Merge revisions 36016:36303 from trunk.

svn path=/branches/kill-bonobo/; revision=36307

942 files changed, 149834 insertions, 130394 deletions

diff --git a/ChangeLog b/ChangeLog
index 6525b02813..b6e061892a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2008-09-10  Michael Meeks  <michael.meeks@novell.com>
+
+	* server.mk: use top_builddir for config.h #551560
+
+2008-09-08  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.23.92 release.
+
+2008-09-01  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.23.91 release and version bump
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* tools/killev.c:
+
+2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Fix compiler warnings in some of the test programs.
+
+2008-08-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546926
+
+	* configure.in:
+	Bump eds_minimum_version to 2.23.91 for camel_shutdown().
+
+2008-08-18  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.23.90 release and Version bump.
+
 2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #547411
diff --git a/NEWS b/NEWS
index 3a6dc5e49c..bbfd699ccd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,103 @@
+Evolution 2.23.92 2008-09-08
+----------------------------
+
+New in 2.23.92:
+	Evolution source code license changed to LGPLv2 or later (Sankar P)
+
+Bug Fixes:
+	#549968: Use the same mnemonic for "Recent Documents" as composer (Matthew Barnes)
+
+Updated Translations:
+	Philip Withnall (en_GB)
+	Andre Klapper (de)
+	Claude Paroz (fr)
+	Alexander Shopov (bg)
+	Theppitak Karoonboonyanan (th)
+	Changwoo Ryu (ko)
+
+Evolution 2.23.91 2008-09-01
+----------------------------
+
+Bug Fixes:
+	#458512: Delete the accessibility tag from the User button (Matthew Barnes)
+	#509647: Do not expunge folder when something goes wrong (Milan Crha)
+	#523327: Show description in monospace font and wrap lines too. (Milan Crha)
+	#525555: Evolution forgets Google Calendar credentials (Milan Crha)
+	#534762: Change "addressbook" to "address book" in translatable strings (Philip Withnall)
+	#544430: Better formed translatable strings for quota usage (Matthew Barnes)
+	#546926: New function to simply call camel_shutdown() (Matthew Barnes)
+	#547822: Make it show "Tasks" for printing tasks list and "Calendar" for printing a calendar (Rouslan Solomakhin)
+	#547822: Use g_malloc() and g_free() instead of malloc() and free() (Matthew Barnes)
+	#548348: Add a libecontactprint_la_LIBADD stanza so we link to the correct libemiscwidgets and libeutil (Matthew Barnes)
+	#549554: Drop sentence about an "Automatic" option (Paul Bolle)
+
+Updated Translations:
+	Andre Klapper (de)
+	Yannick Tailliez and Bruno Brouard (fr)
+	Mark Krapivner(he)
+	Ignacio Casal Quinteiro (gl)
+	Jorge Gonzalez (es)
+	Inaki Larranaga Murgoitio (eu)
+	Ivar Smolin (et)
+	Hendrik Richter (de)
+	Kjartan Maraas (nb)
+	Ilkka Tuohela (fi)
+	Daniel Nylander (sv)
+	Goran Rakić(sr, sr@Latin)
+	Shankar Prasad (kn)
+	Chao-Hsiung Liao (zh_HK, zh_TW)
+	Åsmund Skjæveland (nn)
+	Jovan Naumovski (mk)
+
+Evolution 2.23.90 2008-08-18
+----------------------------
+
+Bug Fixes:
+	#249844: Fix compiler warnings (Milan Crha)
+	#324203: New check box to be able to set LDAP address books browseable until reaches given limits (Milan Crha)
+	#347287: Use a single model for all the views (Chenthill Palanisamy)
+	#352695: Search and clear action, looses the expanded state of threads (Milan Crha)
+	#416258: Make evolution respect GTK_ICON_SIZE changes (Gilles Dartiguelongue)
+	#435969: Show authentication section in an account druid too (Milan Crha)
+	#467115: Fix missing icons in different modules (Matthew Barnes)
+	#498095: Set proper mnemonic widget for description label (Dmitrijs Ledkovs)
+	#508732 Removed 'Crash detection' startup dialog box. (Mathew Barnes)
+	#513363: Removed the outdated "New Features" list and the incorrect "Evolution team" email address. (Mathew Barnes)
+	#519292: Better thread expand and collapse handling (Milan Crha)
+	#529743: Support Subject or Recipients contain search (Srinivasa Ragavan)
+	#530402: Improve dialog wording, and don't use a window title (HIG) (Matthew Barnes)(
+	#531288: Use proxy icon from tango-icon-theme and fall back to the icon shipped by gnome-control-center (Josef Vybíral)
+	#535745: Require and link calendar libs with libgdata and libgdata-google (Milan Crha)
+	#544117: Initialize variables to NULL, to not free uninitialized memory in the cleanup part on the error (Milan Crha)
+	#546263: Editing contact list messes minicard view fixed (Milan Crha)
+	#546668: Drop one unused define (Paul Bolle)
+	#546744: Use address-book-new icon instead of contacts-new (Michael Monreal)
+	#546748: Change "_Properties..." to "_Properties" to match HIG and other components. (Michael Monreal)
+	#546785: Make bbdb plugin just as polite as google-account-setup (Paul Bolle)
+	#546788: Drop unused "ViewNormal" cmd entry (Paul Bolle)
+	#546788: Remove unused formatting style option (Paul Bolle)
+	#546892: Prefer themed icon names (Matthew Barnes)
+	#547308: Do not try to authenticate to the server more than twice with correct credentials (Milan Crha)
+	#547369: Fix a typo. (Matthew Barnes)
+	#547372: Fix TeX-style quotes (Matthew Barnes)
+	#547411: New, Tangoized versions of images now live in data/icons (Matthew Barnes)
+	#547805: Do not filter list of applications to open attachments (Sebastien Bacher)
+
+Other fixes:
+	Lots of disk summary related stability fixes (Srinivasa Ragavan)
+
+Updated Translations:
+	Ignacio Casal Quinteiro (gl)
+	Kjartan Maraas (nb)
+	Shankar Prasad (kn)
+	Ilkka Tuohela (fi)
+	Jorge Gonzalez (es)
+	Duarte Loreto (pt)
+	Chao-Hsiung Liao (zh_HK)
+	Chao-Hsiung Liao (zh_TW)
+	Ivar Smolin (et)
+	Abou Manal (ar)
+
 Evolution 2.23.6 2008-08-04
 ---------------------------
 
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 0a6bae2d79..8364cd3393 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,3 +1,108 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* calendar/ea-day-view.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* addressbook/ea-addressbook-view.h:
+	* addressbook/ea-addressbook.c:
+	* addressbook/ea-addressbook.h:
+	* addressbook/ea-minicard-view.h:
+	* addressbook/ea-minicard.c:
+	* addressbook/ea-minicard.h:
+	* calendar/ea-cal-view-event.c:
+	* calendar/ea-cal-view-event.h:
+	* calendar/ea-cal-view.c:
+	* calendar/ea-calendar.c:
+	* calendar/ea-day-view.h:
+	* calendar/ea-gnome-calendar.h:
+	* calendar/ea-week-view-cell.h:
+	* calendar/ea-week-view-main-item.c:
+	* calendar/ea-week-view.c:
+	* e-table/gal-a11y-e-cell-popup.c:
+	* e-table/gal-a11y-e-cell-registry.c:
+	* e-table/gal-a11y-e-cell-registry.h:
+	* e-table/gal-a11y-e-cell-text.h:
+	* e-table/gal-a11y-e-cell-toggle.c:
+	* e-table/gal-a11y-e-cell-toggle.h:
+	* e-table/gal-a11y-e-cell-tree.h:
+	* e-table/gal-a11y-e-cell.c:
+	* e-table/gal-a11y-e-cell.h:
+	* e-table/gal-a11y-e-table-click-to-add-factory.c:
+	* e-table/gal-a11y-e-table-click-to-add-factory.h:
+	* e-table/gal-a11y-e-table-click-to-add.c:
+	* e-table/gal-a11y-e-table-click-to-add.h:
+	* e-table/gal-a11y-e-table-item-factory.c:
+	* e-table/gal-a11y-e-table-item-factory.h:
+	* e-table/gal-a11y-e-table-item.c:
+	* e-table/gal-a11y-e-table.c:
+	* e-table/gal-a11y-e-tree-factory.c:
+	* e-table/gal-a11y-e-tree-factory.h:
+	* e-table/gal-a11y-e-tree.c:
+	* e-table/gal-a11y-e-tree.h:
+	* e-text/gal-a11y-e-text-factory.c:
+	* e-text/gal-a11y-e-text-factory.h:
+	* e-text/gal-a11y-e-text.c:
+	* ea-cell-table.c:
+	* ea-cell-table.h:
+	* gal-a11y-factory.h:
+	* widgets/ea-calendar-cell.h:
+	* widgets/ea-calendar-item.c:
+	* widgets/ea-calendar-item.h:
+	* widgets/ea-widgets.c:
+
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* addressbook/ea-addressbook-view.c: (ea_ab_view_get_name),
+	(ea_ab_view_get_description):
+	* addressbook/ea-minicard-view.c:
+	(ea_minicard_view_get_description): Change "addressbook" to
+	"address book" in translatable strings.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* calendar/ea-cal-view.h:
+	* calendar/ea-calendar-helpers.c:
+	* calendar/ea-calendar-helpers.h:
+	* calendar/ea-calendar.h:
+	* calendar/ea-day-view-cell.c:
+	* calendar/ea-day-view-cell.h:
+	* calendar/ea-day-view-main-item.c:
+	* calendar/ea-day-view-main-item.h:
+	* calendar/ea-gnome-calendar.c:
+	* calendar/ea-jump-button.c:
+	* calendar/ea-jump-button.h:
+	* calendar/ea-week-view-cell.c:
+	* calendar/ea-week-view-main-item.h:
+	* calendar/ea-week-view.h:
+	* e-table/gal-a11y-e-cell-popup.h:
+	* e-table/gal-a11y-e-cell-vbox.c:
+	* e-table/gal-a11y-e-cell-vbox.h:
+	* e-table/gal-a11y-e-table-column-header.c:
+	* e-table/gal-a11y-e-table-column-header.h:
+	* e-table/gal-a11y-e-table-factory.c:
+	* e-table/gal-a11y-e-table-factory.h:
+	* e-table/gal-a11y-e-table-item.h:
+	* e-table/gal-a11y-e-table.h:
+	* e-text/gal-a11y-e-text.h:
+	* ea-factory.h:
+	* gal-a11y-util.c:
+	* gal-a11y-util.h:
+	* widgets/ea-calendar-cell.c:
+	* widgets/ea-combo-button.c:
+	* widgets/ea-combo-button.h:
+	* widgets/ea-expander.c:
+	* widgets/ea-expander.h:
+	* widgets/ea-widgets.h:
+
 2008-01-24  Tor Lillqvist  <tml@novell.com>
 
 	* widgets/Makefile.am (libevolution_widgets_a11y_la_LIBADD): Link
diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
index be6a1e6212..174fff71f7 100644
--- a/a11y/addressbook/ea-addressbook-view.c
+++ b/a11y/addressbook/ea-addressbook-view.c
@@ -91,7 +91,7 @@ ea_ab_view_get_name (AtkObject *accessible)
 	if (accessible->name)
 		return accessible->name;
 
-	return _("evolution addressbook");
+	return _("evolution address book");
 }
 
 static G_CONST_RETURN gchar*
@@ -100,7 +100,7 @@ ea_ab_view_get_description (AtkObject *accessible)
 	if (accessible->description)
 		return accessible->description;
 
-	return _("evolution addressbook");
+	return _("evolution address book");
 }
 
 AtkObject*
diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h
index 90a868e0aa..86782ad737 100644
--- a/a11y/addressbook/ea-addressbook-view.h
+++ b/a11y/addressbook/ea-addressbook-view.h
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * ea-addressbook_view.h
- * 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 version 2 of the GNU General Public
- * License 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 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.
+ * 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
  */
+
 #ifndef __EA_ADDRESSBOOK_VIEW_H__
 #define __EA_ADDRESSBOOK_VIEW_H__
 
diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c
index 96c66c9087..b41a98434e 100644
--- a/a11y/addressbook/ea-addressbook.c
+++ b/a11y/addressbook/ea-addressbook.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-addressbook.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/addressbook/ea-addressbook.h b/a11y/addressbook/ea-addressbook.h
index 5619a78aaf..337f467760 100644
--- a/a11y/addressbook/ea-addressbook.h
+++ b/a11y/addressbook/ea-addressbook.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-addressbook.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index b617bef24b..fc5638d51d 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -175,7 +175,7 @@ ea_minicard_view_get_description (AtkObject *accessible)
 	if (accessible->description)
 		return accessible->description;
 
-	return _("evolution addressbook");
+	return _("evolution address book");
 }
 
 AtkObject*
diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h
index 58126713e7..922941cb7b 100644
--- a/a11y/addressbook/ea-minicard-view.h
+++ b/a11y/addressbook/ea-minicard-view.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * ea-minicard-view.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- *
- * This library 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 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
- * 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:
+ *		Leon Zhang <leon.zhang@sun.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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __EA_MINICARD_VIEW_H__
 #define __EA_MINICARD_VIEW_H__
 
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c
index 8f619f0152..d0219e03b5 100644
--- a/a11y/addressbook/ea-minicard.c
+++ b/a11y/addressbook/ea-minicard.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * ea-minicard.c
- * 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 version 2 of the GNU General Public
- * License 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 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.
+ * 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  *
- * Author:  Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h
index a7a1924ddc..9c0c8a2b56 100644
--- a/a11y/addressbook/ea-minicard.h
+++ b/a11y/addressbook/ea-minicard.h
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * ea-minicard.h
- * 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 version 2 of the GNU General Public
- * License 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 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.
+ * 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
  */
+
 #ifndef __EA_MINICARD_H__
 #define __EA_MINICARD_H__
 
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 803fd2e83d..49cf525511 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -1,23 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Accessibility: ea-cal-view-event.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com> 
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h
index 7e3a3c9aca..c5000095f6 100644
--- a/a11y/calendar/ea-cal-view-event.h
+++ b/a11y/calendar/ea-cal-view-event.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
index 76dbacb2e1..28410385a6 100644
--- a/a11y/calendar/ea-cal-view.c
+++ b/a11y/calendar/ea-cal-view.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h
index 460ac332fb..e8ebb9eb37 100644
--- a/a11y/calendar/ea-cal-view.h
+++ b/a11y/calendar/ea-cal-view.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
index 9bc761d31f..cc9474c0bc 100644
--- a/a11y/calendar/ea-calendar-helpers.c
+++ b/a11y/calendar/ea-calendar-helpers.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h
index 33b459d3e5..3c980f2911 100644
--- a/a11y/calendar/ea-calendar-helpers.h
+++ b/a11y/calendar/ea-calendar-helpers.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
index 07750f4f5d..bc37ab3079 100644
--- a/a11y/calendar/ea-calendar.c
+++ b/a11y/calendar/ea-calendar.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h
index 771fd6057a..36ef7d5ea0 100644
--- a/a11y/calendar/ea-calendar.h
+++ b/a11y/calendar/ea-calendar.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c
index 27631a5a09..1b8e111e97 100644
--- a/a11y/calendar/ea-day-view-cell.c
+++ b/a11y/calendar/ea-day-view-cell.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h
index 0c4748f90e..ca674e2451 100644
--- a/a11y/calendar/ea-day-view-cell.h
+++ b/a11y/calendar/ea-day-view-cell.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
index 1d83ca1b45..55602e5d92 100644
--- a/a11y/calendar/ea-day-view-main-item.c
+++ b/a11y/calendar/ea-day-view-main-item.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-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 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h
index 211f07e350..79b166f39a 100644
--- a/a11y/calendar/ea-day-view-main-item.h
+++ b/a11y/calendar/ea-day-view-main-item.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index c84966c70d..b43ddbe56f 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h
index 5c316c62e7..5c4773d048 100644
--- a/a11y/calendar/ea-day-view.h
+++ b/a11y/calendar/ea-day-view.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
index ebb4532281..b6eee2699c 100644
--- a/a11y/calendar/ea-gnome-calendar.c
+++ b/a11y/calendar/ea-gnome-calendar.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
index c44aa10ca0..50c43072af 100644
--- a/a11y/calendar/ea-gnome-calendar.h
+++ b/a11y/calendar/ea-gnome-calendar.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c
index 6f45408f02..cfe8e32cbb 100644
--- a/a11y/calendar/ea-jump-button.c
+++ b/a11y/calendar/ea-jump-button.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-jump-button.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Yang Wu <yang.wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-jump-button.h b/a11y/calendar/ea-jump-button.h
index e113c93bbf..4fbd92022f 100644
--- a/a11y/calendar/ea-jump-button.h
+++ b/a11y/calendar/ea-jump-button.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-jump-button.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Yang Wu <yang.wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c
index 99db953a4a..1d1b4d004f 100644
--- a/a11y/calendar/ea-week-view-cell.c
+++ b/a11y/calendar/ea-week-view-cell.c
@@ -1,26 +1,24 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-cell.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <Yang.Wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *		Yang Wu <Yang.Wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-week-view-cell.h b/a11y/calendar/ea-week-view-cell.h
index 72d134b5b8..b09d7d1789 100644
--- a/a11y/calendar/ea-week-view-cell.h
+++ b/a11y/calendar/ea-week-view-cell.h
@@ -1,26 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-cell.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *		Yang Wu <yang.wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c
index 3ad54ae084..5bfb73306b 100644
--- a/a11y/calendar/ea-week-view-main-item.c
+++ b/a11y/calendar/ea-week-view-main-item.c
@@ -1,26 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-main-item.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution Accessibility: ea-week-view-main-item.c
  *
  * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <Yang.Wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-week-view-main-item.h b/a11y/calendar/ea-week-view-main-item.h
index 193cd5f6ec..12687d26c0 100644
--- a/a11y/calendar/ea-week-view-main-item.h
+++ b/a11y/calendar/ea-week-view-main-item.h
@@ -1,26 +1,24 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-main-item.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <Yang.Wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *		Yang Wu <Yang.Wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
index 2e08686433..6cf234c864 100644
--- a/a11y/calendar/ea-week-view.c
+++ b/a11y/calendar/ea-week-view.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h
index dd0bf27fac..b24fe72103 100644
--- a/a11y/calendar/ea-week-view.h
+++ b/a11y/calendar/ea-week-view.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index 1aa3f6f6d3..1a40b23a21 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: gal-a11y-e-cell-popup.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Yang Wu <yang.wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
index 6135dbe603..ebc16c1880 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ b/a11y/e-table/gal-a11y-e-cell-popup.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: gal-a11y-e-cell-popup.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Yang Wu <yang.wu@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
index a41979f842..b88fb581fc 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ b/a11y/e-table/gal-a11y-e-cell-registry.c
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
index 33a75675ea..f231567222 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ b/a11y/e-table/gal-a11y-e-cell-registry.h
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_CELL_REGISTRY_H__
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
index 8dd6bfd143..c69b374100 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ b/a11y/e-table/gal-a11y-e-cell-text.h
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_CELL_TEXT_H__
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index 8f994adeae..23114b0373 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -1,3 +1,24 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #include <gtk/gtk.h>
 
 #include "table/e-cell-toggle.h"
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h
index 06f9448e02..56483aae6b 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.h
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.h
@@ -1,3 +1,24 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef __GAL_A11Y_E_CELL_TOGGLE_H__
 #define __GAL_A11Y_E_CELL_TOGGLE_H__
 
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
index 627b082206..f6f6d9dd70 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ b/a11y/e-table/gal-a11y-e-cell-tree.h
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003.
+ *		Tim Wo <tim.wo@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_CELL_TREE_H__
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c
index 268dc51691..08859d07ef 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.c
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.c
@@ -1,24 +1,27 @@
-/* Evolution Accessibility: gal-a11y-e-cell-vbox.c
- *
- * Copyright (C) 2004 Sun Microsystem, Inc.
+/*
  *
  * 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.
+ * 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.
  *
- * Author: Eric Zhao <eric.zhao@sun.com> Sun Microsystem Inc., 2004
+ * Authors:
+ *		Eric Zhao <eric.zhao@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2004 Sun Microsystem, Inc.
  *
  */
+
 #include <config.h>
 
 #include <atk/atk.h>
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h
index 32a199c05a..276a60177a 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.h
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.h
@@ -1,24 +1,27 @@
-/* Evolution Accessibility: gal-a11y-e-cell-vbox.h
- *
- * Copyright (C) 2004 Sun Microsystem, Inc.
+/*
  *
  * 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.
+ * 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.
  *
- * Author: Eric Zhao <eric.zhao@sun.com> Sun Microsystem Inc., 2004
+ * Authors:
+ *		Eric Zhao <eric.zhao@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2004 Sun Microsystem, Inc.
  *
  */
+
 #ifndef __GAL_A11Y_E_CELL_VBOX_H__
 #define __GAL_A11Y_E_CELL_VBOX_H__
 
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index b9b26f367b..6154fc0acd 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
index f0b9936f68..cdae721112 100644
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ b/a11y/e-table/gal-a11y-e-cell.h
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_CELL_H__
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
index 6801c2353b..9161b4d834 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
@@ -1,7 +1,23 @@
 /*
- * Authors: Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
index 46d6418358..0e4ac11f79 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
@@ -1,7 +1,23 @@
 /*
- * Authors: *   Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY_H__
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index 980e7a5bb3..85c896ccf3 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -1,8 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h
index 6160eadf47..ccefc7a9b8 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.h
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h
@@ -1,4 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__
 #define __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__
diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c
index 5f060e9cde..a50a286940 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.c
+++ b/a11y/e-table/gal-a11y-e-table-column-header.c
@@ -1,6 +1,23 @@
-/* Evolution Accessibility: gal-a11y-e-table-column-header.h
+/*
  *
- * Author: Li Yuan <li.yuan@sun.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.
+ *
+ * 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:
+ *		Li Yuan <li.yuan@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/e-table/gal-a11y-e-table-column-header.h b/a11y/e-table/gal-a11y-e-table-column-header.h
index a8d976ed49..083f0af3de 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.h
+++ b/a11y/e-table/gal-a11y-e-table-column-header.h
@@ -1,6 +1,23 @@
-/* Evolution Accessibility: gal-a11y-e-table-column-header.h
+/*
  *
- * Author: Li Yuan <li.yuan@sun.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.
+ *
+ * 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:
+ *		Li Yuan <li.yuan@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c
index 99bd7bc4a9..37c396aba8 100644
--- a/a11y/e-table/gal-a11y-e-table-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-factory.c
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h
index b5650f03c9..e3ef52c872 100644
--- a/a11y/e-table/gal-a11y-e-table-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-factory.h
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TABLE_FACTORY_H__
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c
index a4eaae7ebc..43508e4796 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.c
@@ -1,7 +1,23 @@
 /*
- * Authors: Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.h b/a11y/e-table/gal-a11y-e-table-item-factory.h
index 7bcdaf69cd..a85c9e894f 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.h
@@ -1,7 +1,23 @@
 /*
- * Authors: *   Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index b8d01124e9..16d50df9b0 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -1,10 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Bolian Yin <bolian.yin@sun.com>
+ *		Christopher James Lahey <clahey@ximian.com>
+ *		Bolian Yin <bolian.yin@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h
index 62e99de9fb..e89f0824b3 100644
--- a/a11y/e-table/gal-a11y-e-table-item.h
+++ b/a11y/e-table/gal-a11y-e-table-item.h
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TABLE_ITEM_H__
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
index eb230c01a1..20261d4eab 100644
--- a/a11y/e-table/gal-a11y-e-table.c
+++ b/a11y/e-table/gal-a11y-e-table.c
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
index 6acd6da071..ab133f5c71 100644
--- a/a11y/e-table/gal-a11y-e-table.h
+++ b/a11y/e-table/gal-a11y-e-table.h
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TABLE_H__
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c
index b9a689c077..cacb3fe082 100644
--- a/a11y/e-table/gal-a11y-e-tree-factory.c
+++ b/a11y/e-table/gal-a11y-e-tree-factory.c
@@ -1,7 +1,23 @@
 /*
- * Authors: Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h
index a171d6f836..621d256c48 100644
--- a/a11y/e-table/gal-a11y-e-tree-factory.h
+++ b/a11y/e-table/gal-a11y-e-tree-factory.h
@@ -1,7 +1,23 @@
 /*
- * Authors: Yuedong Du <yuedong.du@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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TREE_FACTORY_H__
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
index fdc4620763..6fde32b8e7 100644
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ b/a11y/e-table/gal-a11y-e-tree.c
@@ -1,7 +1,23 @@
 /*
- * Authors: Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
index 1a074b8a60..9fe482e1f8 100644
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ b/a11y/e-table/gal-a11y-e-tree.h
@@ -1,7 +1,23 @@
 /*
- * Authors: Yuedong Du <yuedong.du@sun.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.
+ *
+ * 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:
+ *		Yuedong Du <yuedong.du@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TREE_H__
diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c
index fea78faf5e..e1f835e912 100644
--- a/a11y/e-text/gal-a11y-e-text-factory.c
+++ b/a11y/e-text/gal-a11y-e-text-factory.c
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h
index 2e3b3aa83f..ce4d4d0a65 100644
--- a/a11y/e-text/gal-a11y-e-text-factory.h
+++ b/a11y/e-text/gal-a11y-e-text-factory.h
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TEXT_FACTORY_H__
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
index 2b62276048..4eeb7811fc 100644
--- a/a11y/e-text/gal-a11y-e-text.c
+++ b/a11y/e-text/gal-a11y-e-text.c
@@ -1,9 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
index 9f81d9ac9c..5cebd0ff83 100644
--- a/a11y/e-text/gal-a11y-e-text.h
+++ b/a11y/e-text/gal-a11y-e-text.h
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_E_TEXT_H__
diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c
index 1f79d3b525..89724ffac0 100644
--- a/a11y/ea-cell-table.c
+++ b/a11y/ea-cell-table.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cell-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 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h
index 05103eb256..6844abe9da 100644
--- a/a11y/ea-cell-table.h
+++ b/a11y/ea-cell-table.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-table-cell.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
index 309d9aa489..c7805c1ad3 100644
--- a/a11y/ea-factory.h
+++ b/a11y/ea-factory.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-factory.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h
index de9b738d8c..884c94f31e 100644
--- a/a11y/gal-a11y-factory.h
+++ b/a11y/gal-a11y-factory.h
@@ -1,28 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GAL A11Y
- * gal-a11y-factory.h
- *
- * 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
+/*
+ * 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) any later version.
+ * version 2 of the License, or (at your option) version 3.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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/>  
  *
- * 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:
- *  Gilbert Fang <gilbert.fang@sun.com>, Sun Microsystem Inc. 2003.
+ *		Gilbert Fang <gilbert.fang@sun.com>
  *
  * This file is mainly from the gailfactory.h of GAIL.
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _GAL_A11Y_FACTORY_H__
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
index 1bf842a835..c06b4efd6c 100644
--- a/a11y/gal-a11y-util.c
+++ b/a11y/gal-a11y-util.c
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h
index a1aa6cf9df..8354df9ac5 100644
--- a/a11y/gal-a11y-util.h
+++ b/a11y/gal-a11y-util.h
@@ -1,9 +1,24 @@
-/* -*- Mode: 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.
+ *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __GAL_A11Y_UTIL_H__
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
index f97a5851a1..9cd3a58622 100644
--- a/a11y/widgets/ea-calendar-cell.c
+++ b/a11y/widgets/ea-calendar-cell.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h
index fb16e66e8c..a07b7e8bbc 100644
--- a/a11y/widgets/ea-calendar-cell.h
+++ b/a11y/widgets/ea-calendar-cell.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
index 7829e88689..a3da175df1 100644
--- a/a11y/widgets/ea-calendar-item.c
+++ b/a11y/widgets/ea-calendar-item.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-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 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com> 
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h
index cea00dbcdd..87b825b479 100644
--- a/a11y/widgets/ea-calendar-item.h
+++ b/a11y/widgets/ea-calendar-item.h
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-expander.c b/a11y/widgets/ea-expander.c
index 98682a670c..ae9da5fb61 100644
--- a/a11y/widgets/ea-expander.c
+++ b/a11y/widgets/ea-expander.c
@@ -1,22 +1,23 @@
-/* Evolution Accessibility: ea-expander.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.
+ * 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.
+ * 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.
  *
- * Author: Boby Wang <boby.wang@sun.com> Sun Microsystem Inc., 2006
+ * Authors:
+ *		Boby Wang <boby.wang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-expander.h b/a11y/widgets/ea-expander.h
index 26ebfa859a..e670ad07be 100644
--- a/a11y/widgets/ea-expander.h
+++ b/a11y/widgets/ea-expander.h
@@ -1,22 +1,23 @@
-/* Evolution Accessibility: ea-expander.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Boby Wang <boby.wang@sun.com> Sun Microsystem Inc., 2006
+ * Authors:
+ *		Boby Wang <boby.wang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c
index 9143492adc..7ca52ae79f 100644
--- a/a11y/widgets/ea-widgets.c
+++ b/a11y/widgets/ea-widgets.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h
index 7b8b3d8513..75ae46eb1d 100644
--- a/a11y/widgets/ea-widgets.h
+++ b/a11y/widgets/ea-widgets.h
@@ -1,25 +1,23 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.h
- *
- * 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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
+ *
+ * Authors:
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6e42ffec29..8381d07b44 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,135 @@
+2008-09-08  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #361413
+
+	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog):
+	Print detailed error also for LDAP backends.
+
+2008-09-06  Michael Meeks  <michael.meeks@novell.com>
+
+	* gui/component/openldap-extract.h: License fixes.
+
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/widgets/e-minicard-view.c:
+	* gui/widgets/eab-popup-control.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook-config.h:
+	* gui/component/addressbook.h:
+	* gui/component/autocompletion-config.c:
+	* gui/component/autocompletion-config.h:
+	* gui/component/component-factory.c:
+	* gui/contact-editor/e-contact-editor-address.c:
+	* gui/contact-editor/e-contact-editor-address.h:
+	* gui/contact-editor/e-contact-editor-fullname.c:
+	* gui/contact-editor/e-contact-editor-fullname.h:
+	* gui/contact-editor/e-contact-editor-im.c:
+	* gui/contact-editor/e-contact-editor-im.h:
+	* gui/contact-editor/e-contact-editor.h:
+	* gui/contact-editor/e-contact-quick-add.h:
+	* gui/contact-editor/test-editor.c:
+	* gui/contact-list-editor/e-contact-list-editor.c:
+	* gui/contact-list-editor/e-contact-list-editor.h:
+	* gui/contact-list-editor/e-contact-list-model.c:
+	* gui/merging/eab-contact-compare.c:
+	* gui/merging/eab-contact-merging.c:
+	* gui/merging/eab-contact-merging.h:
+	* gui/widgets/e-addressbook-reflow-adapter.c:
+	* gui/widgets/e-addressbook-table-adapter.c:
+	* gui/widgets/e-addressbook-view.h:
+	* gui/widgets/e-minicard-label.h:
+	* gui/widgets/e-minicard-view-widget.c:
+	* gui/widgets/e-minicard-view-widget.h:
+	* gui/widgets/e-minicard.h:
+	* gui/widgets/eab-config.c:
+	* gui/widgets/eab-contact-display.h:
+	* gui/widgets/eab-menu.c:
+	* gui/widgets/eab-popup.c:
+	* gui/widgets/gal-view-factory-minicard.c:
+	* gui/widgets/gal-view-minicard.h:
+	* importers/evolution-csv-importer.c:
+	* printing/e-contact-print-style-editor.c:
+	* printing/e-contact-print-style-editor.h:
+	* printing/e-contact-print-types.h:
+	* printing/e-contact-print.c:
+	* printing/e-contact-print.h:
+	* printing/test-contact-print-style-editor.c:
+	* printing/test-print.c:
+	* tools/evolution-addressbook-export-list-cards.c:
+	* util/eab-book-util.c:
+	* util/eab-book-util.h:
+
+2008-09-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #448435
+
+	* gui/component/addressbook-config.c: (eabc_general_host):
+	Keep UI consistent, disable SSL method for 636 port.
+
+2008-09-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #548827
+
+	* gui/widgets/eab-gui-util.c: (eab_error_dialog):
+	Check bounds of the string array before accessing elements.
+	* gui/widgets/e-addressbook-view.c: (delete_contacts_cb):
+	Show more detailed error message if available.
+
+2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #548348
+
+	* printing/Makefile.am:
+	Add a libecontactprint_la_LIBADD stanza so we link to the
+	correct libemiscwidgets and libeutil.
+
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* addressbook.error.xml:
+	* conduit/address-conduit.c:
+	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog),
+	(eab_search_result_dialog):
+	* gui/widgets/eab-vcard-control.c: (eab_vcard_control_new):
+	* tools/evolution-addressbook-export-list-folders.c:
+	(action_list_folders_init):
+	* tools/evolution-addressbook-export.c: Change "addressbook" to
+	"address book" in translatable strings.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook-component.h:
+	* gui/component/addressbook-migrate.h:
+	* gui/component/addressbook-view.h:
+	* gui/component/openldap-extract.h:
+	* gui/contact-editor/eab-editor.h:
+	* gui/contact-list-editor/e-contact-list-model.h:
+	* gui/merging/eab-contact-compare.h:
+	* gui/widgets/e-addressbook-model.h:
+	* gui/widgets/e-addressbook-reflow-adapter.h:
+	* gui/widgets/e-addressbook-table-adapter.h:
+	* gui/widgets/e-minicard-view.h:
+	* gui/widgets/eab-config.h:
+	* gui/widgets/eab-gui-util.h:
+	* gui/widgets/eab-menu.h:
+	* gui/widgets/eab-popup-control.h:
+	* gui/widgets/eab-popup.h:
+	* gui/widgets/eab-vcard-control.h:
+	* gui/widgets/gal-view-factory-minicard.h:
+	* gui/widgets/gal-view-minicard.c:
+	* importers/evolution-addressbook-importers.h:
+	* tools/evolution-addressbook-export-list-folders.c:
+	* tools/evolution-addressbook-export.h:
+
 2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #508732
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index bfea4ce405..9ca302cdd0 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -2,8 +2,8 @@
 <error-list domain="addressbook">
 
  <error id="ldap-init" type="error" modal="true">
-  <_primary>This addressbook could not be opened.</_primary>
-  <_secondary>This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.</_secondary>
+  <_primary>This address book could not be opened.</_primary>
+  <_secondary>This address book server might be unreachable or the server name may be misspelled or your network connection could be down.</_secondary>
  </error>
 
  <error id="ldap-auth" type="error" modal="true">
@@ -12,7 +12,7 @@
  </error>
 
  <error id="ldap-search-base" type="error" modal="true">
-  <_primary>This addressbook server does not have any suggested search bases.</_primary>
+  <_primary>This address book server does not have any suggested search bases.</_primary>
   <_secondary>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.</_secondary>
  </error>
 
@@ -29,7 +29,7 @@
  </error>
 
  <error id="remove-addressbook" type="error" modal="true">
-  <_primary>Could not remove addressbook.</_primary>
+  <_primary>Could not remove address book.</_primary>
  </error>
 
  <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
@@ -51,15 +51,15 @@
  </error>
 
  <error id="load-error" type="error">
-  <_title>Unable to open addressbook</_title>
-  <_primary>Error loading addressbook.</_primary>
-  <!-- For Translators: {0} is string describing the error why the addressbook could not be loaded -->
+  <_title>Unable to open address book</_title>
+  <_primary>Error loading address book.</_primary>
+  <!-- For Translators: {0} is string describing the error why the address book could not be loaded -->
   <_secondary>{0}</_secondary>
  </error>
 
  <error id="search-error" type="error">
   <_primary>Unable to perform search.</_primary>
-  <!-- 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." -->
+  <!-- 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." -->
   <_secondary>{0}</_secondary>
  </error>
 
@@ -73,7 +73,7 @@
 
  <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
   <_primary>Cannot move contact.</_primary>
-  <_secondary>You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?</_secondary>
+  <_secondary>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?</_secondary>
   <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
  </error>
@@ -91,7 +91,7 @@
  </error>
 
  <error id="backend-died" type="error">
-  <_primary>The Evolution addressbook has quit unexpectedly.</_primary>
+  <_primary>The Evolution address book has quit unexpectedly.</_primary>
   <_secondary>Your contacts for {0} will not be available until Evolution is restarted.</_secondary>
  </error>
 
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index b88a85eb96..3a370fa060 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1317,8 +1317,8 @@ pre_sync (GnomePilotConduit *conduit,
 				  G_CALLBACK (addressbook_authenticate), ctxt->cfg->source);
 	}
 	if (!ctxt->ebook || !e_book_open (ctxt->ebook, TRUE, NULL)) {
-		WARN(_("Could not load addressbook"));
-		gnome_pilot_conduit_error (conduit, _("Could not load addressbook"));
+		WARN(_("Could not load address book"));
+		gnome_pilot_conduit_error (conduit, _("Could not load address book"));
 
 		return -1;
 	}
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
index 171fefa9e4..83fbdf87ee 100644
--- a/addressbook/gui/component/addressbook-component.h
+++ b/addressbook/gui/component/addressbook-component.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _ADDRESSBOOK_COMPONENT_H_
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 3907f6648d..e6dc8e1a2a 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -731,6 +731,7 @@ eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
 	tmp = e_source_get_property (sdialog->source, "ssl");
 	sdialog->ssl = tmp ? ldap_parse_ssl (tmp) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
 	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl);
+	gtk_widget_set_sensitive (sdialog->ssl_optionmenu, strcmp (port, LDAPS_PORT_STRING) != 0);
 	g_signal_connect(sdialog->ssl_optionmenu, "changed", G_CALLBACK(ssl_optionmenu_changed_cb), sdialog);
 
 	g_object_unref(gui);
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 5e1f2c9c2c..dc0452e6b1 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-storage.h
- *
- * 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.
+ * 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.
+ * 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:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- **/
+ *		Chris Toshok <toshok@ximian.com>
+ * 		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __ADDRESSBOOK_CONFIG_H__
 #define __ADDRESSBOOK_CONFIG_H__
diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h
index 2437b17f45..189978b212 100644
--- a/addressbook/gui/component/addressbook-migrate.h
+++ b/addressbook/gui/component/addressbook-migrate.h
@@ -1,22 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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.
+ * 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.
+ * 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:
+ *		Chris Toshok (toshok@ximian.com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: Chris Toshok (toshok@ximian.com)
  */
 
 #ifndef _ADDRESSBOOK_MIGRATE_H_
diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h
index f5eb6c8af5..f86ce46005 100644
--- a/addressbook/gui/component/addressbook-view.h
+++ b/addressbook/gui/component/addressbook-view.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-view.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Chris Toshok <toshok@ximian.com>
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _ADDRESSBOOK_VIEW_H_
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
index 23dc98a800..2e25448717 100644
--- a/addressbook/gui/component/addressbook.h
+++ b/addressbook/gui/component/addressbook.h
@@ -1,3 +1,24 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef __ADDRESSBOOK_H__
 #define __ADDRESSBOOK_H__
 
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index 9e42a375f9..f093564f7e 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -1,21 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
  *
  * 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.
+ * 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:
+ *		Chris Toshok <toshok@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 "autocompletion-config.h"
diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h
index 1ad958235e..c2cf6b55d0 100644
--- a/addressbook/gui/component/autocompletion-config.h
+++ b/addressbook/gui/component/autocompletion-config.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
  *
  * 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.
+ * 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: Chris Toshok <toshok@ximian.com>
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _AUTOCOMPLETION_CONFIG_H
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index e7336fa804..feea79d88f 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c - Factory for Evolution's Addressbook component.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * component-factory.c - Factory for Evolution's Addressbook component.
  *
  * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index 1a1e6e18ed..be8c75e636 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-editor-address.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; 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/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
index 2044a4bb85..101e672c5a 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_CONTACT_EDITOR_ADDRESS_H__
 #define __E_CONTACT_EDITOR_ADDRESS_H__
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index af0db54e7e..db7030e98b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * eab-contact-editor-phones.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; 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/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 7571a21131..81b7182397 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_CONTACT_EDITOR_FULLNAME_H__
 #define __E_CONTACT_EDITOR_FULLNAME_H__
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
index 8b421c0b3b..6121eb8be8 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-im.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-editor-im.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Christian Hammond <chipx86@gnupdate.org>
- *
- * This library 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 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
- * 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:
+ *		Christian Hammond <chipx86@gnupdate.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.h b/addressbook/gui/contact-editor/e-contact-editor-im.h
index 7bce2a2144..cf16cdce93 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-im.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-im.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-add-im.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Christian Hammond <chipx86@gnupdate.org>
- *
- * This library 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 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
- * 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:
+ *		Christian Hammond <chipx86@gnupdate.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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_CONTACT_EDITOR_IM_H__
 #define __E_CONTACT_EDITOR_IM_H__
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index c6dd17a6ac..7fd94698c8 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_CONTACT_EDITOR_H__
 #define __E_CONTACT_EDITOR_H__
 
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
index e10581abe7..0aaabdc69c 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.h
@@ -1,27 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		Jon Trowbridge <trow@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.
  */
 
 #ifndef __E_CONTACT_QUICK_ADD_H__
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
index aad4e9bf54..c106ec75a6 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -1,22 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-editor.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
+/*
  *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __EAB_EDITOR_H__
 #define __EAB_EDITOR_H__
 
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 83e15acfb6..7a7e644238 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; 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/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index cac976ad70..7146bc7100 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; 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/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
index 6850d7fc48..a2bd50acf5 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __E_CONTACT_LIST_EDITOR_H__
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index d596919481..c91bfb44d5 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -1,4 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #include <config.h>
 #include <string.h>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
index 68de720286..f4fde83a4b 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h
@@ -1,4 +1,21 @@
-/* -*- Mode: 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef _E_CONTACT_LIST_MODEL_H_
 #define _E_CONTACT_LIST_MODEL_H_
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 4733533d9a..adc6938c8d 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -1,28 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-contact-compare.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *      Chris Toshok <toshok@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/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index cf343da05e..ff8bfc1a85 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -1,29 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * eab-contact-compare.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *			Jon Trowbridge <trow@ximian.com>
+ *          Chris Toshok <toshok@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.
  */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
 #ifndef __EAB_CONTACT_COMPARE_H__
 #define __EAB_CONTACT_COMPARE_H__
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index f409f576f3..a912a4f08e 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -1,12 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Code for checking for duplicates when doing EContact work.
  *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
+ *		Chris Toshok <toshok@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
index e8d4262246..4228fc1028 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/merging/eab-contact-merging.h
@@ -1,12 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * The Evolution addressbook client object.
  *
+ * 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:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
+ *		Chris Toshok <toshok@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __E_CONTACT_MERGING_H__
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 8ccc4f0693..6558d94812 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -1,4 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef _EAB_MODEL_H_
 #define _EAB_MODEL_H_
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 95452113e8..7f8eec9e56 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -1,5 +1,20 @@
 /* -*- Mode: 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.
+ *
+ * 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)
+ */
 
 #include <config.h>
 #include <string.h>
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index b237b2fbb8..fd7842684f 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -1,4 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index c2eec4a6fa..a4440155d9 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -1,4 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #include <config.h>
 #include <gtk/gtk.h>
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
index 8af5a95950..c4182d2d2b 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h
@@ -1,4 +1,23 @@
-/* -*- Mode: 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef _EAB_TABLE_ADAPTER_H_
 #define _EAB_TABLE_ADAPTER_H_
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 3a221342d8..a45ac2fd75 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1240,7 +1240,7 @@ static void delete_contacts_cb (EBook *book,  EBookStatus status,  gpointer clos
 			break;
 	  	default :
 			/* Unknown error */
-			e_error_run (NULL, "addressbook:generic-error", _("Failed to delete contact"), _("Other error"), NULL);
+			eab_error_dialog (_("Failed to delete contact"), status);
 			break;
 	}
 }
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index eae3b54861..4b3504d87f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 #ifndef EAB_VIEW_H
 #define EAB_VIEW_H
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index cd5ef33fa2..3d41e4cb87 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_MINICARD_LABEL_H__
 #define __E_MINICARD_LABEL_H__
 
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 1e6b103192..2796bfe433 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-minicard-view-widget.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; 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/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index f55e998d19..1c4323523f 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_MINICARD_VIEW_WIDGET_H__
 #define __E_MINICARD_VIEW_WIDGET_H__
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 30a384091d..803df061a2 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-minicard-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; 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/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index eb6d07f034..7d0a5b1842 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -1,22 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
+/*
  *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_MINICARD_VIEW_H__
 #define __E_MINICARD_VIEW_H__
 
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index b7ed9711e6..71c976745f 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_MINICARD_H__
 #define __E_MINICARD_H__
 
diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c
index f057daf52d..bb8eb63dd0 100644
--- a/addressbook/gui/widgets/eab-config.c
+++ b/addressbook/gui/widgets/eab-config.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/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h
index 215e526190..59b1705764 100644
--- a/addressbook/gui/widgets/eab-config.h
+++ b/addressbook/gui/widgets/eab-config.h
@@ -1,21 +1,23 @@
 /*
- * 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/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index 36b4bb64f0..c7b7f1a476 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -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/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 651a44bfa7..154e5bb0c1 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -81,7 +81,12 @@ static const char *status_to_string[] = {
 void
 eab_error_dialog (const char *msg, EBookStatus status)
 {
-	const char *status_str = status_to_string [status];
+	const char *status_str;
+
+	if (status < 0 || status >= G_N_ELEMENTS (status_to_string))
+		status_str = "Other error";
+	else
+		status_str = status_to_string [status];
 
 	if (status_str)
 		e_error_run (NULL, "addressbook:generic-error", msg, _(status_str), NULL);
@@ -92,22 +97,24 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 {
 	char *label_string, *label = NULL, *uri;
 	GtkWidget *dialog;
+	gboolean can_detail_error = TRUE;
 
 	g_return_if_fail (source != NULL);
 
 	uri = e_source_get_uri (source);
 
 	if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) {
-		label_string = _("We were unable to open this addressbook. This either means "
+		can_detail_error = FALSE;
+		label_string = _("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 "
+                                 "for offline usage. Please load the address book once in online mode "
                                  "to download its contents");
 	}
 
 	else if (!strncmp (uri, "file:", 5)) {
 		char *path = g_filename_from_uri (uri, NULL, NULL);
 		label = g_strdup_printf (
-			_("We were unable to open this addressbook.  Please check that the "
+			_("We were unable to open this address book.  Please check that the "
 			  "path %s exists and that you have permission to access it."), path);
 		g_free (path);
 		label_string = label;
@@ -116,10 +123,11 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 		/* special case for ldap: contact folders so we can tell the user about openldap */
 #ifdef HAVE_LDAP
 		label_string =
-			_("We were unable to open this addressbook.  This either "
+			_("We were unable to open this address book.  This either "
 			  "means you have entered an incorrect URI, or the LDAP server "
 			  "is unreachable.");
 #else
+		can_detail_error = FALSE;
 		label_string =
 			_("This version of Evolution does not have LDAP support "
 			  "compiled in to it.  If you want to use LDAP in Evolution, "
@@ -128,10 +136,12 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 	} else {
 		/* other network folders */
 		label_string =
-			_("We were unable to open this addressbook.  This either "
+			_("We were unable to open this address book.  This either "
 			  "means you have entered an incorrect URI, or the server "
 			  "is unreachable.");
+	}
 
+	if (can_detail_error) {
 		/* do not show repository offline message, it's kind of generic error */
 		if (status != E_BOOK_ERROR_REPOSITORY_OFFLINE && status > 0 && status < G_N_ELEMENTS (status_to_string) && status_to_string [status]) {
 			label = g_strconcat (label_string, "\n\n", _("Detailed error:"), " ", _(status_to_string [status]), NULL);
@@ -160,19 +170,19 @@ eab_search_result_dialog      (GtkWidget *parent,
 		str = _("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.");
 		break;
 	case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED:
 		str = _("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.");
 		break;
 	case E_BOOK_VIEW_ERROR_INVALID_QUERY:
-		str = _("The backend for this addressbook was unable to parse this query.");
+		str = _("The backend for this address book was unable to parse this query.");
 		break;
 	case E_BOOK_VIEW_ERROR_QUERY_REFUSED:
-		str = _("The backend for this addressbook refused to perform this query.");
+		str = _("The backend for this address book refused to perform this query.");
 		break;
 	case E_BOOK_VIEW_ERROR_OTHER_ERROR:
 		str = _("This query did not complete successfully.");
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 263b8f3e38..79dbe5493a 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -1,22 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-gui-util.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
+/*
  *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef __E_ADDRESSBOOK_UTIL_H__
 #define __E_ADDRESSBOOK_UTIL_H__
 
diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c
index 5190e5fa22..603e93893c 100644
--- a/addressbook/gui/widgets/eab-menu.c
+++ b/addressbook/gui/widgets/eab-menu.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h
index 0da2cbcfa9..7da05c133b 100644
--- a/addressbook/gui/widgets/eab-menu.h
+++ b/addressbook/gui/widgets/eab-menu.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index 03e9886149..de3d21b7d6 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -1,32 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * eab-popup-control.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This file is too big and this widget is too complicated.  Forgive me.
  *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
- */
-
-/*
- * This file is too big and this widget is too complicated.  Forgive me.
+ * 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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *      Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include <config.h>
diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h
index 09ae811e1d..4a6539e29c 100644
--- a/addressbook/gui/widgets/eab-popup-control.h
+++ b/addressbook/gui/widgets/eab-popup-control.h
@@ -1,28 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * eab-popup-control.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *			Jon Trowbridge <trow@ximian.com>
+ *          Chris Toshok <toshok@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.
  */
 
 #ifndef __EAB_POPUP_CONTROL_H__
diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
index 73075543a4..17f979734b 100644
--- a/addressbook/gui/widgets/eab-popup.c
+++ b/addressbook/gui/widgets/eab-popup.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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; version 2 of the License.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h
index 457959ff96..933c815af8 100644
--- a/addressbook/gui/widgets/eab-popup.h
+++ b/addressbook/gui/widgets/eab-popup.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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 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 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; version 2 of 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
index 7b81ec64a7..2379559e3d 100644
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ b/addressbook/gui/widgets/eab-vcard-control.c
@@ -281,7 +281,7 @@ eab_vcard_control_new (void)
 			  G_CALLBACK (toggle_full_vcard), vcard_control);
 	gtk_box_pack_start (GTK_BOX (bbox), button1, FALSE, FALSE, 0);
 
-	button2 = gtk_button_new_with_label(_("Save in addressbook"));
+	button2 = gtk_button_new_with_label(_("Save in address book"));
 	g_signal_connect (button2, "clicked",
 			  G_CALLBACK (save_in_addressbook), vcard_control);
 	gtk_box_pack_start (GTK_BOX (bbox), button2, FALSE, FALSE, 0);
diff --git a/addressbook/gui/widgets/eab-vcard-control.h b/addressbook/gui/widgets/eab-vcard-control.h
index 5f6643c1ca..06ca62727a 100644
--- a/addressbook/gui/widgets/eab-vcard-control.h
+++ b/addressbook/gui/widgets/eab-vcard-control.h
@@ -1,3 +1,23 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef __EAB_VCARD_CONTROL_H__
 #define __EAB_VCARD_CONTROL_H__
 
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index 9fb1e5b0f6..ccec1bf092 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -1,11 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-factory-minicard.c: A View Factory
+ * 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:
- *   Chris Lahey <clahey@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * (C) 2000, 2001 Ximian, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
index 1a9b1d4c51..d1cf2de444 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.h
@@ -1,12 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ *
  * gal-view-factory-minicard.c: A View Factory
  *
+ * 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:
- *   Chris Lahey <clahey@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * (C) 2000, 2001 Ximian, Inc.
  */
+
 #ifndef _GAL_VIEW_FACTORY_MINICARD_H_
 #define _GAL_VIEW_FACTORY_MINICARD_H_
 
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index 764c0edfe0..02276a6960 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -1,12 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ *
  * gal-view-minicard.c: An Minicard View
  *
+ * 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:
- *   Chris Lahey <clahey@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * (C) 2000, 2001 Ximian, Inc.
  */
+
 #include <config.h>
 
 #include <libxml/parser.h>
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
index e6f8c415b4..bb22cf8a57 100644
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ b/addressbook/gui/widgets/gal-view-minicard.h
@@ -1,12 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * gal-view-minicard.h: An Minicard View
  *
+ * 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:
- *   Chris Lahey <clahey@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * (C) 2000, 2001 Ximian, Inc.
  */
+
 #ifndef _GAL_VIEW_MINICARD_H_
 #define _GAL_VIEW_MINICARD_H_
 
diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h
index b571060b06..94b0e3b023 100644
--- a/addressbook/importers/evolution-addressbook-importers.h
+++ b/addressbook/importers/evolution-addressbook-importers.h
@@ -1,3 +1,22 @@
+/*
+ *
+ * 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)
+ *
+ */
 
 struct _EImportImporter *evolution_ldif_importer_peek(void);
 struct _EImportImporter *evolution_vcard_importer_peek(void);
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 20f56b46aa..c699662b5c 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -1,24 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution CSV and TAB importer
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution CSV and TAB importer
  *
  * 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.
+ * 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:
+ *		Devashish Sharma <sdevashish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Authors: Devashish Sharma <sdevashish@novell.com>
  */
+
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 6113519b2f..a2c3bec2fe 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -28,6 +28,10 @@ libecontactprint_la_SOURCES = 			\
 	e-contact-print.c			\
 	e-contact-print.h
 
+libecontactprint_la_LIBADD =					\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la
+
 noinst_PROGRAMS =			\
 	contact-print-test		\
 	contact-print-style-editor-test
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
index 2590212af4..22a01f05e4 100644
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ b/addressbook/printing/e-contact-print-style-editor.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-print-style-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #include "e-contact-print-style-editor.h"
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
index 932b53af2d..15460f6e12 100644
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ b/addressbook/printing/e-contact-print-style-editor.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
index f6a7d14d1f..15d64e71e0 100644
--- a/addressbook/printing/e-contact-print-types.h
+++ b/addressbook/printing/e-contact-print-types.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-print-types.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef E_CONTACT_PRINT_TYPES_H
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index f82335335a..23abe184ca 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-print.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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>
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index da80242835..c9cc40847e 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-print.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef E_CONTACT_PRINT_H
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
index dd36a98959..cf9aeebeb2 100644
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ b/addressbook/printing/test-contact-print-style-editor.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-contact-print-style-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; 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/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index be98d9fe0b..6616a92fff 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-print.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Lahey <clahey@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 library; 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/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 36c67c42e6..285f1dc9bc 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -1,23 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export-list-cards.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.
+ * 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.
+ * 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.
+ * 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/>  
  *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
+ *
+ * Authors:
+ *		Gilbert Fang <gilbert.fang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index 247789cea9..f9679b3378 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export-list-folders.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.
+ * 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.
+ * 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.
  *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
+ * Authors:
+ *		Gilbert Fang <gilbert.fang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -41,7 +41,7 @@ action_list_folders_init (ActionContext * p_actctx)
 	FILE *outputfile = NULL;
 
 	if (!e_book_get_addressbooks (&addressbooks, NULL)) {
-		g_warning (_("Couldn't get list of addressbooks"));
+		g_warning (_("Couldn't get list of address books"));
 		exit (-1);
 	}
 
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 71372dbbfb..2f9df1fabc 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -50,7 +50,7 @@ static GOptionEntry entries[] = {
 	  N_("OUTPUTFILE") },
 	{ "list-addressbook-folders", 'l', 0,
 	  G_OPTION_ARG_NONE, &opt_list_folders_mode,
-	  N_("List local addressbook folders") },
+	  N_("List local address book folders") },
 	{ "format", '\0', 0,
 	  G_OPTION_ARG_STRING, &opt_output_format,
 	  N_("Show cards as vcard or csv file"),
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
index ec1b9f4e94..210dc2c1d5 100644
--- a/addressbook/tools/evolution-addressbook-export.h
+++ b/addressbook/tools/evolution-addressbook-export.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
+ * Authors:
+ *		Gilbert Fang <gilbert.fang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index a19abda67c..af1324bf64 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -1,28 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-util.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *      Chris Toshok <toshok@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/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
index c1a38a0d6a..66c3a6c23e 100644
--- a/addressbook/util/eab-book-util.h
+++ b/addressbook/util/eab-book-util.h
@@ -1,28 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *      Chris Toshok <toshok@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.
  */
 
 #ifndef __EAB_UTIL_H__
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4768f8b834..92de5afd33 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,17 +1,227 @@
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+2008-09-09  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #551382
+
+	* gui/e-week-view.c: (model_comps_deleted_cb):
+	* gui/e-cal-model.c: (redo_queries):
+	Get rid of unused variables.
+	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
+	Use result of g_list_prepend, thus report changes properly.
+
+2008-09-08  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #544187
+	* calendar/gui/e-cal-model.c:
+	* calendar/gui/e-cal-model.h:
+	* calendar/gui/e-day-view.c:
+	* calendar/gui/e-week-view.c: Added a new signal
+	handler to update the views on comp deletion.
+
+2008-09-06  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #549968
 
 	* gui/dialogs/comp-editor.c (comp_editor_init):
 	Use the same mnemonic for "Recent Documents" as composer.
 
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+2008-09-04  Sankar P  <psankar@novell.com>
 
-	** Fixes bug #549967
+License Changes
 
-	* gui/caltypes.xml:
-	* gui/tasktypes.xml:
-	Capitalize "days" in "Next 7 Days".
+	* gui/alarm-notify/util.c:
+	* gui/dialogs/calendar-setup.c:
+	* gui/e-day-view-time-item.c:
+	* gui/e-meeting-list-view.c:
+	* gui/misc.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* conduits/common/libecalendar-common-conduit.c:
+	* gui/alarm-notify/alarm-notify-dialog.c:
+	* gui/alarm-notify/alarm-notify-dialog.h:
+	* gui/alarm-notify/alarm-notify.c:
+	* gui/calendar-component.h:
+	* gui/calendar-view-factory.c:
+	* gui/calendar-view.c:
+	* gui/comp-editor-factory.h:
+	* gui/control-factory.c:
+	* gui/dialogs/alarm-dialog.c:
+	* gui/dialogs/alarm-list-dialog.c:
+	* gui/dialogs/cal-attachment-select-file.c:
+	* gui/dialogs/cancel-comp.c:
+	* gui/dialogs/changed-comp.h:
+	* gui/dialogs/comp-editor-page.h:
+	* gui/dialogs/comp-editor-util.c:
+	* gui/dialogs/comp-editor-util.h:
+	* gui/dialogs/comp-editor.h:
+	* gui/dialogs/e-delegate-dialog.c:
+	* gui/dialogs/e-send-options-utils.h:
+	* gui/dialogs/event-editor.c:
+	* gui/dialogs/event-editor.h:
+	* gui/dialogs/event-page.h:
+	* gui/dialogs/memo-editor.c:
+	* gui/dialogs/recur-comp.h:
+	* gui/dialogs/schedule-page.c:
+	* gui/dialogs/schedule-page.h:
+	* gui/dialogs/send-comp.c:
+	* gui/dialogs/task-details-page.c:
+	* gui/dialogs/task-editor.c:
+	* gui/dialogs/task-editor.h:
+	* gui/e-cal-component-memo-preview.h:
+	* gui/e-cal-config.c:
+	* gui/e-cal-event.c:
+	* gui/e-cal-list-view-config.c:
+	* gui/e-cal-list-view.c:
+	* gui/e-cal-menu.c:
+	* gui/e-cal-model-calendar.c:
+	* gui/e-cal-model-memos.c:
+	* gui/e-cal-model.c:
+	* gui/e-calendar-table-config.c:
+	* gui/e-calendar-table.h:
+	* gui/e-calendar-view.h:
+	* gui/e-cell-date-edit-config.c:
+	* gui/e-cell-date-edit-text.c:
+	* gui/e-cell-date-edit-text.h:
+	* gui/e-comp-editor-registry.c:
+	* gui/e-comp-editor-registry.h:
+	* gui/e-date-edit-config.c:
+	* gui/e-date-time-list.c:
+	* gui/e-day-view-config.c:
+	* gui/e-day-view-main-item.h:
+	* gui/e-meeting-attendee.c:
+	* gui/e-meeting-time-sel-item.c:
+	* gui/e-memo-table-config.c:
+	* gui/e-memo-table-config.h:
+	* gui/e-memos.c:
+	* gui/e-memos.h:
+	* gui/e-mini-calendar-config.c:
+	* gui/e-mini-calendar-config.h:
+	* gui/e-select-names-editable.c:
+	* gui/e-select-names-renderer.c:
+	* gui/e-tasks.c:
+	* gui/e-tasks.h:
+	* gui/e-week-view-config.c:
+	* gui/e-week-view-config.h:
+	* gui/e-week-view-layout.c:
+	* gui/e-week-view-main-item.c:
+	* gui/e-week-view-titles-item.c:
+	* gui/goto.h:
+	* gui/itip-bonobo-control.c:
+	* gui/memos-component.h:
+	* gui/tasks-component.h:
+	* gui/weekday-picker.c:
+	* importers/main.c:
+
+2008-08-28  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Related to bug #547822
+
+	* gui/print.c (print_table_draw_page), (print_table):
+	Use g_malloc() and g_free() instead of malloc() and free().
+	Also fix an "assignment discards qualifiers" compiler warning.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* common/authentication.c:
+	* common/authentication.h:
+	* conduits/common/libecalendar-common-conduit.h:
+	* gui/alarm-notify/alarm-notify.h:
+	* gui/alarm-notify/alarm-queue.h:
+	* gui/alarm-notify/config-data.h:
+	* gui/alarm-notify/util.h:
+	* gui/cal-search-bar.h:
+	* gui/calendar-view-factory.h:
+	* gui/calendar-view.h:
+	* gui/control-factory.h:
+	* gui/dialogs/alarm-dialog.h:
+	* gui/dialogs/alarm-list-dialog.h:
+	* gui/dialogs/cal-attachment-select-file.h:
+	* gui/dialogs/calendar-setup.h:
+	* gui/dialogs/cancel-comp.h:
+	* gui/dialogs/comp-editor-page.c:
+	* gui/dialogs/copy-source-dialog.h:
+	* gui/dialogs/delete-comp.h:
+	* gui/dialogs/delete-error.h:
+	* gui/dialogs/e-delegate-dialog.h:
+	* gui/dialogs/memo-editor.h:
+	* gui/dialogs/memo-page.h:
+	* gui/dialogs/recurrence-page.h:
+	* gui/dialogs/save-comp.c:
+	* gui/dialogs/save-comp.h:
+	* gui/dialogs/select-source-dialog.c:
+	* gui/dialogs/select-source-dialog.h:
+	* gui/dialogs/send-comp.h:
+	* gui/dialogs/task-details-page.h:
+	* gui/dialogs/task-page.h:
+	* gui/e-alarm-list.h:
+	* gui/e-cal-component-preview.h:
+	* gui/e-cal-config.h:
+	* gui/e-cal-event.h:
+	* gui/e-cal-list-view-config.h:
+	* gui/e-cal-list-view.h:
+	* gui/e-cal-menu.h:
+	* gui/e-cal-model-calendar.h:
+	* gui/e-cal-model-memos.h:
+	* gui/e-cal-model-tasks.h:
+	* gui/e-cal-model.h:
+	* gui/e-cal-popup.h:
+	* gui/e-calendar-table-config.h:
+	* gui/e-cell-date-edit-config.h:
+	* gui/e-date-edit-config.h:
+	* gui/e-date-time-list.h:
+	* gui/e-day-view-config.h:
+	* gui/e-day-view-layout.c:
+	* gui/e-day-view-layout.h:
+	* gui/e-day-view-time-item.h:
+	* gui/e-day-view-top-item.h:
+	* gui/e-day-view.h:
+	* gui/e-meeting-attendee.h:
+	* gui/e-meeting-list-view.h:
+	* gui/e-meeting-time-sel-item.h:
+	* gui/e-meeting-types.h:
+	* gui/e-meeting-utils.c:
+	* gui/e-meeting-utils.h:
+	* gui/e-memo-table.h:
+	* gui/e-select-names-editable.h:
+	* gui/e-select-names-renderer.h:
+	* gui/e-timezone-entry.h:
+	* gui/e-week-view-event-item.h:
+	* gui/e-week-view-layout.h:
+	* gui/e-week-view-main-item.h:
+	* gui/e-week-view-titles-item.h:
+	* gui/itip-bonobo-control.h:
+	* gui/memos-control.c:
+	* gui/memos-control.h:
+	* gui/migration.h:
+	* gui/misc.h:
+	* gui/print.h:
+	* gui/tag-calendar.c:
+	* gui/tag-calendar.h:
+	* gui/tasks-control.h:
+	* gui/weekday-picker.h:
+	* importers/evolution-calendar-importer.h:
+	* zones.h:
+
+2008-08-27  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #523327
+
+	* gui/e-cal-component-preview.c: (write_html):
+	* gui/e-cal-component-memo-preview.c: (write_html):
+	Show description in monospace font and wrap lines too.
+
+2008-08-22  Tobias Mueller  <tobiasmue@svn.gnome.org>
+
+	* gui/print.c (print_table_draw_page):
+	Make it show "Tasks" for printing tasks list and "Calendar" for
+	printing a calendar. Patch by
+	Rouslan Solomakhin <rouslan@solomakhin.net>
+	
+	** Fixes bug 547822
 
 2008-08-18  Milan Crha  <mcrha@redhat.com>
 
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index f38c5232bb..7925a36b65 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Rodrigo Moya <rodrigo@ximian.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 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:
+ *		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/common/authentication.h b/calendar/common/authentication.h
index 9c11653fbd..147b67e831 100644
--- a/calendar/common/authentication.h
+++ b/calendar/common/authentication.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Rodrigo Moya <rodrigo@ximian.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 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:
+ *		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
  */
 
 #ifndef _AUTHENTICATION_H_
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index 52ea6c92c5..c5000875b7 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -1,23 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Tom Billet <mouse256@ulyssis.org>
- *          Nathan Owens <pianocomp81@yahoo.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:
+ *		Tom Billet <mouse256@ulyssis.org>
+ *      Nathan Owens <pianocomp81@yahoo.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include <string.h>
diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h
index 62800f2bd3..e168e001eb 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.h
+++ b/calendar/conduits/common/libecalendar-common-conduit.h
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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)
+ *
+ */
+
 #include <libedataserver/e-categories.h>
 #include <libecal/e-cal.h>
 #include <pi-appinfo.h>
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index bfc0375c8f..61eea70f52 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -1,22 +1,25 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - alarm notification 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.
  */
 
 #include <config.h>
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index 3d65e88f56..4b2a3d9c95 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -1,21 +1,23 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
  */
 
 #ifndef ALARM_NOTIFY_DIALOG_H
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 7ba36fb78a..fb29f7f7d8 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
- *  Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
index 2e43405831..7fea501de9 100644
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ b/calendar/gui/alarm-notify/alarm-notify.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - Alarm notification service object
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Alarm notification service object
  *
  * 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.
  */
 
 #ifndef ALARM_NOTIFY_H
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
index d6b0823371..69fbafec02 100644
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ b/calendar/gui/alarm-notify/alarm-queue.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Alarm queueing engine
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Alarm queueing engine
  *
  * 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.
  */
 
 #ifndef ALARM_QUEUE_H
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 005140bfb4..9dd6f0221c 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Configuration values for the alarm notification daemon
  *
  * 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.
  */
 
 #ifndef CONFIG_DATA_H
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 311b738c68..6a734a8660 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -1,22 +1,25 @@
-/* Evolution calendar - utility functions
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - utility functions
  *
  * 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
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
index e4c8a26a6d..c53f047953 100644
--- a/calendar/gui/alarm-notify/util.h
+++ b/calendar/gui/alarm-notify/util.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - utility functions
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - utility functions
  *
  * 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.
  */
 
 #ifndef UTIL_H
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index 5cc5d2fc49..64e1b40b0c 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Search bar widget for calendar views
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Search bar widget for calendar views
  *
  * 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.
  */
 
 #ifndef CAL_SEARCH_BAR_H
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 7643ff01aa..131ffd3a3a 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _CALENDAR_COMPONENT_H_
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index edb7368b62..ce76578563 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Generic view factory for calendar views
  *
  * 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
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
index f329633a9e..779e59809c 100644
--- a/calendar/gui/calendar-view-factory.h
+++ b/calendar/gui/calendar-view-factory.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Generic view factory for calendar views
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Generic view factory for calendar views
  *
  * 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.
  */
 
 #ifndef CALENDAR_VIEW_FACTORY_H
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
index e2e00054e0..331181e4cd 100644
--- a/calendar/gui/calendar-view.c
+++ b/calendar/gui/calendar-view.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Generic view object for calendar views
  *
  * 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
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index 62e5a31246..53c4ca6a39 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Generic view object for calendar views
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Generic view object for calendar views
  *
  * 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.
  */
 
 #ifndef CALENDAR_VIEW_H
diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h
index 6c9d76a300..fdab8a0a46 100644
--- a/calendar/gui/comp-editor-factory.h
+++ b/calendar/gui/comp-editor-factory.h
@@ -1,21 +1,25 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Component editor factory object
  *
  * 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.
  */
 
 #ifndef COMP_EDITOR_FACTORY_H
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 9ed1181b9d..63014b2c4f 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
index 4932d71999..2103f458f1 100644
--- a/calendar/gui/control-factory.h
+++ b/calendar/gui/control-factory.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _CONTROL_FACTORY_H_
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 11642e3e47..a5f13ccb51 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1,27 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *      Hans Petter Jansson <hpj@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/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h
index 3de343d66c..0cdee744c9 100644
--- a/calendar/gui/dialogs/alarm-dialog.h
+++ b/calendar/gui/dialogs/alarm-dialog.h
@@ -1,25 +1,30 @@
-/* Evolution calendar - Alarm page of the calendar component dialogs
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
+ * Evolution calendar - Alarm page of the calendar component dialogs
  *
  * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *      Hans Petter Jansson <hpj@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.
  */
 
 #ifndef ALARM_DIALOG_H
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 8066061993..b078e3123b 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -1,27 +1,29 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
+/*
+ * Evolution calendar - Alarm page of the calendar component dialogs
  *
  * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *      Hans Petter Jansson <hpj@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/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h
index f221e65d04..6a55f03000 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.h
+++ b/calendar/gui/dialogs/alarm-list-dialog.h
@@ -1,25 +1,30 @@
-/* Evolution calendar - Alarm page of the calendar component dialogs
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
+ * Evolution calendar - Alarm page of the calendar component dialogs
  *
  * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *      Hans Petter Jansson <hpj@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.
  */
 
 #ifndef ALARM_LIST_DIALOG_H
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 2d2acb359e..8d968a84a9 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /*
- *  Authors: Harish Krishnaswamy <kharish@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:
+ *		Harish Krishnaswamy <kharish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h
index 97f02b8944..3c39fed125 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.h
+++ b/calendar/gui/dialogs/cal-attachment-select-file.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* cal-attachment-select-file.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
- * published by the Free Software Foundation; either version 2 of the
- * 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.
+ * 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.
  *
- * Author: Harish K <kharish@novell.com>
+ * Authors:
+ *		Harish K <kharish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_MSG_COMPOSER_SELECT_FILE_H
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 816a76d98e..f7ab2ee846 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.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/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h
index 6e02ab193c..3898467595 100644
--- a/calendar/gui/dialogs/calendar-setup.h
+++ b/calendar/gui/dialogs/calendar-setup.h
@@ -1,21 +1,23 @@
 /*
- * 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/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 4e81e79f44..547f70348e 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Send calendar component 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:
+ *		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
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
index 070e76ba4d..3566a7548e 100644
--- a/calendar/gui/dialogs/cancel-comp.h
+++ b/calendar/gui/dialogs/cancel-comp.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Send calendar component dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+ * Evolution calendar - Send calendar component 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:
+ *		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.
  */
 
 #ifndef CANCEL_COMP_H
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
index 911c3cf44f..7a8bcb30f5 100644
--- a/calendar/gui/dialogs/changed-comp.h
+++ b/calendar/gui/dialogs/changed-comp.h
@@ -1,21 +1,23 @@
-/* Evolution calendar - Changed calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		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.
  */
 
 #ifndef CHANGED_COMP_H
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 4a48611d01..a86465d5d7 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -1,21 +1,26 @@
-/* Evolution calendar - Base class for calendar component editor pages
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Base class for calendar component editor pages
  *
  * 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
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
index 736ca1c8dc..f8b9db23f3 100644
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ b/calendar/gui/dialogs/comp-editor-page.h
@@ -1,21 +1,25 @@
-/* Evolution calendar - Base class for calendar component editor pages
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Base class for calendar component editor pages
  *
  * 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.
  */
 
 #ifndef COMP_EDITOR_PAGE_H
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index ea0441709c..6547731776 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Widget utilities
  *
  * 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
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index c20faf1ec4..565feeaea5 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -1,21 +1,25 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Widget utilities
  *
  * 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:
+ *		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.
  */
 
 #ifndef _COMP_EDITOR_UTIL_H_
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 786c937d98..9289b9ced7 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -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.
  */
 
 #ifndef COMP_EDITOR_H
diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h
index d5211bc4e6..ba3169a1b8 100644
--- a/calendar/gui/dialogs/copy-source-dialog.h
+++ b/calendar/gui/dialogs/copy-source-dialog.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Copy source dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+ * Evolution calendar - Copy source 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:
+ *		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.
  */
 
 #ifndef COPY_SOURCE_DIALOG_H
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
index bce1d084a7..a2f85301a0 100644
--- a/calendar/gui/dialogs/delete-comp.h
+++ b/calendar/gui/dialogs/delete-comp.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Delete calendar component dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Delete calendar component 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.
  */
 
 #ifndef DELETE_COMP_H
diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h
index c757f9c982..cb0a7d9294 100644
--- a/calendar/gui/dialogs/delete-error.h
+++ b/calendar/gui/dialogs/delete-error.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Send calendar component dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+ * Evolution calendar - Send calendar component 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:
+ *		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.
  */
 
 #ifndef DELETE_ERROR_H
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 6eb771622b..31c4631ca9 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Delegate selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
+/*
+ * Evolution calendar - Delegate selector 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:
+ *		Damon Chaplin <damon@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/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index f2cf85bc4c..553b7c1576 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -1,21 +1,24 @@
-/* Evolution calendar - Delegate selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		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.
  */
 
 #ifndef __E_DELEGATE_DIALOG_H__
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index 885d57fd1b..cae3131c00 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -1,22 +1,25 @@
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
+/*
+ * Evolution calendar - Timezone selector 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.
+ * 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:
+ *		Damon Chaplin <damon@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.
  */
 
 #ifndef __E_SENDOPTIONS_UTILS_H__
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 99750b27c5..c4393b0174 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -1,26 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Event editor dialog
- *
- * 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 - Event 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:
+ *		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.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h
index aa50466a02..c050b92dfb 100644
--- a/calendar/gui/dialogs/event-editor.h
+++ b/calendar/gui/dialogs/event-editor.h
@@ -1,24 +1,27 @@
-/* Evolution calendar - Event editor dialog
- *
- * 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 - Event 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:
+ *		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 __EVENT_EDITOR_H__
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 2f61631960..7c868f1d3d 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -1,24 +1,28 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Main page of the event 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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.
  */
 
 #ifndef EVENT_PAGE_H
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 692e1fc256..377cceef84 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -1,27 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Memo editor dialog
- *
- * 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>
- *          JP Rosevear <jpr@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.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.
+ * 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>
+ *      JP Rosevear <jpr@ximian.com>
+ *      Nathan Owens <pianocomp81@yahoo.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/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h
index ab229584e5..b45edd18ce 100644
--- a/calendar/gui/dialogs/memo-editor.h
+++ b/calendar/gui/dialogs/memo-editor.h
@@ -1,25 +1,29 @@
-/* Evolution calendar - Task editor dialog
+/*
  *
- * 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>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ * Evolution calendar - Task 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      Nathan Owens <pianocomp81@yahoo.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 __MEMO_EDITOR_H__
diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h
index c96eba9999..cfe4cb0a17 100644
--- a/calendar/gui/dialogs/memo-page.h
+++ b/calendar/gui/dialogs/memo-page.h
@@ -1,24 +1,27 @@
-/* Evolution calendar - Main page of the memo editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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.
  */
 
 #ifndef MEMO_PAGE_H
diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h
index 88de66c651..e4666772f7 100644
--- a/calendar/gui/dialogs/recur-comp.h
+++ b/calendar/gui/dialogs/recur-comp.h
@@ -1,21 +1,25 @@
-/* Evolution calendar - Recurring calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Recurring calendar component 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:
+ *		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.
  */
 
 #ifndef RECUR_COMP_H
diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h
index f4d19effb4..f3bff613ee 100644
--- a/calendar/gui/dialogs/recurrence-page.h
+++ b/calendar/gui/dialogs/recurrence-page.h
@@ -1,25 +1,30 @@
-/* Evolution calendar - Recurrence page of the calendar component dialogs
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
+ * Evolution calendar - Recurrence page of the calendar component dialogs
  *
  * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *      Hans Petter Jansson <hpj@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.
  */
 
 #ifndef RECURRENCE_PAGE_H
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index e1d575cdb1..cb178e0dce 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -1,22 +1,24 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
index a06d7182e6..123a4a8587 100644
--- a/calendar/gui/dialogs/save-comp.h
+++ b/calendar/gui/dialogs/save-comp.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
  *
+ * Evolution calendar - Delete calendar component 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.
  */
 
 #ifndef SAVE_COMP_H
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 57af4ecf87..534923a853 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -1,24 +1,28 @@
-/* Evolution calendar - Scheduling page
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Scheduling page
  *
  * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
index 1bc1825856..8ffbb43c71 100644
--- a/calendar/gui/dialogs/schedule-page.h
+++ b/calendar/gui/dialogs/schedule-page.h
@@ -1,21 +1,25 @@
-/* Evolution calendar - Scheduling page
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Scheduling page
  *
  * 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:
+ *		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.
  */
 
 #ifndef SCHEDULE_PAGE_H
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 9cc6c57fe3..e9fc7d0d9f 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -1,21 +1,24 @@
-/* Evolution calendar - Select source dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		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/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h
index 1df04fba1c..3ca3cec041 100644
--- a/calendar/gui/dialogs/select-source-dialog.h
+++ b/calendar/gui/dialogs/select-source-dialog.h
@@ -1,21 +1,26 @@
-/* Evolution calendar - Select source dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+ * Evolution calendar - Select source 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:
+ *		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.
  */
 
 #ifndef SELECT_SOURCE_DIALOG_H
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 90e07592b0..11d6e74757 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Send calendar component 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:
+ *		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
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
index c01612c79b..4a1a6c55ab 100644
--- a/calendar/gui/dialogs/send-comp.h
+++ b/calendar/gui/dialogs/send-comp.h
@@ -1,21 +1,24 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		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.
  */
 
 #ifndef SEND_COMP_H
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index ffd3be6c6e..81358901ba 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -1,24 +1,28 @@
-/* Evolution calendar - task details page
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - task details page
  *
  * 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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
diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h
index 797b87fc9d..9fbfcd4af6 100644
--- a/calendar/gui/dialogs/task-details-page.h
+++ b/calendar/gui/dialogs/task-details-page.h
@@ -1,24 +1,29 @@
-/* Evolution calendar - Main page of the task editor dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+ * Evolution calendar - Main page of the task 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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.
  */
 
 #ifndef TASK_DETAILS_PAGE_H
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 17339e31b5..57a4063755 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -1,26 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Task editor dialog
- *
- * 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>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Task 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
index 2f8330d8e4..9376b4149a 100644
--- a/calendar/gui/dialogs/task-editor.h
+++ b/calendar/gui/dialogs/task-editor.h
@@ -1,24 +1,27 @@
-/* Evolution calendar - Task editor dialog
- *
- * 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 - Task 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:
+ *		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 __TASK_EDITOR_H__
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
index 243506929e..77ec68fa1d 100644
--- a/calendar/gui/dialogs/task-page.h
+++ b/calendar/gui/dialogs/task-page.h
@@ -1,24 +1,29 @@
-/* Evolution calendar - Main page of the task editor dialog
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+ * Evolution calendar - Main page of the task 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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      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.
  */
 
 #ifndef TASK_PAGE_H
diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h
index e15c4ca5c7..6819994af1 100644
--- a/calendar/gui/e-alarm-list.h
+++ b/calendar/gui/e-alarm-list.h
@@ -1,23 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EAlarmList - list of calendar alarms with GtkTreeModel interface.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
  *
+ * EAlarmList - list of calendar alarms with GtkTreeModel interface.
+ * 
  * 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/>  
  *
- * 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:  Hans Petter Jansson  <hpj@ximian.com>
+ * Authors:
+ *		Hans Petter Jansson  <hpj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_ALARM_LIST_H
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index 5f65001d25..f4107efe84 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -199,13 +199,13 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 
 		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Description:"));
 
-		gtk_html_stream_printf (stream, "<TD><PRE>");
+		gtk_html_stream_printf (stream, "<TD><TT>");
 
 		for (node = l; node != NULL; node = node->next) {
 			char *html;
 
 			text = * (ECalComponentText *) node->data;
-			html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0);
+			html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0);
 
 			if (html)
 				gtk_html_stream_printf (stream, "%s", html);
@@ -213,7 +213,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 			g_free (html);
 		}
 
-		gtk_html_stream_printf (stream, "</PRE></TD></TR>");
+		gtk_html_stream_printf (stream, "</TT></TD></TR>");
 
 		e_cal_component_free_text_list (l);
 	}
diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h
index c7291382da..144e54fe5c 100644
--- a/calendar/gui/e-cal-component-memo-preview.h
+++ b/calendar/gui/e-cal-component-memo-preview.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-cal-component-memo-preview.h
- *
- * 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.
+ * 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.
+ * 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: Federico Mena Quintero <federico@ximian.com>
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ *      Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_CAL_COMPONENT_MEMO_PREVIEW_H_
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 05b84bef30..3d8be3abd2 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -290,13 +290,13 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 
 		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Description:"));
 
-		gtk_html_stream_printf (stream, "<TD><PRE>");
+		gtk_html_stream_printf (stream, "<TD><TT>");
 
 		for (node = l; node != NULL; node = node->next) {
 			char *html;
 
 			text = * (ECalComponentText *) node->data;
-			html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0);
+			html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0);
 
 			if (html)
 				gtk_html_stream_printf (stream, "%s", html);
@@ -304,7 +304,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 			g_free (html);
 		}
 
-		gtk_html_stream_printf (stream, "</PRE></TD></TR>");
+		gtk_html_stream_printf (stream, "</TT></TD></TR>");
 
 		e_cal_component_free_text_list (l);
 	}
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index 8612d4c514..e5cc98109c 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-cal-component-preview.h
- *
- * 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.
+ * 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.
+ * 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: Federico Mena Quintero <federico@ximian.com>
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_CAL_COMPONENT_PREVIEW_H_
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index dbcb6a217b..18ceee76ca 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.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/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index 6505da6e0d..8af6313b5b 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -1,21 +1,23 @@
 /*
- * 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/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index fe02d4854e..6e295ab9a8 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.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/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
index 541e0f9625..4fbaa394ec 100644
--- a/calendar/gui/e-cal-event.h
+++ b/calendar/gui/e-cal-event.h
@@ -1,21 +1,23 @@
 /*
- * 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/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c
index e686aa531c..efa8b9b7fb 100644
--- a/calendar/gui/e-cal-list-view-config.c
+++ b/calendar/gui/e-cal-list-view-config.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Rodrigo Moya <rodrigo@ximian.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 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:
+ *		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
  */
 
 #include "calendar-config.h"
diff --git a/calendar/gui/e-cal-list-view-config.h b/calendar/gui/e-cal-list-view-config.h
index 4a7b77fe76..021262e357 100644
--- a/calendar/gui/e-cal-list-view-config.h
+++ b/calendar/gui/e-cal-list-view-config.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_CAL_LIST_VIEW_CONFIG_H_
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index a11778f285..6534a562f0 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -1,28 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors:
- *  Hans Petter Jansson  <hpj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * ECalListView - display calendar events in an ETable.
  *
  * 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
- */
-
-/*
- * ECalListView - display calendar events in an ETable.
+ * 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:
+ *		Hans Petter Jansson  <hpj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 898249d01c..606997c17d 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors:
- *  Hans Petter Jansson  <hpj@ximian.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 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:
+ *		Hans Petter Jansson  <hpj@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
  */
+
 #ifndef _E_CAL_LIST_VIEW_H_
 #define _E_CAL_LIST_VIEW_H_
 
diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c
index ddfc099d28..c6639b2816 100644
--- a/calendar/gui/e-cal-menu.c
+++ b/calendar/gui/e-cal-menu.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index 88bd1d8330..30962d9a1a 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 4559035504..27c73dd12c 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Data model for ETable
  *
  * 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:
+ *		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/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h
index 3abfbf58f5..ec0cb4c75c 100644
--- a/calendar/gui/e-cal-model-calendar.h
+++ b/calendar/gui/e-cal-model-calendar.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - Data model for ETable
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+ * Evolution calendar - Data model for ETable
  *
  * 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:
+ *		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.
  */
 
 #ifndef E_CAL_MODEL_CALENDAR_H
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 0efb6b6377..ffb1c8a488 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -1,23 +1,26 @@
-/* Evolution memos - Data model for ETable
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+/*
+ * Evolution memos - Data model for ETable
  *
  * 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:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *      Nathan Owens <pianocomp81@yahoo.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/e-cal-model-memos.h b/calendar/gui/e-cal-model-memos.h
index 9cba3ed233..5417c9c09b 100644
--- a/calendar/gui/e-cal-model-memos.h
+++ b/calendar/gui/e-cal-model-memos.h
@@ -1,23 +1,27 @@
-/* Evolution memo - Data model for ETable
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ * Evolution memo - Data model for ETable
  *
  * 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:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *      Nathan Owens <pianocomp81@yahoo.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 E_CAL_MODEL_MEMOS_H
diff --git a/calendar/gui/e-cal-model-tasks.h b/calendar/gui/e-cal-model-tasks.h
index db45ed99bd..40d651e583 100644
--- a/calendar/gui/e-cal-model-tasks.h
+++ b/calendar/gui/e-cal-model-tasks.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - Data model for ETable
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+ * Evolution calendar - Data model for ETable
  *
  * 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:
+ *		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.
  */
 
 #ifndef E_CAL_MODEL_TASKS_H
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 818015cade..0b476a4bd5 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Data model for ETable
  *
  * 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:
+ *		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
@@ -105,6 +109,7 @@ static void remove_client (ECalModel *model, ECalModelClient *client_data);
 enum {
 	TIME_RANGE_CHANGED,
 	ROW_APPENDED,
+	COMPS_DELETED,
 	CAL_VIEW_PROGRESS,
 	CAL_VIEW_DONE,
 	LAST_SIGNAL
@@ -155,6 +160,16 @@ e_cal_model_class_init (ECalModelClass *klass)
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
+
+	signals[COMPS_DELETED] =
+		g_signal_new ("comps_deleted",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (ECalModelClass, comps_deleted),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__POINTER,
+			      G_TYPE_NONE, 1, G_TYPE_POINTER);
+
 	signals[CAL_VIEW_PROGRESS] =
 		g_signal_new ("cal_view_progress",
 			      G_TYPE_FROM_CLASS (klass),
@@ -1427,13 +1442,21 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 		while ((comp_data = search_by_id_and_client (priv, client,
 							      id))) {
 			int pos;
+			GSList *list = NULL;
 
 			pos = get_position_in_array (priv->objects, comp_data);
+ 			
+			if (!g_ptr_array_remove (priv->objects, comp_data))
+				continue;
+
+			list = g_slist_append (list, comp_data);
+			g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, list);
+
+			g_slist_free (list);
+			g_object_unref (comp_data);
+
 			e_table_model_pre_change (E_TABLE_MODEL (model));
 			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
-
- 			if (g_ptr_array_remove (priv->objects, comp_data))
-	 			e_cal_model_free_component_data (comp_data);
  		}
 
 		e_cal_component_free_id (id);
@@ -1469,9 +1492,45 @@ static void
 e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_data)
 {
 	ECalModel *model = (ECalModel *) user_data;
+	ECalModelPrivate *priv;
+	GList *l, *list = NULL;
+
+	priv = model->priv;
+
+	/*  re-add only the recurrence objects */
+	for (l = objects; l != NULL; l = g_list_next (l)) {
+		if (e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) 
+			list = g_list_prepend (list, l->data);
+		else {
+			int pos;
+			ECalModelComponent *comp_data;
+			ECalComponentId *id;
+			ECalComponent *comp = e_cal_component_new ();
+			ECal *client = e_cal_view_get_client (query);
+		
+			if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data))) {
+				g_object_unref (comp);
+				continue;
+			}
+
+			e_table_model_pre_change (E_TABLE_MODEL (model));
+
+			id = e_cal_component_get_id (comp);
+				
+			comp_data = search_by_id_and_client (priv, client, id);
+			icalcomponent_free (comp_data->icalcomp);
+			
+			comp_data->icalcomp = icalcomponent_new_clone (l->data);
+			e_cal_model_set_instance_times (comp_data, priv->zone);
+			
+			pos = get_position_in_array (priv->objects, comp_data);
+			
+			e_table_model_row_changed (E_TABLE_MODEL (model), pos);
+		}
+	}
 
-	/* now re-add all objects */
-	e_cal_view_objects_added_cb (query, objects, model);
+	e_cal_view_objects_added_cb (query, list, model);
+	g_list_free (list);
 }
 
 static void
@@ -1490,13 +1549,21 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
 
 		/* make sure we remove all objects with this UID */
 		while ((comp_data = search_by_id_and_client (priv, e_cal_view_get_client (query), id))) {
+			GSList *l = NULL;
+
 			pos = get_position_in_array (priv->objects, comp_data);
 
+			if (!g_ptr_array_remove (priv->objects, comp_data))
+				continue;
+
+			l = g_slist_append (l, comp_data);
+			g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, l);
+
+			g_slist_free (l);
+			g_object_unref (comp_data);
+		
 			e_table_model_pre_change (E_TABLE_MODEL (model));
 			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
-
-			if (g_ptr_array_remove (priv->objects, comp_data))
-				e_cal_model_free_component_data (comp_data);
 		}
 	}
 
@@ -1688,11 +1755,18 @@ remove_client_objects (ECalModel *model, ECalModelClient *client_data)
 		g_return_if_fail (comp_data != NULL);
 
 		if (comp_data->client == client_data->client) {
-			e_table_model_pre_change (E_TABLE_MODEL (model));
-			e_table_model_row_deleted (E_TABLE_MODEL (model), i - 1);
+			GSList *l = NULL;
 
 			g_ptr_array_remove (model->priv->objects, comp_data);
-			e_cal_model_free_component_data (comp_data);
+		
+			l = g_slist_append (l, comp_data);
+			g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, l);
+
+			g_slist_free (l);
+			g_object_unref (comp_data);
+
+			e_table_model_pre_change (E_TABLE_MODEL (model));
+			e_table_model_row_deleted (E_TABLE_MODEL (model), i - 1);
 		}
 	}
 
@@ -1764,11 +1838,34 @@ e_cal_model_remove_all_clients (ECalModel *model)
 	}
 }
 
+static GSList *
+get_objects_as_list (ECalModel *model)
+{
+	gint i;
+	GSList *l = NULL;
+	ECalModelPrivate *priv = model->priv;
+
+	for (i = 0; i < priv->objects->len; i++) {
+		ECalModelComponent *comp_data;
+
+		comp_data = g_ptr_array_index (priv->objects, i);
+		if (comp_data == NULL) {
+			g_warning ("comp_data is null\n");
+			continue;
+		}
+
+		l = g_slist_prepend (l, comp_data);
+	}
+
+	return l;
+}
+
 static void
 redo_queries (ECalModel *model)
 {
 	ECalModelPrivate *priv;
 	GList *l;
+	GSList *slist;
 	int len;
 
 	priv = model->priv;
@@ -1798,8 +1895,15 @@ redo_queries (ECalModel *model)
 	/* clean up the current contents */
 	e_table_model_pre_change (E_TABLE_MODEL (model));
 	len = priv->objects->len;
+
+	slist = get_objects_as_list (model);
+	g_ptr_array_set_size (priv->objects, 0);
+	g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, slist);
+	
 	e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len);
-	clear_objects_array (priv);
+	
+	g_slist_foreach (slist, (GFunc)g_object_unref, NULL);
+	g_slist_free (slist);
 
 	/* update the query for all clients */
 	for (l = priv->clients; l != NULL; l = l->next) {
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 405efb4400..ad9bc7d9ae 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - Data model for ETable
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+ * Evolution calendar - Data model for ETable
  *
  * 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:
+ *		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.
  */
 
 #ifndef E_CAL_MODEL_H
@@ -112,6 +116,7 @@ typedef struct {
 	/* Signals */
 	void (* time_range_changed) (ECalModel *model, time_t start, time_t end);
 	void (* row_appended) (ECalModel *model);
+	void (* comps_deleted) (ECalModel *model, gpointer list);
 	void (* cal_view_progress) (ECalModel *model, const char *message, int progress, ECalSourceType type);
 	void (* cal_view_done) (ECalModel *model, ECalendarStatus status, ECalSourceType type);
 } ECalModelClass;
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 500b85bb4b..fb899c3961 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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 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 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; version 2 of 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c
index 6e0b1e7e40..f8a7af9c14 100644
--- a/calendar/gui/e-calendar-table-config.c
+++ b/calendar/gui/e-calendar-table-config.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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 "calendar-config.h"
diff --git a/calendar/gui/e-calendar-table-config.h b/calendar/gui/e-calendar-table-config.h
index 9d8379d413..12cbc3e326 100644
--- a/calendar/gui/e-calendar-table-config.h
+++ b/calendar/gui/e-calendar-table-config.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_CALENDAR_TABLE_CONFIG_H_
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index ea5566404c..519a540d4a 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_CALENDAR_TABLE_H_
 #define _E_CALENDAR_TABLE_H_
 
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index b8b8fbb588..334988a6e9 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Rodrigo Moya <rodrigo@ximian.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 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:
+ *		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
  */
+
 #ifndef _E_CALENDAR_VIEW_H_
 #define _E_CALENDAR_VIEW_H_
 
diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c
index 7ef6ed8712..e2a9cc6eb2 100644
--- a/calendar/gui/e-cell-date-edit-config.c
+++ b/calendar/gui/e-cell-date-edit-config.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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 "calendar-config.h"
diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h
index c6cfcc1161..6203aec1a4 100644
--- a/calendar/gui/e-cell-date-edit-config.h
+++ b/calendar/gui/e-cell-date-edit-config.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_CELL_DATE_EDIT_CONFIG_H_
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index e980113c1e..56ffc9ce69 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -1,29 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * ECellDateEditText - a subclass of ECellText used to show and edit the text
+ * representation of the date, from a ECalComponentDateTime* model value.
  *
  * 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
- */
-
-/*
- * ECellDateEditText - a subclass of ECellText used to show and edit the text
- * representation of the date, from a ECalComponentDateTime* model value.
+ * 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>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 4c1bf60de2..9bbbfb0fc4 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -1,29 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * ECellDateEditText - a subclass of ECellText used to show and edit the text
+ * representation of the date, from a ECalComponentDateTime* model value.
  *
  * 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
- */
-
-/*
- * ECellDateEditText - a subclass of ECellText used to show and edit the text
- * representation of the date, from a ECalComponentDateTime* model value.
+ * 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>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef _E_CELL_DATE_EDIT_TEXT_H_
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c
index 3b86333e27..9855d12462 100644
--- a/calendar/gui/e-comp-editor-registry.c
+++ b/calendar/gui/e-comp-editor-registry.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-comp-editor-registry.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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
index 8a9d861d98..4f1444601c 100644
--- a/calendar/gui/e-comp-editor-registry.h
+++ b/calendar/gui/e-comp-editor-registry.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-comp-editor-registry.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		 JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_COMP_EDITOR_REGISTRY_H_
diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c
index 3ecb104a2f..16732305ec 100644
--- a/calendar/gui/e-date-edit-config.c
+++ b/calendar/gui/e-date-edit-config.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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 "calendar-config.h"
diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h
index 2dc68bd7f6..c31899bb9e 100644
--- a/calendar/gui/e-date-edit-config.h
+++ b/calendar/gui/e-date-edit-config.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_DATE_EDIT_CONFIG_H_
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index beda3a4574..defd013fce 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EDateTimeList - list of calendar dates/times with GtkTreeModel interface.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * EDateTimeList - list of calendar dates/times with GtkTreeModel interface.
  *
  * 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/>  
  *
- * 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:  Hans Petter Jansson  <hpj@ximian.com>
+ * Authors:
+ *		Hans Petter Jansson  <hpj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <string.h>
diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h
index d9684dfa66..b4f6a01a10 100644
--- a/calendar/gui/e-date-time-list.h
+++ b/calendar/gui/e-date-time-list.h
@@ -1,23 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EDateTimeList - list of calendar dates/times with GtkTreeModel interface.
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * EDateTimeList - list of calendar dates/times with GtkTreeModel interface.
  *
  * 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/>  
  *
- * 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:  Hans Petter Jansson  <hpj@ximian.com>
+ * Authors:
+ *		Hans Petter Jansson  <hpj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_DATE_TIME_LIST_H
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index f11212f896..b7acf6541f 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Rodrigo Moya <rodrigo@ximian.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 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:
+ *		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
  */
 
 #include "calendar-config.h"
diff --git a/calendar/gui/e-day-view-config.h b/calendar/gui/e-day-view-config.h
index 0fbc662c5a..6ca1f2717e 100644
--- a/calendar/gui/e-day-view-config.h
+++ b/calendar/gui/e-day-view-config.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_DAY_VIEW_CONFIG_H_
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index 9c83080ef7..26459997df 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index bd52a21734..19ee6ee036 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_DAY_VIEW_LAYOUT_H_
 #define _E_DAY_VIEW_LAYOUT_H_
 
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index d12896c2a3..650f139eb1 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_DAY_VIEW_MAIN_ITEM_H_
 #define _E_DAY_VIEW_MAIN_ITEM_H_
 
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index b57eb3505a..6a31855262 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -1,30 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * EDayViewTimeItem - canvas item which displays the times down the left of
+ * the EDayView.
  *
  * 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
- */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
+ * 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>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index fff0267ea4..67d1213c7a 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_DAY_VIEW_TIME_ITEM_H_
 #define _E_DAY_VIEW_TIME_ITEM_H_
 
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index 6f65c065ee..d45aa4e155 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_DAY_VIEW_TOP_ITEM_H_
 #define _E_DAY_VIEW_TOP_ITEM_H_
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index ebf17eff78..f1fb84cd3c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -624,10 +624,10 @@ model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data
 }
 
 static void
-model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data)
+model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 {
 	EDayView *day_view = E_DAY_VIEW (user_data);
-	int i;
+	GSList *l, *list = data;
 
 	if (!E_CALENDAR_VIEW (day_view)->in_focus) {
 		return;
@@ -635,15 +635,12 @@ model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data)
 
 	e_day_view_stop_editing_event (day_view);
 
-	for (i = row + count; i > row; i--) {
+	for (l = list; l != NULL; l = g_slist_next (l)) {
+		ECalModelComponent *comp_data = l->data;
 		gint day, event_num;
 		const char *uid = NULL;
 		char *rid = NULL;
-		ECalModelComponent *comp_data;
 
-		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), i - 1);
-		if (!comp_data)
-			continue;
 
 		uid = icalcomponent_get_uid (comp_data->icalcomp);
 		if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
@@ -656,6 +653,7 @@ model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data)
 
 		if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
 			e_day_view_remove_event_cb (day_view, day, event_num, NULL);
+
 		g_free (rid);
 	}
 
@@ -1024,8 +1022,8 @@ init_model (EDayView *day_view, ECalModel *model)
 			  G_CALLBACK (model_cell_changed_cb), day_view);
 	g_signal_connect (G_OBJECT (model), "model_rows_inserted",
 			  G_CALLBACK (model_rows_inserted_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_rows_deleted",
-			  G_CALLBACK (model_rows_deleted_cb), day_view);
+	g_signal_connect (G_OBJECT (model), "comps_deleted",
+			  G_CALLBACK (model_comps_deleted_cb), day_view);
 }
 
 /* Turn off the background of the canvas windows. This reduces flicker
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 2a187c6f42..6f4c0d7da1 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_DAY_VIEW_H_
 #define _E_DAY_VIEW_H_
 
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 8d140f9fcc..3ecee9dd78 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-attendee.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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index d0c156fc6e..a9f344484d 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-meeting_attendee.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_MEETING_ATTENDEE_H_
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 83b672c393..8d747a7be1 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -1,24 +1,24 @@
 /*
- * e-meeting-list-view.c
- *
- * Authors: Mike Kestner  <mkestner@ximian.com>
- * 	    JP Rosevear  <jpr@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@ximian.com>
+ * 	    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
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
index f3acc21ad2..b1ed367257 100644
--- a/calendar/gui/e-meeting-list-view.h
+++ b/calendar/gui/e-meeting-list-view.h
@@ -1,23 +1,24 @@
 /*
- * e-meeting-list-view.h
- *
- * Author: Mike Kestner <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner <mkestner@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.
  */
 
 #ifndef _E_MEETING_LIST_VIEW_H_
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index bd79b104d3..6687919a40 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -1,33 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * EMeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
+ * display canvas and the top display (with the dates, times & All Attendees).
+ * I didn't make these separate GnomeCanvasItems since they share a lot of
+ * code.
  *
  * 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
- */
-
-/*
- * EMeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
+ * 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@gtk.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index 0d0117ed84..addb99e47a 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@gtk.org>
- *
- * 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.
+ * 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:
+ *		Damon Chaplin <damon@gtk.org>
+ *
+ * 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
  */
 
 /*
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 0531198445..86c0edc04e 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-attendee.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_MEETING_TYPES_H_
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
index 5d0bf028d4..30fbaf143b 100644
--- a/calendar/gui/e-meeting-utils.c
+++ b/calendar/gui/e-meeting-utils.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-model.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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index c70ae472a2..d360471b20 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-attendee.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_MEETING_UTILS_H_
diff --git a/calendar/gui/e-memo-table-config.c b/calendar/gui/e-memo-table-config.c
index 60a54519c8..21e6f036c1 100644
--- a/calendar/gui/e-memo-table-config.c
+++ b/calendar/gui/e-memo-table-config.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.com>
- *  Nathan Owens <pianocomp81@yahoo.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 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:
+ *		JP Rosevear <jpr@ximian.com>
+ *		Nathan Owens <pianocomp81@yahoo.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 "calendar-config.h"
diff --git a/calendar/gui/e-memo-table-config.h b/calendar/gui/e-memo-table-config.h
index fa6df1c43a..5242b5f7b7 100644
--- a/calendar/gui/e-memo-table-config.h
+++ b/calendar/gui/e-memo-table-config.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.com>
- *  Nathan Owens <pianocomp81@yahoo.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 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:
+ *		JP Rosevear <jpr@ximian.com>
+ *		Nathan Owens <pianocomp81@yahoo.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 _E_MEMO_TABLE_CONFIG_H_
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index 0fc4821328..58f398bfb5 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -1,27 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *  Nathan Owens <pianocomp81@yahoo.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Nathan Owens <pianocomp81@yahoo.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 _E_MEMO_TABLE_H_
 #define _E_MEMO_TABLE_H_
 
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 97147f42b6..a8c5b41b2b 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-memos.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.
+ * 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.
+ * 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: Federico Mena Quintero <federico@ximian.com>
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *      Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h
index 25d52c6b63..c4a4e96154 100644
--- a/calendar/gui/e-memos.h
+++ b/calendar/gui/e-memos.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-memos.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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.
+ * 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.
+ * 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>
+ *
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ *      Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_MEMOS_H_
diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c
index 45e4e815a8..dfafc86fe6 100644
--- a/calendar/gui/e-mini-calendar-config.c
+++ b/calendar/gui/e-mini-calendar-config.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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 "calendar-config.h"
diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h
index 4c9492d2b9..621d682e9d 100644
--- a/calendar/gui/e-mini-calendar-config.h
+++ b/calendar/gui/e-mini-calendar-config.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_MINI_CALENDAR_CONFIG_H_
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index 136fa7d9fc..5ec94a0fc6 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -1,23 +1,23 @@
 /*
- * e-select-names-editable.c
- *
- * Author: Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h
index 77386b9b51..da961237e7 100644
--- a/calendar/gui/e-select-names-editable.h
+++ b/calendar/gui/e-select-names-editable.h
@@ -1,23 +1,24 @@
 /*
- * e-select-names-editable.h
- *
- * Author: Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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.
  */
 
 #ifndef __E_SELECT_NAMES_EDITABLE_H__
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 14cb6d94d1..fb742bf5c7 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -1,23 +1,23 @@
 /*
- * e-select-names-renderer.c
- *
- * Author:  Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h
index fa992c5761..21deec2cb5 100644
--- a/calendar/gui/e-select-names-renderer.h
+++ b/calendar/gui/e-select-names-renderer.h
@@ -1,23 +1,24 @@
 /*
- * e-select-names-renderer.h
- *
- * Author: Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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.
  */
 
 #ifndef __E_SELECT_NAMES_RENDERER_H__
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 93adcdd158..b866439413 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.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.
+ * 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.
+ * 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.
+ * 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>
+ *
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index da63870d6f..f94ee27ad9 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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.
+ * 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.
+ * 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>
+ *
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_TASKS_H_
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index cc31e49a5e..f4780f0712 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
index 5f3f967b55..28224fb1db 100644
--- a/calendar/gui/e-week-view-config.c
+++ b/calendar/gui/e-week-view-config.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Rodrigo Moya <rodrigo@ximian.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 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:
+ *		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
  */
 
 #include "calendar-config.h"
diff --git a/calendar/gui/e-week-view-config.h b/calendar/gui/e-week-view-config.h
index bbf7c670e1..32f32b0d75 100644
--- a/calendar/gui/e-week-view-config.h
+++ b/calendar/gui/e-week-view-config.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author :
- *  JP Rosevear <jpr@ximian.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 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:
+ *		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
  */
 
 #ifndef _E_WEEK_VIEW_CONFIG_H_
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index 8787e7f760..1e56a5d8a5 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_WEEK_VIEW_EVENT_ITEM_H_
 #define _E_WEEK_VIEW_EVENT_ITEM_H_
 
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 32bb43d4b8..6599a3f7db 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -1,29 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Lays out events for the Week & Month views of the calendar. It is also
+ * used for printing.
  *
  * 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
- */
-
-/*
- * Lays out events for the Week & Month views of the calendar. It is also
- * used for printing.
+ * 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>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include <config.h>
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index aa83acdad5..d531435d11 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_WEEK_VIEW_LAYOUT_H_
 #define _E_WEEK_VIEW_LAYOUT_H_
 
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index ef419d0cbd..be69282a4a 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -1,29 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * EWeekViewMainItem - displays the background grid and dates for the Week and
+ * Month calendar views.
  *
  * 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
- */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
+ * 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>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index aee068a8e4..818ba87d0f 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_WEEK_VIEW_MAIN_ITEM_H_
 #define _E_WEEK_VIEW_MAIN_ITEM_H_
 
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index a2623a2068..d483473810 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -1,29 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
+ * the Month calendar view.
  *
  * 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
- */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
+ * 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>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 891c9b2c9d..89f33de6ef 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_WEEK_VIEW_TITLES_ITEM_H_
 #define _E_WEEK_VIEW_TITLES_ITEM_H_
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index aa459f817d..67dc931c68 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -401,25 +401,21 @@ model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data
 }
 
 static void
-model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data)
+model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 {
 	EWeekView *week_view = E_WEEK_VIEW (user_data);
-	int i;
+	GSList *l, *list = data;
 
 	/* FIXME Stop editing? */
 	if (!E_CALENDAR_VIEW (week_view)->in_focus) {
 		return;
 	}
 
-	for (i = row + count; i > row; i--) {
+	for (l = list; l != NULL; l = g_slist_next (l)) {
 		gint event_num;
 		const char *uid;
 		char *rid = NULL;
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), i - 1);
-		if (!comp_data)
-			continue;
+		ECalModelComponent *comp_data = l->data;
 
 		uid = icalcomponent_get_uid (comp_data->icalcomp);
 		if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
@@ -626,8 +622,8 @@ init_model (EWeekView *week_view, ECalModel *model)
 			  G_CALLBACK (model_cell_changed_cb), week_view);
 	g_signal_connect (G_OBJECT (model), "model_rows_inserted",
 			  G_CALLBACK (model_rows_inserted_cb), week_view);
-	g_signal_connect (G_OBJECT (model), "model_rows_deleted",
-			  G_CALLBACK (model_rows_deleted_cb), week_view);
+	g_signal_connect (G_OBJECT (model), "comps_deleted",
+			  G_CALLBACK (model_comps_deleted_cb), week_view);
 
 }
 
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
index 633bda6de7..c1f51632f8 100644
--- a/calendar/gui/goto.h
+++ b/calendar/gui/goto.h
@@ -1,24 +1,27 @@
-/* Evolution calendar - Go To Date dialog
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Go To Date 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 <federico@ximian.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 1998 Red Hat, Inc.
  *
- * 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 GOTO_DIALOG_H
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index 1cc27c38fe..ccfb0254e8 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Jesse Pavel <jpavel@ximian.com>
+/*
+ * Evolution calendar - Control for displaying iTIP mail messages
  *
  * 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:
+ *		Jesse Pavel <jpavel@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/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h
index 0d8fefe045..7c2033656c 100644
--- a/calendar/gui/itip-bonobo-control.h
+++ b/calendar/gui/itip-bonobo-control.h
@@ -1,24 +1,27 @@
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Jesse Pavel <jpavel@ximian.com>
- *   JP Rosevear <jpr@ximian.com>
+/*
  *
+ * Evolution calendar - Control for displaying iTIP mail messages
+ * 
  * 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:
+ *		Jesse Pavel <jpavel@ximian.com>
+ *		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.
  */
 
 #ifndef __ITIP_CONTROL_FACTORY_H__
diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h
index edf56f1461..b3995628ab 100644
--- a/calendar/gui/memos-component.h
+++ b/calendar/gui/memos-component.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* memos-component.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *      Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _MEMOS_COMPONENT_H_
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index d6a80a0067..052ac1fb49 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -1,25 +1,26 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* memos-control.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.
+ * 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.
+ * 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: Damon Chaplin <damon@ximian.com>
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
  *	    Ettore Perazzoli
- *          Nathan Owens <pianocomp81@yahoo.com>
+ *      Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/memos-control.h b/calendar/gui/memos-control.h
index b9b20fad32..5861ae50e5 100644
--- a/calendar/gui/memos-control.h
+++ b/calendar/gui/memos-control.h
@@ -1,25 +1,26 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* memos-control.h
- *
- * 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.
+ * 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.
+ * 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: Federico Mena Quintero <federico@ximian.com>
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+ *      Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _MEMOS_CONTROL_H_
diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h
index 1961c41eaa..4073e31fac 100644
--- a/calendar/gui/migration.h
+++ b/calendar/gui/migration.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.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.
+ * 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.
+ * 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.
  *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef MIGRATION_H
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 8057909e1c..acae5d8e1e 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -1,22 +1,25 @@
-/* Evolution calendar - Miscellaneous utility functions
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Miscellaneous utility functions
  *
  * 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.
+ * 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
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
index fb78374e58..3e0fe04cb4 100644
--- a/calendar/gui/misc.h
+++ b/calendar/gui/misc.h
@@ -1,22 +1,26 @@
-/* Evolution calendar - Miscellaneous utility functions
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Miscellaneous utility functions
  *
  * 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.
+ * 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.
  */
 
 #ifndef MISC_H
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 9caf4fbdf9..e68ec84a84 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2744,11 +2744,16 @@ print_title (GtkPrintContext *context, const gchar *text, gdouble page_width)
 	pango_font_description_free (desc);
 }
 
+struct print_opts {
+  EPrintable *printable;
+  const gchar *print_header;
+};
+
 static void
 print_table_draw_page (GtkPrintOperation *operation,
                        GtkPrintContext *context,
                        gint page_nr,
-                       EPrintable *printable)
+                       struct print_opts *opts)
 {
 	GtkPageSetup *setup;
 	gdouble width;
@@ -2759,13 +2764,15 @@ print_table_draw_page (GtkPrintOperation *operation,
 
 	do {
 		/* TODO Allow the user to customize the title. */
-		print_title (context, _("Upcoming Appointments"), width);
+		print_title (context, opts->print_header, width);
 
-		if (e_printable_data_left (printable))
+		if (e_printable_data_left (opts->printable))
 			e_printable_print_page (
-				printable, context, width, 24, TRUE);
+				opts->printable, context, width, 24, TRUE);
 
-	} while (e_printable_data_left (printable));
+	} while (e_printable_data_left (opts->printable));
+
+	g_free (opts);
 }
 
 void
@@ -2774,6 +2781,7 @@ print_table (ETable *table, const gchar *dialog_title,
 {
 	GtkPrintOperation *operation;
 	EPrintable *printable;
+	struct print_opts *opts;
 
 	printable = e_table_get_printable (table);
 	g_object_ref_sink (printable);
@@ -2782,9 +2790,13 @@ print_table (ETable *table, const gchar *dialog_title,
 	operation = e_print_operation_new ();
 	gtk_print_operation_set_n_pages (operation, 1);
 
+	opts = g_malloc (sizeof (struct print_opts));
+	opts->printable = printable;
+	opts->print_header = print_header;
+
 	g_signal_connect (
 		operation, "draw_page",
-		G_CALLBACK (print_table_draw_page), printable);
+		G_CALLBACK (print_table_draw_page), opts);
 
 	gtk_print_operation_run (operation, action, NULL, NULL);
 
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
index ae58d244a9..35454f9224 100644
--- a/calendar/gui/print.h
+++ b/calendar/gui/print.h
@@ -1,22 +1,25 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		Michael Zucchi <notzed@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.
  */
 
 #ifndef PRINT_H
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index e3732df053..9000060183 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -1,22 +1,27 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Utilities for tagging ECalendar widgets
  *
  * 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:
+ *		Damon Chaplin <damon@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.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
index d2cf0109a7..847aab12ea 100644
--- a/calendar/gui/tag-calendar.h
+++ b/calendar/gui/tag-calendar.h
@@ -1,22 +1,27 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
+ * Evolution calendar - Utilities for tagging ECalendar widgets
  *
  * 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:
+ *		Damon Chaplin <damon@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.
  */
 
 #ifndef TAG_CALENDAR_H
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index d39330d850..cbb25d793e 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-component.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _TASKS_COMPONENT_H_
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
index 84bcdadde6..a41783fe9a 100644
--- a/calendar/gui/tasks-control.h
+++ b/calendar/gui/tasks-control.h
@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.h
- *
- * 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.
+ * 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.
+ * 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: Federico Mena Quintero <federico@ximian.com>
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _TASKS_CONTROL_H_
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 3794ae2ef0..3140d69df5 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Week day picker 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:
+ *		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
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
index 54e4ad8b89..c730ebbf4b 100644
--- a/calendar/gui/weekday-picker.h
+++ b/calendar/gui/weekday-picker.h
@@ -1,21 +1,24 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
  */
 
 #ifndef WEEKDAY_PICKER_H
diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h
index 32f55cf0c6..9a3facc4d7 100644
--- a/calendar/importers/evolution-calendar-importer.h
+++ b/calendar/importers/evolution-calendar-importer.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.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 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.
+ * 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:
+ *		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.
  */
 
 #ifndef EVOLUTION_CALENDAR_IMPORTER_H
diff --git a/calendar/importers/main.c b/calendar/importers/main.c
index 6268e0b7d5..b1a3a20501 100644
--- a/calendar/importers/main.c
+++ b/calendar/importers/main.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution calendar importer component
  *
  * 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.
+ * 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:
+ *		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/zones.h b/calendar/zones.h
index 5b482255f0..ad485eb993 100644
--- a/calendar/zones.h
+++ b/calendar/zones.h
@@ -1,4 +1,23 @@
 /*
+ *
+ * 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.
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 32c38183f4..7afbe38079 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,41 @@
+2008-09-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #551548
+
+	* e-msg-composer.c:
+	* e-composer-action.c:
+	Remove pointless SMIME_SUPPORTED check, which was hard-coded to 1.
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-msg-composer.h:
+
+2008-09-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #545661
+
+	* e-composer-autosave.c: (e_composer_autosave_snapshot):
+	Do not mark composer as not changed, that's not truth possibly.
+	* e-msg-composer.h: (e_msg_composer_is_exiting):
+	* e-msg-composer.c: (e_msg_composer_is_exiting):
+	* e-composer-actions.c: (action_close_cb): Skip question
+	for "not-saved" only when not changed or application is exiting.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-composer-common.h:
+	* e-composer-from-header.c:
+	* e-composer-from-header.h:
+	* e-composer-header.c:
+	* e-composer-name-header.c:
+	* e-composer-post-header.c:
+	* e-composer-post-header.h:
+	* e-composer-text-header.h:
+
 2008-08-18  Baptiste Mille-Mathias  <bmm80@free.fr>
 
 	** Fixes bug #546867
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 07ec555452..3146d9614b 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -127,9 +127,8 @@ action_close_cb (GtkAction *action,
 	editor = GTKHTML_EDITOR (composer);
 	widget = GTK_WIDGET (composer);
 
-	if (!gtkhtml_editor_get_changed (editor) &&
-		e_composer_autosave_get_saved (composer)) {
-
+	if (!gtkhtml_editor_get_changed (editor) ||
+	    e_msg_composer_is_exiting (composer)) {
 		gtk_widget_destroy (widget);
 		return;
 	}
@@ -699,7 +698,7 @@ e_composer_actions_init (EMsgComposer *composer)
 		G_OBJECT (ACTION (ATTACH)),
 		"short-label", _("Attach"), NULL);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	visible = TRUE;
 #else
 	visible = FALSE;
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index dca539b89b..298184b60f 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -324,7 +324,9 @@ e_composer_autosave_snapshot (EMsgComposer *composer)
 	}
 
 	/* Snapshot was successful; set various flags. */
-	gtkhtml_editor_set_changed (editor, FALSE);
+	/* do not touch "changed" flag, this is only autosave,
+	   which doesn't mean it's saved permanently */
+
 	e_composer_autosave_set_saved (composer, TRUE);
 
 	camel_object_unref (message);
diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h
index 73e317a33d..832b38001f 100644
--- a/composer/e-composer-common.h
+++ b/composer/e-composer-common.h
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_COMPOSER_COMMON
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index b1310230f0..68b6c0c14a 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include "e-composer-from-header.h"
diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h
index 15a945785c..74fda9ae03 100644
--- a/composer/e-composer-from-header.h
+++ b/composer/e-composer-from-header.h
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_COMPOSER_FROM_HEADER_H
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index bc88117d31..8cbcf64f1f 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include "e-composer-header.h"
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 829fc5b22b..70a126b1e0 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include "e-composer-name-header.h"
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index 4eb54dfb55..bb971d53bf 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include "e-composer-post-header.h"
diff --git a/composer/e-composer-post-header.h b/composer/e-composer-post-header.h
index f76995da7c..666d043df2 100644
--- a/composer/e-composer-post-header.h
+++ b/composer/e-composer-post-header.h
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_COMPOSER_POST_HEADER_H
diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h
index 02fef2fb2d..c0c4708595 100644
--- a/composer/e-composer-text-header.h
+++ b/composer/e-composer-text-header.h
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_COMPOSER_TEXT_HEADER_H
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index dd3a228fb9..11b64a7ff9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -41,8 +41,6 @@
 #include <config.h>
 #endif
 
-#define SMIME_SUPPORTED 1
-
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -87,7 +85,7 @@
 #include <camel/camel-multipart-encrypted.h>
 #include <camel/camel-string-utils.h>
 #include <camel/camel-cipher-context.h>
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 #include <camel/camel-smime-context.h>
 #endif
 
@@ -757,7 +755,7 @@ build_message (EMsgComposer *composer,
 	action = GTK_TOGGLE_ACTION (ACTION (PGP_ENCRYPT));
 	pgp_encrypt = gtk_toggle_action_get_active (action);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	action = GTK_TOGGLE_ACTION (ACTION (SMIME_SIGN));
 	smime_sign = gtk_toggle_action_get_active (action);
 
@@ -853,7 +851,7 @@ build_message (EMsgComposer *composer,
 		camel_object_unref (part);
 	}
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	if (smime_sign || smime_encrypt) {
 		CamelInternetAddress *from = NULL;
 		CamelCipherContext *cipher;
@@ -941,7 +939,7 @@ build_message (EMsgComposer *composer,
 		camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
 	camel_object_unref (current);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 skip_content:
 #endif
 	if (recipients) {
@@ -4595,6 +4593,14 @@ e_msg_composer_set_enable_autosave (EMsgComposer *composer,
 }
 
 gboolean
+e_msg_composer_is_exiting (EMsgComposer *composer)
+{
+	g_return_val_if_fail (composer != NULL, FALSE);
+
+	return composer->priv->application_exiting;
+}
+
+gboolean
 e_msg_composer_request_close_all (void)
 {
 	GSList *iter, *next;
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 8236c9cda0..f0ef682999 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.h
- *
- * 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
- * published by the Free Software Foundation; either version 2 of the
- * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_MSG_COMPOSER_H
@@ -156,6 +155,8 @@ struct _EAttachmentBar *
 		e_msg_composer_get_attachment_bar
 						(EMsgComposer *composer);
 
+gboolean	e_msg_composer_is_exiting (EMsgComposer *composer);
+
 G_END_DECLS
 
 #endif /* E_MSG_COMPOSER_H */
diff --git a/configure.in b/configure.in
index bc76b77ae4..20ceb7636e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.23.90, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.23.92, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 
 # Some requirements have versioned package names
@@ -13,7 +13,7 @@ GTKHTML_PACKAGE=3.14
 # Required Packages
 m4_define([glib_minimum_version], [2.16.0])
 m4_define([gtk_minimum_version], [2.12.0])
-m4_define([eds_minimum_version], [2.23.90])
+m4_define([eds_minimum_version], [2.23.91])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([libbonoboui_minimum_version], [2.4.2])
@@ -259,8 +259,8 @@ if test $have_iconv = yes; then
 
 int main (int argc, char **argv)
 {
-        const char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
-        const char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
+        char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
+        char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
         char *transbuf = malloc (10), *trans = transbuf;
         iconv_t cd;
         size_t jp_len = strlen (jp), utf8_len = 10;
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index b227df58fe..520505af3a 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,84 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-gui-utils.c:
+	* e-html-utils.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-categories-config.c:
+	* e-config-listener.c:
+	* e-config-listener.h:
+	* e-config.c:
+	* e-corba-utils.c:
+	* e-corba-utils.h:
+	* e-cursor.c:
+	* e-dialog-utils.h:
+	* e-dialog-widgets.c:
+	* e-dialog-widgets.h:
+	* e-error.h:
+	* e-fsutils.h:
+	* e-gui-utils.h:
+	* e-html-utils.h:
+	* e-import.c:
+	* e-logger.h:
+	* e-menu.c:
+	* e-mktemp.c:
+	* e-mktemp.h:
+	* e-pilot-map.c:
+	* e-pilot-map.h:
+	* e-pilot-util.c:
+	* e-plugin.h:
+	* e-popup.c:
+	* e-profile-event.c:
+	* e-request.c:
+	* e-request.h:
+	* e-sorter-array.h:
+	* e-sorter.c:
+	* e-text-event-processor-emacs-like.c:
+	* e-text-event-processor.c:
+	* e-text-event-processor.h:
+	* e-util-labels.c:
+	* e-xml-utils.h:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-bconf-map.c:
+	* e-bconf-map.h:
+	* e-bit-array.c:
+	* e-bit-array.h:
+	* e-categories-config.h:
+	* e-config.h:
+	* e-cursor.h:
+	* e-event.h:
+	* e-folder-map.c:
+	* e-folder-map.h:
+	* e-fsutils.c:
+	* e-icon-factory.h:
+	* e-import.h:
+	* e-logger.c:
+	* e-menu.h:
+	* e-pilot-util.h:
+	* e-popup.h:
+	* e-print.c:
+	* e-print.h:
+	* e-profile-event.h:
+	* e-signature-list.c:
+	* e-signature-list.h:
+	* e-signature.c:
+	* e-signature.h:
+	* e-sorter.h:
+	* e-text-event-processor-emacs-like.h:
+	* e-text-event-processor-types.h:
+	* e-util-labels.h:
+	* e-util-private.h:
+	* e-win32-reloc.c:
+
 2008-08-18  Bharath Acharya  <abharath@novell.com>
 
 	* e-icon-factory.c: (e_icon_factory_get_icon_filename),
diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
index 785e5033f3..7d874b896b 100644
--- a/e-util/e-bconf-map.c
+++ b/e-util/e-bconf-map.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index 3523ccc906..f47368de78 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __E_BCONF_MAP_H__
 #define __E_BCONF_MAP_H__
 
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index a8d02d6b17..fdd3d3fe01 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-bit-array.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index a939cd60b5..ea8ed89797 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-bit-array.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_BIT_ARRAY_H_
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 720bc6c58e..875b67974f 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -1,11 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Categories configuration.
+ * 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.
  *
- * Author:
- *   Rodrigo Moya <rodrigo@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.
+ *
+ * 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:
+ *		Rodrigo Moya <rodrigo@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <string.h>
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index daa3efc18c..9eff161375 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -1,11 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ *
  * Categories configuration.
  *
- * Author:
- *   Rodrigo Moya <rodrigo@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.
+ *
+ * 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:
+ *		Rodrigo Moya <rodrigo@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __E_CATEGORIES_CONFIG_H__
diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c
index e1b565c8cf..83fb305347 100644
--- a/e-util/e-config-listener.c
+++ b/e-util/e-config-listener.c
@@ -1,11 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Configuration component listener
  *
- * Author:
- *   Rodrigo Moya <rodrigo@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.
+ *
+ * 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:
+ *		Rodrigo Moya <rodrigo@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <string.h>
diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h
index 2535c77f5f..655bc3c1ec 100644
--- a/e-util/e-config-listener.h
+++ b/e-util/e-config-listener.h
@@ -1,11 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Configuration component listener
  *
- * Author:
- *   Rodrigo Moya <rodrigo@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.
+ *
+ * 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:
+ *		Rodrigo Moya <rodrigo@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __E_CONFIG_LISTENER_H__
diff --git a/e-util/e-config.c b/e-util/e-config.c
index b10a11fd20..d320bcd7af 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-config.h b/e-util/e-config.h
index b1cee1379c..2eeb663d59 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
index 2638d20f4f..0288602a7e 100644
--- a/e-util/e-corba-utils.c
+++ b/e-util/e-corba-utils.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c
-*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Ettore Perazzoli <ettore@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Ettore Perazzoli <ettore@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 library; 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/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 259d86e8a5..979237929d 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-corba-utils.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Ettore Perazzoli <ettore@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Ettore Perazzoli <ettore@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef E_CORBA_UTILS_H
diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c
index a312e6e72c..97e3989f9b 100644
--- a/e-util/e-cursor.c
+++ b/e-util/e-cursor.c
@@ -1,21 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Authors: Srinivasa Ragavan <sragavan@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.
  *
- *  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 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.
+ * Authors:
+ *		Srinivasa Ragavan <sragavan@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/e-util/e-cursor.h b/e-util/e-cursor.h
index 562d8e873d..9e1a228316 100644
--- a/e-util/e-cursor.h
+++ b/e-util/e-cursor.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
+/*
  *
- *  Authors: Srinivasa Ragavan <sragavan@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 version 2 of the GNU General Public
- *  License 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 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:
+ *		Srinivasa Ragavan <sragavan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index 3f5abbee8c..9d594122e2 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dialog-utils.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_DIALOG_UTILS_H
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index ad74ad8cc7..d3987b07bc 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -1,23 +1,25 @@
-/* Evolution internal utilities - Glade dialog widget utilities
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution internal utilities - Glade dialog widget utilities
  *
  * 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.
+ * 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.
  */
 
 #include <config.h>
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index 6277d0d83f..39f4b47b39 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -1,23 +1,25 @@
-/* Evolution internal utilities - Glade dialog widget utilities
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution internal utilities - Glade dialog widget utilities
  *
  * 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.
+ * 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.
  */
 
 #ifndef E_DIALOG_WIDGETS_H
diff --git a/e-util/e-error.h b/e-util/e-error.h
index 0f4a5b2562..321957839f 100644
--- a/e-util/e-error.h
+++ b/e-util/e-error.h
@@ -1,21 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Authors: Michael Zucchi <notzed@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.
  *
- *  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 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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.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/e-util/e-event.h b/e-util/e-event.h
index 4be869b62d..074d8deed2 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -1,22 +1,23 @@
-/* -*- Mode: 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.
  *
- *  Authors: Michel Zucchi <notzed@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.
  *
- *  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:
+ *		Michel Zucchi <notzed@ximian.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/e-util/e-folder-map.c b/e-util/e-folder-map.c
index 885334d4a4..3475d61a70 100644
--- a/e-util/e-folder-map.c
+++ b/e-util/e-folder-map.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h
index 269936cbfd..e61dc140ff 100644
--- a/e-util/e-folder-map.h
+++ b/e-util/e-folder-map.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __E_FOLDER_MAP_H__
 #define __E_FOLDER_MAP_H__
 
diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c
index 899ca2bb56..28b434f291 100644
--- a/e-util/e-fsutils.c
+++ b/e-util/e-fsutils.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@ximian.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 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/>  
  *
- * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h
index cfa814ad18..91ad9b9c4a 100644
--- a/e-util/e-fsutils.h
+++ b/e-util/e-fsutils.h
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@ximian.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 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index cff2b500b0..37d3fc9c48 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -1,16 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * GUI utility functions
  *
+ * 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:
- *   Miguel de Icaza (miguel@ximian.com)
- *   Chris Toshok (toshok@ximian.com)
+ *		Miguel de Icaza (miguel@ximian.com)
+ *		Chris Toshok (toshok@ximian.com)
  *
- * Copyright (C) 1999 Miguel de Icaza
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h
index bbeefa9c61..d7552d5379 100644
--- a/e-util/e-gui-utils.h
+++ b/e-util/e-gui-utils.h
@@ -1,3 +1,24 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef E_GUI_UTILS_H
 #define E_GUI_UTILS_H
 
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index acec98998b..d634f5f6b0 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Dan Winship <danw@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Dan Winship <danw@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #include <ctype.h>
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index e0a6f4c711..fa70e55f7f 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Dan Winship <danw@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Dan Winship <danw@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __E_HTML_UTILS__
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index 9cecbbd116..f8d1fc2fc7 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-icon-factory.h - Icon factory for the Evolution shell.
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_ICON_FACTORY_H_
diff --git a/e-util/e-import.c b/e-util/e-import.c
index da4fffb346..9e8c8a3fa7 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 9fab14361f..9a9994150b 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 9890cbd941..0c95520fe8 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Srinivasa Ragavan <sragavan@gnome.org>
+ * 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.
  *
- *  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:
+ *		Srinivasa Ragavan <sragavan@gnome.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-logger.h b/e-util/e-logger.h
index 1b2b0ba8da..f7dfd8017e 100644
--- a/e-util/e-logger.h
+++ b/e-util/e-logger.h
@@ -1,21 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Authors: Srinivasa Ragavan <sragavan@gnome.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.
  *
+ * 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:
+ *		Srinivasa Ragavan <sragavan@gnome.org>
  *
- *  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/e-util/e-menu.c b/e-util/e-menu.c
index ed5aaa7296..cfbb215712 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index b71bb431d7..e6ee11f304 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 6b651e37a5..80bce49cce 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@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/e-util/e-mktemp.h b/e-util/e-mktemp.h
index 7378b7c04d..48e72235ee 100644
--- a/e-util/e-mktemp.h
+++ b/e-util/e-mktemp.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@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.
  */
 
 
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 3feb542326..877d60ac41 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution Conduits - Pilot Map routines
  *
  * 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.
+ * 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:
+ *		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 <string.h>
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
index 3ceed5f885..d49d62cbb2 100644
--- a/e-util/e-pilot-map.h
+++ b/e-util/e-pilot-map.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution Conduits - Pilot Map routines
  *
  * 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.
+ * 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:
+ *		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.
  */
 
 #ifndef E_PILOT_MAP_H
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index f771929e26..2273064ac3 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution Conduits - Pilot Map routines
  *
  * 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.
+ * 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:
+ *		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 <string.h>
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
index 447aa74450..8559918eb3 100644
--- a/e-util/e-pilot-util.h
+++ b/e-util/e-pilot-util.h
@@ -1,23 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@ximian.com>
+ *Evolution Conduits - Pilot Map routines
  *
  * 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.
+ * 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:
+ *		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 <libedataserver/e-source-list.h>
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index f315c25836..4994861d6f 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -1,3 +1,23 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef _E_PLUGIN_H
 #define _E_PLUGIN_H
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index 1d2e808bc3..41428c3c5a 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 6c7ad0782c..877f5dfce4 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-print.c b/e-util/e-print.c
index a50a3ef90c..4cc3b8155e 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -1,22 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-print.c - Uniform print setting/dialog routines for Evolution
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@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.
+ * 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:
+ *		JP Rosevear <jpr@novell.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 "e-print.h"
diff --git a/e-util/e-print.h b/e-util/e-print.h
index ea87ff246c..93cbe2d10d 100644
--- a/e-util/e-print.h
+++ b/e-util/e-print.h
@@ -1,22 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-print.c - Uniform print setting/dialog routines for Evolution
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear <jpr@novell.com>
+ * Uniform print setting/dialog routines for Evolution
  *
  * 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:
+ *		JP Rosevear <jpr@novell.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 __E_PRINT__
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index eb3cef67ec..4fdd5d958a 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h
index 213a060eb0..b7ac21adc1 100644
--- a/e-util/e-profile-event.h
+++ b/e-util/e-profile-event.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-request.c b/e-util/e-request.c
index f384da9a59..1977b9b0fe 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-request.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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/e-util/e-request.h b/e-util/e-request.h
index 96352e4a90..a84da2941a 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-request.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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_REQUEST_H
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index cfa09ac963..898bff9057 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index d35aff3703..4edd48a7dd 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __E_SIGNATURE_LIST__
 #define __E_SIGNATURE_LIST__
 
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 24f69ea45b..2d0df59579 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/e-util/e-signature.h b/e-util/e-signature.h
index d077ff5b43..cc5309c7c1 100644
--- a/e-util/e-signature.h
+++ b/e-util/e-signature.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __E_SIGNATURE_H__
 #define __E_SIGNATURE_H__
 
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index 23356da672..f31d9b06cc 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-sorter-array.h
- * 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)
+ *
  */
 
 #ifndef _E_SORTER_ARRAY_H_
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 1ac624bc6e..6176b58715 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-sorter.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>
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
index 7282a1b4b9..365d66a461 100644
--- a/e-util/e-sorter.h
+++ b/e-util/e-sorter.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-sorter.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_SORTER_H_
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 52c3cf5b0c..60da48d375 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-event-processor-emacs-like.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>
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index c478566db3..87e3fa797d 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-event-processor-emacs-like.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index da0092eb65..9caf2abe6d 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-event-processor-types.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TEXT_EVENT_PROCESSOR_TYPES_H__
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index cec0d45f9b..e381e86342 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-event-processor.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>
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index c894fda59d..1f88407823 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-event-processor.h
- * 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)
+ *
  */
 
 #ifndef __E_TEXT_EVENT_PROCESSOR_H__
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index 0850b92745..359157a25f 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*  e-util-labels.c
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
- *  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 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.
+ * 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; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
+ * Authors:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <gtk/gtk.h>
diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h
index 992a97062c..a9dd5613bc 100644
--- a/e-util/e-util-labels.h
+++ b/e-util/e-util-labels.h
@@ -1,22 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*  e-util-labels.h
+/*
  *
- *  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.
  *
- *  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,
+ * 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 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 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)
  *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
  */
 
 #ifndef _E_UTIL_LABELS_H
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index c4b2749499..cca11e2477 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-util-private.h: Private functions for Evolution (not just for libeutil)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Tor Lillqvist <tml@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.
+ * 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:
+ *		Tor Lillqvist <tml@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_UTIL_PRIVATE_H_
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index bffc099ec6..1c8c5d3f18 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-win32-reloc.c: Support relocatable installation on Win32
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Tor Lillqvist <tml@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.
+ * 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:
+ *		Tor Lillqvist <tml@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index bc0df95b1b..59d11c63fe 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-xml-utils.h
- * 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)
+ *
  */
 
 #ifndef __E_XML_UTILS__
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 145ae2c029..740a192178 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,31 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* filter-code.c:
+	* filter-code.h:
+	* filter-colour.c:
+	* filter-colour.h:
+	* filter-datespec.h:
+	* filter-element.h:
+	* filter-file.c:
+	* filter-input.c:
+	* filter-input.h:
+	* filter-option.h:
+	* filter-part.h:
+	* filter-rule.h:
+	* rule-context.c:
+	* rule-editor.h:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* filter-file.h:
+	* filter-label.c:
+	* filter-label.h:
+	* rule-context.h:
+
 2008-07-30  Takao Fujiwara  <takao.fujiwara@sun.com>
 
 	Reviewed by Srinivasa Ragavan <sragavan@novell.com>
diff --git a/filter/filter-code.c b/filter/filter-code.c
index 403ba5bc16..2ca98313b6 100644
--- a/filter/filter-code.c
+++ b/filter/filter-code.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/filter/filter-code.h b/filter/filter-code.h
index e3d7f35c78..3ea5559a2c 100644
--- a/filter/filter-code.h
+++ b/filter/filter-code.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _FILTER_CODE_H
 #define _FILTER_CODE_H
 
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index dbe38e0b41..0d0388de94 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/filter/filter-colour.h b/filter/filter-colour.h
index afb7ae1c39..1de46ab70b 100644
--- a/filter/filter-colour.h
+++ b/filter/filter-colour.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
index 03734284e7..29c4f872b1 100644
--- a/filter/filter-datespec.h
+++ b/filter/filter-datespec.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _FILTER_DATESPEC_H
 #define _FILTER_DATESPEC_H
 
diff --git a/filter/filter-element.h b/filter/filter-element.h
index 5c7fdfe01f..6124b364a2 100644
--- a/filter/filter-element.h
+++ b/filter/filter-element.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _FILTER_ELEMENT_H
diff --git a/filter/filter-file.c b/filter/filter-file.c
index c9b95d0f6d..4126c4b937 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/filter/filter-file.h b/filter/filter-file.h
index 35a4474ddd..81e6b8c1cd 100644
--- a/filter/filter-file.h
+++ b/filter/filter-file.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __FILTER_FILE_H__
 #define __FILTER_FILE_H__
 
diff --git a/filter/filter-input.c b/filter/filter-input.c
index bb87f4f7b5..be88a06835 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/filter/filter-input.h b/filter/filter-input.h
index 831808ee32..b6c6019052 100644
--- a/filter/filter-input.h
+++ b/filter/filter-input.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _FILTER_INPUT_H
 #define _FILTER_INPUT_H
 
diff --git a/filter/filter-label.c b/filter/filter-label.c
index 7291e36b4c..1d76300339 100644
--- a/filter/filter-label.c
+++ b/filter/filter-label.c
@@ -1,27 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	     Michael Zucchi <notzed@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/filter/filter-label.h b/filter/filter-label.h
index 9b1d73735b..5df24b8b0d 100644
--- a/filter/filter-label.h
+++ b/filter/filter-label.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __FILTER_LABEL__
 #define __FILTER_LABEL__
 
diff --git a/filter/filter-option.h b/filter/filter-option.h
index 9d4b874110..8cc6c052d4 100644
--- a/filter/filter-option.h
+++ b/filter/filter-option.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _FILTER_OPTION_H
 #define _FILTER_OPTION_H
 
diff --git a/filter/filter-part.h b/filter/filter-part.h
index bb6d59868e..6c83b1d734 100644
--- a/filter/filter-part.h
+++ b/filter/filter-part.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _FILTER_PART_H
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index c43b09916c..184c1270e5 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _FILTER_RULE_H
diff --git a/filter/rule-context.c b/filter/rule-context.c
index b41791a032..2a370fd2af 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/filter/rule-context.h b/filter/rule-context.h
index 104cf66c8a..f7a10df65f 100644
--- a/filter/rule-context.h
+++ b/filter/rule-context.h
@@ -1,26 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _RULE_CONTEXT_H
 #define _RULE_CONTEXT_H
 
diff --git a/filter/rule-editor.h b/filter/rule-editor.h
index 9bf9e034b3..4e675f839f 100644
--- a/filter/rule-editor.h
+++ b/filter/rule-editor.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _RULE_EDITOR_H
 #define _RULE_EDITOR_H
 
diff --git a/help/ChangeLog b/help/ChangeLog
index 45e464a2d7..ea58942c57 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,19 @@
+2008-08-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-08-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es/es.po: Updated Spanish translation
+
+2008-08-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-08-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
 2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	* C/evolution.xml:
diff --git a/help/es/es.po b/help/es/es.po
index 873ce0ceeb..d1893ceaa8 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.help.HEAD\n"
-"POT-Creation-Date: 2008-08-13 19:08+0000\n"
-"PO-Revision-Date: 2008-08-14 15:09+0200\n"
+"POT-Creation-Date: 2008-08-20 17:24+0000\n"
+"PO-Revision-Date: 2008-08-22 14:26+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"
-"Content-Type:  text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -22,10 +22,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:230(None)
-msgid ""
-"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr ""
-"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgid "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgstr "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -40,18 +38,14 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:418(None)
-msgid ""
-"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
-msgstr ""
-"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+msgid "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+msgstr "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:428(None)
-msgid ""
-"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
-msgstr ""
-"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+msgid "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -66,26 +60,20 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:512(None)
-msgid ""
-"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
-msgstr ""
-"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+msgid "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+msgstr "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:534(None)
-msgid ""
-"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
-msgstr ""
-"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+msgid "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+msgstr "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:584(None)
-msgid ""
-"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
-msgstr ""
-"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+msgid "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+msgstr "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -110,18 +98,14 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:678(None)
-msgid ""
-"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
-msgstr ""
-"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+msgid "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+msgstr "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:725(None)
-msgid ""
-"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
-msgstr ""
-"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+msgid "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+msgstr "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -137,8 +121,7 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:928(None)
 msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
-msgstr ""
-"@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
+msgstr "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -164,8 +147,7 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:980(None)
 msgid "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
-msgstr ""
-"@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
+msgstr "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -190,63 +172,42 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1009(None)
-msgid ""
-"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
-msgstr ""
-"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgstr "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1019(None)
-msgid ""
-"@@image: 'figures/evo_crash_recovery.png'; "
-"md5=6bfa921910f94e5845f893a6308169a6"
-msgstr ""
-"@@image: 'figures/evo_crash_recovery.png'; "
-"md5=6bfa921910f94e5845f893a6308169a6"
+#: C/evolution.xml:1177(None)
+msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+msgstr "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1183(None)
-msgid ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-msgstr ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1200(None)
+#: C/evolution.xml:1194(None)
 msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
-msgstr ""
-"@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
+msgstr "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1215(None)
-msgid ""
-"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
-msgstr ""
-"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+#: C/evolution.xml:1209(None)
+msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+msgstr "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1390(None)
-msgid ""
-"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
-msgstr ""
-"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+#: C/evolution.xml:1384(None)
+msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+msgstr "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1478(None)
-msgid ""
-"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
-msgstr ""
-"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+#: C/evolution.xml:1472(None)
+msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+msgstr "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1532(None)
+#: C/evolution.xml:1526(None)
 msgid ""
 "@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
@@ -256,7 +217,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1545(None)
+#: C/evolution.xml:1539(None)
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
 "md5=25f7db7cd7d310110847354c62702ecf"
@@ -266,7 +227,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1873(None)
+#: C/evolution.xml:1867(None)
 msgid ""
 "@@image: 'figures/evo_account_editor_a.png'; "
 "md5=39b83104a4e6ecb9473cbb84121e6be3"
@@ -276,15 +237,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1913(None)
-msgid ""
-"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
-msgstr ""
-"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+#: C/evolution.xml:1907(None)
+msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+msgstr "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2354(None)
+#: C/evolution.xml:2348(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -294,15 +253,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2381(None)
-msgid ""
-"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
-msgstr ""
-"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+#: C/evolution.xml:2375(None)
+msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+msgstr "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2532(None)
+#: C/evolution.xml:2526(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -312,7 +269,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2549(None)
+#: C/evolution.xml:2543(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -322,7 +279,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2552(None)
+#: C/evolution.xml:2546(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -332,46 +289,37 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2715(None)
-msgid ""
-"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
-msgstr ""
-"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+#: C/evolution.xml:2709(None)
+msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+msgstr "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2745(None)
-msgid ""
-"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
-msgstr ""
-"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+#: C/evolution.xml:2739(None)
+msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+msgstr "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2751(None)
-msgid ""
-"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
-msgstr ""
-"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+#: C/evolution.xml:2745(None)
+msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+msgstr "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2778(None)
-msgid ""
-"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
-msgstr ""
-"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+#: C/evolution.xml:2772(None)
+msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+msgstr "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3026(None)
+#: C/evolution.xml:3020(None)
 msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
-msgstr ""
-"@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
+msgstr "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3117(None)
+#: C/evolution.xml:3111(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -381,7 +329,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3210(None)
+#: C/evolution.xml:3204(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -391,45 +339,37 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3248(None)
-msgid ""
-"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
-msgstr ""
-"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+#: C/evolution.xml:3242(None)
+msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+msgstr "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3504(None)
-msgid ""
-"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
-msgstr ""
-"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+#: C/evolution.xml:3498(None)
+msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+msgstr "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3659(None)
+#: C/evolution.xml:3653(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 msgstr "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3682(None)
-msgid ""
-"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
-msgstr ""
-"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+#: C/evolution.xml:3676(None)
+msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+msgstr "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3714(None)
-msgid ""
-"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
-msgstr ""
-"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+#: C/evolution.xml:3708(None)
+msgid "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+msgstr "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3813(None)
+#: C/evolution.xml:3807(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -439,23 +379,21 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3881(None)
-msgid ""
-"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
-msgstr ""
-"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+#: C/evolution.xml:3875(None)
+msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+msgstr "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4077(None) C/evolution.xml:5352(None)
-#: C/evolution.xml:5738(None)
+#: C/evolution.xml:4071(None) C/evolution.xml:5346(None)
+#: C/evolution.xml:5732(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4173(None) C/evolution.xml:4487(None)
-#: C/evolution.xml:4725(None)
+#: C/evolution.xml:4167(None) C/evolution.xml:4481(None)
+#: C/evolution.xml:4719(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -465,30 +403,25 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4636(None)
+#: C/evolution.xml:4630(None)
 msgid "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
-msgstr ""
-"@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
+msgstr "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5032(None)
-msgid ""
-"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr ""
-"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: C/evolution.xml:5026(None)
+msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgstr "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5037(None)
-msgid ""
-"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
-msgstr ""
-"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+#: C/evolution.xml:5031(None)
+msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5044(None)
+#: C/evolution.xml:5038(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -498,23 +431,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5058(None)
-msgid ""
-"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
-msgstr ""
-"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+#: C/evolution.xml:5052(None)
+msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+msgstr "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5066(None)
-msgid ""
-"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
-msgstr ""
-"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+#: C/evolution.xml:5060(None)
+msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+msgstr "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5074(None)
+#: C/evolution.xml:5068(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -524,15 +453,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5107(None) C/evolution.xml:5344(None)
-msgid ""
-"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
-msgstr ""
-"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+#: C/evolution.xml:5101(None) C/evolution.xml:5338(None)
+msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+msgstr "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5149(None)
+#: C/evolution.xml:5143(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -542,13 +469,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5229(None)
+#: C/evolution.xml:5223(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5238(None)
+#: C/evolution.xml:5232(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -558,7 +485,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5273(None)
+#: C/evolution.xml:5267(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -568,15 +495,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5303(None)
-msgid ""
-"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
-msgstr ""
-" @@image: 'figures/filter-new-fig.png'; md5=8816e3bdeb3a4e936b7cf877f51c033c"
+#: C/evolution.xml:5297(None)
+msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+msgstr " @@image: 'figures/filter-new-fig.png'; md5=8816e3bdeb3a4e936b7cf877f51c033c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5632(None)
+#: C/evolution.xml:5626(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -586,7 +511,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5640(None)
+#: C/evolution.xml:5634(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -596,7 +521,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5653(None)
+#: C/evolution.xml:5647(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -606,24 +531,21 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5699(None)
-msgid ""
-"@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
-msgstr ""
-"@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+#: C/evolution.xml:5693(None)
+msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+msgstr "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5731(None)
-msgid ""
-"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+#: C/evolution.xml:5725(None)
+msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr ""
 " @@image: 'figures/evo_send_setup_a.png'; "
 "md5=956fcc991274e17196342801de1f55a4"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5802(None)
+#: C/evolution.xml:5796(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -633,46 +555,39 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5857(None)
-msgid ""
-"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
-msgstr ""
-"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+#: C/evolution.xml:5851(None)
+msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+msgstr "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5915(None)
-msgid ""
-"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
-msgstr ""
-"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+#: C/evolution.xml:5909(None)
+msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+msgstr "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6056(None)
-msgid ""
-"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+#: C/evolution.xml:6050(None)
+msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr ""
 " @@image: 'figures/evo_imapreceive_a.png'; "
 "md5=0b35b1fc693bb79aefe7dcfb5f354faf"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6079(None)
-msgid ""
-"@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
-msgstr ""
-"@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+#: C/evolution.xml:6073(None)
+msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+msgstr "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6088(None)
+#: C/evolution.xml:6082(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6231(None)
+#: C/evolution.xml:6225(None)
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
 "md5=4141df4bf4b2dc4e82a0bad514714194"
@@ -682,52 +597,41 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6340(None)
-msgid ""
-"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
-msgstr ""
-"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+#: C/evolution.xml:6334(None)
+msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6435(None)
-msgid ""
-"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
-msgstr ""
-"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+#: C/evolution.xml:6429(None)
+msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+msgstr "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6461(None)
-msgid ""
-"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-msgstr ""
-"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+#: C/evolution.xml:6455(None)
+msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgstr "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6506(None)
+#: C/evolution.xml:6500(None)
 msgid "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
-msgstr ""
-"@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
+msgstr "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6850(None)
-msgid ""
-"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
-msgstr ""
-"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+#: C/evolution.xml:6844(None)
+msgid "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+msgstr "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:7002(None)
-msgid ""
-"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
-msgstr ""
-"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+#: C/evolution.xml:6996(None)
+msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgstr "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
-#: C/evolution.xml:15(title) C/evolution.xml:7392(para)
+#: C/evolution.xml:15(title) C/evolution.xml:7386(para)
 msgid "Evolution 2.22 User Guide"
 msgstr "Guía de usuario de Evolution 2.22"
 
@@ -799,8 +703,8 @@ msgstr ""
 "Una guía de usuario para Evolution que explica como usar sus características "
 "de correo, calendario, libreta de direcciones y listas de tareas."
 
-#: C/evolution.xml:76(productname) C/evolution.xml:5536(para)
-#: C/evolution.xml:7201(glossterm)
+#: C/evolution.xml:76(productname) C/evolution.xml:5530(para)
+#: C/evolution.xml:7195(glossterm)
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -830,57 +734,57 @@ msgstr ""
 msgid "Getting Started"
 msgstr "Inicio"
 
-#: C/evolution.xml:91(link) C/evolution.xml:1113(title)
+#: C/evolution.xml:91(link) C/evolution.xml:1107(title)
 msgid "Sending and Receiving Email"
 msgstr "Enviar y recibir correo"
 
-#: C/evolution.xml:94(link) C/evolution.xml:2257(title)
+#: C/evolution.xml:94(link) C/evolution.xml:2251(title)
 msgid "Organizing Your Email"
 msgstr "Organizar su correo electrónico"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:97(link) C/evolution.xml:3151(title)
+#: C/evolution.xml:97(link) C/evolution.xml:3145(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Contactos de Evolution: la libreta de direcciones"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:100(link) C/evolution.xml:3560(title)
+#: C/evolution.xml:100(link) C/evolution.xml:3554(title)
 msgid "Evolution Calendar"
 msgstr "Calendario de Evolution"
 
-#: C/evolution.xml:103(link) C/evolution.xml:4853(title)
+#: C/evolution.xml:103(link) C/evolution.xml:4847(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Conexión a servidores Exchange"
 
-#: C/evolution.xml:106(link) C/evolution.xml:5408(title)
+#: C/evolution.xml:106(link) C/evolution.xml:5402(title)
 msgid "Connecting to GroupWise"
 msgstr "Conexión a GroupWise"
 
-#: C/evolution.xml:109(link) C/evolution.xml:6202(title)
+#: C/evolution.xml:109(link) C/evolution.xml:6196(title)
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: C/evolution.xml:112(link) C/evolution.xml:6864(title)
+#: C/evolution.xml:112(link) C/evolution.xml:6858(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Sincronización de Evolution con dispositivos portátiles"
 
-#: C/evolution.xml:115(link) C/evolution.xml:6921(title)
+#: C/evolution.xml:115(link) C/evolution.xml:6915(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migrar de Outlook a Evolution"
 
-#: C/evolution.xml:118(link) C/evolution.xml:6983(title)
+#: C/evolution.xml:118(link) C/evolution.xml:6977(title)
 msgid "Quick Reference"
 msgstr "Referencia rápida"
 
-#: C/evolution.xml:121(link) C/evolution.xml:7097(title)
+#: C/evolution.xml:121(link) C/evolution.xml:7091(title)
 msgid "Known Bugs and Limitations"
 msgstr "Fallos conocidos y limitaciones"
 
-#: C/evolution.xml:124(link) C/evolution.xml:7103(title)
+#: C/evolution.xml:124(link) C/evolution.xml:7097(title)
 msgid "Authors"
 msgstr "Autores"
 
-#: C/evolution.xml:127(link) C/evolution.xml:7162(title)
+#: C/evolution.xml:127(link) C/evolution.xml:7156(title)
 msgid "Glossary"
 msgstr "Glosario"
 
@@ -1088,16 +992,14 @@ msgstr ""
 "«Responder a»."
 
 #: C/evolution.xml:245(para)
-msgid ""
-"Use this field if you want replies to messages sent to a different address."
+msgid "Use this field if you want replies to messages sent to a different address."
 msgstr ""
 "Use este campo si quiere que las respuestas a los correos-e se envíen a una "
 "dirección diferente."
 
 #: C/evolution.xml:248(para)
 msgid "(Optional) Type your organization name in the Organization field."
-msgstr ""
-"(Opcional) Teclee el nombre de su organización en el campo «Organización»."
+msgstr "(Opcional) Teclee el nombre de su organización en el campo «Organización»."
 
 #: C/evolution.xml:249(para)
 msgid ""
@@ -1113,8 +1015,8 @@ msgstr ""
 #: C/evolution.xml:550(para) C/evolution.xml:565(para)
 #: C/evolution.xml:583(para) C/evolution.xml:604(para)
 #: C/evolution.xml:626(para) C/evolution.xml:649(para)
-#: C/evolution.xml:705(para) C/evolution.xml:2324(para)
-#: C/evolution.xml:2346(para)
+#: C/evolution.xml:705(para) C/evolution.xml:2318(para)
+#: C/evolution.xml:2340(para)
 msgid "Click Forward."
 msgstr "Pulse «Adelante»."
 
@@ -1140,8 +1042,7 @@ msgstr "Seleccione un tipo de servidor en la lista «Tipo de servidor»."
 
 #: C/evolution.xml:265(para)
 msgid "The following is a list of server types that are available:"
-msgstr ""
-"Lo siguiente es una lista de tipos de servidores que están disponibles:"
+msgstr "Lo siguiente es una lista de tipos de servidores que están disponibles:"
 
 #: C/evolution.xml:267(title)
 msgid "Novell GroupWise:"
@@ -1307,7 +1208,7 @@ msgstr ""
 "instrucciones de configuración, consulte <link linkend=\"bstgbqn\">Opciones "
 "de configuración locales</link>."
 
-#: C/evolution.xml:307(title) C/evolution.xml:5244(title)
+#: C/evolution.xml:307(title) C/evolution.xml:5238(title)
 msgid "None:"
 msgstr "Ninguno:"
 
@@ -1333,8 +1234,7 @@ msgstr ""
 
 #: C/evolution.xml:318(para) C/evolution.xml:681(para)
 msgid "Type the server name of your email server in the Server field."
-msgstr ""
-"Teclee el nombre del servidor de su correo electrónico en el campo «Servidor»."
+msgstr "Teclee el nombre del servidor de su correo electrónico en el campo «Servidor»."
 
 #: C/evolution.xml:319(para) C/evolution.xml:682(para)
 msgid ""
@@ -1368,27 +1268,27 @@ msgstr ""
 "su sistema para obtener más información."
 
 #: C/evolution.xml:330(para) C/evolution.xml:689(para)
-#: C/evolution.xml:5073(para)
+#: C/evolution.xml:5067(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr "Seleccione su tipo de autenticación en la lista «Autenticación»."
 
 #: C/evolution.xml:331(para) C/evolution.xml:690(para)
-#: C/evolution.xml:723(para) C/evolution.xml:1939(para)
-#: C/evolution.xml:2063(para) C/evolution.xml:2071(para)
-#: C/evolution.xml:2238(para) C/evolution.xml:3016(para)
-#: C/evolution.xml:3021(para) C/evolution.xml:3447(para)
-#: C/evolution.xml:3462(para) C/evolution.xml:3470(para)
-#: C/evolution.xml:3803(para) C/evolution.xml:3805(para)
-#: C/evolution.xml:3807(para) C/evolution.xml:3827(para)
-#: C/evolution.xml:3838(para) C/evolution.xml:3843(para)
-#: C/evolution.xml:3864(para) C/evolution.xml:3872(para)
-#: C/evolution.xml:3988(para) C/evolution.xml:3999(para)
-#: C/evolution.xml:4004(para) C/evolution.xml:4015(para)
-#: C/evolution.xml:4023(para) C/evolution.xml:4028(para)
-#: C/evolution.xml:4374(para) C/evolution.xml:4393(para)
-#: C/evolution.xml:4425(para) C/evolution.xml:4438(para)
-#: C/evolution.xml:4660(para) C/evolution.xml:6102(para)
-#: C/evolution.xml:6768(para) C/evolution.xml:6834(para)
+#: C/evolution.xml:723(para) C/evolution.xml:1933(para)
+#: C/evolution.xml:2057(para) C/evolution.xml:2065(para)
+#: C/evolution.xml:2232(para) C/evolution.xml:3010(para)
+#: C/evolution.xml:3015(para) C/evolution.xml:3441(para)
+#: C/evolution.xml:3456(para) C/evolution.xml:3464(para)
+#: C/evolution.xml:3797(para) C/evolution.xml:3799(para)
+#: C/evolution.xml:3801(para) C/evolution.xml:3821(para)
+#: C/evolution.xml:3832(para) C/evolution.xml:3837(para)
+#: C/evolution.xml:3858(para) C/evolution.xml:3866(para)
+#: C/evolution.xml:3982(para) C/evolution.xml:3993(para)
+#: C/evolution.xml:3998(para) C/evolution.xml:4009(para)
+#: C/evolution.xml:4017(para) C/evolution.xml:4022(para)
+#: C/evolution.xml:4368(para) C/evolution.xml:4387(para)
+#: C/evolution.xml:4419(para) C/evolution.xml:4432(para)
+#: C/evolution.xml:4654(para) C/evolution.xml:6096(para)
+#: C/evolution.xml:6762(para) C/evolution.xml:6828(para)
 msgid "or"
 msgstr "o"
 
@@ -1508,17 +1408,16 @@ msgstr ""
 #: C/evolution.xml:538(para) C/evolution.xml:561(para)
 #: C/evolution.xml:576(para) C/evolution.xml:596(para)
 #: C/evolution.xml:616(para) C/evolution.xml:639(para)
-#: C/evolution.xml:5651(para)
+#: C/evolution.xml:5645(para)
 msgid "Select if you want Evolution to automatically check for new mail."
-msgstr ""
-"Marque si quiere que Evolution compruebe automáticamente si hay correo nuevo."
+msgstr "Marque si quiere que Evolution compruebe automáticamente si hay correo nuevo."
 
 #: C/evolution.xml:391(para) C/evolution.xml:432(para)
 #: C/evolution.xml:473(para) C/evolution.xml:517(para)
 #: C/evolution.xml:539(para) C/evolution.xml:562(para)
 #: C/evolution.xml:577(para) C/evolution.xml:597(para)
 #: C/evolution.xml:617(para) C/evolution.xml:640(para)
-#: C/evolution.xml:5652(para)
+#: C/evolution.xml:5646(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1527,15 +1426,14 @@ msgstr ""
 "debe comprobar si hay mensajes nuevos."
 
 #: C/evolution.xml:394(para) C/evolution.xml:435(para)
-#: C/evolution.xml:5657(para)
+#: C/evolution.xml:5651(para)
 msgid "Select if you want to check for new messages in all folders."
-msgstr ""
-"Marque si quiere que compruebe si hay mensajes nuevos en todas las carpetas."
+msgstr "Marque si quiere que compruebe si hay mensajes nuevos en todas las carpetas."
 
 #: C/evolution.xml:397(para) C/evolution.xml:453(para)
 #: C/evolution.xml:488(para) C/evolution.xml:600(para)
 #: C/evolution.xml:620(para) C/evolution.xml:643(para)
-#: C/evolution.xml:5660(para)
+#: C/evolution.xml:5654(para)
 msgid ""
 "Select Apply filters to new messages in inbox on this server if you want to "
 "apply filters."
@@ -1544,7 +1442,7 @@ msgstr ""
 "este servidor si desea aplicar los filtros."
 
 #: C/evolution.xml:398(para) C/evolution.xml:489(para)
-#: C/evolution.xml:601(para) C/evolution.xml:5661(para)
+#: C/evolution.xml:601(para) C/evolution.xml:5655(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1553,7 +1451,7 @@ msgstr ""
 "org-filters-new\">Creación de reglas de filtrado nuevas</link>."
 
 #: C/evolution.xml:401(para) C/evolution.xml:456(para)
-#: C/evolution.xml:492(para) C/evolution.xml:5664(para)
+#: C/evolution.xml:492(para) C/evolution.xml:5658(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr "Seleccione si quiere comprobar si los mensajes nuevos son basura."
 
@@ -1568,10 +1466,9 @@ msgstr ""
 "linkend=\"usage-mail-organize-spam\">Parar el correo basura (SPAM)</link> y "
 "<link linkend=\"mail-prefs-junk\">SPAM</link>."
 
-#: C/evolution.xml:405(para) C/evolution.xml:5668(para)
+#: C/evolution.xml:405(para) C/evolution.xml:5662(para)
 msgid "Select if you want to only check for junk messages in the Inbox folder."
-msgstr ""
-"Marque si sólo quiere comprobar el correo basura en la Bandeja de entrada."
+msgstr "Marque si sólo quiere comprobar el correo basura en la Bandeja de entrada."
 
 #: C/evolution.xml:408(para) C/evolution.xml:450(para)
 #: C/evolution.xml:499(para)
@@ -1617,7 +1514,7 @@ msgstr ""
 "Teclee su puerto de Agente SOAP de Oficina de correos en el campo Puerto del "
 "Agente SOAP de Oficina de Correos."
 
-#: C/evolution.xml:414(para) C/evolution.xml:5679(para)
+#: C/evolution.xml:414(para) C/evolution.xml:5673(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1726,8 +1623,7 @@ msgstr ""
 "suscribiéndose a ellas."
 
 #: C/evolution.xml:484(para)
-msgid ""
-"Select if you want Evolution to override server-supplied folder namespaces."
+msgid "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Marque si quiere que Evolution no haga caso de los espacios de nombres de "
 "carpetas suministrados por el servidor."
@@ -1761,8 +1657,7 @@ msgstr "Marque si quiere dejar los mensajes en el servidor."
 
 #: C/evolution.xml:523(para)
 msgid "Select if you want to disable support for all POP3 extensions."
-msgstr ""
-"Seleccione si quiere desactivar el soporte para todas las extensiones POP3."
+msgstr "Seleccione si quiere desactivar el soporte para todas las extensiones POP3."
 
 #: C/evolution.xml:535(para)
 msgid ""
@@ -1815,8 +1710,7 @@ msgstr ""
 "recepción, necesita especificar las opciones siguientes:"
 
 #: C/evolution.xml:580(para)
-msgid ""
-"Select if you want to use the <emphasis>.folders</emphasis> summary file."
+msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr ""
 "Seleccione si quiere usar el archivo de resumen <emphasis>.folders</"
 "emphasis>."
@@ -1830,16 +1724,14 @@ msgstr ""
 "recepción, necesita especificar las opciones siguientes:"
 
 #: C/evolution.xml:623(para) C/evolution.xml:646(para)
-msgid ""
-"Select if you want to store status headers in Elm, Pine, and Mutt formats."
+msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Seleccione si quiere almacenar las cabeceras de estado en los formatos Elm, "
 "Pine y Mutt."
 
 #: C/evolution.xml:635(title)
 msgid "Standard Unix mbox spool directory Receiving Options"
-msgstr ""
-"Opciones de recepción para directorios de correo en formato estándar de Unix"
+msgstr "Opciones de recepción para directorios de correo en formato estándar de Unix"
 
 #: C/evolution.xml:636(para)
 msgid ""
@@ -1975,7 +1867,7 @@ msgstr ""
 "descripción de la característica de importación, consulte <link linkend="
 "\"importing-mail\">Importación de archivos aislados</link>."
 
-#: C/evolution.xml:739(para) C/evolution.xml:2355(para)
+#: C/evolution.xml:739(para) C/evolution.xml:2349(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
 "proprietary formats that Evolution cannot read or import."
@@ -1993,7 +1885,7 @@ msgstr ""
 "bajo Windows*. Vea las instrucciones en <link linkend=\"outlook-migration-"
 "mail\">Migrar carpetas de correo locales de Outlook</link>."
 
-#: C/evolution.xml:741(para) C/evolution.xml:2360(para)
+#: C/evolution.xml:741(para) C/evolution.xml:2354(para)
 msgid ""
 "Before importing email from Netscape*, Mozilla and Netscape users need to "
 "click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
@@ -2339,30 +2231,30 @@ msgstr "Teclee el nombre de la carpeta en el campo «Nombre de la carpeta»."
 msgid "Select the location of the new folder."
 msgstr "Seleccione la ubicación de la carpeta nueva."
 
-#: C/evolution.xml:841(para) C/evolution.xml:1250(para)
-#: C/evolution.xml:1276(para) C/evolution.xml:1288(para)
-#: C/evolution.xml:1523(para) C/evolution.xml:1805(para)
-#: C/evolution.xml:1907(para) C/evolution.xml:1923(para)
-#: C/evolution.xml:2140(para) C/evolution.xml:2179(para)
-#: C/evolution.xml:2245(para) C/evolution.xml:2725(para)
-#: C/evolution.xml:2758(para) C/evolution.xml:2954(para)
-#: C/evolution.xml:2996(para) C/evolution.xml:3129(para)
-#: C/evolution.xml:3223(para) C/evolution.xml:3238(para)
-#: C/evolution.xml:3256(para) C/evolution.xml:3303(para)
-#: C/evolution.xml:3517(para) C/evolution.xml:3521(para)
-#: C/evolution.xml:3748(para) C/evolution.xml:4117(para)
-#: C/evolution.xml:4183(para) C/evolution.xml:4305(para)
-#: C/evolution.xml:4348(para) C/evolution.xml:4680(para)
-#: C/evolution.xml:4735(para) C/evolution.xml:5186(para)
-#: C/evolution.xml:5261(para) C/evolution.xml:5283(para)
-#: C/evolution.xml:5307(para) C/evolution.xml:5341(para)
-#: C/evolution.xml:5685(para) C/evolution.xml:5820(para)
-#: C/evolution.xml:5847(para) C/evolution.xml:5867(para)
-#: C/evolution.xml:5882(para) C/evolution.xml:5905(para)
-#: C/evolution.xml:5931(para) C/evolution.xml:6063(para)
-#: C/evolution.xml:6086(para) C/evolution.xml:6164(para)
-#: C/evolution.xml:6194(para) C/evolution.xml:6740(para)
-#: C/evolution.xml:6838(para) C/evolution.xml:6973(para)
+#: C/evolution.xml:841(para) C/evolution.xml:1244(para)
+#: C/evolution.xml:1270(para) C/evolution.xml:1282(para)
+#: C/evolution.xml:1517(para) C/evolution.xml:1799(para)
+#: C/evolution.xml:1901(para) C/evolution.xml:1917(para)
+#: C/evolution.xml:2134(para) C/evolution.xml:2173(para)
+#: C/evolution.xml:2239(para) C/evolution.xml:2719(para)
+#: C/evolution.xml:2752(para) C/evolution.xml:2948(para)
+#: C/evolution.xml:2990(para) C/evolution.xml:3123(para)
+#: C/evolution.xml:3217(para) C/evolution.xml:3232(para)
+#: C/evolution.xml:3250(para) C/evolution.xml:3297(para)
+#: C/evolution.xml:3511(para) C/evolution.xml:3515(para)
+#: C/evolution.xml:3742(para) C/evolution.xml:4111(para)
+#: C/evolution.xml:4177(para) C/evolution.xml:4299(para)
+#: C/evolution.xml:4342(para) C/evolution.xml:4674(para)
+#: C/evolution.xml:4729(para) C/evolution.xml:5180(para)
+#: C/evolution.xml:5255(para) C/evolution.xml:5277(para)
+#: C/evolution.xml:5301(para) C/evolution.xml:5335(para)
+#: C/evolution.xml:5679(para) C/evolution.xml:5814(para)
+#: C/evolution.xml:5841(para) C/evolution.xml:5861(para)
+#: C/evolution.xml:5876(para) C/evolution.xml:5899(para)
+#: C/evolution.xml:5925(para) C/evolution.xml:6057(para)
+#: C/evolution.xml:6080(para) C/evolution.xml:6158(para)
+#: C/evolution.xml:6188(para) C/evolution.xml:6734(para)
+#: C/evolution.xml:6832(para) C/evolution.xml:6967(para)
 msgid "Click OK."
 msgstr "Pulse «Aceptar»."
 
@@ -2470,7 +2362,7 @@ msgstr "Carpeta nueva:"
 msgid "Creates another folder in the same location."
 msgstr "Crea otra carpeta en el mismo lugar."
 
-#: C/evolution.xml:890(title) C/evolution.xml:2884(title)
+#: C/evolution.xml:890(title) C/evolution.xml:2878(title)
 msgid "Delete:"
 msgstr "Borrar:"
 
@@ -2509,8 +2401,7 @@ msgstr ""
 "sistema local para operación desconectada."
 
 #: C/evolution.xml:905(para)
-msgid ""
-"You can also rearrange folders and messages by dragging and dropping them."
+msgid "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "También puede reorganizar las carpetas y los mensajes arrastrándolos y "
 "soltándolos donde desee."
@@ -2629,7 +2520,6 @@ msgstr ""
 "marcarlos como spam."
 
 #: C/evolution.xml:939(para)
-#, fuzzy
 msgid ""
 "Most of the email-related actions you want to perform are listed in the "
 "Message Menu and Folder Menu in the menu bar. The most frequently used ones, "
@@ -2873,31 +2763,10 @@ msgstr ""
 "para restaurar desde el archivador si está disponible localmente."
 
 #: C/evolution.xml:1017(title)
-msgid "Crash Recovery"
-msgstr "Recuperación de cuelgues"
-
-#: C/evolution.xml:1018(para)
-msgid ""
-"Evolution displays a crash detection message when you restart it after a "
-"crash."
-msgstr ""
-"Evolution muestra un mensaje de detección de cuelgue al reiniciarlo después "
-"de un cuelgue."
-
-#: C/evolution.xml:1020(para)
-msgid ""
-"Click Ignore to restore the preview pane displayed when Evolution crashed. "
-"If you click Recover, Evolution opens with all preview panes hidden."
-msgstr ""
-"Pulse Ignorar para restaurar el panel de vista previa mostrado cuando "
-"Evolution se colgó. Si pulsa Recuperar, Evolution se abrirá con todos los "
-"paneles de vista previa ocultos."
-
-#: C/evolution.xml:1023(title)
 msgid "Command Line Options"
 msgstr "Opciones de la línea de órdenes"
 
-#: C/evolution.xml:1024(para)
+#: C/evolution.xml:1018(para)
 msgid ""
 "Evolution has a number of command line options that you can use. For more "
 "information about command line options, open a terminal window and type "
@@ -2908,36 +2777,35 @@ msgstr ""
 "comandos, abra una ventana de terminal y teclee <command>evolution --help</"
 "command>."
 
-#: C/evolution.xml:1025(para)
+#: C/evolution.xml:1019(para)
 msgid "The most important command line options are:"
 msgstr "Las opciones para la línea de comandos más importantes son:"
 
-#: C/evolution.xml:1033(para)
+#: C/evolution.xml:1027(para)
 msgid "Command"
 msgstr "Orden"
 
-#: C/evolution.xml:1036(para) C/evolution.xml:1710(para)
+#: C/evolution.xml:1030(para) C/evolution.xml:1704(para)
 msgid "Description"
 msgstr "Descripción"
 
-#: C/evolution.xml:1043(para)
+#: C/evolution.xml:1037(para)
 msgid "evolution --offline"
 msgstr "evolution --offline"
 
-#: C/evolution.xml:1046(para)
+#: C/evolution.xml:1040(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Inicia Evolution en modo desconectado."
 
-#: C/evolution.xml:1051(para)
+#: C/evolution.xml:1045(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: C/evolution.xml:1054(para)
+#: C/evolution.xml:1048(para)
 msgid "Disables all the preview panes when you launch Evolution."
-msgstr ""
-"Deshabilita todos los paneles de vista preliminar cuando inicie Evolution."
+msgstr "Deshabilita todos los paneles de vista preliminar cuando inicie Evolution."
 
-#: C/evolution.xml:1055(para)
+#: C/evolution.xml:1049(para)
 msgid ""
 "It lets Evolution not to open the last crashed message, task or contact when "
 "you restart Evolution. Thus, it provides a way to avoid system crash caused "
@@ -2948,56 +2816,55 @@ msgstr ""
 "evitar otro cuelgue causado por la vista preliminar de un mensaje, tarea o "
 "contacto."
 
-#: C/evolution.xml:1060(para)
+#: C/evolution.xml:1054(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>joe@somewhere.net</varname>"
 
-#: C/evolution.xml:1063(para)
-msgid ""
-"Starts Evolution and begins composing a message to the email address listed."
+#: C/evolution.xml:1057(para)
+msgid "Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Inicia Evolution y empieza redactando un mensaje a la dirección de correo "
 "listada."
 
-#: C/evolution.xml:1068(para)
+#: C/evolution.xml:1062(para)
 msgid "evolution -c mail"
 msgstr "evolution -c mail"
 
-#: C/evolution.xml:1071(para)
+#: C/evolution.xml:1065(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Inicia Evolution en modo correo."
 
-#: C/evolution.xml:1076(para)
+#: C/evolution.xml:1070(para)
 msgid "evolution -c calendar"
 msgstr "evolution -c calendar"
 
-#: C/evolution.xml:1079(para)
+#: C/evolution.xml:1073(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Inicia Evolution en modo calendario."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:1084(para)
+#: C/evolution.xml:1078(para)
 msgid "evolution -c contacts"
 msgstr "evolution -c contacts"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:1087(para)
+#: C/evolution.xml:1081(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Inicia Evolution en modo contactos."
 
-#: C/evolution.xml:1092(para)
+#: C/evolution.xml:1086(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution --force-shutdown"
 
-#: C/evolution.xml:1095(para)
+#: C/evolution.xml:1089(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Fuerza cada componente de Evolution a terminar inmediatamente."
 
-#: C/evolution.xml:1100(para)
+#: C/evolution.xml:1094(para)
 msgid "evolution <quote>%s</quote>"
 msgstr "evolution <quote>%s</quote>"
 
-#: C/evolution.xml:1103(para)
+#: C/evolution.xml:1097(para)
 msgid ""
 "Makes Evolution your default email handler for your Web browser and in the "
 "GNOME* Control Center."
@@ -3005,8 +2872,7 @@ msgstr ""
 "Hace de Evolution su manipulador de correo-e predeterminado para su "
 "navegador web y en el centro de control de GNOME*."
 
-#: C/evolution.xml:1114(para)
-#, fuzzy
+#: C/evolution.xml:1108(para)
 msgid ""
 "This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
 "Email</link>, provide you with an in-depth guide to the capabilities of "
@@ -3014,37 +2880,37 @@ msgid ""
 "to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail "
 "Preferences</link>."
 msgstr ""
-"Esta sección, así como<link linkend=\"usage-mail-organize\">Organización de "
-"su correo-e</link>, le ofrece una guía en profundidad de las posibilidades "
-"de <trademark>Evolution</trademark> como cliente de correo. Para saber más "
+"Esta sección, así como <link linkend=\"usage-mail-organize\">Organizar su "
+"correo-e</link>, le ofrece una guía en profundidad de las posibilidades de "
+"<trademark>Evolution</trademark> como cliente de correo. Para saber más "
 "sobre cómo configurar su cuenta de correo consulte <link linkend=\"config-"
 "prefs-mail\">Opciones de correo</link>."
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1117(link) C/evolution.xml:1134(title)
+#: C/evolution.xml:1111(link) C/evolution.xml:1128(title)
 msgid "Reading Mail"
 msgstr "Lectura de correo"
 
-#: C/evolution.xml:1120(link) C/evolution.xml:1386(title)
+#: C/evolution.xml:1114(link) C/evolution.xml:1380(title)
 msgid "Composing New Email Messages"
 msgstr "Redacción de mensajes de correo-e nuevos"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1123(link) C/evolution.xml:1982(title)
+#: C/evolution.xml:1117(link) C/evolution.xml:1976(title)
 msgid "Sending Invitations by Mail"
 msgstr "Envío de invitaciones por correo"
 
-#: C/evolution.xml:1126(link) C/evolution.xml:2005(title)
+#: C/evolution.xml:1120(link) C/evolution.xml:1999(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Gestor de suscripciones IMAP"
 
-#: C/evolution.xml:1129(link) C/evolution.xml:2029(title)
+#: C/evolution.xml:1123(link) C/evolution.xml:2023(title)
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: C/evolution.xml:1135(para)
+#: C/evolution.xml:1129(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -3056,8 +2922,7 @@ msgstr ""
 "la lista de mensajes, si quiere verlo en su propia ventana, puede o bien "
 "pulsar dos veces en él, pulsar Intro o pulsar Ctrol+O."
 
-#: C/evolution.xml:1137(para)
-#, fuzzy
+#: C/evolution.xml:1131(para)
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
 "press Backspace to page up while reading an email. Ensure that you use the "
@@ -3068,7 +2933,7 @@ msgstr ""
 "lee un correo-e. Asegúrese de que usa las teclas cuando la lista de mensajes "
 "está activada."
 
-#: C/evolution.xml:1138(para)
+#: C/evolution.xml:1132(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
@@ -3086,11 +2951,11 @@ msgstr ""
 "corchete derecho (]) para el siguiente mensaje no leído y el corchete "
 "izquierdo ([) para el mensaje anterior no leído."
 
-#: C/evolution.xml:1142(title)
+#: C/evolution.xml:1136(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Barra espaciadora mágica para leer correos"
 
-#: C/evolution.xml:1143(para)
+#: C/evolution.xml:1137(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
 "folders. You can read mail, scroll through mail and switch folders by using "
@@ -3100,29 +2965,29 @@ msgstr ""
 "en todas las carpetas de correo. Puede leer correo, deslizar el correo y "
 "cambiar entre las carpetas usando la barra espaciadora de su teclado."
 
-#: C/evolution.xml:1144(para)
+#: C/evolution.xml:1138(para)
 msgid "To enable Magic Spacebar:"
 msgstr "Activar la Barra espaciadora mágica:"
 
-#: C/evolution.xml:1147(para) C/evolution.xml:1243(para)
-#: C/evolution.xml:2128(para) C/evolution.xml:2167(para)
-#: C/evolution.xml:2228(para) C/evolution.xml:5053(para)
-#: C/evolution.xml:5326(para) C/evolution.xml:5609(para)
-#: C/evolution.xml:5625(para) C/evolution.xml:6043(para)
+#: C/evolution.xml:1141(para) C/evolution.xml:1237(para)
+#: C/evolution.xml:2122(para) C/evolution.xml:2161(para)
+#: C/evolution.xml:2222(para) C/evolution.xml:5047(para)
+#: C/evolution.xml:5320(para) C/evolution.xml:5603(para)
+#: C/evolution.xml:5619(para) C/evolution.xml:6037(para)
 msgid "Select Edit &gt; Preferences, then select Mail Accounts."
 msgstr "Pulse Editar &gt; Preferencias, después seleccione Cuentas de correo."
 
-#: C/evolution.xml:1150(para)
+#: C/evolution.xml:1144(para)
 msgid "Select the Enable Magic Spacebar check box."
 msgstr "Activar la casilla de verificación de la Barra espaciadora mágica."
 
-#: C/evolution.xml:1153(para)
+#: C/evolution.xml:1147(para)
 msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Cuando esté en la vista de correo, la barra espaciadora se comportará de la "
 "siguiente manera:"
 
-#: C/evolution.xml:1156(para)
+#: C/evolution.xml:1150(para)
 msgid ""
 "When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
@@ -3130,7 +2995,7 @@ msgstr ""
 "Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
 "correo no leído."
 
-#: C/evolution.xml:1159(para)
+#: C/evolution.xml:1153(para)
 msgid ""
 "If the message is more than one screen long, the Spacebar works as Page Down "
 "key."
@@ -3138,7 +3003,7 @@ msgstr ""
 "Si el mensaje es más largo que la pantalla, la barra espaciadora funciona "
 "como avance de página."
 
-#: C/evolution.xml:1162(para)
+#: C/evolution.xml:1156(para)
 msgid ""
 "If you press the Spacebar after you reach the bottom of the page, it takes "
 "you to the next unread message."
@@ -3146,7 +3011,7 @@ msgstr ""
 "Si pulsa la barra espaciadora cuando ha llegado al final de la página, le "
 "lleva al siguiente mensaje no leído."
 
-#: C/evolution.xml:1165(para)
+#: C/evolution.xml:1159(para)
 msgid ""
 "If there are no more unread messages in the mailbox, pressing the Spacebar "
 "takes you to the next unread message in the next folder."
@@ -3154,7 +3019,7 @@ msgstr ""
 "Si no hay más mensajes sin leer en el buzón de correo, la barra espaciadora "
 "le lleva al siguiente mensaje sin leer en la siguiente carpeta."
 
-#: C/evolution.xml:1168(para)
+#: C/evolution.xml:1162(para)
 msgid ""
 "If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
@@ -3165,12 +3030,11 @@ msgstr ""
 "siguiente mensaje no leído en una carpeta diferente sin tener que pulsar "
 "sobre la carpeta."
 
-#: C/evolution.xml:1174(title)
+#: C/evolution.xml:1168(title)
 msgid "Checking for New Mail"
 msgstr "Comprobación de correo nuevo"
 
-#: C/evolution.xml:1175(para)
-#, fuzzy
+#: C/evolution.xml:1169(para)
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
@@ -3181,10 +3045,10 @@ msgstr ""
 "Para comprobar su correo, pulse Enviar/Recibir en la barra de herramientas. "
 "Si no ha creado ninguna cuenta de correo aún, el asistente de configuración "
 "le pide la información que necesita para comprobar el correo-e. Para más "
-"información acerca de crear cuentas de correo, vea <link linkend=\"usage-"
+"información acerca de crear cuentas de correo consulte <link linkend=\"usage-"
 "mainwindow-starting\">Iniciar Evolution por primera vez</link>."
 
-#: C/evolution.xml:1176(para)
+#: C/evolution.xml:1170(para)
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
@@ -3194,7 +3058,7 @@ msgstr ""
 "Evolution que almacena su contraseña, se le pedirá la contraseña. Introduzca "
 "su contraseña para descargar su correo."
 
-#: C/evolution.xml:1177(para)
+#: C/evolution.xml:1171(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3205,12 +3069,11 @@ msgstr ""
 "linkend=\"mail-prefs-headers\">Opciones de las cabeceras del correo</link> o "
 "pregunte al administrador del sistema."
 
-#: C/evolution.xml:1181(title)
-#, fuzzy
+#: C/evolution.xml:1175(title)
 msgid "New Mail Notification"
 msgstr "Notificaciones de correo nuevo"
 
-#: C/evolution.xml:1182(para)
+#: C/evolution.xml:1176(para)
 msgid ""
 "Evolution notifies you of new email. When you receive a new mail in your "
 "inbox, a blinking icon appears on the Switcher."
@@ -3218,8 +3081,7 @@ msgstr ""
 "Evolution le notifica la llegada de nuevo correo-e. Cuando reciba un nuevo "
 "correo en su buzón, aparecerá un icono parpadeante en el Selector."
 
-#: C/evolution.xml:1184(para)
-#, fuzzy
+#: C/evolution.xml:1178(para)
 msgid ""
 "You can also see a blinking icon <inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/> in the notification area that disappears when "
@@ -3233,11 +3095,11 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> mostrará "
 "el mensaje de notificación."
 
-#: C/evolution.xml:1188(title)
+#: C/evolution.xml:1182(title)
 msgid "Vertical View Versus Classical View"
 msgstr "Vista vertical y vista clásica"
 
-#: C/evolution.xml:1189(para)
+#: C/evolution.xml:1183(para)
 msgid ""
 "Evolution provides you vertical view in addition to the classical view. In "
 "the vertical view, message preview pane is located at the right side of the "
@@ -3252,19 +3114,19 @@ msgstr ""
 "vista vertical le permite usar la anchura extra en los monitores de pantalla "
 "panorámica."
 
-#: C/evolution.xml:1191(title)
+#: C/evolution.xml:1185(title)
 msgid "Vertical View:"
 msgstr "Vista vertical:"
 
-#: C/evolution.xml:1192(para)
+#: C/evolution.xml:1186(para)
 msgid "To switch to vertical view"
 msgstr "Para cambiar a la vista vertical"
 
-#: C/evolution.xml:1196(para)
+#: C/evolution.xml:1190(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Pulse Ver &gt; Vista previa &gt; Vista vertical"
 
-#: C/evolution.xml:1199(para)
+#: C/evolution.xml:1193(para)
 msgid ""
 "In Vertical view, default message list contains a double line compressed "
 "headers, which enables you to consume the extra width in the preview column. "
@@ -3277,23 +3139,23 @@ msgstr ""
 "correo electrónico del remitente, el icono de adjuntos, la fecha y el asunto "
 "en la segunda línea."
 
-#: C/evolution.xml:1202(title)
+#: C/evolution.xml:1196(title)
 msgid "Classical View:"
 msgstr "Vista clásica:"
 
-#: C/evolution.xml:1203(para)
+#: C/evolution.xml:1197(para)
 msgid "To switch to classical view,"
 msgstr "Para cambiar a la vista clásica,"
 
-#: C/evolution.xml:1207(para)
+#: C/evolution.xml:1201(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Pulse Ver &gt; Vista previa &gt; Vista clásica"
 
-#: C/evolution.xml:1213(title)
+#: C/evolution.xml:1207(title)
 msgid "Collapsible Message Headers"
 msgstr "Cabeceras de mensajes contraíbles"
 
-#: C/evolution.xml:1214(para)
+#: C/evolution.xml:1208(para)
 msgid ""
 "Evolution compresses the TO, CC, BCC headers of received mail and shows only "
 "limited addresses. You can set the limit of the number of addresses to be "
@@ -3303,24 +3165,23 @@ msgstr ""
 "muestra sólo direcciones limitadas. Puede establecer un límite en el número "
 "de direcciones para mostrar en el panel de vista previa."
 
-#: C/evolution.xml:1216(para)
-msgid ""
-"Use the following procedure to set the limit of addresses to be displayed:"
+#: C/evolution.xml:1210(para)
+msgid "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Use el siguiente procedimiento para establecer el límite de direcciones a "
 "mostrar:"
 
-#: C/evolution.xml:1219(para) C/evolution.xml:1877(para)
-#: C/evolution.xml:2204(para) C/evolution.xml:5028(para)
-#: C/evolution.xml:5222(para) C/evolution.xml:6333(para)
+#: C/evolution.xml:1213(para) C/evolution.xml:1871(para)
+#: C/evolution.xml:2198(para) C/evolution.xml:5022(para)
+#: C/evolution.xml:5216(para) C/evolution.xml:6327(para)
 msgid "Select Edit &gt; Preferences."
 msgstr "Seleccione Editar &gt; Preferencias."
 
-#: C/evolution.xml:1222(para)
+#: C/evolution.xml:1216(para)
 msgid "Select Mail Preferences."
 msgstr "Seleccione Opciones de correo."
 
-#: C/evolution.xml:1225(para)
+#: C/evolution.xml:1219(para)
 msgid ""
 "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
 "address."
@@ -3328,12 +3189,11 @@ msgstr ""
 "Marque la columna <guilabel>Reducir las cabeceras Para / Cc / Cco a</"
 "guilabel> para limitar las direcciones"
 
-#: C/evolution.xml:1228(para)
+#: C/evolution.xml:1222(para)
 msgid "Enter the limit in the field."
 msgstr "Introduzca el límite en el campo."
 
-#: C/evolution.xml:1231(para)
-#, fuzzy
+#: C/evolution.xml:1225(para)
 msgid ""
 "You can expand the message headers by clicking the <inlinegraphic format="
 "\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
@@ -3345,11 +3205,11 @@ msgstr ""
 "en el panel de vista previa. Para contraerlas pulse el icono <inlinegraphic "
 "format=\"PNG\" fileref=\"figures/minus.png\"/> en el panel de vista previa."
 
-#: C/evolution.xml:1235(title)
+#: C/evolution.xml:1229(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Compartir buzones con otros programas de correo"
 
-#: C/evolution.xml:1236(para)
+#: C/evolution.xml:1230(para)
 msgid ""
 "If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
@@ -3357,15 +3217,15 @@ msgstr ""
 "Si quiere usar Evolution y además otro cliente de correo electrónico, como "
 "Mutt, al mismo tiempo, use el siguiente procedimiento:"
 
-#: C/evolution.xml:1239(para)
+#: C/evolution.xml:1233(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Descargue su correo en la otra aplicación como haría con normalidad."
 
-#: C/evolution.xml:1242(para)
+#: C/evolution.xml:1236(para)
 msgid "In Evolution:"
 msgstr "En Evolution:"
 
-#: C/evolution.xml:1244(para)
+#: C/evolution.xml:1238(para)
 msgid ""
 "Select the account you want to use to share mail and click Edit. Instead of "
 "Edit, you might want to create a new account just for this source of mail by "
@@ -3375,7 +3235,7 @@ msgstr ""
 "En lugar de Editar, quizá quiera crear una cuenta nueva sólo para esta "
 "fuente de correo pulsando Nuevo."
 
-#: C/evolution.xml:1247(para)
+#: C/evolution.xml:1241(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3387,7 +3247,7 @@ msgstr ""
 "lugar. Una eleción habitual son los archivos mbox, con la ruta «/home/"
 "<varname>nombresdelusuario</varname>/Mail»."
 
-#: C/evolution.xml:1253(para)
+#: C/evolution.xml:1247(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3397,11 +3257,11 @@ msgstr ""
 "bloquean por el programa de correo que los esté usando en ese momento, así "
 "que los archivos no pueden accederse por otro programa de correo."
 
-#: C/evolution.xml:1257(title)
+#: C/evolution.xml:1251(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Trabajar con adjuntos y correo HTML"
 
-#: C/evolution.xml:1258(para)
+#: C/evolution.xml:1252(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3420,11 +3280,11 @@ msgstr ""
 "de adjuntos. Para abrir un adjunto, pulse dos veces en él. pulse el botón "
 "Guardar todo para guardar todos los adjuntos."
 
-#: C/evolution.xml:1261(title)
+#: C/evolution.xml:1255(title)
 msgid "Saving or Opening Attachments"
 msgstr "Guardar o abrir adjuntos"
 
-#: C/evolution.xml:1262(para)
+#: C/evolution.xml:1256(para)
 msgid ""
 "If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
@@ -3432,7 +3292,7 @@ msgstr ""
 "Si recibe un adjunto dentro de un mensaje de correo electrónico, Evolution "
 "le ayuda a guardarlo o a abrirlo con las aplicaciones adecuadas."
 
-#: C/evolution.xml:1263(para)
+#: C/evolution.xml:1257(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3443,11 +3303,11 @@ msgstr ""
 "adjuntos. Pulse en el icono de la flecha derecha para mostar la barra de "
 "adjuntos."
 
-#: C/evolution.xml:1264(para)
+#: C/evolution.xml:1258(para)
 msgid "To save an attachment to disk:"
 msgstr "Para guardar un adjunto en el disco:"
 
-#: C/evolution.xml:1267(para) C/evolution.xml:1282(para)
+#: C/evolution.xml:1261(para) C/evolution.xml:1276(para)
 msgid ""
 "Click the down-arrow on the attachment icon or right-click the attachment "
 "icon in the attachment bar."
@@ -3455,23 +3315,23 @@ msgstr ""
 "Pulse la flecha hacia abajo en el icono de adjunto o pulse con el botón "
 "derecho sobre el icono del adjunto en la barra de adjuntos."
 
-#: C/evolution.xml:1270(para)
+#: C/evolution.xml:1264(para)
 msgid "Click Save As."
 msgstr "Pulse Guardar como."
 
-#: C/evolution.xml:1273(para)
+#: C/evolution.xml:1267(para)
 msgid "Select a location and name for the file."
 msgstr "Seleccine una ubicación y un nombre para el archivo."
 
-#: C/evolution.xml:1279(para)
+#: C/evolution.xml:1273(para)
 msgid "To open an attachment using another application:"
 msgstr "Para abrir un adjunto usando otra aplicación:"
 
-#: C/evolution.xml:1285(para)
+#: C/evolution.xml:1279(para)
 msgid "Select the application to open the attachment."
 msgstr "Seleccione la aplicación para abrir el adjunto."
 
-#: C/evolution.xml:1291(para)
+#: C/evolution.xml:1285(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3485,11 +3345,11 @@ msgstr ""
 "org y cualquier otro procesador de textos, y archivos comprimidos se pueden "
 "abrir con la aplicación File Roller."
 
-#: C/evolution.xml:1295(title)
+#: C/evolution.xml:1289(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Imágenes dentro de correos HTML"
 
-#: C/evolution.xml:1296(para)
+#: C/evolution.xml:1290(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3504,8 +3364,7 @@ msgstr ""
 "compositor. Alternativamente, sólo arrastre una imagen dentro del área de "
 "composición del mensaje."
 
-#: C/evolution.xml:1297(para)
-#, fuzzy
+#: C/evolution.xml:1291(para)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
@@ -3521,27 +3380,27 @@ msgstr ""
 "lee los mensajes. No cargar automáticamente las imágenes ayuda a proteger su "
 "privacidad."
 
-#: C/evolution.xml:1298(para)
+#: C/evolution.xml:1292(para)
 msgid "To load the images for one message:"
 msgstr "Para cargar las imágenes de un mensaje:"
 
-#: C/evolution.xml:1301(para)
+#: C/evolution.xml:1295(para)
 msgid "Click View &gt; Load Images."
 msgstr "Pulse Ver &gt; Cargar imágenes."
 
-#: C/evolution.xml:1304(para)
+#: C/evolution.xml:1298(para)
 msgid "To set the default action for loading images:"
 msgstr "Para establecer la acción predeterminada para cargar imágenes:"
 
-#: C/evolution.xml:1307(para)
+#: C/evolution.xml:1301(para)
 msgid "Select Edit &gt; Preferences, then select Mail Preferences."
 msgstr "Seleccione Editar &gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:1310(para)
+#: C/evolution.xml:1304(para)
 msgid "Click the HTML Mail tab."
 msgstr "Pulse sobre la solapa Correo en HTML."
 
-#: C/evolution.xml:1313(para)
+#: C/evolution.xml:1307(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3550,28 +3409,28 @@ msgstr ""
 "Cargar imágenes en el correo de los contactos o Siempre cargar las imágenes "
 "desde internet."
 
-#: C/evolution.xml:1316(para) C/evolution.xml:1364(para)
-#: C/evolution.xml:1555(para) C/evolution.xml:1790(para)
-#: C/evolution.xml:1824(para) C/evolution.xml:1847(para)
-#: C/evolution.xml:2143(para) C/evolution.xml:2182(para)
-#: C/evolution.xml:2216(para) C/evolution.xml:2248(para)
-#: C/evolution.xml:5686(para) C/evolution.xml:6064(para)
+#: C/evolution.xml:1310(para) C/evolution.xml:1358(para)
+#: C/evolution.xml:1549(para) C/evolution.xml:1784(para)
+#: C/evolution.xml:1818(para) C/evolution.xml:1841(para)
+#: C/evolution.xml:2137(para) C/evolution.xml:2176(para)
+#: C/evolution.xml:2210(para) C/evolution.xml:2242(para)
+#: C/evolution.xml:5680(para) C/evolution.xml:6058(para)
 msgid "Click Close."
 msgstr "Pulse Cerrar."
 
-#: C/evolution.xml:1319(para)
+#: C/evolution.xml:1313(para)
 msgid "To set your proxy in KDE:"
 msgstr "Para establecer su proxy en KDE:"
 
-#: C/evolution.xml:1322(para)
+#: C/evolution.xml:1316(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Pulse el icono de menú &gt; Sistema &gt; Configuración &gt; Yast."
 
-#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
+#: C/evolution.xml:1319(para) C/evolution.xml:1334(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Pulse Servicios de red, después Proxy."
 
-#: C/evolution.xml:1328(para) C/evolution.xml:1343(para)
+#: C/evolution.xml:1322(para) C/evolution.xml:1337(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3579,15 +3438,15 @@ msgstr ""
 "Especifique la configuración de su proxy (si no conoce los ajustes de su "
 "proxy, contacte con su ISP o el administrador de su sistema)."
 
-#: C/evolution.xml:1331(para) C/evolution.xml:1346(para)
+#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
 msgid "Click Finish, then click Close."
 msgstr "Pulse Finalizar, después Cerrar."
 
-#: C/evolution.xml:1334(para)
+#: C/evolution.xml:1328(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Para establecer su proxy en GNOME:"
 
-#: C/evolution.xml:1337(para)
+#: C/evolution.xml:1331(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3595,12 +3454,11 @@ msgstr ""
 "Pulse Sistema &gt; Preferencias &gt; Proxy de la red (si es necesario "
 "introduzca su contraseña de superusuario)."
 
-#: C/evolution.xml:1353(title)
+#: C/evolution.xml:1347(title)
 msgid "Using Evolution for News"
 msgstr "Usar Evolution para noticias"
 
-#: C/evolution.xml:1354(para)
-#, fuzzy
+#: C/evolution.xml:1348(para)
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
@@ -3618,7 +3476,7 @@ msgstr ""
 "una carpeta IMAP. Cuando pulse Enviar/Recibir, Evolution también comprueba "
 "mensajes de noticias."
 
-#: C/evolution.xml:1355(para)
+#: C/evolution.xml:1349(para)
 msgid ""
 "When you create a newsgroup account, you are not subscribed to any groups. "
 "To subscribe to a newsgroup:"
@@ -3626,11 +3484,11 @@ msgstr ""
 "Cuando crea una cuenta de grupo de noticias, no está suscrito a ningún "
 "grupo. Para suscribirse a un grupo de noticias:"
 
-#: C/evolution.xml:1358(para) C/evolution.xml:5296(para)
+#: C/evolution.xml:1352(para) C/evolution.xml:5290(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Pulse Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:1361(para)
+#: C/evolution.xml:1355(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3638,11 +3496,11 @@ msgstr ""
 "Seleccione su cuenta NNTP, seleccione los grupos a los que quiere "
 "suscribirse, después pulse Subscribir."
 
-#: C/evolution.xml:1370(title)
+#: C/evolution.xml:1364(title)
 msgid "Deleting Mail"
 msgstr "Borrado de correo"
 
-#: C/evolution.xml:1371(para)
+#: C/evolution.xml:1365(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the delete tool in the toolbar, "
@@ -3653,8 +3511,7 @@ msgstr ""
 "de herramientas, pulse Ctrl+D o pulse con el botón derecho del ratón sobre "
 "él y después pulse Borrar."
 
-#: C/evolution.xml:1372(para)
-#, fuzzy
+#: C/evolution.xml:1366(para)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
 "deleted, but is marked for deletion. Your email is recoverable until you "
@@ -3664,15 +3521,15 @@ msgid ""
 "striken off for later deletion. You can also find deleted messages in your "
 "Trash folder."
 msgstr ""
-"Cuando pulsa «Borrar» o pulsa en el la carpeta de la papelera, su correo no "
-"se borra realmente sino que se marca para ser eliminado. Su correo es "
-"recuperable hasta que no lo haya purgado. Cuando «Purga» una carpeta "
-"realmente está eliminando todo el correo marcado como borrado. Para mostrar "
-"los mensajes borrados, desmarque la casilla «Ocultar mensajes borrados» del "
-"menú Ver. Puede ver los mensajes marcados para ser borrados posteriormente. "
-"Puede además encontrar los mensajes borrados en la carpeta Papelera."
+"Cuando pulsa Borrar o pulsa en el la carpeta de la papelera, su correo no se "
+"borra realmente sino que se marca para ser eliminado. Su correo es "
+"recuperable hasta que no lo haya purgado. Cuando Purga una carpeta realmente "
+"está eliminando todo el correo marcado como borrado. Para mostrar los "
+"mensajes borrados, desmarque la casilla Ocultar mensajes borrados del menú "
+"Ver. Puede ver los mensajes marcados para ser borrados posteriormente. Puede "
+"además encontrar los mensajes borrados en la carpeta Papelera."
 
-#: C/evolution.xml:1373(para)
+#: C/evolution.xml:1367(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3680,7 +3537,7 @@ msgstr ""
 "Para borrar permanentemente todos los mensajes borrados en una carpeta, "
 "pulse Carpeta &gt; Compactar o pulse Ctrl+E."
 
-#: C/evolution.xml:1374(para)
+#: C/evolution.xml:1368(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
@@ -3692,7 +3549,7 @@ msgstr ""
 "para un borrado posterior. De tal manera que vaciar la Papelera no es otra "
 "cosa que purgar los correos borrados de todas sus carpetas en la cuenta."
 
-#: C/evolution.xml:1375(para)
+#: C/evolution.xml:1369(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3705,11 +3562,11 @@ msgstr ""
 "acerca de carpetas de búsquedas, vea <link linkend=\"usage-mail-organize-"
 "vfolders\">Uso de carpetas de búsqueda</link>."
 
-#: C/evolution.xml:1379(title)
+#: C/evolution.xml:1373(title)
 msgid "Undeleting Messages"
 msgstr "Recuperar mensajes"
 
-#: C/evolution.xml:1380(para)
+#: C/evolution.xml:1374(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
 "undelete a message, select the message, click Edit &gt; Undelete. Note that "
@@ -3720,7 +3577,7 @@ msgstr ""
 "Note que Ver &gt; Ocultar mensajes borrados en la barra de menú debe estar "
 "desactivado para esto."
 
-#: C/evolution.xml:1381(para)
+#: C/evolution.xml:1375(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3728,7 +3585,7 @@ msgstr ""
 "Si ha marcado un mensaje para su eliminación, recuperándolo eliminará la "
 "marca y el mensaje se borrará de la carpeta Papelera."
 
-#: C/evolution.xml:1387(para)
+#: C/evolution.xml:1381(para)
 msgid ""
 "You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
@@ -3738,8 +3595,7 @@ msgstr ""
 "Nuevo &gt; Mensaje de correo, pulsando Ctrl+N cuando esté en la herramienta "
 "de correo o pulsando Nuevo en la barra de herramientas."
 
-#: C/evolution.xml:1388(para)
-#, fuzzy
+#: C/evolution.xml:1382(para)
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
 "addresses, type in the addresses separated by comma. You can also use a "
@@ -3747,72 +3603,72 @@ msgid ""
 "Subject field, and a message in the box at the bottom of the window. After "
 "you have written your message, click Send."
 msgstr ""
-"Escriba una dirección en el campo «Para». Si quiere introducir varias "
+"Escriba una dirección en el campo Para. Si quiere introducir varias "
 "direcciones de correo electrónico, escriba las direcciones separadas por una "
 "coma. También puede usar la lista de contactos para enviar correos a varios "
-"destinatarios. Escriba el asunto en el campo «Asunto», y en la caja que hay "
-"en la parte inferior, el texto del mensaje. Una vez que haya escrito su "
-"mensaje pulse «Enviar»."
+"destinatarios. Escriba el asunto en el campo Asunto, y en la caja que hay en "
+"la parte inferior, el texto del mensaje. Una vez que haya escrito su mensaje "
+"pulse Enviar."
 
-#: C/evolution.xml:1389(para)
+#: C/evolution.xml:1383(para)
 msgid "New mail message window look like this:"
 msgstr "La ventana de mensaje de correo nuevo es así:"
 
-#: C/evolution.xml:1391(para) C/evolution.xml:5944(para)
+#: C/evolution.xml:1385(para) C/evolution.xml:5938(para)
 msgid "This section contains the following topics:"
 msgstr "Esta sección contiene los siguientes temas:"
 
-#: C/evolution.xml:1394(link) C/evolution.xml:1432(title)
+#: C/evolution.xml:1388(link) C/evolution.xml:1426(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII, y alfabetos no latinos"
 
-#: C/evolution.xml:1397(link) C/evolution.xml:1444(title)
+#: C/evolution.xml:1391(link) C/evolution.xml:1438(title)
 msgid "Sending Composed Messages Later"
 msgstr "Enviar los mensajes nuevos más tarde"
 
-#: C/evolution.xml:1400(link) C/evolution.xml:1460(title)
+#: C/evolution.xml:1394(link) C/evolution.xml:1454(title)
 msgid "Working Offline"
 msgstr "Trabar desconectado"
 
-#: C/evolution.xml:1403(link) C/evolution.xml:1513(title)
+#: C/evolution.xml:1397(link) C/evolution.xml:1507(title)
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: C/evolution.xml:1406(link) C/evolution.xml:1560(title)
+#: C/evolution.xml:1400(link) C/evolution.xml:1554(title)
 msgid "Specifying Additional Recipients for Email"
 msgstr "Especificar destinatarios adicioneles para correo electrónico"
 
-#: C/evolution.xml:1409(link) C/evolution.xml:1585(title)
+#: C/evolution.xml:1403(link) C/evolution.xml:1579(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Eligiendo los destinatarios rápidamente"
 
-#: C/evolution.xml:1412(link) C/evolution.xml:1593(title)
+#: C/evolution.xml:1406(link) C/evolution.xml:1587(title)
 msgid "Replying to Email Messages"
 msgstr "Responder a mensajes de correo-e"
 
-#: C/evolution.xml:1415(link) C/evolution.xml:1659(title)
+#: C/evolution.xml:1409(link) C/evolution.xml:1653(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Buscar y sustituir en el editor de mensajes"
 
-#: C/evolution.xml:1418(link) C/evolution.xml:1681(title)
+#: C/evolution.xml:1412(link) C/evolution.xml:1675(title)
 msgid "Enhancing Your Email with HTML"
 msgstr "Mejorar su correo electrónico con HTML"
 
-#: C/evolution.xml:1421(link) C/evolution.xml:1855(title)
+#: C/evolution.xml:1415(link) C/evolution.xml:1849(title)
 msgid "Mail Send Options"
 msgstr "Opciones de envío de correo"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1424(link) C/evolution.xml:1933(title)
+#: C/evolution.xml:1418(link) C/evolution.xml:1927(title)
 msgid "Forwarding Mail"
 msgstr "Reenviar correo"
 
-#: C/evolution.xml:1427(link) C/evolution.xml:1954(title)
+#: C/evolution.xml:1421(link) C/evolution.xml:1948(title)
 msgid "Tips for Email Courtesy"
 msgstr "Consejos para correo electrónico de cortesía"
 
-#: C/evolution.xml:1433(para)
+#: C/evolution.xml:1427(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3835,7 +3691,7 @@ msgstr ""
 "cirílicas apropiadas, y la comilla simple (‘) proporciona un carácter de "
 "signo suave."
 
-#: C/evolution.xml:1434(para)
+#: C/evolution.xml:1428(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3849,11 +3705,11 @@ msgstr ""
 "seguro de cuáles usar, seleccione UTF-8, que ofrece el mayor rango de "
 "caracteres disponibles en el mayor número de idiomas."
 
-#: C/evolution.xml:1437(title)
+#: C/evolution.xml:1431(title)
 msgid "Using Character Sets"
 msgstr "Usar los juegos de codificaciones"
 
-#: C/evolution.xml:1438(para)
+#: C/evolution.xml:1432(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -3876,8 +3732,7 @@ msgstr ""
 "de estándares desarrollaron el juego de caracteres UTF-8 Unicode* para "
 "proporcionar un juego de caracteres único para todo el mundo."
 
-#: C/evolution.xml:1439(para)
-#, fuzzy
+#: C/evolution.xml:1433(para)
 msgid ""
 "Most email messages state in advance which character set they use, so "
 "Evolution usually can display those messages correctly. However, if you find "
@@ -3901,7 +3756,7 @@ msgstr ""
 "mayoría de usuarios es UTF-8, que ofrece el rango más grande de caracteres "
 "para el rango más grande de idiomas."
 
-#: C/evolution.xml:1445(para)
+#: C/evolution.xml:1439(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -3910,7 +3765,7 @@ msgstr ""
 "Sin embargo hay unas cuantas maneras de guardar un mensaje para enviarlo más "
 "tarde:"
 
-#: C/evolution.xml:1448(para)
+#: C/evolution.xml:1442(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -3920,7 +3775,7 @@ msgstr ""
 "mensajes en la carpeta «Bandeja de salida». El mensaje se enviará la próxima "
 "vez que se conecte a Internet y envíe o reciba correo."
 
-#: C/evolution.xml:1451(para)
+#: C/evolution.xml:1445(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the drafts folder for "
 "later revision."
@@ -3928,7 +3783,7 @@ msgstr ""
 "Pulse Archivo &gt; Guardar borrador para guardar sus mensajes en la carpeta "
 "de borradores y poder revisarlos después."
 
-#: C/evolution.xml:1454(para)
+#: C/evolution.xml:1448(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -3936,8 +3791,7 @@ msgstr ""
 "Si prefiere guardar el mensaje como un archivo de texto pulse Archivo &gt; "
 "Guardar como, y después especifique un nombre de archivo."
 
-#: C/evolution.xml:1461(para)
-#, fuzzy
+#: C/evolution.xml:1455(para)
 msgid ""
 "Offline mode helps you communicate with remote mail storage systems like "
 "<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
@@ -3952,7 +3806,7 @@ msgstr ""
 "permite crear nuevos mensajes, guardarlos en la Bandeja de salida y enviarlo "
 "en cuanto vuelva a conectarse."
 
-#: C/evolution.xml:1462(para)
+#: C/evolution.xml:1456(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -3965,22 +3819,21 @@ msgstr ""
 "descargará todos los mensajes sin leer desde las carpetas que haya elegido "
 "almacenar."
 
-#: C/evolution.xml:1463(para)
+#: C/evolution.xml:1457(para)
 msgid "To mark a folder for offline use,"
 msgstr "Para marcar una carpeta para su uso desconectado,"
 
-#: C/evolution.xml:1466(para)
+#: C/evolution.xml:1460(para)
 msgid "Right-click the folder, then click Properties."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre la carpeta, después elija "
 "Propiedades."
 
-#: C/evolution.xml:1469(para)
+#: C/evolution.xml:1463(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
-msgstr ""
-"Pulse Copiar el contenido de la carpeta localmente para operar desconectado."
+msgstr "Pulse Copiar el contenido de la carpeta localmente para operar desconectado."
 
-#: C/evolution.xml:1472(para)
+#: C/evolution.xml:1466(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left border "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -3991,11 +3844,11 @@ msgstr ""
 "mostrará dos cables enchufados. Cuando esté desconectado los cables estarán "
 "desenchufados."
 
-#: C/evolution.xml:1473(para)
+#: C/evolution.xml:1467(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr "Para cachear las carpetas seleccionadas y desconectar de la red,"
 
-#: C/evolution.xml:1476(para)
+#: C/evolution.xml:1470(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -4003,7 +3856,7 @@ msgstr ""
 "Pulse Archivo &gt; Trabajar desconectado o pulse el icono de estado de la "
 "conexión en la esquina inferior izquierda de la pantalla."
 
-#: C/evolution.xml:1477(para)
+#: C/evolution.xml:1471(para)
 msgid ""
 "A message pop-ups and asks you whether you want to go offline immediately or "
 "cache before you go offline."
@@ -4011,7 +3864,7 @@ msgstr ""
 "Un mensaje emergerá y le preguntará si quiere desconectarse inmediatamente o "
 "cachear antes de desconectarse."
 
-#: C/evolution.xml:1482(para)
+#: C/evolution.xml:1476(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -4019,11 +3872,11 @@ msgstr ""
 "Pulse Sincronizar para descargar todos los mensajes en las carpetas marcadas "
 "para trabajar desconectado."
 
-#: C/evolution.xml:1483(para) C/evolution.xml:3696(para)
+#: C/evolution.xml:1477(para) C/evolution.xml:3690(para)
 msgid "Or"
 msgstr "O"
 
-#: C/evolution.xml:1484(para)
+#: C/evolution.xml:1478(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -4031,7 +3884,7 @@ msgstr ""
 "Pulse No sincronizar para desconectarse inmediatamente, sin descargar los "
 "mensajes localmente para trabajar desconectado."
 
-#: C/evolution.xml:1485(para)
+#: C/evolution.xml:1479(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -4039,21 +3892,21 @@ msgstr ""
 "Seleccione No mostrar otra vez este mensaje para desactivar este mensaje "
 "emergente. Lo predeterminado es no sincronizar al desconectar."
 
-#: C/evolution.xml:1488(para)
+#: C/evolution.xml:1482(para)
 msgid "When you want to reconnect,"
 msgstr "Cuando quiera reconectar,"
 
-#: C/evolution.xml:1491(para)
+#: C/evolution.xml:1485(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
 msgstr ""
 "Pulse Archivo &gt; Trabajar conectado o pulse el icono de estado de la "
 "conexión de nuevo."
 
-#: C/evolution.xml:1496(title)
+#: C/evolution.xml:1490(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Descargar los mensajes para trabajar desconectado"
 
-#: C/evolution.xml:1497(para)
+#: C/evolution.xml:1491(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -4065,19 +3918,19 @@ msgstr ""
 "De otra manera y de forma predeterminada, se desconecta cuando pulsa el "
 "botón de desconexión sin descargar los mensajes."
 
-#: C/evolution.xml:1498(para)
+#: C/evolution.xml:1492(para)
 msgid "To download messages for offline operations,"
 msgstr "Para descargar mensajes para trabajar desconectado,"
 
-#: C/evolution.xml:1501(para)
+#: C/evolution.xml:1495(para)
 msgid "Select File &gt; Download messages for offline."
 msgstr "Seleccione Archivo &gt; Descargar mensajes para trabajar sin conexión."
 
-#: C/evolution.xml:1507(title)
+#: C/evolution.xml:1501(title)
 msgid "Automatic Network State Handling"
 msgstr "Gestión automática del estado de la red"
 
-#: C/evolution.xml:1508(para)
+#: C/evolution.xml:1502(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -4090,19 +3943,19 @@ msgstr ""
 "esta característica, asegúrese de que su sistema tiene instalado Network "
 "Manager."
 
-#: C/evolution.xml:1514(para)
+#: C/evolution.xml:1508(para)
 msgid "To attach a file to your email:"
 msgstr "Para adjuntar un archivo a su correo-e:"
 
-#: C/evolution.xml:1517(para)
+#: C/evolution.xml:1511(para)
 msgid "Click the Attach icon in the composer toolbar."
 msgstr "Pulse el botón Adjuntar en la barra de herramientas del editor."
 
-#: C/evolution.xml:1520(para)
+#: C/evolution.xml:1514(para)
 msgid "Select the file you want to attach."
 msgstr "Seleccione el archivo que quiere adjuntar."
 
-#: C/evolution.xml:1526(para)
+#: C/evolution.xml:1520(para)
 msgid ""
 "You can also drag a file to the attachment bar of the composer window. If "
 "you want to send it as an inline attachment, right-click the attachment and "
@@ -4113,7 +3966,7 @@ msgstr ""
 "derecho del ratón sobre el adjunto y puse Propiedades, después seleccione "
 "Mostrado automático de los adjuntos."
 
-#: C/evolution.xml:1527(para)
+#: C/evolution.xml:1521(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -4122,11 +3975,11 @@ msgstr ""
 "presente que los adjuntos de gran tamaño pueden tomar mucho tiempo al ser "
 "enviados y recibidos."
 
-#: C/evolution.xml:1530(title)
+#: C/evolution.xml:1524(title)
 msgid "Attachment Reminder:"
 msgstr "Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1531(para)
+#: C/evolution.xml:1525(para)
 msgid ""
 "Evolution has an Attachment Reminder plugin you can use to remind yourself "
 "to attach a file to an email. If it determines that you have not attached "
@@ -4136,7 +3989,7 @@ msgstr ""
 "recordarle que adjunte un archivo en un correo-e. Si determina que el "
 "archivo no está adjuntado, muestra el siguiente mensaje:"
 
-#: C/evolution.xml:1535(para)
+#: C/evolution.xml:1529(para)
 msgid ""
 "Click Continue Editing to attach the missing file, or click Send to send the "
 "message without any attachment."
@@ -4144,15 +3997,15 @@ msgstr ""
 "Pulse Continuar editando para adjuntar el archivo que se le está recordando "
 "que falta o pulse Enviar para enviar el mensaje sin ningún adjunto."
 
-#: C/evolution.xml:1538(para)
+#: C/evolution.xml:1532(para)
 msgid "To enable the Attachment Reminder:"
 msgstr "Para activar el Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1541(para)
+#: C/evolution.xml:1535(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Seleccione Editar &gt; Complementos &gt; Recuerdo de adjuntos."
 
-#: C/evolution.xml:1544(para)
+#: C/evolution.xml:1538(para)
 msgid ""
 "Click Configuration, then make sure that Remind Missing Attachments is "
 "selected."
@@ -4160,7 +4013,7 @@ msgstr ""
 "Pulse Configuración, después asegúrese de que Recordar los adjuntos "
 "faltantes está seleccionado."
 
-#: C/evolution.xml:1548(para)
+#: C/evolution.xml:1542(para)
 msgid ""
 "Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
 "and click Add."
@@ -4168,7 +4021,7 @@ msgstr ""
 "Seleccione las palabras clave tales como <quote>Adjuntar</quote> o "
 "<quote>Adjunto</quote> y pulse Añadir."
 
-#: C/evolution.xml:1549(para)
+#: C/evolution.xml:1543(para)
 msgid ""
 "Based on the keywords you have added here, it searches every mail you are "
 "sending. If it finds the keywords such as <quote>attach</quote> in your mail "
@@ -4180,7 +4033,7 @@ msgstr ""
 "tales como <quote>adjuntar</quote> y no hay un archivo adjunto, se le "
 "recuerda que faltan adjuntos."
 
-#: C/evolution.xml:1552(para)
+#: C/evolution.xml:1546(para)
 msgid ""
 "To edit any of the existing keywords, select the keyword, click Edit, then "
 "modify the word as desired."
@@ -4188,8 +4041,7 @@ msgstr ""
 "Para editar cualquiera de las palabras clave existentes, seleccione la "
 "palabra clave y pulse Editar, después modifique la palabra como desee."
 
-#: C/evolution.xml:1561(para)
-#, fuzzy
+#: C/evolution.xml:1555(para)
 msgid ""
 "<trademark>Evolution</trademark>, like most email programs, recognizes three "
 "types of addresses: primary recipients, secondary recipients, and hidden "
@@ -4204,7 +4056,7 @@ msgstr ""
 "electrónico en el campo Para:, que denota los destinatarios primarios. Use "
 "el campo Cc: para enviar un mensaje de correo a destinatarios secundarios."
 
-#: C/evolution.xml:1562(para)
+#: C/evolution.xml:1556(para)
 msgid ""
 "Addresses on the Bcc: list are hidden from the other recipients of the "
 "message. You can use it to send mail to large groups of people, especially "
@@ -4216,8 +4068,7 @@ msgstr ""
 "especialmente si no se conocen entre sí o si es importante mantener la "
 "privacidad. Si el campo Cco: no está a la vista pulse Ver &gt; Campo Cco."
 
-#: C/evolution.xml:1563(para)
-#, fuzzy
+#: C/evolution.xml:1557(para)
 msgid ""
 "If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
@@ -4230,25 +4081,24 @@ msgstr ""
 "cómo hacerlo consulte <link linkend=\"usage-contact-organize-group-list"
 "\">Crear una lista de contactos</link>."
 
-#: C/evolution.xml:1564(para)
-#, fuzzy
+#: C/evolution.xml:1558(para)
 msgid ""
 "Evolution has the ability to let you specify the Reply-To in an email. Using "
 "this, you can set up a special Reply-To for an email. To do this:"
 msgstr ""
-"Evolution tiene la capacidad de permitirle especificar el campo «Responder "
-"a:» en un correo-e. Usando esto, puede establecer un «Responder a:» especial "
-"para un correo-e. Para hacer esto:"
+"Evolution tiene la capacidad de permitirle especificar el campo Responder a: "
+"en un correo-e. Usando esto, puede establecer un Responder a: especial para "
+"un correo-e. Para hacer esto:"
 
-#: C/evolution.xml:1567(para)
+#: C/evolution.xml:1561(para)
 msgid "Open a compose window."
 msgstr "Abra una ventana del editor."
 
-#: C/evolution.xml:1570(para)
+#: C/evolution.xml:1564(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
 msgstr "Abra el campo Responder a pulsando en Ver &gt; Responder a."
 
-#: C/evolution.xml:1573(para)
+#: C/evolution.xml:1567(para)
 msgid ""
 "Specify the address you want as the Reply-To address in the new Reply-To "
 "field."
@@ -4256,17 +4106,16 @@ msgstr ""
 "Especifique la dirección a la que quiere que le respondan en el nuevo campo "
 "«Responder a»."
 
-#: C/evolution.xml:1576(para)
+#: C/evolution.xml:1570(para)
 msgid "Complete the rest of your message."
 msgstr "Complete el resto de su mensaje."
 
-#: C/evolution.xml:1579(para) C/evolution.xml:1947(para)
-#: C/evolution.xml:2161(para) C/evolution.xml:5206(para)
+#: C/evolution.xml:1573(para) C/evolution.xml:1941(para)
+#: C/evolution.xml:2155(para) C/evolution.xml:5200(para)
 msgid "Click Send."
 msgstr "Pulse Enviar."
 
-#: C/evolution.xml:1586(para)
-#, fuzzy
+#: C/evolution.xml:1580(para)
 msgid ""
 "Address auto completion is by default enabled in Evolution when you create "
 "contacts. Evolution makes it easy for you to quickly fill in the address "
@@ -4286,7 +4135,7 @@ msgstr ""
 "tarjeta, Evolution abrirá una caja de diálogo para preguntarle a qué persona "
 "se refiere."
 
-#: C/evolution.xml:1587(para)
+#: C/evolution.xml:1581(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
 "Preferences, then click Autocompletion. There, select the address book you "
@@ -4297,8 +4146,7 @@ msgstr ""
 "direcciones quequiere usar para el autocompletado de direcciones en el "
 "correo."
 
-#: C/evolution.xml:1588(para)
-#, fuzzy
+#: C/evolution.xml:1582(para)
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
 "the email addresses in your contacts. Select addresses and click the arrows "
@@ -4309,8 +4157,7 @@ msgstr ""
 "Seleccione las direcciones y pulse las flechas para moverlas entre las "
 "columnas de direcciones apropiadas."
 
-#: C/evolution.xml:1589(para)
-#, fuzzy
+#: C/evolution.xml:1583(para)
 msgid ""
 "For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
@@ -4318,13 +4165,12 @@ msgid ""
 "\">Scheduling With the Evolution Calendar</link>."
 msgstr ""
 "Para obtener más información acerca de cómo usar el correo-e con el "
-"administrador de contactos y el calendario, vea <link linkend=\"contact-"
+"administrador de contactos y el calendario consulte <link linkend=\"contact-"
 "automation-basic\">Envíeme una carta: Cómo añadir tarjetas rápidamente</"
 "link> y <link linkend=\"usage-calendar-apts\">Planificación con el "
 "calendario de Evolution</link>."
 
-#: C/evolution.xml:1594(para)
-#, fuzzy
+#: C/evolution.xml:1588(para)
 msgid ""
 "To reply to a message, click the message to reply to in the message list and "
 "click the Reply button in the toolbar, or right-click within the message and "
@@ -4344,7 +4190,7 @@ msgstr ""
 "el carácter &gt; antes de cada línea (para el modo texto plano), para "
 "indicar que es parte del mensaje anterior."
 
-#: C/evolution.xml:1595(para)
+#: C/evolution.xml:1589(para)
 msgid ""
 "If you're reading a message with several recipients, you can use Reply to "
 "All instead of Reply. If there are large numbers of people in the Cc: or To: "
@@ -4354,12 +4200,11 @@ msgstr ""
 "Responder a todos en lugar de Responder. Si hay un gran número de personas "
 "en los campos Para: o Cc: esto puede ahorrar mucho tiempo."
 
-#: C/evolution.xml:1598(title)
+#: C/evolution.xml:1592(title)
 msgid "Using the Reply To All Feature"
 msgstr "Uso de la característica de Responder a todos"
 
-#: C/evolution.xml:1599(para)
-#, fuzzy
+#: C/evolution.xml:1593(para)
 msgid ""
 "Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
@@ -4375,7 +4220,7 @@ msgstr ""
 "respuesta no la recibirá nadie a quien Susana haya incluido en la lista de "
 "Cco: de su mensaje original porque tal lista no ha sido compartida con nadie."
 
-#: C/evolution.xml:1600(para)
+#: C/evolution.xml:1594(para)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list, rather than to the sender, select Reply to List instead of Reply or "
@@ -4385,72 +4230,71 @@ msgstr ""
 "la misma en lugar de al remitente pulse en Responder la lista en lugar de "
 "Responder o de Responder a todos."
 
-#: C/evolution.xml:1604(title)
+#: C/evolution.xml:1598(title)
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:1612(para)
+#: C/evolution.xml:1606(para)
 msgid "Tools"
 msgstr "Herramientas"
 
-#: C/evolution.xml:1615(para)
+#: C/evolution.xml:1609(para)
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: C/evolution.xml:1622(para)
+#: C/evolution.xml:1616(para)
 msgid "Reply to sender"
 msgstr "Responder al remitente"
 
-#: C/evolution.xml:1625(para)
+#: C/evolution.xml:1619(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: C/evolution.xml:1630(para)
+#: C/evolution.xml:1624(para)
 msgid "Reply to List"
 msgstr "Responder a la lista"
 
-#: C/evolution.xml:1633(para)
+#: C/evolution.xml:1627(para)
 msgid "Clrl+L"
 msgstr "Clrl+L"
 
-#: C/evolution.xml:1638(para)
+#: C/evolution.xml:1632(para)
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: C/evolution.xml:1641(para)
+#: C/evolution.xml:1635(para)
 msgid "Shift+Ctrl+R"
 msgstr "Shift+Ctrl+R"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1646(para)
+#: C/evolution.xml:1640(para)
 msgid "Forward"
 msgstr "Reenviar"
 
-#: C/evolution.xml:1649(para)
+#: C/evolution.xml:1643(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: C/evolution.xml:1660(para)
-msgid ""
-"The message composer makes several text searching features available to you."
+#: C/evolution.xml:1654(para)
+msgid "The message composer makes several text searching features available to you."
 msgstr ""
 "El editor de mensajes le proporciona varias características de búsqueda de "
 "texto."
 
-#: C/evolution.xml:1662(title)
+#: C/evolution.xml:1656(title)
 msgid "Find:"
 msgstr "Buscar:"
 
-#: C/evolution.xml:1663(para)
+#: C/evolution.xml:1657(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr "Escriba una palabra o frase y Evolution la encontrará en el mensaje."
 
-#: C/evolution.xml:1666(title)
+#: C/evolution.xml:1660(title)
 msgid "Find Regex:"
 msgstr "Buscar expresión regular:"
 
-#: C/evolution.xml:1667(para)
+#: C/evolution.xml:1661(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
 "\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
@@ -4462,24 +4306,23 @@ msgstr ""
 "ventana de su editor. Si no está seguro de lo que es una expresión regular, "
 "debería ignorar esta característica."
 
-#: C/evolution.xml:1670(title)
+#: C/evolution.xml:1664(title)
 msgid "Find Again:"
 msgstr "Buscar de nuevo:"
 
-#: C/evolution.xml:1671(para)
+#: C/evolution.xml:1665(para)
 msgid "Select this item to repeat the last search you performed."
-msgstr ""
-"Seleccione este elemento para repetir la última búsqueda que haya realizado."
+msgstr "Seleccione este elemento para repetir la última búsqueda que haya realizado."
 
-#: C/evolution.xml:1674(title)
+#: C/evolution.xml:1668(title)
 msgid "Replace:"
 msgstr "Reemplazar:"
 
-#: C/evolution.xml:1675(para)
+#: C/evolution.xml:1669(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr "Buscar una palabra o una frase y sustituirla por otra cosa."
 
-#: C/evolution.xml:1677(para)
+#: C/evolution.xml:1671(para)
 msgid ""
 "For all of these menu items, you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -4489,8 +4332,7 @@ msgstr ""
 "punto el que se encuentra el cursor. También puede determinar si quiere que "
 "la búsqueda sea sensible a mayúsculas o no."
 
-#: C/evolution.xml:1682(para)
-#, fuzzy
+#: C/evolution.xml:1676(para)
 msgid ""
 "Normally, you can't set text styles or insert pictures in email. However, "
 "most newer email programs can display images and text styles in addition to "
@@ -4503,7 +4345,7 @@ msgstr ""
 "básico y formateo de párrafos. Esto es posible al usar <glossterm linkend="
 "\"html\">HTML</glossterm> al igual que las páginas web."
 
-#: C/evolution.xml:1683(para)
+#: C/evolution.xml:1677(para)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -4514,11 +4356,11 @@ msgstr ""
 "descargar y de mostrar en pantalla. Por ello Evolution envía mensajes de "
 "texto plano a menos que le pida explícitamenteque los componga con HTML."
 
-#: C/evolution.xml:1686(title)
+#: C/evolution.xml:1680(title)
 msgid "Basic HTML Formatting"
 msgstr "Formateo básico de HTML"
 
-#: C/evolution.xml:1687(para)
+#: C/evolution.xml:1681(para)
 msgid ""
 "You can change the format of an email message from plain text to HTML by "
 "choosing Format &gt; HTML from the menu bar."
@@ -4526,7 +4368,7 @@ msgstr ""
 "Puede cambiar el formato de un mensaje de correo electrónico de texto plano "
 "a HTML eligiendo Formato &gt; HTML desde la barra de menú."
 
-#: C/evolution.xml:1688(para)
+#: C/evolution.xml:1682(para)
 msgid ""
 "To send all your mail as HTML by default, set your mail format preferences "
 "in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
@@ -4537,7 +4379,7 @@ msgstr ""
 "de configuración del correo. Para obtener más información consulte la <xref "
 "linkend=\"config-prefs-mail-composer\"/>."
 
-#: C/evolution.xml:1689(para)
+#: C/evolution.xml:1683(para)
 msgid ""
 "HTML formatting tools are located in the toolbar just above the space where "
 "you actually compose the message. They also appear in the Insert and Format "
@@ -4547,7 +4389,7 @@ msgstr ""
 "justo encima del espacio en el que realmente compone su mensaje y también "
 "aparecen en los menús Insertar y Formato."
 
-#: C/evolution.xml:1690(para)
+#: C/evolution.xml:1684(para)
 msgid ""
 "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
 "tips</link>, which appear when you hold your mouse pointer over the buttons. "
@@ -4557,11 +4399,11 @@ msgstr ""
 "\"tooltip\">consejos</glossterm> que aparecen cuando mantiene el ratón sobre "
 "los botones. Estos se clasifican en cuatro categorías:"
 
-#: C/evolution.xml:1692(title)
+#: C/evolution.xml:1686(title)
 msgid "Headers and Lists:"
 msgstr "Cabeceras y listas:"
 
-#: C/evolution.xml:1693(para)
+#: C/evolution.xml:1687(para)
 msgid ""
 "At the left edge of the toolbar, you can choose Normal for a default text "
 "style or Header 1 through Header 6 for varying sizes of header from large "
@@ -4574,7 +4416,7 @@ msgstr ""
 "pequeño). Otros estilos disponibles para los más organizados son Preformato, "
 "la lista de puntos o los tres tipos de listas numeradas."
 
-#: C/evolution.xml:1695(para)
+#: C/evolution.xml:1689(para)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the Bulleted List style from the style drop-down list. Evolution uses "
@@ -4586,11 +4428,11 @@ msgstr ""
 "distintos estilos para las listas de topos y maneja varios niveles de "
 "sangría y de ajuste para las palabras."
 
-#: C/evolution.xml:1697(title)
+#: C/evolution.xml:1691(title)
 msgid "Text Styles:"
 msgstr "Estilos de texto:"
 
-#: C/evolution.xml:1698(para)
+#: C/evolution.xml:1692(para)
 msgid ""
 "Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
@@ -4600,15 +4442,15 @@ msgstr ""
 "seleccionado un texto, el estilo se aplicará sobre él. Si no, el estilo se "
 "aplicará a lo próximo que escriba."
 
-#: C/evolution.xml:1707(para)
+#: C/evolution.xml:1701(para)
 msgid "Button"
 msgstr "Botón"
 
-#: C/evolution.xml:1717(para)
+#: C/evolution.xml:1711(para)
 msgid "TT"
 msgstr "TT"
 
-#: C/evolution.xml:1720(para)
+#: C/evolution.xml:1714(para)
 msgid ""
 "Typewriter text, which is approximately the same as the Courier monospace "
 "font."
@@ -4616,43 +4458,43 @@ msgstr ""
 "Texto de máquina de escribir, es aproximadamente igual a la tipografía "
 "monoespaciadia Courier."
 
-#: C/evolution.xml:1725(para)
+#: C/evolution.xml:1719(para)
 msgid "Bold A"
 msgstr "A en negrita"
 
-#: C/evolution.xml:1728(para)
+#: C/evolution.xml:1722(para)
 msgid "Bolds the text."
 msgstr "Pone el texto en negrita."
 
-#: C/evolution.xml:1733(para)
+#: C/evolution.xml:1727(para)
 msgid "Italic A"
 msgstr "A en cursiva"
 
-#: C/evolution.xml:1736(para)
+#: C/evolution.xml:1730(para)
 msgid "Italicizes the text."
 msgstr "Pone el texto en cursiva."
 
-#: C/evolution.xml:1741(para)
+#: C/evolution.xml:1735(para)
 msgid "Underlined A"
 msgstr "A subrayada"
 
-#: C/evolution.xml:1744(para)
+#: C/evolution.xml:1738(para)
 msgid "Underlines the text."
 msgstr "Subraya el texto."
 
-#: C/evolution.xml:1749(para)
+#: C/evolution.xml:1743(para)
 msgid "Strike through A"
 msgstr "A tachada"
 
-#: C/evolution.xml:1752(para)
+#: C/evolution.xml:1746(para)
 msgid "Marks a line through the text."
 msgstr "Tacha el texto."
 
-#: C/evolution.xml:1759(title)
+#: C/evolution.xml:1753(title)
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: C/evolution.xml:1760(para)
+#: C/evolution.xml:1754(para)
 msgid ""
 "Located next to the text style buttons, the three paragraph icons should be "
 "familiar to users of most word processing software. The left most button "
@@ -4664,11 +4506,11 @@ msgstr ""
 "El que está más a la izquierda alinea el texto a la izquierda, el del "
 "centro, lo centra y el de la derecha lo alinea hacia el lado derecho."
 
-#: C/evolution.xml:1763(title)
+#: C/evolution.xml:1757(title)
 msgid "Indentation Rules:"
 msgstr "Reglas de sangrado:"
 
-#: C/evolution.xml:1764(para)
+#: C/evolution.xml:1758(para)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -4676,12 +4518,11 @@ msgstr ""
 "El botón con la flecha que apunta a la izquierda reducirá la sangría de un "
 "párrafo y el de la derecha la aumentará."
 
-#: C/evolution.xml:1767(title)
+#: C/evolution.xml:1761(title)
 msgid "Color Selection:"
 msgstr "Selección de color:"
 
-#: C/evolution.xml:1768(para)
-#, fuzzy
+#: C/evolution.xml:1762(para)
 msgid ""
 "At the far right is the color section tool, where a box displays the current "
 "text color. To choose a new color, click the arrow button to the right. If "
@@ -4696,14 +4537,13 @@ msgstr ""
 "de texto seleccionado el color se aplicará al mismo. Si no, el color se "
 "aplicará a lo que escriba después. Puede seleccionar un color o imagen de "
 "fondo pulsando con el botón derecho del ratón sobre el fondo del mensaje, "
-"para después seleccionar Estilo de la página."
+"para después seleccionar Estilo &gt; Estilo de la página."
 
-#: C/evolution.xml:1773(title)
+#: C/evolution.xml:1767(title)
 msgid "Advanced HTML Formatting"
 msgstr "Formato HTML avanzado"
 
-#: C/evolution.xml:1774(para)
-#, fuzzy
+#: C/evolution.xml:1768(para)
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
 "your email. To use these and other HTML formatting tools, make sure you have "
@@ -4711,13 +4551,13 @@ msgid ""
 msgstr ""
 "Bajo el menú Insertar, hay varios elementos más que puede usar para dar "
 "estilo a su correo-e. Para usar éstas y otras herramientas de formato HTML , "
-"asegúrese de que ha activado el modo HTML usando Formato HTML."
+"asegúrese de que ha activado el modo HTML usando Formato &gt; HTML."
 
-#: C/evolution.xml:1777(title)
+#: C/evolution.xml:1771(title)
 msgid "Inserting a Link"
 msgstr "Insertar un enlace"
 
-#: C/evolution.xml:1778(para)
+#: C/evolution.xml:1772(para)
 msgid ""
 "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
 "don't want special link text, you can just enter the address directly, and "
@@ -4727,79 +4567,77 @@ msgstr ""
 "HTML. Si no quiere escribir ningún texto en particular, sólo tiene que "
 "escribir la dirección directamente y Evolution la reconocerá como un enlace."
 
-#: C/evolution.xml:1781(para)
+#: C/evolution.xml:1775(para)
 msgid "Select the text you want to link from."
 msgstr "Seleccione el texto en el que quiere poner el enlace."
 
-#: C/evolution.xml:1784(para)
+#: C/evolution.xml:1778(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el texto, después elija Insertar "
 "enlace."
 
-#: C/evolution.xml:1787(para)
+#: C/evolution.xml:1781(para)
 msgid "Type the URL in the URL field."
 msgstr "Escriba el URL en el campo URL."
 
-#: C/evolution.xml:1796(title)
+#: C/evolution.xml:1790(title)
 msgid "Inserting an Image"
 msgstr "Insertar una imagen"
 
-#: C/evolution.xml:1799(para)
+#: C/evolution.xml:1793(para)
 msgid "Click Insert &gt; Image in the menubar."
 msgstr "Pulse Insertar &gt; Imagen en la barra del menú,"
 
-#: C/evolution.xml:1802(para)
+#: C/evolution.xml:1796(para)
 msgid "Browse to and select the image file."
 msgstr "Navegue y seleccione el archivo de la imagen."
 
-#: C/evolution.xml:1811(title)
+#: C/evolution.xml:1805(title)
 msgid "Inserting a Rule"
 msgstr "Insertar una regla"
 
-#: C/evolution.xml:1812(para)
-msgid ""
-"You can insert a horizontal line into the text to help divide two sections:"
-msgstr ""
-"Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
+#: C/evolution.xml:1806(para)
+msgid "You can insert a horizontal line into the text to help divide two sections:"
+msgstr "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
-#: C/evolution.xml:1815(para)
+#: C/evolution.xml:1809(para)
 msgid "Click Insert &gt; Rule in the menubar."
 msgstr "Pulse Insertar &gt; Regla en la barra de menú."
 
-#: C/evolution.xml:1818(para)
+#: C/evolution.xml:1812(para)
 msgid "Select the width, size, and alignment."
 msgstr "Seleccione la anchura, tamaño y el alineamiento."
 
-#: C/evolution.xml:1821(para)
+#: C/evolution.xml:1815(para)
 msgid "Select Shade if necessary."
 msgstr "Si es necesario, seleccione el sombreado."
 
-#: C/evolution.xml:1830(title)
+#: C/evolution.xml:1824(title)
 msgid "Inserting a Table"
 msgstr "Insertar una tabla"
 
-#: C/evolution.xml:1831(para)
+#: C/evolution.xml:1825(para)
 msgid "You can insert a table into the text:"
 msgstr "Para insertar una tabla en el texto:"
 
-#: C/evolution.xml:1834(para)
+#: C/evolution.xml:1828(para)
 msgid "Click Insert &gt; Table in the menubar."
 msgstr "Pulse Insertar &gt; Tabla en la barra de menú."
 
-#: C/evolution.xml:1837(para)
+#: C/evolution.xml:1831(para)
 msgid "Select the number of rows and columns."
 msgstr "Seleccione el número de filas y columnas."
 
-#: C/evolution.xml:1840(para)
+#: C/evolution.xml:1834(para)
 msgid "Select the type of layout for the table."
 msgstr "Seleccione el tipo de disposición para la tabla."
 
-#: C/evolution.xml:1843(para)
+#: C/evolution.xml:1837(para)
 msgid "Select a background for the table."
 msgstr "Seleccione un fondo para la tabla."
 
-#: C/evolution.xml:1844(para)
+#: C/evolution.xml:1838(para)
 msgid ""
 "To insert a picture for the background, click the filechooser button and "
 "select the desired image."
@@ -4807,17 +4645,15 @@ msgstr ""
 "Para introducir una imagen para el fondo de pantalla, pulse el botón del "
 "selector de archivos y seleccione la imagen que desee."
 
-#: C/evolution.xml:1856(para)
+#: C/evolution.xml:1850(para)
 msgid "You can set the following options when sending mail in Evolution."
-msgstr ""
-"Puede establecer las siguientes opciones cuando envía correos con Evolution."
+msgstr "Puede establecer las siguientes opciones cuando envía correos con Evolution."
 
-#: C/evolution.xml:1858(title)
+#: C/evolution.xml:1852(title)
 msgid "Read Receipts:"
 msgstr "Confirmación de lectura:"
 
-#: C/evolution.xml:1859(para)
-#, fuzzy
+#: C/evolution.xml:1853(para)
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
@@ -4830,11 +4666,11 @@ msgstr ""
 "importante. Para enviar una petición de lectura, pulse Insertar &gt; "
 "Solicitar confirmación de lectura en la ventana del editor."
 
-#: C/evolution.xml:1862(title)
+#: C/evolution.xml:1856(title)
 msgid "Prioritize Message:"
 msgstr "Priorizar mensaje:"
 
-#: C/evolution.xml:1863(para)
+#: C/evolution.xml:1857(para)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
 "relative importance.To prioritize a message, click Insert &gt; Prioritize "
@@ -4844,7 +4680,7 @@ msgstr ""
 "importancia relativa. Para priorizar un mensaje, pulse Insertar &gt; "
 "Priorizar mensaje en la ventana del editor."
 
-#: C/evolution.xml:1866(para)
+#: C/evolution.xml:1860(para)
 msgid ""
 "Evolution will ignore the message priority, because it assumes that the "
 "recipient should decide whether the message is important or not."
@@ -4853,11 +4689,11 @@ msgstr ""
 "debería decidir si el mensaje es importante o no."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:1871(title)
+#: C/evolution.xml:1865(title)
 msgid "Default Settings"
 msgstr "Ajustes predeterminados"
 
-#: C/evolution.xml:1872(para)
+#: C/evolution.xml:1866(para)
 msgid ""
 "Evolution allows you to change the default settings. You can organize your "
 "draft folder and sent folder, set the addresses to which you want to sent "
@@ -4870,25 +4706,25 @@ msgstr ""
 "También puede cambiar los ajustes para los destinatarios de los mensajes "
 "desde la ventana Predeterminados."
 
-#: C/evolution.xml:1874(para)
+#: C/evolution.xml:1868(para)
 msgid "To change your default settings,"
 msgstr "Cambiar los ajustes predeterminados,"
 
-#: C/evolution.xml:1880(para)
+#: C/evolution.xml:1874(para)
 msgid "Select the mail account whose default settings you want to change."
 msgstr ""
 "Seleccione la cuenta de correo de la que quiere cambiar los ajustes "
 "predeterminados."
 
-#: C/evolution.xml:1883(para)
+#: C/evolution.xml:1877(para)
 msgid "Click Edit to open Account Editor window."
 msgstr "Pulse Editar para abrir la ventana del editor de cuentas."
 
-#: C/evolution.xml:1886(para)
+#: C/evolution.xml:1880(para)
 msgid "Click Default tab."
 msgstr "Pulse sobre la solapa Predeterminados."
 
-#: C/evolution.xml:1889(para)
+#: C/evolution.xml:1883(para)
 msgid ""
 "Click the respective check boxes and enter the email addresses you want CC "
 "and BCC to."
@@ -4896,19 +4732,17 @@ msgstr ""
 "Pulse las respectivas casillas de verificación e introduzca la dirección de "
 "correo-e que quiere usar para los campos Cc y Cco."
 
-#: C/evolution.xml:1892(para)
-msgid ""
-"Select the desired option for send message receipts from the drop-down list."
+#: C/evolution.xml:1886(para)
+msgid "Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Seleccione la opción que desea para la notificación de recepción de mensajes "
 "de la lista desplegable."
 
-#: C/evolution.xml:1897(title)
+#: C/evolution.xml:1891(title)
 msgid "Changing Default Folder for Sent and Draft Items"
-msgstr ""
-"Cambiar la carpeta predeterminada para el Correo enviado y los Borradores"
+msgstr "Cambiar la carpeta predeterminada para el Correo enviado y los Borradores"
 
-#: C/evolution.xml:1898(para)
+#: C/evolution.xml:1892(para)
 msgid ""
 "By default, all the sent messages directly goes to Sent folder and those "
 "messages marked as drafts are saved in Draft folder. To change the default "
@@ -4919,32 +4753,31 @@ msgstr ""
 "la carpeta Borradores. Para cambiar el ajuste predeterminado para los "
 "borradores,"
 
-#: C/evolution.xml:1901(para)
+#: C/evolution.xml:1895(para)
 msgid "Click Drafts button to open Folder view."
 msgstr "Pulse el botón Borradores para abrir la vista de carpeta."
 
-#: C/evolution.xml:1904(para)
+#: C/evolution.xml:1898(para)
 msgid "Select the folder you want to save the drafts to."
 msgstr "Seleccione la carpeta en la que quiere guardar los borradores."
 
-#: C/evolution.xml:1910(para) C/evolution.xml:1926(para)
+#: C/evolution.xml:1904(para) C/evolution.xml:1920(para)
 msgid "Click Revert button to revert back to previous settings."
 msgstr "Pulse el botón Revertir para revertir al ajuste anterior."
 
-#: C/evolution.xml:1914(para)
+#: C/evolution.xml:1908(para)
 msgid "To change the default folder for sent items,"
 msgstr "Para cambiar la carpeta predeterminada para los elementos enviados,"
 
-#: C/evolution.xml:1917(para)
+#: C/evolution.xml:1911(para)
 msgid "Click Sent button to open the Folder view."
 msgstr "Pulse el botón Correo enviado para abrir la vista de carpeta."
 
-#: C/evolution.xml:1920(para)
+#: C/evolution.xml:1914(para)
 msgid "Select the desired folder for sent items."
 msgstr "Seleccione la carpeta que desea para los elementos enviados."
 
-#: C/evolution.xml:1934(para)
-#, fuzzy
+#: C/evolution.xml:1928(para)
 msgid ""
 "When you receive an email, you can forward it to other individuals or groups "
 "that might be interested. You can forward a message as an attachment to a "
@@ -4967,15 +4800,15 @@ msgstr ""
 "al autor original del mensaje y diferenciar claramente las partes del texto "
 "que ha modificado, borrado o añadido."
 
-#: C/evolution.xml:1935(para)
+#: C/evolution.xml:1929(para)
 msgid "To forward a message you are reading:"
 msgstr "Reenviar un mensaje que está leyendo:"
 
-#: C/evolution.xml:1938(para)
+#: C/evolution.xml:1932(para)
 msgid "Click Forward on the toolbar."
 msgstr "Pulse Reenviar en la barra de herramientas."
 
-#: C/evolution.xml:1940(para)
+#: C/evolution.xml:1934(para)
 msgid ""
 "If you prefer to forward the message <link linkend=\"inline\">inline</link> "
 "instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
@@ -4984,7 +4817,7 @@ msgstr ""
 "lugar de como adjunto, pulse en el menú Mensaje &gt; Reenviar como &gt; "
 "Incluido en línea."
 
-#: C/evolution.xml:1943(para)
+#: C/evolution.xml:1937(para)
 msgid ""
 "Select an addressee as you would when sending a new message; the subject is "
 "already entered, although you can alter it if you want."
@@ -4992,11 +4825,11 @@ msgstr ""
 "Seleccione una dirección como lo haría al enviar un mensaje nuevo, el asunto "
 "ya está introducido, aunque puede cambiarlo si lo desea."
 
-#: C/evolution.xml:1946(para)
+#: C/evolution.xml:1940(para)
 msgid "Add your comments on the message in the composition frame"
 msgstr "Añada sus comentarios en el mensaje dentro del marco de edición"
 
-#: C/evolution.xml:1950(para)
+#: C/evolution.xml:1944(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -5006,7 +4839,7 @@ msgstr ""
 "el mensaje original como un adjunto. Los mensajes incluidos no reenvían "
 "ningún adjunto."
 
-#: C/evolution.xml:1957(para)
+#: C/evolution.xml:1951(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -5017,7 +4850,7 @@ msgstr ""
 "varias capas de signos de mayor que (&gt;) que indican sucesivos reenvíos "
 "descuidados."
 
-#: C/evolution.xml:1960(para)
+#: C/evolution.xml:1954(para)
 msgid ""
 "Always begin and close with a salutation. Say <quote>please</quote> and "
 "<quote>thank you,</quote> just like you do in real life. You can keep your "
@@ -5027,7 +4860,7 @@ msgstr ""
 "<quote>gracias</quote> de la misma manera que haría en la vida real. Puede "
 "ser breve en sus cumplidos pero sea educado."
 
-#: C/evolution.xml:1963(para)
+#: C/evolution.xml:1957(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -5035,7 +4868,7 @@ msgstr ""
 "CUANDO ESCRIBE CON MAYÚSCULAS SIGNIFICA QUE EST� GRITANDO No escriba "
 "mensajes enteros con mayúsculas porque a la gente le dolerán los oídos."
 
-#: C/evolution.xml:1966(para)
+#: C/evolution.xml:1960(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -5044,12 +4877,11 @@ msgstr ""
 "preconfigurado para destacar las palabras que no reconozca con una línea "
 "roja bajo las palabras conforme las vaya escribiendo."
 
-#: C/evolution.xml:1969(para)
+#: C/evolution.xml:1963(para)
 msgid "Don't send nasty emails (flames). If you get one, don't write back."
-msgstr ""
-"No envíe correos desagradables. Si recibe alguno, mejor no lo responda."
+msgstr "No envíe correos desagradables. Si recibe alguno, mejor no lo responda."
 
-#: C/evolution.xml:1972(para)
+#: C/evolution.xml:1966(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -5057,11 +4889,11 @@ msgstr ""
 "Cuando conteste o reenvíe un mensaje incluya lo justo del mensaje anterior "
 "para proporcionar el contexto necesario."
 
-#: C/evolution.xml:1975(para)
+#: C/evolution.xml:1969(para)
 msgid "Don't send spam."
 msgstr "No envíe spam."
 
-#: C/evolution.xml:1983(para)
+#: C/evolution.xml:1977(para)
 msgid ""
 "If you create an event in the calendar component, you can then send "
 "invitations to the attendee list through the Evolution email tool. The "
@@ -5072,7 +4904,7 @@ msgstr ""
 "Evolution. La tarjeta de invitación se envía como archivo adjunto en formato "
 "iCal."
 
-#: C/evolution.xml:1984(para)
+#: C/evolution.xml:1978(para)
 msgid ""
 "To send an invitation, right click on the calendar item and click Forward as "
 "iCalendar."
@@ -5080,15 +4912,15 @@ msgstr ""
 "Para enviar una invitación pulse con el botón derecho sobre el elemento del "
 "calendario y pulse Reenviar como iCalendar."
 
-#: C/evolution.xml:1985(para)
+#: C/evolution.xml:1979(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Cuando reciba una invitación, tiene varias opciones:"
 
-#: C/evolution.xml:1987(title)
+#: C/evolution.xml:1981(title)
 msgid "Accept:"
 msgstr "Aceptar:"
 
-#: C/evolution.xml:1988(para)
+#: C/evolution.xml:1982(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -5096,11 +4928,11 @@ msgstr ""
 "Indica que asistirá a la reunión. Cuando pulse el botón Aceptar, la reunión "
 "se apuntará en su agenda."
 
-#: C/evolution.xml:1991(title)
+#: C/evolution.xml:1985(title)
 msgid "Tentatively Accept:"
 msgstr "Aceptado provisionalmente:"
 
-#: C/evolution.xml:1992(para)
+#: C/evolution.xml:1986(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -5109,11 +4941,11 @@ msgstr ""
 "Indica que es probable que asista a la reunión. Cuando pulse el botón "
 "Aceptar la reunión se apuntará en su agenda, pero marcada como provisional."
 
-#: C/evolution.xml:1995(title)
+#: C/evolution.xml:1989(title)
 msgid "Decline:"
 msgstr "Rehusar:"
 
-#: C/evolution.xml:1996(para)
+#: C/evolution.xml:1990(para)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
@@ -5123,18 +4955,17 @@ msgstr ""
 "calendario al pulsar Aceptar, aunque su respuesta se envía al organizador de "
 "la reunión si ha seleccionado la opción Responder al remitente."
 
-#: C/evolution.xml:1999(title)
+#: C/evolution.xml:1993(title)
 msgid "Send reply to sender:"
 msgstr "Responder al remitente:"
 
-#: C/evolution.xml:2000(para)
-msgid ""
-"Select this option if you want your response sent to the meeting organizers."
+#: C/evolution.xml:1994(para)
+msgid "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Marque esta casilla si quiere que su respuesta llegue a los organizadores de "
 "la reunión."
 
-#: C/evolution.xml:2006(para)
+#: C/evolution.xml:2000(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -5150,11 +4981,11 @@ msgstr ""
 "si quiere escoger elementos específicos y excluir el resto, puede usar la "
 "herramienta de gestión de suscripciones."
 
-#: C/evolution.xml:2009(para)
+#: C/evolution.xml:2003(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Seleccione Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:2012(para)
+#: C/evolution.xml:2006(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -5162,15 +4993,15 @@ msgstr ""
 "Si tiene cuentas en varios servidores IMAP, seleccione el servidor donde "
 "quiere gestionar sus suscripciones."
 
-#: C/evolution.xml:2013(para)
+#: C/evolution.xml:2007(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution mostrará la lista de carpetas y archivos disponibles."
 
-#: C/evolution.xml:2016(para)
+#: C/evolution.xml:2010(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Seleccione un archivo o carpeta pulsando sobre él."
 
-#: C/evolution.xml:2017(para)
+#: C/evolution.xml:2011(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5181,18 +5012,17 @@ msgstr ""
 "puede incluir carpetas que no son de correo, que puede ignorar sin mayor "
 "problema."
 
-#: C/evolution.xml:2020(para)
-msgid ""
-"Enable the corresponding checkbox to add a folder to the subscribed list."
+#: C/evolution.xml:2014(para)
+msgid "Enable the corresponding checkbox to add a folder to the subscribed list."
 msgstr ""
 "Active la correspondiente casilla de verificación para añadir una carpeta a "
 "su lista de suscripción."
 
-#: C/evolution.xml:2023(para)
+#: C/evolution.xml:2017(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr "Cierre la ventana cuando se haya suscrito a las carpetas que desea."
 
-#: C/evolution.xml:2030(para)
+#: C/evolution.xml:2024(para)
 msgid ""
 "To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
@@ -5200,15 +5030,15 @@ msgstr ""
 "Para proteger y codificar sus transmisiones de correos-e, Evolution ofrece "
 "dos métodos de cifrado:"
 
-#: C/evolution.xml:2033(para)
+#: C/evolution.xml:2027(para)
 msgid "GPG Encryption"
 msgstr "Cifrado GPG"
 
-#: C/evolution.xml:2036(para) C/evolution.xml:2194(title)
+#: C/evolution.xml:2030(para) C/evolution.xml:2188(title)
 msgid "S/MIME Encryption"
 msgstr "Cifrado S/MIME"
 
-#: C/evolution.xml:2039(para)
+#: C/evolution.xml:2033(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5218,8 +5048,7 @@ msgstr ""
 "Guard (GPG), una implementación del potente algoritmo de <link linkend="
 "\"public-key-encryption\">cifrado de clave pública</link>."
 
-#: C/evolution.xml:2040(para)
-#, fuzzy
+#: C/evolution.xml:2034(para)
 msgid ""
 "In order to send and receive encrypted emails using GPG, it is necessary to "
 "use two kinds of encryption keys: public and private. Public keys are used "
@@ -5235,7 +5064,7 @@ msgstr ""
 "compartir con aquellos a los que quiera enviar mensajes cifrados. También "
 "puede subirlas a un servidor de claves públicas."
 
-#: C/evolution.xml:2041(para)
+#: C/evolution.xml:2035(para)
 msgid ""
 "Those who wish to send you encrypted email must first have a copy of your "
 "public key on your keyring. To this end, public keys can be shared with "
@@ -5249,7 +5078,7 @@ msgstr ""
 "mensajes cifrados. Para ello, debe subir sus claves públicas a un servidor "
 "de claves públicas. Las claves privadas no se deben compartir con otros."
 
-#: C/evolution.xml:2042(para)
+#: C/evolution.xml:2036(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
@@ -5257,11 +5086,11 @@ msgstr ""
 "Evolution no soporta versiones antiguas de PGP, tales como OpenPGP y PGP "
 "inluido."
 
-#: C/evolution.xml:2043(para)
+#: C/evolution.xml:2037(para)
 msgid "You can use encryption in two different ways:"
 msgstr "El cifrado se puede usar de dos maneras diferentes:"
 
-#: C/evolution.xml:2046(para)
+#: C/evolution.xml:2040(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5269,7 +5098,7 @@ msgstr ""
 "Puede cifrar el mensaje entero para que nadie, excepto el destinatario, "
 "pueda leerlo."
 
-#: C/evolution.xml:2049(para)
+#: C/evolution.xml:2043(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5280,7 +5109,7 @@ msgstr ""
 "necesitaría descifrar la firma cuando quiera verificar la identidad del "
 "remitente."
 
-#: C/evolution.xml:2052(para)
+#: C/evolution.xml:2046(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
@@ -5296,11 +5125,11 @@ msgstr ""
 "usa su clave privada para descifrarlo y el mensaje quedará listo para su "
 "lectura."
 
-#: C/evolution.xml:2055(title)
+#: C/evolution.xml:2049(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Crear claves de cifrado GPG"
 
-#: C/evolution.xml:2056(para)
+#: C/evolution.xml:2050(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5313,16 +5142,15 @@ msgstr ""
 "exacto. Puede averiguar la versión exacta usando la orden <command>gpg --"
 "version</command>."
 
-#: C/evolution.xml:2059(para)
+#: C/evolution.xml:2053(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
-msgstr ""
-"Abra una terminal e instroduzca el comando <command>gpg --gen-key</command>."
+msgstr "Abra una terminal e instroduzca el comando <command>gpg --gen-key</command>."
 
-#: C/evolution.xml:2062(para)
+#: C/evolution.xml:2056(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Seleccione un algoritmo, después pulse Intro."
 
-#: C/evolution.xml:2064(para)
+#: C/evolution.xml:2058(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5330,7 +5158,7 @@ msgstr ""
 "Para aceptar el algoritmo predeterminado «DSA y ElGamal», pulse Intro "
 "(recomendado)."
 
-#: C/evolution.xml:2067(para)
+#: C/evolution.xml:2061(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5338,11 +5166,11 @@ msgstr ""
 "Seleccione una longitud de clave, después pulse Intro. Para aceptar la "
 "predeterminada, de 1024 bits, pulse Intro."
 
-#: C/evolution.xml:2070(para)
+#: C/evolution.xml:2064(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Introduzca el timepo para la cual su clave deberá ser válida."
 
-#: C/evolution.xml:2072(para)
+#: C/evolution.xml:2066(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5350,32 +5178,31 @@ msgstr ""
 "Para aceptar la opción predeterminada sin caducidad, pulse Intro, después "
 "puse Y cuando se le pregunte la verificación de su elección."
 
-#: C/evolution.xml:2075(para)
+#: C/evolution.xml:2069(para)
 msgid "Type your real name, then press Enter."
 msgstr "Escriba su nombre real, después pulse Intro."
 
-#: C/evolution.xml:2078(para)
+#: C/evolution.xml:2072(para)
 msgid "Type your email address, then press Enter."
 msgstr "Escriba su dirección de correo-e, después pulse Intro."
 
-#: C/evolution.xml:2081(para)
+#: C/evolution.xml:2075(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "(Opcional) Escriba un comentario, después pulse Intro."
 
-#: C/evolution.xml:2084(para)
+#: C/evolution.xml:2078(para)
 msgid "Review your selected user ID. If it is correct, press O."
-msgstr ""
-"Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
+msgstr "Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
 
-#: C/evolution.xml:2087(para)
+#: C/evolution.xml:2081(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Escriba una frase de paso, después pulse Intro."
 
-#: C/evolution.xml:2090(para)
+#: C/evolution.xml:2084(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Mueva su ratón aleatoriamente para generar las claves."
 
-#: C/evolution.xml:2093(para)
+#: C/evolution.xml:2087(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5391,7 +5218,7 @@ msgstr ""
 "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
 "computeroutput>"
 
-#: C/evolution.xml:2094(para)
+#: C/evolution.xml:2088(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5402,11 +5229,11 @@ msgstr ""
 "están guardadas en el archivo ~/.gnupg/pubring.gpg. Si quiere darle a "
 "alguien su clave, envíele éste archivo."
 
-#: C/evolution.xml:2095(para)
+#: C/evolution.xml:2089(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr "Si lo desea puede subir sus claves a un servidor de claves."
 
-#: C/evolution.xml:2098(para)
+#: C/evolution.xml:2092(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after 1024D "
 "on the line beginning with pub. In the example above, it is 32j38dk2."
@@ -5415,7 +5242,7 @@ msgstr ""
 "identificador será la cadena que está detras de 1024D en la línea que "
 "empieza con «pub». En estte ejemplo es 32j38dk2."
 
-#: C/evolution.xml:2101(para)
+#: C/evolution.xml:2095(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5426,7 +5253,7 @@ msgstr ""
 "clave por <varname>32j38dk2</varname>. Necesitará su contraseña para poder "
 "hacerlo."
 
-#: C/evolution.xml:2104(para)
+#: C/evolution.xml:2098(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5441,7 +5268,7 @@ msgstr ""
 "publicarla de una vez y permitir a los demás descargarlas desde un servidor "
 "central cuando ellos quieran."
 
-#: C/evolution.xml:2105(para)
+#: C/evolution.xml:2099(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5451,11 +5278,11 @@ msgstr ""
 "herramienta de cifrado para buscarla automáticamente. Si no puede encontrar "
 "la clave se mostrará un mensaje de error."
 
-#: C/evolution.xml:2109(title)
+#: C/evolution.xml:2103(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Obtener y usar claves GPG públicas"
 
-#: C/evolution.xml:2110(para)
+#: C/evolution.xml:2104(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5465,7 +5292,7 @@ msgstr ""
 "combinación con su clave privada. Evolution lo hace por usted, pero con todo "
 "necesitará obtener su clave y añadirla a su depósito de claves."
 
-#: C/evolution.xml:2111(para)
+#: C/evolution.xml:2105(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5478,7 +5305,7 @@ msgstr ""
 "por el identificador del destinatario. Necesitará escribir su contraseña y "
 "su identificador se añadirá automáticamente a su llavero."
 
-#: C/evolution.xml:2113(para)
+#: C/evolution.xml:2107(para)
 msgid ""
 "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
 "to multiple hosts in various networks. The gpg utility tries to connect to "
@@ -5490,7 +5317,7 @@ msgstr ""
 "a una en la red actual y si ese servidor en particular está caído, falla al "
 "superarse el tiempo de expiración."
 
-#: C/evolution.xml:2116(para)
+#: C/evolution.xml:2110(para)
 msgid ""
 "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
 "console and get the IP address of the hosts. You can ping each of them to "
@@ -5505,7 +5332,7 @@ msgstr ""
 "wwwkeys.pgp.net keyid con el número de dirección IP explícito que devolvió "
 "la utilidad del servidor."
 
-#: C/evolution.xml:2121(para)
+#: C/evolution.xml:2115(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
 "enter the command <command>gpg <varname>--import</varname></command> to add "
@@ -5515,24 +5342,23 @@ msgstr ""
 "de texto plano e introduzca el comando <command>gpg <varname>--import</"
 "varname></command> para añadirá a su depósito de claves."
 
-#: C/evolution.xml:2125(title)
+#: C/evolution.xml:2119(title)
 msgid "Setting up GPG Encryption"
 msgstr "Configurar el cifrado GPG"
 
-#: C/evolution.xml:2131(para) C/evolution.xml:2170(para)
+#: C/evolution.xml:2125(para) C/evolution.xml:2164(para)
 msgid "Select the account you want to use securely, then click Edit."
-msgstr ""
-"Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
+msgstr "Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
 
-#: C/evolution.xml:2134(para) C/evolution.xml:2173(para)
+#: C/evolution.xml:2128(para) C/evolution.xml:2167(para)
 msgid "Click the Security tab."
 msgstr "Pulse en la solapa de Seguridad."
 
-#: C/evolution.xml:2137(para)
+#: C/evolution.xml:2131(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr "Especifique el ID de su clave en el campo ID de la clave GPG/PGP."
 
-#: C/evolution.xml:2146(para)
+#: C/evolution.xml:2140(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
 "can find it by typing <command>gpg --list-keys</command> in a terminal "
@@ -5544,43 +5370,42 @@ msgstr ""
 "en un terminal. El identificador de clave es una cadena de 8 caracteres con "
 "números y letras aleatorios."
 
-#: C/evolution.xml:2150(title)
+#: C/evolution.xml:2144(title)
 msgid "Encrypting Messages"
 msgstr "Cifrar mensajes"
 
-#: C/evolution.xml:2151(para)
+#: C/evolution.xml:2145(para)
 msgid "To encrypt a single message:"
 msgstr "Cifrar un sólo mensaje:"
 
-#: C/evolution.xml:2154(para)
+#: C/evolution.xml:2148(para)
 msgid "Open a Compose a Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
-#: C/evolution.xml:2157(para)
+#: C/evolution.xml:2151(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Pulse Seguridad &gt; Cifrado PGP."
 
-#: C/evolution.xml:2160(para)
+#: C/evolution.xml:2154(para)
 msgid "Compose your message."
 msgstr "Edite su mensaje."
 
-#: C/evolution.xml:2164(para)
+#: C/evolution.xml:2158(para)
 msgid "You can set Evolution to always sign your email messages:"
 msgstr ""
 "Puede configurar Evolution para que firme siempre sus mensajes de correo "
 "electrónico:"
 
 # index.docbook:172, index.docbook:216
-#: C/evolution.xml:2176(para)
+#: C/evolution.xml:2170(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
-msgstr ""
-"Seleccione Firmar siempre los mensajes salientes cuando se use esta cuenta."
+msgstr "Seleccione Firmar siempre los mensajes salientes cuando se use esta cuenta."
 
-#: C/evolution.xml:2188(title)
+#: C/evolution.xml:2182(title)
 msgid "Unencrypting a Received Message"
 msgstr "Descifrar un mensaje recibido"
 
-#: C/evolution.xml:2189(para)
+#: C/evolution.xml:2183(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5590,7 +5415,7 @@ msgstr ""
 "Recuerde que el remitente tiene que tener su clave pública (la suya, de "
 "usted) antes de enviarle un mensaje cifrado."
 
-#: C/evolution.xml:2190(para)
+#: C/evolution.xml:2184(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5598,7 +5423,7 @@ msgstr ""
 "Cuando vea el mensaje, Evolution le pedirá que escriba su contraseña PGP. "
 "Escríbala y el mensaje se mostrará apropiadamente."
 
-#: C/evolution.xml:2195(para)
+#: C/evolution.xml:2189(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -5620,7 +5445,7 @@ msgstr ""
 "certificado S/MIME, su sistema recibirá automáticamente la parte pública del "
 "certificado y descifrará o verificará el mensaje."
 
-#: C/evolution.xml:2196(para)
+#: C/evolution.xml:2190(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -5636,7 +5461,7 @@ msgstr ""
 "VeriSign* o Thawte*.  En cualquier caso, el administrador del sistema le "
 "proporciona un archivo de certificado."
 
-#: C/evolution.xml:2197(para)
+#: C/evolution.xml:2191(para)
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
 "certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
@@ -5649,28 +5474,27 @@ msgstr ""
 "mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html\">ayuda "
 "de mozilla</ulink>."
 
-#: C/evolution.xml:2198(para)
+#: C/evolution.xml:2192(para)
 msgid "The certificate file is a password-protected file on your computer."
-msgstr ""
-"El archivo certificado es un archivo protegido por contraseña en su equipo."
+msgstr "El archivo certificado es un archivo protegido por contraseña en su equipo."
 
-#: C/evolution.xml:2201(title)
+#: C/evolution.xml:2195(title)
 msgid "Adding a Signing Certificate"
 msgstr "Añadir un certificado firmado"
 
-#: C/evolution.xml:2207(para)
+#: C/evolution.xml:2201(para)
 msgid "Click Certificates."
 msgstr "Pulse Certificados."
 
-#: C/evolution.xml:2210(para) C/evolution.xml:2333(para)
+#: C/evolution.xml:2204(para) C/evolution.xml:2327(para)
 msgid "Click Import."
 msgstr "Pulse Importar."
 
-#: C/evolution.xml:2213(para)
+#: C/evolution.xml:2207(para)
 msgid "Select the file to import, then click Open."
 msgstr "Seleccione el archivo a importar, después pulse Abrir."
 
-#: C/evolution.xml:2219(para)
+#: C/evolution.xml:2213(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -5683,11 +5507,11 @@ msgstr ""
 "nuevas autoridades de certificados, que tienen sus propios archivos de "
 "certificados, de la misma forma."
 
-#: C/evolution.xml:2223(title)
+#: C/evolution.xml:2217(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Firmar o cifrar cada mensaje"
 
-#: C/evolution.xml:2224(para)
+#: C/evolution.xml:2218(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -5696,19 +5520,19 @@ msgstr ""
 "mensaje pulsando Seguridad &gt; Firma S/MIME o Cifrado S/MIME en el editor "
 "de mensajes."
 
-#: C/evolution.xml:2225(para)
+#: C/evolution.xml:2219(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Para enviar cada mensaje cifrado o firmado:"
 
-#: C/evolution.xml:2231(para)
+#: C/evolution.xml:2225(para)
 msgid "Select the account to encrypt the messages in."
 msgstr "Seleccione la cuenta en la que cifrar mensajes."
 
-#: C/evolution.xml:2234(para)
+#: C/evolution.xml:2228(para)
 msgid "Click Edit, then click Security."
 msgstr "Pulse Editar, después pulse en Seguridad."
 
-#: C/evolution.xml:2237(para)
+#: C/evolution.xml:2231(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -5716,7 +5540,7 @@ msgstr ""
 "Pulse Seleccionar junto a Certificado de firma y especificar la ruta a su "
 "certificado de firma."
 
-#: C/evolution.xml:2239(para)
+#: C/evolution.xml:2233(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
@@ -5724,11 +5548,11 @@ msgstr ""
 "Pulse seleccionar junto a Certificado de cifrado y especifique la ruta a su "
 "certificado de cifrado."
 
-#: C/evolution.xml:2242(para)
+#: C/evolution.xml:2236(para)
 msgid "Select the appropriate options."
 msgstr "Seleccione las opciones apropiadas."
 
-#: C/evolution.xml:2258(para)
+#: C/evolution.xml:2252(para)
 msgid ""
 "Whether you only get a few email messages a day, or you receive hundreds, "
 "you probably want to sort and organize them. <trademark>Evolution</"
@@ -5738,35 +5562,35 @@ msgstr ""
 "probablemente querrá organizarlos. <trademark>Evolution</trademark> tiene "
 "las herramientas para ayudarle a hacerlo."
 
-#: C/evolution.xml:2261(link) C/evolution.xml:2284(title)
+#: C/evolution.xml:2255(link) C/evolution.xml:2278(title)
 msgid "Importing Your Old Email"
 msgstr "Importar su correo-e antiguo"
 
-#: C/evolution.xml:2264(link) C/evolution.xml:2374(title)
+#: C/evolution.xml:2258(link) C/evolution.xml:2368(title)
 msgid "Sorting the Message List"
 msgstr "Ordenación de la lista de mensajes"
 
-#: C/evolution.xml:2267(link) C/evolution.xml:2545(title)
+#: C/evolution.xml:2261(link) C/evolution.xml:2539(title)
 msgid "Getting Organized with Folders"
 msgstr "Organización básica de carpetas"
 
-#: C/evolution.xml:2270(link) C/evolution.xml:2560(title)
+#: C/evolution.xml:2264(link) C/evolution.xml:2554(title)
 msgid "Searching for Messages"
 msgstr "Búsqueda de mensajes"
 
-#: C/evolution.xml:2273(link) C/evolution.xml:2764(title)
+#: C/evolution.xml:2267(link) C/evolution.xml:2758(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Creación de reglas para organizar automáticamente el correo"
 
-#: C/evolution.xml:2276(link) C/evolution.xml:3003(title)
+#: C/evolution.xml:2270(link) C/evolution.xml:2997(title)
 msgid "Using Search Folders"
 msgstr "Usar las carpetas de búsqueda"
 
-#: C/evolution.xml:2279(link) C/evolution.xml:3136(title)
+#: C/evolution.xml:2273(link) C/evolution.xml:3130(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Parar el correo basura (SPAM)"
 
-#: C/evolution.xml:2285(para)
+#: C/evolution.xml:2279(para)
 msgid ""
 "Evolution allows you to import old email and contacts so that you don't need "
 "to worry about losing your old information."
@@ -5774,19 +5598,19 @@ msgstr ""
 "Evolution le permite importar correo-e antiguo y sus contactos para que no "
 "tenga que preocuparse por la pérdida de información anterior."
 
-#: C/evolution.xml:2288(title)
+#: C/evolution.xml:2282(title)
 msgid "Importing Single Files"
 msgstr "Importar un sólo archivo"
 
-#: C/evolution.xml:2289(para)
+#: C/evolution.xml:2283(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution puede importar los siguientes tipos de archivos:"
 
-#: C/evolution.xml:2291(title)
+#: C/evolution.xml:2285(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
-#: C/evolution.xml:2292(para)
+#: C/evolution.xml:2286(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -5796,11 +5620,11 @@ msgstr ""
 "numerosas aplicaciones de administración de contactos. Será necesario poder "
 "exportar la libreta de direcciones de su otra aplicación al formato vCard."
 
-#: C/evolution.xml:2295(title)
+#: C/evolution.xml:2289(title)
 msgid "vCalendar:"
 msgstr "vCalendar:"
 
-#: C/evolution.xml:2296(para)
+#: C/evolution.xml:2290(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -5808,11 +5632,11 @@ msgstr ""
 "Un formato para almacenar archivos de calendario. generalmente usado por "
 "Evolution, Microsoft Outlook, Sunbird y Korganizer."
 
-#: C/evolution.xml:2299(title)
+#: C/evolution.xml:2293(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar or iCal (.ics):"
 
-#: C/evolution.xml:2300(para)
+#: C/evolution.xml:2294(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -5821,22 +5645,21 @@ msgstr ""
 "programa utilizado por equipos de mano PalmOS, así como Evolution y "
 "Microsoft Outlook."
 
-#: C/evolution.xml:2303(title)
+#: C/evolution.xml:2297(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
-#: C/evolution.xml:2304(para)
-msgid ""
-"CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
+#: C/evolution.xml:2298(para)
+msgid "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "Los archivos CSV o Tab guardados al usar Evolution, Microsoft Outlook y "
 "Mozilla."
 
-#: C/evolution.xml:2307(title)
+#: C/evolution.xml:2301(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx):"
 
-#: C/evolution.xml:2308(para)
+#: C/evolution.xml:2302(para)
 msgid ""
 "The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
@@ -5846,19 +5669,19 @@ msgstr ""
 "otras versiones de Microsoft Outlook y Outlook Express, vea la solución "
 "descrita en el <link linkend=\"bsawgkk\">Paso 1</link>."
 
-#: C/evolution.xml:2311(title)
+#: C/evolution.xml:2305(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "Formato de intercambio de datos de LDAP (.LDIF):"
 
-#: C/evolution.xml:2312(para)
+#: C/evolution.xml:2306(para)
 msgid "A standard data format for contact cards."
 msgstr "Un formato de datos estándar para tarjetas de visita."
 
-#: C/evolution.xml:2315(title)
+#: C/evolution.xml:2309(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox o extensión nula):"
 
-#: C/evolution.xml:2316(para)
+#: C/evolution.xml:2310(para)
 msgid ""
 "The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
 "other email clients."
@@ -5866,28 +5689,28 @@ msgstr ""
 "El formato de buzón de correo utilizado por los programas Mozilla, Netscape, "
 "Evolution, Eudora* y muchos otros clientes de correo electrónico."
 
-#: C/evolution.xml:2318(para)
+#: C/evolution.xml:2312(para)
 msgid "To import your old email:"
 msgstr "Importar sus correos electrónicos antiguos:"
 
-#: C/evolution.xml:2321(para) C/evolution.xml:2343(para)
-#: C/evolution.xml:3446(para)
+#: C/evolution.xml:2315(para) C/evolution.xml:2337(para)
+#: C/evolution.xml:3440(para)
 msgid "Click File &gt; Import."
 msgstr "Pulse Archivo &gt; Importar."
 
-#: C/evolution.xml:2327(para)
+#: C/evolution.xml:2321(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Seleccione Importar un único archivo, después pulse Siguiente."
 
-#: C/evolution.xml:2330(para)
+#: C/evolution.xml:2324(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Seleccione el archivo para importar, después pulse Adelante."
 
-#: C/evolution.xml:2339(title)
+#: C/evolution.xml:2333(title)
 msgid "Importing Multiple Files"
 msgstr "Importar múltiples archivos"
 
-#: C/evolution.xml:2340(para)
+#: C/evolution.xml:2334(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -5895,14 +5718,13 @@ msgstr ""
 "Evolution automatiza el proceso de importación para distintas aplicaciones "
 "que puede reconocer."
 
-#: C/evolution.xml:2349(para)
-msgid ""
-"Select Import Data and Settings From Older Programs, then click Forward."
+#: C/evolution.xml:2343(para)
+msgid "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Seleccione Importar datos y configuración de programas antiguos, después "
 "pulse Adelante."
 
-#: C/evolution.xml:2350(para)
+#: C/evolution.xml:2344(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -5910,7 +5732,7 @@ msgstr ""
 "Siga los pasos <link linkend=\"bsawely\">Paso 3</link> hasta <link linkend="
 "\"bsawf2t\">Paso 5</link> para importar."
 
-#: C/evolution.xml:2351(para)
+#: C/evolution.xml:2345(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -5918,22 +5740,19 @@ msgstr ""
 "Evolution busca programas de correo antiguos y, si es posible, importa los "
 "datos de ellos."
 
-#: C/evolution.xml:2356(para)
-#, fuzzy
+#: C/evolution.xml:2350(para)
 msgid ""
 "One migration method that works well is to use the Outport application. See "
 "<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
 "ulink> for additional information. You can also import data into another "
 "Windows mail client such as Mozilla."
 msgstr ""
-"Microsoft Outlook y las versiones posteriores a Outlook Express 4 usan "
-"formatos propietarios que Evolution no puede leer o importar. Un método de "
-"migración que funciona bien es usar la aplicación Outport. Vea <ulink url="
-"\"http://outport.sourceforge.net\">outport.sourceforge.net</ulink> para "
-"obtener información adicional. También puede importar datos en otro cliente "
-"de correo para Windows como Mozilla."
+"Un método de migración que funciona bien es usar la aplicación Outport. "
+"Consulte <ulink url=\"http://outport.sourceforge.net\">outport.sourceforge."
+"net</ulink> para obtener información adicional. También puede importar datos "
+"en otro cliente de correo para Windows como Mozilla."
 
-#: C/evolution.xml:2359(para)
+#: C/evolution.xml:2353(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -5942,19 +5761,17 @@ msgstr ""
 "otro cliente de correo que utilice el formato mbox estándar, como Netscape o "
 "Eudora)."
 
-#: C/evolution.xml:2363(para)
-msgid ""
-"Copy the files to the system or partition that Evolution is installed on."
+#: C/evolution.xml:2357(para)
+msgid "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Copie los archivos al sistema o a la partición en la que esté instalado "
 "Evolution."
 
-#: C/evolution.xml:2366(para)
+#: C/evolution.xml:2360(para)
 msgid "Use the Evolution import tool to import the files."
-msgstr ""
-"Use la herramienta de importar de Evolution para importar los archivos."
+msgstr "Use la herramienta de importar de Evolution para importar los archivos."
 
-#: C/evolution.xml:2369(para)
+#: C/evolution.xml:2363(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -5971,8 +5788,7 @@ msgstr ""
 "todos los mensajes en la carpeta, seleccione la carpeta entera pulsaando Ctrl"
 "+A y después aplique los filtros pulsando Ctrl+Y."
 
-#: C/evolution.xml:2375(para)
-#, fuzzy
+#: C/evolution.xml:2369(para)
 msgid ""
 "Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
@@ -5987,42 +5803,39 @@ msgstr ""
 "ordenarlo por remitente, asunto o fecha pulse en las barras etiquetadas "
 "encima de la lista de mensajes. La dirección de la flecha en la misma le "
 "indicará el sentido de la ordenación. Si vuelve a pulsar, la ordenación "
-"cambiará al sentido inverso. Por ejemplo pulse una vez en Fecha para ordenar "
-"los mensajes por la fecha, desde el más antiguo al más reciente. Pulse de "
-"nuevo y Evolution ordenará la lista desde el más nuevo al más antiguo. "
-"También puede pulsar con el botón derecho sobre la cabecera del mensaje para "
+"cambiará al sentido inverso. Por ejemplo pulse en Fecha para ordenar los "
+"mensajes por la fecha, desde el más antiguo al más reciente. Pulse de nuevo "
+"y Evolution ordenará la lista desde el más nuevo al más antiguo. También "
+"puede pulsar con el botón derecho sobre la cabecera del mensaje para "
 "disponer de un conjunto de opciones de ordenación y añadir o quitar columnas "
 "de la lista de mensajes."
 
-#: C/evolution.xml:2376(para)
-#, fuzzy
+#: C/evolution.xml:2370(para)
 msgid ""
 "To look at the complete headers for a message, click View &gt; All Message "
 "Headers. To see all message data, click View &gt; Message Source."
 msgstr ""
-"Para ver todas las cabeceras de un mensaje, pulse Ver &gt; Mostrar mensaje "
-"&gt; Mostrar cabeceras completas. Para ver todos los datos del mensaje, "
-"pulse Ver &gt; Mensaje en bruto."
+"Para ver todas las cabeceras de un mensaje, pulse Ver &gt; Todas las "
+"cabeceras del mensaje. Para ver todos los datos del mensaje, pulse Ver &gt; "
+"Mensaje en bruto."
 
-#: C/evolution.xml:2379(title)
+#: C/evolution.xml:2373(title)
 msgid "Sorting Mail In Email Threads"
 msgstr "Ordenar los correos por conversaciones"
 
-#: C/evolution.xml:2380(para)
-#, fuzzy
+#: C/evolution.xml:2374(para)
 msgid ""
 "You can also choose a threaded message view. Click View &gt; Group By "
 "Threads to turn the threaded view on or off. When you select this option, "
 "Evolution groups the replies to a message with the original, so you can "
 "follow the thread of a conversation from one message to the next."
 msgstr ""
-"Puede elegir una vista de mensajes por conversaciones. Elija Ver &gt; Lista "
-"de mensajes por conversaciones para activarla o desactivarla. Cuando elije "
-"esta opción, Evolution agrupa las respuestas de un mensaje con el original, "
-"por lo que puede seguir el hilo de la conversación de un mensaje al "
-"siguiente."
+"Puede elegir una vista de mensajes por conversaciones. Elija Ver &gt; "
+"Agrupar por conversaciones para activarla o desactivarla. Cuando elije esta "
+"opción, Evolution agrupa las respuestas de un mensaje con el original, por "
+"lo que puede seguir el hilo de la conversación de un mensaje al siguiente."
 
-#: C/evolution.xml:2382(para)
+#: C/evolution.xml:2376(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -6039,7 +5852,7 @@ msgstr ""
 "conversaciones se ordenan por la fecha del mensaje más reciente en las "
 "conversaciones."
 
-#: C/evolution.xml:2384(para)
+#: C/evolution.xml:2378(para)
 msgid ""
 "There is a gconf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -6055,11 +5868,11 @@ msgstr ""
 "todas las conversaciones toman este estado. Es una opción muy avanzada sólo "
 "para usuarios avanzados."
 
-#: C/evolution.xml:2389(title)
+#: C/evolution.xml:2383(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2390(para)
+#: C/evolution.xml:2384(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -6071,12 +5884,11 @@ msgstr ""
 "asunto. Puede cambiar el orden de las columnas o añadir y quitar columnas "
 "arrastrando y soltándolas."
 
-#: C/evolution.xml:2394(title)
+#: C/evolution.xml:2388(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2395(para)
-#, fuzzy
+#: C/evolution.xml:2389(para)
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
 "by list. You can use any of the criteria given in the Sort-by list such as "
@@ -6090,99 +5902,97 @@ msgstr ""
 "emphasis> para realizar la ordenación. Devuelve la lista de correo ordenada "
 "que coincide con los criterios que ha seleccionado."
 
-#: C/evolution.xml:2396(para)
+#: C/evolution.xml:2390(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2399(para)
+#: C/evolution.xml:2393(para)
 msgid "Right click message header bar."
 msgstr "Pulse con el botón derecho sobre las barra de cabeceras."
 
-#: C/evolution.xml:2402(para)
+#: C/evolution.xml:2396(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Pulse Ordenar por para obtener una lista de opciones."
 
-#: C/evolution.xml:2404(title)
+#: C/evolution.xml:2398(title)
 msgid "Sort by:"
 msgstr "Ordenar por:"
 
-#: C/evolution.xml:2405(para)
+#: C/evolution.xml:2399(para)
 msgid "Sorts the message by different criteria as listed below:"
-msgstr ""
-"Ordena los mensajes por diferentes criterios tal y como se lista debajo:"
+msgstr "Ordena los mensajes por diferentes criterios tal y como se lista debajo:"
 
-#: C/evolution.xml:2409(para)
+#: C/evolution.xml:2403(para)
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: C/evolution.xml:2412(para) C/evolution.xml:2418(para)
+#: C/evolution.xml:2406(para) C/evolution.xml:2412(para)
 msgid "Sender"
 msgstr "Remitente"
 
-#: C/evolution.xml:2415(para)
+#: C/evolution.xml:2409(para)
 msgid "Location"
 msgstr "Lugar"
 
-#: C/evolution.xml:2421(para)
+#: C/evolution.xml:2415(para)
 msgid "Due By"
 msgstr "Vence en"
 
-#: C/evolution.xml:2424(para)
+#: C/evolution.xml:2418(para)
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
-#: C/evolution.xml:2427(para)
+#: C/evolution.xml:2421(para)
 msgid "Flag Status"
 msgstr "Marca de estado"
 
-#: C/evolution.xml:2430(para)
+#: C/evolution.xml:2424(para)
 msgid "Size"
 msgstr "Tamaño"
 
-#: C/evolution.xml:2433(para)
+#: C/evolution.xml:2427(para)
 msgid "To"
 msgstr "Para"
 
-#: C/evolution.xml:2436(para)
+#: C/evolution.xml:2430(para)
 msgid "Received"
 msgstr "Recibido"
 
-#: C/evolution.xml:2439(para)
+#: C/evolution.xml:2433(para)
 msgid "Date"
 msgstr "Fecha"
 
-#: C/evolution.xml:2442(para)
+#: C/evolution.xml:2436(para)
 msgid "Subject"
 msgstr "Asunto"
 
-#: C/evolution.xml:2445(para)
+#: C/evolution.xml:2439(para)
 msgid "From"
 msgstr "De"
 
-#: C/evolution.xml:2448(para)
+#: C/evolution.xml:2442(para)
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: C/evolution.xml:2451(para)
+#: C/evolution.xml:2445(para)
 msgid "Score"
 msgstr "Puntuación"
 
-#: C/evolution.xml:2454(para)
+#: C/evolution.xml:2448(para)
 msgid "Flagged"
 msgstr "Marcado"
 
-#: C/evolution.xml:2457(para) C/evolution.xml:3368(para)
-#: C/evolution.xml:4258(para) C/evolution.xml:4609(para)
-#: C/evolution.xml:4804(para)
+#: C/evolution.xml:2451(para) C/evolution.xml:3362(para)
+#: C/evolution.xml:4252(para) C/evolution.xml:4603(para)
+#: C/evolution.xml:4798(para)
 msgid "Status"
 msgstr "Estado"
 
-#: C/evolution.xml:2460(para)
+#: C/evolution.xml:2454(para)
 msgid "Custom"
 msgstr "Personalizado"
 
-#: C/evolution.xml:2464(para)
-#, fuzzy
+#: C/evolution.xml:2458(para)
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
@@ -6192,20 +6002,20 @@ msgid ""
 "messages by recipients in ascending order and for the second time, sort in "
 "the reverse order. For the next click, messages will be displayed unsorted."
 msgstr ""
-"Pulsar por cada criterio de ordenación rota por tres posibilidades. Criterio "
-"de ordenación ascendente o descendente o sin orden. Cuando pulsa sobre "
-"cualquier criterio de ordenación reiterativamente, Evolution ordena los "
-"mensajes de forma secuencial, ascendente, descendente y sin ordenar. Por "
+"Pulsar por cada criterio de ordenación rota entre tres posibilidades. "
+"Criterio de ordenación ascendente o descendente o sin orden. Cuando pulsa "
+"sobre cualquier criterio de ordenación reiterativamente, Evolution ordena "
+"los mensajes de forma secuencial, ascendente, descendente y sin ordenar. Por "
 "ejemplo, cuando pulsa Destinatarios la primera vez, Evolution ordena los "
 "mensajes por destinatarios en orden ascendente, y la segunda vez que pulse "
 "los ordenará descendentemente. La siguiente pulsación hará que se muestren "
 "sin orden."
 
-#: C/evolution.xml:2467(title)
+#: C/evolution.xml:2461(title)
 msgid "Sort Ascending:"
 msgstr "Orden ascendente:"
 
-#: C/evolution.xml:2468(para)
+#: C/evolution.xml:2462(para)
 msgid ""
 "Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
@@ -6213,11 +6023,11 @@ msgstr ""
 "Ordena los mensajes de arriba a abajo y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más viejo a más nuevo."
 
-#: C/evolution.xml:2471(title)
+#: C/evolution.xml:2465(title)
 msgid "Sort Descending:"
 msgstr "Orden descendente:"
 
-#: C/evolution.xml:2472(para)
+#: C/evolution.xml:2466(para)
 msgid ""
 "Sort descending revers the order and returns you the sorted message list in "
 "the order of newest to oldest."
@@ -6225,11 +6035,11 @@ msgstr ""
 "Ordena los mensajes de forma descendente y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más nuevo a más viejo."
 
-#: C/evolution.xml:2475(title)
+#: C/evolution.xml:2469(title)
 msgid "Unsort:"
 msgstr "Desordenar:"
 
-#: C/evolution.xml:2476(para)
+#: C/evolution.xml:2470(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6237,11 +6047,11 @@ msgstr ""
 "Desordenar elimina la ordenación para esta columna, revirtiendo el orden de "
 "los mensajes según fueron añadidos a la carpeta."
 
-#: C/evolution.xml:2479(title)
+#: C/evolution.xml:2473(title)
 msgid "Removing a Column:"
 msgstr "Eliminar una columna:"
 
-#: C/evolution.xml:2480(para)
+#: C/evolution.xml:2474(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6249,11 +6059,11 @@ msgstr ""
 "Retira la columna de la pantalla. Para retirar columnas, también puede "
 "arrastrar y soltar la cabecera fuera de la lista."
 
-#: C/evolution.xml:2483(title)
+#: C/evolution.xml:2477(title)
 msgid "Adding a Column:"
 msgstr "Añadir una columna:"
 
-#: C/evolution.xml:2484(para)
+#: C/evolution.xml:2478(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6264,11 +6074,11 @@ msgstr ""
 "cabeceras existentes. Una flecha roja le indica el lugar donde quedará la "
 "columna."
 
-#: C/evolution.xml:2487(title)
+#: C/evolution.xml:2481(title)
 msgid "Best Fit:"
 msgstr "Ajuste automático:"
 
-#: C/evolution.xml:2488(para)
+#: C/evolution.xml:2482(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6276,11 +6086,11 @@ msgstr ""
 "Ajusta automáticamente las anchuras de las columnas para un uso más "
 "eficiente del espacio."
 
-#: C/evolution.xml:2491(title)
+#: C/evolution.xml:2485(title)
 msgid "Customizing the Current View:"
 msgstr "Personalizar la vista actual:"
 
-#: C/evolution.xml:2492(para)
+#: C/evolution.xml:2486(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6288,19 +6098,19 @@ msgstr ""
 "Elija este elemento para escoger un orden de los mensajes más complejo o "
 "para elegir qué columnas quiere ver con la información de sus mensajes."
 
-#: C/evolution.xml:2496(para)
+#: C/evolution.xml:2490(para)
 msgid "Select the search criteria from the list."
 msgstr "Seleccione el criterio de búsqueda de la lista."
 
-#: C/evolution.xml:2497(para)
+#: C/evolution.xml:2491(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 
-#: C/evolution.xml:2503(title)
+#: C/evolution.xml:2497(title)
 msgid "Using the Follow up Feature"
 msgstr "Usar la característica de Marca de seguimiento"
 
-#: C/evolution.xml:2504(para)
+#: C/evolution.xml:2498(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the Follow up "
 "feature."
@@ -6308,46 +6118,45 @@ msgstr ""
 "Para asegurarse de que no se olvida de un mensaje, puede usar la "
 "característica Marca de seguimiento."
 
-#: C/evolution.xml:2507(para)
+#: C/evolution.xml:2501(para)
 msgid "Select one or more messages."
 msgstr "Seleccione uno o más mensajes."
 
-#: C/evolution.xml:2510(para)
+#: C/evolution.xml:2504(para)
 msgid "Right-click one of the messages."
 msgstr "Pulse con el botón derecho sobre uno de los mensajes."
 
-#: C/evolution.xml:2513(para)
+#: C/evolution.xml:2507(para)
 msgid "Click Mark for Follow Up."
 msgstr "Pulse Marca para seguimiento."
 
-#: C/evolution.xml:2516(para)
+#: C/evolution.xml:2510(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr "También puede abrir la ventana de Marcar para seguimiento así"
 
-#: C/evolution.xml:2519(para)
+#: C/evolution.xml:2513(para)
 msgid "Select the messages."
 msgstr "Seleccione los mensajes."
 
-#: C/evolution.xml:2522(para)
+#: C/evolution.xml:2516(para)
 msgid "Select Message menu."
 msgstr "Seleccione Menú de mensaje."
 
-#: C/evolution.xml:2525(para)
+#: C/evolution.xml:2519(para)
 msgid "Click Mark as."
 msgstr "Pulse en Marcar como."
 
-#: C/evolution.xml:2528(para)
+#: C/evolution.xml:2522(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Seleccione Marcar para seguimiento o pulse Mayús+Ctrl+G."
 
-#: C/evolution.xml:2529(para)
-msgid ""
-"A dialog box opens to allow you to set the type of flag and the due date."
+#: C/evolution.xml:2523(para)
+msgid "A dialog box opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Se abrirá una caja de diálogo para permitirle establecer el tipo de marca y "
 "la fecha de vencimiento."
 
-#: C/evolution.xml:2533(para)
+#: C/evolution.xml:2527(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward, and Reply, but you can enter your "
@@ -6357,7 +6166,7 @@ msgstr ""
 "Tiene varias disponibles, como Llamar, Reenviar y Responder, pero puede "
 "escribir la nota o acción que prefiera."
 
-#: C/evolution.xml:2534(para)
+#: C/evolution.xml:2528(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6367,7 +6176,7 @@ msgstr ""
 "eliminar la marca pinchando con el botón derecho sobre el mensaje y "
 "eligiendo Marcar como terminado o Quitar marca."
 
-#: C/evolution.xml:2535(para)
+#: C/evolution.xml:2529(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
 "before the message headers. An overdue message might tell you "
@@ -6378,7 +6187,7 @@ msgstr ""
 "un mensaje atrasado podrá decirle algo como <quote>Llamar antes del 7 de "
 "abril de 2003 a las 17:00</quote>."
 
-#: C/evolution.xml:2536(para)
+#: C/evolution.xml:2530(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6393,11 +6202,11 @@ msgstr ""
 "quitarles las marcas cuando haya acabado, de manera que la carpeta sólo "
 "contenga mensajes pendientes."
 
-#: C/evolution.xml:2538(title)
+#: C/evolution.xml:2532(title)
 msgid "Mark as Important Feature:"
 msgstr "Característica Marcar como importante:"
 
-#: C/evolution.xml:2539(para)
+#: C/evolution.xml:2533(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
@@ -6408,7 +6217,7 @@ msgstr ""
 "sobre el mensaje y después pulsando Marcar como importante o Seleccionar "
 "mensaje &gt; Marcar como &gt; Importante desde la barra de menú,"
 
-#: C/evolution.xml:2546(para)
+#: C/evolution.xml:2540(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6421,20 +6230,18 @@ msgstr ""
 "desee. Cree nuevas carpetas pulsaando Carpeta &gt; Nueva, o pulsando con el "
 "botón derecho sobre la lista y seleccionando Carpeta nueva."
 
-#: C/evolution.xml:2547(para)
-#, fuzzy
+#: C/evolution.xml:2541(para)
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
 "move the messages to it by dragging and dropping them, or right click on the "
 "message and choose Move to folder, or press Shift+Ctrl+V."
 msgstr ""
-"Cuando pulse Aceptar, su nueva carpeta aparecerá en la vista de carpetas. "
+"Cuando pulse Aceptar aparecerá su nueva carpeta en la vista de carpetas. "
 "Entonces podrá mover los mensajes a la carpeta arrastrándolos y soltándolos, "
-"o pulsando con el botón derecho &gt; Mover a la carpeta o pulsando Mayús+Ctrl"
-"+V."
+"o pulsando con el botón derecho del ratón y eligiendo Mover a la carpeta o "
+"pulsando Mayús+Ctrl+V."
 
-#: C/evolution.xml:2548(para)
-#, fuzzy
+#: C/evolution.xml:2542(para)
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
 "&gt; Move to folder. This will open the Select folder window, where you can "
@@ -6445,7 +6252,7 @@ msgstr ""
 "abrirá la ventana Seleccionar carpeta, donde podrá soltar su mensaje en "
 "cualquiera de las carpetas listadas."
 
-#: C/evolution.xml:2550(para)
+#: C/evolution.xml:2544(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder at the entry "
@@ -6458,19 +6265,17 @@ msgstr ""
 "puede mover los mensajes desde una carpeta a otra seleccionando el mensaje y "
 "pulsando la solapa Mover en la parte inferior derecha."
 
-#: C/evolution.xml:2551(para)
-#, fuzzy
+#: C/evolution.xml:2545(para)
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
 "automatically. Select Edit &gt; Message Filters to bring up the Message "
 "Filters window."
 msgstr ""
-"Si crea un filtro con el asistente de filtros, puede tener el correo "
-"ordenado automáticamente. Para ello seleccione Editar &gt; Filtros de "
-"mensajes para que aparezca la ventana Filtros de mensajes."
+"Si crea un filtro con el asistente de filtros puede tener el correo ordenado "
+"automáticamente. Para ello seleccione Editar &gt; Filtros de mensajes para que "
+"aparezca la ventana Filtros de mensajes."
 
-#: C/evolution.xml:2553(para)
-#, fuzzy
+#: C/evolution.xml:2547(para)
 msgid ""
 "Click on the Add button to bring up the Add Rule window from where you can "
 "set different criteria for filtering messages. For additional information on "
@@ -6479,10 +6284,10 @@ msgid ""
 msgstr ""
 "Pulse la solapa de añadir para que aparezca la ventana Añadir regla, donde "
 "puede establecer diferentes criterios para filtrar los mensajes. Para "
-"obtener más información vea la <link linkend=\"usage-mail-org-filters-new"
+"obtener más información consulte <link linkend=\"usage-mail-org-filters-new"
 "\">Crear de reglas de filtrado nuevas</link>."
 
-#: C/evolution.xml:2555(para)
+#: C/evolution.xml:2549(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6498,7 +6303,7 @@ msgstr ""
 "subcarpetas en el buzón de entrada, dejará de poder leer mensajes que "
 "existen en esta carpeta, hasta que las mueva hacia otro lugar."
 
-#: C/evolution.xml:2561(para)
+#: C/evolution.xml:2555(para)
 msgid ""
 "Most email clients can search the message for you, but Evolution does it "
 "differently and efficiently giving you faster search result with Quick "
@@ -6509,13 +6314,13 @@ msgstr ""
 "una búsqueda más rápida con Búsqueda rápida, Búsqueda personalizada y "
 "Búsqueda avanzada."
 
-#: C/evolution.xml:2563(title) C/evolution.xml:3308(title)
-#: C/evolution.xml:4190(title) C/evolution.xml:4498(title)
-#: C/evolution.xml:4742(title)
+#: C/evolution.xml:2557(title) C/evolution.xml:3302(title)
+#: C/evolution.xml:4184(title) C/evolution.xml:4492(title)
+#: C/evolution.xml:4736(title)
 msgid "Quick Search:"
 msgstr "Búsqueda rápida:"
 
-#: C/evolution.xml:2564(para)
+#: C/evolution.xml:2558(para)
 msgid ""
 "Quick Search displays all the messages that match the in-built criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6525,14 +6330,14 @@ msgstr ""
 "criterios integrados que ha seleccionado de la lista desplegable en la parte "
 "superior izquierda, justo encima de la lista de mensajes."
 
-#: C/evolution.xml:2566(para)
+#: C/evolution.xml:2560(para)
 msgid "To perform a quick search, perform the following procedure:"
 msgstr "Para realizar una búsqueda rápida, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2569(para) C/evolution.xml:2648(para)
-#: C/evolution.xml:3271(para) C/evolution.xml:3314(para)
-#: C/evolution.xml:4142(para) C/evolution.xml:4458(para)
-#: C/evolution.xml:4694(para)
+#: C/evolution.xml:2563(para) C/evolution.xml:2642(para)
+#: C/evolution.xml:3265(para) C/evolution.xml:3308(para)
+#: C/evolution.xml:4136(para) C/evolution.xml:4452(para)
+#: C/evolution.xml:4688(para)
 msgid ""
 "Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> to expand the drop-down list."
@@ -6540,72 +6345,72 @@ msgstr ""
 "Pulse el botón de búsqueda <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> para expandir la dista desplegable."
 
-#: C/evolution.xml:2572(para) C/evolution.xml:3317(para)
-#: C/evolution.xml:4198(para) C/evolution.xml:4540(para)
-#: C/evolution.xml:4750(para)
+#: C/evolution.xml:2566(para) C/evolution.xml:3311(para)
+#: C/evolution.xml:4192(para) C/evolution.xml:4534(para)
+#: C/evolution.xml:4744(para)
 msgid "Select the search criteria from the list:"
 msgstr "Seleccione el criterio de búsqueda de la lista:"
 
-#: C/evolution.xml:2575(para)
+#: C/evolution.xml:2569(para)
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: C/evolution.xml:2578(para)
+#: C/evolution.xml:2572(para)
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: C/evolution.xml:2581(para)
+#: C/evolution.xml:2575(para)
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: C/evolution.xml:2584(para) C/evolution.xml:2626(para)
+#: C/evolution.xml:2578(para) C/evolution.xml:2620(para)
 msgid "Important"
 msgstr "Importante"
 
-#: C/evolution.xml:2587(para) C/evolution.xml:2629(para)
+#: C/evolution.xml:2581(para) C/evolution.xml:2623(para)
 msgid "Work"
 msgstr "Trabajo"
 
-#: C/evolution.xml:2590(para) C/evolution.xml:2632(para)
-#: C/evolution.xml:3362(para) C/evolution.xml:4252(para)
-#: C/evolution.xml:4603(para) C/evolution.xml:4798(para)
-#: C/evolution.xml:5368(para)
+#: C/evolution.xml:2584(para) C/evolution.xml:2626(para)
+#: C/evolution.xml:3356(para) C/evolution.xml:4246(para)
+#: C/evolution.xml:4597(para) C/evolution.xml:4792(para)
+#: C/evolution.xml:5362(para)
 msgid "Personal"
 msgstr "Personal"
 
-#: C/evolution.xml:2593(para) C/evolution.xml:2635(para)
+#: C/evolution.xml:2587(para) C/evolution.xml:2629(para)
 msgid "To do"
 msgstr "Por hacer"
 
-#: C/evolution.xml:2596(para) C/evolution.xml:2638(para)
+#: C/evolution.xml:2590(para) C/evolution.xml:2632(para)
 msgid "Later"
 msgstr "Después"
 
-#: C/evolution.xml:2599(para)
+#: C/evolution.xml:2593(para)
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: C/evolution.xml:2602(para)
+#: C/evolution.xml:2596(para)
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: C/evolution.xml:2605(para)
+#: C/evolution.xml:2599(para)
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: C/evolution.xml:2608(para)
+#: C/evolution.xml:2602(para)
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: C/evolution.xml:2611(para)
+#: C/evolution.xml:2605(para)
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: C/evolution.xml:2614(para)
+#: C/evolution.xml:2608(para)
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son spam"
 
-#: C/evolution.xml:2619(para)
+#: C/evolution.xml:2613(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6613,7 +6418,7 @@ msgstr ""
 "Evolution muestra los mensajes que coincidan con los criterios presentes en "
 "la lista de mensajes mostrada."
 
-#: C/evolution.xml:2623(para)
+#: C/evolution.xml:2617(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
 "listed here. You can change the name of these labels by selecting Edit &gt; "
@@ -6624,13 +6429,13 @@ msgstr ""
 "etiquetas seleccionando Editar &gt; Preferencias &gt; Preferencias del "
 "correo &gt; Colores."
 
-#: C/evolution.xml:2643(title) C/evolution.xml:3266(title)
-#: C/evolution.xml:4137(title) C/evolution.xml:4453(title)
-#: C/evolution.xml:4689(title)
+#: C/evolution.xml:2637(title) C/evolution.xml:3260(title)
+#: C/evolution.xml:4131(title) C/evolution.xml:4447(title)
+#: C/evolution.xml:4683(title)
 msgid "Customized Search:"
 msgstr "Búsqueda personalizada:"
 
-#: C/evolution.xml:2644(para)
+#: C/evolution.xml:2638(para)
 msgid ""
 "Evolution allows you to perform customized search. To search for a message "
 "use the following procedure:"
@@ -6638,11 +6443,11 @@ msgstr ""
 "Evolution le permite realizar búsquedas personalizadas. Para buscar un "
 "mensaje use el siguiente procedimiento:"
 
-#: C/evolution.xml:2650(title)
+#: C/evolution.xml:2644(title)
 msgid "Subject or Sender Contain:"
 msgstr "El asunto o remitente contiene:"
 
-#: C/evolution.xml:2651(para)
+#: C/evolution.xml:2645(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -6650,78 +6455,76 @@ msgstr ""
 "Busca mensajes que contiene el texto buscado en el asunto o remitente. No "
 "busca en el cuerpo del mensaje."
 
-#: C/evolution.xml:2654(title)
+#: C/evolution.xml:2648(title)
 msgid "Recipients Contain:"
 msgstr "El destinatario contiene:"
 
-#: C/evolution.xml:2655(para)
+#: C/evolution.xml:2649(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr "Busca mensajes con el texto buscado en las cabeceras Para: y Cc:."
 
-#: C/evolution.xml:2658(title)
+#: C/evolution.xml:2652(title)
 msgid "Message Contains:"
 msgstr "El mensaje contiene:"
 
-#: C/evolution.xml:2659(para)
+#: C/evolution.xml:2653(para)
 msgid "Searches the message body and all headers for the specified text."
 msgstr ""
 "Busca el texto especificado en el cuerpo del mensaje y en todas las "
 "cabeceras."
 
-#: C/evolution.xml:2662(title)
+#: C/evolution.xml:2656(title)
 msgid "Subject Contain:"
 msgstr "El asunto contiene:"
 
-#: C/evolution.xml:2663(para)
+#: C/evolution.xml:2657(para)
 msgid "Shows messages where the search text is in the subject line."
-msgstr ""
-"Muestra los mensajes donde el texto de búsqueda está en la línea del asunto."
+msgstr "Muestra los mensajes donde el texto de búsqueda está en la línea del asunto."
 
-#: C/evolution.xml:2666(title)
+#: C/evolution.xml:2660(title)
 msgid "Sender Contain:"
 msgstr "El remitente contiene:"
 
-#: C/evolution.xml:2667(para)
-msgid ""
-"Finds messages whose From: header contains a match for your search text."
+#: C/evolution.xml:2661(para)
+msgid "Finds messages whose From: header contains a match for your search text."
 msgstr ""
 "Busca mensajes cuya cabecera De: contiene coincidencias con el texto que ha "
 "introducido."
 
-#: C/evolution.xml:2670(title)
+#: C/evolution.xml:2664(title)
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2671(para)
+#: C/evolution.xml:2665(para)
 msgid "Searches only in message text, not any other header."
 msgstr "Busca sólo en el cuerpo del mensaje, no en ninguna otra cabecera."
 
-#: C/evolution.xml:2675(para)
+#: C/evolution.xml:2669(para)
 msgid "Click the drop-down list to select the scope"
 msgstr "Pulse sobre la lista desplegable para seleccionar el rango"
 
-#: C/evolution.xml:2678(para)
+#: C/evolution.xml:2672(para)
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: C/evolution.xml:2681(para)
+#: C/evolution.xml:2675(para)
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: C/evolution.xml:2684(para)
+#: C/evolution.xml:2678(para)
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: C/evolution.xml:2687(para)
+#: C/evolution.xml:2681(para)
 msgid "Current Message"
 msgstr "Mensaje actual"
 
-#: C/evolution.xml:2692(para)
+#: C/evolution.xml:2686(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr "Escriba la cadena de búsqueda en el campo de búsqueda y pulse Intro."
 
-#: C/evolution.xml:2694(para)
+#: C/evolution.xml:2688(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -6729,7 +6532,7 @@ msgstr ""
 "Se deshabilitará la lista de carpetas mientras realiza una búsqueda en Todas "
 "las cuentas o en la Cuenta actual."
 
-#: C/evolution.xml:2698(para)
+#: C/evolution.xml:2692(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -6740,7 +6543,7 @@ msgstr ""
 "la <link linkend=\"usage-mail-organize-vfolders\">Uso de las carpetas de "
 "búsqueda</link>."
 
-#: C/evolution.xml:2700(para) C/evolution.xml:3306(para)
+#: C/evolution.xml:2694(para) C/evolution.xml:3300(para)
 msgid ""
 "To clear your search you can click the Clear icon in the search string "
 "field, or choose Search &gt; Clear from the menubar, or enter a blank "
@@ -6751,7 +6554,7 @@ msgstr ""
 "introducir una búsqueda vacía. También puede pulsar Mayús+Ctrl+Q para "
 "limpiar la búsqueda."
 
-#: C/evolution.xml:2703(para)
+#: C/evolution.xml:2697(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -6760,33 +6563,32 @@ msgstr ""
 "personalizada ya que sólo filtra y muestra los mensajes en la lista de "
 "mensajes."
 
-#: C/evolution.xml:2706(title) C/evolution.xml:4163(title)
-#: C/evolution.xml:4479(title) C/evolution.xml:4715(title)
+#: C/evolution.xml:2700(title) C/evolution.xml:4157(title)
+#: C/evolution.xml:4473(title) C/evolution.xml:4709(title)
 msgid "Advanced Search:"
 msgstr "Búsqueda avanzada:"
 
-#: C/evolution.xml:2707(para) C/evolution.xml:4164(para)
-#: C/evolution.xml:4480(para) C/evolution.xml:4716(para)
+#: C/evolution.xml:2701(para) C/evolution.xml:4158(para)
+#: C/evolution.xml:4474(para) C/evolution.xml:4710(para)
 msgid "You can perform an advanced search based on any of the search types."
 msgstr ""
 "Puede realizar una búsqueda avanzada basada en cualquiera de los tipos de "
 "búsqueda."
 
-#: C/evolution.xml:2711(para) C/evolution.xml:4168(para)
-#: C/evolution.xml:4484(para)
+#: C/evolution.xml:2705(para) C/evolution.xml:4162(para)
+#: C/evolution.xml:4478(para)
 msgid "Select the Search menu."
 msgstr "Seleccione el menú Buscar."
 
-#: C/evolution.xml:2714(para)
+#: C/evolution.xml:2708(para)
 msgid "Click Advanced Search to open Advanced Search dialog box."
-msgstr ""
-"Pulse Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda avanzada."
+msgstr "Pulse Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda avanzada."
 
-#: C/evolution.xml:2719(para)
+#: C/evolution.xml:2713(para)
 msgid "Enter the Search name."
 msgstr "Introduzca el nombre de la búsqueda."
 
-#: C/evolution.xml:2722(para)
+#: C/evolution.xml:2716(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -6796,15 +6598,15 @@ msgstr ""
 "acerca de las reglas, vea el <link linkend=\"bsazsjd\">Paso 4</link> bajo "
 "<link linkend=\"vfolder-create\">Crear una carpeta de búsqueda</link>."
 
-#: C/evolution.xml:2728(para)
+#: C/evolution.xml:2722(para)
 msgid "Press Save to save your search results."
 msgstr "Pulse Guardar par aguardar los resultados."
 
-#: C/evolution.xml:2732(title)
+#: C/evolution.xml:2726(title)
 msgid "Save Search:"
 msgstr "Guardar búsqueda:"
 
-#: C/evolution.xml:2733(para)
+#: C/evolution.xml:2727(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -6814,28 +6616,27 @@ msgstr ""
 "seleccione Buscar &gt; Guardar búsqueda. Puede ver la etiqueta de los "
 "resultados de su búsqueda listada bajo el menú Buscar."
 
-#: C/evolution.xml:2736(title)
+#: C/evolution.xml:2730(title)
 msgid "Edit Saved Searches:"
 msgstr "Editar búsquedas guardadas:"
 
-#: C/evolution.xml:2737(para)
+#: C/evolution.xml:2731(para)
 msgid "To edit your saved searches,"
 msgstr "Editar sus búsquedas guardadas,"
 
-#: C/evolution.xml:2741(para)
+#: C/evolution.xml:2735(para)
 msgid "Select Search from the menu bar."
 msgstr "Seleccione Buscar en la barra de menú."
 
-#: C/evolution.xml:2744(para)
+#: C/evolution.xml:2738(para)
 msgid "Click Edit Saved Searches to open the Searches dialog box."
-msgstr ""
-"Pulse Editar búsquedas guardadas para abrir el cuadro de diálogo Búsquedas."
+msgstr "Pulse Editar búsquedas guardadas para abrir el cuadro de diálogo Búsquedas."
 
-#: C/evolution.xml:2749(para)
+#: C/evolution.xml:2743(para)
 msgid "Click the Edit button to open the Edit Rule dialog box."
 msgstr "Pulse el botón Editar para abrir el cuadro de diálogo Editar regla."
 
-#: C/evolution.xml:2750(para)
+#: C/evolution.xml:2744(para)
 msgid ""
 "You can also add or remove Searches from the list by using the respective "
 "buttons available at the right."
@@ -6843,11 +6644,11 @@ msgstr ""
 "También puede añadir o quitar Búsquedas de la lista usando los respectivos "
 "botones disponibles a la derecha."
 
-#: C/evolution.xml:2755(para)
+#: C/evolution.xml:2749(para)
 msgid "Edit the title or search criteria from the dialog box."
 msgstr "Edite el título o el criterio de búsqueda desde el cuadro de diálogo."
 
-#: C/evolution.xml:2765(para)
+#: C/evolution.xml:2759(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -6864,29 +6665,29 @@ msgstr ""
 "copias de un mismo mensaje en múltiples carpetas; pueden también conservar o "
 "incluso mandar una copia a otra persona."
 
-#: C/evolution.xml:2768(title)
+#: C/evolution.xml:2762(title)
 msgid "Creating New Filter Rules"
 msgstr "Crear reglas de filtros nuevas"
 
-#: C/evolution.xml:2771(para) C/evolution.xml:2975(para)
-#: C/evolution.xml:2990(para)
+#: C/evolution.xml:2765(para) C/evolution.xml:2969(para)
+#: C/evolution.xml:2984(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Pulse Editar &gt; Filtros de mensajes."
 
-#: C/evolution.xml:2774(para) C/evolution.xml:3025(para)
-#: C/evolution.xml:5031(para) C/evolution.xml:5612(para)
+#: C/evolution.xml:2768(para) C/evolution.xml:3019(para)
+#: C/evolution.xml:5025(para) C/evolution.xml:5606(para)
 msgid "Click Add."
 msgstr "Pulse Añadir."
 
-#: C/evolution.xml:2777(para)
+#: C/evolution.xml:2771(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Escriba un nombre para el filtro en el campo de nombre de la regla."
 
-#: C/evolution.xml:2782(para)
+#: C/evolution.xml:2776(para)
 msgid "Define the criteria for the filter in the first section."
 msgstr "Defina el criterio para el filtro en la primera sección."
 
-#: C/evolution.xml:2783(para)
+#: C/evolution.xml:2777(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -6894,42 +6695,41 @@ msgstr ""
 "Para cada criterio de filtrado, debe seleccionar en primer lugar qué partes "
 "de los mensajes quiere filtrar:"
 
-#: C/evolution.xml:2785(title) C/evolution.xml:3035(title)
+#: C/evolution.xml:2779(title) C/evolution.xml:3029(title)
 msgid "Sender:"
 msgstr "Remitente:"
 
-#: C/evolution.xml:2786(para)
+#: C/evolution.xml:2780(para)
 msgid "The sender's email address or the name of the sender."
-msgstr ""
-"La dirección de correo electrónico del remitente o el nombre del remitente."
+msgstr "La dirección de correo electrónico del remitente o el nombre del remitente."
 
-#: C/evolution.xml:2789(title)
+#: C/evolution.xml:2783(title)
 msgid "Recipient:"
 msgstr "Destinatario:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2790(para) C/evolution.xml:3040(para)
+#: C/evolution.xml:2784(para) C/evolution.xml:3034(para)
 msgid "The recipients of the message."
 msgstr "Los destinatarios del mensaje."
 
-#: C/evolution.xml:2793(title) C/evolution.xml:3043(title)
+#: C/evolution.xml:2787(title) C/evolution.xml:3037(title)
 msgid "Subject:"
 msgstr "Asunto:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2794(para) C/evolution.xml:3044(para)
+#: C/evolution.xml:2788(para) C/evolution.xml:3038(para)
 msgid "The subject line of the message."
 msgstr "La línea asunto del mensaje."
 
-#: C/evolution.xml:2797(title)
+#: C/evolution.xml:2791(title)
 msgid "Specific Header:"
 msgstr "Cabecera específica:"
 
-#: C/evolution.xml:2798(para)
+#: C/evolution.xml:2792(para)
 msgid "Any header including custom ones."
 msgstr "Cualquier cabecera, incluyendo las personalizadas."
 
-#: C/evolution.xml:2800(para)
+#: C/evolution.xml:2794(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
@@ -6947,20 +6747,20 @@ msgstr ""
 "si la segunda declaración no apareciera. Para filtrar mensajes que utilizan "
 "varias cabeceras varias veces, utilice una expresión regular."
 
-#: C/evolution.xml:2802(title) C/evolution.xml:3047(title)
+#: C/evolution.xml:2796(title) C/evolution.xml:3041(title)
 msgid "Message Body:"
 msgstr "Cuerpo del mensaje:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2803(para) C/evolution.xml:3048(para)
+#: C/evolution.xml:2797(para) C/evolution.xml:3042(para)
 msgid "Searches in the actual text of the message."
 msgstr "Busca en el texto efectivo del mensaje."
 
-#: C/evolution.xml:2806(title)
+#: C/evolution.xml:2800(title)
 msgid "Expression:"
 msgstr "Expresión:"
 
-#: C/evolution.xml:2807(para)
+#: C/evolution.xml:2801(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
 "in the Scheme language used to define filters in Evolution."
@@ -6968,11 +6768,11 @@ msgstr ""
 "(Sólo para programadores) busca un mensaje que corresponda a una expresión "
 "escrita en lenguaje Scheme, usado para definir filtros en Evolution."
 
-#: C/evolution.xml:2810(title) C/evolution.xml:3055(title)
+#: C/evolution.xml:2804(title) C/evolution.xml:3049(title)
 msgid "Date Sent:"
 msgstr "Fecha de envío:"
 
-#: C/evolution.xml:2811(para) C/evolution.xml:3056(para)
+#: C/evolution.xml:2805(para) C/evolution.xml:3050(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -6990,12 +6790,12 @@ msgstr ""
 "en el calendario. Es posible incluso buscar mensajes dentro de un intervalo "
 "de tiempo relativo, por ejemplo, buscar mensajes en los últimos cuatro días."
 
-#: C/evolution.xml:2814(title) C/evolution.xml:3059(title)
+#: C/evolution.xml:2808(title) C/evolution.xml:3053(title)
 msgid "Date Received:"
 msgstr "Fecha de recepción:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2815(para) C/evolution.xml:3060(para)
+#: C/evolution.xml:2809(para) C/evolution.xml:3054(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -7003,11 +6803,11 @@ msgstr ""
 "Funciona del mismo modo que la opción Fecha de envío, excepto que compara la "
 "fecha y hora de recepción del mensaje con las fechas especificadas."
 
-#: C/evolution.xml:2818(title) C/evolution.xml:3063(title)
+#: C/evolution.xml:2812(title) C/evolution.xml:3057(title)
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: C/evolution.xml:2819(para) C/evolution.xml:3064(para)
+#: C/evolution.xml:2813(para) C/evolution.xml:3058(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
 "can set labels with other filters or manually."
@@ -7016,11 +6816,11 @@ msgstr ""
 "Tareas pendientes o Más tarde. Puede establecer etiquetas con otros filtros "
 "o manualmente."
 
-#: C/evolution.xml:2822(title) C/evolution.xml:3067(title)
+#: C/evolution.xml:2816(title) C/evolution.xml:3061(title)
 msgid "Score:"
 msgstr "Puntuación:"
 
-#: C/evolution.xml:2823(para) C/evolution.xml:3068(para)
+#: C/evolution.xml:2817(para) C/evolution.xml:3062(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -7035,20 +6835,20 @@ msgstr ""
 "simplemente un número que puede asignar a mensajes para que otros filtros "
 "puedan procesarlos."
 
-#: C/evolution.xml:2826(title) C/evolution.xml:3071(title)
+#: C/evolution.xml:2820(title) C/evolution.xml:3065(title)
 msgid "Size:"
 msgstr "Tamaño:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2827(para) C/evolution.xml:3072(para)
+#: C/evolution.xml:2821(para) C/evolution.xml:3066(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Ordenación basada en el tamaño del mensaje, en kilobytes."
 
-#: C/evolution.xml:2830(title) C/evolution.xml:3075(title)
+#: C/evolution.xml:2824(title) C/evolution.xml:3069(title)
 msgid "Status:"
 msgstr "Estado:"
 
-#: C/evolution.xml:2831(para) C/evolution.xml:3076(para)
+#: C/evolution.xml:2825(para) C/evolution.xml:3070(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -7056,27 +6856,27 @@ msgstr ""
 "Filtros de acuerdo al estado de un mensaje. El estado puede ser Respoder a, "
 "Borrador, Importante, Leído o SPAM."
 
-#: C/evolution.xml:2834(title)
+#: C/evolution.xml:2828(title)
 msgid "Flagged:"
 msgstr "Marcado:"
 
-#: C/evolution.xml:2835(para) C/evolution.xml:3080(para)
+#: C/evolution.xml:2829(para) C/evolution.xml:3074(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Comprueba si el mensaje está marcado para seguimiento."
 
-#: C/evolution.xml:2838(title) C/evolution.xml:3083(title)
+#: C/evolution.xml:2832(title) C/evolution.xml:3077(title)
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: C/evolution.xml:2839(para) C/evolution.xml:3084(para)
+#: C/evolution.xml:2833(para) C/evolution.xml:3078(para)
 msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Crea un filtro en función de si el correo-e contiene un adjunto."
 
-#: C/evolution.xml:2842(title)
+#: C/evolution.xml:2836(title)
 msgid "Mailing List"
 msgstr "Lista de correo"
 
-#: C/evolution.xml:2843(para) C/evolution.xml:3088(para)
+#: C/evolution.xml:2837(para) C/evolution.xml:3082(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -7090,11 +6890,11 @@ msgstr ""
 "redistribuciones de correo. El correo proveniente de  servidores de listas "
 "que no establezca adecuadamente la cabecera X-BeenThere no será filtrado."
 
-#: C/evolution.xml:2846(title)
+#: C/evolution.xml:2840(title)
 msgid "Regex Match:"
 msgstr "Coincide con la expresión regular:"
 
-#: C/evolution.xml:2847(para)
+#: C/evolution.xml:2841(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -7112,11 +6912,11 @@ msgstr ""
 "cómo usar las expresiones regulares examine la página del manual del comando "
 "grep."
 
-#: C/evolution.xml:2850(title)
+#: C/evolution.xml:2844(title)
 msgid "Source Account:"
 msgstr "Cuenta de orígen:"
 
-#: C/evolution.xml:2851(para)
+#: C/evolution.xml:2845(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -7124,11 +6924,11 @@ msgstr ""
 "Filtros de mensajes de acuerdo con el servidor de las que las recibió. Esto "
 "es útil cuando tiene múltiples cuentas de correo POP."
 
-#: C/evolution.xml:2854(title) C/evolution.xml:2938(title)
+#: C/evolution.xml:2848(title) C/evolution.xml:2932(title)
 msgid "Pipe to Program:"
 msgstr "Encauzar al programa:"
 
-#: C/evolution.xml:2855(para)
+#: C/evolution.xml:2849(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -7139,54 +6939,50 @@ msgstr ""
 "deben devolver un entero. Generalmente esto se suele usar para añadir un "
 "filtro de correo spam."
 
-#: C/evolution.xml:2858(title)
+#: C/evolution.xml:2852(title)
 msgid "Junk Test:"
 msgstr "Detección de spam:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2859(para)
+#: C/evolution.xml:2853(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtros basados en los resultados de las pruebas de spam."
 
-#: C/evolution.xml:2862(title)
+#: C/evolution.xml:2856(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Seleccione el Criterio para la Condición:"
 
-#: C/evolution.xml:2863(para)
-msgid ""
-"If you want multiple criteria for this filter, click Add and repeat step 4."
+#: C/evolution.xml:2857(para)
+msgid "If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
 "Si quiere utilizar múltiples criterios para este filtro, pulse Añadir y "
 "repita el paso 4."
 
-#: C/evolution.xml:2866(title)
+#: C/evolution.xml:2860(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Seleccione las Acciones para el filtro en la sección Entonces:"
 
-#: C/evolution.xml:2867(para)
+#: C/evolution.xml:2861(para)
 msgid "Select any of the following options."
 msgstr "Seleccione cualqueira de la siguientes opciones."
 
-#: C/evolution.xml:2872(title)
+#: C/evolution.xml:2866(title)
 msgid "Move to Folder:"
 msgstr "Mover a la carpeta:"
 
-#: C/evolution.xml:2873(para)
+#: C/evolution.xml:2867(para)
 msgid "Moves the message into a folder you specify."
 msgstr "Mueve el mensaje dentro de la carpeta que especifique."
 
-#: C/evolution.xml:2878(title)
+#: C/evolution.xml:2872(title)
 msgid "Copy to Folder:"
 msgstr "Copar a la carpeta:"
 
-#: C/evolution.xml:2879(para)
-#, fuzzy
+#: C/evolution.xml:2873(para)
 msgid "Puts a copy of the message into a folder you specify."
-msgstr ""
-"Pone una copia del mensaje en la carpeta que especifique. Pulse Aquí para "
-"seleccionar la carpeta destino."
+msgstr "Pone una copia del mensaje en la carpeta que especifique."
 
-#: C/evolution.xml:2885(para)
+#: C/evolution.xml:2879(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -7194,47 +6990,48 @@ msgstr ""
 "Marca el mensaje para borrarlo. Sigue siendo posible recuperar el mensaje de "
 "nuevo, al menos hasta que seleccione Purgar el correo."
 
-#: C/evolution.xml:2890(title)
+#: C/evolution.xml:2884(title)
 msgid "Stop Processing:"
 msgstr "Parar de procesar:"
 
-#: C/evolution.xml:2891(para)
-#, fuzzy
+#: C/evolution.xml:2885(para)
 msgid ""
 "Select this if you want to all other filters ignore this message. Note that "
 "only filters listed after this particular rule will be ignored."
 msgstr ""
-"Especifique si desea que todos los demás filtros pasen por alto este mensaje."
+"Seleccione esto si quiere que el resto de filtros pasen por alto este "
+"mensaje. Note que sólo los filtros listados después de esta regla en "
+"particular, se ignorarán."
 
-#: C/evolution.xml:2896(title)
+#: C/evolution.xml:2890(title)
 msgid "Assign Color:"
 msgstr "Asignar color:"
 
-#: C/evolution.xml:2897(para)
+#: C/evolution.xml:2891(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Marca el mensaje con un color de su elección."
 
-#: C/evolution.xml:2902(title)
+#: C/evolution.xml:2896(title)
 msgid "Assign Score:"
 msgstr "Asignar puntuación:"
 
-#: C/evolution.xml:2903(para)
+#: C/evolution.xml:2897(para)
 msgid "Assigns the message a numeric score."
 msgstr "Asigna al mensaje una puntuación numérica."
 
-#: C/evolution.xml:2908(title)
+#: C/evolution.xml:2902(title)
 msgid "Adjust Score:"
 msgstr "Ajustar puntuación:"
 
-#: C/evolution.xml:2909(para)
+#: C/evolution.xml:2903(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Cambia la puntuación numérica por la cantidad que establezca."
 
-#: C/evolution.xml:2914(title)
+#: C/evolution.xml:2908(title)
 msgid "Set Status:"
 msgstr "Poner estado:"
 
-#: C/evolution.xml:2915(para)
+#: C/evolution.xml:2909(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7242,11 +7039,11 @@ msgstr ""
 "Establece el estado del mensaje. El estado puede ser Respondió a, Borrador, "
 "Importante, Leído, o SPAM."
 
-#: C/evolution.xml:2920(title)
+#: C/evolution.xml:2914(title)
 msgid "Unset Status:"
 msgstr "Quitar estado:"
 
-#: C/evolution.xml:2921(para)
+#: C/evolution.xml:2915(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7254,24 +7051,23 @@ msgstr ""
 "Si el mensaje tiene un estado, lo elimina. Si no tiene establecido un "
 "estado, no hace nada."
 
-#: C/evolution.xml:2926(title)
+#: C/evolution.xml:2920(title)
 msgid "Beep:"
 msgstr "Pitar:"
 
-#: C/evolution.xml:2927(para)
+#: C/evolution.xml:2921(para)
 msgid "Makes the system beep."
 msgstr "Hace que el sistema pite."
 
-#: C/evolution.xml:2932(title)
+#: C/evolution.xml:2926(title)
 msgid "Play Sound:"
 msgstr "Reproducir un sonido:"
 
-#: C/evolution.xml:2933(para)
+#: C/evolution.xml:2927(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Seleccione un archivo de sonido para que Evolution lo reproduzca."
 
-#: C/evolution.xml:2939(para)
-#, fuzzy
+#: C/evolution.xml:2933(para)
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
 "This feature can be used to create automatic Web postings from email "
@@ -7283,38 +7079,35 @@ msgstr ""
 "desde mensajes de correo o para realizar procesados posteriores adicionales "
 "que no estén soportados por Evolution."
 
-#: C/evolution.xml:2944(title)
+#: C/evolution.xml:2938(title)
 msgid "Run Program:"
 msgstr "Ejecutar programa:"
 
-#: C/evolution.xml:2945(para)
+#: C/evolution.xml:2939(para)
 msgid "Evolution runs an application."
 msgstr "Evolution ejecutar una aplicación."
 
-#: C/evolution.xml:2951(para)
-#, fuzzy
+#: C/evolution.xml:2945(para)
 msgid "Click Add if you need multiple actions and click OK."
-msgstr ""
-"Pulse Añadir si necesita añadir múltiples acciones y después pulse Aceptar."
+msgstr "Pulse Añadir si necesita añadir múltiples acciones y después pulse Aceptar."
 
-#: C/evolution.xml:2957(para)
+#: C/evolution.xml:2951(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr ""
 "Existe un atajo sencillo para los filtros rápidos o creación de carpetas de "
 "búsqueda:"
 
-#: C/evolution.xml:2960(para)
+#: C/evolution.xml:2954(para)
 msgid "Right-click the message in the message list."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el mensaje en la lista de "
 "mensajes."
 
-#: C/evolution.xml:2963(para)
-#, fuzzy
+#: C/evolution.xml:2957(para)
 msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr "Seleccione uno de los elementos bajo Crear regla del submenú Mensaje."
 
-#: C/evolution.xml:2964(para)
+#: C/evolution.xml:2958(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7322,7 +7115,7 @@ msgstr ""
 "Crear una regla basada en un mensaje abre la herramienta de creación de "
 "filtros con alguna de la información acerca del mensaje ya introducida."
 
-#: C/evolution.xml:2967(para)
+#: C/evolution.xml:2961(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7334,7 +7127,7 @@ msgstr ""
 "usa esta acción en un filtro, el mensaje afectado no volverá a ser procesado "
 "por ningún otro filtro."
 
-#: C/evolution.xml:2968(para)
+#: C/evolution.xml:2962(para)
 msgid ""
 "When you first open the Filters dialog box, you are shown the list of "
 "filters sorted in the order in which they will be applied. You can move them "
@@ -7344,28 +7137,27 @@ msgstr ""
 "por el orden de aplicación de los mismos. Puede moverlos arriba y abajo, "
 "modificando así su prioridad pulsando los botones Arriba y Abajo."
 
-#: C/evolution.xml:2972(title)
+#: C/evolution.xml:2966(title)
 msgid "Editing Filters"
 msgstr "Editar de filtros"
 
-#: C/evolution.xml:2978(para)
+#: C/evolution.xml:2972(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Seleccione el filtro a editar, después puse Editar."
 
-#: C/evolution.xml:2981(para)
+#: C/evolution.xml:2975(para)
 msgid "Make the desired corrections, then click OK twice."
 msgstr "Haga las correcciones que desee, después pulse Aceptar dos veces."
 
-#: C/evolution.xml:2987(title)
+#: C/evolution.xml:2981(title)
 msgid "Deleting Filters"
 msgstr "Borrar filtros"
 
-#: C/evolution.xml:2993(para)
+#: C/evolution.xml:2987(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Seleccione el filtro a eliminar, después pulse Quitar."
 
-#: C/evolution.xml:3004(para)
-#, fuzzy
+#: C/evolution.xml:2998(para)
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
@@ -7376,11 +7168,11 @@ msgstr ""
 "Si los filtros no le resultan lo suficientemente flexibles, o si se "
 "encuentra ejecutando la misma búsqueda una y otra vez, considere la solución "
 "de las carpetas de búsqueda. Las carpetas de búsqueda son una solución "
-"avanzada para ver sus mensajes de correo-e con Evolution. Las carpetas de "
-"búsqueda ayudan a controlar la situación cuando recibe una gran cantidad de "
-"correo, o cuando olvida con frecuencia a dónde mueve los mensajes."
+"avanzada para ver sus mensajes de correo-e con Evolution. Si recibe una gran "
+"cantidad de correo u olvida con frecuencia dónde pone sus mensajes, entonces "
+"las carpetas de búsqueda le ayudarán a mantener las cosas organizadas."
 
-#: C/evolution.xml:3005(para)
+#: C/evolution.xml:2999(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7397,7 +7189,7 @@ msgstr ""
 "diferentes. Los mensajes incluidos son identificados al vuelo mediante un "
 "conjunto de criterios elegidos de antemano."
 
-#: C/evolution.xml:3006(para)
+#: C/evolution.xml:3000(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7410,7 +7202,7 @@ msgstr ""
 "donde existe realmente, así como de cualquier carpeta de búsqueda con la que "
 "es posible consultarlo."
 
-#: C/evolution.xml:3007(para)
+#: C/evolution.xml:3001(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7419,8 +7211,7 @@ msgstr ""
 "carpetas de búsqueda: contiene todos los mensajes que no cumplen los "
 "criterios satisfechos por las demás carpetas de búsqueda."
 
-#: C/evolution.xml:3008(para)
-#, fuzzy
+#: C/evolution.xml:3002(para)
 msgid ""
 "If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
@@ -7428,14 +7219,13 @@ msgid ""
 "that search remote mail stores, the Unmatched Search Folder does not search "
 "in them either."
 msgstr ""
-"Si utiliza un sistema de almacenamiento remoto como IMAP o Microsoft "
-"Exchange, y ha creado carpetas de búsqueda en ellos, la carpeta de búsqueda "
-"no coincidente se adapta a su vez y también explora las carpetas remotas. Si "
-"no crea ninguna carpeta de búsqueda que busque en almacenes de correo "
-"remotos, la carpeta de búsqueda no coincidente tampoco los buscará."
+"Si usa un sistema de almacenamiento remoto como IMAP o Microsoft Exchange, y ha "
+"creado carpetas de búsqueda en ellos, la carpeta de búsqueda no coincidente "
+"también explora las carpetas en ellos. Si no crea ninguna carpeta de búsqueda "
+"que busque en almacenes de correo remotos, la carpeta de búsqueda No coincidente "
+"tampoco los buscará."
 
-#: C/evolution.xml:3009(para)
-#, fuzzy
+#: C/evolution.xml:3003(para)
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
 "following: To organize his mailbox, Jim sets up a search folder for email "
@@ -7448,24 +7238,22 @@ msgid ""
 "in the <quote>Anna</quote> search folder and in the <quote>Internal "
 "Evolution Discussion</quote> search folder."
 msgstr ""
-"Como ejemplo de uso de las carpetas, búsquedas y carpetas de búsqueda "
-"considere lo siguiente: Para organizar su buzón de correo, Juan define una "
-"carpeta de búsqueda para los mensajes enviados por su amiga y compañera de "
-"trabajo Ana. También tiene otra para los mensajes que incluyen novell.com en "
-"la dirección, y Evolution en la línea del asunto, con el fin de conservar el "
-"seguimiento de lo que sus compañeros de trabajo le envían acerca de "
-"Evolution. Si Ana le envía un mensaje acerca de cualquier otro tema distinto "
-"a Evolution, éste sólo aparece en la carpeta de búsqueda llamada <quote>Ana</"
-"quote>. Cuando Ana le envía un correo acerca de la interfaz de usuario de "
-"Evolution, el mensaje aparece tanto en la carpeta de búsqueda <quote>Ana</"
-"quote>, como también en la carpeta de búsqueda <quote>Debate interno acerca "
-"de Evolution</quote>."
-
-#: C/evolution.xml:3012(title)
+"Como ejemplo de uso de las carpetas, búsquedas y carpetas de búsqueda considere lo "
+"siguiente: Para organizar su buzón de correo, Juan define una carpeta de búsqueda para los correos "
+"enviados por su amiga y compañera de trabajo Ana. También tiene otra carpeta de búsqueda para "
+"los mensajes que incluyen novell.com en la dirección, y Evolution en la línea de asunto, "
+"con el fin de conservar el seguimiento de lo que sus compañeros de trabajo le envían acerca de "
+"Evolution. Si Ana le envía un mensaje acerca de cualquier otro tema distinto de Evolution, "
+"éste sólo aparece en la carpeta de búsqueda llamada <quote>Ana</quote>. Cuando Ana le envía "
+"un correo acerca de la interfaz de usuario de Evolution, el mensaje aparece tanto "
+"en la carpeta de búsqueda <quote>Ana</quote> como también en la carpeta de búsqueda "
+"<quote>Debate interno acerca de Evolution</quote>."
+
+#: C/evolution.xml:3006(title)
 msgid "Creating A Search Folder"
 msgstr "Crear una carpeta de búsqueda"
 
-#: C/evolution.xml:3015(para)
+#: C/evolution.xml:3009(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7473,13 +7261,13 @@ msgstr ""
 "Pulse Mensaje &gt; Crear regla, después seleccione una carpeta de búsqueda "
 "basada en el Asunto, Remitente, Destinatario o Lista de correo."
 
-#: C/evolution.xml:3017(para)
+#: C/evolution.xml:3011(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr ""
 "Seleccione el menú Buscar &gt; Crear una carpeta de búsqueda desde la "
 "búsqueda."
 
-#: C/evolution.xml:3019(para)
+#: C/evolution.xml:3013(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7488,17 +7276,17 @@ msgstr ""
 "búsqueda desde la búsqueda está activado sólo si ya ha realizado una "
 "búsqueda."
 
-#: C/evolution.xml:3022(para)
+#: C/evolution.xml:3016(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Seleccione Editar &gt; Carpeta de búsqueda"
 
-#: C/evolution.xml:3030(para)
+#: C/evolution.xml:3024(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr ""
 "Escriba el nombre de la carpeta de búsqueda en el campo Nombre de la "
 "búsqueda."
 
-#: C/evolution.xml:3033(para)
+#: C/evolution.xml:3027(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7509,19 +7297,19 @@ msgstr ""
 "similares a los de los filtros."
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:3036(para)
+#: C/evolution.xml:3030(para)
 msgid "Sender's address."
 msgstr "La dirección del remitente."
 
-#: C/evolution.xml:3039(title)
+#: C/evolution.xml:3033(title)
 msgid "Recipients:"
 msgstr "Destinatarios:"
 
-#: C/evolution.xml:3051(title)
+#: C/evolution.xml:3045(title)
 msgid "Expression (For programmers only):"
 msgstr "Expresión (sólo para programadores):"
 
-#: C/evolution.xml:3052(para)
+#: C/evolution.xml:3046(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
@@ -7529,33 +7317,31 @@ msgstr ""
 "Busca un mensaje que coincida con una expresión escrita en lenguaje Scheme, "
 "utilizado para definir filtros en Evolution."
 
-#: C/evolution.xml:3079(title)
+#: C/evolution.xml:3073(title)
 msgid "Follow Up:"
 msgstr "Seguimiento:"
 
-#: C/evolution.xml:3087(title)
+#: C/evolution.xml:3081(title)
 msgid "Mailing List:"
 msgstr "Lista de correo:"
 
-#: C/evolution.xml:3091(title)
+#: C/evolution.xml:3085(title)
 msgid "Match all:"
 msgstr "Coincidir con todo:"
 
-#: C/evolution.xml:3092(para)
+#: C/evolution.xml:3086(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Comprueba si el mensaje coincide con todos los criterios listados."
 
-#: C/evolution.xml:3096(para)
-msgid ""
-"Select which folders will be used for the search folder. Your options are:"
-msgstr ""
-"Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
+#: C/evolution.xml:3090(para)
+msgid "Select which folders will be used for the search folder. Your options are:"
+msgstr "Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
 
-#: C/evolution.xml:3098(title)
+#: C/evolution.xml:3092(title)
 msgid "All local folders:"
 msgstr "Todas las carpetas locales:"
 
-#: C/evolution.xml:3099(para)
+#: C/evolution.xml:3093(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7563,11 +7349,11 @@ msgstr ""
 "Usa todas las carpetas locales para la fuente de la carpeta de búsqueda, "
 "además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3102(title)
+#: C/evolution.xml:3096(title)
 msgid "All active remote folders:"
 msgstr "Todas las carpetas remotas activas:"
 
-#: C/evolution.xml:3103(para)
+#: C/evolution.xml:3097(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7579,11 +7365,11 @@ msgstr ""
 "para poder incluir cualquier mensaje de dicho origen además de las carpetas "
 "individuales seleccionadas."
 
-#: C/evolution.xml:3106(title)
+#: C/evolution.xml:3100(title)
 msgid "All local and active remote folders:"
 msgstr "Todas las carpetas locales y remotas activas:"
 
-#: C/evolution.xml:3107(para)
+#: C/evolution.xml:3101(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7591,27 +7377,27 @@ msgstr ""
 "Usa todas las carpetas activas remotas y locales para la fuente de la "
 "carpeta de búsqueda, además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3110(title)
+#: C/evolution.xml:3104(title)
 msgid "Specific folders only:"
 msgstr "Únicamente carpetas especificadas:"
 
-#: C/evolution.xml:3111(para)
+#: C/evolution.xml:3105(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Usa carpetas individuales para la fuente de carpeta de búsqueda."
 
-#: C/evolution.xml:3113(para)
+#: C/evolution.xml:3107(para)
 msgid "If you select Specific folders only,"
 msgstr "Si selecciona Únicamente carpetas especificadas,"
 
-#: C/evolution.xml:3116(para)
+#: C/evolution.xml:3110(para)
 msgid "click Add button to open the Select folder window."
 msgstr "pulse el botón Añadir para abrir la ventana Seleccionar carpeta."
 
-#: C/evolution.xml:3123(para)
+#: C/evolution.xml:3117(para)
 msgid "Select the folder and press Add button."
 msgstr "Seleccione la carpeta y pulse el botón Añadir."
 
-#: C/evolution.xml:3126(para)
+#: C/evolution.xml:3120(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7619,8 +7405,7 @@ msgstr ""
 "Puede ver la carpeta añadida a la lista de carpetas en la caja de texto de "
 "la parte inferior de la ventana Carpeta de búsqueda nueva."
 
-#: C/evolution.xml:3137(para)
-#, fuzzy
+#: C/evolution.xml:3131(para)
 msgid ""
 "Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
 "or Bogofilter with trainable Bayesian filters to perform the spam check. "
@@ -7631,11 +7416,10 @@ msgstr ""
 "Evolution comprueba el correo basura. Evolution usa SpamAssasin y/o "
 "Bogofilter con filtros Bayesianos entrenables para realizar la comprobación "
 "de SPAM. Cuando el software detecta correo que parece ser correo basura, lo "
-"marcará y ocultará a su vista. Los mensajes marcados como correo basura sólo "
+"marcará y ocultará de su vista. Los mensajes marcados como correo basura sólo "
 "se muestran en la carpeta SPAM."
 
-#: C/evolution.xml:3138(para)
-#, fuzzy
+#: C/evolution.xml:3132(para)
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
@@ -7648,16 +7432,16 @@ msgid ""
 msgstr ""
 "El filtro de correo basura puede aprender qué tipos de correo son legítimos "
 "y cuales no, si lo entrena. Cuando comience a usar el bloqueador de correo "
-"basura, compruebe la carpeta de Basura para asegurarse de que el correo "
+"basura, compruebe la carpeta SPAM para asegurarse de que el correo "
 "legítimo no se marca como correo basura. Si el correo bueno se marca "
-"incorrectamente, quítelo de la carpeta Basura pulsando con el botón derecho "
-"y seleccionando Marcar como no spam o pulsando Mayús+Ctrl+J. Si Evolution "
+"incorrectamente, quítelo de la carpeta SPAM pulsando con el botón derecho "
+"y seleccionando Marcar como no SPAM o pulsando Mayús+Ctrl+J. Si Evolution "
 "falla algún correo basura, pulse con el botón derecho sobre el mensaje, "
-"después pulse Marcar como spam o Ctrl+J. Cuando lo corrija, el filtro puede "
+"después pulse Marcar como SPAM o Ctrl+J. Cuando lo corrija, el filtro puede "
 "reconocer mensajes similares para el futuro y se hace más preciso a medida "
 "que pasa el tiempo."
 
-#: C/evolution.xml:3139(para)
+#: C/evolution.xml:3133(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -7670,7 +7454,7 @@ msgstr ""
 "aprenda que es correo válido. El botón <emphasis>SPAM</emphasis> aprende qué "
 "mensajes son SPAM."
 
-#: C/evolution.xml:3140(para)
+#: C/evolution.xml:3134(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
 "then click Mail Preferences."
@@ -7678,7 +7462,7 @@ msgstr ""
 "Para cambiar sus preferencias de filtrado de correo basura, pulse Editar "
 "&gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:3141(para) C/evolution.xml:5665(para)
+#: C/evolution.xml:3135(para) C/evolution.xml:5659(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"mail-prefs-"
 "junk\">Junk Mail Preferences</link>."
@@ -7686,7 +7470,7 @@ msgstr ""
 "Para información adicional acerca del correo basura, vea <link linkend="
 "\"mail-prefs-junk\">Preferencias de spam</link>."
 
-#: C/evolution.xml:3142(para)
+#: C/evolution.xml:3136(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -7694,8 +7478,7 @@ msgstr ""
 "Para ver ajustes de correo basura adicionales, consulte <link linkend=\"more-"
 "mail-options\">Opciones de recepción de correo</link>."
 
-#: C/evolution.xml:3144(para)
-#, fuzzy
+#: C/evolution.xml:3138(para)
 msgid ""
 "SpamAssassin is an application that scan through the mail box to find junk "
 "mail. Evolution uses SpamAssassin as the default spam-filtering application. "
@@ -7704,11 +7487,11 @@ msgid ""
 msgstr ""
 "SpamAssasin es una aplicación que busca a través del buzón para encontrar "
 "correo basura. Evolution usa SpamAssasin como la aplicación predeterminada "
-"para filtrar el SPAM. Para obtener más información, consulte <ulink url="
+"para filtrar el SPAM. Para obtener más información consulte <ulink url="
 "\"http://spamassassin.apache.org/\">El proyecto SpamAssasin de Apache</"
 "ulink>."
 
-#: C/evolution.xml:3145(para)
+#: C/evolution.xml:3139(para)
 msgid ""
 "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
 "by a statistical analysis of the message's header and content (body). It is "
@@ -7723,7 +7506,7 @@ msgstr ""
 "consulte <ulink url=\"http://bogofilter.sourceforge.net/\">el sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:3152(para)
+#: C/evolution.xml:3146(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "contacts tool to organize any amount of contact information, share addresses "
@@ -7734,28 +7517,27 @@ msgstr ""
 "información sobre contactos, compartir direcciones a través de una red y "
 "ahorrar tiempo con las tareas cotidianas."
 
-#: C/evolution.xml:3155(link) C/evolution.xml:3172(title)
+#: C/evolution.xml:3149(link) C/evolution.xml:3166(title)
 msgid "Contacts and Cards"
 msgstr "Contactos y tarjetas"
 
-#: C/evolution.xml:3158(link) C/evolution.xml:3264(title)
+#: C/evolution.xml:3152(link) C/evolution.xml:3258(title)
 msgid "Searching for Contacts"
 msgstr "Búsqueda de contactos"
 
-#: C/evolution.xml:3161(link) C/evolution.xml:3415(title)
+#: C/evolution.xml:3155(link) C/evolution.xml:3409(title)
 msgid "Organizing your Contacts"
 msgstr "Organizar sus contactos"
 
-#: C/evolution.xml:3164(link) C/evolution.xml:3531(title)
+#: C/evolution.xml:3158(link) C/evolution.xml:3525(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP: libretas de direcciones compartidas en una red"
 
-#: C/evolution.xml:3167(link) C/evolution.xml:3554(title)
+#: C/evolution.xml:3161(link) C/evolution.xml:3548(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Envíeme una tarjeta: Cómo añadir tarjetas rápidamente"
 
-#: C/evolution.xml:3173(para)
-#, fuzzy
+#: C/evolution.xml:3167(para)
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
 "you can keep track of information about them and send email to them. In "
@@ -7768,15 +7550,15 @@ msgstr ""
 "direcciones para mantener un seguimiento de la información sobre ellos y "
 "enviarles correos electrónicos. En Evolution, un contacto individual se "
 "llama tarjeta. Para obtener más información acerca de cómo organizar su "
-"lista de contactos vea <link linkend=\"usage-contact-organize\">Organizar "
+"lista de contactos consulte <link linkend=\"usage-contact-organize\">Organizar "
 "sus contactos</link>. Para aprender a configurar la herramienta de contactos "
-"vea <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
+"consulte <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
 
-#: C/evolution.xml:3176(title)
+#: C/evolution.xml:3170(title)
 msgid "The Contact Editor"
 msgstr "El editor de contactos"
 
-#: C/evolution.xml:3177(para)
+#: C/evolution.xml:3171(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email address, telephone numbers, mailer addresses and all other contact "
@@ -7787,23 +7569,23 @@ msgstr ""
 "mensajería instantánea y el resto de la información que ha introducido para "
 "un contacto en particular."
 
-#: C/evolution.xml:3178(para)
+#: C/evolution.xml:3172(para)
 msgid "The contact editor window has three tabs:"
 msgstr "La ventana del editor de contactos tiene tres solapas:"
 
-#: C/evolution.xml:3180(title)
+#: C/evolution.xml:3174(title)
 msgid "Contact:"
 msgstr "Contacto:"
 
-#: C/evolution.xml:3181(para)
+#: C/evolution.xml:3175(para)
 msgid "Contains basic contact information."
 msgstr "Contiene la información básica del contacto."
 
-#: C/evolution.xml:3184(title)
+#: C/evolution.xml:3178(title)
 msgid "Personal Information:"
 msgstr "Información personal:"
 
-#: C/evolution.xml:3185(para)
+#: C/evolution.xml:3179(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -7811,16 +7593,15 @@ msgstr ""
 "Contiene una descripción más específica de la persona, incluyendo URL para "
 "el calendario e información de disponibilidad."
 
-#: C/evolution.xml:3188(title)
+#: C/evolution.xml:3182(title)
 msgid "Mailing Address:"
 msgstr "Dirección de correo:"
 
-#: C/evolution.xml:3189(para)
+#: C/evolution.xml:3183(para)
 msgid "Contains the individual's mailing address."
 msgstr "Contiene las direcciones de correo individuales."
 
-#: C/evolution.xml:3191(para)
-#, fuzzy
+#: C/evolution.xml:3185(para)
 msgid ""
 "You can also the Forward Contact menu item in the Action menu, which opens a "
 "new message with the card already attached, and Send Message to Contact, "
@@ -7830,8 +7611,7 @@ msgstr ""
 "un nuevo mensaje con la tarjeta adjuntada, y Enviar mensaje al contacto, que "
 "abrirá un nuevo mensaje con la dirección de correo-e del contacto."
 
-#: C/evolution.xml:3192(para)
-#, fuzzy
+#: C/evolution.xml:3186(para)
 msgid ""
 "You can add a card from within an email message or calendar appointment. In "
 "an open email, right-click any email address or message, and click Add to "
@@ -7839,10 +7619,10 @@ msgid ""
 msgstr ""
 "Puede añadir tarjetas a partir de un mensaje de correo-e o de una cita del "
 "calendario. Con el mensaje abierto, pulse con el botón derecho en cualquier "
-"dirección o mensaje de correo electrónico, y elija en el menú Añadir "
-"remitente a la libreta de direcciones."
+"dirección o mensaje de correo electrónico, y elija en el menú Añadir a la "
+"libreta de direcciones o seleccione Añadir remitente a la libreta."
 
-#: C/evolution.xml:3193(para)
+#: C/evolution.xml:3187(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -7851,12 +7631,11 @@ msgstr ""
 "la información que haya introducido, pero algunos de ellos tienen "
 "características adicionales:"
 
-#: C/evolution.xml:3195(title)
+#: C/evolution.xml:3189(title)
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: C/evolution.xml:3196(para)
-#, fuzzy
+#: C/evolution.xml:3190(para)
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
@@ -7872,26 +7651,25 @@ msgid ""
 "quote> has two words, and to sort it correctly you must enter de Icaza, "
 "Miguel in the File As entry."
 msgstr ""
-"Especifique aquí el nombre de su contacto. Puede escribir un nombre dentro "
-"del campo Nombre completo, pero también puede pulsar el botón Nombre "
-"completo para mostrar una pequeña caja de diálogo con cajas de texto para "
-"nombre y apellido, títulos como <quote>Sr.</quote> o <quote>Su excelencia</"
-"quote>, y sufijos como <quote>Hijo</quote>. El nombre completo también "
-"interactúa con la caja Archivar como para ayudarle a organizar sus contactos "
-"y manejar apellidos multipalabra. Para ver cómo funciona escriba un nombre "
-"en el campo Nombre completo. Como ejemplo usaremos Miguel de Icaza. Notará "
-"que en campo Archivar como también se rellena, pero en orden inverso: Icaza, "
-"Miguel de. Si ha introducido Ignacio Sopelana Matamoros, el editor de "
+"Especifique aquí el nombre de su contacto. Puede escribir un nombre dentro del campo Nombre completo, "
+"pero también puede pulsar el botón Nombre completo para mostrar una pequeña "
+"caja de diálogo con cajas de texto para nombre y apellido, títulos como <quote>Sr.</quote> "
+"o <quote>Su excelencia</quote>, y sufijos como <quote>Hijo</quote>. "
+"El nombre completo también interactúa con la caja Archivar como para ayudarle a "
+"organizar sus contactos y manejar apellidos multipalabra. Para ver cómo "
+"funciona escriba un nombre en el campo Nombre completo. Como ejemplo usaremos Miguel "
+"de Icaza. Notará que en campo Archivar como también se rellena, pero en "
+"orden inverso: Icaza, Miguel de. Si ha introducido Ignacio Sopelana Matamoros, el editor de "
 "contactos debería haber adivinado que la entrada debería archivarse como "
 "<quote>Matamoros, Ignacio S.</quote>. No obstante el apellido de Miguel, "
-"<quote>de Icaza</quote> tiene dos palabras y para ordenarlo correctamente "
+"<quote>de Icaza</quote>, tiene dos palabras y para ordenarlo correctamente "
 "debe introducir de Icaza, Miguel en el campo Archivar como."
 
-#: C/evolution.xml:3199(title)
+#: C/evolution.xml:3193(title)
 msgid "Where:"
 msgstr "Dónde:"
 
-#: C/evolution.xml:3200(para)
+#: C/evolution.xml:3194(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -7901,11 +7679,11 @@ msgstr ""
 "contacto. Quizá no pueda escribir en todas las libretas de direcciones, "
 "especialmente en aquellas de una red."
 
-#: C/evolution.xml:3203(title)
+#: C/evolution.xml:3197(title)
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: C/evolution.xml:3204(para)
+#: C/evolution.xml:3198(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -7918,11 +7696,11 @@ msgstr ""
 "contactos, vea <link linkend=\"usage-contact-organize\">Organizar sus "
 "contactos</link>."
 
-#: C/evolution.xml:3207(title)
+#: C/evolution.xml:3201(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "URL de Disponibilidad y Calendario:"
 
-#: C/evolution.xml:3208(para)
+#: C/evolution.xml:3202(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes Free/Busy or calendar data online, using a server "
@@ -7936,28 +7714,27 @@ msgstr ""
 "direcciones para esos servidores aquí. Después de hacerlo, puede comprobar "
 "sus horarios cuando cree citas con el Calendario."
 
-#: C/evolution.xml:3213(title)
+#: C/evolution.xml:3207(title)
 msgid "Creating and Editing Contacts"
 msgstr "Crear y editar contactos"
 
-#: C/evolution.xml:3214(para)
+#: C/evolution.xml:3208(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Siga los pasos dados debajo para crear una nueva tarjeta."
 
-#: C/evolution.xml:3217(para)
+#: C/evolution.xml:3211(para)
 msgid "Click File &gt; New &gt; Contact."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Contacto."
 
-#: C/evolution.xml:3220(para)
+#: C/evolution.xml:3214(para)
 msgid "Enter the contact information to the entry boxes provided."
-msgstr ""
-"Introduzca la información del contacto en las cajas de texto proporcionadas."
+msgstr "Introduzca la información del contacto en las cajas de texto proporcionadas."
 
-#: C/evolution.xml:3226(para)
+#: C/evolution.xml:3220(para)
 msgid "If you want to change a card that already exists,"
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
-#: C/evolution.xml:3229(para)
+#: C/evolution.xml:3223(para)
 msgid ""
 "Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
 "the menubar."
@@ -7965,32 +7742,31 @@ msgstr ""
 "Vaya a la ventana de Contactos seleccionando Ver &gt; Ventana &gt; Contactos "
 "desde la barra de menú."
 
-#: C/evolution.xml:3232(para)
+#: C/evolution.xml:3226(para)
 msgid "Double click on the card you want to edit."
 msgstr "Pulse dos veces en la tarjeta que quiera editar."
 
-#: C/evolution.xml:3235(para) C/evolution.xml:3255(para)
+#: C/evolution.xml:3229(para) C/evolution.xml:3249(para)
 msgid "Edit the information in the Contact Editor window."
 msgstr "Edite la información en la ventana del editor de contactos."
 
-#: C/evolution.xml:3241(para)
+#: C/evolution.xml:3235(para)
 msgid "You can also edit the contact information from the preview pane."
 msgstr ""
 "También puede editar la información del contacto desde el panel de vista "
 "previa."
 
-#: C/evolution.xml:3244(para)
+#: C/evolution.xml:3238(para)
 msgid "Right click on the address from Message Header."
-msgstr ""
-"Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
+msgstr "Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
 
-#: C/evolution.xml:3247(para)
+#: C/evolution.xml:3241(para)
 msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 "Seleccione Añadir a la libreta de direcciones para mostrar la ventana Añadir "
 "contacto rápido."
 
-#: C/evolution.xml:3252(para)
+#: C/evolution.xml:3246(para)
 msgid ""
 "Press the Edit Full button at the bottom left to bring up the Contact Editor "
 "window."
@@ -7998,7 +7774,7 @@ msgstr ""
 "Pulse la solapa Editar todo en la parte inferior izquierda para mostrar la "
 "ventana del Editor de contactos."
 
-#: C/evolution.xml:3267(para)
+#: C/evolution.xml:3261(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "Customized Search. To find the contact address you are looking for, use the "
@@ -8008,29 +7784,28 @@ msgstr ""
 "Búsqueda personalizada. Para buscar la dirección del contacto que está "
 "buscando, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3274(para) C/evolution.xml:4145(para)
-#: C/evolution.xml:4461(para) C/evolution.xml:4697(para)
+#: C/evolution.xml:3268(para) C/evolution.xml:4139(para)
+#: C/evolution.xml:4455(para) C/evolution.xml:4691(para)
 msgid "Specify the search criteria from any of the following:"
-msgstr ""
-"Especifique el criterio de búsqueda entre cualquiera de los siguientes:"
+msgstr "Especifique el criterio de búsqueda entre cualquiera de los siguientes:"
 
-#: C/evolution.xml:3277(para)
+#: C/evolution.xml:3271(para)
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: C/evolution.xml:3280(para)
+#: C/evolution.xml:3274(para)
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: C/evolution.xml:3283(para)
+#: C/evolution.xml:3277(para)
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:3288(para)
+#: C/evolution.xml:3282(para)
 msgid "Press Enter to begin the search"
 msgstr "Pulse Intro para iniciar la búsqueda"
 
-#: C/evolution.xml:3291(para)
+#: C/evolution.xml:3285(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
@@ -8038,19 +7813,19 @@ msgstr ""
 "Para una búsqueda más compleja, seleccione Búsqueda avanzada y seleccione el "
 "criterio que describe el contacto que desea:"
 
-#: C/evolution.xml:3294(para)
+#: C/evolution.xml:3288(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Escriba un nombre para la regla en el campo Nombre de la regla."
 
-#: C/evolution.xml:3297(para)
+#: C/evolution.xml:3291(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Configure el criterio en el campo Buscar elementos."
 
-#: C/evolution.xml:3300(para)
+#: C/evolution.xml:3294(para)
 msgid "Select Add to add additional criteria."
 msgstr "Seleccione Añadir para añadir el criterio adicional."
 
-#: C/evolution.xml:3309(para)
+#: C/evolution.xml:3303(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the Display pane."
@@ -8059,140 +7834,139 @@ msgstr ""
 "seleccionado de la lista desplegable en la parte izquierda, justo encima del "
 "panel de visualización."
 
-#: C/evolution.xml:3311(para)
+#: C/evolution.xml:3305(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr "Para realizar una búsqueda rápida, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3320(para) C/evolution.xml:4213(para)
-#: C/evolution.xml:4564(para) C/evolution.xml:4759(para)
+#: C/evolution.xml:3314(para) C/evolution.xml:4207(para)
+#: C/evolution.xml:4558(para) C/evolution.xml:4753(para)
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: C/evolution.xml:3323(para) C/evolution.xml:4216(para)
-#: C/evolution.xml:4567(para) C/evolution.xml:4762(para)
+#: C/evolution.xml:3317(para) C/evolution.xml:4210(para)
+#: C/evolution.xml:4561(para) C/evolution.xml:4756(para)
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: C/evolution.xml:3326(para) C/evolution.xml:4219(para)
-#: C/evolution.xml:4570(para) C/evolution.xml:4765(para)
+#: C/evolution.xml:3320(para) C/evolution.xml:4213(para)
+#: C/evolution.xml:4564(para) C/evolution.xml:4759(para)
 msgid "Business"
 msgstr "Trabajo"
 
-#: C/evolution.xml:3329(para) C/evolution.xml:4222(para)
-#: C/evolution.xml:4573(para) C/evolution.xml:4768(para)
+#: C/evolution.xml:3323(para) C/evolution.xml:4216(para)
+#: C/evolution.xml:4567(para) C/evolution.xml:4762(para)
 msgid "Competition"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:3332(para) C/evolution.xml:4771(para)
+#: C/evolution.xml:3326(para) C/evolution.xml:4765(para)
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:3335(para) C/evolution.xml:4228(para)
-#: C/evolution.xml:4579(para) C/evolution.xml:4774(para)
+#: C/evolution.xml:3329(para) C/evolution.xml:4222(para)
+#: C/evolution.xml:4573(para) C/evolution.xml:4768(para)
 msgid "Gifts"
 msgstr "Regalos"
 
-#: C/evolution.xml:3338(para) C/evolution.xml:4231(para)
-#: C/evolution.xml:4582(para) C/evolution.xml:4777(para)
+#: C/evolution.xml:3332(para) C/evolution.xml:4225(para)
+#: C/evolution.xml:4576(para) C/evolution.xml:4771(para)
 msgid "Goals/Objectives"
 msgstr "Metas/Objetivos"
 
-#: C/evolution.xml:3341(para) C/evolution.xml:4234(para)
+#: C/evolution.xml:3335(para) C/evolution.xml:4228(para)
 msgid "Holiday"
 msgstr "Fiesta"
 
-#: C/evolution.xml:3344(para) C/evolution.xml:4237(para)
-#: C/evolution.xml:4588(para) C/evolution.xml:4783(para)
+#: C/evolution.xml:3338(para) C/evolution.xml:4231(para)
+#: C/evolution.xml:4582(para) C/evolution.xml:4777(para)
 msgid "Holiday Cards"
 msgstr "Tarjetas de vacaciones"
 
-#: C/evolution.xml:3347(para)
+#: C/evolution.xml:3341(para)
 msgid "Hot Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:3350(para) C/evolution.xml:4240(para)
-#: C/evolution.xml:4591(para) C/evolution.xml:4786(para)
+#: C/evolution.xml:3344(para) C/evolution.xml:4234(para)
+#: C/evolution.xml:4585(para) C/evolution.xml:4780(para)
 msgid "Ideas"
 msgstr "Ideas"
 
-#: C/evolution.xml:3353(para) C/evolution.xml:4243(para)
-#: C/evolution.xml:4594(para) C/evolution.xml:4789(para)
+#: C/evolution.xml:3347(para) C/evolution.xml:4237(para)
+#: C/evolution.xml:4588(para) C/evolution.xml:4783(para)
 msgid "International"
 msgstr "Internacional"
 
-#: C/evolution.xml:3356(para) C/evolution.xml:4246(para)
+#: C/evolution.xml:3350(para) C/evolution.xml:4240(para)
 msgid "Key Customer"
 msgstr "Cliente clave"
 
-#: C/evolution.xml:3359(para) C/evolution.xml:4249(para)
-#: C/evolution.xml:4600(para) C/evolution.xml:4795(para)
+#: C/evolution.xml:3353(para) C/evolution.xml:4243(para)
+#: C/evolution.xml:4594(para) C/evolution.xml:4789(para)
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: C/evolution.xml:3365(para) C/evolution.xml:4255(para)
-#: C/evolution.xml:4606(para) C/evolution.xml:4801(para)
+#: C/evolution.xml:3359(para) C/evolution.xml:4249(para)
+#: C/evolution.xml:4600(para) C/evolution.xml:4795(para)
 msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
-#: C/evolution.xml:3371(para) C/evolution.xml:4261(para)
-#: C/evolution.xml:4612(para) C/evolution.xml:4807(para)
+#: C/evolution.xml:3365(para) C/evolution.xml:4255(para)
+#: C/evolution.xml:4606(para) C/evolution.xml:4801(para)
 msgid "Strategies"
 msgstr "Estrategias"
 
-#: C/evolution.xml:3374(para) C/evolution.xml:4264(para)
-#: C/evolution.xml:4615(para) C/evolution.xml:4810(para)
+#: C/evolution.xml:3368(para) C/evolution.xml:4258(para)
+#: C/evolution.xml:4609(para) C/evolution.xml:4804(para)
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#: C/evolution.xml:3377(para) C/evolution.xml:4267(para)
-#: C/evolution.xml:4618(para) C/evolution.xml:4813(para)
+#: C/evolution.xml:3371(para) C/evolution.xml:4261(para)
+#: C/evolution.xml:4612(para) C/evolution.xml:4807(para)
 msgid "Time &amp; Expenses"
 msgstr "Tiempo y gastos"
 
-#: C/evolution.xml:3380(para) C/evolution.xml:4270(para)
-#: C/evolution.xml:4621(para) C/evolution.xml:4816(para)
+#: C/evolution.xml:3374(para) C/evolution.xml:4264(para)
+#: C/evolution.xml:4615(para) C/evolution.xml:4810(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: C/evolution.xml:3383(para) C/evolution.xml:4273(para)
-#: C/evolution.xml:4624(para) C/evolution.xml:4819(para)
+#: C/evolution.xml:3377(para) C/evolution.xml:4267(para)
+#: C/evolution.xml:4618(para) C/evolution.xml:4813(para)
 msgid "Waiting"
 msgstr "Esperando"
 
-#: C/evolution.xml:3386(para)
+#: C/evolution.xml:3380(para)
 msgid "Weather: Cloudy"
 msgstr "Meteorología: Nuboso"
 
-#: C/evolution.xml:3389(para)
+#: C/evolution.xml:3383(para)
 msgid "Weather: Fog"
 msgstr "Meteorología: Niebla"
 
-#: C/evolution.xml:3392(para)
+#: C/evolution.xml:3386(para)
 msgid "Weather: Partly Cloudy"
 msgstr "Meteorología: Parcialmente nuboso"
 
-#: C/evolution.xml:3395(para)
+#: C/evolution.xml:3389(para)
 msgid "Weather: Rain"
 msgstr "Meteorología: Lluvia"
 
-#: C/evolution.xml:3398(para)
+#: C/evolution.xml:3392(para)
 msgid "Weather: Snow"
 msgstr "Meteorología: Nieve"
 
-#: C/evolution.xml:3401(para)
+#: C/evolution.xml:3395(para)
 msgid "Weather: Sunny"
 msgstr "Meteorología: Soleado"
 
-#: C/evolution.xml:3404(para)
+#: C/evolution.xml:3398(para)
 msgid "Weather: Thunderstorms"
 msgstr "Meteorología: Tormenta"
 
-#: C/evolution.xml:3409(para)
+#: C/evolution.xml:3403(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution muestra los contactos deseados."
 
-#: C/evolution.xml:3416(para)
-#, fuzzy
+#: C/evolution.xml:3410(para)
 msgid ""
 "Evolution allows you to organize your contacts. You can create several "
 "individual address books, or contact lists. Within a given address book, you "
@@ -8202,24 +7976,23 @@ msgstr ""
 "libretas de direcciones individuales o grupos de contactos. Dentro de una "
 "libreta de direcciones dada puede tener varias categorías para los contactos."
 
-#: C/evolution.xml:3419(link) C/evolution.xml:3433(title)
+#: C/evolution.xml:3413(link) C/evolution.xml:3427(title)
 msgid "Contacts Groups"
 msgstr "Grupos de contactos"
 
-#: C/evolution.xml:3422(link) C/evolution.xml:3455(title)
+#: C/evolution.xml:3416(link) C/evolution.xml:3449(title)
 msgid "Creating a List of Contacts"
 msgstr "Crear una lista de contactos"
 
-#: C/evolution.xml:3425(link) C/evolution.xml:3487(title)
+#: C/evolution.xml:3419(link) C/evolution.xml:3481(title)
 msgid "Grouping with Categories"
 msgstr "Agrupación por categorías"
 
-#: C/evolution.xml:3428(link) C/evolution.xml:3548(title)
+#: C/evolution.xml:3422(link) C/evolution.xml:3542(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "Configuración de Evolution para utilizar LDAP"
 
-#: C/evolution.xml:3434(para)
-#, fuzzy
+#: C/evolution.xml:3428(para)
 msgid ""
 "Contacts Groups are nothing but Address Books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
@@ -8235,8 +8008,7 @@ msgstr ""
 "proporcionar un nombre. Para los contactos en la red debe proporcionar más "
 "información acerca del servidor de contactos al que está intentando acceder."
 
-#: C/evolution.xml:3435(para)
-#, fuzzy
+#: C/evolution.xml:3429(para)
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
 "of contacts and drop it to a different group. You cannot change the contents "
@@ -8246,8 +8018,7 @@ msgstr ""
 "vista general de contactos. No puede modificar el contenido de la mayoría de "
 "los contactos de red."
 
-#: C/evolution.xml:3437(para)
-#, fuzzy
+#: C/evolution.xml:3431(para)
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
@@ -8260,11 +8031,11 @@ msgstr ""
 "contactos y generalmente se usa para enviar correos electrónicos a varias "
 "personas a la vez."
 
-#: C/evolution.xml:3442(title)
+#: C/evolution.xml:3436(title)
 msgid "Importing Contacts"
 msgstr "Importar contactos"
 
-#: C/evolution.xml:3443(para)
+#: C/evolution.xml:3437(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8272,11 +8043,11 @@ msgstr ""
 "Puede importar contactos desde otra herramienta de gestión de contactos con "
 "la herramienta Importar."
 
-#: C/evolution.xml:3448(para)
+#: C/evolution.xml:3442(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr "Envíese a si mismo un contacto como un adjunto vCard."
 
-#: C/evolution.xml:3449(para)
+#: C/evolution.xml:3443(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8284,8 +8055,7 @@ msgstr ""
 "Actualmente se soportan VCF y LDIF. Los formatos CSV y TAB están soportados "
 "desde Miscrosoft Outlook, Thunderbird, Mozilla  y Evolution."
 
-#: C/evolution.xml:3456(para)
-#, fuzzy
+#: C/evolution.xml:3450(para)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
 "When you send email to the nickname, it is sent to every member of the list. "
@@ -8299,8 +8069,7 @@ msgstr ""
 "para su conveniencia, en lugar de ser una dirección de correo real "
 "gestionada por una aplicación para listas de correo en un servidor."
 
-#: C/evolution.xml:3457(para)
-#, fuzzy
+#: C/evolution.xml:3451(para)
 msgid ""
 "For example, you could create one card for each family member, then add "
 "those cards to a contact list called <quote>Family.</quote> Then, instead of "
@@ -8313,35 +8082,33 @@ msgstr ""
 "correo electrónico de cada persona individualmente, puede enviar un correo "
 "electrónico a <quote>Familia</quote> y el mensaje se enviará a todos ellos."
 
-#: C/evolution.xml:3458(para)
+#: C/evolution.xml:3452(para)
 msgid "To create a list of contacts:"
 msgstr "Para crear una lista de contactos:"
 
-#: C/evolution.xml:3461(para)
+#: C/evolution.xml:3455(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 "Abra el cuadro de diálogo de creación de listas pulsando el botón Nueva "
 "lista."
 
-#: C/evolution.xml:3463(para)
+#: C/evolution.xml:3457(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de contactos."
 
-#: C/evolution.xml:3466(para)
+#: C/evolution.xml:3460(para)
 msgid "Specify a name for the list."
 msgstr "Especifique un nombre para la lista."
 
-#: C/evolution.xml:3469(para)
-#, fuzzy
+#: C/evolution.xml:3463(para)
 msgid "Specify the names or email addresses of contacts."
 msgstr "Especifique los nombres o direcciones de correo-e de los contactos."
 
-#: C/evolution.xml:3471(para)
+#: C/evolution.xml:3465(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Arrastre los contactos desde la ventana principal hasta la lista."
 
-#: C/evolution.xml:3474(para)
-#, fuzzy
+#: C/evolution.xml:3468(para)
 msgid ""
 "Choose whether you want to hide the email addresses when you send a message "
 "to the list."
@@ -8349,8 +8116,7 @@ msgstr ""
 "Elija si quiere ocultar las direcciones de los correos-e cuando envíe un "
 "mensaje a la lista."
 
-#: C/evolution.xml:3475(para)
-#, fuzzy
+#: C/evolution.xml:3469(para)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
@@ -8363,12 +8129,11 @@ msgstr ""
 "to-types\">Especificar destinatarios adicioneles para correo electrónico</"
 "link>."
 
-#: C/evolution.xml:3478(para)
+#: C/evolution.xml:3472(para)
 msgid "When you are finished, click OK."
 msgstr "Cuando termine, pulse Aceptar."
 
-#: C/evolution.xml:3481(para)
-#, fuzzy
+#: C/evolution.xml:3475(para)
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
 "card, including mailing the list to another person and sending email to the "
@@ -8378,8 +8143,7 @@ msgstr ""
 "demás, incluyendo la posibilidad de enviar la lista a otra persona y la de "
 "enviar un mensaje a la lista."
 
-#: C/evolution.xml:3482(para)
-#, fuzzy
+#: C/evolution.xml:3476(para)
 msgid ""
 "To mail the list, open a new email and type the name you chose for the list. "
 "Evolution addresses the message to the entire list when you send the "
@@ -8392,13 +8156,11 @@ msgstr ""
 "tarjeta correspondiente en la libreta de direcciones, y seleccionar Enviar "
 "un mensaje a la lista."
 
-#: C/evolution.xml:3483(para)
+#: C/evolution.xml:3477(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
-msgstr ""
-"Evolution no puede almacenar listas de contactos en servidores Exchange."
+msgstr "Evolution no puede almacenar listas de contactos en servidores Exchange."
 
-#: C/evolution.xml:3488(para)
-#, fuzzy
+#: C/evolution.xml:3482(para)
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
@@ -8409,30 +8171,28 @@ msgstr ""
 "Otro método para agrupar tarjetas consiste en marcarlas como pertenecientes "
 "a diferentes categorías. Por tanto, puede asociar una tarjeta con numerosas "
 "categorías, o no asociarla. Por ejemplo, asocie la tarjeta de un amigo con "
-"la categoría <guilabel>Trabajo</guilabel> porque trabaja con él, en la "
-"categoría <guilabel>Amigos</guilabel> porque es un amigo y en la categoría "
-"<guilabel>Frecuentes</guilabel> porque lo llama frecuentemente."
+"la categoría <guilabel>Trabajo</guilabel> porque trabaja con él y en la "
+"categoría <guilabel>Amigos</guilabel> porque es un amigo."
 
-#: C/evolution.xml:3489(para)
+#: C/evolution.xml:3483(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Para marcar una tarjeta como perteneciente a una categoría,"
 
-#: C/evolution.xml:3492(para)
+#: C/evolution.xml:3486(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 "Pulse dos veces sobre la tarjeta para que aparezca la ventana del Editor de "
 "contactos"
 
-#: C/evolution.xml:3495(para)
+#: C/evolution.xml:3489(para)
 msgid "Click the Categories button at the left."
 msgstr "Pulse el botón Categorías de la izquierda."
 
-#: C/evolution.xml:3496(para)
-#, fuzzy
+#: C/evolution.xml:3490(para)
 msgid "You can view the Categories dialog box as given below."
 msgstr "Puede ver el cuadro de diálogo de Categorías tal y como se ve debajo."
 
-#: C/evolution.xml:3508(para)
+#: C/evolution.xml:3502(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8440,32 +8200,27 @@ msgstr ""
 "Seleccione la categoría de la lista. Puede seleccionar tantas categorías "
 "como desee."
 
-#: C/evolution.xml:3511(para)
-#, fuzzy
+#: C/evolution.xml:3505(para)
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
 "categories. To add a new category,"
 msgstr ""
-"Si la lista maestra de categorías no se ajusta a sus necesidades, puede "
+"Si la lista maestra de categorías no se ajusta a sus necesidades puede "
 "añadir sus propias categorías. Para añadir una nueva categoría,"
 
-#: C/evolution.xml:3514(para)
-#, fuzzy
+#: C/evolution.xml:3508(para)
 msgid "Enter the new category in the entry box at the top."
-msgstr ""
-"Introduzca la nueva categoría en la caja de entrada de la parte superior."
+msgstr "Introduzca la nueva categoría en la caja de entrada de la parte superior."
 
-#: C/evolution.xml:3518(para)
-#, fuzzy
+#: C/evolution.xml:3512(para)
 msgid ""
 "You can view the category name appeared in the field next to Categories "
 "button in the Contact Editor."
 msgstr ""
 "Puede ver que el nombre de la categoría aparece en el campo junto al botón "
-"Categorías en el Editor de contactos"
+"Categorías en el Editor de contactos."
 
-#: C/evolution.xml:3525(para)
-#, fuzzy
+#: C/evolution.xml:3519(para)
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click Edit button at the bottom of the "
@@ -8476,7 +8231,7 @@ msgstr ""
 "inferior de la ventana de Categorías. Pulse el botón Borrar para borrar "
 "elementos de la lista."
 
-#: C/evolution.xml:3532(para)
+#: C/evolution.xml:3526(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8492,8 +8247,7 @@ msgstr ""
 "libreta LDAP las direcciones de todos sus empleados o los contactos de "
 "clientes."
 
-#: C/evolution.xml:3533(para)
-#, fuzzy
+#: C/evolution.xml:3527(para)
 msgid ""
 "To learn how to add a remote LDAP directory to your available address books, "
 "see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
@@ -8501,14 +8255,12 @@ msgid ""
 "They work like a local folder of contact cards, with the following "
 "exceptions:"
 msgstr ""
-"Para obtener información acerca de cómo añadir un directorio remoto dentro "
-"de sus carpetas de contactos disponibles, consulte <link linkend=\"config-"
-"prefs-contact\">Gestión de contactos</link>. Los grupos de contactos remotos "
-"aparecen bajo los servidores LDAP a los que está conectado. Funciona como "
-"una carpeta de tarjetas locales, con las siguientes excepciones:"
+"Para aprender a añadir un directorio LDAP remoto a sus libretas de direcciones disponibles"
+"consulte <link linkend=\"config-prefs-contact\">Gestión de contactos</link>. Los grupos de contactos remotos "
+"aparecen bajo el elemento En servidores LDAP en el selector. "
+"Funciona como una carpeta de tarjetas locales, con las siguientes excepciones:"
 
-#: C/evolution.xml:3536(para)
-#, fuzzy
+#: C/evolution.xml:3530(para)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
@@ -8516,11 +8268,11 @@ msgid ""
 "desired contacts into the local address books."
 msgstr ""
 "Las carpetas de red sólo están disponibles cuando se conecta a la red. Si "
-"utiliza un equipo portátil o una conexión telefónica, conviene hacer una "
-"copia del directorio de red, o colocar éste en caché. Para ello, arrastre "
+"usa un equipo portátil o una conexión telefónica, conviene hacer una "
+"copia del directorio de red o colocar en caché algún directorio de red. Para ello, arrastre "
 "los contactos deseados dentro de la lista de contactos local."
 
-#: C/evolution.xml:3537(para)
+#: C/evolution.xml:3531(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, then click Properties. Select Copy Folder Content "
@@ -8531,7 +8283,7 @@ msgstr ""
 "Propiedades. Seleccione Copiar el contenido de la carpeta localmente para "
 "operación desconectada."
 
-#: C/evolution.xml:3540(para)
+#: C/evolution.xml:3534(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8539,7 +8291,7 @@ msgstr ""
 "Para prevenir exceso de tráfico en la red, Evolution no descarga los datos "
 "del servidor LDAP de una forma normal al iniciarse."
 
-#: C/evolution.xml:3543(para)
+#: C/evolution.xml:3537(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8552,7 +8304,7 @@ msgstr ""
 "la que Evolution proporciona. Compruebe con su administrador de su sistema "
 "si necesita una configuración diferente."
 
-#: C/evolution.xml:3549(para)
+#: C/evolution.xml:3543(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8560,8 +8312,7 @@ msgstr ""
 "Para obtener más información acerca de cómo configurar Evolution para usar "
 "LDAP, vea <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
 
-#: C/evolution.xml:3555(para)
-#, fuzzy
+#: C/evolution.xml:3549(para)
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
 "you can add it to an address card. To do so, right-click any email address "
@@ -8571,17 +8322,15 @@ msgid ""
 "operation. For more information, see <link linkend=\"config-sync"
 "\">Synchronizing Your Handheld Device</link>."
 msgstr ""
-"Cuando recoja información en un mensaje o en una entrada en el calendario "
-"acerca de una persona, puede añadirla a una tarjeta de visita. Para ello, "
-"pulse con el botón derecho sobre cualquier dirección de correo o sobre "
-"cualquier mensaje y elija la opción Añadir remitente a la libreta de "
-"direcciones. Si el remitente ya existe, la solapa del Editor se abrirá y "
-"podrá editar los detalles. Evolution también puede añadir tarjetas desde "
-"dispositivos de mano durante la operación de sincronización. Para obtener "
-"más información consulte <link linkend=\"config-sync\">Sincronización de "
-"Evolution con dispositivos portátiles</link>."
+"Cuando reciba información acerca de una persona en el correo o en una entrada del calendario, "
+"puede añadirla a una tarjeta de visita. Para ello, pulse con el botón derecho sobre cualquier dirección de correo o sobre "
+"cualquier correo-e y elija la opción Añadir remitente a la libreta de direcciones en el menú que aparece. Si "
+"el remitente ya existe, la solapa del Editor se abrirá y podrá editar los detalles. "
+"Evolution también puede añadir tarjetas desde dispositivos de mano durante la "
+"operación de sincronización HotSync*. Para obtener más información consulte "
+"<link linkend=\"config-sync\">Sincronización de Evolution con dispositivos portátiles</link>."
 
-#: C/evolution.xml:3561(para)
+#: C/evolution.xml:3555(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "Calendar to manage your schedule alone or in conjunction with peers. To "
@@ -8594,48 +8343,47 @@ msgstr ""
 "linkend=\"importing-mail\">Importar un solo archivo</link>, que describe la "
 "herramienta de importación."
 
-#: C/evolution.xml:3564(link) C/evolution.xml:3596(title)
+#: C/evolution.xml:3558(link) C/evolution.xml:3590(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Opciones de la vista de calendario"
 
-#: C/evolution.xml:3567(link) C/evolution.xml:3754(title)
+#: C/evolution.xml:3561(link) C/evolution.xml:3748(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Planificación con el calendario de Evolution"
 
-#: C/evolution.xml:3570(link) C/evolution.xml:4134(title)
+#: C/evolution.xml:3564(link) C/evolution.xml:4128(title)
 msgid "Searching for Calendar Items"
 msgstr "Buscar elementos del calendario"
 
-#: C/evolution.xml:3573(link) C/evolution.xml:4282(title)
+#: C/evolution.xml:3567(link) C/evolution.xml:4276(title)
 msgid "Printing Displayed Items"
 msgstr "Imprimir los elementos mostrados"
 
-#: C/evolution.xml:3576(link) C/evolution.xml:4287(title)
+#: C/evolution.xml:3570(link) C/evolution.xml:4281(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Borrar citas y reuniones antiguas"
 
-#: C/evolution.xml:3579(link) C/evolution.xml:4292(title)
+#: C/evolution.xml:3573(link) C/evolution.xml:4286(title)
 msgid "Delegating Meetings"
 msgstr "Eliminar reuniones"
 
-#: C/evolution.xml:3582(link) C/evolution.xml:4312(title)
+#: C/evolution.xml:3576(link) C/evolution.xml:4306(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Múltiples calendarios, calendarios web y CalDAV"
 
-#: C/evolution.xml:3585(link) C/evolution.xml:4319(title)
+#: C/evolution.xml:3579(link) C/evolution.xml:4313(title)
 msgid "The Task List"
 msgstr "La Lista de tareas"
 
-#: C/evolution.xml:3588(link) C/evolution.xml:4634(title)
+#: C/evolution.xml:3582(link) C/evolution.xml:4628(title)
 msgid "Memos"
 msgstr "Notas"
 
-#: C/evolution.xml:3591(link) C/evolution.xml:4829(title)
+#: C/evolution.xml:3585(link) C/evolution.xml:4823(title)
 msgid "Configuring Time Zones"
 msgstr "Configurar la zona horaria"
 
-#: C/evolution.xml:3597(para)
-#, fuzzy
+#: C/evolution.xml:3591(para)
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
@@ -8647,17 +8395,17 @@ msgid ""
 msgstr ""
 "En Evolution puede mantener múltiples calendarios y solaparlos entre ellos. "
 "Por ejemplo, puede tener un horario de acontecimientos del trabajo, uno para "
-"casa y uno para su equipo de deporte favorito. El selector lista esos "
+"casa y uno para su equipo de deporte favorito. La barra lateral lista esos "
 "calendarios y puede seleccionar o deseleccionar las cajas junto a ellos para "
 "mostrar y ocultar las citas en la vista de calendario. Ocultando y mostrando "
 "diferentes juegos de citas, puede asegurarse de evitar conflictos, "
 "reduciendo la carga en la vista."
 
-#: C/evolution.xml:3598(para)
+#: C/evolution.xml:3592(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr "Las citas para cada calendario aparecen con un color diferente."
 
-#: C/evolution.xml:3599(para)
+#: C/evolution.xml:3593(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
@@ -8665,77 +8413,75 @@ msgstr ""
 "La barra de herramientas le ofrece cinco botones diferentes que le pueden "
 "mostrar distintas vistas de su calendario."
 
-#: C/evolution.xml:3607(para)
+#: C/evolution.xml:3601(para)
 msgid "Calendar View"
 msgstr "Vista del calendario"
 
-#: C/evolution.xml:3610(para)
+#: C/evolution.xml:3604(para)
 msgid "Shortcut Keys"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:3617(para)
+#: C/evolution.xml:3611(para)
 msgid "Day"
 msgstr "Día"
 
-#: C/evolution.xml:3620(para)
+#: C/evolution.xml:3614(para)
 msgid "control+y"
 msgstr "control+y"
 
-#: C/evolution.xml:3625(para)
+#: C/evolution.xml:3619(para)
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: C/evolution.xml:3628(para)
+#: C/evolution.xml:3622(para)
 msgid "control+j"
 msgstr "control+j"
 
-#: C/evolution.xml:3633(para)
+#: C/evolution.xml:3627(para)
 msgid "Week"
 msgstr "Semana"
 
-#: C/evolution.xml:3636(para)
+#: C/evolution.xml:3630(para)
 msgid "control+k"
 msgstr "control+k"
 
-#: C/evolution.xml:3641(para)
+#: C/evolution.xml:3635(para)
 msgid "Month"
 msgstr "Mes"
 
-#: C/evolution.xml:3644(para)
+#: C/evolution.xml:3638(para)
 msgid "control+m"
 msgstr "control+m"
 
-#: C/evolution.xml:3649(para)
+#: C/evolution.xml:3643(para)
 msgid "List"
 msgstr "Lista"
 
-#: C/evolution.xml:3652(para)
+#: C/evolution.xml:3646(para)
 msgid "control+l"
 msgstr "control+l"
 
-#: C/evolution.xml:3658(para)
-#, fuzzy
+#: C/evolution.xml:3652(para)
 msgid ""
 "You can also select an arbitrary range of days in the small calendar in the "
 "side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
-"Puede elegir cualquier rango de días en el pequeño calendario encima del "
-"selector a la izquierda. Para ello seleccione los días que quiere ver en el "
+"Puede elegir cualquier rango de días en el calendario pequeño en la "
+"barra lateral. Para ello seleccione los días que quiere ver en el "
 "calendario."
 
-#: C/evolution.xml:3660(para)
-#, fuzzy
+#: C/evolution.xml:3654(para)
 msgid ""
 "The Previous and Next buttons move you forward and back in your calendar "
 "pages. If you are using a week or month view, you can move by week or month. "
 "To return to today's listing, click the Today button in the toolbar."
 msgstr ""
-"Los botones Volver y Avanzar sirven para desplazarse adelante y atrás por "
+"Los botones Anterior y Siguiente sirven para desplazarse adelante y atrás por "
 "las páginas del calendario. Si está usando la vista de semana o mes, puede "
-"desplazarse una semana o un mes. Para volver al día de hoy pulse en Ir a hoy "
+"desplazarse una semana o un mes. Para volver al día de hoy pulse Hoy "
 "en la barra de tareas."
 
-#: C/evolution.xml:3661(para)
+#: C/evolution.xml:3655(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -8743,11 +8489,11 @@ msgstr ""
 "Para visitar las entradas del calendario para una fecha específica, pulse en "
 "Ir a para abrir un cuadro de diálogo donde elegir la fecha."
 
-#: C/evolution.xml:3664(title)
+#: C/evolution.xml:3658(title)
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: C/evolution.xml:3665(para)
+#: C/evolution.xml:3659(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -8756,38 +8502,33 @@ msgstr ""
 "copiar los contenidos para su uso desconectado. Para establecer las "
 "propiedades de su calendario"
 
-#: C/evolution.xml:3668(para)
-#, fuzzy
+#: C/evolution.xml:3662(para)
 msgid "Select the calendar from the side bar at the left."
-msgstr "Seleccione el calendario desde la vista de carpetas en la izquierda."
+msgstr "Seleccione el calendario desde la barra lateral en la izquierda."
 
-#: C/evolution.xml:3671(para)
-#, fuzzy
+#: C/evolution.xml:3665(para)
 msgid "Right click on the calendar."
-msgstr "Pulse con el botón derecho sobre uno de los mensajes."
+msgstr "Pulse con el botón derecho en el calendario."
 
-#: C/evolution.xml:3674(para)
-#, fuzzy
+#: C/evolution.xml:3668(para)
 msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
 "Seleccione Propiedades para abrir el cuadro de diálogo Propiedades del "
 "calendario."
 
-#: C/evolution.xml:3686(para)
+#: C/evolution.xml:3680(para)
 msgid "Edit the label from Name field."
 msgstr "Edite la etiqueta desde el campo Nombre."
 
-#: C/evolution.xml:3689(para)
-#, fuzzy
+#: C/evolution.xml:3683(para)
 msgid "To assign a color for the calendar, click the Color button."
-msgstr ""
-"Para establecer el color para el calendario, pulse sobre la solapa Color."
+msgstr "Para asignar un color para el calendario,pulse el botón Color."
 
-#: C/evolution.xml:3692(para)
+#: C/evolution.xml:3686(para)
 msgid "Select the color and click OK."
 msgstr "Seleccione el color y pulse Aceptar."
 
-#: C/evolution.xml:3695(para)
+#: C/evolution.xml:3689(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -8795,7 +8536,7 @@ msgstr ""
 "Para marcar el contenido de su calendario para un uso desconectado, pulse "
 "Copiar el contenido del calendario localmente para trabajar desconectado."
 
-#: C/evolution.xml:3697(para)
+#: C/evolution.xml:3691(para)
 msgid ""
 "Right click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
@@ -8806,7 +8547,7 @@ msgstr ""
 "acerca de trabajar desconectado, vea <link linkend=\"usage-mail-getnsend-"
 "offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:3699(para)
+#: C/evolution.xml:3693(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -8816,7 +8557,7 @@ msgstr ""
 "iCal, pulse con el botón derecho sobre el calendario en la vista de "
 "calendario a la izquierda y seleccione Guardar al disco."
 
-#: C/evolution.xml:3701(para)
+#: C/evolution.xml:3695(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -8824,11 +8565,11 @@ msgstr ""
 "Pulse Marcar como carpeta predeterminada si quiere marcar esta carpeta como "
 "su carpeta predeterminada para los calendarios."
 
-#: C/evolution.xml:3705(title)
+#: C/evolution.xml:3699(title)
 msgid "Google Calendar"
 msgstr "Google Calendar"
 
-#: C/evolution.xml:3706(para)
+#: C/evolution.xml:3700(para)
 msgid ""
 "Evolution allows you to access your Google calendar. You can view the Google "
 "calendar offline or create, modify, and delete the calendar items online."
@@ -8837,45 +8578,45 @@ msgstr ""
 "calendario de Google cuando esté desconectado o crear, modificar y borrar "
 "elementos del calendario cuando esté conectado."
 
-#: C/evolution.xml:3707(para)
+#: C/evolution.xml:3701(para)
 msgid "To integrate the Google calendar to Evolution:"
 msgstr "Para integrar el calendario de Google en Evolution:"
 
-#: C/evolution.xml:3710(para)
+#: C/evolution.xml:3704(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 "Pulse Nuevo, después seleccione Calendario para abrir el diálogo Calendario "
 "nuevo."
 
-#: C/evolution.xml:3713(para)
+#: C/evolution.xml:3707(para)
 msgid "Select Google from the Type drop-down list."
 msgstr "Seleccione Google de la lista desplegable de tipos."
 
-#: C/evolution.xml:3718(para)
+#: C/evolution.xml:3712(para)
 msgid "Specify the following:"
 msgstr "Especifique lo siguiente:"
 
-#: C/evolution.xml:3722(title)
+#: C/evolution.xml:3716(title)
 msgid "Name:"
 msgstr "Nombre:"
 
-#: C/evolution.xml:3723(para)
+#: C/evolution.xml:3717(para)
 msgid "Specify a name for the Google calendar"
 msgstr "Especifique un nombre para el calendario en Google"
 
-#: C/evolution.xml:3728(title)
+#: C/evolution.xml:3722(title)
 msgid "Username:"
 msgstr "Usuario:"
 
-#: C/evolution.xml:3729(para)
+#: C/evolution.xml:3723(para)
 msgid "Specify your username for your Google account"
 msgstr "Especifique su nombre de usuario para su cuenta en Google"
 
-#: C/evolution.xml:3735(para)
+#: C/evolution.xml:3729(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr "Establezca el tiempo para refrescar el calendario automáticamente."
 
-#: C/evolution.xml:3738(para)
+#: C/evolution.xml:3732(para)
 msgid ""
 "Select Use SSL to enable SSL for communication between Evolution and the "
 "Google server."
@@ -8883,7 +8624,7 @@ msgstr ""
 "Seleccione Usar SSL para activar SSL para la comunicación entre Evolution y "
 "el servidor de Google."
 
-#: C/evolution.xml:3741(para)
+#: C/evolution.xml:3735(para)
 msgid ""
 "If you want to set a color label for the calendar, click the Color tab, "
 "select the desired color, then click OK."
@@ -8891,7 +8632,7 @@ msgstr ""
 "Si quiere establecer un color para una etiqueta del calendario, pulse la "
 "solapa Color y seleccione el color que desee y pulse Aceptar."
 
-#: C/evolution.xml:3744(para)
+#: C/evolution.xml:3738(para)
 msgid ""
 "If you want to view the calendar items offline, select Copy calendar content "
 "locally for offline operation check box."
@@ -8900,14 +8641,13 @@ msgstr ""
 "seleccione la casilla de verificación Copiar el contenido del calendario "
 "localmente para trabajar desconectado."
 
-#: C/evolution.xml:3745(para)
-msgid ""
-"If you select this option, you cannot modify or create the calendar items."
+#: C/evolution.xml:3739(para)
+msgid "If you select this option, you cannot modify or create the calendar items."
 msgstr ""
 "Si selecciona esta opción, no podrá modificar o crear elementos en el "
 "calendario."
 
-#: C/evolution.xml:3755(para)
+#: C/evolution.xml:3749(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -8921,72 +8661,68 @@ msgstr ""
 "También puede usar la búsqueda de Disponibilidad para las reuniones y "
 "determinar la disponibilidad de los participantes."
 
-#: C/evolution.xml:3758(link) C/evolution.xml:3781(title)
+#: C/evolution.xml:3752(link) C/evolution.xml:3775(title)
 msgid "Appointments"
 msgstr "Citas"
 
-#: C/evolution.xml:3761(link) C/evolution.xml:3953(title)
+#: C/evolution.xml:3755(link) C/evolution.xml:3947(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Enviar una invitación para reunión"
 
-#: C/evolution.xml:3764(link) C/evolution.xml:4042(title)
+#: C/evolution.xml:3758(link) C/evolution.xml:4036(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Aceptar y responder a solicitudes de reuniones"
 
-#: C/evolution.xml:3767(link) C/evolution.xml:4060(title)
+#: C/evolution.xml:3761(link) C/evolution.xml:4054(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Leer respuestas a solicitudes de reunión"
 
-#: C/evolution.xml:3770(link) C/evolution.xml:4065(title)
+#: C/evolution.xml:3764(link) C/evolution.xml:4059(title)
 msgid "Using the Free/Busy View"
 msgstr "Uso de la característica de disponibilidad"
 
-#: C/evolution.xml:3773(link) C/evolution.xml:4094(title)
-msgid ""
-"Publishing Calendar and Free/Busy Information Without a Groupware Server"
+#: C/evolution.xml:3767(link) C/evolution.xml:4088(title)
+msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publicar la información de Disponibilidad de calendario sin un servidor "
 "Groupware"
 
-#: C/evolution.xml:3776(link) C/evolution.xml:4127(title)
+#: C/evolution.xml:3770(link) C/evolution.xml:4121(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
 
-#: C/evolution.xml:3782(para)
+#: C/evolution.xml:3776(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
-msgstr ""
-"En Evolution, una cita es un acontecimiento que programa para si mismo."
+msgstr "En Evolution, una cita es un acontecimiento que programa para si mismo."
 
-#: C/evolution.xml:3785(link) C/evolution.xml:3799(title)
+#: C/evolution.xml:3779(link) C/evolution.xml:3793(title)
 msgid "Creating Appointments"
 msgstr "Crear de citas"
 
-#: C/evolution.xml:3788(link) C/evolution.xml:3887(title)
-#: C/evolution.xml:5317(title)
+#: C/evolution.xml:3782(link) C/evolution.xml:3881(title)
+#: C/evolution.xml:5311(title)
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: C/evolution.xml:3791(link) C/evolution.xml:3923(title)
+#: C/evolution.xml:3785(link) C/evolution.xml:3917(title)
 msgid "Classifications"
 msgstr "Clasificaciones"
 
-#: C/evolution.xml:3794(link) C/evolution.xml:3946(title)
+#: C/evolution.xml:3788(link) C/evolution.xml:3940(title)
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: C/evolution.xml:3802(para)
+#: C/evolution.xml:3796(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Cita."
 
-#: C/evolution.xml:3804(para)
-msgid ""
-"Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
+#: C/evolution.xml:3798(para)
+msgid "Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
 msgstr ""
 "Pulse el Calendario en el Selector, después pulse Archivo &gt; Nuevo &gt; "
 "Cita."
 
-#: C/evolution.xml:3806(para)
-#, fuzzy
+#: C/evolution.xml:3800(para)
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
 "dialog box. The particular time on the calendar view against which you have "
@@ -8996,36 +8732,32 @@ msgstr ""
 "cuadro de diálogo Cita. Se creará la cita para esa hora en particular en la "
 "vista del calendario sobre la que haya pulsado dos veces."
 
-#: C/evolution.xml:3808(para)
-msgid ""
-"Select the required duration on the calender view and enter the summary."
+#: C/evolution.xml:3802(para)
+msgid "Select the required duration on the calender view and enter the summary."
 msgstr ""
 "Seleccione la duración requerida en la vista del calendario y escriba el "
 "resumen."
 
-#: C/evolution.xml:3811(para) C/evolution.xml:3966(para)
+#: C/evolution.xml:3805(para) C/evolution.xml:3960(para)
 msgid "Select a calendar in the Calendar drop-down list."
 msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
-#: C/evolution.xml:3812(para) C/evolution.xml:3823(para)
-#: C/evolution.xml:3981(para) C/evolution.xml:4364(para)
-#: C/evolution.xml:4418(para) C/evolution.xml:4650(para)
-#: C/evolution.xml:5716(para)
-#, fuzzy
+#: C/evolution.xml:3806(para) C/evolution.xml:3817(para)
+#: C/evolution.xml:3975(para) C/evolution.xml:4358(para)
+#: C/evolution.xml:4412(para) C/evolution.xml:4644(para)
+#: C/evolution.xml:5710(para)
 msgid "Enter a brief summary in the Summary field."
 msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
 
-#: C/evolution.xml:3817(para) C/evolution.xml:3984(para)
-#, fuzzy
+#: C/evolution.xml:3811(para) C/evolution.xml:3978(para)
 msgid "(Optional) Type a location in the Location field."
-msgstr "(Opcional) escriba una categoría en el campo Categoría."
+msgstr "(Opcional) escriba una ubicación en el campo Lugar."
 
-#: C/evolution.xml:3820(para)
-#, fuzzy
+#: C/evolution.xml:3814(para)
 msgid "Select the date and time."
-msgstr "Seleccione la anchura, tamaño y el alineamiento."
+msgstr "Seleccione la fecha y la hora."
 
-#: C/evolution.xml:3826(para) C/evolution.xml:3987(para)
+#: C/evolution.xml:3820(para) C/evolution.xml:3981(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -9033,19 +8765,17 @@ msgstr ""
 "Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
 "Opciones &gt; Acontecimiento para todo el día."
 
-#: C/evolution.xml:3828(para) C/evolution.xml:3989(para)
+#: C/evolution.xml:3822(para) C/evolution.xml:3983(para)
 msgid "Click the All Day Event button on the toolbar."
-msgstr ""
-"Pulse el botón Acontecimiento para todo el día de la barra de herramientas."
+msgstr "Pulse el botón Acontecimiento para todo el día de la barra de herramientas."
 
-#: C/evolution.xml:3831(para) C/evolution.xml:3992(para)
-msgid ""
-"If the event is an all day event, specify a starting date and an ending date."
+#: C/evolution.xml:3825(para) C/evolution.xml:3986(para)
+msgid "If the event is an all day event, specify a starting date and an ending date."
 msgstr ""
 "Si el acontecimiento es un acontecimiento para todo el día, especifique la "
 "fecha de comienzo y la fecha de finalización."
 
-#: C/evolution.xml:3834(para) C/evolution.xml:3995(para)
+#: C/evolution.xml:3828(para) C/evolution.xml:3989(para)
 msgid ""
 "If the event is not an all day event, specify a starting time and an ending "
 "time."
@@ -9053,73 +8783,69 @@ msgstr ""
 "Si el acontecimiento no es un acontecimiento para todo el día, especifique "
 "una hora de comienzo y una hora de finalización."
 
-#: C/evolution.xml:3837(para) C/evolution.xml:3998(para)
+#: C/evolution.xml:3831(para) C/evolution.xml:3992(para)
 msgid "Select For to specify the duration."
 msgstr "Seleccione Durante para especificar la duración."
 
-#: C/evolution.xml:3839(para) C/evolution.xml:4000(para)
+#: C/evolution.xml:3833(para) C/evolution.xml:3994(para)
 msgid "Select Until to specify the ending time of the event."
-msgstr ""
-"Seleccione Hasta para especificar la hora de finalización del acontecimiento."
+msgstr "Seleccione Hasta para especificar la hora de finalización del acontecimiento."
 
-#: C/evolution.xml:3842(para) C/evolution.xml:4003(para)
-#: C/evolution.xml:4373(para) C/evolution.xml:4424(para)
+#: C/evolution.xml:3836(para) C/evolution.xml:3997(para)
+#: C/evolution.xml:4367(para) C/evolution.xml:4418(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Escriba la información de zona horaria en el campo Zona horaria."
 
-#: C/evolution.xml:3844(para) C/evolution.xml:4005(para)
-#: C/evolution.xml:4375(para) C/evolution.xml:4426(para)
+#: C/evolution.xml:3838(para) C/evolution.xml:3999(para)
+#: C/evolution.xml:4369(para) C/evolution.xml:4420(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Pulse el globo terráqueo para personalizar la zona horaria."
 
-#: C/evolution.xml:3845(para) C/evolution.xml:4006(para)
-#: C/evolution.xml:4376(para) C/evolution.xml:4427(para)
+#: C/evolution.xml:3839(para) C/evolution.xml:4000(para)
+#: C/evolution.xml:4370(para) C/evolution.xml:4421(para)
 msgid "To hide or show the Time Zone field, click View &gt; Time Zone."
-msgstr ""
-"Para ocultar o mostrar el campo Zona horaria, pulse Ver &gt; Zona horaria."
+msgstr "Para ocultar o mostrar el campo Zona horaria, pulse Ver &gt; Zona horaria."
 
-#: C/evolution.xml:3848(para)
+#: C/evolution.xml:3842(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Para mostrar la hora como ocupada, pulse Opciones &gt; Mostrar hora como "
 "ocupada."
 
-#: C/evolution.xml:3851(para) C/evolution.xml:3929(para)
-#: C/evolution.xml:4379(para) C/evolution.xml:4430(para)
-#: C/evolution.xml:4646(para)
+#: C/evolution.xml:3845(para) C/evolution.xml:3923(para)
+#: C/evolution.xml:4373(para) C/evolution.xml:4424(para)
+#: C/evolution.xml:4640(para)
 msgid "(Optional) Type a category in the Categories field."
 msgstr "(Opcional) escriba una categoría en el campo Categoría."
 
-#: C/evolution.xml:3852(para) C/evolution.xml:3935(para)
-#: C/evolution.xml:4380(para) C/evolution.xml:4431(para)
+#: C/evolution.xml:3846(para) C/evolution.xml:3929(para)
+#: C/evolution.xml:4374(para) C/evolution.xml:4425(para)
 msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:3855(para) C/evolution.xml:4383(para)
-#: C/evolution.xml:4434(para) C/evolution.xml:4656(para)
-#: C/evolution.xml:5725(para)
-#, fuzzy
+#: C/evolution.xml:3849(para) C/evolution.xml:4377(para)
+#: C/evolution.xml:4428(para) C/evolution.xml:4650(para)
+#: C/evolution.xml:5719(para)
 msgid "(Optional) Enter a description in the Description field."
-msgstr "Escriba una descripción en el campo Descripción."
+msgstr "(Opcional) escriba una descripción en el campo Descripción."
 
-#: C/evolution.xml:3858(para) C/evolution.xml:3913(para)
-#: C/evolution.xml:4009(para)
-#, fuzzy
+#: C/evolution.xml:3852(para) C/evolution.xml:3907(para)
+#: C/evolution.xml:4003(para)
 msgid ""
 "To create an alarm for this appointment, click Alarms on the toolbar, or "
 "click Options &gt; Alarms."
 msgstr ""
-"Cuando cree una cita, pulse Alertas en la barra de herramientas o pulse "
-"Opciones &gt; Alertas."
+"Para crear una alerta para esta cita, pulse Alertas en la barra de "
+"herramientas o pulse Opciones &gt; Alertas."
 
-#: C/evolution.xml:3859(para) C/evolution.xml:3916(para)
-#: C/evolution.xml:4010(para)
+#: C/evolution.xml:3853(para) C/evolution.xml:3910(para)
+#: C/evolution.xml:4004(para)
 msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
 "Seleccione Personalizar para añadir o eliminar alertas personalizadas para "
 "el acontecimiento."
 
-#: C/evolution.xml:3860(para) C/evolution.xml:4011(para)
+#: C/evolution.xml:3854(para) C/evolution.xml:4005(para)
 msgid ""
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
@@ -9127,10 +8853,9 @@ msgstr ""
 "Para obtener más información acerca de los recordatorios, vea <link linkend="
 "\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:3863(para) C/evolution.xml:4014(para)
-#: C/evolution.xml:4392(para) C/evolution.xml:4437(para)
-#: C/evolution.xml:4659(para)
-#, fuzzy
+#: C/evolution.xml:3857(para) C/evolution.xml:4008(para)
+#: C/evolution.xml:4386(para) C/evolution.xml:4431(para)
+#: C/evolution.xml:4653(para)
 msgid ""
 "(Optional) To add an attachment, drag and drop the attachment into the "
 "attachment bar."
@@ -9138,9 +8863,9 @@ msgstr ""
 "(Opcional) para añadir un adjunto a la tarea, arrastre y suelte el adjunto "
 "en la barra de adjuntos."
 
-#: C/evolution.xml:3865(para) C/evolution.xml:4016(para)
-#: C/evolution.xml:4394(para) C/evolution.xml:4439(para)
-#: C/evolution.xml:4661(para)
+#: C/evolution.xml:3859(para) C/evolution.xml:4010(para)
+#: C/evolution.xml:4388(para) C/evolution.xml:4433(para)
+#: C/evolution.xml:4655(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -9148,7 +8873,7 @@ msgstr ""
 "Pulse el botón Adjuntar en la barra de herramientas, o pulse Insertar &gt; "
 "Adjunto y después examine para seleccionar el adjunto."
 
-#: C/evolution.xml:3868(para) C/evolution.xml:4019(para)
+#: C/evolution.xml:3862(para) C/evolution.xml:4013(para)
 msgid ""
 "(Optional) Select a classification (Public, Private, or Confidential) by "
 "clicking &gt; Options &gt; Classifications."
@@ -9156,11 +8881,11 @@ msgstr ""
 "(Opcional) seleccione una clasificación (Pública, Privada o Confidencial) "
 "pulsando Opciones &gt; Clasificaciones."
 
-#: C/evolution.xml:3871(para) C/evolution.xml:4022(para)
+#: C/evolution.xml:3865(para) C/evolution.xml:4016(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr "(Opcional) pulse el botón Repetición en la barra de herramientas."
 
-#: C/evolution.xml:3873(para) C/evolution.xml:4024(para)
+#: C/evolution.xml:3867(para) C/evolution.xml:4018(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -9168,11 +8893,11 @@ msgstr ""
 "Pulse Opciones &gt; Repetición, y especifique cuando y con qué frecuencia "
 "quiere que se repita la cita."
 
-#: C/evolution.xml:3878(title)
+#: C/evolution.xml:3872(title)
 msgid "All Day Event"
 msgstr "Acontecimiento para todo el día"
 
-#: C/evolution.xml:3879(para)
+#: C/evolution.xml:3873(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -9191,7 +8916,7 @@ msgstr ""
 "solaparse. Cuando eso ocurre se muestran con múltiples columnas en la vista "
 "del día del calendario."
 
-#: C/evolution.xml:3880(para)
+#: C/evolution.xml:3874(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -9199,7 +8924,7 @@ msgstr ""
 "Si crea citas que se solapan, Evolution las mostrará lado a lado en el "
 "calendario."
 
-#: C/evolution.xml:3888(para)
+#: C/evolution.xml:3882(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -9209,29 +8934,27 @@ msgstr ""
 "antelación a la cita que ha planificado. Puede tener un recordatorio de cada "
 "uno de los siguientes tipos:"
 
-#: C/evolution.xml:3892(title)
+#: C/evolution.xml:3886(title)
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: C/evolution.xml:3893(para)
-msgid ""
-"A notification pops up on your screen to remind you of your appointment."
-msgstr ""
-"Se abrirá una ventana emergente en su pantalla para recordarle su cita."
+#: C/evolution.xml:3887(para)
+msgid "A notification pops up on your screen to remind you of your appointment."
+msgstr "Se abrirá una ventana emergente en su pantalla para recordarle su cita."
 
-#: C/evolution.xml:3898(title)
+#: C/evolution.xml:3892(title)
 msgid "Audio:"
 msgstr "Sonido:"
 
-#: C/evolution.xml:3899(para)
+#: C/evolution.xml:3893(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "Su sistema emitirça un sonido como alerta."
 
-#: C/evolution.xml:3904(title)
+#: C/evolution.xml:3898(title)
 msgid "Program:"
 msgstr "Ejecutar un programa:"
 
-#: C/evolution.xml:3905(para)
+#: C/evolution.xml:3899(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -9239,7 +8962,7 @@ msgstr ""
 "Puede ejecutar un programa como recordatorio. Debe introducir el nombre en "
 "el campo de texto o buscarlo con el botón Explorar."
 
-#: C/evolution.xml:3909(para)
+#: C/evolution.xml:3903(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -9249,12 +8972,11 @@ msgstr ""
 "parpadea en el área de notificación. Para pausar la alerta o ver el "
 "acontecimiento, pulse en el icono de notificación."
 
-#: C/evolution.xml:3910(para)
+#: C/evolution.xml:3904(para)
 msgid "To create a reminder:"
 msgstr "Crear un recordatorio:"
 
-#: C/evolution.xml:3919(para)
-#, fuzzy
+#: C/evolution.xml:3913(para)
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
@@ -9262,15 +8984,13 @@ msgid ""
 "at least once after logging in. No matter where the reminders are stored, "
 "you can quit Evolution and still be reminded of an upcoming appointment."
 msgstr ""
-"Si ha almacenado recordatorios en el calendario local, tendrán efecto desde "
-"el momento en el que inicie su sesión en el sistema. Sin embargo, para "
-"recibir recordatorios almacenados en un servidor remoto como GroupWise "
-"Exchange que requiere autenticación, deberá ejecutar Evolution al menos una "
-"vez tras el inicio de sesión. Con independencia del lugar de almacenamiento, "
-"puede salir de Evolution y aún podrá recibir los recordatorios de las citas "
-"próximas."
+"Si ha almacenado recordatorios en el calendario local, tendrán efecto desde el momento "
+"en el que inicie su sesión en el sistema. Sin embargo, para recordatorios almacenados en un servidor remoto como "
+"GroupWise o Exchange que requieren autenticación, deberá ejecutar Evolution "
+"al menos una vez tras el inicio de sesión. Con independencia del lugar de almacenamiento, "
+"puede salir de Evolution y aún podrá recibir los recordatorios de las citas próximas."
 
-#: C/evolution.xml:3924(para)
+#: C/evolution.xml:3918(para)
 msgid ""
 "If you are using a calendar on a Novell <trademark class=\"registered"
 "\">GroupWise</trademark> or Microsoft Exchange server, select a "
@@ -9290,7 +9010,7 @@ msgstr ""
 "del servidor; compruebe con el administrador de su sistema o ajuste su "
 "configuración de delegación."
 
-#: C/evolution.xml:3925(para)
+#: C/evolution.xml:3919(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9305,13 +9025,11 @@ msgstr ""
 "la caja Libre en la selección Mostrar hora como. Generalmente las citas se "
 "muestran como Ocupado."
 
-#: C/evolution.xml:3926(para)
-msgid ""
-"You can categorize appointments in the same way you can categorize contacts."
-msgstr ""
-"Puede categorizar las citas de la misma manera que categoriza contactos."
+#: C/evolution.xml:3920(para)
+msgid "You can categorize appointments in the same way you can categorize contacts."
+msgstr "Puede categorizar las citas de la misma manera que categoriza contactos."
 
-#: C/evolution.xml:3932(para)
+#: C/evolution.xml:3926(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
@@ -9319,7 +9037,7 @@ msgstr ""
 "Seleccione la casilla de verificación junto a cada categoría que coincida "
 "con la cita que está creando."
 
-#: C/evolution.xml:3939(para)
+#: C/evolution.xml:3933(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
@@ -9328,7 +9046,7 @@ msgstr ""
 "lista maestra de categorías y a continuación en Pulse aquí para añadir una "
 "categoría."
 
-#: C/evolution.xml:3941(para)
+#: C/evolution.xml:3935(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9338,8 +9056,7 @@ msgstr ""
 "cita. Las categorías seleccionadas se muestran en un cuadro de texto a la "
 "derecha del botón Categorías."
 
-#: C/evolution.xml:3942(para)
-#, fuzzy
+#: C/evolution.xml:3936(para)
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
@@ -9348,10 +9065,10 @@ msgid ""
 msgstr ""
 "Las citas con categorías aparecen con iconos en la vista de calendario y "
 "también puede buscar las citas por categorías. Para mostrar sólo las citas "
-"de una categoría en particular, seleccione Categoría es en la barra de "
-"búsqueda en la parte superior del calendario y seleccione una categoría."
+"de una categoría en particular, seleccione la categoría correspondiente en "
+"la barra de búsqueda en la parte superior del calendario."
 
-#: C/evolution.xml:3947(para)
+#: C/evolution.xml:3941(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
@@ -9370,8 +9087,7 @@ msgstr ""
 "de junio de 2008</quote> o <quote>de cada mes el primer viernes en 12 "
 "ocasiones</quote>."
 
-#: C/evolution.xml:3948(para)
-#, fuzzy
+#: C/evolution.xml:3942(para)
 msgid ""
 "After you have finished settings, click the Save button in the toolbar to "
 "save and close the appointment editor window. If you want, you can alter an "
@@ -9379,14 +9095,13 @@ msgid ""
 "change other settings by right-clicking the appointment then choosing Open, "
 "or double-clicking the appointment."
 msgstr ""
-"Cuando haya terminado con todos los detalles pulse en el icono del disco en "
-"la barra de tareas para guardar la cita y cerrar la ventana del editor. Si "
-"lo desea, puede modificar el resumen de una cita en la vista del calendario "
-"pulsando sobre ella y escribiendo directamente. Puede cambiar otros ajustes "
-"pulsando con el botón derecho sobre la cita y después eligiendo Abrir o "
+"Cuando haya terminado con todos los detalles pulse el botón Guardar en la barra de herramientas para "
+"guardar la cita y cerrar la ventana del editor. Si lo desea, puede modificar "
+"el resumen de una cita en la vista del calendario pulsando sobre ella y escribiendo directamente. "
+"Puede cambiar otros ajustes pulsando con el botón derecho sobre la cita y después eligiendo Abrir o "
 "pulsando dos veces sobre la cita."
 
-#: C/evolution.xml:3954(para)
+#: C/evolution.xml:3948(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9396,8 +9111,7 @@ msgstr ""
 "Evolution sirve para organizar reuniones de grupos y ayudarle a gestionar "
 "las respuestas a las solicitudes de reunión."
 
-#: C/evolution.xml:3955(para)
-#, fuzzy
+#: C/evolution.xml:3949(para)
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
 "attendees in several categories, such as <quote>chair</quote> or "
@@ -9410,8 +9124,7 @@ msgstr ""
 "requerido</quote>. Cuando guarde su lista, cada invitado recibirá un mensaje "
 "con los datos de la cita y tendrán la opción de responder."
 
-#: C/evolution.xml:3956(para)
-#, fuzzy
+#: C/evolution.xml:3950(para)
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
@@ -9427,42 +9140,39 @@ msgstr ""
 "destinatarios podrán incluir el acontecimiento en sus calendarios con una "
 "pulsación, pero no le enviarán respuesta acerca de si asistirán o no."
 
-#: C/evolution.xml:3957(para)
+#: C/evolution.xml:3951(para)
 msgid "To schedule a meeting:"
 msgstr "Para planificar una reunión:"
 
-#: C/evolution.xml:3960(para) C/evolution.xml:4070(para)
+#: C/evolution.xml:3954(para) C/evolution.xml:4064(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Reunión."
 
-#: C/evolution.xml:3963(para) C/evolution.xml:4409(para)
-#, fuzzy
+#: C/evolution.xml:3957(para) C/evolution.xml:4403(para)
 msgid ""
 "If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
 msgstr ""
-"Si tiene múltiples cuentas de correo, seleccione la que quiere usar "
+"Si tiene múltiples cuentas de correo seleccione la que quiere usar "
 "seleccionando un elemento en el campo Organizador."
 
-#: C/evolution.xml:3969(para) C/evolution.xml:4073(para)
-#, fuzzy
+#: C/evolution.xml:3963(para) C/evolution.xml:4067(para)
 msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Pulse añadir para añadir las direcciones de correo-e de las personas a las "
 "que quiere invitar."
 
-#: C/evolution.xml:3972(para)
-msgid ""
-"To remove an attendee from the list, select an attendee and press Remove."
+#: C/evolution.xml:3966(para)
+msgid "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Para quitar un participante de la lista, seleccione un participante y pulse "
 "Quitar."
 
-#: C/evolution.xml:3975(para)
+#: C/evolution.xml:3969(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr "Para editar un campo, seleccione el campo y pulse Editar."
 
-#: C/evolution.xml:3978(para)
+#: C/evolution.xml:3972(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9470,7 +9180,7 @@ msgstr ""
 "Pulse Ver en la barra de menú para ver u ocultar los campos Tipo, Rol, "
 "Estado y RSVP."
 
-#: C/evolution.xml:4027(para)
+#: C/evolution.xml:4021(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9478,24 +9188,21 @@ msgstr ""
 "Para preguntar la información de Disponibilidad de los asistentes, pulse el "
 "botón Disponibilidad en la barra de herramientas."
 
-#: C/evolution.xml:4029(para)
+#: C/evolution.xml:4023(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Pulse Opciones &gt; Disponibilidad."
 
-#: C/evolution.xml:4032(para)
+#: C/evolution.xml:4026(para)
 msgid "Click Save to save the meeting."
 msgstr "Pulse Guardar para guardar la reunión."
 
-#: C/evolution.xml:4035(para)
-#, fuzzy
-msgid ""
-"An email is sent out to all the recipients, inviting them to your event."
+#: C/evolution.xml:4029(para)
+msgid "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Se enviará un correo-e a todos los destinatarios, invitándoles a su "
 "acontecimiento."
 
-#: C/evolution.xml:4037(para)
-#, fuzzy
+#: C/evolution.xml:4031(para)
 msgid ""
 "In Evolution, a meeting can have only one organizer, and only the organizer "
 "can add participants to that meeting. Though it is possible to change the "
@@ -9506,13 +9213,13 @@ msgid ""
 "organiser to additional participants."
 msgstr ""
 "Una reunión sólo puede tener un organizador, y sólo el organizador puede "
-"añadir participantes. Puede designarse a si mismo como organizador de la "
-"reunión, pero si no lo es, puede provocar confusión en el proceso de "
-"planificación.Si desea invitar a personas adicionales sin cambiar el "
-"organizador, lo mejor es reenviar el mensaje original del organizador a los "
-"nuevos invitados."
+"añadir participantes a esa cita. Aunque se puede cambiar el organizador de "
+"una reunión, no se recomienda porque puede provocar confusión en el proceso "
+"de planificación. Si desea invitar a personas adicionales y no son los que "
+"ha invitado el organizador, es recomendable que reenvíe el mensaje de "
+"invitación que recibió del organizador original a los asistentes."
 
-#: C/evolution.xml:4043(para)
+#: C/evolution.xml:4037(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9525,20 +9232,19 @@ msgstr ""
 "fechas. Después puede elegir cómo responder a la invitación. Sus opciones "
 "son:"
 
-#: C/evolution.xml:4046(para)
+#: C/evolution.xml:4040(para)
 msgid "Accept"
 msgstr "Aceptar"
 
-#: C/evolution.xml:4049(para)
+#: C/evolution.xml:4043(para)
 msgid "Tentatively Accept"
 msgstr "Aceptado provisionalmente"
 
-#: C/evolution.xml:4052(para)
+#: C/evolution.xml:4046(para)
 msgid "Decline"
 msgstr "Rehusar"
 
-#: C/evolution.xml:4055(para)
-#, fuzzy
+#: C/evolution.xml:4049(para)
 msgid ""
 "Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
@@ -9546,7 +9252,7 @@ msgstr ""
 "Pulse Aceptar para enviar un correo-e con su respuesta al organizador. Si "
 "acepta el acontecimiento también se añadirá a su calendario."
 
-#: C/evolution.xml:4056(para)
+#: C/evolution.xml:4050(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9556,18 +9262,15 @@ msgstr ""
 "a la información, pero si el organizador original envía otra actualización, "
 "sus cambios se sobreescribirán."
 
-#: C/evolution.xml:4061(para)
-#, fuzzy
+#: C/evolution.xml:4055(para)
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
 "inline by clicking the attachment and selecting View Inline."
 msgstr ""
 "Cuando reciba una respuesta a su invitación de reunión, podrá verla incluida "
-"dentro del mensaje. Pulse con el botón derecho sobre el adjunto y elija Ver "
-"incluido. En la parte inferior, puede pulsar Aceptar para actualizar su "
-"lista de asistentes."
+"dentro del mensaje pulsando el adjunto y seleccionando Ver incluido."
 
-#: C/evolution.xml:4066(para)
+#: C/evolution.xml:4060(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9588,47 +9291,44 @@ msgstr ""
 "todavía puede usar los acontecimientos iCal en forma de invitaciones para "
 "coordinar las agendas con otras personas."
 
-#: C/evolution.xml:4067(para)
+#: C/evolution.xml:4061(para)
 msgid "To access the free/busy view:"
 msgstr "Para acceder a la vista de disponibilidad:"
 
-#: C/evolution.xml:4076(para)
-msgid ""
-"Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
+#: C/evolution.xml:4070(para)
+msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Pulse el botón Disponibilidad en la barra de herramientas o pulse Opciones "
 "&gt; Disponibilidad."
 
-#: C/evolution.xml:4081(para)
-#, fuzzy
+#: C/evolution.xml:4075(para)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
 "Close. Attendees on an Exchange server have the appointment updated "
 "automatically; others receive email notification of any change in plans."
 msgstr ""
-"Para ajustar la hora de reunión, arrastre los bordes de la reunión o pulse "
+"Ajuste la hora de reunión, arrastrando los bordes de la reunión o pulsando "
 "en Autoseleccionar para hacer una elección automática, después pulse Guardar "
 "y cerrar. Los asistentes en un servidor Exchange tendrán sus datos "
 "actualizados automáticamente, el resto recibirá una notificación por correo "
 "electrónico de cualquier cambio en los planes."
 
-#: C/evolution.xml:4085(title)
+#: C/evolution.xml:4079(title)
 msgid "Attendee List:"
 msgstr "Lista de asistentes:"
 
-#: C/evolution.xml:4086(para)
-msgid ""
-"The Attendee List shows the people who have been invited to the appointment."
+#: C/evolution.xml:4080(para)
+msgid "The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 "La Lista de asistentes muestra a las personas que han sido invitadas a la "
 "reunión."
 
-#: C/evolution.xml:4089(title)
+#: C/evolution.xml:4083(title)
 msgid "Schedule Grid:"
 msgstr "Cuadrícula de planificación:"
 
-#: C/evolution.xml:4090(para)
+#: C/evolution.xml:4084(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -9647,7 +9347,7 @@ msgstr ""
 "un URL y ha indtroducido ese URL en la tarjeta del contacto usando el editor "
 "de contactos."
 
-#: C/evolution.xml:4095(para)
+#: C/evolution.xml:4089(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -9659,15 +9359,15 @@ msgstr ""
 "web con soporte HTTP PUT. Compruebe con el administrador de su sistema si no "
 "está seguro de disponer de esta funcionalidad."
 
-#: C/evolution.xml:4096(para)
+#: C/evolution.xml:4090(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr "Para establecer la disponibilidad de publicación de un Calendario:"
 
-#: C/evolution.xml:4099(para) C/evolution.xml:4833(para)
+#: C/evolution.xml:4093(para) C/evolution.xml:4827(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr "Pulse Editar &gt; Preferencias, después pulse Calendario y tareas."
 
-#: C/evolution.xml:4102(para)
+#: C/evolution.xml:4096(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -9675,23 +9375,23 @@ msgstr ""
 "Pulse en la solapa Publicación de calendarios, pulse Añadir, después "
 "seleccione la información que quiere publicar."
 
-#: C/evolution.xml:4105(para)
+#: C/evolution.xml:4099(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr "Seleccione la frecuencia con la que quiere subir datos."
 
-#: C/evolution.xml:4108(para)
+#: C/evolution.xml:4102(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Seleccione los calendarios para los que quiere mostrar los datos."
 
-#: C/evolution.xml:4111(para)
+#: C/evolution.xml:4105(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Especifique la ubicación para publicar en el servidor de subidas."
 
-#: C/evolution.xml:4114(para)
+#: C/evolution.xml:4108(para)
 msgid "Type your username and password."
 msgstr "Escriba su nombre de usuario y contraseña."
 
-#: C/evolution.xml:4120(para)
+#: C/evolution.xml:4114(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -9700,13 +9400,13 @@ msgstr ""
 "herramienta del Calendario y pulse Acciones &gt; Publicar información del "
 "calendario."
 
-#: C/evolution.xml:4122(para) C/evolution.xml:6682(para)
+#: C/evolution.xml:4116(para) C/evolution.xml:6676(para)
 msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 "Puede especificar una plantilla para usar cuando publique contra el servidor "
 "de disponibilidad."
 
-#: C/evolution.xml:4128(para)
+#: C/evolution.xml:4122(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -9719,7 +9419,7 @@ msgstr ""
 "reunión con ellos, Evolution comprueba los horarios y los muestra en los "
 "datos de Disponibilidad."
 
-#: C/evolution.xml:4135(para)
+#: C/evolution.xml:4129(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Calendar items."
@@ -9727,7 +9427,7 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos del Calendario."
 
-#: C/evolution.xml:4138(para)
+#: C/evolution.xml:4132(para)
 msgid ""
 "Evolution enables you to find the Calendar items by using a Customized "
 "Search."
@@ -9735,56 +9435,56 @@ msgstr ""
 "Evolution le permite buscar los elementos del Calendario usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4148(para) C/evolution.xml:4464(para)
-#: C/evolution.xml:4700(para)
+#: C/evolution.xml:4142(para) C/evolution.xml:4458(para)
+#: C/evolution.xml:4694(para)
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: C/evolution.xml:4151(para) C/evolution.xml:4467(para)
-#: C/evolution.xml:4703(para)
+#: C/evolution.xml:4145(para) C/evolution.xml:4461(para)
+#: C/evolution.xml:4697(para)
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: C/evolution.xml:4154(para) C/evolution.xml:4470(para)
-#: C/evolution.xml:4706(para)
+#: C/evolution.xml:4148(para) C/evolution.xml:4464(para)
+#: C/evolution.xml:4700(para)
 msgid "Any field Contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:4159(para) C/evolution.xml:4711(para)
+#: C/evolution.xml:4153(para) C/evolution.xml:4705(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution muestra los elementos del Calendario deseados."
 
-#: C/evolution.xml:4171(para) C/evolution.xml:4485(para)
-#: C/evolution.xml:4723(para)
+#: C/evolution.xml:4165(para) C/evolution.xml:4479(para)
+#: C/evolution.xml:4717(para)
 msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Seleccione Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda "
 "avanzada."
 
-#: C/evolution.xml:4172(para) C/evolution.xml:4486(para)
-#: C/evolution.xml:4724(para)
+#: C/evolution.xml:4166(para) C/evolution.xml:4480(para)
+#: C/evolution.xml:4718(para)
 msgid "Search name field displays the search type you have selected."
 msgstr ""
 "El campo de búsqueda de nombre muestra el tipo de búsqueda que ha "
 "seleccionado."
 
-#: C/evolution.xml:4177(para) C/evolution.xml:4491(para)
-#: C/evolution.xml:4729(para)
+#: C/evolution.xml:4171(para) C/evolution.xml:4485(para)
+#: C/evolution.xml:4723(para)
 msgid "Click Add to add rules."
 msgstr "Pulse Añadir para añadir reglas."
 
-#: C/evolution.xml:4180(para) C/evolution.xml:4494(para)
-#: C/evolution.xml:4732(para)
+#: C/evolution.xml:4174(para) C/evolution.xml:4488(para)
+#: C/evolution.xml:4726(para)
 msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Seleccione el criterio y después escriba una entrada de búsqueda en el campo "
 "proporcionado."
 
-#: C/evolution.xml:4186(para) C/evolution.xml:4738(para)
+#: C/evolution.xml:4180(para) C/evolution.xml:4732(para)
 msgid "Click Save to save your search results."
 msgstr "Pulse Guardar para guardar los resultados."
 
-#: C/evolution.xml:4191(para)
+#: C/evolution.xml:4185(para)
 msgid ""
 "Displays all the Calendar items that match the criteria that you have "
 "selected from the drop-down list in the Search bar."
@@ -9792,43 +9492,43 @@ msgstr ""
 "Muestra todos los elementos del Calendario que coincidan con los criterios "
 "que haya seleccionado de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4195(para) C/evolution.xml:4747(para)
+#: C/evolution.xml:4189(para) C/evolution.xml:4741(para)
 msgid "Click the Show drop-down list."
 msgstr "Pulse Mostrar la lista desplegable."
 
-#: C/evolution.xml:4201(para) C/evolution.xml:4543(para)
-#: C/evolution.xml:4753(para)
+#: C/evolution.xml:4195(para) C/evolution.xml:4537(para)
+#: C/evolution.xml:4747(para)
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: C/evolution.xml:4204(para) C/evolution.xml:4546(para)
-#: C/evolution.xml:4756(para)
+#: C/evolution.xml:4198(para) C/evolution.xml:4540(para)
+#: C/evolution.xml:4750(para)
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: C/evolution.xml:4207(para)
+#: C/evolution.xml:4201(para)
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: C/evolution.xml:4210(para)
+#: C/evolution.xml:4204(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
-#: C/evolution.xml:4225(para) C/evolution.xml:4576(para)
+#: C/evolution.xml:4219(para) C/evolution.xml:4570(para)
 msgid "Favourites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:4278(para)
+#: C/evolution.xml:4272(para)
 msgid "You can view the desired items listed in the Calendar view."
 msgstr "Puede ver los elementos deseados listados en la vista del Calendario."
 
-#: C/evolution.xml:4283(para)
+#: C/evolution.xml:4277(para)
 msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Para imprimir los elementos mostrados del calendario pulse Archivo &gt; "
 "Imprimir."
 
-#: C/evolution.xml:4288(para)
+#: C/evolution.xml:4282(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -9839,29 +9539,29 @@ msgstr ""
 "introduzca el número de días de acontecimientos pasados que quiere mantener. "
 "Pulse Aceptar para purgar los elementos."
 
-#: C/evolution.xml:4293(para)
+#: C/evolution.xml:4287(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Sólo los asistentes a una reunión pueden delegar una reunión."
 
-#: C/evolution.xml:4296(para)
+#: C/evolution.xml:4290(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho en la reunión que quiere "
 "delegar."
 
-#: C/evolution.xml:4299(para)
+#: C/evolution.xml:4293(para)
 msgid "Click Delegate Meeting."
 msgstr "Pulse Delegar reunión."
 
-#: C/evolution.xml:4302(para)
+#: C/evolution.xml:4296(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Seleccione los contactos a los que quiere delegar la reunión."
 
-#: C/evolution.xml:4308(para)
+#: C/evolution.xml:4302(para)
 msgid "Each contact receives a copy of the meeting invitation."
 msgstr "Cada contacto recibe una copia de la invitación a la reunión."
 
-#: C/evolution.xml:4313(para)
+#: C/evolution.xml:4307(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -9883,7 +9583,7 @@ msgstr ""
 "añadido el calendario de un equipo de deporte a su calendario, puede que no "
 "necesite actualizarlo más de una vez por semana."
 
-#: C/evolution.xml:4314(para)
+#: C/evolution.xml:4308(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -9895,8 +9595,7 @@ msgstr ""
 "fiestas nacionales y religiosas, fases de la luna, deportes y "
 "acontecimientos locales y regionales."
 
-#: C/evolution.xml:4315(para)
-#, fuzzy
+#: C/evolution.xml:4309(para)
 msgid ""
 "Evolution lets you view and manage calendars on remote CalDAV servers. The "
 "procedure to create a CalDAV calendar source is similar to that of a remote "
@@ -9904,14 +9603,11 @@ msgid ""
 "accounts just like other calendars on Evolution."
 msgstr ""
 "Evolution le permite ver y gestionar calendarios en servidores remotos "
-"CalDAV tales como <trademark class=\"registered\">Hula</trademark>. Para "
-"obtener más información acerca de Hula, vea la <ulink url=\"http://www.hula-"
-"project.org\">página web del proyecto Hula</ulink>. El procedimiento para "
-"crear un calendario CalDAV es similar al del calendario Web remoto. Puede "
-"ver y crear acontecimientos en las cuentas CalDAV igual que en los otros "
-"calendarios de Evolution."
+"CalDAV. El procedimiento para crear un calendario CalDAV es similar al del "
+"calendario Web remoto. Puede ver y crear acontecimientos en las cuentas "
+"CalDAV igual que en los otros calendarios de Evolution."
 
-#: C/evolution.xml:4320(para)
+#: C/evolution.xml:4314(para)
 msgid ""
 "The Task List, located in the upper-right corner of the calendar, lets you "
 "keep a list of tasks separate from your calendar appointments."
@@ -9920,7 +9616,7 @@ msgstr ""
 "calendario, permite mantener la lista de tareas separada de las citas del "
 "calendario."
 
-#: C/evolution.xml:4321(para)
+#: C/evolution.xml:4315(para)
 msgid ""
 "You can use the list in a larger window by clicking the Tasks button in the "
 "side bar."
@@ -9928,7 +9624,7 @@ msgstr ""
 "Puede usar la lista en la ventana más grande pulsando el botón Tareas en la "
 "barra lateral."
 
-#: C/evolution.xml:4322(para)
+#: C/evolution.xml:4316(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -9942,36 +9638,34 @@ msgstr ""
 "calendario aparecen las tareas de todas las listas de tareas, coloreadas por "
 "su código de lista."
 
-#: C/evolution.xml:4325(link) C/evolution.xml:4336(title)
+#: C/evolution.xml:4319(link) C/evolution.xml:4330(title)
 msgid "Creating a New Task List"
 msgstr "Crear una nueva lista de tareas"
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4328(link) C/evolution.xml:4355(title)
+#: C/evolution.xml:4322(link) C/evolution.xml:4349(title)
 msgid "Creating a New Task"
 msgstr "Crear una tarea nueva"
 
-#: C/evolution.xml:4331(link) C/evolution.xml:4400(title)
+#: C/evolution.xml:4325(link) C/evolution.xml:4394(title)
 msgid "Assigned Tasks"
 msgstr "Tareas asignadas"
 
-#: C/evolution.xml:4339(para)
+#: C/evolution.xml:4333(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de tareas."
 
-#: C/evolution.xml:4342(para)
+#: C/evolution.xml:4336(para)
 msgid "Specify the name and color for the task list."
 msgstr "Especifique el nombre y el color para la lista de tareas."
 
-#: C/evolution.xml:4345(para)
-msgid ""
-"(Optional) If the task is an online list, specify the URL of the task list."
+#: C/evolution.xml:4339(para)
+msgid "(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(Opcional) Si la tarea es una lista en línea, especifique el URL de la lista "
 "de tareas."
 
-#: C/evolution.xml:4351(para)
-#, fuzzy
+#: C/evolution.xml:4345(para)
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
@@ -9991,28 +9685,28 @@ msgstr ""
 "dirección y tipo de ordenación, o pulse con el botón derecho para añadir o "
 "eliminar columnas desde la pantalla."
 
-#: C/evolution.xml:4358(para)
+#: C/evolution.xml:4352(para)
 msgid "Click File &gt; New &gt; Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea."
 
-#: C/evolution.xml:4361(para) C/evolution.xml:4412(para)
+#: C/evolution.xml:4355(para) C/evolution.xml:4406(para)
 msgid "Select a group for the task."
 msgstr "Seleccione un grupo para la tarea."
 
-#: C/evolution.xml:4367(para)
+#: C/evolution.xml:4361(para)
 msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 "(Opcional) especifique una fecha de comienzo y una fecha de finalización "
 "para la tarea."
 
-#: C/evolution.xml:4370(para)
+#: C/evolution.xml:4364(para)
 msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 "(Opcional) especifique una hora de comienzo y una hora de finalización para "
 "la tarea."
 
-#: C/evolution.xml:4386(para) C/evolution.xml:4442(para)
-#: C/evolution.xml:4664(para)
+#: C/evolution.xml:4380(para) C/evolution.xml:4436(para)
+#: C/evolution.xml:4658(para)
 msgid ""
 "(Optional) Click Options &gt; Classifications, then select a classification "
 "(as Public, Private or Confidential)."
@@ -10020,7 +9714,7 @@ msgstr ""
 "(Opcional) pulse Opciones &gt; Clasificaciones, después seleccione una "
 "clasificación (como Público, Privado o Confidencial)."
 
-#: C/evolution.xml:4389(para) C/evolution.xml:4445(para)
+#: C/evolution.xml:4383(para) C/evolution.xml:4439(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -10028,11 +9722,11 @@ msgstr ""
 "(Opcional) para especificar un estado para la tarea, pulse Opciones &gt; "
 "Detalles del estado."
 
-#: C/evolution.xml:4401(para)
+#: C/evolution.xml:4395(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution se puede usar para asignar una tarea a varias personas."
 
-#: C/evolution.xml:4402(para)
+#: C/evolution.xml:4396(para)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as <quote>chair</quote> or <quote>required.</quote> When you save the "
@@ -10045,15 +9739,15 @@ msgstr ""
 "datos de la cita y tendrán la opción de responder."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4403(para)
+#: C/evolution.xml:4397(para)
 msgid "To assign a new task:"
 msgstr "Asignar una tarea nueva:"
 
-#: C/evolution.xml:4406(para)
+#: C/evolution.xml:4400(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea asignada."
 
-#: C/evolution.xml:4415(para)
+#: C/evolution.xml:4409(para)
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
 "email addresses of people you want to assign the task. To remove an attendee "
@@ -10068,7 +9762,7 @@ msgstr ""
 "el campo y después pulse Editar. Pulse Ver en la barra de menú para mostrar "
 "u ocultar los campos Tipo, Rol, Estado y RSVP."
 
-#: C/evolution.xml:4421(para)
+#: C/evolution.xml:4415(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -10076,22 +9770,21 @@ msgstr ""
 "(Opcional) especifique una fecha y hora de comienzo y una fecha y hora de "
 "caducidad para la tarea."
 
-#: C/evolution.xml:4451(title)
+#: C/evolution.xml:4445(title)
 msgid "Searching for Task Items"
 msgstr "Buscar elementos de las tareas"
 
-#: C/evolution.xml:4454(para)
-msgid ""
-"Evolution enables you to find the task items by using Customized Search."
+#: C/evolution.xml:4448(para)
+msgid "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las tareas usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4475(para)
+#: C/evolution.xml:4469(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution muestra los elementos de las tareas deseados."
 
-#: C/evolution.xml:4499(para)
+#: C/evolution.xml:4493(para)
 msgid ""
 "Displays all the task items that match the criteria that you have selected "
 "from the drop-down list at the top left side, just above the display pane."
@@ -10100,7 +9793,7 @@ msgstr ""
 "que haya seleccionado de la lista desplegable en la parte superior "
 "izquierda, justo encima del panel de visualización."
 
-#: C/evolution.xml:4501(para)
+#: C/evolution.xml:4495(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -10110,19 +9803,19 @@ msgstr ""
 "permite ver rápidamente cuándo vencen las tareas, ya que puede ser "
 "interesante para planificarse si tiene muchas tareas entre manos."
 
-#: C/evolution.xml:4503(title)
+#: C/evolution.xml:4497(title)
 msgid "Any Category:"
 msgstr "Cualquier categoría:"
 
-#: C/evolution.xml:4504(para)
+#: C/evolution.xml:4498(para)
 msgid "Displays all the tasks that fall under any category."
 msgstr "Muestra todas las tareas que están bajo cualquier categoría."
 
-#: C/evolution.xml:4507(title)
+#: C/evolution.xml:4501(title)
 msgid "Unmatched:"
 msgstr "No coincidente:"
 
-#: C/evolution.xml:4508(para)
+#: C/evolution.xml:4502(para)
 msgid ""
 "Displays all the tasks that do not fall under any of the categories listed "
 "here."
@@ -10130,20 +9823,19 @@ msgstr ""
 "Muestra todas las tareas que no están bajo ninguna de las categorías aquí "
 "listadas."
 
-#: C/evolution.xml:4511(title)
+#: C/evolution.xml:4505(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Tareas de los próximos 7 días:"
 
-#: C/evolution.xml:4512(para)
+#: C/evolution.xml:4506(para)
 msgid "Displays all the active tasks that are due within the next seven days."
-msgstr ""
-"Muestra todas las tareas activas que vencerán en los próximos siete días."
+msgstr "Muestra todas las tareas activas que vencerán en los próximos siete días."
 
-#: C/evolution.xml:4515(title)
+#: C/evolution.xml:4509(title)
 msgid "Active Tasks:"
 msgstr "Tareas activas:"
 
-#: C/evolution.xml:4516(para)
+#: C/evolution.xml:4510(para)
 msgid ""
 "Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
@@ -10151,35 +9843,35 @@ msgstr ""
 "Muestra todas las tareas cuya fecha de vencimiento está por llegar. Esto le "
 "permite ver la fecha de vencimiento de las tareas que caducan en el futuro."
 
-#: C/evolution.xml:4519(title)
+#: C/evolution.xml:4513(title)
 msgid "Over Due Tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:4520(para)
+#: C/evolution.xml:4514(para)
 msgid "Displays all the tasks whose end date has already passed."
 msgstr "Muestra todas las tareas cuya fecha de vencimiento ya ha pasado."
 
-#: C/evolution.xml:4523(title)
+#: C/evolution.xml:4517(title)
 msgid "Completed Tasks:"
 msgstr "Tareas completadas:"
 
-#: C/evolution.xml:4524(para)
+#: C/evolution.xml:4518(para)
 msgid "Displays the tasks whose status is 100% completed."
 msgstr "Muestra las tareas cuyo estado es 100% completado."
 
-#: C/evolution.xml:4527(title)
+#: C/evolution.xml:4521(title)
 msgid "Tasks With Attachment:"
 msgstr "Tareas con adjuntos:"
 
-#: C/evolution.xml:4528(para)
+#: C/evolution.xml:4522(para)
 msgid "Displays all the tasks with attachments."
 msgstr "Muestra todas las tareas con adjuntos."
 
-#: C/evolution.xml:4531(title)
+#: C/evolution.xml:4525(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Lista de categorías&gt;:"
 
-#: C/evolution.xml:4532(para)
+#: C/evolution.xml:4526(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
 "Anniversary, Holidays, Gifts, etc."
@@ -10187,47 +9879,47 @@ msgstr ""
 "Lista todas las tareas que pertenezcan a una categoría particular tal como "
 "Aniversarios, Vacaciones, Reglados, etc."
 
-#: C/evolution.xml:4534(para)
+#: C/evolution.xml:4528(para)
 msgid "To perform quick search,"
 msgstr "Para realizar una búsqueda rápida,"
 
-#: C/evolution.xml:4537(para)
+#: C/evolution.xml:4531(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr "Pulse sobre la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4549(para)
+#: C/evolution.xml:4543(para)
 msgid "Next 7 Days Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: C/evolution.xml:4552(para)
+#: C/evolution.xml:4546(para)
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: C/evolution.xml:4555(para)
+#: C/evolution.xml:4549(para)
 msgid "Over Due Tasks"
 msgstr "Tareas vencidas"
 
-#: C/evolution.xml:4558(para)
+#: C/evolution.xml:4552(para)
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: C/evolution.xml:4561(para)
+#: C/evolution.xml:4555(para)
 msgid "Tasks With Attachments"
 msgstr "Tareas con adjuntos"
 
-#: C/evolution.xml:4585(para) C/evolution.xml:4780(para)
+#: C/evolution.xml:4579(para) C/evolution.xml:4774(para)
 msgid "Holidays"
 msgstr "Vacaciones"
 
-#: C/evolution.xml:4597(para) C/evolution.xml:4792(para)
+#: C/evolution.xml:4591(para) C/evolution.xml:4786(para)
 msgid "Key Customers"
 msgstr "Clientes clave"
 
-#: C/evolution.xml:4629(para)
+#: C/evolution.xml:4623(para)
 msgid "You can view the desired items listed in the Task view."
 msgstr "Puede ver los elementos deseados listados en la vista de tareas."
 
-#: C/evolution.xml:4635(para)
+#: C/evolution.xml:4629(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -10235,23 +9927,23 @@ msgstr ""
 "En Evolution, el componente de Notas le permite crear, editar y almacenar "
 "entradas sin fecha de su diario, usando el sistema de archivos como «backend»."
 
-#: C/evolution.xml:4637(para)
+#: C/evolution.xml:4631(para)
 msgid "To create a new memo entry:"
 msgstr "Crear una nueva nota:"
 
-#: C/evolution.xml:4640(para)
+#: C/evolution.xml:4634(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota."
 
-#: C/evolution.xml:4643(para) C/evolution.xml:5713(para)
+#: C/evolution.xml:4637(para) C/evolution.xml:5707(para)
 msgid "Select the Group in which you would like to create the entry."
 msgstr "Seleccione el grupo en el que quiere crear la entrada."
 
-#: C/evolution.xml:4647(para)
+#: C/evolution.xml:4641(para)
 msgid "To show or hide Categories field, click View &gt; Categories."
 msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:4653(para) C/evolution.xml:5719(para)
+#: C/evolution.xml:4647(para) C/evolution.xml:5713(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
 "the recipients' Calendars."
@@ -10259,11 +9951,11 @@ msgstr ""
 "En el campo Fecha de inicio escriba la fecha en la que esta nota "
 "recordatoria debería aparecer en los calendarios de los Destinatarios."
 
-#: C/evolution.xml:4669(title)
+#: C/evolution.xml:4663(title)
 msgid "The Memo List"
 msgstr "La lista de notas"
 
-#: C/evolution.xml:4670(para)
+#: C/evolution.xml:4664(para)
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
 "list is assigned a color, and you can use the side bar to hide and show memo "
@@ -10273,23 +9965,23 @@ msgstr ""
 "notas. Cada lista de notas tendrá su color y podrá usar el selector de Notas "
 "para mostrar y ocultar las notas."
 
-#: C/evolution.xml:4671(para)
+#: C/evolution.xml:4665(para)
 msgid "To create a new memo list:"
 msgstr "Crear una nueva lista de notas:"
 
-#: C/evolution.xml:4674(para)
+#: C/evolution.xml:4668(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de notas."
 
-#: C/evolution.xml:4677(para)
+#: C/evolution.xml:4671(para)
 msgid "Enter the type, name and color for the memo list."
 msgstr "Escriba el tipo, nombre y color para la lista de notas."
 
-#: C/evolution.xml:4686(title)
+#: C/evolution.xml:4680(title)
 msgid "Searching for Memo Items"
 msgstr "Buscar elementos de las notas"
 
-#: C/evolution.xml:4687(para)
+#: C/evolution.xml:4681(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Memo Items."
@@ -10297,18 +9989,17 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos de las notas."
 
-#: C/evolution.xml:4690(para)
-msgid ""
-"Evolution enables you to find the Memo items by using a Customized Search."
+#: C/evolution.xml:4684(para)
+msgid "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las notas usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4720(para)
+#: C/evolution.xml:4714(para)
 msgid "Select the desired search type from the drop-down list."
 msgstr "Seleccione la opción de búsqueda que desea de la lista desplegable."
 
-#: C/evolution.xml:4743(para)
+#: C/evolution.xml:4737(para)
 msgid ""
 "Displays all the Memo items that match the criteria that you have selected "
 "from the Show drop-down list in the Search bar."
@@ -10316,11 +10007,11 @@ msgstr ""
 "Muestra todos los elementos de las notas que coincidan con los criterios que "
 "haya seleccionado ç de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4822(para)
+#: C/evolution.xml:4816(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr "Puede ver los elementos deseados listados en la vista del notas."
 
-#: C/evolution.xml:4830(para)
+#: C/evolution.xml:4824(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10329,20 +10020,19 @@ msgstr ""
 "archivos de calendario con amigos o compañeros de trabajo es bastante "
 "posible que tenga que configurar su zona horaria."
 
-#: C/evolution.xml:4836(para)
+#: C/evolution.xml:4830(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
-msgstr ""
-"Pulse el icono junto al campo Zona horaria, después seleccione su ubicación."
+msgstr "Pulse el icono junto al campo Zona horaria, después seleccione su ubicación."
 
-#: C/evolution.xml:4837(para)
+#: C/evolution.xml:4831(para)
 msgid "Each red dot represents a major city."
 msgstr "Cada punto rojo representa una gran ciudad."
 
-#: C/evolution.xml:4840(para)
+#: C/evolution.xml:4834(para)
 msgid "Select a city, then click OK."
 msgstr "Seleccione una ciudad, después pulse Aceptar."
 
-#: C/evolution.xml:4843(para)
+#: C/evolution.xml:4837(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10359,11 +10049,11 @@ msgstr ""
 "las llamadas con varias horas de diferencia. Usar las zonas horarias "
 "adecuadas en cada cita ayuda a evitar esa confusión potencial."
 
-#: C/evolution.xml:4847(title)
+#: C/evolution.xml:4841(title)
 msgid "Marcus Bains Line"
 msgstr "Línea Marcus Bains"
 
-#: C/evolution.xml:4848(para)
+#: C/evolution.xml:4842(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
 "feature is available in the Evolution calendar."
@@ -10371,7 +10061,7 @@ msgstr ""
 "La línea Marcus Bains es un marcador para mostrar la fecha y hora actuales. "
 "Ahora esta característica está disponible en el calendario de Evolution."
 
-#: C/evolution.xml:4854(para)
+#: C/evolution.xml:4848(para)
 msgid ""
 "<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
 "Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
@@ -10382,28 +10072,28 @@ msgstr ""
 "2000 y 2003. Al igual que Evolution, es software libre y está licenciado "
 "bajo la GPL."
 
-#: C/evolution.xml:4857(link) C/evolution.xml:4877(title)
+#: C/evolution.xml:4851(link) C/evolution.xml:4871(title)
 msgid "Evolution Exchange Features"
 msgstr "Características de Evolution Exchange"
 
-#: C/evolution.xml:4860(link) C/evolution.xml:4979(title)
+#: C/evolution.xml:4854(link) C/evolution.xml:4973(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Añadir su cuenta Exchange a Evolution"
 
-#: C/evolution.xml:4863(link) C/evolution.xml:5097(title)
+#: C/evolution.xml:4857(link) C/evolution.xml:5091(title)
 msgid "Accessing the Exchange Server"
 msgstr "Acceder al servidor Exchange"
 
-#: C/evolution.xml:4866(link) C/evolution.xml:5105(title)
+#: C/evolution.xml:4860(link) C/evolution.xml:5099(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Ajustes exclusivos de Evolution Exchange"
 
-#: C/evolution.xml:4869(link) C/evolution.xml:5128(link)
-#: C/evolution.xml:5350(title)
+#: C/evolution.xml:4863(link) C/evolution.xml:5122(link)
+#: C/evolution.xml:5344(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Planificar citas según disponibilidad"
 
-#: C/evolution.xml:4873(para)
+#: C/evolution.xml:4867(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
@@ -10413,24 +10103,23 @@ msgstr ""
 "habilitar el componente Outlook Web Access. Cada usuario debe disponer de "
 "una cuenta válida en el servidor Microsoft Exchange, incluida la licencia."
 
-#: C/evolution.xml:4878(para)
-msgid ""
-"Evolution Exchange supports the following basic Microsoft Exchange features:"
+#: C/evolution.xml:4872(para)
+msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange soporta las siguientes características básicas de "
 "Microsoft Exchange:"
 
-#: C/evolution.xml:4881(para) C/evolution.xml:6538(link)
-#: C/evolution.xml:6549(title) C/evolution.xml:6597(link)
-#: C/evolution.xml:6611(title)
+#: C/evolution.xml:4875(para) C/evolution.xml:6532(link)
+#: C/evolution.xml:6543(title) C/evolution.xml:6591(link)
+#: C/evolution.xml:6605(title)
 msgid "General"
 msgstr "General"
 
-#: C/evolution.xml:4885(title)
+#: C/evolution.xml:4879(title)
 msgid "Remote Exchange Information Store:"
 msgstr "Almacén remoto de información de Exchange:"
 
-#: C/evolution.xml:4886(para)
+#: C/evolution.xml:4880(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
@@ -10439,19 +10128,19 @@ msgstr ""
 "carpeta Lista de direcciones globales), calendarios y carpetas de tareas en "
 "un servidor Exchange desde Evolution."
 
-#: C/evolution.xml:4891(title)
+#: C/evolution.xml:4885(title)
 msgid "Palm Synchronization:"
 msgstr "Sincronización con Palm:"
 
-#: C/evolution.xml:4892(para)
+#: C/evolution.xml:4886(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Compatibilidad con los contactos y calendarios de Exchange."
 
-#: C/evolution.xml:4897(title)
+#: C/evolution.xml:4891(title)
 msgid "Password Management:"
 msgstr "Gestión de contraseñas:"
 
-#: C/evolution.xml:4898(para)
+#: C/evolution.xml:4892(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
@@ -10459,15 +10148,15 @@ msgstr ""
 "Le permite borrar su contraseña. Si su contraseña ha caducado, Evolution le "
 "pregunta si quiere cambiarla durante el inicio."
 
-#: C/evolution.xml:4904(para) C/evolution.xml:5439(para)
+#: C/evolution.xml:4898(para) C/evolution.xml:5433(para)
 msgid "Mail"
 msgstr "Correo"
 
-#: C/evolution.xml:4908(title)
+#: C/evolution.xml:4902(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr "Ver correo en carpetas Exchange:"
 
-#: C/evolution.xml:4909(para)
+#: C/evolution.xml:4903(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
@@ -10475,11 +10164,11 @@ msgstr ""
 "El correo almacenado en el servidor Exchange se verá en el componente de "
 "correo de Evolution."
 
-#: C/evolution.xml:4914(title)
+#: C/evolution.xml:4908(title)
 msgid "Sending Email via Exchange Protocols:"
 msgstr "Envío de correo mediante protocolos Exchange:"
 
-#: C/evolution.xml:4915(para)
+#: C/evolution.xml:4909(para)
 msgid ""
 "If you use the Microsoft Exchange mail transport protocol to send email, "
 "make sure that the address you have entered as your email address is exactly "
@@ -10494,11 +10183,11 @@ msgstr ""
 "<quote>sunombre@exchange-server.ejemplo.com</quote> en lugar de "
 "<quote>sunombre@ejemplo.com.</quote>."
 
-#: C/evolution.xml:4920(title)
+#: C/evolution.xml:4914(title)
 msgid "Out of Office Message:"
 msgstr "Mensaje de Estoy fuera de la oficina:"
 
-#: C/evolution.xml:4921(para)
+#: C/evolution.xml:4915(para)
 msgid ""
 "You can set <quote>out of Office</quote> message that will automatically be "
 "sent to people who send mail to you while you are away from office."
@@ -10507,11 +10196,11 @@ msgstr ""
 "enviará automáticamente a las personas que le envíen correos mientras está "
 "fuera de la oficina."
 
-#: C/evolution.xml:4926(title)
+#: C/evolution.xml:4920(title)
 msgid "Send Options:"
 msgstr "Opciones de envío:"
 
-#: C/evolution.xml:4927(para)
+#: C/evolution.xml:4921(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is.The priority can have one "
@@ -10527,16 +10216,16 @@ msgstr ""
 "Confidencial respectivamente. También puede activar la confirmación de envío "
 "de mensaje y de lectura de mensaje para los mensajes enviados."
 
-#: C/evolution.xml:4933(para) C/evolution.xml:5462(para)
-#: C/evolution.xml:6993(link) C/evolution.xml:7063(title)
+#: C/evolution.xml:4927(para) C/evolution.xml:5456(para)
+#: C/evolution.xml:6987(link) C/evolution.xml:7057(title)
 msgid "Calendar"
 msgstr "Calendario"
 
-#: C/evolution.xml:4937(title)
+#: C/evolution.xml:4931(title)
 msgid "Meeting Requests/Proposal:"
 msgstr "Solicitud y convocatoria de reuniones:"
 
-#: C/evolution.xml:4938(para)
+#: C/evolution.xml:4932(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
@@ -10546,11 +10235,11 @@ msgstr ""
 "cuando están ocupados los otros usuarios de acuerdo con sus calendarios y "
 "enviar peticiones de reunión de forma consecuente."
 
-#: C/evolution.xml:4943(title)
+#: C/evolution.xml:4937(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr "Añadir solicitudes de reuniones iCalendar al calendario:"
 
-#: C/evolution.xml:4944(para)
+#: C/evolution.xml:4938(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
@@ -10560,24 +10249,24 @@ msgstr ""
 "calendario Exchange. Nótese que necesita especificar el calendario de la "
 "lista, en la que quiere añadir sus horarios de reuniones."
 
-#: C/evolution.xml:4950(para) C/evolution.xml:5374(para)
-#: C/evolution.xml:5473(para)
+#: C/evolution.xml:4944(para) C/evolution.xml:5368(para)
+#: C/evolution.xml:5467(para)
 msgid "Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:4954(title)
+#: C/evolution.xml:4948(title)
 msgid "Address Completion:"
 msgstr "Autocompletado de direcciones:"
 
-#: C/evolution.xml:4955(para)
+#: C/evolution.xml:4949(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr "Soporte para sus carpeta de contactos Exchange."
 
-#: C/evolution.xml:4960(title)
+#: C/evolution.xml:4954(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "Añadir vCards a la libreta de direcciones:"
 
-#: C/evolution.xml:4961(para)
+#: C/evolution.xml:4955(para)
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book.New Address Book entries can also be created on Exchange from "
@@ -10588,11 +10277,11 @@ msgstr ""
 "también se pueden crear desde mensajes de correo-e recibidos con una sola "
 "pulsación."
 
-#: C/evolution.xml:4967(para)
+#: C/evolution.xml:4961(para)
 msgid "Work Offline (disconnected mode)"
 msgstr "«Trabajar desconectado» (modo desconectado)"
 
-#: C/evolution.xml:4968(para)
+#: C/evolution.xml:4962(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10604,11 +10293,11 @@ msgstr ""
 "carpeta localmente para operación desconectada. Para obtener más información "
 "vea <link linkend=\"usage-mail-getnsend-offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:4973(para)
+#: C/evolution.xml:4967(para)
 msgid "Recall Message function is not available."
 msgstr "La función Recordar mensaje no está disponible."
 
-#: C/evolution.xml:4980(para)
+#: C/evolution.xml:4974(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
@@ -10616,35 +10305,35 @@ msgstr ""
 "Después de instalar Evolution Exchange, necesita configurar el acceso a su "
 "cuenta Exchange tanto en el servidor Exchange como en Evolution."
 
-#: C/evolution.xml:4983(link) C/evolution.xml:5000(title)
+#: C/evolution.xml:4977(link) C/evolution.xml:4994(title)
 msgid "Exchange Server Settings"
 msgstr "Configuración del servidor Exchange"
 
-#: C/evolution.xml:4986(link) C/evolution.xml:5014(title)
+#: C/evolution.xml:4980(link) C/evolution.xml:5008(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr "Herramienta de configuración estándar para Evolution Exchange"
 
-#: C/evolution.xml:4989(link) C/evolution.xml:5018(title)
+#: C/evolution.xml:4983(link) C/evolution.xml:5012(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr "Herramienta sencilla de configuración para Evolution Exchange"
 
-#: C/evolution.xml:4992(link) C/evolution.xml:5025(title)
+#: C/evolution.xml:4986(link) C/evolution.xml:5019(title)
 msgid "Creating a New Exchange Account"
 msgstr "Creación de una nueva cuenta Exchange"
 
-#: C/evolution.xml:4995(link) C/evolution.xml:5049(title)
+#: C/evolution.xml:4989(link) C/evolution.xml:5043(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr "Configurar una cuenta existente para utilizarla con Evolution Exchange"
 
-#: C/evolution.xml:5001(para)
+#: C/evolution.xml:4995(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr "Compruebe con el administrador del sistema los puntos siguientes:"
 
-#: C/evolution.xml:5004(para)
+#: C/evolution.xml:4998(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Posee una cuenta válida en el servidor Exchange."
 
-#: C/evolution.xml:5007(para)
+#: C/evolution.xml:5001(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
@@ -10654,7 +10343,7 @@ msgstr ""
 "predeterminado del servidor Exchange, y no debería sernecesario modificarlo, "
 "a menos que su administrador de sistema lo haya deshabilitado."
 
-#: C/evolution.xml:5010(para)
+#: C/evolution.xml:5004(para)
 msgid ""
 "The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
 "\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
@@ -10666,7 +10355,7 @@ msgstr ""
 "información adicional para asegurar que su servidor Exchange acepte las "
 "conexiones de Evolution."
 
-#: C/evolution.xml:5015(para)
+#: C/evolution.xml:5009(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
@@ -10674,7 +10363,7 @@ msgstr ""
 "Una vez sepa que su servidor está disponible para conectarse, está preparado "
 "para añadir su cuenta Exchange a Evolution Exchange."
 
-#: C/evolution.xml:5019(para)
+#: C/evolution.xml:5013(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
@@ -10682,7 +10371,7 @@ msgstr ""
 "Evolution Exchange proporciona una herramienta de creación de cuentas simple "
 "para cuentas Exchange."
 
-#: C/evolution.xml:5020(para)
+#: C/evolution.xml:5014(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -10695,7 +10384,7 @@ msgstr ""
 "Evolution Exchange determinará por sí mismo el resto de la información "
 "necesaria."
 
-#: C/evolution.xml:5021(para)
+#: C/evolution.xml:5015(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -10707,7 +10396,7 @@ msgstr ""
 "información acerca de ello, vea <link linkend=\"config-exchange-new-account"
 "\">Creación de una nueva cuenta Exchange</link>."
 
-#: C/evolution.xml:5036(para)
+#: C/evolution.xml:5030(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -10718,12 +10407,11 @@ msgstr ""
 "seleccionar el servidor Miscrosoft Exchange como el tipo de servidor en la "
 "sección Recepción de correo."
 
-#: C/evolution.xml:5042(para)
+#: C/evolution.xml:5036(para)
 msgid "Only one Microsoft Exchange account can be configured in Evolution."
-msgstr ""
-"Sólo se puede configurar una cuenta de Microsoft Exchange con Evolution."
+msgstr "Sólo se puede configurar una cuenta de Microsoft Exchange con Evolution."
 
-#: C/evolution.xml:5050(para)
+#: C/evolution.xml:5044(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
@@ -10731,7 +10419,7 @@ msgstr ""
 "Use el siguiente procedimiento para configurar su cuenta ya existente para "
 "Evolution Exchange:"
 
-#: C/evolution.xml:5056(para)
+#: C/evolution.xml:5050(para)
 msgid ""
 "Select the account you want to convert, then click Edit to appear the "
 "Account Editor."
@@ -10739,15 +10427,15 @@ msgstr ""
 "Seleccione la cuenta que quiera convertir, después pulse Editar para que "
 "aparezca el Editor de cuentas."
 
-#: C/evolution.xml:5057(para)
+#: C/evolution.xml:5051(para)
 msgid "You can view Identity tab enabled."
 msgstr "Podrá ver la solapa Identidad activada."
 
-#: C/evolution.xml:5062(para) C/evolution.xml:5636(para)
+#: C/evolution.xml:5056(para) C/evolution.xml:5630(para)
 msgid "Change your email address as needed."
 msgstr "Cambie su cuenta de correo electrónico si es necesario."
 
-#: C/evolution.xml:5065(para)
+#: C/evolution.xml:5059(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -10755,7 +10443,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Microsoft "
 "Exchange como tipo de servidor."
 
-#: C/evolution.xml:5070(para)
+#: C/evolution.xml:5064(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
@@ -10765,11 +10453,11 @@ msgstr ""
 "Autenticar, después introduzca la contraseña al ser preguntar. El servidor "
 "autenticará su cuenta."
 
-#: C/evolution.xml:5078(para) C/evolution.xml:5650(para)
+#: C/evolution.xml:5072(para) C/evolution.xml:5644(para)
 msgid "Click the Receiving Options tab."
 msgstr "Pulse en la solapa Opciones de recepción."
 
-#: C/evolution.xml:5079(para)
+#: C/evolution.xml:5073(para)
 msgid ""
 "Specify how often to check for new mail, your Global Catalog server name and "
 "whether to apply filters to messages in your Inbox, check for junk, set a "
@@ -10780,7 +10468,7 @@ msgstr ""
 "su Bandeja de entrada, comprobar el correo basura, establecer una caducidad "
 "para la contraseña y cualquier otro ajuste que quiera incluir."
 
-#: C/evolution.xml:5082(para)
+#: C/evolution.xml:5076(para)
 msgid ""
 "Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
 "IDs, and set options for message receipts."
@@ -10789,16 +10477,16 @@ msgstr ""
 "determinadas identidades y establecer opciones para los destinatarios de los "
 "mensajes."
 
-#: C/evolution.xml:5085(para)
+#: C/evolution.xml:5079(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr "Use la solapa Seguridad para establecer las opciones PGP y S/MIME."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:5088(para)
+#: C/evolution.xml:5082(para)
 msgid "Quit Evolution and restart it."
 msgstr "Salir de Evolution y reiniciarlo."
 
-#: C/evolution.xml:5089(para)
+#: C/evolution.xml:5083(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
@@ -10806,7 +10494,7 @@ msgstr ""
 "Los cambios en la configuración de cuentas de Evolution Exchange no se "
 "activarán hasta después de reiniciar la aplicación."
 
-#: C/evolution.xml:5098(para)
+#: C/evolution.xml:5092(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -10826,7 +10514,7 @@ msgstr ""
 "la de Contactos para los contactos y la herramienta de Calendario para "
 "planificar sus horarios."
 
-#: C/evolution.xml:5099(para)
+#: C/evolution.xml:5093(para)
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
 "should be aware that whenever you save an email address or appointment from "
@@ -10843,7 +10531,7 @@ msgstr ""
 "direcciones de su dispositivo Palm OS se sincronizarán con las carpetas "
 "correspondientes en Exchange, y no en su equipo local."
 
-#: C/evolution.xml:5100(para)
+#: C/evolution.xml:5094(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
@@ -10851,7 +10539,7 @@ msgstr ""
 "Para evitar carga innecesaria en el servidor, la Lista de direcciones "
 "globales (GAL) aparece vacía hasta que busque algo en ella."
 
-#: C/evolution.xml:5106(para)
+#: C/evolution.xml:5100(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
 "Exchange, like delegation and permission handling, creating <quote>Out of "
@@ -10862,31 +10550,31 @@ msgstr ""
 "mensajes <quote>Estoy fuera de la oficina</quote>, cambiar la contraseña y "
 "ver el tamaño de la carpeta."
 
-#: C/evolution.xml:5110(link) C/evolution.xml:5133(title)
+#: C/evolution.xml:5104(link) C/evolution.xml:5127(title)
 msgid "Send Options"
 msgstr "Opciones de envío"
 
-#: C/evolution.xml:5113(link) C/evolution.xml:5214(title)
+#: C/evolution.xml:5107(link) C/evolution.xml:5208(title)
 msgid "Access Delegation"
 msgstr "Delegación de acceso"
 
-#: C/evolution.xml:5116(link) C/evolution.xml:5218(title)
+#: C/evolution.xml:5110(link) C/evolution.xml:5212(title)
 msgid "Delegating Access to Others"
 msgstr "Delegando acceso a terceros"
 
-#: C/evolution.xml:5119(link) C/evolution.xml:5268(title)
+#: C/evolution.xml:5113(link) C/evolution.xml:5262(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Subscribirse a la carpeta de otro usuario"
 
-#: C/evolution.xml:5122(link) C/evolution.xml:5292(title)
+#: C/evolution.xml:5116(link) C/evolution.xml:5286(title)
 msgid "Subscribe to Public Folders"
 msgstr "Suscribirse a carpetas públicas"
 
-#: C/evolution.xml:5125(link) C/evolution.xml:5322(title)
+#: C/evolution.xml:5119(link) C/evolution.xml:5316(title)
 msgid "Setting an Out of Office Message"
 msgstr "Configuración un mensaje de Estoy fuera"
 
-#: C/evolution.xml:5134(para)
+#: C/evolution.xml:5128(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -10903,11 +10591,11 @@ msgstr ""
 "confirmación de envío de mensaje y de lectura de mensaje para los mensajes "
 "enviados."
 
-#: C/evolution.xml:5137(title)
+#: C/evolution.xml:5131(title)
 msgid "Tracking Options"
 msgstr "Opciones de seguimiento"
 
-#: C/evolution.xml:5138(para)
+#: C/evolution.xml:5132(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
@@ -10918,26 +10606,26 @@ msgstr ""
 "lectura de mensaje y así podrá saber cuándo llegó el elemento al "
 "destinatario o cuándo lo leyó."
 
-#: C/evolution.xml:5139(para)
+#: C/evolution.xml:5133(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr "Para establecer la importancia y sensibilidad del mensaje:"
 
-#: C/evolution.xml:5142(para)
+#: C/evolution.xml:5136(para)
 msgid "Open a Compose Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5145(para)
+#: C/evolution.xml:5139(para)
 msgid "Select the exchange account from the From field."
 msgstr "Seleccione la cuenta de Exchange del campo De."
 
-#: C/evolution.xml:5148(para)
+#: C/evolution.xml:5142(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 "Pulse Insertar &gt; Opciones de envío para abrir el cuadro de diálogo de "
 "Opciones de envío"
 
-#: C/evolution.xml:5153(para)
+#: C/evolution.xml:5147(para)
 msgid ""
 "Select the priority for your sent message from the given three options "
 "(Normal, High, Low)"
@@ -10945,7 +10633,7 @@ msgstr ""
 "Seleccione la prioridad para su mensaje enviado de las tres opciones "
 "proporcionadas (Normal, Alta, Baja)"
 
-#: C/evolution.xml:5156(para)
+#: C/evolution.xml:5150(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
@@ -10953,11 +10641,11 @@ msgstr ""
 "Seleccione la sensibilidad para su mensaje enviado de las cuatro opciones "
 "proporcionadas (Normal, Personal, Privado, Confidencial)."
 
-#: C/evolution.xml:5160(title)
+#: C/evolution.xml:5154(title)
 msgid "Message Access Delegation:"
 msgstr "Delegación de acceso a mensajes:"
 
-#: C/evolution.xml:5161(para)
+#: C/evolution.xml:5155(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
@@ -10965,7 +10653,7 @@ msgstr ""
 "Pulse Enviar como delegado para enviar el mensaje al destinatario en nombre "
 "de otra persona."
 
-#: C/evolution.xml:5164(para)
+#: C/evolution.xml:5158(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
@@ -10975,11 +10663,11 @@ msgstr ""
 "mensaje del delgado y también debe tener asignados los permisos necesarios "
 "por el delegador."
 
-#: C/evolution.xml:5168(para)
+#: C/evolution.xml:5162(para)
 msgid "Click User to open Show Contacts dialog box."
 msgstr "Pulse Usuario para abrir el cuadro de diálogo Mostrar contactos."
 
-#: C/evolution.xml:5171(para)
+#: C/evolution.xml:5165(para)
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
 "the dialog box."
@@ -10987,7 +10675,7 @@ msgstr ""
 "Seleccione el contacto de la Libreta de direcciones deseada y pulse Añadir, "
 "después cierre el cuadro de diálogo."
 
-#: C/evolution.xml:5173(para)
+#: C/evolution.xml:5167(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
@@ -10995,7 +10683,7 @@ msgstr ""
 "No se le permite enviar un mensaje en nombre de a más de una persona a la "
 "vez."
 
-#: C/evolution.xml:5175(para)
+#: C/evolution.xml:5169(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
 "<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
@@ -11006,7 +10694,7 @@ msgstr ""
 "delegador&gt;</guilabel> en la barra de cabeceras del panel de vista "
 "preliminar."
 
-#: C/evolution.xml:5180(para)
+#: C/evolution.xml:5174(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
@@ -11014,7 +10702,7 @@ msgstr ""
 "Seleccione la casilla de verificación Pedir una confirmación de entrega para "
 "este mensaje para obtener una confirmación de entrega de su destinatario."
 
-#: C/evolution.xml:5183(para)
+#: C/evolution.xml:5177(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
@@ -11022,11 +10710,11 @@ msgstr ""
 "Seleccione Pedir una confirmación de lectura para este mensaje para obtener "
 "una confirmación de lectura para este mensaje que ha enviado."
 
-#: C/evolution.xml:5192(title)
+#: C/evolution.xml:5186(title)
 msgid "Delegating Calendar Items"
 msgstr "Delegar elementos del calendario"
 
-#: C/evolution.xml:5193(para)
+#: C/evolution.xml:5187(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
@@ -11034,23 +10722,23 @@ msgstr ""
 "Puede enviar Reuniones o Citas en nombre de otra persona si se ha suscrito a "
 "su calendario."
 
-#: C/evolution.xml:5196(para)
+#: C/evolution.xml:5190(para)
 msgid "Select the delegator's Calendar."
 msgstr "Seleccione el calendario del delegado."
 
-#: C/evolution.xml:5199(para)
+#: C/evolution.xml:5193(para)
 msgid "Open a new Meeting composer window."
 msgstr "Abra una ventana del editor de Reuniones."
 
-#: C/evolution.xml:5202(para)
+#: C/evolution.xml:5196(para)
 msgid "Add the recipients."
 msgstr "Añada los destinatarios."
 
-#: C/evolution.xml:5205(para)
+#: C/evolution.xml:5199(para)
 msgid "Fill in the information."
 msgstr "Rellene la información."
 
-#: C/evolution.xml:5207(para)
+#: C/evolution.xml:5201(para)
 msgid ""
 "When the recipient receives the calendar item, a message indicates that the "
 "item was created by someone on behalf of the Delegator."
@@ -11058,7 +10746,7 @@ msgstr ""
 "Cuando el destinatario recibe el elemento del calendario, un mensaje "
 "indicará que el elemento se creó por alguien en nombre del Delegador."
 
-#: C/evolution.xml:5215(para)
+#: C/evolution.xml:5209(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -11071,26 +10759,25 @@ msgstr ""
 "usuarios hacer cualquier cosa, desde consultarse mutuamente sus planes hasta "
 "gestionar completamente toda su información personal."
 
-#: C/evolution.xml:5219(para)
+#: C/evolution.xml:5213(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Para añadir alguien a su lista de delegados:"
 
-#: C/evolution.xml:5225(para)
+#: C/evolution.xml:5219(para)
 msgid "Click the Exchange Settings tab."
 msgstr "Pulse en la solapa Configuración de Exchange."
 
-#: C/evolution.xml:5228(para)
+#: C/evolution.xml:5222(para)
 msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 "Pulse Asistente de delegaciones para abrir el cuadro de diálogo de los "
 "Delegados."
 
-#: C/evolution.xml:5233(para)
+#: C/evolution.xml:5227(para)
 msgid "Click Add, then search for a contact in the Global Address List."
-msgstr ""
-"Pulse Añadir, después busque un contacto en la Lista de direcciones global."
+msgstr "Pulse Añadir, después busque un contacto en la Lista de direcciones global."
 
-#: C/evolution.xml:5234(para)
+#: C/evolution.xml:5228(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
@@ -11098,7 +10785,7 @@ msgstr ""
 "Recuerde que la Lista de direcciones globales (GAL) aparecerá vacía hasta "
 "que haya introducido algo para buscar."
 
-#: C/evolution.xml:5237(para)
+#: C/evolution.xml:5231(para)
 msgid ""
 "Select the delegate and click Edit to open the delegate permission dialog "
 "box."
@@ -11106,7 +10793,7 @@ msgstr ""
 "Seleccione el delegado y pulse Editar para abrir el cuadro de diálogo de "
 "permisos del delegado."
 
-#: C/evolution.xml:5242(para)
+#: C/evolution.xml:5236(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
@@ -11114,15 +10801,15 @@ msgstr ""
 "Seleccione uno de los siguientes niveles de acceso para cada uno de los "
 "cuatro tipos de carpetas:"
 
-#: C/evolution.xml:5245(para)
+#: C/evolution.xml:5239(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "No permitir a esta persona acceder a ninguna carpeta de este tipo."
 
-#: C/evolution.xml:5248(title)
+#: C/evolution.xml:5242(title)
 msgid "Reviewer (read-only):"
 msgstr "Revisor (sólo lectura):"
 
-#: C/evolution.xml:5249(para)
+#: C/evolution.xml:5243(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
@@ -11130,11 +10817,11 @@ msgstr ""
 "Permite al delegado ver elementos en este tipo de carpeta pero no crear "
 "nuevos o modificar los existentes."
 
-#: C/evolution.xml:5252(title)
+#: C/evolution.xml:5246(title)
 msgid "Author (read, create):"
 msgstr "Autor (leer, crear):"
 
-#: C/evolution.xml:5253(para)
+#: C/evolution.xml:5247(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
@@ -11142,15 +10829,15 @@ msgstr ""
 "El delegado puede ver elementos en sus carpetas y puede crear otros nuevos "
 "pero no puede modificar ninguno de los existentes."
 
-#: C/evolution.xml:5256(title)
+#: C/evolution.xml:5250(title)
 msgid "Editor (read, create, edit):"
 msgstr "Editor (leer, crear, editar):"
 
-#: C/evolution.xml:5257(para)
+#: C/evolution.xml:5251(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr "El delegado puede ver, crear y cambiar elementos en sus carpetas."
 
-#: C/evolution.xml:5264(para)
+#: C/evolution.xml:5258(para)
 msgid ""
 "The delegate is notified through a separate mail that he or she is being "
 "added to your list of delegates. The mail summarizes all the rights that "
@@ -11160,15 +10847,15 @@ msgstr ""
 "añadido a su lista de delegados. El correo resume todos los permisos que se "
 "le han asignado."
 
-#: C/evolution.xml:5269(para)
+#: C/evolution.xml:5263(para)
 msgid "To access the folders delegated to you:"
 msgstr "Para acceder a las carpetas que le han sido delegadas:"
 
-#: C/evolution.xml:5272(para)
+#: C/evolution.xml:5266(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Pulse Archivo &gt; Suscribirse a la carpeta Exchange de otro usuario."
 
-#: C/evolution.xml:5277(para)
+#: C/evolution.xml:5271(para)
 msgid ""
 "Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
@@ -11176,11 +10863,11 @@ msgstr ""
 "Especifique la dirección de correo-e del usuario que le haya delegado o "
 "pulse el botón Usuario para elegirlo de su libreta de direcciones."
 
-#: C/evolution.xml:5280(para)
+#: C/evolution.xml:5274(para)
 msgid "Select the folder you want to open."
 msgstr "Seleccione la carpeta que quiere abrir."
 
-#: C/evolution.xml:5286(para)
+#: C/evolution.xml:5280(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -11193,7 +10880,7 @@ msgstr ""
 "carpeta llamada Ignacio Matamoros en el árbol de carpetas, al mismo nivel "
 "que sus carpetas locales y carpetas públicas."
 
-#: C/evolution.xml:5287(para)
+#: C/evolution.xml:5281(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
@@ -11201,31 +10888,29 @@ msgstr ""
 "Si la carpeta no se abre adecuadamente, compruebe con el dueño de la carpeta "
 "que le ha concedido los permisos de acceso correctos."
 
-#: C/evolution.xml:5293(para)
+#: C/evolution.xml:5287(para)
 msgid "You can subscribe to public folders available on the Exchange server."
-msgstr ""
-"Puede suscribirse a carpetas públicas disponibles en el servidor Exchange."
+msgstr "Puede suscribirse a carpetas públicas disponibles en el servidor Exchange."
 
-#: C/evolution.xml:5299(para)
+#: C/evolution.xml:5293(para)
 msgid "Select the Exchange account."
 msgstr "Seleccione la cuenta de Exchange."
 
-#: C/evolution.xml:5302(para)
+#: C/evolution.xml:5296(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Seleccione las carpetas a las que se quiere suscribir."
 
-#: C/evolution.xml:5308(para)
-msgid ""
-"The folders you have subscribed to appear in the folder list at the left."
+#: C/evolution.xml:5302(para)
+msgid "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Las carpetas a las que se ha suscrito para aparecer en la lista de carpetas "
 "a la izquierda."
 
-#: C/evolution.xml:5311(para)
+#: C/evolution.xml:5305(para)
 msgid "To view contents of a folder, click it."
 msgstr "Para ver el contenido de una carpeta, pulse sobre ella."
 
-#: C/evolution.xml:5318(para)
+#: C/evolution.xml:5312(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
@@ -11247,7 +10932,7 @@ msgstr ""
 "guilabel>. Para obtener más información acerca de los Recordatorios consulte "
 "<link linkend=\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:5323(para)
+#: C/evolution.xml:5317(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
 "to messages, explaining why you are not immediately responding to their "
@@ -11262,11 +10947,11 @@ msgstr ""
 "para que la gente sepa que realmente no los está ignorando."
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5329(para)
+#: C/evolution.xml:5323(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Seleccione la cuenta de Exchange, después pulse Editar."
 
-#: C/evolution.xml:5332(para)
+#: C/evolution.xml:5326(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
@@ -11274,15 +10959,15 @@ msgstr ""
 "Seleccione la solapa Configuración de Exchange. La opción superior le "
 "permitirá establecer un Mensaje para cuando esté fuera de la oficina."
 
-#: C/evolution.xml:5335(para)
+#: C/evolution.xml:5329(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Pulse Ahora no estoy en la oficina."
 
-#: C/evolution.xml:5338(para)
+#: C/evolution.xml:5332(para)
 msgid "Type a short message in the text field."
 msgstr "Escriba un mensaje corto en el campo de texto."
 
-#: C/evolution.xml:5345(para)
+#: C/evolution.xml:5339(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -11290,7 +10975,7 @@ msgstr ""
 "Su mensaje se envía automáticamente a cualquiera que le envíe correo hasta "
 "que vuelva y seleccione Ahora estoy en la oficina."
 
-#: C/evolution.xml:5351(para)
+#: C/evolution.xml:5345(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees.It's Free/Busy feature allows you to perform a "
@@ -11304,11 +10989,11 @@ msgstr ""
 "usuarios para saber si están ocupados según sus calendarios Exchange, y de "
 "ser así cambiar la hora de la reunión de una forma conjunta."
 
-#: C/evolution.xml:5355(para)
+#: C/evolution.xml:5349(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Crear una nueva cita en el calendario."
 
-#: C/evolution.xml:5358(para)
+#: C/evolution.xml:5352(para)
 msgid ""
 "Right-click the appointment, then select Schedule Meeting to appear "
 "Evolution Meeting editor."
@@ -11316,13 +11001,13 @@ msgstr ""
 "Pulse con el botón derecho del ratón sobre la cita, después seleccione "
 "Concertar una reunión para mostrar el editor de citas de Evolution."
 
-#: C/evolution.xml:5361(para)
+#: C/evolution.xml:5355(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 "Pulse sobre la solapa Añadir para introducir las direcciones de correo-e en "
 "la lista."
 
-#: C/evolution.xml:5364(para)
+#: C/evolution.xml:5358(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
@@ -11330,18 +11015,17 @@ msgstr ""
 "Pulse la solapa Participantes para seleccionar los participantes de Listas "
 "de direcciones globales (GAL)."
 
-#: C/evolution.xml:5365(para)
-msgid ""
-"You can directly select the participants from the following address lists."
+#: C/evolution.xml:5359(para)
+msgid "You can directly select the participants from the following address lists."
 msgstr ""
 "Puede seleccionar directamente a los participantes de la siguiente lista de "
 "direcciones."
 
-#: C/evolution.xml:5371(para)
+#: C/evolution.xml:5365(para)
 msgid "Global Address List"
 msgstr "Lista de direcciones global"
 
-#: C/evolution.xml:5377(para)
+#: C/evolution.xml:5371(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
@@ -11349,31 +11033,31 @@ msgstr ""
 "También puede especificar la categoría como Aniversario, Cumpleaños, "
 "Negocios etc, de la lista desplegable para cada lista de direcciones dada."
 
-#: C/evolution.xml:5380(para)
+#: C/evolution.xml:5374(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr "Añada los participantes a las siguientes categorías de asistentes."
 
-#: C/evolution.xml:5383(para)
+#: C/evolution.xml:5377(para)
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: C/evolution.xml:5386(para)
+#: C/evolution.xml:5380(para)
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: C/evolution.xml:5389(para)
+#: C/evolution.xml:5383(para)
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: C/evolution.xml:5392(para)
+#: C/evolution.xml:5386(para)
 msgid "Resources"
 msgstr "Recursos"
 
-#: C/evolution.xml:5397(para)
+#: C/evolution.xml:5391(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr "La herramienta de Disponibilidad en la esquina superior derecha."
 
-#: C/evolution.xml:5400(para)
+#: C/evolution.xml:5394(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
@@ -11382,7 +11066,7 @@ msgstr ""
 "los participantes y, si es posible, actualizar la reunión en los calendarios "
 "de cada uno de los asistentes"
 
-#: C/evolution.xml:5403(para)
+#: C/evolution.xml:5397(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11400,7 +11084,7 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5409(para)
+#: C/evolution.xml:5403(para)
 msgid ""
 "<trademark>Evolution</trademark> can access accounts on <trademark class="
 "\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
@@ -11410,35 +11094,35 @@ msgstr ""
 "<trademark class=\"registered\">Novell</trademark><trademark class="
 "\"registered\">GroupWise</trademark> 7."
 
-#: C/evolution.xml:5412(link) C/evolution.xml:5435(title)
+#: C/evolution.xml:5406(link) C/evolution.xml:5429(title)
 msgid "GroupWise Features"
 msgstr "Características de GroupWise"
 
-#: C/evolution.xml:5415(link) C/evolution.xml:5524(title)
+#: C/evolution.xml:5409(link) C/evolution.xml:5518(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "Terminologías GroupWise y Evolution"
 
-#: C/evolution.xml:5418(link) C/evolution.xml:5595(title)
+#: C/evolution.xml:5412(link) C/evolution.xml:5589(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "Añadir su cuenta GroupWise a Evolution"
 
-#: C/evolution.xml:5421(link) C/evolution.xml:5736(title)
+#: C/evolution.xml:5415(link) C/evolution.xml:5730(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr "Planificando citas según disponibilidad"
 
-#: C/evolution.xml:5424(link) C/evolution.xml:5758(title)
+#: C/evolution.xml:5418(link) C/evolution.xml:5752(title)
 msgid "Managing Sent Items"
 msgstr "Gestionar los elementos enviados"
 
-#: C/evolution.xml:5427(link) C/evolution.xml:5939(title)
+#: C/evolution.xml:5421(link) C/evolution.xml:5933(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr "Dar acceso a su Buzón de correo o Calendario a otros"
 
-#: C/evolution.xml:5430(link) C/evolution.xml:6110(title)
+#: C/evolution.xml:5424(link) C/evolution.xml:6104(title)
 msgid "Junk Mail Handling"
 msgstr "Gestión de correo basura"
 
-#: C/evolution.xml:5436(para)
+#: C/evolution.xml:5430(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
@@ -11446,23 +11130,23 @@ msgstr ""
 "La conectividad de GroupWise en Evolution soporta las siguientes "
 "características básicas de Novell GroupWise:"
 
-#: C/evolution.xml:5442(para)
+#: C/evolution.xml:5436(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr "Ver el correo y las carpetas almacenadas en el sistema GroupWise."
 
-#: C/evolution.xml:5445(para)
+#: C/evolution.xml:5439(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "Enviar correo desde su cuenta GroupWise."
 
-#: C/evolution.xml:5448(para)
+#: C/evolution.xml:5442(para)
 msgid "Converting mail to a task or meeting."
 msgstr "Convertir un correo en una tarea o reunión."
 
-#: C/evolution.xml:5451(para)
+#: C/evolution.xml:5445(para)
 msgid "Tracking the status of a message."
 msgstr "Seguir el estado de un mensaje."
 
-#: C/evolution.xml:5454(para)
+#: C/evolution.xml:5448(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
@@ -11470,11 +11154,11 @@ msgstr ""
 "Marcar un mensaje como correo basura añade al remitente a su lista de correo "
 "basura de GroupWise."
 
-#: C/evolution.xml:5457(para)
+#: C/evolution.xml:5451(para)
 msgid "Improved Status Tracking."
 msgstr "Seguimiento de estado mejorado."
 
-#: C/evolution.xml:5465(para)
+#: C/evolution.xml:5459(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
@@ -11484,7 +11168,7 @@ msgstr ""
 "usuarios de Evolution programar sus reuniones y examinar la disponibilidad "
 "de asistencia de otros usuarios en GroupWise."
 
-#: C/evolution.xml:5468(para)
+#: C/evolution.xml:5462(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
@@ -11492,7 +11176,7 @@ msgstr ""
 "Puede recibir una solicitud de reunión con iCalendar y añadirla a su "
 "calendario GroupWise."
 
-#: C/evolution.xml:5476(para)
+#: C/evolution.xml:5470(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
@@ -11502,7 +11186,7 @@ msgstr ""
 "GruopWise, incluyendo la libreta de direcciones del sistema, los Contactos "
 "frecuentes y su libreta de direcciones personal."
 
-#: C/evolution.xml:5479(para)
+#: C/evolution.xml:5473(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
@@ -11513,7 +11197,7 @@ msgstr ""
 "de las libretas de direcciones nuevas también se pueden añadir a su libreta "
 "de direcciones personal desde mensajes de correo-e recibidos."
 
-#: C/evolution.xml:5482(para)
+#: C/evolution.xml:5476(para)
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
@@ -11527,11 +11211,11 @@ msgstr ""
 "crearlas. La libreta de direcciones del sistema de GroupWise se marca para "
 "uso desconectado de manera predeterminada. Esto acelera el rendimiento."
 
-#: C/evolution.xml:5487(para) C/evolution.xml:5559(para)
+#: C/evolution.xml:5481(para) C/evolution.xml:5553(para)
 msgid "Reminder Note"
 msgstr "Nota de recuerdo"
 
-#: C/evolution.xml:5490(para)
+#: C/evolution.xml:5484(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
@@ -11542,39 +11226,39 @@ msgstr ""
 "derecha de la vista del Calendario suponiendo que las ha seleccionando bajo "
 "el componente de Notas."
 
-#: C/evolution.xml:5495(para)
+#: C/evolution.xml:5489(para)
 msgid "Proxy"
 msgstr "Proxy"
 
-#: C/evolution.xml:5498(para)
+#: C/evolution.xml:5492(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Puede asignar acceso proxy a otros usuarios."
 
-#: C/evolution.xml:5501(para)
+#: C/evolution.xml:5495(para)
 msgid "You can view other users' accounts through Proxy access."
 msgstr "Puede ver las cuentas de otros usuarios a través de un proxy."
 
-#: C/evolution.xml:5506(para)
+#: C/evolution.xml:5500(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Sin embargo, algunas características no están disponibles:"
 
-#: C/evolution.xml:5509(para)
+#: C/evolution.xml:5503(para)
 msgid "Resending items"
 msgstr "Reenviar elementos"
 
-#: C/evolution.xml:5512(para)
+#: C/evolution.xml:5506(para)
 msgid "Retracting items"
 msgstr "Retractar elementos"
 
-#: C/evolution.xml:5515(para)
+#: C/evolution.xml:5509(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr "Aceptar citas o reuniones en modo desconectado"
 
-#: C/evolution.xml:5518(para)
+#: C/evolution.xml:5512(para)
 msgid "Archive"
 msgstr "Archivar"
 
-#: C/evolution.xml:5525(para)
+#: C/evolution.xml:5519(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
@@ -11584,55 +11268,55 @@ msgstr ""
 "tipos de elementos. La siguiente tabla compara la terminología de GroupWise "
 "con la terminología de Evolution."
 
-#: C/evolution.xml:5533(para)
+#: C/evolution.xml:5527(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: C/evolution.xml:5543(para) C/evolution.xml:5554(para)
+#: C/evolution.xml:5537(para) C/evolution.xml:5548(para)
 msgid "Appointment"
 msgstr "Cita"
 
-#: C/evolution.xml:5546(para)
+#: C/evolution.xml:5540(para)
 msgid "Meeting"
 msgstr "Reunión"
 
-#: C/evolution.xml:5551(para)
+#: C/evolution.xml:5545(para)
 msgid "Posted Appointment"
 msgstr "Cita postpuesta"
 
-#: C/evolution.xml:5562(para) C/evolution.xml:5586(para)
+#: C/evolution.xml:5556(para) C/evolution.xml:5580(para)
 msgid "None; use a task"
 msgstr "Ninguno, usar una tarea"
 
-#: C/evolution.xml:5567(para)
+#: C/evolution.xml:5561(para)
 msgid "Discussion Note"
 msgstr "Nota de discusión"
 
-#: C/evolution.xml:5570(para)
+#: C/evolution.xml:5564(para)
 msgid "None; use an assigned task"
 msgstr "Ninguno, usar una tarea asignada"
 
-#: C/evolution.xml:5575(para)
+#: C/evolution.xml:5569(para)
 msgid "Phone Message"
 msgstr "Mensajes telefónicos"
 
-#: C/evolution.xml:5578(para)
+#: C/evolution.xml:5572(para)
 msgid "None; use a message"
 msgstr "Ninguno, usar un mensaje"
 
-#: C/evolution.xml:5583(para)
+#: C/evolution.xml:5577(para)
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
-#: C/evolution.xml:5598(link) C/evolution.xml:5606(title)
+#: C/evolution.xml:5592(link) C/evolution.xml:5600(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Crear una nueva cuenta GroupWise"
 
-#: C/evolution.xml:5601(link) C/evolution.xml:5621(title)
+#: C/evolution.xml:5595(link) C/evolution.xml:5615(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr "Modificar una cuenta existente para trabajar con GroupWise"
 
-#: C/evolution.xml:5615(para)
+#: C/evolution.xml:5609(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11640,7 +11324,7 @@ msgstr ""
 "Cree la cuenta siguiendo el procedimiento en <link linkend=\"usage-"
 "mainwindow-starting\">Inicio de Evolution por primera vez</link>."
 
-#: C/evolution.xml:5622(para)
+#: C/evolution.xml:5616(para)
 msgid ""
 "If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
@@ -11648,15 +11332,15 @@ msgstr ""
 "Si ya tiene una cuenta de correo-e existente y quiere convertirla para "
 "usarla con GroupWise:"
 
-#: C/evolution.xml:5628(para)
+#: C/evolution.xml:5622(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr "Seleccione la cuenta que quiere convertir, después pulse Editar."
 
-#: C/evolution.xml:5631(para)
+#: C/evolution.xml:5625(para)
 msgid "Click the Identity tab."
 msgstr "Pulse la solapa de Identidad."
 
-#: C/evolution.xml:5639(para)
+#: C/evolution.xml:5633(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
@@ -11664,7 +11348,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Novell "
 "GroupWise como el tipo de servidor."
 
-#: C/evolution.xml:5644(para)
+#: C/evolution.xml:5638(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
@@ -11672,7 +11356,7 @@ msgstr ""
 "Escriba el nombre del servidor de su correo, su nombre de usuario y "
 "seleccione si quiere usar SSL."
 
-#: C/evolution.xml:5646(para)
+#: C/evolution.xml:5640(para)
 msgid ""
 "Select SSL for a highly secured connection between your client and server. "
 "Contact your administrator for further details."
@@ -11680,7 +11364,7 @@ msgstr ""
 "Seleccione SSL para una conexión segura entre su cliente y el servidor. "
 "Contacte con el administrador de su sistema para obtener más detalles."
 
-#: C/evolution.xml:5671(para)
+#: C/evolution.xml:5665(para)
 msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
@@ -11688,7 +11372,7 @@ msgstr ""
 "Seleccione si quiere sincronizar automáticamente su calendario remoto y sus "
 "contactos localmente."
 
-#: C/evolution.xml:5672(para)
+#: C/evolution.xml:5666(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
@@ -11696,7 +11380,7 @@ msgstr ""
 "Obtiene el calendario y la información del contacto remotos y los almacena "
 "en su unidad local."
 
-#: C/evolution.xml:5674(para)
+#: C/evolution.xml:5668(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
@@ -11704,7 +11388,7 @@ msgstr ""
 "Generalmente los calendarios y contactos remotos se almacenan en servidores "
 "en lugar de en discos duros locales."
 
-#: C/evolution.xml:5678(para)
+#: C/evolution.xml:5672(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -11712,7 +11396,7 @@ msgstr ""
 "Especifique su puerto del agente de la oficina de correos SOAP en el campo "
 "Puerto del agente de la oficina de correos SOAP."
 
-#: C/evolution.xml:5682(para)
+#: C/evolution.xml:5676(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
@@ -11720,11 +11404,11 @@ msgstr ""
 "(Opcional) pulse sobre la solapa Proxy, después pulse Añadir para añadir "
 "cualquier usuario proxy a su cuenta."
 
-#: C/evolution.xml:5693(title)
+#: C/evolution.xml:5687(title)
 msgid "Reminder Notes"
 msgstr "Notas de recordatorios"
 
-#: C/evolution.xml:5694(para)
+#: C/evolution.xml:5688(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
@@ -11739,7 +11423,7 @@ msgstr ""
 "Calendario en la fecha que especifique. No se emplazan en su Buzón de correo "
 "o en el buzón de correo de ningún otro usuario."
 
-#: C/evolution.xml:5695(para)
+#: C/evolution.xml:5689(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
@@ -11749,7 +11433,7 @@ msgstr ""
 "que puede ver las Notas de recordatorio listadas bajo las Notas en la parte "
 "inferior derecha de la vista del calendario."
 
-#: C/evolution.xml:5697(para)
+#: C/evolution.xml:5691(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
@@ -11757,7 +11441,7 @@ msgstr ""
 "Seleccione la nota o la Nota de recordatorio bajo el componente Notas para "
 "mostrarla en la vista del Calendario."
 
-#: C/evolution.xml:5700(para)
+#: C/evolution.xml:5694(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
@@ -11767,15 +11451,15 @@ msgstr ""
 "\">Paso 1</link> hasta el <link linkend=\"b10fqh6r\">Paso 8</link> bajo "
 "<link linkend=\"b1012vdd\">Notas</link>."
 
-#: C/evolution.xml:5701(para)
+#: C/evolution.xml:5695(para)
 msgid "To send a Reminder Note,"
 msgstr "Enviar una nota de recordatorio,"
 
-#: C/evolution.xml:5704(para)
+#: C/evolution.xml:5698(para)
 msgid "Click File &gt; New &gt; Shared Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota compartida."
 
-#: C/evolution.xml:5707(para)
+#: C/evolution.xml:5701(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
@@ -11783,7 +11467,7 @@ msgstr ""
 "Seleccione el nombre de la cuenta del Organizador de la lista desplegable "
 "proporcionada junto al campo Organizador."
 
-#: C/evolution.xml:5710(para)
+#: C/evolution.xml:5704(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
@@ -11791,15 +11475,15 @@ msgstr ""
 "En el campo Para escriba un nombre de usuario, después pulse Intro. Repita "
 "la operación para añadir usuarios adicionales."
 
-#: C/evolution.xml:5722(para)
+#: C/evolution.xml:5716(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr "Especifique la categoría bajo la que recae la nota de recordatorio."
 
-#: C/evolution.xml:5728(para)
+#: C/evolution.xml:5722(para)
 msgid "Click Save."
 msgstr "Pulse Guardar."
 
-#: C/evolution.xml:5737(para)
+#: C/evolution.xml:5731(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
@@ -11809,7 +11493,7 @@ msgstr ""
 "podrá comprobar la disponibilidad de otros usuarios en el mismo servidor en "
 "función de sus respectivos calendarios GruopWise."
 
-#: C/evolution.xml:5739(para)
+#: C/evolution.xml:5733(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -11822,15 +11506,15 @@ msgstr ""
 "que funcionan desde el mismo momento de iniciar la sesión, sin tener en "
 "cuenta si ejecutó el Evolution durante dicha sesión."
 
-#: C/evolution.xml:5742(para)
+#: C/evolution.xml:5736(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Abra una nueva cita en el calendario."
 
-#: C/evolution.xml:5745(para)
+#: C/evolution.xml:5739(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Pulse Acciones &gt; Planificar una reunión."
 
-#: C/evolution.xml:5748(para)
+#: C/evolution.xml:5742(para)
 msgid ""
 "Add attendees, either by entering their email addresses into the list, or by "
 "clicking the Invite Others button."
@@ -11838,7 +11522,7 @@ msgstr ""
 "Añada participantes, ya sea introduciendo sus direcciones de correo-e en la "
 "lista o pulsando el botón Invitar a otros."
 
-#: C/evolution.xml:5751(para)
+#: C/evolution.xml:5745(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
@@ -11847,7 +11531,7 @@ msgstr ""
 "agendas de los participantes y, si es posible, actualizar la reunión en los "
 "calendarios de cada uno de los asistentes."
 
-#: C/evolution.xml:5754(para)
+#: C/evolution.xml:5748(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11865,24 +11549,24 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5761(link) C/evolution.xml:5781(title)
+#: C/evolution.xml:5755(link) C/evolution.xml:5775(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr "Confirmar la entrega de los elementos que ha enviado"
 
-#: C/evolution.xml:5764(link) C/evolution.xml:5887(title)
+#: C/evolution.xml:5758(link) C/evolution.xml:5881(title)
 msgid "Displaying Sent Items"
 msgstr "Mostrar elementos enviados"
 
-#: C/evolution.xml:5767(link) C/evolution.xml:5826(title)
+#: C/evolution.xml:5761(link) C/evolution.xml:5820(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr "Comprobar el estado de un elemento que ha enviado"
 
-#: C/evolution.xml:5770(link) C/evolution.xml:5773(link)
-#: C/evolution.xml:5853(title)
+#: C/evolution.xml:5764(link) C/evolution.xml:5767(link)
+#: C/evolution.xml:5847(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr "Petición de respuesta para elementos que envíe"
 
-#: C/evolution.xml:5777(para)
+#: C/evolution.xml:5771(para)
 msgid ""
 "You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
@@ -11890,7 +11574,7 @@ msgstr ""
 "Puede gestionar sus elementos enviados para correo electrónico GroupWise "
 "sólo si el destinatario está ubicado en el mismo sistema GruopWise."
 
-#: C/evolution.xml:5782(para)
+#: C/evolution.xml:5776(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
@@ -11902,11 +11586,11 @@ msgstr ""
 "enviado. Por ejemplo, puede ver cuándo se entregó un correo-e y cuándo lo "
 "abrió o borró el destinatario."
 
-#: C/evolution.xml:5784(title)
+#: C/evolution.xml:5778(title)
 msgid "Track an Item You Sent:"
 msgstr "Seguir un elemento que haya enviado:"
 
-#: C/evolution.xml:5785(para)
+#: C/evolution.xml:5779(para)
 msgid ""
 "You can check the status in the Message Status window of an email you have "
 "sent."
@@ -11914,11 +11598,11 @@ msgstr ""
 "Puede comprobar el estado de un correo electrónico que haya enviado en la "
 "ventana Estado del mensaje."
 
-#: C/evolution.xml:5788(title)
+#: C/evolution.xml:5782(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr "Recibir una notificación cuando se abre o borra el elemento:"
 
-#: C/evolution.xml:5789(para)
+#: C/evolution.xml:5783(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
@@ -11928,11 +11612,11 @@ msgstr ""
 "mensaje. Para obtener más información consulte <link linkend=\"Ak05sv1"
 "\">Recibir notificaciones acerca de elementos que envíe</link>."
 
-#: C/evolution.xml:5792(title)
+#: C/evolution.xml:5786(title)
 msgid "Request a Reply:"
 msgstr "Pedir una respuesta:"
 
-#: C/evolution.xml:5793(para)
+#: C/evolution.xml:5787(para)
 msgid ""
 "You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
@@ -11945,27 +11629,26 @@ msgstr ""
 "doble flecha. Para obtener más información vea <link linkend=\"Ak05sv1"
 "\">Petición de respuesta para elementos que envíe</link>."
 
-#: C/evolution.xml:5797(title) C/evolution.xml:5911(title)
+#: C/evolution.xml:5791(title) C/evolution.xml:5905(title)
 msgid "Enabling Status Tracking"
 msgstr "Activar el seguimiento de estado"
 
-#: C/evolution.xml:5800(para) C/evolution.xml:5840(para)
-#: C/evolution.xml:5856(para)
+#: C/evolution.xml:5794(para) C/evolution.xml:5834(para)
+#: C/evolution.xml:5850(para)
 msgid "In the Compose Message window, click Insert &gt; Send Options."
-msgstr ""
-"En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
+msgstr "En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
 
-#: C/evolution.xml:5801(para)
+#: C/evolution.xml:5795(para)
 msgid "Select Status Tracking."
 msgstr "Seleccione Seguimiento de estado"
 
-#: C/evolution.xml:5806(para) C/evolution.xml:5918(para)
+#: C/evolution.xml:5800(para) C/evolution.xml:5912(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 "Seleccione la casilla de verificación junto a Crear un elemento enviado para "
 "seguimiento de la información."
 
-#: C/evolution.xml:5809(para) C/evolution.xml:5921(para)
+#: C/evolution.xml:5803(para) C/evolution.xml:5915(para)
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
@@ -11973,7 +11656,7 @@ msgstr ""
 "Seleccione cualqueira de las opciones dadas (Entregado, Entregado y abierto, "
 "Toda la información)"
 
-#: C/evolution.xml:5810(para) C/evolution.xml:5922(para)
+#: C/evolution.xml:5804(para) C/evolution.xml:5916(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
@@ -11981,7 +11664,7 @@ msgstr ""
 "Basándose en esta selección, puede ver el estado del mensaje enviado en la "
 "carpeta de Correo enviado."
 
-#: C/evolution.xml:5811(para)
+#: C/evolution.xml:5805(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
@@ -11989,7 +11672,7 @@ msgstr ""
 "Para obtener más información, consulte <link linkend=\"Aal54a9\">Comprobar "
 "el estado de un elemento que ha enviado</link>."
 
-#: C/evolution.xml:5814(para) C/evolution.xml:5925(para)
+#: C/evolution.xml:5808(para) C/evolution.xml:5919(para)
 msgid ""
 "(Optional)Select the check box next to Auto-delete sent item to "
 "automatically delete the sent item from the Sent folder."
@@ -11997,20 +11680,19 @@ msgstr ""
 "(Opcional) Seleccione la casilla junto a Autoborrar el elemento enviado para "
 "borrar automáticamente el elemento enviado de la carpeta Correo enviado."
 
-#: C/evolution.xml:5817(para) C/evolution.xml:5928(para)
+#: C/evolution.xml:5811(para) C/evolution.xml:5922(para)
 msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 "En Devolver notificación, especifique el tipo de notificación que desea "
 "recibir."
 
-#: C/evolution.xml:5829(para)
-msgid ""
-"Right-click an email in your Sent folder, then click Track Message Status."
+#: C/evolution.xml:5823(para)
+msgid "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 "Pulse con el botón derecho sobre un correo-e en su carpeta de Correo "
 "enviado, después pulse Seguir el estado del mensaje."
 
-#: C/evolution.xml:5830(para)
+#: C/evolution.xml:5824(para)
 msgid ""
 "With Message Tracking, you know when the item reaches the recipients or is "
 "read by them. You also know exactly who received your message, who read your "
@@ -12020,15 +11702,15 @@ msgstr ""
 "destinatarios o cuándo se leyó. También podrá saber exactamente quién "
 "recibió su mensaje, quién lo leyó y quién lo borró y cuándo."
 
-#: C/evolution.xml:5837(title)
+#: C/evolution.xml:5831(title)
 msgid "Changing the Priority of an Email"
 msgstr "Cambiar la prioridad de un correo-e"
 
-#: C/evolution.xml:5843(para)
+#: C/evolution.xml:5837(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
 msgstr "Seleccione Prioridad Alta, Estándar, Baja, o Indefinida."
 
-#: C/evolution.xml:5844(para)
+#: C/evolution.xml:5838(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
@@ -12036,13 +11718,13 @@ msgstr ""
 "El pequeño icono junto al elemento en el Buzón de correo será rojo cuando la "
 "prioridad sea alta."
 
-#: C/evolution.xml:5860(para)
+#: C/evolution.xml:5854(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 "Pulse Respuesta solicitada, después especifique cuando quiere recibir la "
 "respuesta."
 
-#: C/evolution.xml:5861(para)
+#: C/evolution.xml:5855(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -12054,7 +11736,7 @@ msgstr ""
 "días, entonces aparecerá Respuesta solicitada: en <varname>día del mes día "
 "numérico hora año</varname> en la parte superior del mensaje."
 
-#: C/evolution.xml:5864(para)
+#: C/evolution.xml:5858(para)
 msgid ""
 "Click Set Expiration Date, then specify the number of days for this message "
 "to remain in the recipient's Inbox."
@@ -12062,11 +11744,11 @@ msgstr ""
 "Pulse Establecer fecha de caducidad y especifique el número de días durante "
 "el cual este mensaje permanecerá en el buzón de correo del destinatario."
 
-#: C/evolution.xml:5872(title)
+#: C/evolution.xml:5866(title)
 msgid "Setting Message Delivery Options"
 msgstr "Establecer opciones de entrega de los mensajes"
 
-#: C/evolution.xml:5873(para)
+#: C/evolution.xml:5867(para)
 msgid ""
 "You can delay the delivery of an individual message by having it held in the "
 "Outbox for a specified time."
@@ -12074,11 +11756,11 @@ msgstr ""
 "Puede posponer la entrega de un mensaje individual dejándolo en la Bandeja "
 "de salida por un periodo de tiempo especificado."
 
-#: C/evolution.xml:5876(para)
+#: C/evolution.xml:5870(para)
 msgid "Click Delay message delivery."
 msgstr "Pulse Retrasar la entrega del mensaje."
 
-#: C/evolution.xml:5879(para)
+#: C/evolution.xml:5873(para)
 msgid ""
 "Use the Date and Time options to specify how long the message should remain "
 "in the Outbox before it is sent to the recipient."
@@ -12087,11 +11769,11 @@ msgstr ""
 "permanecer el mensaje en la Bandeja de salida antes de que se envíe a su "
 "destinatario."
 
-#: C/evolution.xml:5890(para)
+#: C/evolution.xml:5884(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr "Pulse en la carpeta Correo enviado en la lista de carpetas."
 
-#: C/evolution.xml:5893(para)
+#: C/evolution.xml:5887(para)
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
 "for sent email in the account editor default settings. For more information, "
@@ -12105,18 +11787,17 @@ msgstr ""
 "el Correo enviado y los Borradores</link> bajo <link linkend=\"b13uhy6r"
 "\">Predeterminados</link>."
 
-#: C/evolution.xml:5896(title)
+#: C/evolution.xml:5890(title)
 msgid "Delegating an Item"
 msgstr "Borrar un elemento"
 
-#: C/evolution.xml:5899(para)
-msgid ""
-"In the Calendar, right-click the meeting or appointment you want to delegate."
+#: C/evolution.xml:5893(para)
+msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho sobre la reunión o cita que "
 "quiere delegar."
 
-#: C/evolution.xml:5902(para)
+#: C/evolution.xml:5896(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
@@ -12124,11 +11805,11 @@ msgstr ""
 "Seleccione Delegar reunión, después seleccione los contactos a los que "
 "quiere delegar la reunión o cita."
 
-#: C/evolution.xml:5908(para)
+#: C/evolution.xml:5902(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr "Cada contacto obtiene una copia de la cita o reunión."
 
-#: C/evolution.xml:5914(para)
+#: C/evolution.xml:5908(para)
 msgid ""
 "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
 "Tracking"
@@ -12136,7 +11817,7 @@ msgstr ""
 "En la ventana del editor de mensaje pulse Insertar &gt; Opciones de envío "
 "&gt; Seguimiento de estado"
 
-#: C/evolution.xml:5940(para)
+#: C/evolution.xml:5934(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
@@ -12147,7 +11828,7 @@ msgstr ""
 "aceptar y rechazar elementos de parte del otro usuario, con las "
 "restricciones que el otro usuario ajuste."
 
-#: C/evolution.xml:5942(para)
+#: C/evolution.xml:5936(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
@@ -12157,27 +11838,27 @@ msgstr ""
 "diferente, siempre que la persona esté en el mismo sistema GroupWise. No "
 "puede establecer el proxy para un usuario en un sistema GroupWise diferente."
 
-#: C/evolution.xml:5947(link) C/evolution.xml:5964(title)
+#: C/evolution.xml:5941(link) C/evolution.xml:5958(title)
 msgid "Receiving Proxy Rights"
 msgstr "Obtener derechos del Proxy"
 
-#: C/evolution.xml:5950(link) C/evolution.xml:5969(title)
+#: C/evolution.xml:5944(link) C/evolution.xml:5963(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Asignar derechos proxy a otro usuario"
 
-#: C/evolution.xml:5953(link) C/evolution.xml:6040(title)
+#: C/evolution.xml:5947(link) C/evolution.xml:6034(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr "Añadir y eliminar nombres y derechos Proxy en su Lista proxy"
 
-#: C/evolution.xml:5956(link) C/evolution.xml:6071(title)
+#: C/evolution.xml:5950(link) C/evolution.xml:6065(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr "Gestionar el buzón de correo o el calendario de otra persona"
 
-#: C/evolution.xml:5959(link) C/evolution.xml:6095(title)
+#: C/evolution.xml:5953(link) C/evolution.xml:6089(title)
 msgid "Marking an Item Private"
 msgstr "Hacer un elemento privado"
 
-#: C/evolution.xml:5965(para)
+#: C/evolution.xml:5959(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -12190,7 +11871,7 @@ msgstr ""
 "seleccionar al usuario de tal forma que pueda acceder a su Buzón de correo o "
 "Calendario."
 
-#: C/evolution.xml:5970(para)
+#: C/evolution.xml:5964(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -12207,19 +11888,19 @@ msgstr ""
 "calendario, deles acceso de lectura para las citas. La siguiente tabla "
 "describe los permisos que puede otorgar a los usuarios:"
 
-#: C/evolution.xml:5978(para)
+#: C/evolution.xml:5972(para)
 msgid "This Right"
 msgstr "Este derecho"
 
-#: C/evolution.xml:5981(para)
+#: C/evolution.xml:5975(para)
 msgid "Lets your proxy do this"
 msgstr "Permite que su proxy haga esto"
 
-#: C/evolution.xml:5988(para)
+#: C/evolution.xml:5982(para)
 msgid "Read"
 msgstr "Leer"
 
-#: C/evolution.xml:5991(para)
+#: C/evolution.xml:5985(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
@@ -12227,11 +11908,11 @@ msgstr ""
 "Leer los elementos que reciba. Los proxies no pueden ver su Carpeta de "
 "contactos con éste o cualquier otro derecho."
 
-#: C/evolution.xml:5996(para)
+#: C/evolution.xml:5990(para)
 msgid "Write"
 msgstr "Escribir"
 
-#: C/evolution.xml:5999(para)
+#: C/evolution.xml:5993(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
@@ -12240,11 +11921,11 @@ msgstr ""
 "Crear y enviar elementos en su nombre, incluyendo su firma si ha definido "
 "una. Asignar categorías a los elementos y cambiar el asunto de los elementos."
 
-#: C/evolution.xml:6004(para)
+#: C/evolution.xml:5998(para)
 msgid "Subscribe to my alarms"
 msgstr "Suscribirse a sus alertas"
 
-#: C/evolution.xml:6007(para)
+#: C/evolution.xml:6001(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
@@ -12252,11 +11933,11 @@ msgstr ""
 "Recibir las mismas alertas que usted reciba. Recibir alertas está soportado "
 "sólo si el proxy está en la misma oficina postal."
 
-#: C/evolution.xml:6012(para)
+#: C/evolution.xml:6006(para)
 msgid "Subscribe to my notifications"
 msgstr "Suscribirse a sus notificaciones"
 
-#: C/evolution.xml:6015(para)
+#: C/evolution.xml:6009(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
@@ -12265,11 +11946,11 @@ msgstr ""
 "notificaciones sólo está soportada si el proxy está en la misma oficina "
 "postal."
 
-#: C/evolution.xml:6020(para)
+#: C/evolution.xml:6014(para)
 msgid "Modify options/rules/folders"
 msgstr "Modificar opciones/reglas/carpetas"
 
-#: C/evolution.xml:6023(para)
+#: C/evolution.xml:6017(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -12282,11 +11963,11 @@ msgstr ""
 "modificar reglas y carpetas. Este permiso permite a un proxy añadir, borrar "
 "y modificar categorías."
 
-#: C/evolution.xml:6028(para)
+#: C/evolution.xml:6022(para)
 msgid "Read items marked Private"
 msgstr "Leer elementos marcados como Privado"
 
-#: C/evolution.xml:6031(para)
+#: C/evolution.xml:6025(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
@@ -12295,15 +11976,15 @@ msgstr ""
 "Privados a un proxy, todos los elementos marcados como Privado en su Buzón "
 "de correo permanecerán ocultos para ese proxy."
 
-#: C/evolution.xml:6046(para)
+#: C/evolution.xml:6040(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr "Seleccione la cuenta GruopWise para editarla, después pulse Editar."
 
-#: C/evolution.xml:6049(para)
+#: C/evolution.xml:6043(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr "Pulse en la solapa Proxy, después en Añadir."
 
-#: C/evolution.xml:6052(para)
+#: C/evolution.xml:6046(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
@@ -12311,11 +11992,11 @@ msgstr ""
 "Para añadir un usuario a la lista, escriba el nombre en la caja Nombre o "
 "importe el contacto de la Lista de contactos."
 
-#: C/evolution.xml:6055(para)
+#: C/evolution.xml:6049(para)
 msgid "Select the rights you want to give to the user."
 msgstr "Seleccione los derechos que quiere darle al usuario."
 
-#: C/evolution.xml:6060(para)
+#: C/evolution.xml:6054(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
@@ -12324,7 +12005,7 @@ msgstr ""
 "\"Aai4sll\">Paso 5</link> para asignar derechos a cada usuario en la lista "
 "proxy."
 
-#: C/evolution.xml:6067(para)
+#: C/evolution.xml:6061(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
@@ -12332,7 +12013,7 @@ msgstr ""
 "Para borrar un usuario de la lista proxy, seleccione el usuario, después "
 "pulse Quitar usuario."
 
-#: C/evolution.xml:6072(para)
+#: C/evolution.xml:6066(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
@@ -12342,16 +12023,15 @@ msgstr ""
 "de proxy en su Lista proxy en las Preferencias. La cantidad de acceso que "
 "tenga dependerá de los permisos que le hayan concedido."
 
-#: C/evolution.xml:6075(para)
+#: C/evolution.xml:6069(para)
 msgid "Right-click on the GroupWise account in the folder list."
-msgstr ""
-"Pulse con el botón derecho sobre la cuenta GroupWise en la lista de carpetas."
+msgstr "Pulse con el botón derecho sobre la cuenta GroupWise en la lista de carpetas."
 
-#: C/evolution.xml:6078(para)
+#: C/evolution.xml:6072(para)
 msgid "Click Proxy Login."
 msgstr "Pulse Sesión proxy."
 
-#: C/evolution.xml:6083(para)
+#: C/evolution.xml:6077(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
@@ -12359,11 +12039,11 @@ msgstr ""
 "Escriba el nombre de usuario de la persona que le ha dado acceso proxy o "
 "selecciónelo de la lista."
 
-#: C/evolution.xml:6087(para)
+#: C/evolution.xml:6081(para)
 msgid "The user's data appears in the respective components."
 msgstr "Los datos del usuario aparecerán en los respectivos componentes."
 
-#: C/evolution.xml:6089(para)
+#: C/evolution.xml:6083(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
@@ -12373,7 +12053,7 @@ msgstr ""
 "citas de cada usuario. También puede seleccionar si quiere mostrar las citas "
 "de un usuario en particular o no hacerlo."
 
-#: C/evolution.xml:6096(para)
+#: C/evolution.xml:6090(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
@@ -12381,7 +12061,7 @@ msgstr ""
 "Puede limitar el acceso de un proxy a elementos individuales en su Buzón de "
 "correo o Calendario haciéndolos privados."
 
-#: C/evolution.xml:6097(para)
+#: C/evolution.xml:6091(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
@@ -12391,7 +12071,7 @@ msgstr ""
 "puedan abrirlo. Los proxies no pueden acceder a los elementos marcados como "
 "Privado a no ser que les de esos permisos en su Lista de acceso."
 
-#: C/evolution.xml:6098(para)
+#: C/evolution.xml:6092(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12408,12 +12088,11 @@ msgstr ""
 "búsqueda de Disponibilidad en concordancia con el estado que seleccionó "
 "cuando aceptó la cita."
 
-#: C/evolution.xml:6101(para)
+#: C/evolution.xml:6095(para)
 msgid "In an open item, click Actions, then click Mark Private."
-msgstr ""
-"En un elemento abierto, pulse Acciones, después pulse Marcar como privado."
+msgstr "En un elemento abierto, pulse Acciones, después pulse Marcar como privado."
 
-#: C/evolution.xml:6103(para)
+#: C/evolution.xml:6097(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
@@ -12421,7 +12100,7 @@ msgstr ""
 "En su Calendario, pulse un elemento en las Citas, Notas de recordatorio o "
 "Lista de tareas, pulse Acciones y después pulse Marcar como privado."
 
-#: C/evolution.xml:6111(para)
+#: C/evolution.xml:6105(para)
 msgid ""
 "Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
@@ -12435,35 +12114,33 @@ msgstr ""
 "Debido a que estos ajustes están en el sistema GroupWise, su lista de SPAM "
 "le sigue de equipo en equipo."
 
-#: C/evolution.xml:6114(link) C/evolution.xml:6131(title)
+#: C/evolution.xml:6108(link) C/evolution.xml:6125(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Marcar un mensaje como spam"
 
-#: C/evolution.xml:6117(link) C/evolution.xml:6141(title)
+#: C/evolution.xml:6111(link) C/evolution.xml:6135(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Marcar un mensaje como no spam"
 
-#: C/evolution.xml:6120(link) C/evolution.xml:6155(title)
+#: C/evolution.xml:6114(link) C/evolution.xml:6149(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr "Activar o desactivar su lista de correo basura"
 
-#: C/evolution.xml:6123(link) C/evolution.xml:6170(title)
+#: C/evolution.xml:6117(link) C/evolution.xml:6164(title)
 msgid "Adding an Email Address to Your Junk List"
 msgstr "Añadir una dirección de correo electrónico a su lista de correo basura"
 
-#: C/evolution.xml:6126(link) C/evolution.xml:6185(title)
+#: C/evolution.xml:6120(link) C/evolution.xml:6179(title)
 msgid "Removing an Email Address from Your Junk List"
-msgstr ""
-"Quitar una dirección de correo electrónico de su lista de correo basura"
+msgstr "Quitar una dirección de correo electrónico de su lista de correo basura"
 
-#: C/evolution.xml:6134(para)
-msgid ""
-"Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
+#: C/evolution.xml:6128(para)
+msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 "Seleccione el mensaje marcado como spam, después pulse el icono de SPAM o "
 "pulse Ctrl+J."
 
-#: C/evolution.xml:6135(para)
+#: C/evolution.xml:6129(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
@@ -12471,23 +12148,23 @@ msgstr ""
 "El mensaje se moverá a su carpeta de correo basura y el usuario se añadirá a "
 "su lista de spam."
 
-#: C/evolution.xml:6144(para)
+#: C/evolution.xml:6138(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 "Seleccione el mensaje para marcarlo como no spam en su Carpeta de correo "
 "basura."
 
-#: C/evolution.xml:6147(para)
+#: C/evolution.xml:6141(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 "Pulse con el botón derecho sobre el mensaje, después pulse Marcar como no "
 "spam."
 
-#: C/evolution.xml:6148(para)
+#: C/evolution.xml:6142(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "O seleccione el mensaje y pulse Mayús+Ctrl+J"
 
-#: C/evolution.xml:6149(para)
+#: C/evolution.xml:6143(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
@@ -12495,29 +12172,28 @@ msgstr ""
 "El mensaje se moverá a su Bandeja de entrada y el nombre se eliminará de su "
 "lista de correo basura."
 
-#: C/evolution.xml:6158(para) C/evolution.xml:6173(para)
-#: C/evolution.xml:6188(para)
+#: C/evolution.xml:6152(para) C/evolution.xml:6167(para)
+#: C/evolution.xml:6182(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr "Pulse con el botón derecho, después pulse Opciones de spam."
 
-#: C/evolution.xml:6161(para)
+#: C/evolution.xml:6155(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr "Seleccione si quiere activar o desactivar el manejo del correo basura."
 
-#: C/evolution.xml:6176(para)
+#: C/evolution.xml:6170(para)
 msgid "Type the email address to block in the Email field."
-msgstr ""
-"Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
+msgstr "Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
 
-#: C/evolution.xml:6179(para)
+#: C/evolution.xml:6173(para)
 msgid "Click Add, then click OK."
 msgstr "Pulse Añadir, después pulse Aceptar."
 
-#: C/evolution.xml:6191(para)
+#: C/evolution.xml:6185(para)
 msgid "Select the email address to remove, then click Remove."
 msgstr "Seleccione la dirección de correo-e a quitar, después pulse Quitar."
 
-#: C/evolution.xml:6203(para)
+#: C/evolution.xml:6197(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
@@ -12528,39 +12204,39 @@ msgstr ""
 "puede que quiera cambiar su configuración de <trademark>Evolution</"
 "trademark>."
 
-#: C/evolution.xml:6206(link) C/evolution.xml:6260(title)
+#: C/evolution.xml:6200(link) C/evolution.xml:6254(title)
 msgid "Working with Mail Accounts"
 msgstr "Utilización de cuentas de correo"
 
-#: C/evolution.xml:6209(link) C/evolution.xml:6303(title)
+#: C/evolution.xml:6203(link) C/evolution.xml:6297(title)
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:6212(link) C/evolution.xml:6365(title)
+#: C/evolution.xml:6206(link) C/evolution.xml:6359(title)
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: C/evolution.xml:6215(link) C/evolution.xml:6534(title)
+#: C/evolution.xml:6209(link) C/evolution.xml:6528(title)
 msgid "Composer Preferences"
 msgstr "Editor de correo"
 
-#: C/evolution.xml:6218(link) C/evolution.xml:6593(title)
+#: C/evolution.xml:6212(link) C/evolution.xml:6587(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6221(link) C/evolution.xml:6712(title)
+#: C/evolution.xml:6215(link) C/evolution.xml:6706(title)
 msgid "Contact Management"
 msgstr "Gestión de contactos"
 
-#: C/evolution.xml:6224(link) C/evolution.xml:6695(title)
+#: C/evolution.xml:6218(link) C/evolution.xml:6689(title)
 msgid "Certificates"
 msgstr "Certificados"
 
-#: C/evolution.xml:6227(link) C/evolution.xml:6845(title)
+#: C/evolution.xml:6221(link) C/evolution.xml:6839(title)
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: C/evolution.xml:6230(para)
+#: C/evolution.xml:6224(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12574,15 +12250,15 @@ msgstr ""
 "de Evolution personalizar. La parte derecha de la ventana es donde realmente "
 "realizará cambios."
 
-#: C/evolution.xml:6232(para)
+#: C/evolution.xml:6226(para)
 msgid "There are six items you can customize."
 msgstr "Existen seis elementos que puede personalizar."
 
-#: C/evolution.xml:6234(title)
+#: C/evolution.xml:6228(title)
 msgid "Mail Accounts:"
 msgstr "Cuentas de correo:"
 
-#: C/evolution.xml:6235(para)
+#: C/evolution.xml:6229(para)
 msgid ""
 "Add or change information about your email accounts, such as the servers you "
 "connect to, the way you download mail, and your password authentication "
@@ -12595,11 +12271,11 @@ msgstr ""
 "complejo de la lista y está descrito en <link linkend=\"config-prefs-mail-"
 "identity\">Utilización de cuentas de correo</link>."
 
-#: C/evolution.xml:6238(title)
+#: C/evolution.xml:6232(title)
 msgid "Autocompletion:"
 msgstr "Autocompletado:"
 
-#: C/evolution.xml:6239(para)
+#: C/evolution.xml:6233(para)
 msgid ""
 "Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
@@ -12609,11 +12285,11 @@ msgstr ""
 "correo-e en el editor de mensajes. Para obtener más información vea <link "
 "linkend=\"bshoq5l\">Autocompletado</link>."
 
-#: C/evolution.xml:6242(title)
+#: C/evolution.xml:6236(title)
 msgid "Mail Preferences:"
 msgstr "Opciones de correo:"
 
-#: C/evolution.xml:6243(para)
+#: C/evolution.xml:6237(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12628,11 +12304,11 @@ msgstr ""
 "link>, pero la mayoría de los ajustes de correo están en <link linkend="
 "\"config-prefs-mail\">Opciones de correo</link>."
 
-#: C/evolution.xml:6246(title)
+#: C/evolution.xml:6240(title)
 msgid "Composer Preferences:"
 msgstr "Preferencias del editor:"
 
-#: C/evolution.xml:6247(para)
+#: C/evolution.xml:6241(para)
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
 "signatures, and spelling. This includes the ability to substitute graphical "
@@ -12647,11 +12323,11 @@ msgstr ""
 "en las <link linkend=\"config-prefs-mail-composer\">Preferencias del editor</"
 "link>."
 
-#: C/evolution.xml:6250(title)
+#: C/evolution.xml:6244(title)
 msgid "Calendar and Tasks:"
 msgstr "Calendario y tareas:"
 
-#: C/evolution.xml:6251(para)
+#: C/evolution.xml:6245(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -12662,11 +12338,11 @@ msgstr ""
 "más información vea <link linkend=\"config-prefs-cal\">Preferencias del "
 "calendario y de las tareas</link>."
 
-#: C/evolution.xml:6254(title)
+#: C/evolution.xml:6248(title)
 msgid "Certificates:"
 msgstr "Certificados:"
 
-#: C/evolution.xml:6255(para)
+#: C/evolution.xml:6249(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -12675,7 +12351,7 @@ msgstr ""
 "MIME. Para obtener más información vea <link linkend=\"bshoty0"
 "\">Certificados</link>."
 
-#: C/evolution.xml:6257(para)
+#: C/evolution.xml:6251(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -12691,7 +12367,7 @@ msgstr ""
 "botón derecho sobre la carpeta, y la delegación para Exchange está "
 "disponible en el menú Mensaje de la herramienta Exchange."
 
-#: C/evolution.xml:6261(para)
+#: C/evolution.xml:6255(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
 "are writing an email message, you can choose which account to use by "
@@ -12703,7 +12379,7 @@ msgstr ""
 "cuanta quiere usar seleccionándola de una lista desplegable junto al campo "
 "De: en el editor de mensajes."
 
-#: C/evolution.xml:6262(para)
+#: C/evolution.xml:6256(para)
 msgid ""
 "Click Send/Receive to update all mail sources that are not disabled. If you "
 "don't want to check mail for a given account, select the account in Edit "
@@ -12714,7 +12390,7 @@ msgstr ""
 "seleccione la cuenta en la página Editar &gt; Preferencias &gt; Cuentas de "
 "correo y pulse el botón Desactivar."
 
-#: C/evolution.xml:6263(para)
+#: C/evolution.xml:6257(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
 "assistant. To alter an existing account, select it in the Preferences "
@@ -12725,15 +12401,15 @@ msgstr ""
 "selecciónela y pulse en Editar para abrir el cuadro de diálogo del editor de "
 "cuentas."
 
-#: C/evolution.xml:6264(para)
+#: C/evolution.xml:6258(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "El cuadro de diálogo del editor de cuentas cuenta con siete secciones:"
 
-#: C/evolution.xml:6266(title)
+#: C/evolution.xml:6260(title)
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: C/evolution.xml:6267(para)
+#: C/evolution.xml:6261(para)
 msgid ""
 "Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
@@ -12742,11 +12418,11 @@ msgstr ""
 "puede elegir una firma predeterminada para añadirla al final de los mensajes "
 "enviados desde esta cuenta."
 
-#: C/evolution.xml:6270(title)
+#: C/evolution.xml:6264(title)
 msgid "Receiving Email:"
 msgstr "Recibir correo electrónico:"
 
-#: C/evolution.xml:6271(para)
+#: C/evolution.xml:6265(para)
 msgid ""
 "Select the way you receive email. You can download email from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
@@ -12765,7 +12441,7 @@ msgstr ""
 "seleccionar una de las tres opciones proporcionadas: Sin cifrado, Cifrado "
 "TLS o Cifrado SSL."
 
-#: C/evolution.xml:6273(para)
+#: C/evolution.xml:6267(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -12779,7 +12455,7 @@ msgstr ""
 "servidor smtp.ejemplo.net, especifique smtp.ejemplo.net:142 como nombre del "
 "servidor."
 
-#: C/evolution.xml:6274(para)
+#: C/evolution.xml:6268(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -12787,11 +12463,11 @@ msgstr ""
 "Para obtener información adicional, vea <link linkend=\"second-step"
 "\">Recepción de correo</link>."
 
-#: C/evolution.xml:6276(title)
+#: C/evolution.xml:6270(title)
 msgid "Receiving Options:"
 msgstr "Opciones de recepción:"
 
-#: C/evolution.xml:6277(para)
+#: C/evolution.xml:6271(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -12799,7 +12475,7 @@ msgstr ""
 "Decida si quiere descargar su correo automáticamente y con qué frecuencia, "
 "así como otras opciones de recuperación de los mensajes."
 
-#: C/evolution.xml:6279(para)
+#: C/evolution.xml:6273(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -12809,11 +12485,11 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:6281(title)
+#: C/evolution.xml:6275(title)
 msgid "Sending Mail:"
 msgstr "Envío de correo:"
 
-#: C/evolution.xml:6282(para)
+#: C/evolution.xml:6276(para)
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
@@ -12825,7 +12501,7 @@ msgstr ""
 "instalado Evolution Connector para Microsoft Exchange), <link linkend="
 "\"sendmail\">Sendmail</link> o muchas otras opciones."
 
-#: C/evolution.xml:6284(para)
+#: C/evolution.xml:6278(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -12833,11 +12509,11 @@ msgstr ""
 "Para obtener información adicional vea <link linkend=\"third-step\">Envío de "
 "correo</link>."
 
-#: C/evolution.xml:6286(title)
+#: C/evolution.xml:6280(title)
 msgid "Defaults:"
 msgstr "Predeterminados:"
 
-#: C/evolution.xml:6287(para)
+#: C/evolution.xml:6281(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
@@ -12847,7 +12523,7 @@ msgstr ""
 "los guardados como borradores. Si quiere restaurar la configuración "
 "predeterminada pulse el botón Revertir."
 
-#: C/evolution.xml:6289(para)
+#: C/evolution.xml:6283(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -12857,7 +12533,7 @@ msgstr ""
 "active la casilla Siempre enviar copia de carbón (Cc) a: o Siempre enviar "
 "copia de carbón oculta (Cco) a: e introduzca una o más direcciones."
 
-#: C/evolution.xml:6290(para)
+#: C/evolution.xml:6284(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
@@ -12868,7 +12544,7 @@ msgstr ""
 "por cada mensaje. Para obtener más información consulte <link linkend="
 "\"b13uhy6r\">Ajustes predeterminados</link>."
 
-#: C/evolution.xml:6291(para)
+#: C/evolution.xml:6285(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -12883,11 +12559,11 @@ msgstr ""
 "concordancia. Active el seguimiento de estado así como Devolver notificación "
 "para el correo, el calendario y las tareas."
 
-#: C/evolution.xml:6293(title)
+#: C/evolution.xml:6287(title)
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: C/evolution.xml:6294(para)
+#: C/evolution.xml:6288(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -12899,11 +12575,11 @@ msgstr ""
 "\"encryption\">Cifrado</link>) y elija, entre las cuatro opciones "
 "disponibles, la manera de manejar su clave y firma."
 
-#: C/evolution.xml:6297(title)
+#: C/evolution.xml:6291(title)
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: C/evolution.xml:6298(para)
+#: C/evolution.xml:6292(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -12912,7 +12588,7 @@ msgstr ""
 "ajustar el acceso proxy para que otros usuarios accedan a su Bandeja de "
 "correo o Calendario."
 
-#: C/evolution.xml:6304(para)
+#: C/evolution.xml:6298(para)
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
 "for you in the mail composer. This functionality requires accessibility to "
@@ -12926,11 +12602,11 @@ msgstr ""
 "autocompletado, seleccione cada una de las libretas de direcciones que "
 "quiere usar en la página Autocompletado."
 
-#: C/evolution.xml:6308(title)
+#: C/evolution.xml:6302(title)
 msgid "IMAP Mail Headers"
 msgstr "Cabeceras de correo IMAP"
 
-#: C/evolution.xml:6309(para)
+#: C/evolution.xml:6303(para)
 msgid ""
 "Evolution allows you to choose the headers that you want to download so that "
 "you can reduce the download time and filter or move your mail around the way "
@@ -12943,11 +12619,11 @@ msgstr ""
 "las preferencias de las cabeceras de corroe IMAP y así ahorrar tiempo de "
 "descarga. Las cabeceras de correo IMAP son las siguientes:"
 
-#: C/evolution.xml:6311(title)
+#: C/evolution.xml:6305(title)
 msgid "All Headers:"
 msgstr "Todas las cabeceras:"
 
-#: C/evolution.xml:6312(para)
+#: C/evolution.xml:6306(para)
 msgid ""
 "This includes all the available IMAP Mail headers. By choosing this option, "
 "Evolution will download all the headers for all the messages."
@@ -12955,11 +12631,11 @@ msgstr ""
 "Esto incluye todas las cabeceras de correo IMAP disponibles. Eligiendo esta "
 "opción Evolution descargará todas las cabeceras de todos los mensajes."
 
-#: C/evolution.xml:6315(title)
+#: C/evolution.xml:6309(title)
 msgid "Basic Headers:"
 msgstr "Cabeceras básicas:"
 
-#: C/evolution.xml:6316(para)
+#: C/evolution.xml:6310(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -12973,11 +12649,11 @@ msgstr ""
 "en sus listas de correo, elija esta opción. Esto hará que Evolution trabaje "
 "más rápido y generalmente se recomienda para usuarios normales."
 
-#: C/evolution.xml:6319(title)
+#: C/evolution.xml:6313(title)
 msgid "Mailing List Headers:"
 msgstr "Cabeceras de las listas de correo:"
 
-#: C/evolution.xml:6320(para)
+#: C/evolution.xml:6314(para)
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
@@ -12992,7 +12668,7 @@ msgstr ""
 "correo, el propietario de la lista de correo y demás, con lo que puede crear "
 "un filtro para listas de correo."
 
-#: C/evolution.xml:6322(para)
+#: C/evolution.xml:6316(para)
 msgid ""
 "This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
@@ -13007,11 +12683,11 @@ msgstr ""
 "correo. Si no tiene ningún filtro en Evolution, se recomienda que cambie a "
 "la opción «Cabeceras básicas»."
 
-#: C/evolution.xml:6324(title)
+#: C/evolution.xml:6318(title)
 msgid "Custom Headers:"
 msgstr "Cabeceras personalizadas:"
 
-#: C/evolution.xml:6325(para)
+#: C/evolution.xml:6319(para)
 msgid ""
 "These are the extra headers in addition to the above standard headers. You "
 "can add custom headers in addition to the standard headers. If you want to "
@@ -13028,23 +12704,21 @@ msgstr ""
 "con la opción Cabeceras personalizadas. Aquí podrá seleccionar Añadir/Quitar "
 "cabeceras según sus necesidades."
 
-#: C/evolution.xml:6328(para)
-msgid ""
-"This option may not be needed if you have chosen to download ALL Headers."
+#: C/evolution.xml:6322(para)
+msgid "This option may not be needed if you have chosen to download ALL Headers."
 msgstr ""
 "Puede que esta opción no sea necesaria si ha elegido descargar Todas las "
 "cabeceras."
 
-#: C/evolution.xml:6330(para)
+#: C/evolution.xml:6324(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Para establecer las cabeceras de correo IMAP:"
 
-#: C/evolution.xml:6336(para)
+#: C/evolution.xml:6330(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
-msgstr ""
-"Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
+msgstr "Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
 
-#: C/evolution.xml:6339(para)
+#: C/evolution.xml:6333(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
@@ -13052,14 +12726,13 @@ msgstr ""
 "En el Editor de cuentas, pulse la solapa Cabeceras IMAP para abrir las "
 "Cabeceras IMAP en el Editor de cuentas."
 
-#: C/evolution.xml:6344(para)
-msgid ""
-"Click Fetch All Headers to download all the available header information."
+#: C/evolution.xml:6338(para)
+msgid "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Pulse Obtener todas las cabeceras para descargar toda la información "
 "disponible sobre las cabeceras."
 
-#: C/evolution.xml:6346(para)
+#: C/evolution.xml:6340(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -13067,25 +12740,25 @@ msgstr ""
 "Cuantas más cabeceras tenga más tiempo llevará descargarlas. No se "
 "recomienda esta opción."
 
-#: C/evolution.xml:6350(para)
+#: C/evolution.xml:6344(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr "Pulse Cabeceras básicas para descargar las cabeceras básicas."
 
-#: C/evolution.xml:6353(para)
+#: C/evolution.xml:6347(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Pulse Cabeceras básicas y de listas de correo predeterminadas para descargar "
 "ambas."
 
-#: C/evolution.xml:6356(para)
+#: C/evolution.xml:6350(para)
 msgid "Click Add to add any predefined custom headers."
 msgstr "Pulse Añadir para añadir cualquier cabecera predefinida."
 
-#: C/evolution.xml:6359(para)
+#: C/evolution.xml:6353(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Pulse Eliminar para eliminar las cabeceras personalizadas."
 
-#: C/evolution.xml:6366(para)
+#: C/evolution.xml:6360(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -13095,35 +12768,35 @@ msgstr ""
 "así como otros ajustes de representación del correo."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:6369(link) C/evolution.xml:6393(title)
+#: C/evolution.xml:6363(link) C/evolution.xml:6387(title)
 msgid "General Mail Settings"
 msgstr "Ajustes generales del correo"
 
-#: C/evolution.xml:6372(link) C/evolution.xml:6415(title)
+#: C/evolution.xml:6366(link) C/evolution.xml:6409(title)
 msgid "HTML Mail Preferences"
 msgstr "Preferencias del correo en HTML"
 
-#: C/evolution.xml:6375(link) C/evolution.xml:6433(title)
+#: C/evolution.xml:6369(link) C/evolution.xml:6427(title)
 msgid "Label Preferences"
 msgstr "Preferencias de las etiquetas"
 
-#: C/evolution.xml:6378(link) C/evolution.xml:6467(title)
+#: C/evolution.xml:6372(link) C/evolution.xml:6461(title)
 msgid "Mail Header Preferences"
 msgstr "Opciones de las cabeceras del correo"
 
-#: C/evolution.xml:6381(link) C/evolution.xml:6479(title)
+#: C/evolution.xml:6375(link) C/evolution.xml:6473(title)
 msgid "Junk Mail Preferences"
 msgstr "Opciones de correo spam"
 
-#: C/evolution.xml:6384(link) C/evolution.xml:6522(title)
+#: C/evolution.xml:6378(link) C/evolution.xml:6516(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Preferencias de los contactos automáticos"
 
-#: C/evolution.xml:6387(link) C/evolution.xml:6528(title)
+#: C/evolution.xml:6381(link) C/evolution.xml:6522(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6390(para)
+#: C/evolution.xml:6384(para)
 msgid ""
 "For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
@@ -13132,15 +12805,15 @@ msgstr ""
 "<link linkend=\"config-prefs-mail-identity\">Utilización de cuentas de "
 "correo</link>."
 
-#: C/evolution.xml:6394(para) C/evolution.xml:6550(para)
+#: C/evolution.xml:6388(para) C/evolution.xml:6544(para)
 msgid "The General page has the following options:"
 msgstr "La página General tiene las siguientes opciones:"
 
-#: C/evolution.xml:6396(title)
+#: C/evolution.xml:6390(title)
 msgid "Message Fonts:"
 msgstr "Tipografías del mensaje:"
 
-#: C/evolution.xml:6397(para)
+#: C/evolution.xml:6391(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
@@ -13151,11 +12824,11 @@ msgstr ""
 "las mismas tipografías que en otras aplicaciones y elija una tipografía "
 "estándar y otra de tamaño fijo."
 
-#: C/evolution.xml:6400(title)
+#: C/evolution.xml:6394(title)
 msgid "Message Display:"
 msgstr "Vista de los mensajes:"
 
-#: C/evolution.xml:6401(para)
+#: C/evolution.xml:6395(para)
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
 "highlight quotations, and the default encoding. Enable <guilabel>Fall back "
@@ -13181,7 +12854,7 @@ msgstr ""
 "aplicación externa. También puede activar la barra espaciadora mágica y las "
 "carpetas de búsqueda."
 
-#: C/evolution.xml:6403(para)
+#: C/evolution.xml:6397(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
 "Ctrl+T."
@@ -13189,11 +12862,11 @@ msgstr ""
 "Para agrupar mensajes por conversaciones, seleccione Ver &gt; Agrupar por "
 "conversaciones o pulse Ctrl +T."
 
-#: C/evolution.xml:6405(title)
+#: C/evolution.xml:6399(title)
 msgid "Deleting Mail:"
 msgstr "Borrar correo:"
 
-#: C/evolution.xml:6406(para)
+#: C/evolution.xml:6400(para)
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
@@ -13208,11 +12881,11 @@ msgstr ""
 "frecuencia para la eliminación: Cada vez, Una vez por día, Una vez por "
 "semana y Una vez por mes."
 
-#: C/evolution.xml:6409(title)
+#: C/evolution.xml:6403(title)
 msgid "New Mail Notifications:"
 msgstr "Notificaciones de correo nuevo:"
 
-#: C/evolution.xml:6410(para)
+#: C/evolution.xml:6404(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -13223,23 +12896,23 @@ msgstr ""
 "ninguno, tal como prefiera. Puede elegir no notificar la llegada de correo "
 "nuevo."
 
-#: C/evolution.xml:6416(para)
+#: C/evolution.xml:6410(para)
 msgid "The HTML Mail page has the following options:"
 msgstr "La página Correo HTML tiene las siguientes opciones:"
 
-#: C/evolution.xml:6418(title)
+#: C/evolution.xml:6412(title)
 msgid "Show Image Animations:"
 msgstr "Mostrar imágenes animadas:"
 
-#: C/evolution.xml:6419(para)
+#: C/evolution.xml:6413(para)
 msgid "Turns image animation (e.g. GIF files) on or off."
 msgstr "Activar o desactivar las animaciones (ej. archivos GIF)."
 
-#: C/evolution.xml:6422(title)
+#: C/evolution.xml:6416(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr "Preguntar al mandar mensajes HTML a contactos que no los quieren:"
 
-#: C/evolution.xml:6423(para)
+#: C/evolution.xml:6417(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -13250,11 +12923,11 @@ msgstr ""
 "HTML a personas a las que previamente ha anotado en su libreta de "
 "direcciones que no quieren recibirlo."
 
-#: C/evolution.xml:6426(title)
+#: C/evolution.xml:6420(title)
 msgid "Loading Images:"
 msgstr "Cargar imágenes:"
 
-#: C/evolution.xml:6427(para)
+#: C/evolution.xml:6421(para)
 msgid ""
 "You can embed a image in an email and have it load only when the message "
 "arrives. However, spammers can use image loading patterns to confirm "
@@ -13269,7 +12942,7 @@ msgstr ""
 "carguen las imágenes automáticamente, hacerlo solamente si el remitente está "
 "en su libreta de direcciones o cargarlas siempre."
 
-#: C/evolution.xml:6429(para)
+#: C/evolution.xml:6423(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
@@ -13279,7 +12952,7 @@ msgstr ""
 "imágenes en cada mensaje seleccionando Ver &gt; Cargar imágenes o pulsando "
 "Ctrl+I."
 
-#: C/evolution.xml:6434(para)
+#: C/evolution.xml:6428(para)
 msgid ""
 "The Label preferences option lets you add color labels for different kinds "
 "of messages. You can add, edit, or remove the labels. You can also assign "
@@ -13289,47 +12962,46 @@ msgstr ""
 "color para diferentes tipos de mensajes. Puede añadir, editar o eliminar las "
 "etiquetas. También puede asignar colores a cada etiqueta que haya creado."
 
-#: C/evolution.xml:6436(para)
+#: C/evolution.xml:6430(para)
 msgid "To create a label:"
 msgstr "Para crear una etiqueta:"
 
-#: C/evolution.xml:6439(para)
+#: C/evolution.xml:6433(para)
 msgid "Click Add and specify the name in the Label Name dialog box."
 msgstr ""
 "Pulse Añadir y especifique el nombre en la caja de diálogo Nombre de la "
 "etiqueta."
 
-#: C/evolution.xml:6442(para)
+#: C/evolution.xml:6436(para)
 msgid "Click the color tab and select a color, then click OK."
 msgstr "Pulse la solapa de color y seleccione el color, después pulse Aceptar."
 
-#: C/evolution.xml:6445(para)
+#: C/evolution.xml:6439(para)
 msgid "To edit label properties:"
 msgstr "Para editar las propiedades de la etiqueta:"
 
-#: C/evolution.xml:6448(para)
+#: C/evolution.xml:6442(para)
 msgid "Select the label and click Edit."
 msgstr "Seleccione la etiqueta y pulse Editar."
 
-#: C/evolution.xml:6451(para)
+#: C/evolution.xml:6445(para)
 msgid "Edit name and color, then click OK."
 msgstr "Edite el nombre y color, después pulse Aceptar."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:6454(para)
+#: C/evolution.xml:6448(para)
 msgid "To assign a label to a specific email message:"
 msgstr "Para asignar una etiqueta a un mensaje de correo-e específico:"
 
-#: C/evolution.xml:6457(para)
+#: C/evolution.xml:6451(para)
 msgid "Right-click the message from the message preview."
-msgstr ""
-"Pulse con el botón derecho sobre el mensaje desde la vista previa del mismo."
+msgstr "Pulse con el botón derecho sobre el mensaje desde la vista previa del mismo."
 
-#: C/evolution.xml:6460(para)
+#: C/evolution.xml:6454(para)
 msgid "Click Label and select the desired label for the message."
 msgstr "Pulse Etiqueta y seleccione la etiqueta deseada para el mensaje."
 
-#: C/evolution.xml:6468(para)
+#: C/evolution.xml:6462(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -13344,11 +13016,11 @@ msgstr ""
 "puede añadir o quitar cabeceras a la lista. Las cabeceras predeterminadas no "
 "se pueden eliminar."
 
-#: C/evolution.xml:6470(title)
+#: C/evolution.xml:6464(title)
 msgid "Sender Photograph:"
 msgstr "Foto del remitente:"
 
-#: C/evolution.xml:6471(para)
+#: C/evolution.xml:6465(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -13356,7 +13028,7 @@ msgstr ""
 "Esta característica añade soporte para ver la fotografía del remitente en la "
 "parte derecha del panel de vista preliminar."
 
-#: C/evolution.xml:6473(para)
+#: C/evolution.xml:6467(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -13367,7 +13039,7 @@ msgstr ""
 "vista preliminar del correo-e. Deseleccione esta opción para desactivar esta "
 "característica."
 
-#: C/evolution.xml:6474(para)
+#: C/evolution.xml:6468(para)
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
 "autocompletion. If you deselect the option <guilabel>Search for sender "
@@ -13388,7 +13060,7 @@ msgstr ""
 "tomará el primer contacto independientemente de que tenga o no una "
 "fotografía."
 
-#: C/evolution.xml:6475(para)
+#: C/evolution.xml:6469(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -13396,7 +13068,7 @@ msgstr ""
 "Esta característica está desactivada de forma predeterminada ya que causa "
 "retraso al obtener los correos."
 
-#: C/evolution.xml:6480(para)
+#: C/evolution.xml:6474(para)
 msgid ""
 "You can check your incoming messages for junk content by using Bogofilter "
 "and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
@@ -13407,15 +13079,15 @@ msgstr ""
 "Debeactivar los respectivos complementos de SPAM para activar el filtro de "
 "SPAM."
 
-#: C/evolution.xml:6481(para)
+#: C/evolution.xml:6475(para)
 msgid "To enable Junk plugins:"
 msgstr "Activar complementos anti SPAM:"
 
-#: C/evolution.xml:6484(para)
+#: C/evolution.xml:6478(para)
 msgid "Select Edit &gt; Plugins"
 msgstr "Seleccione Editar &gt; Complementos"
 
-#: C/evolution.xml:6487(para)
+#: C/evolution.xml:6481(para)
 msgid ""
 "Select the junk plugins you want. You can select either Bogofilter or "
 "SpamAssassin, or you can select both."
@@ -13423,11 +13095,11 @@ msgstr ""
 "Seleccione los complementos de filtro de SPAM que quiera. Puede seleccionar "
 "tanto Bogofilter como SpamAssasin, o puede seleccionar los dos."
 
-#: C/evolution.xml:6491(title)
+#: C/evolution.xml:6485(title)
 msgid "General:"
 msgstr "General:"
 
-#: C/evolution.xml:6492(para)
+#: C/evolution.xml:6486(para)
 msgid ""
 "You can check incoming email for junk contents and also decide how often you "
 "want to delete junk mail. You also have the option to choose either "
@@ -13437,20 +13109,19 @@ msgstr ""
 "frecuencia quiere borrar el correo basura. También tiene la opción de elegir "
 "entre SpamAssasin, Bogofilter o ambos."
 
-#: C/evolution.xml:6495(title)
+#: C/evolution.xml:6489(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Detectar si el correo entrante es spam:"
 
-#: C/evolution.xml:6496(para)
+#: C/evolution.xml:6490(para)
 msgid "This option turns automatic junk mail filtering on or off."
-msgstr ""
-"Esta opción activa los filtros de comprobación automática de correo basura."
+msgstr "Esta opción activa los filtros de comprobación automática de correo basura."
 
-#: C/evolution.xml:6499(title)
+#: C/evolution.xml:6493(title)
 msgid "Delete junk mail on exit:"
 msgstr "Borrar los correos SPAM al salir:"
 
-#: C/evolution.xml:6500(para)
+#: C/evolution.xml:6494(para)
 msgid ""
 "This option deletes junk messages when you exit. You can also specify when "
 "to delete the junk messages (every time, once per day, once per week, once "
@@ -13460,11 +13131,11 @@ msgstr ""
 "cuándo se deben borrar los correos basura de las opciones (Cada vez, Una vez "
 "por día, Una vez por semana, Una vez por mes)."
 
-#: C/evolution.xml:6503(title)
+#: C/evolution.xml:6497(title)
 msgid "Default junk plugin:"
 msgstr "Complemento spam predeterminado:"
 
-#: C/evolution.xml:6504(para)
+#: C/evolution.xml:6498(para)
 msgid ""
 "Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
 "can view them only if you have enabled the respective plugins. When you "
@@ -13476,11 +13147,11 @@ msgstr ""
 "Cuando seleccione cualquier opción, también le informa si el binario "
 "correspondiente está disponible o no."
 
-#: C/evolution.xml:6508(title)
+#: C/evolution.xml:6502(title)
 msgid "SpamAssassin Options:"
 msgstr "Opciones de SpamAssasin:"
 
-#: C/evolution.xml:6509(para)
+#: C/evolution.xml:6503(para)
 msgid ""
 "Remote Test performs junk mail filtering on remote servers. It also includes "
 "online tests, like checking for blacklisted message senders and ISPs."
@@ -13489,7 +13160,7 @@ msgstr ""
 "También incluyen pruebas en línea como comprobación de remitentes e ISP en "
 "listas negras."
 
-#: C/evolution.xml:6511(para)
+#: C/evolution.xml:6505(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
@@ -13506,11 +13177,11 @@ msgstr ""
 "eficacia. Cuando seleccione esta opción, no necesitará ninguna configuración "
 "adicional para que funcione."
 
-#: C/evolution.xml:6513(title)
+#: C/evolution.xml:6507(title)
 msgid "Bogofilter Options:"
 msgstr "Opciones de Bogofilter:"
 
-#: C/evolution.xml:6514(para)
+#: C/evolution.xml:6508(para)
 msgid ""
 "Select Convert mail text to Unicode to enable Unicode* filtering. For more "
 "information on Bogofilter, see the <ulink url=\"http://bogofilter."
@@ -13521,7 +13192,7 @@ msgstr ""
 "consulte el <ulink url=\"http://bogofilter.sourceforge.net/\">sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:6517(para)
+#: C/evolution.xml:6511(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
 "Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
@@ -13534,7 +13205,7 @@ msgstr ""
 "bajo Editar &gt; Preferencias &gt; Opciones de correo &gt; SPAM &gt; General "
 "se refiere sólo al correo POP y Correo local."
 
-#: C/evolution.xml:6523(para)
+#: C/evolution.xml:6517(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13545,7 +13216,7 @@ msgstr ""
 "direcciones. Puede seleccionar la libreta de direcciones predeterminada para "
 "los contactos automáticos de la lista."
 
-#: C/evolution.xml:6524(para)
+#: C/evolution.xml:6518(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13557,7 +13228,7 @@ msgstr ""
 "Actualmente esto sólo funciona con Pidgin. Su libreta de direcciones no debe "
 "ser de sólo lectura para que ambas características funcionen correctamente."
 
-#: C/evolution.xml:6529(para)
+#: C/evolution.xml:6523(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13566,7 +13237,7 @@ msgstr ""
 "También le permite seleccionar calendarios para buscar conflictos entre "
 "reuniones."
 
-#: C/evolution.xml:6535(para)
+#: C/evolution.xml:6529(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
 "composer preferences. The General tab covers assorted behavior, the "
@@ -13578,19 +13249,19 @@ msgstr ""
 "configurar el comportamiento, la solapa Firma le permite establecer su firma "
 "y la solapa Ortografía controla la corrección ortográfica."
 
-#: C/evolution.xml:6541(link) C/evolution.xml:6581(title)
+#: C/evolution.xml:6535(link) C/evolution.xml:6575(title)
 msgid "Signature"
 msgstr "Firma"
 
-#: C/evolution.xml:6544(link) C/evolution.xml:6586(title)
+#: C/evolution.xml:6538(link) C/evolution.xml:6580(title)
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: C/evolution.xml:6552(title)
+#: C/evolution.xml:6546(title)
 msgid "Default Behavior:"
 msgstr "Comportamiento predeterminado:"
 
-#: C/evolution.xml:6553(para)
+#: C/evolution.xml:6547(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13600,7 +13271,7 @@ msgstr ""
 "caracteres usará, si desea utilizar el formato HTML y en ese caso, si desea "
 "utilizar emoticones."
 
-#: C/evolution.xml:6555(para)
+#: C/evolution.xml:6549(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13610,11 +13281,11 @@ msgstr ""
 "citado. Elija la forma de responder de la lista desplegable: Citar el "
 "mensaje original, No citar el mensaje original, Adjuntar mensaje original."
 
-#: C/evolution.xml:6557(title)
+#: C/evolution.xml:6551(title)
 msgid "Top Posting Options:"
 msgstr "Opciones de publicar por encima:"
 
-#: C/evolution.xml:6558(para)
+#: C/evolution.xml:6552(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13629,28 +13300,27 @@ msgstr ""
 "del correo electrónico."
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6561(title) C/evolution.xml:6634(title)
+#: C/evolution.xml:6555(title) C/evolution.xml:6628(title)
 msgid "Alerts:"
 msgstr "Alertas:"
 
-#: C/evolution.xml:6562(para)
+#: C/evolution.xml:6556(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Hay dos alertas opcionales que puede seleccionar:"
 
-#: C/evolution.xml:6567(title)
+#: C/evolution.xml:6561(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Preguntar al mandar mensajes con el asunto vacío:"
 
-#: C/evolution.xml:6568(para)
+#: C/evolution.xml:6562(para)
 msgid "The composer warns you if you try to send a message without a subject."
-msgstr ""
-"El editor muestra una advertencia si intenta enviar un mensaje sin asunto."
+msgstr "El editor muestra una advertencia si intenta enviar un mensaje sin asunto."
 
-#: C/evolution.xml:6573(title)
+#: C/evolution.xml:6567(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr "Preguntar al mandar mensajes que sólo tengan definido Cco:"
 
-#: C/evolution.xml:6574(para)
+#: C/evolution.xml:6568(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -13662,7 +13332,7 @@ msgstr ""
 "correo sólo aceptarán copias ocultas cuando el mensaje contiene al menos un "
 "destinatario visible para todos los lectores."
 
-#: C/evolution.xml:6582(para)
+#: C/evolution.xml:6576(para)
 msgid ""
 "The signature editor allows you to create several different signatures in "
 "plain text or in HTML, and to specify which of them will be added to email "
@@ -13675,7 +13345,7 @@ msgstr ""
 "una firma alternativa, o no utilizar ninguna, desde el propio editor de "
 "correo."
 
-#: C/evolution.xml:6587(para)
+#: C/evolution.xml:6581(para)
 msgid ""
 "To choose a spell-checking language, select it here. You must install gnome-"
 "spell, aspell, and an aspell language package (like for example aspell-en "
@@ -13694,56 +13364,56 @@ msgstr ""
 "ortografía mientras se escribe. Puede ajustar el color de las palabras mal "
 "escritas."
 
-#: C/evolution.xml:6594(para)
+#: C/evolution.xml:6588(para)
 msgid "The calendar configuration tool has several pages:"
 msgstr "La herramienta de configuración del calendario tiene varias páginas:"
 
-#: C/evolution.xml:6600(link) C/evolution.xml:6640(title)
+#: C/evolution.xml:6594(link) C/evolution.xml:6634(title)
 msgid "Display"
 msgstr "Mostrar"
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6603(link) C/evolution.xml:6673(title)
+#: C/evolution.xml:6597(link) C/evolution.xml:6667(title)
 msgid "Alarms"
 msgstr "Alertas"
 
-#: C/evolution.xml:6606(link) C/evolution.xml:6686(title)
+#: C/evolution.xml:6600(link) C/evolution.xml:6680(title)
 msgid "Calendar Publishing"
 msgstr "Publicar el calendario"
 
-#: C/evolution.xml:6612(para)
+#: C/evolution.xml:6606(para)
 msgid "The General page lets you set the following options:"
 msgstr "La página General le permite establecer los siguientes valores:"
 
-#: C/evolution.xml:6614(title)
+#: C/evolution.xml:6608(title)
 msgid "Time Zone:"
 msgstr "Zona horaria:"
 
-#: C/evolution.xml:6615(para)
+#: C/evolution.xml:6609(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr "La ciudad en la que se encuentra, para calcular su zona horaria."
 
-#: C/evolution.xml:6618(title)
+#: C/evolution.xml:6612(title)
 msgid "Time Format:"
 msgstr "Formato de la hora:"
 
-#: C/evolution.xml:6619(para)
+#: C/evolution.xml:6613(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Elija entre el formato de doce horas (AM/PM) o de veinticuatro horas."
 
-#: C/evolution.xml:6622(title)
+#: C/evolution.xml:6616(title)
 msgid "Week Starts:"
 msgstr "La semana empieza en:"
 
-#: C/evolution.xml:6623(para)
+#: C/evolution.xml:6617(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Seleccione el día a mostrar como el primer día de cada semana."
 
-#: C/evolution.xml:6626(title)
+#: C/evolution.xml:6620(title)
 msgid "Day Begins:"
 msgstr "El día comienza a las:"
 
-#: C/evolution.xml:6627(para)
+#: C/evolution.xml:6621(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
 "select your preferred hours."
@@ -13751,15 +13421,15 @@ msgstr ""
 "Para Evolution, un día normal de trabajo comienza a las 9 horas y termina a "
 "las 17 horas. Puede seleccionar su horario de trabajo preferido."
 
-#: C/evolution.xml:6630(title)
+#: C/evolution.xml:6624(title)
 msgid "Day Ends:"
 msgstr "El día acaba a las:"
 
-#: C/evolution.xml:6631(para)
+#: C/evolution.xml:6625(para)
 msgid "Sets the end of a normal workday."
 msgstr "Establece el final de un día de trabajo normal."
 
-#: C/evolution.xml:6635(para)
+#: C/evolution.xml:6629(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -13767,7 +13437,7 @@ msgstr ""
 "Active las casillas si desea mostrar una advertencia antes de eliminar "
 "cualquier cita, o recibir recordatorios automáticos para cada acontecimiento."
 
-#: C/evolution.xml:6641(para)
+#: C/evolution.xml:6635(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -13775,11 +13445,11 @@ msgstr ""
 "La sección Vista sirve para elegir la presentación de sus citas y tareas "
 "dentro del calendario."
 
-#: C/evolution.xml:6643(title)
+#: C/evolution.xml:6637(title)
 msgid "Time Divisions:"
 msgstr "Divisiones de horas:"
 
-#: C/evolution.xml:6644(para)
+#: C/evolution.xml:6638(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -13787,12 +13457,11 @@ msgstr ""
 "Establece el incremento de tiempo mostrado como líneas finas en la vista "
 "diaria del calendario."
 
-#: C/evolution.xml:6647(title)
+#: C/evolution.xml:6641(title)
 msgid "Show appointment end times in week and month views:"
-msgstr ""
-"Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
+msgstr "Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
 
-#: C/evolution.xml:6648(para)
+#: C/evolution.xml:6642(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -13800,11 +13469,11 @@ msgstr ""
 "Si hay espacio suficiente, el cliente Evolution mostrará las horas finales "
 "en las vistas semanales y mensajes para cada cita."
 
-#: C/evolution.xml:6651(title)
+#: C/evolution.xml:6645(title)
 msgid "Compress weekends in month view:"
 msgstr "Comprimir fines de semana en la vista mensual:"
 
-#: C/evolution.xml:6652(para)
+#: C/evolution.xml:6646(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -13812,37 +13481,37 @@ msgstr ""
 "Seleccione esta opción para mostrar los fines de semana en una caja en lugar "
 "de dos en la vista mensual."
 
-#: C/evolution.xml:6655(title)
+#: C/evolution.xml:6649(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Muestra los números de las semanas en el navegador de fechas:"
 
-#: C/evolution.xml:6656(para)
+#: C/evolution.xml:6650(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 "Muestra los números de la semana junto a las respectivas semanas en el "
 "calendario."
 
-#: C/evolution.xml:6659(title)
+#: C/evolution.xml:6653(title)
 msgid "Tasks due today:"
 msgstr "Tareas que vencen hoy:"
 
-#: C/evolution.xml:6660(para)
+#: C/evolution.xml:6654(para)
 msgid "Select the color for tasks due today."
 msgstr "Establece el color para las tareas que vencen hoy."
 
-#: C/evolution.xml:6663(title)
+#: C/evolution.xml:6657(title)
 msgid "Overdue tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:6664(para)
+#: C/evolution.xml:6658(para)
 msgid "Select the color for overdue tasks."
 msgstr "Establece el color para las tareas vencidas."
 
-#: C/evolution.xml:6667(title)
+#: C/evolution.xml:6661(title)
 msgid "Hide completed tasks after:"
 msgstr "Ocultar las tareas completadas tras:"
 
-#: C/evolution.xml:6668(para)
+#: C/evolution.xml:6662(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -13853,11 +13522,11 @@ msgstr ""
 "opción, las tareas completadas se mantendrán en su lista de tareas, marcadas "
 "como completadas."
 
-#: C/evolution.xml:6675(title)
+#: C/evolution.xml:6669(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Seleccionar los calendarios para las notificaciones de alerta:"
 
-#: C/evolution.xml:6676(para)
+#: C/evolution.xml:6670(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -13867,15 +13536,15 @@ msgstr ""
 "Si no selecciona el calendario no tendrça notificaciones de alerta para "
 "ningún acontecimiento en este calendario."
 
-#: C/evolution.xml:6681(title)
+#: C/evolution.xml:6675(title)
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: C/evolution.xml:6688(title)
+#: C/evolution.xml:6682(title)
 msgid "Publishing:"
 msgstr "Publicación:"
 
-#: C/evolution.xml:6689(para)
+#: C/evolution.xml:6683(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -13886,7 +13555,7 @@ msgstr ""
 "publicación, la frecuencia de publicación, qué calendario publicará y cómo "
 "qué persona autenticarse."
 
-#: C/evolution.xml:6696(para)
+#: C/evolution.xml:6690(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -13898,11 +13567,11 @@ msgstr ""
 "una conexión cifrada o firmar un mensaje confirmando su identidad al "
 "contacto. Estos ajustes sólo se aplican al cifrado S/MIME."
 
-#: C/evolution.xml:6698(title)
+#: C/evolution.xml:6692(title)
 msgid "Your Certificates:"
 msgstr "Sus certificados:"
 
-#: C/evolution.xml:6699(para)
+#: C/evolution.xml:6693(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
 "own. You can import, view and delete your certificates from this page."
@@ -13911,11 +13580,11 @@ msgstr ""
 "certificados que posee. Desde esta página puede importar, ver y borrar sus "
 "certificados."
 
-#: C/evolution.xml:6702(title)
+#: C/evolution.xml:6696(title)
 msgid "Contact Certificates:"
 msgstr "Certificados de los contactos:"
 
-#: C/evolution.xml:6703(para)
+#: C/evolution.xml:6697(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -13928,11 +13597,11 @@ msgstr ""
 "página puede importar, ver, respaldar y borrar los certificados de sus "
 "contactos."
 
-#: C/evolution.xml:6706(title)
+#: C/evolution.xml:6700(title)
 msgid "Authorities:"
 msgstr "Autoridades:"
 
-#: C/evolution.xml:6707(para)
+#: C/evolution.xml:6701(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -13943,68 +13612,67 @@ msgstr ""
 "es válido. Puede importar, ver, editar y borrar las autoridades de "
 "certificados desde esta página."
 
-#: C/evolution.xml:6713(para)
+#: C/evolution.xml:6707(para)
 msgid "There are two main tasks for configuring contact information:"
-msgstr ""
-"Existen dos tareas principales para configurar la información de un contacto:"
+msgstr "Existen dos tareas principales para configurar la información de un contacto:"
 
-#: C/evolution.xml:6716(link) C/evolution.xml:6724(title)
+#: C/evolution.xml:6710(link) C/evolution.xml:6718(title)
 msgid "Creating a Contact"
 msgstr "Crear un contacto"
 
-#: C/evolution.xml:6719(link) C/evolution.xml:6746(title)
+#: C/evolution.xml:6713(link) C/evolution.xml:6740(title)
 msgid "Creating an Address Book"
 msgstr "Crear una libreta de direcciones"
 
-#: C/evolution.xml:6725(para)
+#: C/evolution.xml:6719(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr "Para añadir una nueva lista de contactos, local o remota:"
 
-#: C/evolution.xml:6728(para)
+#: C/evolution.xml:6722(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Pulse Contactos en el Selector."
 
-#: C/evolution.xml:6731(para)
+#: C/evolution.xml:6725(para)
 msgid "Click the down-arrow next to New."
 msgstr "Pulse la flecha abajo junto a Nuevo."
 
-#: C/evolution.xml:6734(para)
+#: C/evolution.xml:6728(para)
 msgid "Select Contact List."
 msgstr "Seleccione una lista de contactos."
 
-#: C/evolution.xml:6737(para)
+#: C/evolution.xml:6731(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Escriba un nombre y un lugar para la libreta de direcciones."
 
-#: C/evolution.xml:6749(para)
+#: C/evolution.xml:6743(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Libreta de direcciones."
 
-#: C/evolution.xml:6752(para)
+#: C/evolution.xml:6746(para)
 msgid "Select the type of Address Book."
 msgstr "Seleccione el tipo de libreta de direcciones."
 
-#: C/evolution.xml:6754(title)
+#: C/evolution.xml:6748(title)
 msgid "On This Computer:"
 msgstr "En este equipo:"
 
-#: C/evolution.xml:6755(para)
+#: C/evolution.xml:6749(para)
 msgid "Creates a local address book on the computer."
 msgstr "Crea una libreta de direcciones local en el equipo."
 
-#: C/evolution.xml:6758(title)
+#: C/evolution.xml:6752(title)
 msgid "On LDAP Server:"
 msgstr "En un servidor LDAP:"
 
-#: C/evolution.xml:6759(para)
+#: C/evolution.xml:6753(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Crea una libreta de direcciones en el servidor LDAP."
 
-#: C/evolution.xml:6762(title)
+#: C/evolution.xml:6756(title)
 msgid "Specific Account:"
 msgstr "Cuenta específica:"
 
-#: C/evolution.xml:6763(para)
+#: C/evolution.xml:6757(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -14012,7 +13680,7 @@ msgstr ""
 "Si tiene una cuenta que le permite crear una libreta de direcciones en ese "
 "servidor, puede seleccionar esa cuenta."
 
-#: C/evolution.xml:6767(para)
+#: C/evolution.xml:6761(para)
 msgid ""
 "If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
@@ -14021,7 +13689,7 @@ msgstr ""
 "direcciones y elija dónde quiere que se almacene su nueva libreta de "
 "direcciones como su carpeta predeterminada."
 
-#: C/evolution.xml:6769(para)
+#: C/evolution.xml:6763(para)
 msgid ""
 "If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
 "server, enter the server information as requested by the assistant:"
@@ -14030,19 +13698,19 @@ msgstr ""
 "\"ldap\">LDAP</link>, introduzca la información del servidor solicitada por "
 "el asistente:"
 
-#: C/evolution.xml:6771(title)
+#: C/evolution.xml:6765(title)
 msgid "Server Name:"
 msgstr "Nombre del servidor:"
 
-#: C/evolution.xml:6772(para)
+#: C/evolution.xml:6766(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "La dirección de internet del servidor de contactos que está usando."
 
-#: C/evolution.xml:6775(title)
+#: C/evolution.xml:6769(title)
 msgid "Login Method:"
 msgstr "Método de inicio de sesión:"
 
-#: C/evolution.xml:6776(para)
+#: C/evolution.xml:6770(para)
 msgid ""
 "Specify whether your login is anonymous, uses an email address, or uses a "
 "distinguished name. If the login is not anonymous, specify the email address "
@@ -14053,11 +13721,11 @@ msgstr ""
 "sesión anónimo, especifique la dirección de correo-e o el «nombre "
 "distinguido» (DN) requerido por el servidor."
 
-#: C/evolution.xml:6779(title)
+#: C/evolution.xml:6773(title)
 msgid "Port:"
 msgstr "Puerto:"
 
-#: C/evolution.xml:6780(para)
+#: C/evolution.xml:6774(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -14065,11 +13733,11 @@ msgstr ""
 "El puerto de Internet al que se conecta Evolution para acceder a la base de "
 "datos LDAP. Normalmente es el puerto 389."
 
-#: C/evolution.xml:6783(title)
+#: C/evolution.xml:6777(title)
 msgid "Use SSL/TLS:"
 msgstr "Usar SSL/TLS:"
 
-#: C/evolution.xml:6784(para)
+#: C/evolution.xml:6778(para)
 msgid ""
 "SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
 "will send your password unencrypted. By using SSL or TLS, a secure "
@@ -14079,11 +13747,11 @@ msgstr ""
 "enviará su contraseña sin cifrar. Usando SSL o TSL se usará una conexión "
 "segura y su contraseña se enviará cifrada."
 
-#: C/evolution.xml:6787(title)
+#: C/evolution.xml:6781(title)
 msgid "Details: Search Base:"
 msgstr "Detalles: Base de búsqueda:"
 
-#: C/evolution.xml:6788(para)
+#: C/evolution.xml:6782(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -14093,11 +13761,11 @@ msgstr ""
 "punto de partida utilizado para las búsquedas en directorios. Consulte a su "
 "administrador para obtener información acerca de los ajustes adecuados."
 
-#: C/evolution.xml:6791(title)
+#: C/evolution.xml:6785(title)
 msgid "Search Scope:"
 msgstr "Rango de búsqueda:"
 
-#: C/evolution.xml:6792(para)
+#: C/evolution.xml:6786(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -14105,27 +13773,27 @@ msgstr ""
 "El <glossterm linkend=\"search-scope\">rango de búsqueda</glossterm> es la "
 "extensión de una búsqueda dada. Están disponibles las siguientes:"
 
-#: C/evolution.xml:6797(title)
+#: C/evolution.xml:6791(title)
 msgid "One:"
 msgstr "Uno:"
 
-#: C/evolution.xml:6798(para)
+#: C/evolution.xml:6792(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr "Busca dentro de la raíz y un nivel de subdirectorios."
 
-#: C/evolution.xml:6803(title)
+#: C/evolution.xml:6797(title)
 msgid "Sub:"
 msgstr "Sub:"
 
-#: C/evolution.xml:6804(para)
+#: C/evolution.xml:6798(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr "Busca dentro de la raíz y en todos los subdirectorios."
 
-#: C/evolution.xml:6809(title)
+#: C/evolution.xml:6803(title)
 msgid "Timeout (minutes):"
 msgstr "Tiempo de expiración (minutos):"
 
-#: C/evolution.xml:6810(para)
+#: C/evolution.xml:6804(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -14133,11 +13801,11 @@ msgstr ""
 "Es el tiempo de espera máximo para descargar los datos del servidor, antes "
 "de abandonar."
 
-#: C/evolution.xml:6815(title)
+#: C/evolution.xml:6809(title)
 msgid "Download Limit:"
 msgstr "Límite de descarga:"
 
-#: C/evolution.xml:6816(para)
+#: C/evolution.xml:6810(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -14147,11 +13815,11 @@ msgstr ""
 "aceptan enviar más de 500 respuestas, pero puede fijar un número inferior "
 "para reducir el volumen de descargas, en caso de búsquedas muy amplias."
 
-#: C/evolution.xml:6821(title)
+#: C/evolution.xml:6815(title)
 msgid "Display Name:"
 msgstr "Nombre a mostrar:"
 
-#: C/evolution.xml:6822(para)
+#: C/evolution.xml:6816(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
@@ -14159,18 +13827,17 @@ msgstr ""
 "Este es el nombre que quiere usar como etiqueta para esta carpeta. Puede ser "
 "cualquier nombre que elija."
 
-#: C/evolution.xml:6827(title)
+#: C/evolution.xml:6821(title)
 msgid "Search Filter:"
 msgstr "Filtro de búsquedas:"
 
-#: C/evolution.xml:6828(para)
-msgid ""
-"The search filter can be set here for all the LDAP queries. For example:"
+#: C/evolution.xml:6822(para)
+msgid "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Se puede establecer aquí el filtro de búsqueda para todas las consultas "
 "LDAP. Por ejemplo:"
 
-#: C/evolution.xml:6830(para)
+#: C/evolution.xml:6824(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
 "only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
@@ -14183,7 +13850,7 @@ msgstr ""
 "de contactos. (&amp;(mail=*)(ObjectClass=*)): Lista los objetos asociados "
 "con las direcciones de correo-e."
 
-#: C/evolution.xml:6832(para)
+#: C/evolution.xml:6826(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -14191,7 +13858,7 @@ msgstr ""
 "Si cambia cualquier configuración de la libreta de direcciones LDAP deberá "
 "reiniciar Evolution y Evolution Data Server para que puedan ver los cambios."
 
-#: C/evolution.xml:6835(para)
+#: C/evolution.xml:6829(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -14202,7 +13869,7 @@ msgstr ""
 "direcciones se almacene localmente cuando esté desconectado, y si quiere que "
 "la libreta de direcciones sea su carpeta predeterminada."
 
-#: C/evolution.xml:6846(para)
+#: C/evolution.xml:6840(para)
 msgid ""
 "Evolution allows you to view the error logs and set the display duration for "
 "the error messages that appear in the statusbar. When an error occurs, "
@@ -14214,20 +13881,19 @@ msgstr ""
 "barra de estado muestra el mensaje de error durante el tiempo especificado y "
 "después el mensaje se mueve al archivo de depuración."
 
-#: C/evolution.xml:6849(para)
+#: C/evolution.xml:6843(para)
 msgid "From the Help menu, select Debug Logs."
 msgstr "Desde el menú Ayuda seleccione la Depuración de sucesos."
 
-#: C/evolution.xml:6853(para)
+#: C/evolution.xml:6847(para)
 msgid "Specify the display duration for the error messages."
 msgstr "Especifique la duración del mostrado de los mensajes de error."
 
-#: C/evolution.xml:6854(para)
+#: C/evolution.xml:6848(para)
 msgid "The messages remain in the statusbar for this specified time."
-msgstr ""
-"El mensaje permanece en la barra de estado durante el tiempo especificado."
+msgstr "El mensaje permanece en la barra de estado durante el tiempo especificado."
 
-#: C/evolution.xml:6858(para)
+#: C/evolution.xml:6852(para)
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
 "> icon indicates that the error message is a warning. The <inlinegraphic "
@@ -14239,7 +13905,7 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> se "
 "muestra con un mensaje «para-su-información»."
 
-#: C/evolution.xml:6865(para)
+#: C/evolution.xml:6859(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
@@ -14253,19 +13919,19 @@ msgstr ""
 "sólo soporta dispositivos Palm OS como PalmPilot* y Handspring Visor. "
 "Tercero, debe decidir que tipo de sincronización quiere."
 
-#: C/evolution.xml:6868(link) C/evolution.xml:6879(title)
+#: C/evolution.xml:6862(link) C/evolution.xml:6873(title)
 msgid "Enabling Synchronization"
 msgstr "Activar la sincronización"
 
-#: C/evolution.xml:6871(link) C/evolution.xml:6884(title)
+#: C/evolution.xml:6865(link) C/evolution.xml:6878(title)
 msgid "Selecting Conduits"
 msgstr "Seleccionar un conducto"
 
-#: C/evolution.xml:6874(link) C/evolution.xml:6907(title)
+#: C/evolution.xml:6868(link) C/evolution.xml:6901(title)
 msgid "Synchronizing Information"
 msgstr "Sincronizar la información"
 
-#: C/evolution.xml:6880(para)
+#: C/evolution.xml:6874(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
@@ -14288,7 +13954,7 @@ msgstr ""
 "crean dos nodos de dispositivo, ttyUSB0 y ttyUSB1. El segundo nodo es el que "
 "se debe usar al configurar el dispositivo."
 
-#: C/evolution.xml:6885(para)
+#: C/evolution.xml:6879(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -14305,7 +13971,7 @@ msgstr ""
 "libreta de direcciones, ECalendar, para el calendario y ETodo, para la lista "
 "de tareas."
 
-#: C/evolution.xml:6886(para)
+#: C/evolution.xml:6880(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -14315,19 +13981,19 @@ msgstr ""
 "vez activado. Las opciones pueden variar en función del conducto, pero "
 "habitualmente son las siguientes:"
 
-#: C/evolution.xml:6888(title)
+#: C/evolution.xml:6882(title)
 msgid "Disabled:"
 msgstr "Deshabilitado:"
 
-#: C/evolution.xml:6889(para)
+#: C/evolution.xml:6883(para)
 msgid "Do nothing."
 msgstr "No hacer nada."
 
-#: C/evolution.xml:6892(title)
+#: C/evolution.xml:6886(title)
 msgid "Synchronize:"
 msgstr "Sincronizar:"
 
-#: C/evolution.xml:6893(para)
+#: C/evolution.xml:6887(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -14337,24 +14003,23 @@ msgstr ""
 "direcciones. Elimina los elementos que se encontraban en los dos sistemas, "
 "pero que fueron eliminados en uno de ellos."
 
-#: C/evolution.xml:6896(title)
+#: C/evolution.xml:6890(title)
 msgid "Copy From Pilot:"
 msgstr "Copiar desde Pilot:"
 
-#: C/evolution.xml:6897(para)
-msgid ""
-"If there is any new data on the handheld device, copy it to the computer."
+#: C/evolution.xml:6891(para)
+msgid "If there is any new data on the handheld device, copy it to the computer."
 msgstr "Si el dispositivo de mano contiene datos nuevos, los copia al equipo."
 
-#: C/evolution.xml:6900(title)
+#: C/evolution.xml:6894(title)
 msgid "Copy To Pilot:"
 msgstr "Copiar hacia Pilot:"
 
-#: C/evolution.xml:6901(para)
+#: C/evolution.xml:6895(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr "Copia los datos nuevos del equipo hacia el dispositivo de mano."
 
-#: C/evolution.xml:6903(para)
+#: C/evolution.xml:6897(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -14362,7 +14027,7 @@ msgstr ""
 "Seleccione el comportamiento de cada conducto elegido. Si no está seguro, "
 "use Sincronizar."
 
-#: C/evolution.xml:6908(para)
+#: C/evolution.xml:6902(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -14370,7 +14035,7 @@ msgstr ""
 "Use el siguiente procedimiento para sincronizar los datos en su dispositivo "
 "Palm Os con sus datos almacenados en Evolution."
 
-#: C/evolution.xml:6909(para)
+#: C/evolution.xml:6903(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
 "the <command>.evolution</command> directory inside your home directory."
@@ -14379,11 +14044,11 @@ msgstr ""
 "sincronizar, haga una copia del directorio <command>.evolution</command> "
 "dentro de su directorio de inicio."
 
-#: C/evolution.xml:6912(para)
+#: C/evolution.xml:6906(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr "Coloque el dispositivo de mano en su base y pulse el botón HotSync."
 
-#: C/evolution.xml:6913(para)
+#: C/evolution.xml:6907(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -14397,7 +14062,7 @@ msgstr ""
 "dispositivo de mano, realice la sincronización con su equipo de sobremesa y "
 "vuelva a habilitar la protección de su dispositivo."
 
-#: C/evolution.xml:6916(para)
+#: C/evolution.xml:6910(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
@@ -14405,7 +14070,7 @@ msgstr ""
 "Si siguió las instrucciones de configuración adecuadamente, los datos de su "
 "dispositivo Palm OS se podrán sincronizar con Evolution."
 
-#: C/evolution.xml:6922(para)
+#: C/evolution.xml:6916(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
 "helps you switch to <trademark>Evolution</trademark>."
@@ -14413,11 +14078,11 @@ msgstr ""
 "Si está usando Microsoft Outlook pero no Microsoft Exchange, esta sección le "
 "ayuda a cambiarse a <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:6925(title)
+#: C/evolution.xml:6919(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Migrar las carpetas de correo locales de Outlook"
 
-#: C/evolution.xml:6926(para)
+#: C/evolution.xml:6920(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -14427,11 +14092,11 @@ msgstr ""
 "tiene que migrarlo a su partición Linux*. No obstante si ha almacenado "
 "correo en su equipo, quizá quiera hacerlo accesible a Evolution."
 
-#: C/evolution.xml:6927(para)
+#: C/evolution.xml:6921(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr "Primero, mientras usa Windows, prepare sus mensajes para importarlos:"
 
-#: C/evolution.xml:6930(para)
+#: C/evolution.xml:6924(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14441,7 +14106,7 @@ msgstr ""
 "Archivo &gt; Carpetas &gt; Propiedades &gt; Avanzadas &gt; Compactar para "
 "borrar los mensajes antiguos y borrados de su archivo PST."
 
-#: C/evolution.xml:6933(para)
+#: C/evolution.xml:6927(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14451,7 +14116,7 @@ msgstr ""
 "subcarpetas para poder saber a qué carpeta pertenecen. Debe volverlas a "
 "anidar después de cargarlas en Evolution."
 
-#: C/evolution.xml:6936(para)
+#: C/evolution.xml:6930(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14459,7 +14124,7 @@ msgstr ""
 "Importe los archivos en Mozilla Mail (o en otro cliente de correo que "
 "utilice el formato mbox estándar, como Netscape o Eudora)."
 
-#: C/evolution.xml:6937(para)
+#: C/evolution.xml:6931(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14469,7 +14134,7 @@ msgstr ""
 "sólo bajo Windows. En Mozilla, importe seleccionando Window Mail &amp; "
 "Newsgroups Tools Import."
 
-#: C/evolution.xml:6940(para)
+#: C/evolution.xml:6934(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14481,7 +14146,7 @@ msgstr ""
 "\\Local Folders\\OutlookMail\\</command>. Los archivos de datos son los que "
 "no tienen extensión de archivo."
 
-#: C/evolution.xml:6941(para)
+#: C/evolution.xml:6935(para)
 msgid ""
 "If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
 "hard drive is probably in the NTFS format, which some Linux systems cannot "
@@ -14493,7 +14158,7 @@ msgstr ""
 "pueden leer sin software adicional. Quizá encuentre más fácil copiar las "
 "carpetas de correo a una unidad diferente o grabar un CD."
 
-#: C/evolution.xml:6942(para)
+#: C/evolution.xml:6936(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -14503,64 +14168,59 @@ msgstr ""
 "bajo Linux. Continúe entonces con el siguiente procedimiento. Para crear "
 "nuevas carpetas para sus archivos:"
 
-#: C/evolution.xml:6945(para)
+#: C/evolution.xml:6939(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Monte su unidad Windows o el disco donde tenga guardados los archivos de "
 "correo."
 
-#: C/evolution.xml:6948(para)
-msgid ""
-"Copy all the mail files into your home directory or another convenient place."
+#: C/evolution.xml:6942(para)
+msgid "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copie todos los archivos de correo en su carpeta personal o cualquier otro "
 "lugar conveniente."
 
-#: C/evolution.xml:6951(para)
+#: C/evolution.xml:6945(para)
 msgid "Start Evolution."
 msgstr "Inicie Evolution."
 
-#: C/evolution.xml:6954(para)
+#: C/evolution.xml:6948(para)
 msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
-msgstr ""
-"Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que desee."
+msgstr "Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que desee."
 
-#: C/evolution.xml:6957(para)
+#: C/evolution.xml:6951(para)
 msgid "To import the data files:"
 msgstr "Importar los archivos de datos:"
 
-#: C/evolution.xml:6960(para)
-msgid ""
-"In Evolution, open the File Import assistant by clicking File &gt; Import."
+#: C/evolution.xml:6954(para)
+msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "En Evolution, abra el asistente de Importación de archivos pulsando Archivo "
 "&gt; Importar."
 
-#: C/evolution.xml:6963(para)
+#: C/evolution.xml:6957(para)
 msgid "Click Next, then select Import a single file."
 msgstr "Pulse Siguiente, después seleccione Importar un solo archivo."
 
-#: C/evolution.xml:6966(para)
+#: C/evolution.xml:6960(para)
 msgid "Click on the filechooser to select the data file."
 msgstr "Pulse en el selector de archivos para seleccionar el archivo de datos."
 
-#: C/evolution.xml:6967(para)
+#: C/evolution.xml:6961(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr ""
 "Recuerde, los archivos de datos son los archivos que no tienen extensión de "
 "archivo."
 
-#: C/evolution.xml:6970(para)
+#: C/evolution.xml:6964(para)
 msgid "Select the folder where you want to put the imported data file."
-msgstr ""
-"Seleccione la carpeta donde quiere poner sus archivos de datos importados."
+msgstr "Seleccione la carpeta donde quiere poner sus archivos de datos importados."
 
-#: C/evolution.xml:6976(para)
+#: C/evolution.xml:6970(para)
 msgid "Repeat the import steps until you have imported all your mail."
-msgstr ""
-"Repita los pasos de importación hasta que haya importado todo su correo."
+msgstr "Repita los pasos de importación hasta que haya importado todo su correo."
 
-#: C/evolution.xml:6984(para)
+#: C/evolution.xml:6978(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
 "things you want to do with <trademark>Evolution</trademark>. You can also "
@@ -14571,23 +14231,23 @@ msgstr ""
 "trademark>. También puede encontrar esta información seleccionando Ayuda "
 "&gt; Referencia rápida en la barra de menú."
 
-#: C/evolution.xml:6987(link) C/evolution.xml:7001(title)
+#: C/evolution.xml:6981(link) C/evolution.xml:6995(title)
 msgid "Opening or Creating Items"
 msgstr "Apertura o cierre de elementos"
 
-#: C/evolution.xml:6990(link) C/evolution.xml:7026(title)
+#: C/evolution.xml:6984(link) C/evolution.xml:7020(title)
 msgid "Mail Tasks"
 msgstr "Tareas de correo"
 
-#: C/evolution.xml:6996(link) C/evolution.xml:7076(title)
+#: C/evolution.xml:6990(link) C/evolution.xml:7070(title)
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: C/evolution.xml:7004(title)
+#: C/evolution.xml:6998(title)
 msgid "New Item:"
 msgstr "Nuevo elemento:"
 
-#: C/evolution.xml:7005(para)
+#: C/evolution.xml:6999(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -14600,28 +14260,28 @@ msgstr ""
 "direcciones, Ctrl+N creará una nueva tarjeta para un contacto; y en el "
 "calendario se abrirá una nueva cita."
 
-#: C/evolution.xml:7008(title)
+#: C/evolution.xml:7002(title)
 msgid "Creating a New Email Message:"
 msgstr "Crear un nuevo mensaje de correo-e:"
 
-#: C/evolution.xml:7009(para)
+#: C/evolution.xml:7003(para)
 msgid "Click File &gt; New &gt; Mail Message or Shift+Ctrl+M."
 msgstr "Use Archivo &gt; Nuevo &gt; Mensaje de correo o Mayús.+Ctrl+M."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7012(title) C/evolution.xml:7065(title)
+#: C/evolution.xml:7006(title) C/evolution.xml:7059(title)
 msgid "Creating a New Appointment:"
 msgstr "Crear una cita nueva:"
 
-#: C/evolution.xml:7013(para) C/evolution.xml:7066(para)
+#: C/evolution.xml:7007(para) C/evolution.xml:7060(para)
 msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr "Use Archivo &gt; Nuevo &gt; Cita o Mayús+Ctrl+A."
 
-#: C/evolution.xml:7016(title)
+#: C/evolution.xml:7010(title)
 msgid "Entering a New Contact:"
 msgstr "Introducir un contacto nuevo:"
 
-#: C/evolution.xml:7017(para)
+#: C/evolution.xml:7011(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
@@ -14631,19 +14291,19 @@ msgstr ""
 "Nuevo &gt; Contacto o Mayús.+Ctrl+C."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7020(title) C/evolution.xml:7070(title)
+#: C/evolution.xml:7014(title) C/evolution.xml:7064(title)
 msgid "Creating a New Task:"
 msgstr "Crear una tarea nueva:"
 
-#: C/evolution.xml:7021(para) C/evolution.xml:7071(para)
+#: C/evolution.xml:7015(para) C/evolution.xml:7065(para)
 msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea o Mayús.+Ctrl+T."
 
-#: C/evolution.xml:7028(title)
+#: C/evolution.xml:7022(title)
 msgid "Send and Receive Mail:"
 msgstr "Enviar y recibir correo:"
 
-#: C/evolution.xml:7029(para)
+#: C/evolution.xml:7023(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -14651,11 +14311,11 @@ msgstr ""
 "Pulse F9, pulse el botón Enviar/Recibir en la barra de herramientas, o pulse "
 "Archivo &gt; Enviar/Recibir."
 
-#: C/evolution.xml:7032(title)
+#: C/evolution.xml:7026(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Navegar por la lista de mensajes mediante el teclado:"
 
-#: C/evolution.xml:7033(para)
+#: C/evolution.xml:7027(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -14665,22 +14325,21 @@ msgstr ""
 "al anterior mensaje no leído. Use las teclas del cursor para moverse arriba "
 "y abajo por toda la lista de mensajes."
 
-#: C/evolution.xml:7036(title)
+#: C/evolution.xml:7030(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Moverse adelante y atrás en el panel de visualización de mensajes:"
 
-#: C/evolution.xml:7037(para)
-msgid ""
-"Press the Spacebar to move down a page. Press Backspace to move up a page."
+#: C/evolution.xml:7031(para)
+msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Pulse la barra espaciadora para avanzar una página. Pulse la tecla Retroceso "
 "para volver hacia atrás una página."
 
-#: C/evolution.xml:7040(title)
+#: C/evolution.xml:7034(title)
 msgid "Replying To a Message:"
 msgstr "Responder un mensaje:"
 
-#: C/evolution.xml:7041(para)
+#: C/evolution.xml:7035(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -14688,7 +14347,7 @@ msgstr ""
 "Para responder sólo al remitente del mensaje, pulse Responder en la barra de "
 "herramientas o pulse Ctrl+R."
 
-#: C/evolution.xml:7043(para)
+#: C/evolution.xml:7037(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -14696,11 +14355,11 @@ msgstr ""
 "Para responder al remitente y a todos los destinatarios visibles pulse en "
 "Responder a todos o seleccione el mensaje y pulse Mayús.+Ctrl+R."
 
-#: C/evolution.xml:7045(title)
+#: C/evolution.xml:7039(title)
 msgid "Forwarding a Message:"
 msgstr "Reenviar un mensaje:"
 
-#: C/evolution.xml:7046(para)
+#: C/evolution.xml:7040(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -14708,11 +14367,11 @@ msgstr ""
 "Seleccione el o los mensajes que quiera reenviar y pulse en Reenviar en la "
 "barra de herramientas o pulse Ctrl+F."
 
-#: C/evolution.xml:7049(title)
+#: C/evolution.xml:7043(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Abrir un mensaje en una nueva ventana:"
 
-#: C/evolution.xml:7050(para)
+#: C/evolution.xml:7044(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -14720,11 +14379,11 @@ msgstr ""
 "Pulse dos veces sobre el mensaje que quiera ver o selecciónelo y pulse Intro "
 "o Ctrl+O."
 
-#: C/evolution.xml:7053(title)
+#: C/evolution.xml:7047(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Crear filtros y carpetas de búsqueda:"
 
-#: C/evolution.xml:7054(para)
+#: C/evolution.xml:7048(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
@@ -14733,17 +14392,17 @@ msgstr ""
 "mensaje. También puede crear filtros y carpetas de búsqueda desde el menú "
 "Editar."
 
-#: C/evolution.xml:7057(title)
+#: C/evolution.xml:7051(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Añadir un remitente a la libreta de direcciones:"
 
-#: C/evolution.xml:7058(para)
+#: C/evolution.xml:7052(para)
 msgid "Right-click on any email address to add it to your address book."
 msgstr ""
 "Pulse con el botón derecho sobre cualquier dirección de correo-e para "
 "añadirla a su libreta de direcciones."
 
-#: C/evolution.xml:7068(para)
+#: C/evolution.xml:7062(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -14751,21 +14410,21 @@ msgstr ""
 "También puede pulsar en cualquier lugar vacío del calendario y empezar a "
 "escribir para crear una nueva cita."
 
-#: C/evolution.xml:7078(title)
+#: C/evolution.xml:7072(title)
 msgid "Editing a Contact:"
 msgstr "Editar un contacto:"
 
-#: C/evolution.xml:7079(para)
+#: C/evolution.xml:7073(para)
 msgid "Double-click the contact's address card to change details."
 msgstr ""
 "Pulse dos veces en la dirección de la tarjeta del contacto para modificar "
 "los detalles."
 
-#: C/evolution.xml:7082(title)
+#: C/evolution.xml:7076(title)
 msgid "Deleting a Contact:"
 msgstr "Borrar un contacto:"
 
-#: C/evolution.xml:7083(para)
+#: C/evolution.xml:7077(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -14774,21 +14433,21 @@ msgstr ""
 "seleccione el contacto y después pulse el botón Borrar en la barra de "
 "herramientas."
 
-#: C/evolution.xml:7086(title)
+#: C/evolution.xml:7080(title)
 msgid "Sending Emails to a Contact:"
 msgstr "Enviar correos-e a un contacto:"
 
-#: C/evolution.xml:7087(para)
+#: C/evolution.xml:7081(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Pulse con el botón derecho sobre un contacto, después pulse Enviar un "
 "mensaje al contacto."
 
-#: C/evolution.xml:7090(title)
+#: C/evolution.xml:7084(title)
 msgid "Creating a New Contact:"
 msgstr "Crear un contacto nuevo:"
 
-#: C/evolution.xml:7091(para)
+#: C/evolution.xml:7085(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -14799,7 +14458,7 @@ msgstr ""
 "cualquier parte de la libreta de direcciones y seleccione Contacto nuevo. "
 "También puede pulsar Archivo &gt; Nuevo &gt; Contacto o pulsar Mayús+Ctrl+C."
 
-#: C/evolution.xml:7098(para)
+#: C/evolution.xml:7092(para)
 msgid ""
 "<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
 "\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
@@ -14813,7 +14472,7 @@ msgstr ""
 "información de errores de GNOME (conocida como bug-buddy en la línea de "
 "comandos)."
 
-#: C/evolution.xml:7099(para)
+#: C/evolution.xml:7093(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -14826,7 +14485,7 @@ msgstr ""
 "\"http://gnome.org/projects/evolution/developer.shtml\">web para "
 "desarrolladores de Evolution</ulink>."
 
-#: C/evolution.xml:7104(para)
+#: C/evolution.xml:7098(para)
 msgid ""
 "Evolution was written by the <trademark>Evolution</trademark> team and "
 "numerous other dedicated GNOME programmers. You can see their names by "
@@ -14837,7 +14496,7 @@ msgstr ""
 "nombres, seleccione Ayuda &gt; Acerca de en cualquiera de las ventanas de "
 "Evolution."
 
-#: C/evolution.xml:7105(para)
+#: C/evolution.xml:7099(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -14848,7 +14507,7 @@ msgstr ""
 "reconocen los esfuerzos y contribuciones de todos los que trabajaron en "
 "estos proyectos."
 
-#: C/evolution.xml:7106(para)
+#: C/evolution.xml:7100(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
 "gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
@@ -14866,51 +14525,51 @@ msgstr ""
 "información de errores de GNOME bug-buddy para enviar notificaciones de "
 "fallos."
 
-#: C/evolution.xml:7107(para)
+#: C/evolution.xml:7101(para)
 msgid "This manual was written by:"
 msgstr "Este manual lo escribieron:"
 
-#: C/evolution.xml:7110(para)
+#: C/evolution.xml:7104(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: C/evolution.xml:7113(para)
+#: C/evolution.xml:7107(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: C/evolution.xml:7116(para)
+#: C/evolution.xml:7110(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/evolution.xml:7119(para)
+#: C/evolution.xml:7113(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: C/evolution.xml:7122(para)
+#: C/evolution.xml:7116(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: C/evolution.xml:7125(para)
+#: C/evolution.xml:7119(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: C/evolution.xml:7128(para)
+#: C/evolution.xml:7122(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron Weber (aaron@ximian.com)"
 
-#: C/evolution.xml:7131(para)
+#: C/evolution.xml:7125(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: C/evolution.xml:7134(para)
+#: C/evolution.xml:7128(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: C/evolution.xml:7137(para)
+#: C/evolution.xml:7131(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: C/evolution.xml:7140(para)
+#: C/evolution.xml:7134(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -14918,7 +14577,7 @@ msgstr ""
 "Con la ayuda de los programadores de aplicaciones y del Proyecto de "
 "documentación de GNOME."
 
-#: C/evolution.xml:7143(para)
+#: C/evolution.xml:7137(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
@@ -14931,7 +14590,7 @@ msgstr ""
 "com) o Srinivasa Ragavan (sragavan@novell.com) y cualquiera de ellos le "
 "añadirá."
 
-#: C/evolution.xml:7144(para)
+#: C/evolution.xml:7138(para)
 msgid ""
 "Partial list of Documentation Translators (application translated to "
 "numerous additional languages):"
@@ -14939,26 +14598,25 @@ msgstr ""
 "Lista parcial de todos los traductores de la documentación (la aplicación "
 "está traducida a numerosos idiomas adicionales):"
 
-#: C/evolution.xml:7147(para)
+#: C/evolution.xml:7141(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson al sueco"
 
-#: C/evolution.xml:7150(para)
-msgid ""
-"Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
+#: C/evolution.xml:7144(para)
+msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
 msgstr ""
 "Hector García �lvarez, Franciso Javier F. Serrador y Jorge González para el "
 "español (.es)"
 
-#: C/evolution.xml:7153(para)
+#: C/evolution.xml:7147(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas al noruego"
 
-#: C/evolution.xml:7156(para)
+#: C/evolution.xml:7150(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov al ruso (.ru)"
 
-#: C/evolution.xml:7163(para)
+#: C/evolution.xml:7157(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
 "as in <trademark>Evolution</trademark>."
@@ -14966,11 +14624,11 @@ msgstr ""
 "Este glosario contiene términos que se usan frecuentemente en esta guía así "
 "como en <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:7165(glossterm)
+#: C/evolution.xml:7159(glossterm)
 msgid "Assistant"
 msgstr "Asistente"
 
-#: C/evolution.xml:7167(para)
+#: C/evolution.xml:7161(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -14979,11 +14637,11 @@ msgstr ""
 "generalmente para configurar o ajustar un programa. Es equivalente a un "
 "Druida."
 
-#: C/evolution.xml:7171(glossterm)
+#: C/evolution.xml:7165(glossterm)
 msgid "attachment"
 msgstr "adjunto"
 
-#: C/evolution.xml:7173(para)
+#: C/evolution.xml:7167(para)
 msgid ""
 "Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
@@ -14991,21 +14649,21 @@ msgstr ""
 "Cualquier archivo enviado con un correo-e. Los adjuntos se pueden empotrar "
 "en un mensaje o adjuntarse a él."
 
-#: C/evolution.xml:7177(glossterm)
+#: C/evolution.xml:7171(glossterm)
 msgid "automatic indexing"
 msgstr "indexado automático"
 
-#: C/evolution.xml:7179(para)
+#: C/evolution.xml:7173(para)
 msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
 "Una característica que permite a Evolution buscar y ordenar datos "
 "rápidamente."
 
-#: C/evolution.xml:7183(glossterm)
+#: C/evolution.xml:7177(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Cco (Copia de carbón oculta)"
 
-#: C/evolution.xml:7185(para)
+#: C/evolution.xml:7179(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -15019,11 +14677,11 @@ msgstr ""
 "Responder a todos, el destinatario en la copia de carbón oculta no recibirá "
 "la respuesta."
 
-#: C/evolution.xml:7189(glossterm)
+#: C/evolution.xml:7183(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (Copia de carbón)"
 
-#: C/evolution.xml:7191(para)
+#: C/evolution.xml:7185(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -15036,11 +14694,11 @@ msgstr ""
 "Todos los destinatarios pueden ver que se envió la copia de carbón. También "
 "pueden ver todos los nombres de los destinatarios de la Cc."
 
-#: C/evolution.xml:7195(glossterm)
+#: C/evolution.xml:7189(glossterm)
 msgid "conduit"
 msgstr "conducto"
 
-#: C/evolution.xml:7197(para)
+#: C/evolution.xml:7191(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -15048,15 +14706,15 @@ msgstr ""
 "Pequeña aplicación que controla la transferencia de datos entre un "
 "dispositivo portátil y el escritorio del equipo."
 
-#: C/evolution.xml:7203(para)
+#: C/evolution.xml:7197(para)
 msgid "The GNOME groupware application."
 msgstr "La aplicación groupware de GNOME."
 
-#: C/evolution.xml:7207(glossterm)
+#: C/evolution.xml:7201(glossterm)
 msgid "execute"
 msgstr "ejecutar"
 
-#: C/evolution.xml:7209(para)
+#: C/evolution.xml:7203(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -15074,11 +14732,11 @@ msgstr ""
 "archivos consulte la documentación de su administrador de archivos o de su "
 "intérprete de órdenes."
 
-#: C/evolution.xml:7213(glossterm)
+#: C/evolution.xml:7207(glossterm)
 msgid "expunge"
 msgstr "purgar"
 
-#: C/evolution.xml:7215(para)
+#: C/evolution.xml:7209(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -15088,11 +14746,11 @@ msgstr ""
 "purgan. Cuando se purga un mensaje se borra permanentemente, siempre y "
 "cuando estuviese marcado para su borrado."
 
-#: C/evolution.xml:7219(glossterm)
+#: C/evolution.xml:7213(glossterm)
 msgid "file tree"
 msgstr "árbol de archivos"
 
-#: C/evolution.xml:7221(para)
+#: C/evolution.xml:7215(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -15107,11 +14765,11 @@ msgstr ""
 "(«root») ni con el directorio de inicio del superusuario <command>/root</"
 "command>."
 
-#: C/evolution.xml:7225(glossterm)
+#: C/evolution.xml:7219(glossterm)
 msgid "filter"
 msgstr "filtro"
 
-#: C/evolution.xml:7227(para)
+#: C/evolution.xml:7221(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -15122,11 +14780,11 @@ msgstr ""
 "acciones sobre un mensaje que cumpla una (o todas) las condiciones, "
 "definidas entre una amplia gama de posibilidades."
 
-#: C/evolution.xml:7231(glossterm)
+#: C/evolution.xml:7225(glossterm)
 msgid "forward"
 msgstr "reenviar"
 
-#: C/evolution.xml:7233(para)
+#: C/evolution.xml:7227(para)
 msgid ""
 "Forwards a copy of the message and any additional comments to a different "
 "email address."
@@ -15134,11 +14792,11 @@ msgstr ""
 "Reenvía una copia del mensaje y cualquier comentario adicional a distintas "
 "direcciones de correo-e."
 
-#: C/evolution.xml:7237(glossterm)
+#: C/evolution.xml:7231(glossterm)
 msgid "groupware"
 msgstr "groupware"
 
-#: C/evolution.xml:7239(para)
+#: C/evolution.xml:7233(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
@@ -15149,11 +14807,11 @@ msgstr ""
 "varias funciones de productividad integradas en un único programa: correo "
 "electrónico, calendario y gestión de contactos."
 
-#: C/evolution.xml:7243(glossterm)
+#: C/evolution.xml:7237(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: C/evolution.xml:7245(para)
+#: C/evolution.xml:7239(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
 "electronic documents such as Web pages, help files, and email messages. HTML "
@@ -15166,21 +14824,21 @@ msgstr ""
 "envíos a los grupos de noticias para insertar imágenes y darle formato al "
 "texto."
 
-#: C/evolution.xml:7249(glossterm)
+#: C/evolution.xml:7243(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: C/evolution.xml:7251(para)
+#: C/evolution.xml:7245(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal es un protocolo que Evolution usa para gestionar la sección del "
 "calendario."
 
-#: C/evolution.xml:7255(glossterm)
+#: C/evolution.xml:7249(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: C/evolution.xml:7257(para)
+#: C/evolution.xml:7251(para)
 msgid ""
 "Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
@@ -15190,11 +14848,11 @@ msgstr ""
 "electrónico que normalmente se almacena remotamente en el servidor en lugar "
 "de en el disco duro local. IMAP suele ser la alternativa a POP."
 
-#: C/evolution.xml:7261(glossterm)
+#: C/evolution.xml:7255(glossterm)
 msgid "inline"
 msgstr "en línea"
 
-#: C/evolution.xml:7263(para)
+#: C/evolution.xml:7257(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -15202,11 +14860,11 @@ msgstr ""
 "Que se muestra empotrado, como parte de un mensaje u otro documento en lugar "
 "de estar anexo a un archivo. Alternativo a <emphasis>adjunto</emphasis>."
 
-#: C/evolution.xml:7267(glossterm)
+#: C/evolution.xml:7261(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: C/evolution.xml:7269(para)
+#: C/evolution.xml:7263(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -15215,11 +14873,11 @@ msgstr ""
 "buscar a través de grandes bases de datos, alojadas en un servidor, de "
 "direcciones, números de teléfono y personas."
 
-#: C/evolution.xml:7273(glossterm)
+#: C/evolution.xml:7267(glossterm)
 msgid "mail client"
 msgstr "cliente de correo"
 
-#: C/evolution.xml:7275(para)
+#: C/evolution.xml:7269(para)
 msgid ""
 "The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
@@ -15230,11 +14888,11 @@ msgstr ""
 "autenticación de usuarios y dirigen los mensajes del remitente al "
 "destinatario."
 
-#: C/evolution.xml:7279(glossterm)
+#: C/evolution.xml:7273(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: C/evolution.xml:7281(para)
+#: C/evolution.xml:7275(para)
 msgid ""
 "Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
@@ -15244,11 +14902,11 @@ msgstr ""
 "electrónico. En contraste con IMAP sólo se usa para descargar el correo y "
 "almacenarlo localmente en el disco duro."
 
-#: C/evolution.xml:7285(glossterm)
+#: C/evolution.xml:7279(glossterm)
 msgid "protocol"
 msgstr "protocolo"
 
-#: C/evolution.xml:7287(para)
+#: C/evolution.xml:7281(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
@@ -15260,11 +14918,11 @@ msgstr ""
 "POP (Protocolo de Oficina Postal) para correo electrónico y HTTP (Protocolo "
 "de Transferencia de HiperTexto) para páginas web."
 
-#: C/evolution.xml:7291(glossterm)
+#: C/evolution.xml:7285(glossterm)
 msgid "public key encryption"
 msgstr "cifrado de clave pública"
 
-#: C/evolution.xml:7293(para)
+#: C/evolution.xml:7287(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -15276,11 +14934,11 @@ msgstr ""
 "pública sólo pueden ser descifrados con la clave privada. Cuanto más largas "
 "sean las claves más difícil será romper el cifrado."
 
-#: C/evolution.xml:7297(glossterm)
+#: C/evolution.xml:7291(glossterm)
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: C/evolution.xml:7299(para)
+#: C/evolution.xml:7293(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
@@ -15298,11 +14956,11 @@ msgstr ""
 "<quote>fly in soap</quote>. Para obtener más información introduzca "
 "<command>man grep</command> en la línea de comandos."
 
-#: C/evolution.xml:7303(glossterm)
+#: C/evolution.xml:7297(glossterm)
 msgid "script"
 msgstr "script"
 
-#: C/evolution.xml:7305(para)
+#: C/evolution.xml:7299(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -15314,11 +14972,11 @@ msgstr ""
 "órdenes pregrabadas o acciones dentro de una aplicación. Su utilización en "
 "tareas tediosas y repetitivas puede ahorrar mucho tiempo al usuario."
 
-#: C/evolution.xml:7309(glossterm)
+#: C/evolution.xml:7303(glossterm)
 msgid "search base"
 msgstr "base de búsqueda"
 
-#: C/evolution.xml:7311(para)
+#: C/evolution.xml:7305(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -15328,11 +14986,11 @@ msgstr ""
 "búsqueda le informa a LDAP el número de grupos a usar. La profundidad de la "
 "búsqueda base se ajusta con la opción Rango de búsqueda."
 
-#: C/evolution.xml:7315(glossterm)
+#: C/evolution.xml:7309(glossterm)
 msgid "search folder"
 msgstr "carpeta de búsqueda"
 
-#: C/evolution.xml:7317(para)
+#: C/evolution.xml:7311(para)
 msgid ""
 "An email organization tool. Search folders allow you to create a folder that "
 "contains the results of a complex search. Search folder contents are updated "
@@ -15342,19 +15000,19 @@ msgstr ""
 "permiten crear una carpeta que contenga los resultados de una búsqueda "
 "compleja. El contenido de una carpeta de búsqueda se actualiza dinámicamente."
 
-#: C/evolution.xml:7321(glossterm)
+#: C/evolution.xml:7315(glossterm)
 msgid "search scope"
 msgstr "rango de búsqueda"
 
-#: C/evolution.xml:7323(para)
+#: C/evolution.xml:7317(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr "El rango de búsqueda indica cómo de profunda será la búsqueda base."
 
-#: C/evolution.xml:7327(glossterm)
+#: C/evolution.xml:7321(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: C/evolution.xml:7329(para)
+#: C/evolution.xml:7323(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -15364,11 +15022,11 @@ msgstr ""
 "de SMTP, algunas personas lo prefieren porque ofrece mayor flexibilidad; no "
 "obstante es más difícil de configurar."
 
-#: C/evolution.xml:7333(glossterm)
+#: C/evolution.xml:7327(glossterm)
 msgid "switcher"
 msgstr "selector"
 
-#: C/evolution.xml:7335(para)
+#: C/evolution.xml:7329(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -15376,11 +15034,11 @@ msgstr ""
 "Un área de Evolution que ofrece a los usuarios acceso rápido a la mayoría de "
 "las características usadas de la aplicación."
 
-#: C/evolution.xml:7339(glossterm)
+#: C/evolution.xml:7333(glossterm)
 msgid "signature"
 msgstr "firma"
 
-#: C/evolution.xml:7341(para)
+#: C/evolution.xml:7335(para)
 msgid ""
 "Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
@@ -15392,11 +15050,11 @@ msgstr ""
 "desde una cita favorita hasta un enlace a una página web; la cortesía dicta "
 "que debe tener menos de cuatro líneas de longitud."
 
-#: C/evolution.xml:7345(glossterm)
+#: C/evolution.xml:7339(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: C/evolution.xml:7347(para)
+#: C/evolution.xml:7341(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -15404,11 +15062,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. La forma más común de transportar mensajes de "
 "correo desde su equipo al servidor."
 
-#: C/evolution.xml:7351(glossterm)
+#: C/evolution.xml:7345(glossterm)
 msgid "tooltip"
 msgstr "consejo"
 
-#: C/evolution.xml:7353(para)
+#: C/evolution.xml:7347(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -15416,11 +15074,11 @@ msgstr ""
 "Una pequeña caja con texto explicativo que aparece cuando el puntero del "
 "ratón se mantiene sobre un botón u otro elemento del interfaz."
 
-#: C/evolution.xml:7357(glossterm)
+#: C/evolution.xml:7351(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: C/evolution.xml:7359(para)
+#: C/evolution.xml:7353(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15432,11 +15090,11 @@ msgstr ""
 "un daño sustancial saturando redes o discos duros, borrando archivos o "
 "abriendo agujeros de seguridad."
 
-#: C/evolution.xml:7363(glossterm)
+#: C/evolution.xml:7357(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: C/evolution.xml:7365(para)
+#: C/evolution.xml:7359(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
 "address card attached to an email, it is probably in vCard format."
@@ -15445,11 +15103,11 @@ msgstr ""
 "obtiene una tarjeta de dirección adjuntada a un correo-e, probablemente esté "
 "en formato vCard."
 
-#: C/evolution.xml:7371(title)
+#: C/evolution.xml:7365(title)
 msgid "Legal Notices"
 msgstr "Notas legales"
 
-#: C/evolution.xml:7373(member)
+#: C/evolution.xml:7367(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15466,7 +15124,7 @@ msgstr ""
 "momento, sin obligación de notificar a ninguna persona o entidad tales "
 "cambios o revisiones."
 
-#: C/evolution.xml:7374(member)
+#: C/evolution.xml:7368(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15483,7 +15141,7 @@ msgstr ""
 "software de Novell en cualquier momento, sin obligación de notificar a "
 "ninguna persona o entidad tales cambios o revisiones."
 
-#: C/evolution.xml:7377(member)
+#: C/evolution.xml:7371(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15493,7 +15151,7 @@ msgstr ""
 "regulaciones aplicables incluyendo, sin limitación, las regulaciones de "
 "exportación de los EE.UU. o las leyes del país en el que resida."
 
-#: C/evolution.xml:7380(member)
+#: C/evolution.xml:7374(member)
 msgid ""
 "Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
 "or modify this document under the terms of the GNU Free Documentation "
@@ -15509,7 +15167,7 @@ msgstr ""
 "portada ni textos de contraportada. Podrá encontrar una copia de la GFDL en "
 "http://www.fsf.org/licenses/fdl.html."
 
-#: C/evolution.xml:7381(member)
+#: C/evolution.xml:7375(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -15519,7 +15177,7 @@ msgstr ""
 "LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU "
 "(GFDL) Y TENIENDO EN CUENTA QUE:"
 
-#: C/evolution.xml:7382(member)
+#: C/evolution.xml:7376(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -15546,7 +15204,7 @@ msgstr ""
 "NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
 "DE LA RENUNCIA;Y"
 
-#: C/evolution.xml:7383(member)
+#: C/evolution.xml:7377(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -15571,31 +15229,31 @@ msgstr ""
 "MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE "
 "SE PRODUJESEN DICHOS DAÑOS."
 
-#: C/evolution.xml:7386(member)
+#: C/evolution.xml:7380(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: C/evolution.xml:7387(member)
+#: C/evolution.xml:7381(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"
 
-#: C/evolution.xml:7388(member)
+#: C/evolution.xml:7382(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: C/evolution.xml:7389(member)
+#: C/evolution.xml:7383(member)
 msgid "U.S.A."
 msgstr "EE. UU."
 
-#: C/evolution.xml:7390(member)
+#: C/evolution.xml:7384(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: C/evolution.xml:7393(para)
+#: C/evolution.xml:7387(para)
 msgid "July 2007"
 msgstr "Julio de 2007"
 
-#: C/evolution.xml:7395(member)
+#: C/evolution.xml:7389(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -15604,11 +15262,11 @@ msgstr ""
 "Novell así como para obtener actualizaciones, consulte www.novell.com/"
 "documentation."
 
-#: C/evolution.xml:7398(member)
+#: C/evolution.xml:7392(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution es una marca comercial de Novell, Inc."
 
-#: C/evolution.xml:7399(member)
+#: C/evolution.xml:7393(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15616,7 +15274,7 @@ msgstr ""
 "GroupWise es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7400(member)
+#: C/evolution.xml:7394(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15624,12 +15282,11 @@ msgstr ""
 "Novell es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7401(member)
+#: C/evolution.xml:7395(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
-msgstr ""
-"SUSE es una marca comercial registrada de SUSE AG, una filial de Novell."
+msgstr "SUSE es una marca comercial registrada de SUSE AG, una filial de Novell."
 
-#: C/evolution.xml:7402(member)
+#: C/evolution.xml:7396(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15637,7 +15294,7 @@ msgstr ""
 "Ximian es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7405(member)
+#: C/evolution.xml:7399(member)
 msgid "All third-party trademarks are the property of their respective owners."
 msgstr ""
 "Todas las marcas comerciales de terceras partes son propiedad de sus "
@@ -15649,3 +15306,4 @@ msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2008\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
+
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d97fa0d801..f882497878 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,16 +1,208 @@
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+2008-09-09  Milan Crha  <mcrha@redhat.com>
 
-	** Fixes bug #549969
+	** Fix for bug #493298
 
-	* em-migrate.c (migrate_to_db):
-	Use a less geeky sounding migration message.
+	* em-format-html-display.c: (efhd_image): Do not try to access widget
+	of the pury when the operation has been cancelled.
+
+2008-09-08  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #328216
+
+	* mail-send-recv.h: (mail_autoreceive_init):
+	* mail-send-recv.c: (mail_autoreceive_init):
+	* mail-component.c: (mail_component_init): Pass 'session' as parameter
+	to the 'mail_autoreceive_init' to not create two MailComponents.
+	* mail-component.c: (impl_finalize): Do not free pointer twice.
+	* mail-component.c: (impl_finalize), (impl_quit): Call shutdown in time
+	of quit to shutdown camel, which will store changes in 'camel-cert.db'.
+
+2008-09-05  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail-folder-cache.c (real_flush_updates): Fix infinite loop on
+	deleting vfolders.
+
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-composer-prefs.c:
+	* em-event.c:
+	* em-folder-properties.c:
+	* em-folder-selection-button.c:
+	* em-vfolder-rule.c:
+	* em-vfolder-rule.h:
+	* mail-config.h:
+	* mail-session.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-searching-tokenizer.c:
+	* em-account-editor.h:
+	* em-composer-prefs.h:
+	* em-config.c:
+	* em-config.h:
+	* em-filter-context.c:
+	* em-filter-editor.c:
+	* em-filter-rule.c:
+	* em-filter-source-element.c:
+	* em-filter-source-element.h:
+	* em-folder-tree-model.h:
+	* em-folder-utils.c:
+	* em-folder-utils.h:
+	* em-folder-view.h:
+	* em-format-hook.c:
+	* em-format-html-print.h:
+	* em-format-quote.h:
+	* em-icon-stream.h:
+	* em-inline-filter.c:
+	* em-junk-hook.c:
+	* em-menu.c:
+	* em-migrate.h:
+	* em-stripsig-filter.h:
+	* em-sync-stream.c:
+	* em-utils.h:
+	* em-vfolder-editor.h:
+	* importers/elm-importer.c:
+	* mail-autofilter.c:
+	* mail-autofilter.h:
+	* mail-component-factory.c:
+	* mail-component.h:
+	* mail-config-factory.h:
+	* mail-crypto.c:
+	* mail-crypto.h:
+	* mail-folder-cache.h:
+	* mail-mt.h:
+	* mail-ops.h:
+	* mail-send-recv.h:
+	* mail-session.h:
+	* mail-signature-editor.c:
+	* mail-tools.c:
+	* mail-tools.h:
+	* mail-vfolder.c:
+	* mail-vfolder.h:
+	* message-list.h:
+
+2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
 
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+	* em-composer-utils.c (edit_message):
+	Don't mix declarations and code.
 
-	** Fixes bug #549970
+2008-09-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #543135
+
+	* em-format-html-display.c: (efhd_format_optional):
+	Write error message to the right stream.
+	* message-list.c: (mail_regen_list), (regen_list_done): Do not try
+	to set information message to the message list when it's not visible.
+
+2008-09-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #534039
+
+	* mail-folder-cache.c: (real_flush_updates): Make sure search folder's
+	unread count will be tracked properly in a tree even before the folder
+	is opened in the UI. (The previous patch for this bug made this issue.)
+
+2008-09-01  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #549661
+
+	* em-folder-tree.c: (emft_drop_async__exec): Use
+	em_utils_selection_get_urilist() for DND_DROP_TYPE_TEXT_URI_LIST (and
+	not em_utils_selection_get_mailbox()).
+
+2008-08-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix bug #544430
+
+	* em-folder-properties.c (emfp_get_folder_item):
+	Better formed translatable strings for quota usage.
+
+2008-08-30  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail/mail-component.c: Disable flag upsync. I need to implement it
+	more intelligently.
+
+2008-08-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #509647
+
+	* em-folder-utils.c: (emft_copy_folders__exec):
+	* mail-ops.c: (fetch_mail_exec), (send_queue_exec):
+	Do not expunge folder when something goes wrong.
+
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
 
 	* evolution-mail.schemas.in:
-	Reword the descriptions for "lookup_addressbook" key.
+	* mail-config.glade: Change "addressbook" to "address book" in
+	translatable strings.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-searching-tokenizer.h:
+	* em-account-prefs.h:
+	* em-composer-utils.h:
+	* em-event.h:
+	* em-filter-context.h:
+	* em-filter-editor.h:
+	* em-filter-folder-element.c:
+	* em-filter-folder-element.h:
+	* em-filter-rule.h:
+	* em-folder-browser.h:
+	* em-folder-properties.h:
+	* em-folder-selection-button.h:
+	* em-folder-selection.c:
+	* em-folder-selection.h:
+	* em-folder-selector.c:
+	* em-folder-selector.h:
+	* em-folder-tree.h:
+	* em-format-hook.h:
+	* em-format-html-display.h:
+	* em-format-html-print.c:
+	* em-format-html.h:
+	* em-format-quote.c:
+	* em-format.h:
+	* em-html-stream.c:
+	* em-html-stream.h:
+	* em-inline-filter.h:
+	* em-junk-hook.h:
+	* em-menu.h:
+	* em-message-browser.h:
+	* em-popup.h:
+	* em-search-context.c:
+	* em-search-context.h:
+	* em-stripsig-filter.c:
+	* em-subscribe-editor.h:
+	* em-sync-stream.h:
+	* em-vfolder-context.c:
+	* em-vfolder-context.h:
+	* em-vfolder-editor.c:
+	* importers/mail-importer.h:
+	* mail-config-factory.c:
+	* mail-signature-editor.h:
+	* mail-types.h:
+	* message-tag-editor.c:
+	* message-tag-editor.h:
+	* message-tag-followup.c:
+	* message-tag-followup.h:
+
+2008-08-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546926
+
+	* mail-session.c (mail_session_shutdown):
+	New function simply calls camel_shutdown().
+
+	* mail-component.c (impl_finalize):
+	Call mail_session_shutdown().
 
 2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
 
@@ -34,10 +226,10 @@
 
 2008-08-14  Sebastien Bacher  <seb128@ubuntu.com>
 
-        ** Fix for bug #547805
+	** Fix for bug #547805
 
 	* em-popup.c: (emp_standard_menu_factory): 
-          don't filter applications using g_app_info_should_show()
+	don't filter applications using g_app_info_should_show()
 
 2008-08-13  Moritz Mertinkat  <moritz@mertinkat.net>
 
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c
index 1b603acd90..044c3840b7 100644
--- a/mail/e-searching-tokenizer.c
+++ b/mail/e-searching-tokenizer.c
@@ -1,32 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * e-searching-tokenizer.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
- * 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.
+ *
+ * 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:
  * Developed by Jon Trowbridge <trow@ximian.com>
  * Rewritten significantly to handle multiple strings and improve performance
- *  by Michael Zucchi <notzed@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * by Michael Zucchi <notzed@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 General Public License for more details.
+ * 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/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h
index 72059c02f5..ecc914dab7 100644
--- a/mail/e-searching-tokenizer.h
+++ b/mail/e-searching-tokenizer.h
@@ -1,27 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * e-searching-tokenizer.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		Jon Trowbridge <trow@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.
  */
 
 #ifndef __E_SEARCHING_TOKENIZER_H__
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index c21930e8a8..9a5b09afe3 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors:
- *    Jeffrey Stedfast <fejj@ximian.com>
- *    Dan Winship <danw@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *		Dan Winship <danw@ximian.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/mail/em-account-prefs.h b/mail/em-account-prefs.h
index a563470c35..c63b9f562e 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_ACCOUNT_PREFS_H__
 #define __EM_ACCOUNT_PREFS_H__
 
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 0c0a14859b..75a6781759 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index d0e7682b6c..6fcab979f4 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 8ae537ad7c..415a3d7193 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -822,6 +822,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 		CamelStream *stream;		
 		CamelMimePart *part;
 		int count1 = 0, string_changed = 0;
+		const char *cur;
+		int i;
 
 		char *str;
 		gint count = 2;
@@ -853,14 +855,14 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 		str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
 		camel_object_unref (mem);
 
-		const char *cur = str;
-		int i;
+		cur = str;
 		for (i = 0; i < strlen(str); i++) {
 			if (!g_ascii_strncasecmp (cur, "$", 1)) {
 				const char *end = cur, *check_env;
 				char *out;
 				GConfClient *gconf;
 				GSList *clue_list = NULL, *list;
+				char **temp_str;
 
 				gconf = gconf_client_get_default ();
 
@@ -870,7 +872,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 				out = g_strndup ((const gchar *) cur, end - cur);
 				check_env = out;
 
-				char **temp_str = g_strsplit (str, out, 2);
+				temp_str = g_strsplit (str, out, 2);
 
 				/* Get the list from gconf */
 				clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL );
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index cee813fc8f..68bfd1b0bc 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-config.c b/mail/em-config.c
index b4e9e3c981..9075fc3842 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-config.h b/mail/em-config.h
index 6200164972..5530d27d00 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -1,22 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Authors: Michel Zucchi <notzed@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.
  *
- *  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:
+ *		Michel Zucchi <notzed@ximian.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/mail/em-event.c b/mail/em-event.c
index 950f2488fb..0c5a61b454 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-event.h b/mail/em-event.h
index 6b35547084..3afc0146bb 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index c3c66680c5..b0f82a7dad 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-filter-context.h b/mail/em-filter-context.h
index f0a7b66f7d..6b2e4f18fd 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_FILTER_CONTEXT_H
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 34cfe7f7ac..fb0c2c4ea6 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-filter-editor.h b/mail/em-filter-editor.h
index 1d96195875..b0ee632779 100644
--- a/mail/em-filter-editor.h
+++ b/mail/em-filter-editor.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_FILTER_EDITOR_H
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index ee25acbfc7..3539881290 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h
index bbf2576703..27c6ea81d4 100644
--- a/mail/em-filter-folder-element.h
+++ b/mail/em-filter-folder-element.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_FILTER_FOLDER_ELEMENT_H
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 7db52f547d..61156302f8 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@ximian.com>
+ *		Jeffrey Stedfast <fejj@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/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 9053571db0..49e71850d6 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_FILTER_RULE_H
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 8f27989189..d2b5136751 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -1,27 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jon Trowbridge <trow@ximian.com>
- *           Jeffrey Stedfast <fejj@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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h
index 6c2bf3ec52..3204b636a0 100644
--- a/mail/em-filter-source-element.h
+++ b/mail/em-filter-source-element.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jon Trowbridge <trow@ximian.com>
- *           Jeffrey Stedfast <fejj@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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h
index 0af0355799..75dbe975b5 100644
--- a/mail/em-folder-browser.h
+++ b/mail/em-folder-browser.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 506522750b..b871d28203 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Michael Zucchi <notzed@ximian.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; version 2.
+ * 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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -188,11 +189,13 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 			if (!info->total)
 				continue;
 
-			/* show quota name only when available and have more than one quota info */
+			/* Show quota name only when available and we
+			 * have more than one quota info. */
 			if (info->name && quota->next)
-				descr = g_strdup_printf ("%s (%s):", _("Quota usage"), _(info->name));
+				descr = g_strdup_printf (
+					_("Quota usage (%s):"), _(info->name));
 			else
-				descr = g_strdup_printf ("%s:", _("Quota usage"));
+				descr = g_strdup_printf (_("Quota usage"));
 
 			procs = (int) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5);
 
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 5fcf1b99a8..8bae3848e7 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Michael Zucchi <notzed@ximian.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; version 2.
+ * 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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 06f1416102..9257c57b5d 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index 0fb9cd9b4f..e9cd1c2a0e 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_FOLDER_SELECTION_BUTTON_H__
 #define __EM_FOLDER_SELECTION_BUTTON_H__
 
diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c
index 889eccf41e..d56a470153 100644
--- a/mail/em-folder-selection.c
+++ b/mail/em-folder-selection.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h
index ee5f755225..78cd300410 100644
--- a/mail/em-folder-selection.h
+++ b/mail/em-folder-selection.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef EM_FOLDER_SELECTION_H
 #define EM_FOLDER_SELECTION_H
 
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 8d7351b049..ff935674e2 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index ced6448101..06b1bc4520 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index a8b311a150..3247eee308 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_FOLDER_TREE_MODEL_H__
 #define __EM_FOLDER_TREE_MODEL_H__
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index e7cbd0c75b..6d887be3c8 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -937,7 +937,7 @@ emft_drop_async__exec (struct _DragDataReceivedAsync *m)
 			break;
 		case DND_DROP_TYPE_TEXT_URI_LIST:
 			/* import an mbox, maildir, or mh folder? */
-			em_utils_selection_get_mailbox(m->selection, folder);
+			em_utils_selection_get_urilist(m->selection, folder);
 			break;
 		default:
 			abort();
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 63b32376a0..e89be47506 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_FOLDER_TREE_H__
 #define __EM_FOLDER_TREE_H__
 
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index b1ec99f25e..ef0af85bd2 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -1,23 +1,22 @@
-
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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.
+ *
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.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)
  *
  */
 
@@ -174,7 +173,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
 					camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex);
 					camel_folder_free_uids (fromfolder, uids);
 
-					if (m->delete)
+					if (m->delete && !camel_exception_is_set (&m->base.ex))
 						camel_folder_sync(fromfolder, TRUE, NULL);
 
 					camel_object_unref (fromfolder);
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index df11527f5a..19bedd46a3 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *           Rodney Dawes <dobey@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *      Rodney Dawes <dobey@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index 503aad0118..42ef20d296 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 58d0563887..60881396c2 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h
index 9a2d8c9b4f..3665bbf0db 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 199ff19b67..5bb9cc32d3 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -61,6 +61,7 @@
 #include <camel/camel-cipher-context.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-string-utils.h>
+#include <camel/camel-operation.h>
 
 #include <misc/e-cursors.h>
 #include <e-util/e-util.h>
@@ -1249,7 +1250,12 @@ efhd_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormat
 	info->handle = handle;
 	info->shown = TRUE;
 	info->snoop_mime_type = ((EMFormat *) efh)->snoop_mime_type;
-	info->fit_width = ((GtkWidget *)((EMFormatHTML *)info->puri.format)->html)->allocation.width - 12;
+	if (camel_operation_cancel_check (NULL) || !info->puri.format || !((EMFormatHTML *)info->puri.format)->html) {
+		/* some fake value, we are cancelled anyway, thus doesn't matter */
+		info->fit_width = 256;
+	} else {
+		info->fit_width = ((GtkWidget *)((EMFormatHTML *)info->puri.format)->html)->allocation.width - 12;
+	}
 
 	camel_stream_printf(stream, "<td><object classid=\"%s\"></object></td>", classid);
 	g_free(classid);
@@ -2446,7 +2452,12 @@ efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, C
 {
 	char *classid, *html;
 	struct _attach_puri *info;
-	CamelStream *stream = ((CamelStreamFilter *) fstream)->source;
+	CamelStream *stream;
+
+	if (CAMEL_IS_STREAM_FILTER (fstream) && ((CamelStreamFilter *) fstream)->source)
+		stream = ((CamelStreamFilter *) fstream)->source;
+	else
+		stream = fstream;
 
 	classid = g_strdup_printf("optional%s", emf->part_id->str);
 	info = (struct _attach_puri *)em_format_add_puri(emf, sizeof(*info), classid, part, efhd_attachment_frame);
diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h
index be84decc11..651b981364 100644
--- a/mail/em-format-html-display.h
+++ b/mail/em-format-html-display.h
@@ -1,3 +1,22 @@
+/*
+ *
+ * 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)
+ *
+ */
 
 /*
   Concrete class for formatting mails to displayed html
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index cfff244dd2..c0d3573a3e 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h
index a013d57452..e308b065fa 100644
--- a/mail/em-format-html-print.h
+++ b/mail/em-format-html-print.h
@@ -1,8 +1,21 @@
-
 /*
-  Concrete class for formatting mails to displayed html
-*/
-
+ * Concrete class for formatting mails to displayed html
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ */
 #ifndef _EM_FORMAT_HTML_PRINT_H
 #define _EM_FORMAT_HTML_PRINT_H
 
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 942e082d70..a74432fdd9 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 804eead5fd..49c546863a 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-format-quote.h b/mail/em-format-quote.h
index 1c121c8205..6b48fb87b4 100644
--- a/mail/em-format-quote.h
+++ b/mail/em-format-quote.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef _EM_FORMAT_QUOTE_H
 #define _EM_FORMAT_QUOTE_H
 
diff --git a/mail/em-format.h b/mail/em-format.h
index 1804c85cec..7d4b00b903 100644
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c
index 2644afcf3d..daa81d356d 100644
--- a/mail/em-html-stream.c
+++ b/mail/em-html-stream.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	    Michael Zucchi <notzed@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h
index fd2df99b1d..a8eabdda55 100644
--- a/mail/em-html-stream.h
+++ b/mail/em-html-stream.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.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/mail/em-icon-stream.h b/mail/em-icon-stream.h
index 646815bfda..f92bfefb54 100644
--- a/mail/em-icon-stream.h
+++ b/mail/em-icon-stream.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Michael Zucchi <notzed@ximian.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 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 42db3bcca1..07c7afa192 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
- *
- *  Authors: Michael Zucchi <notzed@ximian.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 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.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/mail/em-inline-filter.h b/mail/em-inline-filter.h
index f4d7624b93..062a590445 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Michael Zucchi <notzed@ximian.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 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index 0b63334d41..62a05fd4ff 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Vivek Jain <jvivek@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:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h
index 3dfc3347eb..70926b2f11 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Vivek Jain <jvivek@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:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-menu.c b/mail/em-menu.c
index e8021e1bea..9894054dc7 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-menu.h b/mail/em-menu.h
index c74113f620..48fc96b7fc 100644
--- a/mail/em-menu.h
+++ b/mail/em-menu.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h
index 47d2fa38b9..cf00a74a75 100644
--- a/mail/em-message-browser.h
+++ b/mail/em-message-browser.h
@@ -1,3 +1,22 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef EM_MESSAGE_BROWSER_H
 #define EM_MESSAGE_BROWSER_H
diff --git a/mail/em-migrate.h b/mail/em-migrate.h
index e752b513e6..c755ef9b39 100644
--- a/mail/em-migrate.h
+++ b/mail/em-migrate.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_MIGRATE_H__
 #define __EM_MIGRATE_H__
 
diff --git a/mail/em-popup.h b/mail/em-popup.h
index 685ea8f684..fbe41a310a 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-search-context.c b/mail/em-search-context.c
index 56c07a9a17..5bf98614c6 100644
--- a/mail/em-search-context.c
+++ b/mail/em-search-context.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-search-context.h b/mail/em-search-context.h
index 8b691da270..3df5c1d577 100644
--- a/mail/em-search-context.h
+++ b/mail/em-search-context.h
@@ -1,26 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
-
 #ifndef _EM_SEARCH_CONTEXT_H
 #define _EM_SEARCH_CONTEXT_H
 
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index da22a2fa0b..7dd8a87416 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h
index ba190eb747..be72cef3df 100644
--- a/mail/em-stripsig-filter.h
+++ b/mail/em-stripsig-filter.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_STRIPSIG_FILTER_H__
 #define __EM_STRIPSIG_FILTER_H__
 
diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h
index c6989af84b..aa9c9a2c2d 100644
--- a/mail/em-subscribe-editor.h
+++ b/mail/em-subscribe-editor.h
@@ -1,3 +1,22 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef _EM_SUBSCRIBE_EDITOR_H
 #define _EM_SUBSCRIBE_EDITOR_H
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 82c8b20aeb..ce388eea42 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	     Michael Zucchi <notzed@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.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/mail/em-sync-stream.h b/mail/em-sync-stream.h
index 57e1b4771e..af513e9594 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@ximian.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 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.
+ * 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 5fd05faafb..0bce56d7f3 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c
index 9db3781771..eebf12e960 100644
--- a/mail/em-vfolder-context.c
+++ b/mail/em-vfolder-context.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-vfolder-context.h b/mail/em-vfolder-context.h
index 893d4f4f50..50ce239fb6 100644
--- a/mail/em-vfolder-context.h
+++ b/mail/em-vfolder-context.h
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_VFOLDER_CONTEXT_H
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index c97053280c..b0614d937f 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -1,23 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h
index e6c60157ed..bbdb6ffce8 100644
--- a/mail/em-vfolder-editor.h
+++ b/mail/em-vfolder-editor.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_VFOLDER_EDITOR_H
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 65e56dfe6e..6e12a0456d 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Author: Not Zed <notzed@lostzed.mmc.com.au>
- *          Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@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/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index 18954f11bd..18f8c3156b 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Author: NotZed <notzed@ximian.com>
- *          Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		NotZed <notzed@ximian.com>
+ *      Jeffrey Stedfast <fejj@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.
  */
 
 #ifndef _EM_VFOLDER_RULE_H
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 4d49bd6702..f32428aa4a 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -376,7 +376,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Search for the sender photo in local addressbooks </short>
+         <short>Search for the sender photo in local address books </short>
          <long>
           This option would help in improving the speed of fetching.
          </long>
@@ -1163,12 +1163,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Consult address books when testing for junk mail</short>
+         <short>Determines whether to lookup in address book for sender email</short>
          <long>
-	 Consult autocompletion-enabled address books when testing for junk
-         mail. If the sender's email address is found, do not mark the message
-         as junk. Note, this operation can be slow when consulting remote
-         address books such as LDAP.
+	 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.
          </long>
       </locale>
     </schema>
@@ -1180,9 +1177,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Determines whether to look up addresses for junk filtering in local addressbook only</short>
+         <short>Determines whether to look up addresses for junk filtering in local address book only</short>
          <long>
-	 This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local addressbook only to exclude mail sent by known contacts from junk filtering.
+	 This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering.
          </long>
       </locale>
     </schema>
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index f87a234703..de26d7c0c1 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* elm-importer.c
- *
- * Authors: Iain Holmes  <iain@ximian.com>
- *	    Michael Zucchi <notzed@ximian.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 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:
+ *		Iain Holmes  <iain@ximian.com>
+ *	    Michael Zucchi <notzed@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/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 8c5bb009fc..4144deba98 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.h
- *
- * Authors: Iain Holmes <iain@ximian.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 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.
+ * 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 <iain@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.
  */
 
 #ifndef __MAIL_IMPORTER_H__
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index f19512e892..af5f26093f 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -1,29 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-autofilter.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Code for autogenerating rules or filters from a message.
  *
  * 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.
+ * 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.
+ * 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:
- *   Michael Zucchi <notzed@ximian.com>
- *   Ettore Perazzoli <ettore@ximian.com>
+ *		Michael Zucchi <notzed@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
-/* Code for autogenerating rules or filters from a message.  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 9b4057e225..9f2f66674a 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-autofilter.h
- *
- * 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.
+ * 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.
+ * 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:
- *   Michael Zucchi <notzed@ximian.com>
- *   Ettore Perazzoli <ettore@ximian.com>
+ *		Michael Zucchi <notzed@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _MAIL_AUTOFILTER_H
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
index 62a1f4bd17..04d44e9725 100644
--- a/mail/mail-component-factory.c
+++ b/mail/mail-component-factory.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-component-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@ximian.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 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.
+ * 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:
+ *		Ettore Perazzoli <ettore@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/mail/mail-component.c b/mail/mail-component.c
index 86a3388b1f..bbb4f7e971 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -490,8 +490,6 @@ impl_finalize (GObject *object)
 
 	g_free (priv->base_directory);
 
-	mail_async_event_destroy (priv->async_event);
-
 	g_hash_table_destroy (priv->store_hash);
 
 	if (mail_async_event_destroy (priv->async_event) == -1) {
@@ -900,7 +898,11 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev)
 		/* Falls through */
 	case MC_QUIT_THREADS:
 		/* should we keep cancelling? */
-		return !mail_msg_active((unsigned int)-1);
+		if (mail_msg_active((unsigned int)-1))
+			return FALSE;
+
+		mail_session_shutdown ();
+		return TRUE;
 	}
 
 	return TRUE;
@@ -1299,10 +1301,13 @@ mail_component_init (MailComponent *component)
 		(GDestroyNotify) NULL,
 		(GDestroyNotify) store_hash_free);
 
-	mail_autoreceive_init();
+	mail_autoreceive_init (session);
 
 	priv->mail_sync_in_progress = 0;
-	priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component);
+	if (g_getenv("CAMEL_FLUSH_CHANGES"))
+		priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component);
+	else 
+		priv->mail_sync_id = 0;
 }
 
 /* Public API.  */
diff --git a/mail/mail-component.h b/mail/mail-component.h
index 9e775ad59f..95017b5149 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-component.h
- *
- * 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.
+ * 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.
+ * 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:
- *   Michael Zucchi <notzed@ximian.com>
- *   Jeffrey Stedfast <fejj@ximian.com>
- *   Ettore Perazzoli <ettore@ximian.com>
+ *		Michael Zucchi <notzed@ximian.com>
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _MAIL_COMPONENT_H_
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
index d9a507c907..74c05ec8fc 100644
--- a/mail/mail-config-factory.c
+++ b/mail/mail-config-factory.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h
index ea2113fca7..f3a4b5fd29 100644
--- a/mail/mail-config-factory.h
+++ b/mail/mail-config-factory.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __MAIL_CONFIG_FACTORY_H__
 #define __MAIL_CONFIG_FACTORY_H__
 
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 41e5b27465..05e1843bbf 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -6196,7 +6196,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 			<widget class="GtkCheckButton" id="photo_local">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">S_earch for sender photograph only in local addressbooks</property>
+			  <property name="label" translatable="yes">S_earch for sender photograph only in local address books</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -6779,7 +6779,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		    <widget class="GtkCheckButton" id="lookup_book">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my addressbook</property>
+		      <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my address book</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -6802,7 +6802,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		    <widget class="GtkCheckButton" id="junk_lookup_local_only">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Lookup in local addressbook only</property>
+		      <property name="label" translatable="yes">_Lookup in local address book only</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 4a1df5e2b2..81f245170e 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.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/mail/mail-crypto.c b/mail/mail-crypto.c
index 7c62d1873c..d7350eaa2a 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.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/mail/mail-crypto.h b/mail/mail-crypto.h
index 216b242c85..dbe1e6f86b 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.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/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index b610a8a2b5..63a8f2cf90 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -206,6 +206,19 @@ real_flush_updates(void *o, void *event_data, void *data)
 			e_event_emit((EEvent *)e, "folder.changed", (EEventTarget *)t);
 		}
 
+		if (CAMEL_IS_VEE_STORE (up->store) && !up->remove) {
+			/* Normally the vfolder store takes care of the folder_opened event itself,
+			   but we add folder to the noting system later, thus we do not know about
+			   search folders to update them in a tree, thus ensure their changes will
+			   be tracked correctly. */
+			CamelFolder *folder = camel_store_get_folder (up->store, up->full_name, 0, NULL);
+
+			if (folder) {
+				mail_note_folder (folder);
+				camel_object_unref (folder);
+			}
+		}
+
 		free_update(up);
 
 		LOCK(info_lock);
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index 936eaa24e8..f62d94169b 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-folder-cache.h: Stores information about open folders */
-
 /*
- * Authors: Peter Williams <peterw@ximian.com>
- *	    Michael Zucchi <notzed@ximian.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 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:
+ *		Peter Williams <peterw@ximian.com>
+ *	    Michael Zucchi <notzed@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
  */
 
+/* mail-folder-cache.h: Stores information about open folders */
+
 #ifndef _MAIL_FOLDER_CACHE_H
 #define _MAIL_FOLDER_CACHE_H
 
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index d434b9a206..dba4adee16 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@ximian.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 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.
+ * 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index bc0efb22fa..6a8c998343 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -337,7 +337,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
 					}
 				}
 
-				if (fm->delete || cache_uids) {
+				if ((fm->delete || cache_uids) && !camel_exception_is_set (&fm->base.ex)) {
 					/* expunge messages (downloaded so far) */
 					camel_folder_sync(folder, fm->delete, NULL);
 				}
@@ -772,8 +772,10 @@ send_queue_exec (struct _send_queue_msg *m)
 	camel_folder_free_uids (m->queue, uids);
 	g_ptr_array_free (send_uids, TRUE);
 
-	camel_folder_sync (m->queue, TRUE, &ex);
-	camel_exception_clear (&ex);
+	if (j <= 0 && !camel_exception_is_set (&m->base.ex)) {
+		camel_folder_sync (m->queue, TRUE, &ex);
+		camel_exception_clear (&ex);
+	}
 
 	if (sent_folder) {
 		camel_folder_sync (sent_folder, FALSE, &ex);
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 64879676c5..14654aa0b4 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors:
- *  Peter Williams <peterw@ximian.com>
- *  Michael Zucchi <notzed@ximian.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 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:
+ *		Peter Williams <peterw@ximian.com>
+ *		Michael Zucchi <notzed@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
  */
 
 #ifndef MAIL_OPS_H
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 588d1287ae..139bc2dc25 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1061,7 +1061,7 @@ auto_online(CamelObject *o, void *ed, void *d)
 /* call to setup initial, and after changes are made to the config */
 /* FIXME: Need a cleanup funciton for when object is deactivated */
 void
-mail_autoreceive_init(void)
+mail_autoreceive_init (CamelSession *session)
 {
 	EAccountList *accounts;
 	EIterator *iter;
@@ -1079,7 +1079,7 @@ mail_autoreceive_init(void)
 	for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter))
 		auto_account_added(accounts, (EAccount *)e_iterator_get(iter), NULL);
 
-	camel_object_hook_event(mail_component_peek_session(NULL), "online", auto_online, NULL);
+	camel_object_hook_event (session, "online", auto_online, NULL);
 }
 
 /* we setup the download info's in a hashtable, if we later need to build the gui, we insert
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 73c0d9fb06..8d8e4bbde2 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <NotZed@ximian.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 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.
+ * 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:
+ *		Michael Zucchi <NotZed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -31,13 +31,15 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
+struct _CamelSession;
+
 /* send/receive all uri's */
 GtkWidget *mail_send_receive(void);
 /* receive a single uri */
 void mail_receive_uri(const char *uri, int keep);
 void mail_send (void);
 /* setup auto receive stuff */
-void mail_autoreceive_init(void);
+void mail_autoreceive_init (struct _CamelSession *session);
 
 #ifdef __cplusplus
 }
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 00e4c64405..d86242d393 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -1,24 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-session.c: handles the session information and resource manipulation */
 /*
- *  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.
+ * 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.
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
+/* mail-session.c: handles the session information and resource manipulation */
+
 #include <config.h>
 
 #include <stdlib.h>
@@ -711,6 +713,12 @@ mail_session_init (const char *base_directory)
 	g_free (camel_dir);
 }
 
+void
+mail_session_shutdown (void)
+{
+	camel_shutdown ();
+}
+
 gboolean
 mail_session_get_interactive (void)
 {
diff --git a/mail/mail-session.h b/mail/mail-session.h
index 600b43c7a9..a2a5e9706f 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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.
+ * 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:
+ *		Jeffrey Stedfast <fejj@ximian.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)
  *
  */
 
@@ -33,6 +33,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 void mail_session_init (const char *base_directory);
+void mail_session_shutdown (void);
 gboolean mail_session_get_interactive (void);
 void mail_session_set_interactive (gboolean interactive);
 char *mail_session_request_dialog (const char *prompt, gboolean secret,
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index ade9655684..912182f5ac 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Radek Doulik <rodo@ximian.com>
- *           Jeffrey Stedfast <fejj@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:
+ *		Radek Doulik <rodo@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/mail-signature-editor.h b/mail/mail-signature-editor.h
index 029019f44a..649504be18 100644
--- a/mail/mail-signature-editor.h
+++ b/mail/mail-signature-editor.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors:
- *    Radek Doulik <rodo@ximian.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 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.
+ * 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>
  *
- * 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/mail/mail-tools.c b/mail/mail-tools.c
index 0c85277fc8..7278829501 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors:
- *  Dan Winship <danw@ximian.com>
- *  Peter Williams <peterw@ximian.com>
- *  Jeffrey Stedfast <fejj@ximian.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 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:
+ *		Dan Winship <danw@ximian.com>
+ *		Peter Williams <peterw@ximian.com>
+ *		Jeffrey Stedfast <fejj@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/mail/mail-tools.h b/mail/mail-tools.h
index ca79e961e9..794c1d4735 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author :
- *  Peter Williams <peterw@ximian.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 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:
+ *		Peter Williams <peterw@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
  */
 
 #ifndef MAIL_TOOLS_H
diff --git a/mail/mail-types.h b/mail/mail-types.h
index 9d2350b43f..1873dc8d00 100644
--- a/mail/mail-types.h
+++ b/mail/mail-types.h
@@ -1,21 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * 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.
+ * 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/>  
+ *
+ *
+ * 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 MAIL_TYPES_H
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 6d0d83e46e..d0d9997203 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index 651ace301b..b0f684e721 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -1,3 +1,23 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef _MAIL_VFOLDER_H
 #define _MAIL_VFOLDER_H
diff --git a/mail/message-list.c b/mail/message-list.c
index 19e017e211..306133610a 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4205,14 +4205,16 @@ regen_list_done (struct _regen_list_msg *m)
 		}
 	}
 
-	if (message_list_length (m->ml) <= 0) {
-		/* space is used to indicate no search too */
-		if (m->ml->search && strcmp (m->ml->search, " ") != 0)
-			e_tree_set_info_message (m->ml->tree, _("No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."));
-		else
-			e_tree_set_info_message (m->ml->tree, _("There are no messages in this folder."));
-	} else
-		e_tree_set_info_message (m->ml->tree, NULL);
+	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (m->ml))) {
+		if (message_list_length (m->ml) <= 0) {
+			/* space is used to indicate no search too */
+			if (m->ml->search && strcmp (m->ml->search, " ") != 0)
+				e_tree_set_info_message (m->ml->tree, _("No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."));
+			else
+				e_tree_set_info_message (m->ml->tree, _("There are no messages in this folder."));
+		} else
+			e_tree_set_info_message (m->ml->tree, NULL);
+	}
 
 	g_signal_emit (m->ml, message_list_signals[MESSAGE_LIST_BUILT], 0);
 	m->ml->priv->any_row_changed = FALSE;
@@ -4357,12 +4359,14 @@ mail_regen_list (MessageList *ml, const char *search, const char *hideexpr, Came
 	}
 
 	if (message_list_length (ml) <= 0) {
-		/* there is some info why the message list is empty, let it be something useful */
-		char *txt = g_strconcat (_("Generating message list"), "..." , NULL);
+		if (GTK_WIDGET_VISIBLE (GTK_WIDGET (ml))) {
+			/* there is some info why the message list is empty, let it be something useful */
+			char *txt = g_strconcat (_("Generating message list"), "..." , NULL);
 
-		e_tree_set_info_message (m->ml->tree, txt);
+			e_tree_set_info_message (m->ml->tree, txt);
 
-		g_free (txt);
+			g_free (txt);
+		}
 	} else if (ml->priv->any_row_changed && m->dotree && !ml->just_set_folder && (!ml->search || g_str_equal (ml->search, " "))) {
 		/* there has been some change on any row, if it was an expand state change,
 		   then let it save; if not, then nothing happen. */
diff --git a/mail/message-list.h b/mail/message-list.h
index fe9f42f19f..b144708208 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef _MESSAGE_LIST_H_
 #define _MESSAGE_LIST_H_
 
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
index d31ee93daf..71d2ae41c8 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 71a2a3c0d0..019c7e2e63 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __MESSAGE_TAG_EDITOR_H__
 #define __MESSAGE_TAG_EDITOR_H__
 
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 52fc313e30..3818c6ecf0 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index 35b39b940b..80f261fb80 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/addressbook-file/ChangeLog b/plugins/addressbook-file/ChangeLog
index 167e44dc61..f9b08a85f3 100644
--- a/plugins/addressbook-file/ChangeLog
+++ b/plugins/addressbook-file/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* addressbook-file.c:
+
 2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #545568
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 6e251b3572..0a9ee8b79e 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -1,21 +1,22 @@
 /*
- *
- *
- * Copyright (C) 2004 Sivaiah Nallagatla
- *
  * 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/>  
+ *
+ *
+ * Authors:
+ *		Sivaiah Nallagatla <snallagatla@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/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index d87b1e8b6b..4bea33f456 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* backup-restore.c:
+	* backup.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index b7d0793ca1..3486844cc3 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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)
+ *
+ */
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 947639972b..26c4fb958f 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -1,3 +1,23 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+ 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 703868747b..6c110fd1fc 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,24 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gaimbuddies.c:
+
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* bbdb.c: (bbdb_page_factory):
+	* org-gnome-evolution-bbdb.eplug.xml: Change "addressbook" to
+	"address book" in translatable strings.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* bbdb.h:
+	* test-evobuddy.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 98db91fb99..f5f09274a1 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -564,7 +564,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable BBDB checkbox */
-	check = gtk_check_button_new_with_mnemonic (_("_Auto-create addressbook entries when replying to messages"));
+	check = gtk_check_button_new_with_mnemonic (_("_Auto-create address book entries when replying to messages"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (enable_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0);
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index f4a3bc51ff..e36a7737c3 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.h
@@ -1,3 +1,23 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef __BBDB_H__
 #define __BBDB_H__
 
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 791d9ea493..1a336bc7bb 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -6,31 +6,27 @@
  *  don't already have a buddy icon defined for a person.
  *
  *  This works today (25 October 2004), but is pretty sure to break
- *  later on as the Gaim buddylist file format shifts.
+ *  later on as the Gaim buddylist file format shifts. 
  *
- *  Nat Friedman <nat@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.
  *
- *  Permission is hereby granted, free of charge, to any person
- *  obtaining a copy of this software and associated documentation
- *  files (the "Software"), to deal in the Software without
- *  restriction, including without limitation the rights to use, copy,
- *  modify, merge, publish, distribute, sublicense, and/or sell copies
- *  of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * 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/>  
  *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- *  DEALINGS IN THE SOFTWARE.
+ * Authors:
+ *		Nat Friedman <nat@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <glib.h>
diff --git a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
index 970ff6e90f..ff3ff9f8d8 100644
--- a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
+++ b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
@@ -5,7 +5,7 @@
 	  _name="Automatic Contacts"
  	  location="@PLUGINDIR@/liborg-gnome-evolution-bbdb@SOEXT@">
 
-	  	<_description>Automatically fills your addressbook with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists.</_description>
+	  	<_description>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.</_description>
 
 		<author name="Nat Friedman" email="nat@novell.com"/>
 
diff --git a/plugins/bbdb/test-evobuddy.c b/plugins/bbdb/test-evobuddy.c
index 269999beb1..f7739faea7 100644
--- a/plugins/bbdb/test-evobuddy.c
+++ b/plugins/bbdb/test-evobuddy.c
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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)
+ *
+ */
+
 #include <stdio.h>
 
 void bbdb_sync_buddy_list (void);
diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog
index 43cc26248f..5463c6124e 100644
--- a/plugins/caldav/ChangeLog
+++ b/plugins/caldav/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* caldav-source.c:
+
 2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fixes bug #546785
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 8b48bf6319..24bf2040f3 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- * ex: set ts=8: */
-/* Evolution calendar - caldav backend
- *
- * 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.
+ * 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.
  *
- * Author: Christian Kellner <gicmo@gnome.org>
+ * Authors:
+ *		Christian Kellner <gicmo@gnome.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index 351dc79c96..66be2b91b2 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* calendar-file.c:
+
 2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #545568
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 1e93d410bd..33fef89cc4 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -1,21 +1,21 @@
 /*
- *
- *
- * 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 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.
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/copy-tool/ChangeLog b/plugins/copy-tool/ChangeLog
index be77eb5834..5fab320dc8 100644
--- a/plugins/copy-tool/ChangeLog
+++ b/plugins/copy-tool/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* copy-tool.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c
index e61c0800aa..052722f4eb 100644
--- a/plugins/copy-tool/copy-tool.c
+++ b/plugins/copy-tool/copy-tool.c
@@ -1,7 +1,25 @@
-
-/* Copyright (C) 2004 Michael Zucchi */
-
-/* This file is licensed under the GNU GPL v2 or later */
+/*
+ *
+ * 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:
+ *		Michael Zucchi <notzed@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 /* Add 'copy to clipboard' things to various menu's.
 
diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog
index e62c363bc2..cb0075e36b 100644
--- a/plugins/default-source/ChangeLog
+++ b/plugins/default-source/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* default-source.c:
+
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* org-gnome-default-source.eplug.xml: Change "addressbook" to
+	"address book" in translatable strings.
+
 2008-04-21  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #448863
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index d53983320d..132203cd38 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2004 D
- *
  * 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/>  
+ *
+ *
+ * Authors:
  *
- * 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/default-source/org-gnome-default-source.eplug.xml b/plugins/default-source/org-gnome-default-source.eplug.xml
index ec354e517e..92c6fb7078 100644
--- a/plugins/default-source/org-gnome-default-source.eplug.xml
+++ b/plugins/default-source/org-gnome-default-source.eplug.xml
@@ -6,7 +6,7 @@
      id="org.gnome.evolution.plugin.default-source"
      _name="Default Sources">
      <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-     <_description>Provides functionality for marking a calendar or an addressbook as the default one.</_description>
+     <_description>Provides functionality for marking a calendar or an address book as the default one.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 2c992a4fac..f69ba35622 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	* email-custom-header.c:
+	Don't mix declarations and code.
+
 2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/contact-editor/e-contact-editor.c:
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index ab882cc197..847c56d315 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -651,13 +651,13 @@ header_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIte
 	valid = gtk_tree_model_get_iter_first (model, iter);
 	while (valid && gtk_list_store_iter_is_valid (cd->store, iter)) {
 		char *keyword = NULL;
+		char *value = NULL;
 		gtk_tree_model_get (model, iter, HEADER_KEY_COLUMN, &keyword, -1);
 		/* Check if the keyword is not empty and then emit the row-changed
 		signal (if we delete the row, then the iter gets corrupted) */
 		if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0))
 			gtk_tree_model_row_changed (model, path, iter);
 		
-		char *value = NULL;
                 gtk_tree_model_get (model, iter, HEADER_VALUE_COLUMN, &value, -1);
                 /* Check if the keyword is not empty and then emit the row-changed
                 signal (if we delete the row, then the iter gets corrupted) */
@@ -919,9 +919,10 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);	
 
 	for (list = header_list; list; list = g_slist_next (list)) {
-		gtk_list_store_append (cd->store, &iter);
 		gchar **parse_header_list;
+
                 buffer = list->data;
+		gtk_list_store_append (cd->store, &iter);
                 parse_header_list = g_strsplit_set (buffer, "=,", -1);
                 str_colon = g_strconcat (parse_header_list[0], "", NULL);
                 gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1);
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 09fb3274af..f7f6927919 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,45 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* exchange-calendar.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* exchange-config-listener.c:
+	* exchange-delegates.c:
+	* exchange-folder-size-display.c:
+	* exchange-folder.c:
+	* exchange-mail-send-options.c:
+	* exchange-permissions-dialog.c:
+	* exchange-permissions-dialog.h:
+	* exchange-send-options.c:
+	* exchange-user-dialog.h:
+
+2008-08-28  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #458512
+
+	* exchange-send-options.glade:
+	Delete the accessibility tag from the User button.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* exchange-change-password.c:
+	* exchange-change-password.h:
+	* exchange-config-listener.h:
+	* exchange-delegates-user.h:
+	* exchange-delegates.h:
+	* exchange-folder-permission.c:
+	* exchange-folder-size-display.h:
+	* exchange-folder-subscription.c:
+	* exchange-folder-subscription.h:
+	* exchange-send-options.h:
+
 2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	* exchange-send-options.c:
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 19ff3d49f9..c871f68d77 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.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-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index 69ca5351cf..e35ee38dee 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Copyright (C) 2004 Novell, Inc.
+/*
  *
  * 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.
+ * 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)
  *
- * 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.
  */
 
 /* exchange-change-password: Change Password code */
diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h
index 41b85d056c..e2c40c0186 100644
--- a/plugins/exchange-operations/exchange-change-password.h
+++ b/plugins/exchange-operations/exchange-change-password.h
@@ -1,5 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2004 Novell, Inc. */
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __EXCHANGE_CHANGE_PASSWORD_H__
 #define __EXCHANGE_CHANGE_PASSWORD_H__
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index a562cc6493..913778a1b1 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -1,25 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Copyright (C) 2001-2004 Novell, Inc.
+/*
+ * ExchangeConfigListener: a class that listens to the config database
+ * and handles creating the ExchangeAccount object and making sure that
+ * default folders are updated as needed.
  *
  * 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.
+ * 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.
- */
-
-/* ExchangeConfigListener: a class that listens to the config database
- * and handles creating the ExchangeAccount object and making sure that
- * default folders are updated as needed.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index edf6208255..d0048ee4a9 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -1,5 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2001-2004 Novell, Inc. */
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __EXCHANGE_CONFIG_LISTENER_H__
 #define __EXCHANGE_CONFIG_LISTENER_H__
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index 02ae3dce26..56217981a8 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -1,5 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2002-2004 Novell, Inc. */
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __EXCHANGE_DELEGATES_USER_H__
 #define __EXCHANGE_DELEGATES_USER_H__
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 4ec12c35a7..b1c94afb1c 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -1,20 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Copyright (C) 2002-2004 Novell, Inc.
- *
+/*
  * 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.
+ * 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:
+ *
+ * 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.
  */
 
 /* ExchangeDelegates: Exchange delegate handling.
diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h
index facccd8e98..b0c6833ff7 100644
--- a/plugins/exchange-operations/exchange-delegates.h
+++ b/plugins/exchange-operations/exchange-delegates.h
@@ -1,5 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2002-2004 Novell, Inc. */
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __EXCHANGE_DELEGATES_H__
 #define __EXCHANGE_DELEGATES_H__
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index d06212f59d..ad36853cf1 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -1,21 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Shakti Sen <shprasad@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Shakti Sen <shprasad@novell.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/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index 1cd6924176..4d3082e805 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -1,20 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* Copyright (C) 2002-2004 Novell, Inc.
- *
+/*
  * 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.
+ * 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:
+ *
+ * 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.
  */
 
 /* ExchangeFolderSize: Display the folder tree with the folder sizes */
diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h
index 46b5ffe0c5..9c10b93b5f 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.h
+++ b/plugins/exchange-operations/exchange-folder-size-display.h
@@ -1,5 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2002-2004 Novell, Inc. */
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __EXCHANGE_FOLDER_SIZE_DISPLAY_H__
 #define __EXCHANGE_FOLDER_SIZE_DISPLAY_H__
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 9706dd29ab..1ffbd7365c 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -1,21 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Shakti Sen <shprasad@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Shakti Sen <shprasad@novell.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/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h
index fa63a6a75d..26b4bc3642 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.h
+++ b/plugins/exchange-operations/exchange-folder-subscription.h
@@ -1,3 +1,23 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
 #ifndef __EXCHANGE_FOLDER_SUBSCRIPTION_H__
 #define __EXCHANGE_FOLDER_SUBSCRIPTION_H__
 
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 04062db352..3f2dc421fc 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -1,21 +1,23 @@
-/* -*- Mode: 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.
  *
- *  Shakti Sen <shprasad@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:
+ *		Shakti Sen <shprasad@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index dc76678850..7b801b13e5 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Authors: R.Raghavendran <raghavguru7@gmail.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 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.
+ * 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:
+ *		R.Raghavendran <raghavguru7@gmail.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index 9b4ed097e8..d5c171382b 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -1,20 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Copyright (C) 2002-2004 Novell, Inc.
- *
+/*
  * 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.
+ * 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:
+ *
+ * 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/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h
index e08d80bb49..aa8d9bb043 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.h
+++ b/plugins/exchange-operations/exchange-permissions-dialog.h
@@ -1,5 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2001-2004 Novell, Inc. */
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __EXCHANGE_PERMISSIONS_DIALOG_H__
 #define __EXCHANGE_PERMISSIONS_DIALOG_H__
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index ef7687df93..6ca64049ca 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: R.Raghavendran <raghavguru7@gmail.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 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:
+ *		R.Raghavendran <raghavguru7@gmail.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, MA 02110-1301.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/exchange-operations/exchange-send-options.glade b/plugins/exchange-operations/exchange-send-options.glade
index 92a9dc2b75..22003ae588 100644
--- a/plugins/exchange-operations/exchange-send-options.glade
+++ b/plugins/exchange-operations/exchange-send-options.glade
@@ -299,9 +299,6 @@ Low</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
-		  <accessibility>
-		    <atkproperty name="AtkObject::accessible_name" translatable="yes">button-user</atkproperty>
-		  </accessibility>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index b447bd0f6f..35ce50030f 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -1,20 +1,24 @@
- /* Evolution exchange send options
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Raghavendran R <raghavguru7@gmail.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.
+ * 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:
+ *		Raghavendran R <raghavguru7@gmail.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, MA 02110-1301.
  */
 
 #ifndef __EXCHANGE_SENDOPTIONS_DIALOG_H__
diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h
index 2c68e90378..453d4ca832 100644
--- a/plugins/exchange-operations/exchange-user-dialog.h
+++ b/plugins/exchange-operations/exchange-user-dialog.h
@@ -1,5 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Copyright (C) 2001-2004 Novell, Inc. */
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef __E2K_USER_DIALOG_H__
 #define __E2K_USER_DIALOG_H__
diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog
index 1eb9b8fdef..694cd53c64 100644
--- a/plugins/external-editor/ChangeLog
+++ b/plugins/external-editor/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* external-editor.c:
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #517151
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 698b39ffb9..ecccbf8740 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -1,4 +1,25 @@
-/* Sankar P - <psankar@novell.com> - GPL V3 or Later */
+/*
+ *
+ * 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:
+ *		Sankar P <psankar@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/plugins/face/ChangeLog b/plugins/face/ChangeLog
index c300752828..81bb76d3cb 100644
--- a/plugins/face/ChangeLog
+++ b/plugins/face/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* face.c:
+
 2008-05-08  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #525241 (EPluginUI)
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 0a77b01f7e..eff4fa5794 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Sankar P <psankar@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Sankar P <psankar@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog
index 6f26a1f396..c58c840d45 100644
--- a/plugins/folder-unsubscribe/ChangeLog
+++ b/plugins/folder-unsubscribe/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* folder-unsubscribe.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c
index cce860477b..d2d83b6ec6 100644
--- a/plugins/folder-unsubscribe/folder-unsubscribe.c
+++ b/plugins/folder-unsubscribe/folder-unsubscribe.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Jeffrey Stedfast <fejj@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog
index 3f37cde680..c8e97a9e6b 100644
--- a/plugins/google-account-setup/ChangeLog
+++ b/plugins/google-account-setup/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* google-source.c:
+
+2008-08-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #525555
+
+	* google-source.c: (print_uri_noproto): Removed.
+	* google-source.c: (user_changed): Do not leak.
+	* google-source.c: (plugin_google): Get username from source, not URL.
+
 2008-08-14  Jörgen Scheibengruber  <mfcn@gmx.de>
 
 	* google-contacts-source.c (on_ssl_cb_toggled),
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 57727c6122..772d8a771a 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *  Ebby Wiselyn <ebbywiselyn@gmail.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 version 2 of the GNU Lesser 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 Lesser 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 Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ *		Ebby Wiselyn <ebbywiselyn@gmail.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -118,43 +118,6 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 
 
 /********************************************************************************************************************/
-/* the location field for google sources */
-/* stolen from calendar-weather eplugin */
-static gchar *
-print_uri_noproto (EUri *uri)
-{
-	gchar *uri_noproto;
-
-	if (uri->port != 0)
-		uri_noproto = g_strdup_printf (
-			"%s%s%s%s%s%s%s:%d%s%s%s",
-			uri->user ? uri->user : "",
-			uri->authmech ? ";auth=" : "",
-			uri->authmech ? uri->authmech : "",
-			uri->passwd ? ":" : "",
-			uri->passwd ? uri->passwd : "",
-			uri->user ? "@" : "",
-			uri->host ? uri->host : "",
-			uri->port,
-			uri->path ? uri->path : "",
-			uri->query ? "?" : "",
-			uri->query ? uri->query : "");
-	else
-		uri_noproto = g_strdup_printf (
-			"%s%s%s%s%s%s%s%s%s%s",
-			uri->user ? uri->user : "",
-			uri->authmech ? ";auth=" : "",
-			uri->authmech ? uri->authmech : "",
-			uri->passwd ? ":" : "",
-			uri->passwd ? uri->passwd : "",
-			uri->user ? "@" : "",
-			uri->host ? uri->host : "",
-			uri->path ? uri->path : "",
-			uri->query ? "?" : "",
-			uri->query ? uri->query : "");
-	return uri_noproto;
-}
-
 #if 0
 
 FIXME: Not sure why this function is declared but called no where. This needs fixing.
@@ -264,22 +227,9 @@ static void init_combo_values (GtkComboBox *combo, const char *deftitle, const c
 static void
 user_changed (GtkEntry *editable, ESource *source)
 {
-	EUri       *euri;
 	char       *uri;
-	char       *ruri;
 	const char *user;
 
-	uri = e_source_get_uri (source);
-
-	if (uri == NULL) {
-		g_free (uri);
-		return;
-	}
-
-	euri = e_uri_new (uri);
-	g_free (euri->user);
-	euri->user = NULL;
-
 	/* two reasons why set readonly to FALSE:
 	   a) the e_source_set_relative_uri does nothing for readonly sources
 	   b) we are going to set default uri, which should be always writeable */
@@ -290,7 +240,7 @@ user_changed (GtkEntry *editable, ESource *source)
 	e_source_set_relative_uri (source, uri);
 	g_free (uri);
 
-	e_source_set_property (source, "username", gtk_entry_get_text (GTK_ENTRY (editable)));
+	e_source_set_property (source, "username", user);
 	e_source_set_property (source, "protocol", "google");
 	e_source_set_property (source, "auth-domain", "google");
 	e_source_set_property (source, "auth", (user && *user) ? "1" : NULL);
@@ -299,10 +249,6 @@ user_changed (GtkEntry *editable, ESource *source)
 	/* we changed user, thus reset the chosen calendar combo too, because
 	   other user means other calendars subscribed */
 	init_combo_values (GTK_COMBO_BOX (g_object_get_data (G_OBJECT (editable), "CalendarCombo")), _("Default"), NULL);
-
-	ruri = print_uri_noproto (euri);
-	g_free (ruri);
-	e_uri_free (euri);
 }
 
 static char *
@@ -623,7 +569,7 @@ plugin_google  (EPlugin                    *epl,
 	GtkWidget    *label;
 	GtkWidget    *combo;
 	char         *uri;
-	char         *username;
+	const char   *username;
 	const char   *ssl_prop;
 	gboolean      ssl_enabled;
 	int           row;
@@ -651,7 +597,8 @@ plugin_google  (EPlugin                    *epl,
 		return NULL;
 	}
 
-	username = euri->user;
+	username = e_source_get_property (source, "username");
+	g_free (euri->user);
 	euri->user = NULL;
 	uri = e_uri_to_string (euri, FALSE);
 
@@ -742,7 +689,6 @@ plugin_google  (EPlugin                    *epl,
 			  source);
 
         g_free (uri);
-	g_free (username);
 
 	label = gtk_label_new_with_mnemonic (_("Cal_endar:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 6c0e4211e6..3eb01e4627 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* camel-gw-listener.c:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* camel-gw-listener.h:
+	* groupwise-account-setup.c:
+
 2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #545568
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 95885f8f5d..fa46d8d973 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *
- *  Sivaiah Nallagatla <snallagatla@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 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:
+ *		Sivaiah Nallagatla <snallagatla@novell.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/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h
index 0221370768..16a3fbe83b 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.h
+++ b/plugins/groupwise-account-setup/camel-gw-listener.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *
- *  Sivaiah Nallagatla <snallagatla@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 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:
+ *		Sivaiah Nallagatla <snallagatla@novell.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 CAMEL_GW_LISTENER_H
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index fd458679a2..5ca57d7c7f 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -1,30 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Sivaiah Nallagatla <snallagatla@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 Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
- *  Permission is hereby granted, free of charge, to any person
- *  obtaining a copy of this software and associated documentation
- *  files (the "Software"), to deal in the Software without
- *  restriction, including without limitation the rights to use, copy,
- *  modify, merge, publish, distribute, sublicense, and/or sell copies
- *  of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * 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.
  *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Software.
+ * 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:
+ *		Sivaiah Nallagatla <snallagatla@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- *  DEALINGS IN THE SOFTWARE.
  */
 
-
 #include "camel-gw-listener.h"
 #include <gtk/gtk.h>
 #include "mail/em-config.h"
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 1b18e0c3f2..0dfbadb63c 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,24 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* addressbook-groupwise.c:
+	* junk-mail-settings.c:
+	* mail-retract.c:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* junk-settings.h:
+	* mail-send-options.c:
+	* mail-send-options.h:
+	* process-meeting.c:
+	* proxy-login.h:
+	* proxy.h:
+	* share-folder-common.c:
+	* share-folder.h:
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #544861
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index 9e76401a61..c5959249df 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* *
- * Copyright (C) 2004 Sivaiah Nallagatla <snallagtla@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/>  
+ *
+ *
+ * Authors:
  *
- * 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/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 268a3378e3..4cee3919f4 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -1,23 +1,25 @@
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author(s): Vivek Jain <jvivek@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.
+ * 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:
+ *		Vivek Jain <jvivek@novell.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/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 66f5b576c3..9e3f60ce1a 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Vivek Jain <jvivek@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index bba7f65c5e..737d6626cd 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -1,22 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Author:
- *  Sankar P ( psankar@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.
  *
- *  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 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.
+ * Authors:
+ *		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/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 6071f67a60..0e0663c801 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Authors: Parthasarathi Susarla <sparthasarathi@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 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/>  
  *
- * 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:
+ *		Parthasarathi Susarla <sparthasarathi@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h
index 13529d8aa2..943614e995 100644
--- a/plugins/groupwise-features/mail-send-options.h
+++ b/plugins/groupwise-features/mail-send-options.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Authors: Parthasarathi Susarla <sparthasarathi@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 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/>  
  *
- * 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:
+ *		Parthasarathi Susarla <sparthasarathi@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index f4606439ce..412502f0b3 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -1,23 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Chenthill Palanisamy (pchenthill@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 version 2 of the GNU General Public
- *  License 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 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:
+ *		Chenthill Palanisamy (pchenthill@novell.com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index 1af8b495b8..b36d31563b 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -1,22 +1,24 @@
- /* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Shreyas Srinivasan <sshreyas@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.
+ * 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.
+ * 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:
+ *		Shreyas Srinivasan <sshreyas@novell.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 <gtk/gtk.h>
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 70dd97a363..8c8d30368c 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -1,24 +1,25 @@
- /* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * 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 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.
+ * 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:
+ *		Shreyas Srinivasan <sshreyas@novell.com>
+ *		Sankar P <psankar@novell.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 <libedataserver/e-account.h>
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 85f695d59b..cdea5a7265 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Vivek Jain <jvivek@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index d26c61c1b6..3acf595053 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Vivek Jain <jvivek@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/hula-account-setup/ChangeLog b/plugins/hula-account-setup/ChangeLog
index de0ceee8de..99def86394 100644
--- a/plugins/hula-account-setup/ChangeLog
+++ b/plugins/hula-account-setup/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* camel-hula-listener.c:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* camel-hula-listener.h:
+	* hula-account-setup.c:
+
 2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #545568
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 744f50d7e0..ee40a7bdb7 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *
- *  Harish Krishnaswamy <kharish@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 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:
+ *		Harish Krishnaswamy <kharish@novell.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/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
index e96e7a7f41..3dfdff3b2b 100644
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ b/plugins/hula-account-setup/camel-hula-listener.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *
- *  Harish Krishnaswamy <kharish@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 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:
+ *		Harish Krishnaswamy <kharish@novell.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 CAMEL_HULA_LISTENER_H
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 9aa593b9a5..6518d100c7 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -1,31 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  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.
  *
- *  Author: Harish Krishnaswamy <kharish@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.
  *
- *  Permission is hereby granted, free of charge, to any person
- *  obtaining a copy of this software and associated documentation
- *  files (the "Software"), to deal in the Software without
- *  restriction, including without limitation the rights to use, copy,
- *  modify, merge, publish, distribute, sublicense, and/or sell copies
- *  of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * 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/>  
  *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- *  DEALINGS IN THE SOFTWARE.
+ * Authors:
+ *		Harish Krishnaswamy <kharish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
-
 #include "camel-hula-listener.h"
 #include <gtk/gtk.h>
 #include "mail/em-config.h"
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog
index f2e73712c5..7dcf98134d 100644
--- a/plugins/import-ics-attachments/ChangeLog
+++ b/plugins/import-ics-attachments/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* icsimporter.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Added necessary libraries to link to. Build break while 
diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c
index 27477acf3b..fbd5e46518 100644
--- a/plugins/import-ics-attachments/icsimporter.c
+++ b/plugins/import-ics-attachments/icsimporter.c
@@ -1,21 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Authors: Johnny Jacob <johnnyjacob@gmail.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.
  *
- *  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 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.
+ * Authors:
+ *		Johnny Jacob <johnnyjacob@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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index 2afd831e4c..c9f0e90046 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,23 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* evolution-ipod-sync.h:
+	* ipod.c:
+
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* org-gnome-ipod-sync-evolution.eplug.xml: Change "addressbook" to
+	"address book" in translatable strings.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* format-handler.h:
+
 2008-08-12  Milan Crha  <mcrha@redhat.com>
 
 	* ipod-sync.c: Added missing include.
diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h
index 5984b8a059..6fbf1e985c 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.h
+++ b/plugins/ipod-sync/evolution-ipod-sync.h
@@ -1,9 +1,22 @@
 /*
- * evolution-ipod-sync.h
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
- * (C)2004 Justin Wake <jwake@iinet.net.au>
+ * 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.
  *
- * Licensed under the GNU GPL v2. See COPYING.
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2004 Justin Wake <jwake@iinet.net.au>
  *
  */
 
diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h
index e648ba3fdb..d061f4ce86 100644
--- a/plugins/ipod-sync/format-handler.h
+++ b/plugins/ipod-sync/format-handler.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Philip Van Hoof <pvanhoof@gnome.org>
+ * 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 version 2 of the GNU General Public
- *  License 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 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:
+ *		Philip Van Hoof <pvanhoof@gnome.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index 4edfd6a2dd..26e3d49475 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -1,9 +1,24 @@
 /*
  * ipod.c - Find an iPod mount point using HAL
  *
- * (C)2004 Justin Wake <jwake@iinet.net.au>
+ * 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.
  *
- * Licensed under the GNU GPL v2. See COPYING.
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2004 Justin Wake <jwake@iinet.net.au>
  *
  */
 
diff --git a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
index 6e3afa8037..e95b63b3b9 100644
--- a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
+++ b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
@@ -4,7 +4,7 @@
 	_name="iPod Synchronization"
 	    location="@PLUGINDIR@/liborg-gnome-ipod-sync-evolution@SOEXT@"> 
 	    <author name="Srinivasa Ragavan" email="sragavan@novell.com"/>
-	    <_description>Synchronize the selected task/memo/calendar/addressbook with Apple iPod</_description>
+	    <_description>Synchronize the selected task/memo/calendar/address book with Apple iPod</_description>
 	
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 7d0624cf42..4fc1bddaa4 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* itip-view.h:
+
 2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #546892
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 4a3bdc8cb7..f810f1f074 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-view.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _ITIP_VIEW_H_
diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog
index d266c0cf44..ef2b70ea17 100644
--- a/plugins/mail-to-meeting/ChangeLog
+++ b/plugins/mail-to-meeting/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mail-to-meeting.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/mail-to-meeting/mail-to-meeting.c b/plugins/mail-to-meeting/mail-to-meeting.c
index f3793edb99..b5702cdb6c 100644
--- a/plugins/mail-to-meeting/mail-to-meeting.c
+++ b/plugins/mail-to-meeting/mail-to-meeting.c
@@ -1,21 +1,24 @@
-/* Evolution - Mail To Meeting plugin
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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:
+ *		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/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index ffa866b4d6..7b9ac83950 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mail-to-task.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 5789cd001b..89075dfd28 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -1,9 +1,26 @@
-
-/* Copyright (C) 2004 Novell, Inc */
-/* Authors: Michael Zucchi
-            Rodrigo Moya */
-
-/* This file is licensed under the GNU GPL v2 or later */
+/*
+ *
+ * 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:
+ *		Michael Zucchi <notzed@novell.com>
+ *		Rodrigo Moya <rodrigo@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 /* Convert a mail message into a task */
 
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index 8c661916bb..066bf2bda1 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mailing-list-actions.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 60dc3de3e6..9772fc22e4 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -1,7 +1,23 @@
 /*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  * Copyright (C) 2004 Meilof Veeningen <meilof@wanadoo.nl>
  *
- * This file is licensed under the GNU GPL v2 or later
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
index caf1e71e70..c3d927f105 100644
--- a/plugins/mark-all-read/ChangeLog
+++ b/plugins/mark-all-read/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-02  Paul Bolle <pebolle@tiscali.nl>
+
+	** Fixes bug #550415
+
+	* mark-all-read.c (mar_got_folder): Do not leak an CamelFolderInfo.
+	Slightly change handling of CamelException.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mark-all-read.c:
+
 2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #530402
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index af6c482288..c9ea67ca61 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Chenthill Palanisamy (pchenthill@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 version 2 of the GNU General Public
- *  License 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 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:
+ *		Chenthill Palanisamy <pchenthill@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -221,19 +223,17 @@ mar_got_folder (char *uri, CamelFolder *folder, void *data)
 	gint response;
 	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST;
 
-	camel_exception_init (&ex);
-
 	/* FIXME we have to disable the menu item */
 	if (!folder)
 		return;
 
+	camel_exception_init (&ex);
+
 	store = folder->parent_store;
 	info = camel_store_get_folder_info (store, folder->full_name, flags, &ex);
 
-	if (camel_exception_is_set (&ex)) {
-		camel_exception_clear (&ex);
-		return;
-	}
+	if (camel_exception_is_set (&ex))
+		goto out;
 
 	if (info && (info->child || info->next))
 		response = prompt_user ();
@@ -244,6 +244,8 @@ mar_got_folder (char *uri, CamelFolder *folder, void *data)
 		mark_all_as_read (folder);
 	else if (response == GTK_RESPONSE_YES)
 		mar_all_sub_folders (store, info, &ex);
+out:
+	camel_store_free_folder_info(store, info);
 }
 
 static void
diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog
index e6131ce552..a78216273d 100644
--- a/plugins/mono/ChangeLog
+++ b/plugins/mono/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mono-plugin.c:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mono-plugin.h:
+
 2008-04-01  Johnny Jacob  <jjohnny@novell.com>
 
 	* Camel.cs: Type cast. Fixes compile error.
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index e1d7390375..5c5182e378 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -1,3 +1,23 @@
+/*
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/plugins/mono/mono-plugin.h b/plugins/mono/mono-plugin.h
index 76e459f743..3c11072e83 100644
--- a/plugins/mono/mono-plugin.h
+++ b/plugins/mono/mono-plugin.h
@@ -1,3 +1,26 @@
+/*
+ *
+ * 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:
+ *		Sankar P <psankar@novell.com>
+ *		Michael Zucchi <notzed@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifndef _ORG_GNOME_EVOLUTION_MONO_H
 #define _ORG_GNOME_EVOLUTION_MONO_H
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
index 9e1292570c..1b3d52084a 100644
--- a/plugins/plugin-manager/ChangeLog
+++ b/plugins/plugin-manager/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* plugin-manager.c:
+
 2008-06-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #530069
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index ba3722abfa..4658291679 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -1,8 +1,24 @@
-
-/* Copyright (C) 2004 Novell Inc.
-   by Michael Zucchi <notzed@ximian.com> */
-
-/* This file is licensed under the GNU GPL v2 or later */
+/*
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 /* A plugin manager ui */
 
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index 7f2699a779..9fbb00082b 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-09  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #551492
+
+	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
+	Initialize variable before using it.
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* prefer-plain.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index ba70c4288f..45cafa562a 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -1,7 +1,24 @@
-
-/* Copyright (C) 2004 Michael Zucchi */
-
-/* This file is licensed under the GNU GPL v2 or later */
+/*
+ * 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:
+ *		Michael Zucchi <notzed@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -93,6 +110,9 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
 	CamelMimePart *part, *display_part = NULL;
 	int i, nparts, partidlen, displayid = 0;
 
+	/* FIXME: this part-id stuff is poking private data, needs api */
+	partidlen = t->format->part_id->len;
+
 	if (epp_mode == EPP_NORMAL) {
 		gboolean have_plain = FALSE;
 
@@ -151,9 +171,6 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
 		}
 	}
 
-	/* this part-id stuff is poking private data, needs api */
-	partidlen = t->format->part_id->len;
-
 	/* if we found a text part, show it */
 	if (display_part) {
 		g_string_append_printf(t->format->part_id, ".alternative.%d", displayid);
diff --git a/plugins/profiler/ChangeLog b/plugins/profiler/ChangeLog
index 50dfdf6e80..16b77d5ba6 100644
--- a/plugins/profiler/ChangeLog
+++ b/plugins/profiler/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* profiler.c:
+
 2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* profiler.c: Add missing includes.
diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c
index 3948011c9c..6f52759e82 100644
--- a/plugins/profiler/profiler.c
+++ b/plugins/profiler/profiler.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Michael Zucchi <notzed@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 version 2 of the GNU General Public
- *  License 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 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:
+ *		Michael Zucchi <notzed@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index 7837857825..7b26673770 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,20 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* publish-format-fb.c:
+	* publish-format-ical.c:
+	* publish-location.c:
+	* publish-location.h:
+	* url-editor-dialog.h:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* publish-format-fb.h:
+	* publish-format-ical.h:
+
 2008-04-17  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #526739
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index b09d26d4be..f958fe5344 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.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/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h
index 1a1ee8e099..bd0ff7c31a 100644
--- a/plugins/publish-calendar/publish-format-fb.h
+++ b/plugins/publish-calendar/publish-format-fb.h
@@ -1,21 +1,23 @@
 /*
- * 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/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 792ae59e83..87752e826e 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.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/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h
index 60b3f53c2f..6cfff1011a 100644
--- a/plugins/publish-calendar/publish-format-ical.h
+++ b/plugins/publish-calendar/publish-format-ical.h
@@ -1,21 +1,23 @@
 /*
- * 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/publish-location.c b/plugins/publish-calendar/publish-location.c
index e1a87b46de..2de877b093 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -1,23 +1,23 @@
 /*
- * Authors:
- *  David Trowbridge <trowbrds@cs.colorado.edu>
- *  Gary Ekker <gekker@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:
+ *		David Trowbridge <trowbrds@cs.colorado.edu>
+ *		Gary Ekker <gekker@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h
index 0abd7d5b94..f3fbf03d49 100644
--- a/plugins/publish-calendar/publish-location.h
+++ b/plugins/publish-calendar/publish-location.h
@@ -1,23 +1,23 @@
 /*
- * Authors:
- *  David Trowbridge <trowbrds@cs.colorado.edu>
- *  Gary Ekker <gekker@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:
+ *		David Trowbridge <trowbrds@cs.colorado.edu>
+ *		Gary Ekker <gekker@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h
index 72b454d2e6..b464ff2252 100644
--- a/plugins/publish-calendar/url-editor-dialog.h
+++ b/plugins/publish-calendar/url-editor-dialog.h
@@ -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/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index eb418028d0..5398546088 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* format-handler.h:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h
index 2e050ea06a..0174bfc078 100644
--- a/plugins/save-calendar/format-handler.h
+++ b/plugins/save-calendar/format-handler.h
@@ -1,21 +1,22 @@
-/* -*- Mode: 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.
  *
- *  Authors: Philip Van Hoof <pvanhoof@gnome.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.
  *
- *  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 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.
+ * Authors:
+ *		Philip Van Hoof <pvanhoof@gnome.org>
  *
- *  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/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog
index abaa1aed35..de715176df 100644
--- a/plugins/select-one-source/ChangeLog
+++ b/plugins/select-one-source/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mark-calendar-offline.c:
+	* select-one-source.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/select-one-source/mark-calendar-offline.c b/plugins/select-one-source/mark-calendar-offline.c
index 1ca1d199fe..3ef3330f60 100644
--- a/plugins/select-one-source/mark-calendar-offline.c
+++ b/plugins/select-one-source/mark-calendar-offline.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Harish Krishnaswamy (kharish@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 version 2 of the GNU General Public
- *  License 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 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:
+ *		Harish Krishnaswamy <kharish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/select-one-source/select-one-source.c b/plugins/select-one-source/select-one-source.c
index 3d16546d0e..e45ef2debf 100644
--- a/plugins/select-one-source/select-one-source.c
+++ b/plugins/select-one-source/select-one-source.c
@@ -1,21 +1,23 @@
-/* -*- 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 version 2 of the GNU General Public
- *  License 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 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)
  *
  */
 
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
index 59b23f7b75..dbf730b10b 100644
--- a/plugins/subject-thread/ChangeLog
+++ b/plugins/subject-thread/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* subject-thread.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 2e12747c67..595f938414 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: JP Rosevear <jpr@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
index e1157ef1d9..04e998ef82 100644
--- a/plugins/templates/ChangeLog
+++ b/plugins/templates/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	* templates.c:
+	Don't mix declarations and code.
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index c72ae942a9..bb5630fc5d 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -586,6 +586,7 @@ static GSList
 		char *path;
 		EPopupItem *item;
 		CamelMimeMessage *message;
+		UserData *user_data;
 		const char *uid;
 
 		uid = g_strdup (g_ptr_array_index (uids, i));
@@ -615,7 +616,6 @@ static GSList
 		item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE;
 
 		/* Make some info available to the callback */
-		UserData *user_data;
 		user_data = g_slice_new(UserData);
 		user_data->msg = message;
 		user_data->t = t;
diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
index 0a7c857cb9..669d4373ca 100644
--- a/plugins/tnef-attachments/ChangeLog
+++ b/plugins/tnef-attachments/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-03  Sankar P  <psankar@novell.com>
+
+	* plugins/tnef-attachments/tnef-plugin.c:
+	Assign copyrights to Randall Hand.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* tnef-plugin.c:
+
 2008-03-31  Frederic Crozat  <fcrozat@mandriva.com>
 
 	** Fix for bug #501885
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 483ed35afd..e7b5d624eb 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -1,5 +1,23 @@
-/* Copyright (C) 2005 Novell Inc. */
-/* This file is licensed under the GNU GPL v2 */
+/*
+ *
+ * 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)
+ * Copyright (C) Randall Hand <randall.hand@gmail.com>
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/po/ChangeLog b/po/ChangeLog
index 478241a1a4..bc7c80754f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,202 @@
+2008-09-11  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-09-11  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+        * hi.po: Updated Hindi Translation.
+
+2008-09-11  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-11  Gil Forcada  <gforcada@gnme.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2008-09-10  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Yavor Doganov <yavor@gnu.org>
+
+2008-09-10  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-09-09  Krishnababu K  <kkrothap@redhat.com>
+
+	* te.po: Updated Telugu Translation.
+
+2008-09-09  Pema Geyleg  <pema.geyleg@gmail.com>
+
+	* dz.po: Updated Dzongkha Translation
+
+2008-09-09  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-09-08  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-08  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2008-09-07  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-07  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2008-09-07  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-09-07  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2008-09-07  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2008-09-06  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2008-09-06  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation.
+
+2008-09-05  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-05  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-09-05  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-09-03  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2008-08-31  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-08-31  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-31  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion by Mark Krapivner.
+
+2008-08-30  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Yannick Tailliez and Bruno Brouard.
+
+2008-08-30  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2008-08-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-30  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-08-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-29  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-08-28  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation, fix #545473.
+
+2008-08-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-08-27  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-25  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-08-25  Goran Rakic  <grakic@devbase.net>
+
+        * LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
+
+2008-08-25  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation
+
+2008-08-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-22  Shankar Prasad  <svenkate@redhat.com>
+
+        * kn.po: Updated Kannada translation
+
+2008-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-08-22  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-08-22  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2008-08-21  Jovan Naumovski  <jovan@lugola.net>
+ 
+ 	* mk.po: Updated Macedonian translation.
+
+2008-08-21  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2008-08-21  Shankar Prasad  <svenkate@redhat.com>
+
+        * kn.po: Updated Kannada translation
+
+2008-08-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-08-18  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
 2008-08-18  Shankar Prasad  <svenkate@redhat.com>
 
         * kn.po: Updated Kannada translation
diff --git a/po/LINGUAS b/po/LINGUAS
index 3e7692ebf5..8167901aff 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -67,7 +67,7 @@ sk
 sl
 sq
 sr
-sr@Latn
+sr@latin
 sv
 ta
 te
diff --git a/po/ar.po b/po/ar.po
index 026b3a6a58..9f53b6b643 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,12 +10,12 @@
 # Ahmad Farghal <ahmad.farghal@gmail.com>, 2006, 2007.
 # Anas Husseini <linux.anas@gmail.com>, 2007.
 # Abou Manal <aboumanal@gmail.com, 2008.
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 09:16+0100\n"
+"POT-Creation-Date: 2008-08-26 14:43+0100\n"
 "PO-Revision-Date: 2008-02-23 05:56+0100\n"
 "Last-Translator: Abou Manal <aboumanal@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -36,12 +36,12 @@ msgid "evolution addressbook"
 msgstr "د�تر عناوين إي��ليوشن"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "مراسَل جديد"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "قائمة مراسَلين جديدة"
 
@@ -166,7 +166,7 @@ msgid "calendar view for one or more days"
 msgstr "مشهد التقويم ليوم أو أكثر"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -177,8 +177,8 @@ 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:191
-#: ../calendar/gui/calendar-component.c:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../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
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -186,9 +186,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -196,10 +196,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -209,8 +209,8 @@ 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:221
-#: ../calendar/gui/calendar-component.c:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../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
 msgid "%d %b"
 msgstr "%d %b"
@@ -429,7 +429,7 @@ msgstr "�شل التّوثيق مع خادوم LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "�شل حذ� المرَاسل"
 
@@ -606,8 +606,8 @@ msgstr "إضبط التكملة التلقائية هنا"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
@@ -635,7 +635,8 @@ msgid "Evolution Address Book component"
 msgstr "مكون د�تر عناوين إي��ليوش�ن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "تحكّم إدارة شهادة S/MIME لإي��ليوش�ن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -650,13 +651,13 @@ msgstr "أدر شهادات S/Mime الخاصة بك هنا"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../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:196 ../mail/em-folder-tree-model.c:200
+#: ../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:1456
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "على هذا الحاسوب"
 
@@ -669,10 +670,10 @@ msgstr "على هذا الحاسوب"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../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:205
+#: ../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 "شخصي"
@@ -683,82 +684,82 @@ msgstr "شخصي"
 msgid "On LDAP Servers"
 msgstr "على خواديم LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "أنشئ مراسَل جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "أنشئ قائمة مراسَلين جديدة"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "د�تر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "أنشئ د�تر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�شلت �ي ترقية إعدادات أو مجلد د�تر العناوين."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "قاعدة"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../addressbook/gui/component/addressbook-config.c:517
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "ال_نوع:"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "انسخ محتويات الد�تر محليا للتعامل دون اتصال"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "عام"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "د�تر العناوين"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "معلومات الخادوم"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "التوثق"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "ت�اصيل"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:965
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "يجري البحث"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "يجري التنزيل"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "خصائص د�تر العناوين"
@@ -769,9 +770,9 @@ msgid "Migrating..."
 msgstr "يجري الترقية..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
-#, c-format
-msgid "Migrating `%s':"
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
 msgstr "يجري ترقية `%s':"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -823,68 +824,74 @@ msgstr ""
 "\n"
 "رجاءً كن صابرًا ريثما يقوم إي��ليوشن بتهجير بيانات تزامن بايلوت الخاص بك..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "أع�د تسمية المجلّد \"%s\" إلى:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "أع�د تسمية المجلّد"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز '/'."
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "د�تر عناوين _جديد"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "اح�ظ كـ vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
+#: ../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:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
+#: ../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
+#: ../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 "ا_حذ�"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
-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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "ال_خصائص"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "منتقي مصدر المراسلين"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "النّ�اذ إلى خادوم LDAP كشخص مجهول"
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "�شل التّوثيق.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "أدخل كلمة السّر لـ %s (المستخدم %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
 msgid "Enter password"
@@ -985,72 +992,77 @@ msgstr "دائمًا"
 msgid "Anonymously"
 msgstr "كشخص مجهول"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "أساسي"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "اسم م�ميّز"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "عنوان البريد الإلكتروني"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "سو� يستخدم إي��ليوش�ن عنوان البريد الإلكتروني هذا لتوثيقك مع الخادوم."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "ج�دْ قواعد البحث المحتملة"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "سجّل _دخول:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:760
 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:23
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "لا تش�ير"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "واحد"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "تش�ير SSL "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "مرشّح بحث"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_قاعدة بحث:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "م_رشح بحث:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "مرشّح بحث"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1059,7 +1071,7 @@ msgstr ""
 "مرشح البحث هو نوع الكائنات التي سيبحث عنها أثناء تأدية البحث. إذا لم يتم "
 "تعديله، �سيؤدى البحث ا�تراضا على الكائنات من نوع \"شخص\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1067,7 +1079,7 @@ msgstr ""
 "إنتقاء هذا الخيار يعني أن إي��ليوش�ن لن يتصل بخادوم LDAP خاصتك إلّا إذا كان "
 "الخادوم يدعم SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1075,7 +1087,7 @@ msgstr ""
 "انتقاءهذا الخيار يعني أن إي��ليوشن لن يتصل بخادوم LDAP إلا إذا كان خادوم LDAP "
 "يدعم الاتصال الآمن TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1084,23 +1096,23 @@ msgstr ""
 "إنتقاء هذا الخيار يعني أن خادومك لا يدعم SSL ولا TLS. هذا يعني أن إتّصالك لن "
 "يكون آمنًا، وأنّك ستكون معرّضًا لمخاطر أمنيَّة."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "�رعي"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "قواعد البحث المدعومة"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "تش�ير TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1109,7 +1121,7 @@ msgstr ""
 "قاعدة البحث هي الاسم المميّز (DN) للمدخل الذي تبدأ عنده بحوثك. إن تركت هذا "
 "�ارغًا، سيبدأ البحث عند جذر شجرة الأدلّة."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1120,13 +1132,13 @@ msgstr ""
 "المدخلات تحت قاعدة بحثك. لن يشمل نطاق البحث \"واحد\" إلا المدخلات الواقعة "
 "تحت قاعدتك بمستوىً واحد."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "هذا هو الاسم الكامل لخادوم ldap. مثلا، \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1134,7 +1146,7 @@ msgstr ""
 "هذا هو العدد الأقصى للمدخلات لتنزيلها. تحديد هذا العدد برقم كبير جدًا سو� "
 "يبطئ د�تر عناوينك."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1143,7 +1155,7 @@ msgstr ""
 "هذه هي الطّريقة التي سيستخدمها إي��ليوش�ن لتوثيقك.  لاحظ أنّ ضبط هذا لـ\"عنوان "
 "بريد الكتروني\" يتطلب ن�اذا كشخص مجهول لخادوم ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1151,7 +1163,7 @@ msgstr ""
 "هذا هو الاسم لهذا الخادوم الذي سيظهر على لائحتك لمجلّدات إي��ليوش�ن. إنّه لغرض "
 "العرض �قط. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1160,35 +1172,35 @@ msgstr ""
 "هذا هو المن�ذ على خادوم LDAP الذي سيحاول إي��ليوش�ن الإتّصال به. تم تجهيز قائمة "
 "بالمنا�ذ القياسية. اسأل مدير نظامك عن المن�ذ الذي يجب أن تحدّده."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "باستخدام الاسم الم�ميّز (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "باستخدام عنوان البريد الإلكتروني"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "كلّما كان ممكنًا"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "أ_ض� د�تر عناوين"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "حدّ الت_نزيل:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_ج�د الحدث السابق لجملة البحث"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "طريقة ال_ولوج:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:226
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1196,39 +1208,40 @@ msgstr "طريقة ال_ولوج:"
 msgid "_Name:"
 msgstr "الإ_سم:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "ال_منْ�ذ:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "مجال ال_بحث:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "ال_خادوم:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_مهلة الاتصال:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "ا_ستخدم اتصال آمن:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "بطاقات"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:401
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "دقائق"
 
@@ -1269,7 +1282,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:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1281,16 +1294,16 @@ msgid "Ca_tegories..."
 msgstr "ال_�ئات..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../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
 msgid "Contact"
 msgstr "المراسَل"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "محرّر المراسَلين"
 
@@ -1303,7 +1316,7 @@ msgid "Image"
 msgstr "صورة"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "مرسال إم إس إن"
 
@@ -1316,7 +1329,7 @@ msgid "Nic_kname:"
 msgstr "الاسم ال_مستعار:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1331,7 +1344,7 @@ msgstr "الهات�"
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1356,8 +1369,8 @@ msgid "_Birthday:"
 msgstr "عيد ال_ميلاد:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "ال_تقويم:"
@@ -1446,16 +1459,16 @@ msgstr "أ_ين:"
 msgid "_Zip/Postal Code:"
 msgstr "ال_رمز البريدي:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 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:293
+#: ../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
@@ -1469,976 +1482,976 @@ msgstr "العنوان"
 msgid "Editable"
 msgstr "قابل للتّحرير"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "الولايات المتحدة الأمريكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "أ�غانستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "ألبانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "الجزائر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "صام�وَا الأمريكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "أندورا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "أنجولا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "أنكويّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "القارة المتجمّدة الجنوبيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "أنتيجوا و بربودا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "الأرجنتين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "أرمينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "اروبا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "أستراليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "النّمسا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "أذربيجان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "البهاما"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "البحرين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "بنجلادش"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "بربدوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "بلاروسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "البلجيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "بيليز"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "بنين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "برمودا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "بوتان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "بولي�يا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "البوسنة و الهرسك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "بتسوانا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "جزيرة بو�ي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "إقليم المحيط الهندي البريطاني"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "بروناي دار السّلام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "بلغاريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "بوركينا �اسو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "بوروندي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "كمبوديا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "الكاميرون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "كندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "كاب �يردا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "جزر الكيمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "جمهورية إ�ريقيا الوسطى"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "تشاد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "شيلي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "الصّين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "جزيرة عيد الميلاد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "جزر الكوكوس (كيلنك)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "كولومبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "جزر القمر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "الكنغو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "جمهورية الكونغو الديمقراطية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "جزر كوك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "كوستا ريكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "ساحل العاج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "كرواتيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "كوبا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "قبرص"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "الجمهورية التّشيكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "الدّنمارك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "جيبوتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "الدّومينيكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "جمهورية الدّومينيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "الإكوادور"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "مصر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "السّل�ادور"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "غينيا الإستوائيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "إريتريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "إستونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "إثيوبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "جزر ال�الكلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "جزر ال�ارو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "�يجي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "�نلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "�رنسا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "غينيا ال�رنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "بولونيزيا ال�رنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "الأقاليم الجنوبية ال�رنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "الغابون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "جامبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "جورجيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "غانا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "جبل طارق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "جرينلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "غرناطة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "كوادالوب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "كوام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "جواتيمالا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "جيرنسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "غينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 #, fuzzy
 msgid "Guinea-Bissau"
 msgstr "غينيا بيساو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "غوَيانة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "هايتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "هيرد و جزر ماكدونالد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "البحر المقدّس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "هندوراس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "هونج كونج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "المجر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "إيسلاندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "الهند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "إندونيسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "إيران"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "العراق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "إيرلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "جزيرة مان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "إسرائيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "إيطاليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "جامايكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "جيرسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "الأردن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "كازاخستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "كينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "كيريباتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "جمهورية كوريا الديمقراطية الشعبية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "جمهورية كوريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "الكويت"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "كرغيزستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "لاوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "لات�يا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "لبنان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "لزوتو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "ليبيريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "ليبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "ليشتنشتاين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "لتوانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "لكسمبورج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "ماكاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "مقدونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "مدغشقر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "ملاوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "ماليزيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "المالدي�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "مالي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "مالطا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "جزر المارشل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "مارتينيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "موريتانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "موريشيوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "مايوتا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "المكسيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "مكرونيسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "جمهورية مولدو�ا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "موناكو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "منغوليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "مونسيرات"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "المغرب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "موزمبيق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "مينمار"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "ناميبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "ناورو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "نيبال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "أنتيل هولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "نيو قلدونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "نيوزيلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "نيكاراغوا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "النّيجر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "نيجيريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "نيوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "جزيرة نور�ولك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "جزر ماريانا الشّمالية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "النّرويج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "عمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "باكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "بالاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "�لسطين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "باناما"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "غينيا الجديدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "براجواي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "بيرو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "ال�لبّين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "بتكيرن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "بوارتو ريكو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "قطر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "ريونيون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "رومانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "الإتّحاد الروسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "روَندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "سان كتس و ني�س"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "سان لوسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "سانت �نسينت والجرينادينز"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "صاموا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "سان مارينو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "صاو تومي و برنسيب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "العربيّة السّعودية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "السّينغال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "صربيا و مونتنجرو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "السّيشال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "سييرا ليون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "سنغا�ورة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "سلو�اكيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "سلو�ينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "جزر سليمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "الصّومال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "جنوب إ�ريقيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "جنوب جورجيا و جزر ساندويتش الجنوبيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "إسبانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "سري لانكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "سان هيلانة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "سان بيير و م�كويلون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "السّودان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "سورينام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "س�البارد و جزر جان ماي�ن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "السّوازيلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "السّويد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "سويسرا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "سوريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "طاجيكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "جمهورية تنزانيا المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "تايلند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "تيمور- ليشتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "توجو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "توكيلاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "تونغا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "ترنداد و توباجو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "تركيّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "تركمانستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "جزر ت�ركس و كيْكوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "تو�الو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "أوغندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "أ�كرانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "الإمارات العربيّة المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "المملكة المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "جزر الولايات المتّحدة الصّغرى النّائية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "أوروجواي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "أوزباكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "�انواتو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "�ينزويلّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "ال�يتنام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "جزر �يرجن البريطانيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "جزر �يرجن الأمريكيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "جزر والس و �وتونا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "الصّحراء الغربيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "اليمن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "زامبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "زيمبابوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../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
@@ -2450,35 +2463,35 @@ msgstr "زيمبابوي"
 msgid "Name"
 msgstr "الاسم"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "مرسال أمريكا أون لاين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "جابر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "مرسال ياهو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "مرسال جادو-جادو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "مرسال ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
 msgid "Service"
 msgstr "خدمة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
 #: ../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
@@ -2486,82 +2499,82 @@ msgstr "خدمة"
 msgid "Location"
 msgstr "الموقع"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "اسم المستخدم"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "المنزل"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "ياهو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "غادو-غادو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "الد�تر المصدر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "الد�تر الوجهة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "مراسَل جديد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "حقول قابلة للكتابة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "حقول مطلوبة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "غ�يّ�ر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "محرّر المراسَلين - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "رجاء اختر صورة لهذا المراسل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_لا صورة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2569,23 +2582,23 @@ msgstr ""
 "بيانات المراسل غير صحيحة:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "تنسيق '%s' غير صحيح"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "تنسيق %s'%s' غير صحيح"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �ارغ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "مراسل غير صحيح."
 
@@ -2785,7 +2798,7 @@ msgstr "الأ_عضاء"
 #: ../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:213
+#: ../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
 msgid "Book"
@@ -2852,14 +2865,14 @@ msgid "Email"
 msgstr "البريد الإلكتروني"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "يبدأ البريد الإلكتروني بـ"
 
@@ -2883,7 +2896,7 @@ msgstr[3] "%d مراسَلين"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../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
 msgid "Query"
@@ -2906,15 +2919,15 @@ msgstr "النّموذج"
 msgid "Error modifying card"
 msgstr "خطأ عند تعديل البطاقة"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "يبدأ الاسم بـ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "المصدر"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2922,92 +2935,92 @@ msgstr "المصدر"
 msgid "Type"
 msgstr "النّوع"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "اح�ظ كـ vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../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:1680 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ا_�تح"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "م�رَاسَل _جديد..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "_قائمة مراسَلين جديدة..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "ا_ح�ظ كـ vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_مرّر المراسَل"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_مرّر المراسَل�ين"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "أرس�ل _رسالة للمراسَل"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "أرس�ل _رسالة للقائمة"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "أرس�ل _رسالة للمراسَل�ين"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "ا_طبع"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "ان_سخ لد�تر عناوين..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "ان_قل  لد�تر عناوين..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_قص"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../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:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../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 "ا_نسخ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "ال_صق"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "أيّ �ئة"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "خطأ آخر"
@@ -3321,16 +3334,16 @@ msgstr "م�نتَقَى"
 msgid "Has Cursor"
 msgstr "له مؤشّر"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "ا_�تح الوصلة �ي المتص�ّح"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "ا_نسخ موقع الوصلة"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "ار_سل رسالة جديدة إلى..."
 
@@ -3374,9 +3387,8 @@ msgstr "محادثة بال�يديو"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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
@@ -3390,7 +3402,7 @@ msgstr "التقويم"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "مت�رّغ/مشغول"
 
@@ -3412,13 +3424,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:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
 #: ../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:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "الذكرى السنويّة"
@@ -3535,7 +3547,13 @@ msgstr "غير متو�ر �ي نمط دون اتصال"
 msgid "Invalid server version"
 msgstr "نسخة خادوم غير صحيحة."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "عمليّة غير مدعومة"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3545,7 +3563,7 @@ msgstr ""
 "للإستخدام دون اتصال أو لم يتم تنزيله حتّى الآن. رجاء حمّل د�تر العناوين مرة �ي "
 "نمط الاتصال ليتم تنزيل  محتوياته"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3554,7 +3572,7 @@ msgstr ""
 "لم نتمكّن من �تح د�تر العناوين هذا. رجاءً تأكّد من وجود المسار %s  و أنّك تملك "
 "التصاريح اللازمة للن�اذ إليه."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3562,7 +3580,7 @@ msgstr ""
 "لم نتمكّن من �تح د�تر العناوين هذا. يعني ذلك أنّك أدخلت عنوانًا خطأ، أو أنّه لا "
 "يمكن الوصول إلى خادوم LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3571,7 +3589,7 @@ msgstr ""
 "لم ي�جمع دعم LDAP �ي الإصدارة الحاليّة لإي��ليوش�ن إذا كنت تريد استخدام LDAP �ي "
 "إي��ليوش�ن يجب عليك تثبيت حزمة إي��ليوش�ن �عّل �يها دعم LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3579,7 +3597,12 @@ msgstr ""
 "لم نتمكّن من �تح د�تر العناوين هذا. قد يعني ذلك أنّك أدخلت عنوانًا غير سليم، أو "
 "أنّه لم يمكن الوصول للخادوم."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+#, fuzzy
+msgid "Detailed error:"
+msgstr "خطأ لا يمكن معالجته"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3591,7 +3614,7 @@ msgstr ""
 "أو ار�ع قيمة الحدّ الأقصى للنتائج �ي ت�ضيلات خادوم الدّليل\n"
 "لد�تر العناوين هذا."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3603,45 +3626,45 @@ msgstr ""
 "الإستعلام\n"
 "�ي ت�ضيلات خادوم الدّليل لد�تر العناوين هذا."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "لم تتمكن خل�يّة د�تر العناوين هذا من تحليل هذا الإستعلام."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "ر�ضت خل�يّة د�تر العناوين تأدية هذا الإستعلام."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "لم يتمّ الإستعلام بنجاح."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "خطأ أثناء إضا�ة القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "خطأ أثناء إضا�ة المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "خطأ أثناء تغيير القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "خطأ أثناء تغيير المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "خطأ أثناء إزالة القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "خطأ أثناء إزالة المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3662,16 +3685,16 @@ msgstr[3] ""
 "�تح %d مراسَلين سي�تح أيضًا %d نوا�ذ جديدة.\n"
 "هل تريد �علًا إظهار كل هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "_لا تعرض"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "اعرض _كل المراسَلين"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3680,15 +3703,15 @@ msgstr ""
 "%s موجود\n"
 "هل تريد الكتابة �وقه؟"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "مراسَل واحد"
@@ -3697,50 +3720,50 @@ msgstr[2] "مراسلين"
 msgstr[3] "مراسلين"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "اختر د�تر عناوين"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "اسرد"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "انقل المراسَل إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "انسخ المراسَل إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "انقل المراسَلين إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "انسخ المراسَلين إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "vCards عديدة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "بطاقة vCard لـ%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "معلومات المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "معلومات المراسَل لـ %s"
@@ -4191,19 +4214,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "أمتأكد أنك ترغب �ي حذ� هذا الموعد؟"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "أمتأكد أنك ترغب �ي حذ� هذه المهمّة؟"
@@ -4507,12 +4530,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "لم يمكن كتابة قالب تطبيقات المهام للحاسوب الك�ّي"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "التقويم و المهام"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "التقويمات"
 
@@ -4554,17 +4578,17 @@ 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:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 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:1574 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4589,7 +4613,7 @@ msgstr "_مهام"
 msgid "Evolution Calendar alarm notification service"
 msgstr "خدمة التبليغ لمنبّ�ه تقويم إي��ليوش�ن"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "دقيقة واحدة"
@@ -4597,13 +4621,14 @@ msgstr[1] "دقيقتين"
 msgstr[2] "دقائق"
 msgstr[3] "دقائق"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:402
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ساعة واحدة"
@@ -4611,7 +4636,7 @@ msgstr[1] "ساعتين"
 msgstr[2] "ساعات"
 msgstr[3] "ساعات"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "زمن البدء"
 
@@ -4622,8 +4647,8 @@ msgstr "مواعيد"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4634,7 +4659,7 @@ msgid "Snooze _time:"
 msgstr "_وقت الغ�وة:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4654,32 +4679,32 @@ msgstr "غ_�وة"
 msgid "location of appointment"
 msgstr "موقع الموعد"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 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
 msgid "No description available."
 msgstr "لا يوجد وص�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "لا تتو�ّر معلومات حول الموقع."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "لديك %d منبّهات"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
-#: ../mail/mail-component.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4691,7 +4716,7 @@ msgstr ""
 "مع�دّة لإرسال بريد إلكتروني. سيعرض\n"
 "إي��ليوش�ن صندوق حوار مذكّرة عادي عوضا عن ذلك."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4708,7 +4733,7 @@ msgstr ""
 "\n"
 "هل تريد �علًا تشغيل هذا البرنامج؟"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 
@@ -5046,7 +5071,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "وقت إطلاق آخر منبّه، بوقت _t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "المنطقة الزّمنيّة "
 
@@ -5178,56 +5203,56 @@ msgstr "دقيقة بدأ يوم العمل"
 msgid "daylight savings time"
 msgstr "التوقيت الصي�ي"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "الملخّص يحتوي"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "الوص� يحتوي"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "ال�ئة هي"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "التّعليق يحتوي"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "المكان يحتوي"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "غير مطابق"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "مهمات الأيام السبعة القادمة"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "المهمات النشطة"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "المهمات المتأخرة"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "المهمات المنجَزة"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "المهمات ذات المر�قات"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "المواعيد النشطة"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "مواعيد الأيام السبعة القادمة"
 
@@ -5254,7 +5279,8 @@ msgstr "نظّ� الأحداث الأقدم من"
 #: ../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:403
+#: ../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 "الأيّام"
@@ -5263,55 +5289,47 @@ msgstr "الأيّام"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../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:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "على الويب"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "اعياد الميلاد والسنويّات"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "الطقس"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "ت_قويم جديد"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "ا_نسخ..."
 
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "ال_خصائص"
-
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�شلت ترقية التقويم."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "لم يمكن �تح التقويم '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "لا يتو�ّر تقويم لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "منتقي مصدر التقويم"
 
@@ -5319,10 +5337,6 @@ msgstr "منتقي مصدر التقويم"
 msgid "New appointment"
 msgstr "موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1597
-msgid "_Appointment"
-msgstr "_موعد"
-
 #: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "أنشئ موعد جديد"
@@ -5331,10 +5345,6 @@ msgstr "أنشئ موعد جديد"
 msgid "New meeting"
 msgstr "اجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1605
-msgid "M_eeting"
-msgstr "ا_جتماع"
-
 #: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "أنشئ طلب إجتماع جديد"
@@ -5343,10 +5353,6 @@ msgstr "أنشئ طلب إجتماع جديد"
 msgid "New all day appointment"
 msgstr "موعد جديد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1613
-msgid "All Day A_ppointment"
-msgstr "_موعد يستغرق يومًا بكامله"
-
 #: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "أنشئ موعد جديد يستغرق يومًا بكامله"
@@ -5355,10 +5361,6 @@ msgstr "أنشئ موعد جديد يستغرق يومًا بكامله"
 msgid "New calendar"
 msgstr "تقويم جديد"
 
-#: ../calendar/gui/calendar-component.c:1621
-msgid "Cale_ndar"
-msgstr "الت_قويم"
-
 #: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "أنشئ تقويمًا جديدًا"
@@ -5420,7 +5422,7 @@ msgid "Competition"
 msgstr "تاريخ الإنجاز"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/e-cal-model.c:333 ../calendar/gui/e-calendar-table.c:547
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "خصوصي"
@@ -5522,19 +5524,19 @@ msgid "Phone Calls"
 msgstr "قائمة ال_هات�"
 
 #: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "خاص"
 
 #: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../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
 msgid "Public"
 msgstr "عام"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:297
 msgid "Recurrence"
 msgstr "تكرار"
 
@@ -5621,11 +5623,11 @@ msgstr "الطريقة غير مدعومة عند �تح التقويم"
 msgid "Permission denied to open the calendar"
 msgstr "ر��ض التّصريح ب�تح التقويم"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "خطأ مجهول"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "حرّر المنبّه"
 
@@ -5728,10 +5730,7 @@ msgstr "مرّات إضا�يّة كل"
 msgid "hour(s)"
 msgstr "ساعات"
 
-#. Translators: This is the second half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "دقائق"
 
@@ -5739,7 +5738,7 @@ msgstr "دقائق"
 msgid "start of appointment"
 msgstr "بداية الموعد"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "الإجراء/المح�ّز"
 
@@ -5753,12 +5752,12 @@ msgstr "أ_ض�"
 msgid "Alarms"
 msgstr "المنبّهات"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "ا_قترح عرض تّلقائي للم�ر�ق"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "أر�ق مل�(ات)"
 
@@ -5919,7 +5918,7 @@ msgid "Thursday"
 msgstr "الخميس"
 
 #: ../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 "المنطقة ال_زّمنيّة:"
 
@@ -6064,46 +6063,46 @@ msgstr "خصائص قائمة المهام"
 msgid "New Memo List"
 msgstr "قائمة تذكيرات جديدة"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "ح�ذ� هذا الحدث."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "ح�ذ�ت هذه المهمّة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "ح�ذ�ت هذه المذكرة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  لقد قمت بتغييرات. أتريد تجاهل هذه التّغييرات و غلق المحرّر؟"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، أتريد غلق المحرّر؟"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "غـ�يّرت هذا الحدث."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "غـ�يّرت هذه المهمّة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "غـ�يّرت هذه المذكرة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  لقد قمت بتغييرات. أتريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، أتريد تحديث المحرّر؟"
@@ -6133,15 +6132,15 @@ msgstr " (م�ستحق "
 msgid "Due "
 msgstr "م�ستحق "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "رسالة م�ر�قة - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6150,217 +6149,217 @@ msgstr[1] "رسالتان مر�قتان"
 msgstr[2] "%d رسائل مر�قة"
 msgstr[3] "%d رسالة مر�قة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+#: ../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
 msgid "_Move"
 msgstr "ا_نقل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "الغي ال_سحب"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../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
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "م�ر�ق"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "لم يمكن تحديث الكائن"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "حرّر الموعد"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "إجتماع - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "موعد - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "مهمة م�سْندة - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "مهمّة - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "المذكرة - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 #, fuzzy
 msgid "No Summary"
 msgstr "بدون ملخّص"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "انقر هنا لغلق النا�ذة الحالية"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "نسخ النّص المنتقى للحا�ظة الوسيطة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "قص النّص المنتقى للحا�ظة الوسيطة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "انقر هنا لعرض المساعدة المتو�رة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "لصق نص من الحا�ظة الوسيطة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "انقر هنا لح�ظ النا�ذة الحالية"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "إنتقاء كامل النّص"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "التّ_صني�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../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:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1346
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 #, fuzzy
 msgid "_Insert"
 msgstr "أ_درج"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "_خيارات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 #: ../composer/e-composer-actions.c:472
 msgid "_Attachment..."
 msgstr "_م�ر�ق..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "انقر هنا لإر�اق مل�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "ال_�ئات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "تحديد ما إذا كنت تريد إظهار ال�ئات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "المنطقة ال_زمنية"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "تحديد ما إذا كنت تريد إظهار المنطقة الزمنية"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "_عام"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "تصني� كعام"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "_خاص"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 #, fuzzy
 msgid "Classify as private"
 msgstr "تصني� كخاص"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_خصوصي"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 #, fuzzy
 msgid "Classify as confidential"
 msgstr "صن� كخصوصي"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "حقل ال_دور"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "تحديد ما إذا كان حقل الدور ظاهرًا"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_تأكيد الحضور"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "تحديد ما إذا كان حقل تأكيد الحضور ظاهرًا"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "حقل ال_حالة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "تحديد ما إذا كان حقل الحالة ظاهرًا"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "حقل ال_نوع"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 #, fuzzy
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "تحديد ما إذا كان حقل نوع الحضور ظاهرًا"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
 #, fuzzy
 msgid "Recent Docu_ments"
 msgstr "نسبة مكملة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../calendar/gui/dialogs/comp-editor.c:1785
 #: ../composer/e-composer-actions.c:700
 msgid "Attach"
 msgstr "إر�اق"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6369,46 +6368,46 @@ msgstr[1] "<b>م�ر�قان</b>"
 msgstr[2] "<b>%d</b> مر�قات"
 msgstr[3] "<b>%d</b> م�ر�قات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "اخ�ي _شريط الم�ر�قات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "اظهر _شريط الم�ر�قات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "أ_ض� م�ر�ق..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "اظهر الم�ر�قات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "اضغط مسطرة المسا�ات لتبديل شريط الم�ر�قات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "قد تهمل التّغييرات التي أ�جريت لهذا العنصر �ي حال وصول تحديث"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "لم يمكن استخدام الإصدارة الحاليّة!"
 
@@ -6424,55 +6423,55 @@ msgstr "لم يمكن �تح الو�جهة"
 msgid "Destination is read only"
 msgstr "الو�جهة قابلة للقراءة �قط."
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_حذ� هذا العنصر من كل صناديق بريد المستلمين؟"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "لم يمكن حذ� الحَدث بسبب خطأ �ي corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "لم يمكن حذ� المهمّة بسبب خطأ �ي corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "لم يمكن حذ� المذكرة بسبب خطأ �ي corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "لم يمكن حذ� العنصر بسبب خطأ �ي corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "لم يمكن حذ� الحَدث لأن التّصريح ر��ض"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "لم يمكن حذ� المهمّة لأن التّصريح ر��ض"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "لم يمكن حذ� المذكرة لأن التّصريح ر��ض"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "لم يمكن حذ� العنصر لأن التّصريح ر��ض"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "لم يمكن حذ� الحَدث بسبب خطأ ما"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "لم يمكن حذ� المهمّة بسبب خطأ ما"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "لم يمكن حذ� المذكرة بسبب خطأ ما"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "لم يمكن حذ� العنصر بسبب خطأ ما"
 
@@ -6489,143 +6488,143 @@ msgstr "م��ًّوَض إلى:"
 msgid "Enter Delegate"
 msgstr "أدخل الم��َوَّضْ"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:194
 msgid "_Alarms"
 msgstr "ال_منبّهات"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "Click here to set or unset alarms for this event"
 msgstr "انقر هنا لتعيين أو إزالة المنبهات لهذا الحدث"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Recurrence"
 msgstr "ت_كرار"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Make this a recurring event"
 msgstr "إجعل هذا حدثًا متكررًا"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "خيارات الإرسال"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "Insert advanced send options"
 msgstr "أدرج خيارات إرسال متقدمة"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "All _Day Event"
 msgstr "حدث يستغرق _يومًا بأكمله"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "Toggles whether to have All Day Event"
 msgstr "تغيير ما إذا كان الحدث يستغرق يومًا بأكمله"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 #, fuzzy
 msgid "Show Time as _Busy"
 msgstr "اعرض حالتي كمش_غول �ي هذا الوقت"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "تحديد ما إذا كنت تريد تغيير حالتك إلى مشغول �ي هذا الوقت"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Free/Busy"
 msgstr "_مت�رّغ/مشغول"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Query free / busy information for the attendees"
 msgstr "الاستعلام عن معلومات متو�ر/مشغول للحضور"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "مو_عد"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "لهذا الحدث منبّهات"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_م�وّ�ضون"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "ال_حضور"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "حدث بدون يوم بدأ"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "حدث بدون يوم انتهاء"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "تاريخ البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "تاريخ الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "زمن البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "زمن الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "المنظّم المنتقى لم يعد يمتلك حسابًا."
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "مطلوب منظّم."
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "تحتاج إلى حاضر� واحد على الأقل."
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "أ_ض�"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "تعذر �تح التقويم '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "أنت تتصر� بالنيابة عن %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6634,7 +6633,7 @@ msgstr[1] "يومان قبل الموعد"
 msgstr[2] "%d أيام قبل الموعد"
 msgstr[3] "%d يومًا قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6643,7 +6642,7 @@ msgstr[1] "ساعتان قبل الموعد"
 msgstr[2] "%d ساعات قبل الموعد"
 msgstr[3] "%d ساعة قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6652,22 +6651,22 @@ msgstr[1] "دقيقتين قبل الموعد"
 msgstr[2] "%d دقائق قبل الموعد"
 msgstr[3] "%d دقيقة قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "خصّص"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../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-signature-combo-box.c:69
@@ -6695,23 +6694,25 @@ msgid "Custom Alarm:"
 msgstr "منبّه مخصّص:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "الو_ص�:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "وص� الحدث"
 
-#: ../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 "م_لخّص:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_منبّه"
 
+#: ../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 "ال_وص�:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "ال_وقت:"
@@ -6772,10 +6773,6 @@ msgstr "تاريخ ال_بدأ:"
 msgid "T_o:"
 msgstr "إ_لى:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "ال_وص�:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -7022,7 +7019,7 @@ 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:1064
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "مرت�ع"
 
@@ -7039,14 +7036,14 @@ 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:1062
+#: ../mail/message-list.c:1063
 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:966 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "عادي"
 
@@ -7086,25 +7083,25 @@ msgstr "الأ_ولويّة:"
 msgid "_Web Page:"
 msgstr "_ص�حة الويب:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:111
 msgid "_Status Details"
 msgstr "ت�اصيل ال_حالة"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:113
 #, fuzzy
 msgid "Click to change or view the status details of the task"
 msgstr "انقر غيّ�ر / اعرض ت�اصيل حالة المهمة"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:121
 #: ../composer/e-composer-actions.c:528
 msgid "_Send Options"
 msgstr "خيارات الإر_سال"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_مهمّة"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "ت�اصيل المهمّة"
 
@@ -7131,17 +7128,14 @@ msgid "Categor_ies..."
 msgstr "ال_�ئات..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "الو_ص�:"
+#, fuzzy
+msgid "D_ue date:"
+msgstr "تاريخ الإ_ستحقاق:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "المنطقة الزمنيّة:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "تاريخ الإ_ستحقاق:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7223,7 +7217,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s لنوعيّة مح�ّز مجهولة"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "انقر ل�تح %s"
@@ -7305,7 +7299,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
 #: ../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
@@ -7313,7 +7307,7 @@ msgstr ""
 msgid "Yes"
 msgstr "نعم"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
 #: ../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
@@ -7321,7 +7315,7 @@ msgid "No"
 msgstr "لا"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
 #: ../calendar/gui/e-meeting-list-view.c:167
@@ -7329,43 +7323,43 @@ msgstr "لا"
 #: ../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:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
 #: ../plugins/plugin-manager/plugin-manager.c:73
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "متكرّر"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "م�سْندة"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "اح�ظ كـ..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "اختر مجلّد لح��ظ الم�ر�ق المحدّد..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../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:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../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:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "اضبط ك_خل�ية"
 
@@ -7373,7 +7367,7 @@ msgstr "اضبط ك_خل�ية"
 msgid "_Save Selected"
 msgstr "ا_ح��ظ المنتقى"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "ا�تح �ي %s..."
@@ -7385,7 +7379,7 @@ msgstr "بدون ملخّص"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "المنظّم: %s <%s>"
@@ -7393,7 +7387,7 @@ 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:2228
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "المنظّم: %s"
@@ -7453,23 +7447,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "يجري حذ� الكائنات المنتقاة"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "يجري تحديث الكائ�نات"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "اح�ظ كـ..."
 
 #: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "_مهمّة جديدة"
 
@@ -7478,20 +7472,20 @@ msgid "Open _Web Page"
 msgstr "ا�تح _ص�حة الويب"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ا_طبع..."
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
 #: ../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"
@@ -7558,93 +7552,93 @@ msgstr "الأولويّة"
 msgid "Start date"
 msgstr "تاريخ البدء"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "نقل العناصر"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "نسخ عناصر"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "_موعد جديد..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "_حدث جديد يستغرق يومًا بأكمله"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "إ_جتماع جديد"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "المشهد ال_حالي"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "انتق� اليوم ال_حالي"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "ا_نتق� تاريخًا..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "اط_بع..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "ا_نسخ إلى التقويم..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "ا_نقل إلى التقويم..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_�وّض إجتماع..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_جدو�ل الإجتماع..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_مرّر كـiCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_رد"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../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:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "اجعل هذا الحدوث _متنقّل"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "احذ� هذا ال_حدوث"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "احذ� _كل الحدوثات"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "الوقت: %s %s"
@@ -7683,19 +7677,19 @@ msgstr "أقسام بـ %02i دقيقة"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../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
 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:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
 #: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "ص"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
 #: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "Ù…"
@@ -7804,12 +7798,12 @@ msgstr "خطأ 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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "شخص مجهول"
 
@@ -7824,12 +7818,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "مقبول"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "مقبول مبدئيًّا"
 
@@ -7837,7 +7831,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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "مر�وض"
 
@@ -8054,7 +8048,7 @@ msgid "Attendee status updated\n"
 msgstr "تم تحديث حالة الحاضر\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجودًا"
 
@@ -8212,7 +8206,7 @@ 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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "م�وّض"
 
@@ -8350,7 +8344,7 @@ msgid "Click to add a memo"
 msgstr "انقر لإضا�ة تذكيرة"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8389,7 +8383,7 @@ msgstr "يجري إتمام المهام..."
 msgid "Expunging"
 msgstr "يجري الشطب"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "انتق� منطقة زمنيّة"
 
@@ -8400,43 +8394,39 @@ msgstr "انتق� منطقة زمنيّة"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "تحديث الإست�سار"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "مشهد _مخصّص"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "ا_ح�ظ المشهد المخصّص"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_عرّ� المشاهد..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "تحميل الموعد عند %s"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "تحميل المهام عند %s"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "تحميل التذكيرات عند %s"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "يجري �تح %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "التّنقية"
 
@@ -8550,11 +8540,11 @@ msgstr "معلومات iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "يجب أن تكون حاضرًا للحدث."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "قائمة تذكيرات _جديدة"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8563,7 +8553,7 @@ msgstr[1] "تذكيرتين"
 msgstr[2] "%d تذكيرات"
 msgstr[3] "%d تذكيرة"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8572,20 +8562,20 @@ msgstr[1] "، اثنان م�نتقيان"
 msgstr[2] "، %d منتقاة"
 msgstr[3] "، %d منتقَى"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "�شل ترقية التذكيرات."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "لم يمكن �تح قائمة التذكيرات '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "لا يتو�ّر تقويم لإنشاء التذكيرات"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "منتقي مصدر التذكيرات"
 
@@ -8868,16 +8858,11 @@ msgstr "ال�ئات: %s"
 msgid "Contacts: "
 msgstr "المراسَلون: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "المواعيد القادمة"
-
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "قائمة مهام _جديدة"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8886,20 +8871,20 @@ msgstr[1] "مهمّتين"
 msgstr[2] "%d مهمّات"
 msgstr[3] "%d مهمّة"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "�شلت �ي ترقية المهام."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "لم يمكن �تح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "لا يتو�ّر تقويم لإنشاء المهام"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "منتقي مصدر المهام"
 
@@ -8939,7 +8924,7 @@ msgstr ""
 "\n"
 "أترغب �علًا �ي حذ� هذه المهام؟"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "لا تسألني ثانيةً."
 
@@ -8976,7 +8961,7 @@ msgstr "المواعيد والإجتماعات"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "�تح التقويم"
 
@@ -10572,9 +10557,9 @@ msgstr "_غلق"
 msgid "Close the current file"
 msgstr "غلق المل� الحالي"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
 #: ../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-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ا_طبع..."
@@ -10812,23 +10797,23 @@ msgstr "انقر هنا لتختر المجلدات التي ستنشر بها"
 msgid "Recent _Documents"
 msgstr "نسبة مكملة"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "اظهر شريط ال_مر�قات"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "لا يمكن توقيع الرّسالة الخارجة: لم تعيّن شهادة توقيع لهذا الحساب"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "لا يمكن تش�ير الرّسالة الخارجة: لم تعيّن شهادة تش�ير لهذا الحساب"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
@@ -10838,15 +10823,15 @@ msgstr[1] "م�ر�ق"
 msgstr[2] "م�ر�ق"
 msgstr[3] "م�ر�ق"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "اخ�ي شريط ال_مر�قات"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "اكتب رسالة"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10992,7 +10977,7 @@ msgstr "تابع الت_حرير"
 msgid "_Do not Recover"
 msgstr "_لا تستع�د"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "ا_ستع�د"
 
@@ -11109,6 +11094,11 @@ msgstr "الكتابة �وق المل�؟"
 msgid "_Overwrite"
 msgstr "ا_كتب �وقه"
 
+#: ../e-util/e-util.c:97
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "غير قادر على تحديث تصريحات المجلد."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "م_هم"
@@ -11481,7 +11471,8 @@ msgstr "الوقت الذي تحدّده أنت"
 
 #: ../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:404
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "أسابيع"
 
@@ -11552,10 +11543,10 @@ msgstr "تحكّم ت�ضيلات بريد إي��ليوش�ن"
 msgid "Evolution Network configuration control"
 msgstr "تحكّم إعداد تقويم إي��ليوش�ن"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "البريد"
@@ -11887,7 +11878,7 @@ 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:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "اقرأ"
 
@@ -11961,7 +11952,7 @@ msgstr "أوق�� المعالجة"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11980,51 +11971,51 @@ msgstr "ثمّ"
 msgid "Add Ac_tion"
 msgstr "أض�� إجراءًا"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "أن_شئ مجلّد بحث من البحث..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "كل الرسائل"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "الرسائل غير المقروءة"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "غير مسمّى"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "الرسائل المقروءة"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "الرسائل الحديثة"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "رسائل آخر 5 أيام"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "رسائل ذات مر�قات"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "الرسائل المهمّة"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "رسائل ليست ن�اية"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "بحث الحسابات"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "بحث �ي كل الحسابات"
 
@@ -12055,7 +12046,7 @@ msgstr "مجموع الرسائل:"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
@@ -12119,12 +12110,12 @@ msgstr "نقل المجلد %s"
 msgid "Copying folder %s"
 msgstr "نسخ المجلد %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "نقل الرسائل إلى المجلّد %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "نسخ الرسائل إلى المجلّد %s"
@@ -12133,11 +12124,11 @@ msgstr "نسخ الرسائل إلى المجلّد %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "غير قادر على سحب الرسالة/الرسائل إلى مستوى التخزين العلوي"
 
-#: ../mail/em-folder-tree.c:1003 ../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 "ان_سخ للمجلّد"
 
-#: ../mail/em-folder-tree.c:1004 ../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 "ا_نقل للمجلّد"
 
@@ -12175,293 +12166,298 @@ msgstr "ان_شر صندوق الصاد�ر"
 msgid "_Empty Trash"
 msgstr "أ_�ر�غ المهملات"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "نسخ `%s' إلى `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "انتقي مجلّد"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ان_سخ"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "إنشاء المجلّد `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "أنشئ مجلّد"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "حدّد أين سيتم إنشاء المجلّد:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "�شل حذ� البريد"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ليست لديك تصاريح كا�ية لحذ� هذا البريد."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_رد على المرس�ل"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../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 "_مرّر"
 
 #. 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:1342 ../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 "_حرّر كرسالة� جديدة..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ترا_جع عن الحذ�"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ا_نقل للمجلّد..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "ان_سخ للمجلّد..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "علّم ك _مقروءة"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "_علّم ك_غير مقروء"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "_علّم على أنها _مهمّة"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "علّم على أنها غ_ير مهمّة"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "علّم ك_ن�اية"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "علّم كليس _ن�اية"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "علّم للمتاب_عة..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "ت_سمية"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "لا _شيء"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "لصيقة ج_ديدة"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "تم ال_علم"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ا_مسح العلم"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "أنشئ قاعدة من الرّسالة"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "مجلد بحث باعتبار الموضوع"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "مجلد بحث باعتبار المر_سل"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "مجلد بحث باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "مجلد بحث باعتبار القائمة البريدية"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "رشّح باعتبار المو_ضوع"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "رشّح باعتبار المر_س�ل"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "رشّح باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "رشّح باعتبار ال_قائمة البريديّة"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#. 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 "الإ�تراض"
 
-#: ../mail/em-folder-view.c:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "لم أستط�ع جلب الرسالة"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "يجري سحب الرسالة..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "م_كالمة إلى..."
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "أنشئ مجلّد _بحث"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_من هذا العنوان"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "إ_لى هذا العنوان"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "انقر لمراسلة %s"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "انقر للاتصال بـ %s"
 
-#: ../mail/em-folder-view.c:3328
+#: ../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:472
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "المطابقات: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "ا_عثر:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "ال_سابق"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "ال_تّالي"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_طاب�ق حالة الأحر�"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "غير موقّعة"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "هذه الرّسالة غير موقّعة. لا ضمان بأن هذه الرسالة أصليّة."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "توقيع سليم"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:948
 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:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "توقيع غير صالح"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غ�يّرت أثناء النّقل."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "توقيع صالح لكن تعذر التّحقّق من المرس�ل"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:950
 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:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "التوقيع موجود ولكنه يحتاج م�تاحًا عامًا"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "هذه الرّسالة موقّعة بتوقيع، ولكن لا م�تاح عام مرتبطًا بالتوقيع."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "غير مش�ّرة"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 "هذه الرّسالة ليست مش�ّرة. من الممكن مشاهدة محتواها أثناء نقلها عبر الإنترنت."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "مش�ّرة، ضعي�ة"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12470,21 +12466,21 @@ msgstr ""
 "هذه الرّسالة مش�ّرة، و لكن بخوارزمية تش�ير ضعي�ة. سيصعب و لكن لن يستحيل على "
 "شخص خارجي مشاهدة محتوى هذه الرّسالة ضمن �ترة� زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "مش�ّرة"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:960
 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:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "مش�ّرة، بقوّة"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12493,56 +12489,56 @@ msgstr ""
 "هذه الرّسالة مش�ّرة بخوارزمية تش�ير قويّة. سيكون من الصّعب جدًّا على أيّ شخص خارجي "
 "أن يشاهد محتوى هذه الرّسالة ضمن �ترة� زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ا_عرض الشهادة"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "هذه الشهادة ليست قابلة للعرض"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "اكتمل �ي %B %d، %Y، %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "_�ائت موعدها:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "قبل يوم %B %d، %Y، %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "ا_عرض ضمن السّياق"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "ا_خ�ي"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_لائم العرض"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "اظهر ال_حجم الأصلي"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "اح�ظ المر�ق كـ"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "اختر مجلدًا لح�ظ كل المر�قات"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "ا_ح�ظ المنتقَى..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12551,31 +12547,31 @@ msgstr[1] "م�ر�قان"
 msgstr[2] "%d م�ر�قات"
 msgstr[3] "%d م�ر�قا"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "اح_�ظ"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "اح_�ظ الكل"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "بلا م�ر�ق"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "اعرض _غير المهيأ"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "أخ�ي _غير المهيأ"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "�ت_ح باستخدام"
 
-#: ../mail/em-format-html-display.c:2467
+#: ../mail/em-format-html-display.c:2468
 #, fuzzy
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
@@ -12673,7 +12669,7 @@ msgstr "أرسل <b>%s</b> هذه الرسالة بالنيابة عن <b>%s</b>
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:314
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "من"
 
@@ -12804,11 +12800,6 @@ msgstr "للقيام به"
 msgid "Later"
 msgstr "لاحقًا"
 
-#: ../mail/em-migrate.c:1247
-#, fuzzy, c-format
-msgid "Migrating '%s':"
-msgstr "يجري ترقية `%s':"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12880,17 +12871,17 @@ msgstr ""
 "تعذر قراءة الإعدادات من تثبيت إي�ليوشن السابق، `evolution/config.xmldb' غير "
 "موجود أو تال�."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "ر�_د على المرس�ل"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "ر�د على ال_قائمة"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "أ_ض� إلى د�تر العناوين"
 
@@ -13838,7 +13829,7 @@ msgstr "مستورد مجلدات هيئة صندوق بريد بيركلي"
 msgid "Importing mailbox"
 msgstr "يجري استيراد صندوق البريد"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "يجري استيراد `%s'"
@@ -13891,7 +13882,7 @@ msgstr "أض�� قاعدة مرشحة"
 msgid "Templates"
 msgstr "قالب:"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13900,7 +13891,7 @@ msgstr[1] "اثنان م�نتقيان، "
 msgstr[2] "%d منتقاة، "
 msgstr[3] "%d منتقاة، "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13909,7 +13900,7 @@ msgstr[1] "%d ح�ذ�"
 msgstr[2] "%d ح�ذ�"
 msgstr[3] "%d ح�ذ�"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13918,7 +13909,7 @@ msgstr[1] "%d ن�اية"
 msgstr[2] "%d ن�اية"
 msgstr[3] "%d ن�اية"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13927,7 +13918,7 @@ msgstr[1] "%d مسوّدة"
 msgstr[2] "%d مسوّدة"
 msgstr[3] "%d مسوّدة"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13936,7 +13927,7 @@ msgstr[1] "%d أ�رس�ل"
 msgstr[2] "%d أ�رس�ل"
 msgstr[3] "%d أ�رس�ل"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13945,7 +13936,7 @@ msgstr[1] "%d غير م�رسَل"
 msgstr[2] "%d غير م�رسَل"
 msgstr[3] "%d غير م�رسَل"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13954,7 +13945,7 @@ msgstr[1] "%d غير مقروء"
 msgstr[2] "%d غير مقروء"
 msgstr[3] "%d غير مقروء"
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13963,79 +13954,79 @@ msgstr[1] "%d إجماليًا"
 msgstr[2] "%d إجماليًا"
 msgstr[3] "%d إجماليًا"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "تألي� رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "مجلد بريد جديد"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "أنشئ مجلد بريد جديد"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "�شل تحديث إعدادات أو مجلدات البريد"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "خطأ"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "أخطاء"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "أخطاء و تنبيهات"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "نقّح"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "خطأ، تحذيرات ورسائل التنقيح"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "نقّ�ح السجلات"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1736
 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:1745
+#: ../mail/mail-component.c:1752
 #, fuzzy
 msgid "second(s)."
 msgstr "ثوان."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "رسائل السجل:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "مستوى الولوج"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "الوقت"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "رسائل"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "غلق هذه النا�ذة"
@@ -14615,8 +14606,9 @@ msgstr "ا_سم المستخدم:"
 msgid "Use Authe_ntication"
 msgstr "التوثق"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:364
+#: ../mail/mail-config.glade.h:156 ../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 "ا_سم المستخدم:"
@@ -14805,7 +14797,7 @@ msgstr "اي_جاد:"
 msgid "Find in Message"
 msgstr "أوجد �ي الرسالة"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "علم للمتابعة"
 
@@ -14904,11 +14896,11 @@ msgstr "يجري إرسال الرسالة %d من %d"
 msgid "Failed to send %d of %d messages"
 msgstr "�شل إرسال %d رسالة من إجمالي %d"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "أ�لغ�يَ."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "تم."
 
@@ -15051,27 +15043,27 @@ msgstr "جار� تحضير حساب '%s' للعمل دون اتصال."
 msgid "Checking Service"
 msgstr "يجري �حص الخدمة"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "يجري الإلغاء..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "أرس�ل و تلقى البريد"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "إلغاء ال_كل"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "يجري التّحديث..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "يجري الإنتظار..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "يجري تّ�قّد وصول بريد جديد"
@@ -15791,86 +15783,86 @@ msgstr "_شطب"
 msgid "_Open Messages"
 msgstr "ا�ت_ح الرسائل"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "غير مراجع"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "روجع"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "مجاب"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 #, fuzzy
 msgid "Forwarded"
 msgstr "مرر"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "رسائل غير مراجعة متعدّد"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "رسائل متعدّدة"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "الأدنى"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "أدنى"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "أعلى"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "الأعلى"
 
-#: ../mail/message-list.c:1595 ../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:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 "اليوم %l:%M %p"
 
-#: ../mail/message-list.c:1611 ../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 "الأمس %l:%M %p"
 
-#: ../mail/message-list.c:1623 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1631 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../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:3888 ../mail/message-list.c:4324
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4373
 msgid "Generating message list"
 msgstr "يجري إنشاء قائمة الرسائل"
 
-#: ../mail/message-list.c:4179
+#: ../mail/message-list.c:4223
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4181
+#: ../mail/message-list.c:4225
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr "أرس�ل رد على رسالة �ي مجلّد عمومي"
@@ -15904,39 +15896,39 @@ msgstr "رسائل مرسلة"
 msgid "Size"
 msgstr "الحجم"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "نداء"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "لا تمرر"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "متابعة"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "لمعلوماتك"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "مرر"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "لا داعي للرّد"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "رد"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "رد على الجميع"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "مراجعة"
 
@@ -15961,6 +15953,11 @@ msgid "Subject contains"
 msgstr "الموضوع يحتوي"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "الموضوع أو المرس�ل يحتويان على"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "الموضوع أو المرس�ل يحتويان على"
 
@@ -16249,37 +16246,37 @@ msgstr "استرجع الإعدادات..."
 msgid "_Backup Settings..."
 msgstr "إعدادات النس_خ الاحتياطي..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "المراسَلون التلقائيون"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
+#: ../plugins/bbdb/bbdb.c:567
 #, fuzzy
 msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "أنشئ تل_قائيًا مداخل �ي د�تر العناوين عند الرد على الرسائل"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "انتق د�تر عناوين للمراسَلين التلقائيين"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "مراسَلو المراسلة ال�ورية"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
+#: ../plugins/bbdb/bbdb.c:603
 #, fuzzy
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "زام�ن معلومات المراسَلين وصورهم دوريًا مع قائمة أصدقاء Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "انتق د�تر عناوين لقائمة أصدقاء Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "_زامن مع قائمة الأصدقاء الآن"
 
@@ -16347,17 +16344,18 @@ msgstr "خيارات Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "ترشيح رسائل البريد المهمل باستخدام Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "ع_نوان:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:357
+#: ../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 "استخدم _SSL"
 
@@ -16379,7 +16377,8 @@ msgstr "يو�ر الوظائ� الأساسية للتقويمات المحلي
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:381
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "أع�د الت_حميل"
@@ -16486,7 +16485,7 @@ 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:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "إي��ليوشن"
 
@@ -16522,17 +16521,17 @@ msgstr ""
 "يو�ر امكانية وضع علامة لتقويم أو د�تر عناوين لجعله التقويم أو د�تر العناوين "
 "الا�تراضي."
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 #, fuzzy
 msgid "_Custom Header"
 msgstr "ترويسات مخصصة"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #, fuzzy
 msgid "Key"
 msgstr "كينيا"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr ""
@@ -17015,7 +17014,7 @@ msgid "Add User:"
 msgstr "أض�� مستخدم:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/exchange-operations/exchange-send-options.c:408
 #: ../plugins/groupwise-features/proxy.c:934
 #: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
@@ -17300,7 +17299,7 @@ msgid "Folder offline"
 msgstr "المجلّد غير متصل"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "خطأ عام"
 
@@ -17419,6 +17418,7 @@ msgid "Unknown error looking up {0}"
 msgstr "حدث خطأ أثناء محاولة العثور على {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "خطأ مجهول."
 
@@ -17603,31 +17603,46 @@ msgstr "ألغاء الإشتراك �ي المجلّدات"
 msgid "_Unsubscribe"
 msgstr "إل_غاء الإشتراك"
 
-#: ../plugins/google-account-setup/google-source.c:73
-#: ../plugins/google-account-setup/google-source.c:80
+#: ../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 "جوجل"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:198
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-source.c:439
 #, fuzzy
-msgid "<b>Server</b>"
-msgstr "<b>أعضاء</b>"
+msgid "Please enter user name first."
+msgstr "رجاء اختر اسما آخر."
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, 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
 #, fuzzy
-msgid "Username:"
-msgstr "ا_سم المستخدم:"
+msgid "Cal_endar:"
+msgstr "ال_تقويم:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "يجري سحب `%s'"
 
-#. Translators: This is the first half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
-#: ../plugins/google-account-setup/google-contacts-source.c:233
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 #, fuzzy
-msgid "Update every"
-msgstr "تحديث الإست�سار"
+msgid "<b>Server</b>"
+msgstr "<b>أعضاء</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 #, fuzzy
@@ -18096,28 +18111,28 @@ msgstr "ملحق لمزايا حسابات IMAP."
 msgid "IMAP Features"
 msgstr "ميزات IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "ا_ستيراد إلى التقويم"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "ا_ستيراد إلى المهام"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "استيراد ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "انتقاء قائمة مهام"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "انتقاء تقويم"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "إ_ستيراد"
 
@@ -18171,142 +18186,142 @@ msgstr "تزامن مع iPod "
 msgid "iPod Synchronization"
 msgstr "تزامن iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "�شل تحميل التقويم '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "موعد �ي التقويم '%s' يتضارب مع هذا الاجتماع"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "تم إيجاد الموعد �ي التقويم '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "غير قادر على إيجاد أي تقويمات"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "غير قادر على إيجاد هذا الاجتماع �ي أي تقويم"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "غير قادر على إيجاد هذه المهمة �ي أي قائمة مهام"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "غير قادر على إيجاد هذه المذكرة �ي أي قائمة مذكرات"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "يجري البحث عن إصدار موجود من هذا الموعد"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "غير قادر على تحليل العنصر"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "غير قادر على إرسال العنصر إلى التقويم '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "أ�رس�لَ للتقويم '%s' كمقبول"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "أ�رس�لَ للتقويم '%s' كغير نهائي"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "أ�رس�لَ للتقويم '%s' كمر�وض"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "أ�رس�لَ للتقويم '%s' كمهجور"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "المنظّم قد أزال الم��َوَّضْ %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "أ�رس�لَت مذكرة بالإلغاء للم��َوَّضْ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "غير قادر على إرسال مذكرة بالإلغاء للم��َوَّضْ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "لا يمكن تحديث حالة الحاضر لأن الحالة غير صالحة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "غير قادر على تحديث الحاضر. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "تم تحديث معلومات الحاضر"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "أ�رس�لت معلومات الإجتماع"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "أ�رس�لت معلومات المهمّة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "أ�رس�لت معلومات المذكرة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "تعذر إرسال معلومات الاجتماع، الاجتماع غير موجود"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "تعذر إرسال معلومات المهمة، المهمة غير موجودة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "تعذر إرسال معلومات المذكرة، المذكرة غير موجودة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "التقويم المر�ق غير صالح"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "تدعي الرسالة أنها تحتوي تقويمًا، لكن التقويم ليس بهيئة iCalendar صالحة."
 
-#: ../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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "العنصر �ي التقويم غير صالح"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18314,325 +18329,325 @@ msgstr ""
 "الرسالة تحتوي على تقويم، لكن هذا التقويم لا يحتوي على أي أحداث أو مهام أو "
 "معلومات متو�ر/مشغول"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "التقويم المر�ق يحتوي على عدة عناصر"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "لمعالجة كل هذه العناصر، يجب ح�ظ المل� واستيراد التقويم."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "هذا الموعد متكرّر"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "هذه المهمة متكرّرة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "هذه المذكرة متكرّرة"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "احذ� الرسالة بعد الت_عامل معها"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "بحث عن تضارب"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "انتق تقويمات للبحث �ي عن تضاربات المواعيد"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "اليوم"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "اليوم %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "اليوم %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "اليوم %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "غدا"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "غدا %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "غدا %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "غدا %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "غدا %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../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:273
+#: ../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:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../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:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "رجاءً ر�دّ باسم <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "مستلمة باسم <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> عن طريق %s قد نشر معلومات الاجتماع الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> قد نشر معلومات الاجتماع الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> قد �َوَّضَك لحضور الاجتماع الآتي:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> يطلب حضورك الاجتماع الآتي عن طريق %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> يطلب حضورك الاجتماع الآتي:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> %s يرغب �ي الإضا�ة لاجتماع موجود عن طريق:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "يود <b>%s</b> الإضا�ة إلى إجتماع موجود."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../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 "<b>%s</b> عن طريق %s يرغب �ي استقبال آخر المعلومات عن الاجتماع الآتي:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> يرغب �ي استقبال آخر المعلومات عن الاجتماع الآتي:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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> عن طريق %s قد أرسل ردّ الاجتماع التالي:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> قد أرسل ردّ الاجتماع التالي:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> قد ألغى الاجتماع الآتي عن طريق %s."
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> قد ألغى الاجتماع الآتي."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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> عن طريق %s قد اقترح تغييرات الاجتماع الآتية."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> قد اقترح تغييرات الاجتماع الآتية."
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> قد ر�ض عن طريق %s تغيرات الاجتماع الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> قد ر�ض تغييرات الاجتماع الآتية."
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> عن طريق %s قد نشر المهمة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> قد نشر المهمة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> يطلب تعيين %s للقيام بالمهمة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> عن طريق %s قد عينك للقيام بالمهمة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> قد عينك للقيام بالمهمة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> عن طريق %s يرغب �ي الإضا�ة إلى مهمة موجودة:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> يرغب �ي الإضا�ة إلى مهمة موجودة:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18640,136 +18655,136 @@ msgid ""
 msgstr ""
 "<b>%s</b> عن طريق %s يرغب �ي استقبال آخر المعلومات عن المهمة المعينة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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 "<b>%s</b> يرغب �ي استقبال آخر المعلومات عن المهمة المعينة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> عن طريق %s قد أرسل الرد الآتي على المهمة المعينة:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> قد أرسل الرد الآتي على المهمة المعينة:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> عن طريق %s قد ألغى المهمة المعينة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> قد ألغى المهمة المعينة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> عن طريق %s قد اقترح التغييرات الآتية لإعدادات المهمات:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> قد اقترح التغييرات الآتية لإعدادات المهمات:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> عن طريق %s قد ر�ض المهمة المعينة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> قد ر�ض المهمة الآتية التي تم تعيينها إليه:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> عن طريق %s قد نشر التذكيرة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> قد نشر التذكيرة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> عن طريق %s يرغب �ي الإضا�ة إلى تذكيرة موجودة:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> يرغب �ي الإضا�ة إلى تذكيرة موجودة:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> عن طريق %s قد ألغى التذكيرة الم�شارَكة الآتية:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> قد ألغى التذكيرة الم�شارَكة الآتية:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_�تح التقويم"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "ار�_ض"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "ا_قبل"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "ار�_ض الكل"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "الكل _غير نهائي"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "_غير نهائي"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "اقبل ال_كل"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "أرس�ل المعلومات"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "حدّ_ث حالة الحاضر"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_تحديث"
 
@@ -18917,22 +18932,22 @@ msgstr "ما إن كان على الأيقونة أن توم�ض أم لا."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�يما يجب التبليغ عن الرسائل الجديدة �ي مجلد الداخل �قط."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "توليد _رسالة D-BUS"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:377
 #, fuzzy
 msgid "Evolution's Mail Notification"
 msgstr "تنبيه بريدي"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:398
 #, fuzzy
 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
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18945,7 +18960,7 @@ msgstr[1] "لقد استلمت رسالتان (%d) �ي %s."
 msgstr[2] "لقد استلمت (%d) رسائل �ي %s."
 msgstr[3] "لقد استلمت (%d) رسالة  �ي %s."
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18954,48 +18969,48 @@ msgstr[1] "لقد استلمت رسالتان جديدتان (%Id)."
 msgstr[2] "لقد استلمت %Id رسائل جديدة."
 msgstr[3] "لقد استلمت %Id رسالة جديدة."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "بريد جديد"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "اظهر الأيقونة �ي م_ساحة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "وم_يض الأيقونة �ي منطقة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "اجعل ال_رسالة تنبثق مع الأيقونة"
 
-#: ../plugins/mail-notification/mail-notification.c:728
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "إعز� الصوت عند وصول رسائل جديدة"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_صا�رة"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "شَغّ�ل مل� صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "تحديد اسم _مل�:"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "انتقاء مل� صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "اق_ر ء"
 
-#: ../plugins/mail-notification/mail-notification.c:805
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "بَلّ�غ عن الرسائل الجديدة للبريد الوا�د �قط"
 
@@ -19223,17 +19238,17 @@ msgid "_Unsubscribe from List"
 msgstr "أل_غي الاشتراك �ي القائمة"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "تعليم كل الرسائل �ي هذا المجلد والمجلدات ال�رعية كمقروءة؟"
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "نقل الرسائل إلى المجلّد %s"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "هل تريد إجراء العملية �ي المجلدات ال�رعية؟"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
 #, fuzzy
-msgid "Mark All Messages as Read"
-msgstr "ع_لم كل الرسائل كمقروءة"
+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:162
 #, fuzzy
@@ -19729,15 +19744,15 @@ msgstr ""
 msgid "Setup Assistant"
 msgstr "المساعد"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "مساعد ضبط ا��ليوش�ن"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "مرحبا"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19749,29 +19764,29 @@ msgstr ""
 "\n"
 "رجاءً اضغط زر \"أمام\" للمتابعة. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "إستيراد المل�ات"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "رجاءً انتق المعلومات التي ترغب �ي استيرادها:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "من %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "يجري استيراد البيانات."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "الرجاء الإنتظار"
 
@@ -19881,52 +19896,48 @@ msgid "Configuration version"
 msgstr "إصدار التشكيل"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "يقرر ما إن كان يجب تشغيل اكتشا� الانهيار أم لا."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "العرض الا�تراضي للشريط الجانبي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "إرت�اع النّا�ذة الإ�تراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "الحالة الا�تراضية للنا�ذة"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "عرض النّا�ذة الإ�تراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "أدخل كلمة س�ر"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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:15
+#: ../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/"
@@ -19934,47 +19945,47 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../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:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../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:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "إعدادات "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -19982,27 +19993,23 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "الشريط الجانبي مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "تخطّي مربع حوار التحذير من استخدام إصدار التطوير"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "تخطّي مربع حوار التحذير عند الاسترجاع"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "بدأ دون اتصال بالإنترنت"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "شريط الحالة مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20010,19 +20017,19 @@ msgstr ""
 "إصدار تشكيل إي��ليوشن، مع مستوى التشكيل الأكبر/الأصغر (\"2.6.0\" على سبيل "
 "المثال)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "الارت�اع الا�تراضي للنا�ذة الرئيسية، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "العرض الا�تراضي للنا�ذة الرئيسية، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "العرض الا�تراضي للشريط الجانبي، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20030,37 +20037,37 @@ msgstr ""
 "آخر إصدار تشكيل تمت الترقية إليه،  مع مستوى التشكيل الأكبر/الأصغر (\"2.6.0\" "
 "على سبيل المثال)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../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:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../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 "
@@ -20070,7 +20077,7 @@ msgstr ""
 "\"مثل نوتيلس\". إن تم انتقاء \"مثل نوتيلس\" سيتم تحديد أسلوب عرض الأزرار حسب "
 "طريقة عرضها �ي جنوم."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20078,66 +20085,58 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "شريط الأدوات مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../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:48
+#: ../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:49
-msgid "Whether crash detection should be done or not"
-msgstr "ما إن كان يجب القيام باكتشا� الانهيار أم لا"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "�يما إذا "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "ما إن كان يجب إظهار الشريط الجانبي."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "ما إن كان يجب إظهار شريط الحالة."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "ما إن كان شريط الأدوات مرئيًا."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../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:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "ما إن كان سيتم تخطي مربع حوار التحذير عند استرجاع إي��ليوشن."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "ما إن كانت أزرار النا�ذة يجب أن تكون مرئية."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "أسلوب زر النا�ذة"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "أزرار النا�ذة ظاهرة"
 
@@ -20153,11 +20152,11 @@ msgstr "الإتّصالات النّشطة"
 msgid "Click OK to close these connections and go offline"
 msgstr "انقر موا�ق لغلق هذه الإتصلات و لتكون غير متصل بالإنترنت"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "انقر لإختيار نوع المستورد:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../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.\n"
@@ -20169,11 +20168,11 @@ msgstr ""
 "\n"
 "إن لم تعر� نوعه، يمكنك انتقاء \"تلقائي\" وسيقوم إي��ليوشن بمحاولة التعر� عليه."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "اخ"
 
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20185,23 +20184,23 @@ msgstr ""
 "إعدادات يمكن استيرادها. إن كنت ترغب �ي إعادة\n"
 "المحاولة، رجاء انقر زر \"خل�\".\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "اسم ال_مل�:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "إنتقاء مل�"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "_نوع المل�:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "استورد بيانات وإعدادات من برامج أ_قدم"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "إستيراد مل� _وحيد"
 
@@ -20211,7 +20210,7 @@ msgstr "ت�ضيلات إي��ليوش�ن"
 
 #. 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s -إي��ليوشن"
@@ -20264,7 +20263,7 @@ msgstr "ا_عمل دون اتّصال"
 msgid "Work Offline"
 msgstr "اعمل دون اتّصال"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 #, fuzzy
 msgid ""
 "Evolution is currently online.\n"
@@ -20272,11 +20271,11 @@ msgid ""
 msgstr ""
 "إي��ليوشن متصل بالانترنت حاليا.  انقر هذا الزر للعمل دون اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "يقوم إي��ليوشن حاليًا بالتحول لوضع عدم الاتصال."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 #, fuzzy
 msgid ""
 "Evolution is currently offline.\n"
@@ -20284,47 +20283,47 @@ msgid ""
 msgstr ""
 "إي��ليوشن غير متصل بالانترنت حاليًا.  انقر هذا الزر للعمل على اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:780
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "تبديل إلى %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "خطأ غير معرو� بالنظام."
 
-#: ../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 ك.بايت"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "موا�ق"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "معطيات غير سليمة"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "لم يمكن تسجيل OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "لم يعثر على قاعدة بيانات الإعداد"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "جديد"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "إختبار جديد"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "أنشئ عنصر اختبار جديد"
 
@@ -20367,7 +20366,7 @@ msgstr ""
 "استيراد مل�ات خارجية إلى إي��ليوشن."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20402,7 +20401,7 @@ msgstr ""
 "نتمنى أن تستمتع بنتائج عملنا الشاق، وننتظر مشاركاتك\n"
 "ب�ارغ الصبر!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20410,66 +20409,43 @@ msgstr ""
 "شكرا\n"
 "�ريق إي��ليوش�ن\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "لا تخبرني مرة أخرى"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "اكتشا� انهيار إي��ليوش�ن"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "تج_اهل"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"يظهر أن إ�وليوشن قد اتنهى بطريقة غير متوقعة آخر مرة تم �يها\n"
-"تشغيله. على سبيل الاحتياط، كل شرائط المعاينة ست�خ�ى. \n"
-"يمكنك استرجاع شرائط المعاينة من ثائمة الاظهار. \n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "لا تظهر هذه الرسالة مرة أخرى"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "بدأ ا�ليوشن بتنشيط المكوّن المحدّد"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "بدأ على اتصال بالإنترنت"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "أغلق كل مكونات إي��ليوشن عنوة"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "أعد التهجير من إي�ليوشن ١.٤ عنوة"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "أرس�ل معلومات إخراج التنقيح لجميع المكوّنات لمل�."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "عطّل تحميل أي ملحق."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "عطّل لوح معاينة البريد والمراسَلين والمهمات."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- عميل البريد ومدير المعلومات الشخصي إي��ليوشن"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21677,7 +21653,7 @@ msgstr "قائمة رسائل مشعّبة"
 msgid "_Group By Threads"
 msgstr "جم_ع حسب الخيوط"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_رسالة"
@@ -22012,123 +21988,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "اظهر مؤشّر وامض �ي متن الرّسائل المعروضة"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "اظهر الرّسائل بالأسلوب العادي"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "اظهر الرّسائل مع كل ترويسات البريد الإلكتروني"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "اظهر مصدر البريد الإلكتروني الخام للرّسالة"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "تراجع عن حذ� الرسائل المنتقاه"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "غ_ير مهم"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "ت_صغير"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "مر_�ق"
 
-#: ../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
 msgid "_Clear Flag"
 msgstr "امس_ح العلم"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "اح_ذ� الرسالة"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "أو_جد �ي الرسالة..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "علم كم�نجز"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "إ_ذهب إلى"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "م_هم"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_ضمن السّياق"
 
-#: ../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 "_حمل الصور"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "م_صدر الرسالة"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "الرّسالة ال_تّالية"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "حجم _عادي"
 
-#: ../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 "ا�ت_ح �ي نا�ذه جديدة"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "ال_رّسالة السابقة"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "م_قتبس"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_مقروء"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "اح�_ظ الرّسالة..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "تراجع عن ح_ذ� الرسالة"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_غير مقروء"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "تح_جيم"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "ت_كبير"
 
@@ -22904,11 +22876,11 @@ msgstr "قطعة التسمية"
 msgid "A widget to display in place of the usual expander label"
 msgstr "القطعة التي سيتم عرضها عوضًا عن شارة الموسع الاعتيادية"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "حجم الموسّع"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "حجم سهم الموسّع"
 
@@ -22984,12 +22956,12 @@ msgstr ""
 "خريطة ت�اعلية تعتمد على الماوس لتحديد المنطقة الزمنية. مستخدموا لوحة "
 "الم�اتيح عليهم انتقاء المنطقة الزمنية من مربع التحرير والسرد عوضًا عن هذا."
 
-#: ../widgets/misc/e-online-button.c:112
+#: ../widgets/misc/e-online-button.c:109
 #, fuzzy
 msgid "Online"
 msgstr "ضمن السّياق"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
 msgstr ""
 
@@ -23017,52 +22989,52 @@ msgstr "طراز الانسياب"
 msgid "Column width"
 msgstr "عرض العمود"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "ابحث"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "انقر هنا لتغيير نوع البحث"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "ا_بحث"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "ا_بحث الآن"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "ا_مسح"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "هوية العنصر"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " Ù�_ÙŠ"
 
@@ -23218,19 +23190,19 @@ msgid "_When opened:"
 msgstr "_عند ال�تح:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% تام)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "انقر هنا للذهاب للعنوان"
 
@@ -23458,7 +23430,7 @@ msgstr "ألوان ص�و� متناوبة"
 #: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "شبكة رسم أ�قيّة"
 
@@ -23467,7 +23439,7 @@ msgstr "شبكة رسم أ�قيّة"
 #: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "شبكة رسم عموديّة"
 
@@ -23476,7 +23448,7 @@ msgstr "شبكة رسم عموديّة"
 #: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "تركيز الرّسم"
 
@@ -23501,8 +23473,8 @@ msgstr "نموذج الانتقاء"
 #: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "عتبة الطّول"
 
@@ -23511,8 +23483,8 @@ msgstr "عتبة الطّول"
 #: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "ارت�اع ص�و� منتظم"
 
@@ -23607,8 +23579,8 @@ msgstr "طراز الجدول"
 msgid "Cursor row"
 msgstr "ص� المؤشر"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "ابحث دائمًا"
 
@@ -23616,15 +23588,15 @@ msgstr "ابحث دائمًا"
 msgid "Use click to add"
 msgstr "استخدم النّقر للإضا�ة"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "محوّل جدول الشّجرة الالكترونيّة"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "مظهر ريترو"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "ارسم الخطوط و موسّعات +/-."
 
@@ -23732,6 +23704,87 @@ msgstr "سياق مراس�ل �وري"
 msgid "Handle Popup"
 msgstr "معالجة القا�زة"
 
+#~ msgid "Upcoming Appointments"
+#~ msgstr "المواعيد القادمة"
+
+#~ msgid "Migrating `%s':"
+#~ msgstr "يجري ترقية `%s':"
+
+#~ msgid "_Properties..."
+#~ msgstr "_خصائص..."
+
+#~ msgid "_Appointment"
+#~ msgstr "_موعد"
+
+#~ msgid "M_eeting"
+#~ msgstr "ا_جتماع"
+
+#~ msgid "All Day A_ppointment"
+#~ msgstr "_موعد يستغرق يومًا بكامله"
+
+#~ msgid "Cale_ndar"
+#~ msgstr "الت_قويم"
+
+#~ msgid "D_escription:"
+#~ msgstr "الو_ص�:"
+
+#~ msgid "De_scription:"
+#~ msgstr "الو_ص�:"
+
+#~ msgid "Updating query"
+#~ msgstr "تحديث الإست�سار"
+
+#, fuzzy
+#~ msgid "Username:"
+#~ msgstr "ا_سم المستخدم:"
+
+#, fuzzy
+#~ msgid "Update every"
+#~ msgstr "تحديث الإست�سار"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "تعليم كل الرسائل �ي هذا المجلد والمجلدات ال�رعية كمقروءة؟"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "هل تريد إجراء العملية �ي المجلدات ال�رعية؟"
+
+#, fuzzy
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "ع_لم كل الرسائل كمقروءة"
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "يقرر ما إن كان يجب تشغيل اكتشا� الانهيار أم لا."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "تخطّي مربع حوار التحذير عند الاسترجاع"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "ما إن كان يجب القيام باكتشا� الانهيار أم لا"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "ما إن كان سيتم تخطي مربع حوار التحذير عند استرجاع إي��ليوشن."
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "اكتشا� انهيار إي��ليوش�ن"
+
+#~ msgid "Ig_nore"
+#~ msgstr "تج_اهل"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "يظهر أن إ�وليوشن قد اتنهى بطريقة غير متوقعة آخر مرة تم �يها\n"
+#~ "تشغيله. على سبيل الاحتياط، كل شرائط المعاينة ست�خ�ى. \n"
+#~ "يمكنك استرجاع شرائط المعاينة من ثائمة الاظهار. \n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "لا تظهر هذه الرسالة مرة أخرى"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "اظهر الرّسائل بالأسلوب العادي"
+
 #~ msgid "_Contact"
 #~ msgstr "_مراسَل"
 
@@ -23866,9 +23919,6 @@ msgstr "معالجة القا�زة"
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "أرس�ل البريد بتهيئة HTML"
 
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "أض�� المجلّد إلى قائمة مجلّداتك المشترك بها"
-
 #~ msgid "Refresh List"
 #~ msgstr "حدّ�ث القائمة"
 
diff --git a/po/bg.po b/po/bg.po
index 80135bba30..bd07aa1863 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,15 +5,16 @@
 # Vladimir Petkov <vpetkov@i-space.org> 2004, 2005, 2006.
 # Rostislav "zbrox" Raykov <zbrox@i-space.org>, 2004, 2005.
 # Iassen Pramatarov <turin@fsa-bg.org>, 2005.
-# Alexander Shopov <ash@contact.bg>, 2006, 2007.
+# Alexander Shopov <ash@contact.bg>, 2006, 2007, 2008.
 # Yavor Doganov <yavor@gnu.org>, 2005, 2007, 2008.
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 09:28+0200\n"
-"PO-Revision-Date: 2008-03-10 18:42+0200\n"
+"POT-Creation-Date: 2008-09-10 22:03+0300\n"
+"PO-Revision-Date: 2008-09-10 21:41+0300\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,21 +24,21 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "�дре�ник на Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "�ов контакт"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "�ов �пи�ък � контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -45,7 +46,6 @@ msgstr[0] "текущата папка %s на адреÑ�ника е Ñ� %d виÐ
 msgstr[1] "текущата папка %s на адре�ника е � %d визитки"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Отвар�не"
 
@@ -61,63 +61,63 @@ msgstr "Контакт: "
 msgid "evolution minicard"
 msgstr "мини-карта на 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 "Има повторени�."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Това е �ъбрание."
 
-#: ../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 "Събитие в календар: Обобщението е %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 "Събитие в календар: ��ма обобщение."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "�ъбитие за преглед на календар"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Вземане на фоку�"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "�ова �реща"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "�ово �ъбитие за цели� ден"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "�ово �ъбрание"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Отиване на днешната дата"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Отиване на определена дата"
 
-#: ../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 "таблица за преглед и избор на текущи� времеви интервал"
 
 #. 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."
@@ -126,14 +126,14 @@ msgstr[1] ", %d �ъбити�"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../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 "��ма �ъбити�."
 
 #. 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 "Изглед за работна �едмица: %s. %s"
@@ -141,21 +141,21 @@ msgstr "Изглед за работна �едмица: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Изглед за ден: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "календарен изглед за работна �едмица"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "календарен изглед за един или повече дни"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -165,32 +165,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:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../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:760
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1566
+#: ../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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %B %Y"
 
@@ -199,61 +197,59 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../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:786
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1582
+#: ../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:766
 msgid "Gnome Calendar"
 msgstr "Календар към GNOME"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "лента за тър�ене"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "лента за тър�ене в календара на Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Бутон за �качане"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "�ати�нете тук, ще откриете още �ъбити�."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Изглед за ме�ец: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Изглед за �едмица: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "календарен изглед за ме�ец"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "календарен изглед за една или повече �едмици"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "Група"
 
 #. 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 "из�качащ подпрозорец"
 
@@ -265,12 +261,12 @@ msgstr "редактиране"
 msgid "begin editing this cell"
 msgstr "�тартиране редакци�та на тази клетка"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "задаване"
 
 #. 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 "задаване на клетката"
 
@@ -290,47 +286,47 @@ msgstr "�виване"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "�вива реда в дървото, което �ъдържа тази клетка"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Клетка на таблица"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c: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 "нати�кане за добав�не"
 
-#: ../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 "нати�кане"
 
-#: ../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 "подреждане"
 
-#: ../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 "Календар: от %s до %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "елемент от календара на 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 "�ктивиране на �тандартните"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Из�качащо меню"
 
@@ -345,8 +341,8 @@ msgstr "активиране"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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}“ е адре�ник � права �амо за четене. Превключете на изгледа за контакти "
 "и изберете адре�ник, който може да приема контакти."
@@ -390,14 +386,14 @@ msgid "Could not get schema information for LDAP server."
 msgstr "�еу�пех при получаването на типовете �хеми за LDAP �ървъра."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "�дре�никът не може да бъде премахнат."
 
 #: ../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 ""
 "В момента чрез Evolution можете да до�тъпвате �амо �и�темни� адре�ник на "
 "GroupWise. Използвайте еднократно друг клиент за до�тъп до пощата на "
@@ -408,7 +404,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Изтриване на адре�ника „{0}“?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Грешка при зареждане на адре�ника."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -421,7 +417,7 @@ msgstr "Ð�еуÑ�пех в идентифицирането пред LDAP Ñ�ÑŠÑ€Ð
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "�еу�пех при триенето на контакт"
 
@@ -434,31 +430,27 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP не отговори � валидни типове �хеми."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "До�тъпът е отказан"
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Вер�и� на �ървъра"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Възможно е н�кои функции на програмата да не работ�т правилно � тази вер�и� "
 "на �ървъра"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "�дре�никът на Evolution �пр� неочаквано."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../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:24
+#: ../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 "
@@ -468,55 +460,55 @@ msgstr ""
 "функционално�т или е зле конфигуриран. Попитайте админи�тратора за "
 "поддържаните о�нови за тър�ене."
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "Този адре�ник ще бъде изтрит завинаги."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "Този адре�ник не може да бъде отворен."
 
-#: ../addressbook/addressbook.error.xml.h:27
-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 "Този �ървър за адре�ници н�ма предложени бази за тър�ене."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Този �ървър за адре�ници може да е недо�тъпен, може да �те �грешили името в "
-"на�тройките или мрежовата връзка в момента да е повредена."
+"на�тройките или мрежовата връзка в момента да е изключена."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Този адре�ник ще бъде изтрит завинаги."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Този �ървър не поддържа �хеми от тип LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "�дре�никът не може да бъде отворен"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Тър�енето не може да бъде изпълнено."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Запазването на {0} е неу�пешно."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "И�кате ли да запазите промените?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Опитвате �е да преме�тите контакт от един адре�ник в друг, но той не може да "
 "бъде премахнат от източника. Вме�то това и�кате ли да го копирате?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -526,6 +518,10 @@ msgstr ""
 "възникнат проблеми. За по�тигане на оптимални резултати �ървърът тр�бва да "
 "бъде обновен до поддържана вер�и�."
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "��мате до�татъчно права да изтривате контакти от този адре�ник."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -539,7 +535,7 @@ msgstr ""
 "Вашите контакти за {0} н�ма да бъдат налични, докато не ре�тартирате "
 "Evolution."
 
-#: ../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
@@ -562,9 +558,9 @@ msgstr "_Оразмер�ване"
 msgid "_Use as it is"
 msgstr "_Ползване както е"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../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}"
 
@@ -573,23 +569,23 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "�дре� за �инхронизаци� по подразбиране:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "�дре�никът не може да бъде зареден"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "�еу�пех при четенето на адре�ника на pilot"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
-msgstr "�вт. довършване"
+msgstr "�вт. допи�ване"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
@@ -601,14 +597,14 @@ msgstr "Сертификати"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
-msgstr "Конфигуриране на авт. довършване"
+msgstr "Конфигуриране на авт. допи�ване"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -617,7 +613,7 @@ msgid "Evolution Address Book"
 msgstr "�дре�ник на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "Из�качащ прозорец на адре�ника на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -633,7 +629,7 @@ msgid "Evolution Address Book component"
 msgstr "Компонент за адре�ника на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Управление на S/MIME �ертификати в Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -648,12 +644,13 @@ msgstr "Управление на S/MIME �ертификати"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../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
 msgid "On This Computer"
 msgstr "�а този компютър"
 
@@ -666,121 +663,125 @@ msgstr "�а този компютър"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "Лично"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "�а LDAP �ървъри"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Създаване на нов контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
-msgstr "Спи�ък � _контакти"
+msgstr "_Спи�ък � контакти"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Създаване на нов �пи�ък � контакти"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "�ов адре�ник"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
-msgstr "�дре�ни_к"
+msgstr "_�дре�ник"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Създаване на нов адре�ник"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�еу�пех при о�ъвремен�ването на на�тройките или папките на адре�ника."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "База"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "_Копиране на �ъдържанието на адре�ника за локална употреба в режим „Изключен“"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "О�новни"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "�дре�ник"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Информаци� за �ървъра"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Удо�товер�ване"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "Подробно�ти"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Тър�ене"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Изтегл�не"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "�а�тройки на адре�ника"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
-msgstr "Мигриране..."
+msgstr "Мигриране…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Мигриране на „%s“:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -801,7 +802,7 @@ msgstr ""
 "В новите вер�ии на Evolution папките � контакти имат ново ме�тоположение и "
 "йерархи�.\n"
 "\n"
-"Изчакайте, докато Evolution мигрира вашите папки..."
+"Изчакайте, докато Evolution мигрира вашите папки…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
@@ -811,7 +812,7 @@ msgid ""
 msgstr ""
 "Форматът на контактите за пощен�ките �пи�ъци е променен.\n"
 "\n"
-"Изчакайте, докато Evolution мигрира вашите папки..."
+"Изчакайте, докато Evolution мигрира вашите папки…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
@@ -821,7 +822,7 @@ msgid ""
 msgstr ""
 "�ачинът, по който Evolution запазва н�кои телефонни номера е променен.\n"
 "\n"
-"Изчакайте, докато Evolution мигрира вашите папки..."
+"Изчакайте, докато Evolution мигрира вашите папки…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
@@ -832,86 +833,92 @@ msgstr ""
 "Спи�ъкът � промени и картовите файлове на Palm Sync за Evolution �а "
 "променени.\n"
 "\n"
-"Изчакайте, докато Evolution мигрира вашите Pilot Sync данни..."
+"Изчакайте, докато Evolution мигрира вашите Pilot Sync данни…"
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименуване на папката „%s“ на:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Преименуване на папка"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Името на папката не може да �ъдържа „/“"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_�ов адре�ник"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
-msgstr "Запазване като vCard..."
+msgstr "Запазване като vCard…"
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../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 "_Изтриване"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-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:1044 ../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:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Избиране на контакти"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "�нонимен до�тъп до LDAP �ървъра"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../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 "�еу�пешно удо�товер�ване.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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 "Въвеждане парола за %s (потребител %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Въвеждане на парола"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
-msgstr "�втоматично довършване на дължина"
+msgstr "�втоматично допи�ване на дължина"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML за �пи�ъка � адре� за довършване"
+msgstr "EFolderList XML за �пи�ъка � адре�и за допи�ване"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML за �пи�ъка � адре� за довършване"
+msgstr "EFolderList XML за �пи�ъка � адре�и за допи�ване."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
@@ -931,7 +938,7 @@ msgid ""
 "autocomplete."
 msgstr ""
 "Бро�т знаци, които тр�бва да бъдат изпи�ани, преди Evolution да �е опита да "
-"довърши израза автоматично."
+"допише израза автоматично."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -975,38 +982,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Удо�товер�ване</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Изобраз�ване</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Изтегл�не</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Тър�ене</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Информаци� за �ървъра</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Вид:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Добав�не на адре�ник"
 
-#: ../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:761
 msgid "Always"
 msgstr "Винаги"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "�нонимно"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../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 "О�новни"
@@ -1033,14 +1037,14 @@ msgid "Lo_gin:"
 msgstr "_Потребител:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "�икога"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Без шифриране"
 
@@ -1052,7 +1056,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Шифриране � SSL"
 
@@ -1079,7 +1083,7 @@ msgid ""
 "objectclass of the type \"person\"."
 msgstr ""
 "Филтърът за тър�ене е видът на обектите, които ще �е тър��т. �ко не го "
-"промените - тър��т �е обекти от типа „лице“ (person)."
+"промените — тър��т �е обекти от типа „лице“ (person)."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1119,7 +1123,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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Шифриране � TLS"
 
@@ -1216,8 +1220,8 @@ msgid "_Login method:"
 msgstr "_Метод за идентификаци� в �и�темата:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1232,7 +1236,7 @@ msgid "_Search scope:"
 msgstr "Обхват на _тър�ене:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Сървър:"
@@ -1253,9 +1257,10 @@ msgstr "карти"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "минути"
 
@@ -1296,7 +1301,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1305,32 +1310,32 @@ msgstr "AIM"
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ка_тегории..."
+msgstr "Ка_тегории…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Редактор на контакти"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "Пълно _име..."
+msgstr "Пълно _име…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Изображение"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1343,7 +1348,7 @@ msgid "Nic_kname:"
 msgstr "_Пр�кор:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1357,11 +1362,11 @@ msgstr "Телефон"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Служебен"
 
@@ -1383,8 +1388,8 @@ msgid "_Birthday:"
 msgstr "_Рожден ден:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Календар:"
@@ -1473,1119 +1478,1121 @@ msgstr "_Къде:"
 msgid "_Zip/Postal Code:"
 msgstr "_ZIP/пощен�ки код:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "�дре�"
 
-#: ../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:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Редактируем"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "С�Щ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "�фгани�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "�лбани�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "�лжир"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "�мерикан�ко Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "�ндора"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "�нгола"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "�нгила"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "�нтарктика"
 
-#: ../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 "�нтигуа и Барбуда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "�ржентина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "�рмени�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "�руба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "�в�трали�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "�в�три�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "�зербайджан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Бахам�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Бахрейн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Барбадо�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Белару�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Белги�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Белиз"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Бенин"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Бермуд�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Боливи�"
 
-#: ../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 "Бо�на и Херцеговина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Бот�вана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "О�тров Буве"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Бразили�"
 
-#: ../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 "Британ�ка Индоокеан�ка Територи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Бруней"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Българи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Буркина Фа�о"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Камбоджа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Канада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Кабо Верде"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Кайманови о�трови"
 
-#: ../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 "Централна �фрикан�ка Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Чад"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Чили"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Китай"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Великден�ки о�трови"
 
-#: ../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 "Коко�ови О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Колумби�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Комори"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Конго"
 
-#: ../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 "Конго, Демократична Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "О�трови Кук"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Ко�та Рика"
 
-#: ../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 "Бр�г на �лоновата ко�т"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Хърват�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Куба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Кипър"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Чехи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Дани�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Джибути"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Доминика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Доминикан�ка република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Египет"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "Ел Славадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Екваториална Гвине�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Еритре�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Е�тони�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Етиопи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Фолкленд�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Фарьор�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "О�трови Фиджи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Финланди�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Франци�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Френ�ка Гвиана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Френ�ка Полинези�"
 
-#: ../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 "Френ�ки Южни Територии"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Габон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Гамби�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Грузи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Германи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Гана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Гърци�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Гренланди�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Гренада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Гваделупа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Гвиам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Гърн�и"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Гвине�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "Гвине�-би�ау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Гви�на"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Хаити"
 
-#: ../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 "О�трови Хърд и МакДоналд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Св�то море"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Хондура�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Хонг Конг"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Унгари�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "И�ланди�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Инди�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Индонези�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Иран"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Ирак"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Ирланди�"
 
-#: ../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 "�йл ъф Ман"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Израел"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Итали�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Ямайка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Япони�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Джър�и"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Йордани�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Казах�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Кени�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Коре�, Демократична �ародна Република"
 
-#: ../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 "Коре�, Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Кувейт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Киргиз�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Лао�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Латви�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Ливан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Ле�ото"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Либери�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Либи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Лихтенщайн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Литва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Люк�ембург"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Макао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Македони�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Мадага�кар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Малави"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Малайзи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Малдив�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Мали"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Малта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Маршал�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Мартиника"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Мавритани�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Мавриций"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Майоте"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Мек�ико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Микронези�"
 
-#: ../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 "Република Молдова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Монако"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Монголи�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Мон�ерат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Мароко"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Бирма"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "�амиби�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "�ауру"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "�епал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Холанди�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Холанд�ки �нтили"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "�ова Каледони�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "�ова Зеланди�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "�икарагуа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "�игер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "�игери�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "�иуе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "О�тров �орфолк"
 
-#: ../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 "Мариан�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "�орвеги�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Оман"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Паки�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Палау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Пале�тина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Панама"
 
-#: ../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 "Папуа �ова Гвине�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Парагвай"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Перу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Филипини"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Питкеърн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Полша"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Португали�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Пуерто Рико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Катар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Реюнион"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Румъни�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Ру�и�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: ../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 "Сейнт Кит� и �еви�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Санта Луци�"
 
-#: ../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 "Сент Вин�ент и Гренадини"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "Сан Марино"
 
-#: ../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 "Сан Томе и Прин�ипи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Саудит�ка �раби�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: ../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 "Сърби� и Черна гора"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Сейшел�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Сиера Леоне"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Словаки�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Словени�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Соломонови о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Сомали�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Южна �фрика"
 
-#: ../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 "Южна Джорджи� и Южни Сандвичеви о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "И�пани�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "Света Елена"
 
-#: ../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 "Свети Пиер и Микелон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Судан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Суринам"
 
-#: ../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 "О�трови Свалбард и Жан Майен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Швеци�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Швейцари�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Сири�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Таджики�тан"
 
-#: ../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 "Обединена република Танзани�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Тайланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Тимор-Ле�те"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Того"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Токелао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Тонга"
 
-#: ../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 "Тринидад и Тобаго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Туни�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Турци�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Туркмени�тан"
 
-#: ../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 "О�трови Турк� и Кайко�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Уганда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Украйна"
 
-#: ../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 "Обединени �раб�ки Емир�тва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Обединеното крал�тво"
 
-#: ../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 "Малки външни о�трови на С�Щ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Узбеки�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Виетнам"
 
-#: ../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 "Британ�ки Вирджин�ки о�трови"
 
-#: ../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 "�мерикан�ки Вирджин�ки о�трови"
 
-#: ../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 "О�трови Уоли� и Футуна"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Западна Сахара"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Йемен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Замби�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Име"
 
-#: ../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 "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "У�луга"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Ме�тоположение"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Потребител�ко име"
 
-#: ../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:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Домашна"
 
-#: ../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:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
-msgstr "Книга - източник"
+msgstr "Книга — източник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
-msgstr "Книга - цел"
+msgstr "Книга — цел"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Е нов контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Полета за пи�ане"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Задължителни полета"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Променени"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "Редактор на контакти - %s"
+msgstr "Редактор на контакти — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Изберете изображение за този контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_��ма изображение"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2593,47 +2600,47 @@ msgstr ""
 "Информаци�та на контакта е невалидна:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ е � невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ е � невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "�евалиден контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Бързо добав�не на контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "Пълно р_едактиране"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Пълно име"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "_Е-поща"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "Избор на адре�_ник"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2642,7 +2649,7 @@ msgstr ""
 "Сигурни ли �те, че и�кате да\n"
 "изтриете �пи�ъка � контакти (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2650,7 +2657,7 @@ msgstr ""
 "Сигурни ли �те, че и�кате да\n"
 "изтриете тези �пи�ъци � контакти?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2659,7 +2666,7 @@ msgstr ""
 "Сигурни ли �те, че и�кате да\n"
 "изтриете контакта (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2767,7 +2774,7 @@ msgstr "У�луга за _бързи �ъобщени�:"
 #: ../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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "Ме�топо_ложение:"
@@ -2777,13 +2784,13 @@ msgid "<b>Members</b>"
 msgstr "<b>Потребители</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 "Редактор за контакти"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Select..."
-msgstr "Избор..."
+msgstr "Избор…"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
@@ -2797,27 +2804,28 @@ msgstr "Име на �пи�_ък:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "�апи_шете адре� на е-поща или завлечете контакт до �пи�ъка по-долу:"
 
-#: ../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 "Членове на �пи�ъка � контакти"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "_Членове"
+
+#: ../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:390
-#: ../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/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Книга"
 
-#: ../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 "Е нов �пи�ък"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Членове"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Променен контакт:"
@@ -2855,40 +2863,40 @@ msgstr ""
 "Името или пощен�ки� адре� на този контакт вече �ъще�твува\n"
 "в тази папка. И�кате ли да � добавите въпреки това?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Сме�ване на контакт"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Сме�ване"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Сме�ване на контакт"
+
+#: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Електронна поща"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "Електронната поща започва �"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Името започва �"
+msgid "Name contains"
+msgstr "Името �ъдържа"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2902,10 +2910,10 @@ msgstr[0] "%d контакт"
 msgstr[1] "%d контакта"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "За�вка"
 
@@ -2913,123 +2921,119 @@ msgstr "За�вка"
 msgid "Error getting book view"
 msgstr "Грешка при взимането на изгледа на книгата"
 
-#: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../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:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Модел"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Грешка при пром�на на карта"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Името започва �"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Източник"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
-msgstr "Запазване като vCard..."
+msgstr "Запазване като vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отвар�не"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
-msgstr "_�ов контакт..."
+msgstr "_�ов контакт…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
-msgstr "�ов _�пи�ък � контакти..."
+msgstr "�ов _�пи�ък � контакти…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
-msgstr "_Запазване като vCard..."
+msgstr "_Запазване като vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Препращане на контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Препращане на контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Изпращане на _пи�мо до контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Изпращане на _пи�мо до �пи�ък"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Изпращане на _пи�мо до контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Печат"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
-msgstr "_Копиране в адре�ника..."
+msgstr "_Копиране в адре�ника…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
-msgstr "_Преме�тване в адре�ника..."
+msgstr "_Преме�тване в адре�ника…"
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "_Изр�зване"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../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 ../mail/em-folder-tree.c:1005
+#: ../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-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 "_Копиране"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_По�тав�не"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "В��ка категори�"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "Друга грешка"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3061,7 +3065,7 @@ msgstr "Телефон в автомобил"
 
 #: ../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
@@ -3162,9 +3166,9 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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 "Рол�"
 
@@ -3200,38 +3204,38 @@ msgid "Web Site"
 msgstr "Интернет �траница"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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
 msgid "Width"
 msgstr "Широчина"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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
 msgid "Height"
 msgstr "Ви�очина"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "�а фоку�"
 
@@ -3251,11 +3255,21 @@ msgstr "Тек�тов модел"
 msgid "Max field name length"
 msgstr "Мак�. дължина на името на полето"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Широчина на колоната"
 
-#: ../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"
+"Тър�ене за контакти…"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3269,7 +3283,7 @@ msgstr ""
 "\n"
 "или нати�нете два пъти � мишката тук за нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3283,7 +3297,7 @@ msgstr ""
 "\n"
 "�ати�нете два пъти тук, за да �ъздадете нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3293,7 +3307,7 @@ msgstr ""
 "\n"
 "Тър�ене за контакти."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3303,42 +3317,43 @@ msgstr ""
 "\n"
 "��ма обекти, които да бъдат показани в тази гледка."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "�даптер"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Служебна е-поща"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Домашна е-поща"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Друга е-поща"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Избрани"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Има показалец"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Отвар�не на връзката в _браузър"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "Копиране на ме�_тоположението на връзката"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
-msgstr "_Изпращане на ново пи�мо до..."
+msgstr "_Изпращане на ново пи�мо до…"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
@@ -3358,7 +3373,7 @@ msgid "map"
 msgstr "карта"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Избро�ване на членове"
 
@@ -3379,25 +3394,23 @@ msgid "Video Chat"
 msgstr "Видео разговор"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../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-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 "Календар"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Свободен/зает"
 
@@ -3419,152 +3432,164 @@ msgid "Web Log"
 msgstr "Блог"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Годишнина"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Длъжно�т"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Домашна �траница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Блог"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "У�пех"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Бекендът е зает"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Хранилището е изключено"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "�дре�никът не �ъще�твува"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Контактът не е открит"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Контактът вече �ъще�твува"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Протоколът не �е поддържа"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Отменено"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "�е може да �е прекъ�не"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Удо�товер�ването неу�пешно"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Изи�кване за удо�товер�ване"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS не е наличен"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "��ма такъв източник"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "�еналично в режим „Изключен“"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Друга грешка"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "�евалидна вер�и� на �ървъра"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "�еподдържан метод за удо�товер�ване"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 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:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, 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 ""
-"Този адре�ник не може да бъде отворен. Проверете дали\n"
-"ме�тоположението %s �ъще�твува и дали имате права за до�тъп."
+"Този адре�ник не може да бъде отворен. Проверете дали ме�тоположението %s "
+"�ъще�твува и дали имате права за до�тъп."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 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 ""
 "Тази адре�ник не може бъде отворен. Или �те въвели грешен адре�, или LDAP "
 "�ървърът е недо�тъпен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
@@ -3574,76 +3599,80 @@ msgstr ""
 "ползвате LDAP в Evolution, тр�бва да ин�талирате пакет на Evolution � "
 "включена LDAP поддръжка."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 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 ""
 "Този адре�ник не може да бъде отворен. Въвели �те грешен адре� или �ървърът "
 "е недо�тъпен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error:"
+msgstr "Подробна грешка:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 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 ""
 "Открити �а повече �ъвпадени�, отколкото �ървърът\n"
 "може да върне или Evolution може да покаже.\n"
 "Уточнете тър�енето или увеличете ограничението в\n"
 "на�тройките на адре�ника."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 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 ""
 "Времето за това запитване надвиши �ървърни� лимит или лимита, който �те "
 "на�троили\n"
 "за този адре�ник. �аправете тър�енето по-точно или увеличете времето."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Двигател�т на този адре�ник не у�п� да анализира за�вката."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
 msgstr "Двигател�т на този адре�ник отказа да изпълни за�вката."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "За�вката не завърши у�пешно."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Грешка при добав�не на �пи�ък"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Грешка при добав�не на контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Грешка при пром�на на �пи�ък"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Грешка при пром�на на контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Грешка при премахване на �пи�ък"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Грешка при премахване на контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3658,16 +3687,16 @@ msgstr[1] ""
 "Отвар�нето на %d контакта ще отвори %d нови прозореца.\n"
 "�аи�тина ли и�кате показването на в�ички тези контакти?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "Да _не �е показват"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Показване на _в�ички контакти"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3676,72 +3705,72 @@ msgstr ""
 "%s вече �ъще�твува\n"
 "И�кате ли да го презапишете?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
 msgstr[1] "контакта"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Избор на адре�ник"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "�пи�ък"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Преме�тване на контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Копиране на контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Преме�тване на контакти в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Копиране на контакти в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
 msgid "Multiple vCards"
 msgstr "Множе�тво vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
 #, c-format
 msgid "Contact information"
 msgstr "Информаци� за контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "Информаци� за %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
-msgstr "Запитване до адре�ника..."
+msgstr "Запитване до адре�ника…"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
@@ -3760,56 +3789,56 @@ msgid "Show Compact vCard"
 msgstr "Показване на компактен vCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
-msgstr "Запи�ване в адре�ника"
+msgid "Save in address book"
+msgstr "Запазване в адре�ника"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Преглед на карта"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "Вна��не..."
+msgstr "Вна��не…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "При�тавка за вна��не от файлове (.cvs, .tab) на Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "При�тавка за вна��не от файлове (.cvs, .tab) на Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "При�тавка за вна��не от файлове (.cvs, .tab) на Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "При�тавка за вна��не от файлове (.cvs, .tab) на Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "При�тавка за вна��не от файлове (.cvs, .tab) на Evolution"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "При�тавка за вна��не от файлове (.cvs, .tab) на Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Формат за обм�на на данни LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Интерфей� за вна��не на LDIF"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "vCard (.vcf, .gcrd)"
-msgstr "vCard (.vcf, .gcrd) - визитна карта"
+msgstr "vCard (.vcf, .gcrd) — визитна карта"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution vCard Importer"
@@ -3841,7 +3870,7 @@ msgstr "Измерени�:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "Ш_рифт..."
+msgstr "Ш_рифт…"
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3858,12 +3887,12 @@ msgstr "Формат"
 # Това е грешка, ко�то тр�бва да �е докладва.  Header е както горен
 # колонтитул, така и заглавна ча�т.
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Заглавна ча�т"
 
@@ -3965,8 +3994,8 @@ msgstr "Сенки"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Размер:"
@@ -3984,7 +4013,7 @@ msgid "Top:"
 msgstr "Горе:"
 
 #: ../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 "Тип:"
 
@@ -3994,40 +4023,40 @@ msgstr "Широчина:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "_Шрифт..."
+msgstr "_Шрифт…"
 
-#: ../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 "Проба на редактора за �тила на разпечатване на контакти"
 
-#: ../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 "�втор�ки права 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
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Проба за разпечатване на контакт"
 
-#: ../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:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Файлът не може да бъде отворен."
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "�е може да �е вземе �пи�ък � адре�ниците"
+msgid "Couldn't get list of address books"
+msgstr "�еу�пех при извличането на �пи�ъка � адре�ници"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4042,8 +4071,8 @@ msgid "OUTPUTFILE"
 msgstr "ИЗХОДЕ�_Ф�ЙЛ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
-msgstr "Изпи�ване на папките на локални� адре�ник"
+msgid "List local address book folders"
+msgstr "Показване на папките на локални� адре�ник"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
@@ -4095,13 +4124,22 @@ msgstr "�еобработена грешка"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{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}“ е календар � права �амо за четене. Изберете друг календар от "
+"�транични� панел на календарни� изглед."
+
+#. 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}“ е календар � права �амо за четене. Превключете на календарни� изглед и "
-"изберете календар, който приема �рещи."
+"„{0}“ е календар � права �амо за четене. Изберете друг календар, който може "
+"да приема �рещи."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../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."
@@ -4109,7 +4147,7 @@ msgstr ""
 "Добав�нето на �ми�лено обобщение към вашата �реща ще о�ведоми получателите "
 "за какво �е отна�� �рещата."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -4117,19 +4155,19 @@ msgstr ""
 "Добав�нето на �ми�лено обобщение към вашата задача, ще о�ведоми получателите "
 "за какво �е отна�� тази задача."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../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:6
+#: ../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:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4137,129 +4175,133 @@ msgstr ""
 "Ц�лата информаци� по тези �рещи ще бъде изтрита и н�ма да може да бъде "
 "въз�тановена."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../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:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Сигурни ли �те, че и�кате да изтриете задачата „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Сигурни ли �те, че и�кате да изтриете �рещата, наименувана „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Сигурни ли �те, че и�кате да изтриете бележката „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Сигурни ли �те, че и�кате да изтриете тези {0} �рещи?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Сигурни ли �те, че и�кате да изтриете тези {0} бележки?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Сигурни ли �те, че и�кате да изтриете тези {0} задачи?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Сигурни ли �те, че и�кате да изтриете тази �реща?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурни ли �те, че и�кате да прекъ�нете и изтриете това �ъбрание?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Сигурни ли �те, че и�кате да изтриете тази бележка?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурни ли �те, че и�кате да изтриете тази задача?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Сигурни ли �те, че и�кате да запазите бележката без обобщение?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Сигурни ли �те, че и�кате да изпратите �реща без обобщение?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Сигурни ли �те, че и�кате да изпратите задача без обобщение?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "�еу�пех при �ъздаването на ново �ъбитие"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "�еу�пех при запазването на �ъбитие"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Изтриване на календара „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Изтриване на �пи�ъка � бележки „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Изтриване на �пи�ъка �ъ� задачи „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "_Без изпращане"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Изтегл�нето не е приключило. И�кате ли да запазите �рещата?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Изтегл�нето не е приключило. И�кате ли да запазите задачата?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Редакторът не може да бъде отворен."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4267,25 +4309,25 @@ msgstr ""
 "Ще бъдат изпратени покани по електронната поща до в�ички уча�тници � "
 "възможно�т да приемат тази задача."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../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:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Грешка при зареждане на календара"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Грешка при зареждане на �пи�ък � бележки"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Грешка при зареждане на �пи�ък �ъ� задачи"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4293,7 +4335,7 @@ msgstr ""
 "�ко не изпратите изве�тие за отм�на, другите уча�тници може да не разберат, "
 "че �ъбранието е отменено."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../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."
@@ -4301,7 +4343,7 @@ msgstr ""
 "�ко не изпратите изве�тие за отм�на, другите уча�тници може да не разберат, "
 "че бележката е била изтрита."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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."
@@ -4309,7 +4351,7 @@ msgstr ""
 "�ко не изпратите изве�тие за отм�на, другите уча�тници може да не разберат, "
 "че задачата е изтрита."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4317,7 +4359,7 @@ msgstr ""
 "Изпращането на обновена информаци� позвол�ва на уча�тниците да поддържат "
 "�воите календари о�ъвременени."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4325,7 +4367,7 @@ msgstr ""
 "Изпращането на обновена информаци� позвол�ва на уча�тниците да поддържат "
 "актуални �пи�ъците �и �ъ� задачи."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4333,7 +4375,7 @@ msgstr ""
 "В момента �е изтегл�т н�колко прикрепени обекта. �ко запазите �рещата, то т� "
 "ще бъде без тези прикрепени обекти."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4341,87 +4383,87 @@ msgstr ""
 "В момента �е изтегл�т н�колко прикрепени обекта. �ко запазите задачата, то "
 "т� ще бъде без тези прикрепени обекти."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Възможно е н�кои функции на програмата да не работ�т правилно � тази вер�и� "
 "на �ървъра"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календарът на Evolution �пр� неочаквано."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Програмата за бележки Evolution �пр� неочаквано."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Програмата за задачи �пр� неочаквано."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "Календарът не е избран за работа в режим „Изключен“"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "Спи�ъкът � бележки не е избран за работа в режим „Изключен“"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "Спи�ъкът � бележки не е избран за работа в режим „Изключен“."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
-msgstr "Спи�ъкът �ъ� задачи не е избран за работа в режим „Изключен“"
+msgstr "Спи�ъкът �ъ� задачи не е избран за работа в режим „Изключен“."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Този календар ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Този �пи�ък � бележки ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Този �пи�ък �ъ� задачи ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "И�кате ли да запазите промените по тази �реща?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "И�кате ли да запазите промените по тази бележка?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "И�кате ли да запазите промените по тази задача?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "И�кате ли да изпратите изве�тие за отм�на на тази бележка?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "И�кате ли да изве�тите в�ички уча�тници за отм�ната?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "И�кате ли да изпратите покани до уча�тниците в �ъбранието?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "И�кате ли да изпратите тази задача на уча�тниците?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "И�кате ли да изпратите обновената информаци� за �ъбранието на уча�тниците?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "И�кате ли да изпратите обновената информаци� за задачите на уча�тниците?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4431,108 +4473,108 @@ msgstr ""
 "възникнат проблеми при работата на Evolution. За най-добри резултати "
 "�ървърът тр�бва да бъде обновен до поддържана вер�и�."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�аправили �те промени по тази �реща, но още не �те ги запазили."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "�аправили �те промени по тази задача, но още не �те ги запазили."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�аправили �те промени по тази бележка, но още не �те ги запазили."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Календарите ви н�ма да бъдат налични, докато не ре�тартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Бележките ви н�ма да бъдат налични, докато не ре�тартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Задачите ви н�ма да бъдат налични, докато не ре�тартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Игнориране на промените"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Запазване на промените"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "Изпращане на _изве�тие"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Раздел�не на �ъбити�, по-дълги от един ден:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server не може да �е �тартира"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Календарът на pilot не може да �е прочете"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Спи�ъкът � бележки на pilot не може да �е прочете"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Спи�ъкът � бележки на pilot не може да �е запише"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Стандартен приоритет:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Спи�ъкът �ъ� задачи на pilot не може да �е прочете"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Спи�ъкът �ъ� задачи на pilot не може да �е запише"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4574,25 +4616,25 @@ 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:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "Бележки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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: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 "Задачи"
@@ -4610,25 +4652,26 @@ msgstr "_Задачи"
 msgid "Evolution Calendar alarm notification service"
 msgstr "У�луга за алармите към календара на Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ча�"
 msgstr[1] "ча�ове"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "�ачало"
 
@@ -4639,9 +4682,9 @@ msgstr "Срещи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ме�тоположение:"
@@ -4651,17 +4694,15 @@ msgid "Snooze _time:"
 msgstr "Време за _отлагане:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "_Редактиране"
 
@@ -4673,32 +4714,32 @@ msgstr "_Отлагане"
 msgid "location of appointment"
 msgstr "м��то на �реща"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "��ма обобщение."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "��ма опи�ание."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "��ма информаци� за ме�тоположението."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4710,7 +4751,7 @@ msgstr ""
 "конфигурирано да изпраща поща. Вме�то това, Evolution\n"
 "ще покаже �тандартен прозорец за напомн�не."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4727,29 +4768,29 @@ msgstr ""
 "\n"
 "Сигурни ли �те, че и�кате да �тартирате тази програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Без запитвани� за тази програма отново."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "�е може да �е инициализира Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr ""
 "�еу�пех при �ъздаването на фабриката за алармата, може би в�е още е "
-"�тартирана..."
+"�тартирана…"
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "грешно време"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4757,8 +4798,8 @@ msgstr[0] "%d ча�"
 msgstr[1] "%d ча�а"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4768,8 +4809,8 @@ msgstr[1] "%d минути"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4899,11 +4940,11 @@ msgstr "Крива на Марку� Бейн�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Цв�т на кривата на Марку� Бейн� - изглед за ден�"
+msgstr "Цв�т на кривата на Марку� Бейн� — изглед за ден�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Цв�т на кривата на Марку� Бейн� - поле за време"
+msgstr "Цв�т на кривата на Марку� Бейн� — поле за време"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
@@ -5016,12 +5057,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:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Показване на панела „Предварителен преглед на пи�мата“"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Показване на панела „Предварителен преглед на пи�мата“."
 
@@ -5071,7 +5112,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:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Ча�ови по��"
 
@@ -5090,7 +5131,7 @@ msgstr "24 ча�ов формат на времето"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Мерни единици в подразбиращото �е напомн�не - „минути“, „ча�ове“ или „дни“."
+"Мерни единици в подразбиращото �е напомн�не — „минути“, „ча�ове“ или „дни“."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
@@ -5212,66 +5253,66 @@ msgstr "Минута, в ко�то започва работни� ден"
 msgid "daylight savings time"
 msgstr "л�тно време"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Обобщението �ъдържа"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Опи�анието �ъдържа"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Категори�та е"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Коментарът �ъдържа"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Ме�тонахождението �ъдържа"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "�е�ъвпадащ"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи през �ледващите 7 дни"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "�ктивни задачи"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Про�рочени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Завършени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Задачи � прикрепени файлове"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "�ктивни �рещи"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Срещи през �ледващите 7 дни"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5280,16 +5321,17 @@ msgstr ""
 "Тази операци� ще изтрие завинаги в�ички �ъбити�, по-�тари от избраното "
 "време. �ко продължите, н�ма да можете да въз�тановите тези �ъбити�."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Прочи�тване на �ъбити�, по-�тари от"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "дни"
 
@@ -5298,132 +5340,332 @@ msgstr "дни"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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:406
+#: ../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 "Време"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_�ов календар"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
-msgstr "_Копиране..."
+msgstr "_Копиране…"
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_�а�тройки"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�еу�пех при о�ъвремен�ването на календарите."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "�еу�пех при отвар�нето на календара „%s“ за �ъздаване на �ъбити� и �ъбрани�"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "��ма наличен календар за �ъздаване на �ъбити� и �ъбрани�"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Ме�тонахождение на календара"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "�ова �реща"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
-msgstr "Срещ_а"
+msgstr "_Среща"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Създаване на нова �реща"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "�ово �ъбрание"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
-msgstr "Събрани_е"
+msgstr "С_ъбрание"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Създаване на ново и�кане за �ъбрание"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "�ова �реща за ц�л ден"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Среща за _ц�л ден"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Създаване на нова �реща за ц�л ден"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "�ов календар"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
-msgstr "Кале_ндар"
+msgstr "_Календар"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Създаване на нов календар"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Изглед за ден"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Изглед за работна �едмица"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Изглед за �едмица"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Изглед за ме�ец"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "Прикрепени файлове"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "При�ъ�тващ"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Служебни"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Категори�"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Кла�ифициране"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Конкуренци�"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Поверително"
+
+#: ../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 "Опи�ание"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Опи�анието �ъдържа"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "Съще�твува"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Любими"
+
+#: ../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
+msgid "Holiday"
+msgstr "Празник"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "Горещи контакти"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Идеи"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Международни"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Ключов клиент"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Разни"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Следващите 7 дни"
+
+#: ../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 "Организатор"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Телефонни обаждани�"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Ча�тен"
+
+#: ../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:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Публичен"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Повторение"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Съ�то�ние"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Стратегии"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Обобщение"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Обобщението �ъдържа"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "До�тавчици"
+
+#: ../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
+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
+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
+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
+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
+msgid "is not"
+msgstr "не е"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Грешка при отвар�не на календара"
@@ -5436,11 +5678,11 @@ msgstr "Методът не е поддържан при отвар�нето н
 msgid "Permission denied to open the calendar"
 msgstr "�е беше разрешено да �е отвори календара"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "�еизве�тна грешка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Редактиране на аларма"
 
@@ -5473,17 +5715,17 @@ msgid "Mes_sage:"
 msgstr "_Пи�мо:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Изпълнение на звук"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "Стартиране на програма"
 
@@ -5496,7 +5738,7 @@ msgid "Send To:"
 msgstr "Изпращане до:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Изпращане на е-пи�мо"
 
@@ -5551,7 +5793,7 @@ msgstr "минут(а/и)"
 msgid "start of appointment"
 msgstr "начало на �реща"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Дей�твие/аларма"
 
@@ -5562,16 +5804,15 @@ msgstr "Д_обав�не"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "�ларми"
 
-#: ../calendar/gui/dialogs/cal-attachment-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
 msgid "_Suggest automatic display of attachment"
 msgstr "Предлагане на _автоматично показване на прикрепен обект"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Прикреп�не на файл(ове)"
 
@@ -5640,8 +5881,8 @@ msgid "Display"
 msgstr "Показване"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Петък"
 
@@ -5656,8 +5897,8 @@ msgstr ""
 "Дни"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -5680,7 +5921,7 @@ msgstr ""
 "�едел�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Избор на цв�т"
 
@@ -5690,8 +5931,8 @@ msgid "S_un"
 msgstr "_�д"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Събота"
 
@@ -5708,8 +5949,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показване на номерата на �едмиците в навигатора за _датите"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "�едел�"
 
@@ -5727,13 +5968,13 @@ msgid "Template:"
 msgstr "Шаблон:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Четвъртък"
 
 #: ../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 "Ча�ови _по��:"
 
@@ -5742,14 +5983,14 @@ msgid "Time format:"
 msgstr "Формат на време:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Ср�да"
 
@@ -5827,320 +6068,473 @@ msgstr "_Ср"
 msgid "before every appointment"
 msgstr "преди в��ка �реща"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Копиране на �ъбити�та в календара за _локална употреба в режим „Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Копиране на �ъдържанието на �пи�ъка �ъ� задачи за _локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Копиране на �ъдържанието на �пи�ъка � бележки за _локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
 msgstr "_Цв�т:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Спи�ък �ъ� задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Спи�ък � бележки"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "�а�тройки на календара"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "�ов календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "�а�тройки на �пи�ък �ъ� задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "�ов �пи�ък �ъ� задачи"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "�а�тройки на �пи�ък � бележки"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "�ов �пи�ък � бележки"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Това �ъбитие е било изтрито."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Тази задача е била изтрита."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
-msgstr "Тази бележка е била изтритa."
+msgstr "Тази бележка е била изтрита."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
-"%s  �аправихте промени. Да бъдат ли игнорирани и да �е затвори редактора?"
+"%s �аправихте промени. Да бъдат ли игнорирани и да �е затвори редактора?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  ��ма направени промени, да бъде ли затворен редактора?"
+msgstr "%s ��ма направени промени, да бъде ли затворен редактора?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Това �ъбитие е било променено."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Тази задача е била променена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Тази бележка е била променена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
-"%s  Има направени промени. Да бъдат ли игнорирани и да �е обнови редактора?"
+"%s Има направени промени. Да бъдат ли игнорирани и да �е обнови редактора?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  ��ма направени промени, да �е обнови ли редактора?"
+msgstr "%s ��ма направени промени, да �е обнови ли редактора?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Грешка при проверка: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " до "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Приключено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Приключено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Краен �рок "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Краен �рок "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
-msgstr "Прикрепено пи�мо - %s"
+msgstr "Прикрепено пи�мо — %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Прикрепено пи�мо"
 msgstr[1] "%d прикрепени пи�ма"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "Пре_ме�тване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Отказване на _извлачването"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "прикрепено"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Обектът не може да бъде обновен"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Редактиране на �реща"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Събрание — %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Среща — %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "�азначена задача — %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Задача — %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Бележка — %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "��ма обобщение"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "�ати�нете тук, за да затворите текущи� прозорец"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Копиране на избрани� тек�т в буфера за обмен"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "По�тав�не на тек�та в буфера за обмен"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "�ати�нете тук, за да прегледате наличната помощ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "По�тав�не на тек�т от буфера за обмен"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "�ати�нете тук, за да запазите текущи� прозорец"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Избиране на цели� тек�т"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Отбел�зано като"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../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
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "Помо_щ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "Вмъква_не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_�а�тройки"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Прикрепен…"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "�ати�нете тук, за да прикрепите файл"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Категории"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Превключване между това полето „Категори�“ да �е показва или не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Ча�ови _по��"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Превключване между това дали полето „Ча�ови по��“ да �е показва или не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "_Публично"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Отбел�зване като публично"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Лично"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Отбел�зване като лично"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Поверително"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Отбел�зване като поверително"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "Поле „_Рол�“"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Превключване между това дали полето „Рол�“ да �е показва или не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_Мол� отговорете"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+"Превключване между това дали полето „Мол�, отговорете“ да �е показва или не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "Поле за _�ъ�то�ние"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Превключване между това дали полето „Съ�то�ние“ да �е показва или не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "Поле за _вид"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+"Превключване между това дали полето „Вид на уча�тника“ да �е показва или не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "Скоро отвар�ни _документи"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Прикреп�не"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "_Скриване на лентата за прикрепени файлове"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "_Показване на лентата за прикрепени файлове"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../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
 #: ../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:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1046
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
-msgstr "_Прикреп�не на файл...."
+msgstr "_Прикреп�не на файл…."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Показване на прикрепени файлове"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "�ати�нете интервал, за да превключите показването на лентата за прикреп�не"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Редактиране на �реща"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Събрание - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Среща - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "�азначена задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Бележка - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "��ма обобщение"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промените по този запи� може да бъдат презапи�ани, ако при�тигне обнов�ване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "�е може да �е използва текущата вер�и�!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "�е може да �е отвори източник"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Ме�тоположението не може да бъде отворено"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Имате права �амо за четене"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Изтриване на този обект от пощен�ките кутии на в�ички получатели?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Събитието не може да бъде изтрито, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задачата не може да бъде изтрита, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Тази бележка не можа да бъде изтрита, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Този обект не може да бъде изтрит, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Събитието не може да бъде изтрито, защото н�мате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задачата не може да бъде изтрита, защото н�мате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Бележката не може да бъде изтрита, защото н�мате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Обектът не може да бъде изтрит, защото н�мате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Това �ъбитие не може да бъде изтрито заради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Задачата не може да бъде изтрита заради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Бележката не може да бъде изтрита заради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Обектът не може да бъде изтрит заради грешка"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
-msgstr "Контакти..."
+msgstr "Контакти…"
 
 #: ../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 "Делегиране на:"
 
@@ -6148,135 +6542,181 @@ msgstr "Делегиране на:"
 msgid "Enter Delegate"
 msgstr "Въвеждане на делегат"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_�ларми"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "�ати�нете тук, за да въведете или премахнете аларми за това �ъбитие"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Повторение"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Събитието да е повтар�емо"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../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
+msgid "Insert advanced send options"
+msgstr "Вмъкване на допълнителни опции за изпращането"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "Събитие за _ц�л ден"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Превключване между това дали �ъбитието е за ц�л ден или не"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Показване на времето като _заето"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Превключване между това дали времето да �е показва като заето или не"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Свободен/зает"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Запитване за информаци�та „�вободен/зает“ за при�ъ�тващите"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Среща"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Повторение"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Това �ъбитие има аларми"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Делегати"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "_При�ъ�тващи"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Събитие без начална дата"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Събитие без крайна дата"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "�ачалната дата е грешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Крайната дата е грешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "�ачални�т ча� е грешен"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Крайни�т ча� е грешен"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Избрани�т организатор вече н�ма абонамент."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "�еобходим е организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "�еобходим е поне един уча�тник."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "Доб_ав�не "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "�е може да �е отвори календара „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Дей�твате от името на %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Пер�онализиране"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Без"
 
@@ -6294,30 +6734,32 @@ msgstr "15 минути преди �реща"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
-msgstr "_При�ъ�тващи..."
+msgstr "_При�ъ�тващи…"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Лична аларма:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "Опи�ани_е:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Опи�ание на �ъбитие"
 
-#: ../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 "О_бобщение:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_�ларма"
 
+#: ../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 "_Опи�ание:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Време:"
@@ -6346,30 +6788,26 @@ msgstr "Пром_�на на организатор"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
-msgstr "Конт_акти..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Организатор"
+msgstr "Конт_акти…"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Бележка"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "�е може да �е отвор�т бележките в „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "До"
 
@@ -6382,63 +6820,59 @@ msgstr "�а_чална дата:"
 msgid "T_o:"
 msgstr "_До:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Опи�ание:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Промен�те повтар�що �е �ъбитие. Какво и�кате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Делегирате повтар�що �е �ъбитие. Какво и�кате да делегирате?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Промен�те повтар�ща �е задача. Какво и�кате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Промен�те повтар�ща �е бележка. Какво и�кате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Само в този �лучай"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "В този и предишните �лучаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "В този и бъдещите �лучаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "В�ички �лучаи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Тази �реща �ъдържа повторени�, които Evolution не може да редактира."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "на"
 
@@ -6446,7 +6880,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "първи"
 
@@ -6455,7 +6889,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "�екунда"
 
@@ -6463,7 +6897,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "трети"
 
@@ -6471,7 +6905,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "четвърти"
 
@@ -6479,13 +6913,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "по�леден"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Друга дата"
 
@@ -6493,7 +6927,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "от 1ви до 10ти"
 
@@ -6501,7 +6935,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "от 11ти до 20ти"
 
@@ -6509,45 +6943,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "�ъбити�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Добав�не на опи�ание"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "�еу�пех при получаването на избор, който да �е промени."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Промен�не на изключението"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "�еу�пех при получаването на избор, който да �е изтрие."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Дата/време:"
 
@@ -6598,12 +7032,12 @@ msgstr "�едмиц(а/и)"
 msgid "year(s)"
 msgstr "годин(а/и)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Датата на приключване е грешна"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Интернет �траница"
 
@@ -6618,51 +7052,55 @@ msgstr "<span weight=\"bold\">Съ�то�ние</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Завършено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Ви�око"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "В прогре�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "�и�ко"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "�ормално"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "�е е �тартиран"
 
@@ -6675,7 +7113,7 @@ msgid "Stat_us:"
 msgstr "Съ�то_�ние:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "�еопределено"
 
@@ -6684,7 +7122,7 @@ msgid "_Date completed:"
 msgstr "_Дата на приключване:"
 
 #: ../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 "_Приоритет:"
 
@@ -6692,51 +7130,59 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Интернет �траница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Съ�то�ние"
+
+#: ../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
+msgid "_Send Options"
+msgstr "_�а�тройки за изпращане"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Подробно�ти на задачата"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Крайни�т �рок е невалиден"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "�е може да �е отвор�т задачите в „%s“."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
-msgstr "_При�ъ�тващи..."
+msgstr "_При�ъ�тващи…"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
-msgstr "Ка_тегории..."
+msgstr "Ка_тегории…"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Опи�ание:"
+msgid "D_ue date:"
+msgstr "_Крайна дата:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Ча�ови по��:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Крайна дата:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6744,142 +7190,126 @@ 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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d �едмица"
 msgstr[1] "%d �едмици"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "�еизве�тно дей�твие за изпълнение"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизве�тен тип за превключване"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "�ати�нете, за да отворите %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "�еименувано"
 
-#: ../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
+#: ../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 "�ачална дата:"
 
-#: ../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-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 "Опи�ание:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "Интернет �траница:"
 
-#: ../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 "Обобщено:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Крайна дата:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Съ�то�ние:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Публичен"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Ча�тен"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Поверително"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Крайна дата"
@@ -6889,21 +7319,14 @@ msgstr "Крайна дата"
 msgid "Start Date"
 msgstr "�ачална дата"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Обобщение"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Свободно"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Заето"
 
@@ -6917,199 +7340,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025 ../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 "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "�е"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../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-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
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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:968
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Повтар�щ �е"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "�азначен"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
-msgstr "Запазване като..."
+msgstr "Запазване като…"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
-msgstr "Изберете папка, където да �е запаз�т избраните прикрепени файлове..."
+msgstr "Изберете папка, където да �е запаз�т избраните прикрепени файлове…"
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "неозаглавено_изображение.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
-msgstr "_Запазване като..."
+msgstr "_Запазване като…"
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Използване за _фон"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Запазване на избраните"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
-msgstr "Отвар�не в %s..."
+msgstr "Отвар�не в %s…"
+
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Организатор: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "�ачало: "
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Краен �рок: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Изтриване на избраните обекти"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Обнов�ване на обектите"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../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:277
 msgid "Save as..."
-msgstr "Запазване като..."
+msgstr "Запазване като…"
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "�ова _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Отвар�не на �траница в _Интернет"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
-msgstr "_Разпечатване..."
+msgstr "_Разпечатване…"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_По�тав�не"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Задаване на задача"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Препращане като iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Отбел�зване като приключено"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Отбел�зване на избраните задачи като приключено"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "Отбел�зване като _неприключено"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Отбел�зване на избраните задачи като _неприключено"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Изтриване на избраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "�ати�нете, за да добавите задача"
@@ -7132,7 +7581,8 @@ msgid "Due date"
 msgstr "Краен �рок"
 
 #: ../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:372
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -7140,127 +7590,108 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "�ачална дата"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Съ�то�ние"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Преме�тване на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Копиране на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
-msgstr "�ова _�реща..."
+msgstr "�ова _�реща…"
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "В�ички нови _�ъбити� за ден�"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "�ово _�ъбрание"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Текущ изглед"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Избиране на _днешна дата"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
-msgstr "Избор на д_ата..."
+msgstr "Избор на д_ата…"
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
-msgstr "_Разпечатване..."
+msgstr "_Разпечатване…"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
-msgstr "Копиране в _календар..."
+msgstr "Копиране в _календар…"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
-msgstr "Преме_�тване в календар..."
+msgstr "Преме_�тване в календар…"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
-msgstr "_Делегиране на �ъбрание..."
+msgstr "_Делегиране на �ъбрание…"
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
-msgstr "�а�рочване на �_ъбрание..."
+msgstr "�а�рочване на �_ъбрание…"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
-msgstr "Препра_ща като iCalendar..."
+msgstr "Препра_ща като iCalendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "Отгово_р"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Прави това �ъбитие пр_еме�тваемо"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Изтриване на това �_ъбитие"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Изтриване на в�ички _�ъбити�"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Организатор: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Организатор: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Ме�тоположение: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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: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"
@@ -7273,7 +7704,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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Разделени� от по %02i минути"
@@ -7284,46 +7715,34 @@ 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1549
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 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:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:789 ../calendar/gui/e-week-view.c:524
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "�утрин"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "�ледобед"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да (�ложно повторение)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "В�еки ден"
 msgstr[1] "�а в�еки %d дена"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7331,9 +7750,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "В��ка �едмица"
 msgstr[1] "�а в�еки %d �едмици"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7341,51 +7758,35 @@ msgstr[0] "В��ка �едмица в "
 msgstr[1] "�а в�еки %d �едмици в "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " и "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s ден от "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s от "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "в�еки ме�ец"
 msgstr[1] "на в�еки %d ме�еца"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "В��ка година"
 msgstr[1] "�а в�еки %d години"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7393,47 +7794,47 @@ msgstr[0] "общо %d път"
 msgstr[1] "общо %d пъти"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", завършва на "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "�ачало"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Край"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Краен �рок"
 
-#: ../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 "iCalendar информаци�"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Грешка в 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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "�еизве�тна лично�т"
 
 #. 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."
@@ -7441,294 +7842,294 @@ msgstr ""
 "<br> Прегледайте �ледната информаци� и тогава изберете дей�твие от долното "
 "меню."
 
-#: ../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:728
+#: ../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:2034
 msgid "Accepted"
 msgstr "Прието"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
 #: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "�еуверено прието"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
+#: ../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:2040
 msgid "Declined"
 msgstr "Отказано"
 
-#: ../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> публикува информаци� за �ъбрание."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Информаци� за �ъбрание"
 
-#: ../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> изи�ква при�ъ�твието на %s по време на �ъбранието."
 
-#: ../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> изи�ква вашето при�ъ�твие на �ъбрание."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Предложение за �ъбрание"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> и�ка да бъде добавен към �ъще�твуващо �ъбрание."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Обнов�ване на �ъбранието"
 
-#: ../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> и�ка да получи по�ледната информаци� за �ъбранието."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "За�вка за обнов�ване на �ъбранието"
 
-#: ../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> отговори на запитване за �ъбрание."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Отговор за �ъбрание"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> отмени �ъбранието."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Отм�на на �ъбрание"
 
-#: ../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> е изпратил неразбираемо �ъобщение."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Лошо �ъобщение за �ъбрание"
 
-#: ../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> публикува информаци� за задачата."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Информаци� за задача"
 
-#: ../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> изи�ква %s, за да бъде изпълнена задачата."
 
-#: ../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> изи�ква вашето уча�тие в задача.."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Предложение за задача"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> и�ка да бъде добавен към �ъще�твуваща задача."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Обнов�ване на задача"
 
-#: ../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> и�ка да получи по�ледната информаци� за задача."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "За�вка за обнов�ване на задача"
 
-#: ../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> отговори на включване в задача."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Отговор на задача"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> отмени задача."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Отм�на на задача"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Лошо �ъобщение за задача"
 
-#: ../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> публикува информаци� �вободен/зает."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Информаци� �вободен/зает"
 
-#: ../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> изи�ква от ва� информаци� за �вободен/зает."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "За�вка �вободен/зает"
 
-#: ../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> отговори на за�вката �вободен/зает."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Отговор �вободен/зает"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Лошо �ъобщение �вободен/зает"
 
-#: ../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 "Изглежда �ъобщението е повредено."
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението �ъдържа �амо неподдържани за�вки."
 
-#: ../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 "Прикрепени�т обект не �ъдържа валидно �ъобщение за календар."
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикрепени�т обект не �ъдържа видими обекти на календар"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Обнов�ването приключено\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Обектът е невалиден и не може да бъде о�ъвременен\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Този отговор не е от текущ при�ъ�тващ.  Да �е добави ли като уча�тник?"
+msgstr "Този отговор не е от текущ при�ъ�тващ. Да �е добави ли като уча�тник?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Съ�то�нието на при�ъ�тващи� не може да бъде о�ъвременено заради невалидно "
 "�ъ�то�ние!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Съ�то�нието на при�ъ�тващи� е о�ъвременено\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Съ�то�нието на при�ъ�тващи� не може да бъде о�ъвременено, защото обекта вече "
 "не �ъще�твува"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Обектът е изпратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Обектът не може да бъде изпратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Избор на дей�твие:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Обнов�ване"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Приемане"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Временно приемане"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Отказване"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Изпращане на информаци� �вободен/зает"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Обнов�ване на �ъ�то�нието на отговар�щи�"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Изпращане на най-новата информаци�"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отказ"
@@ -7751,118 +8152,118 @@ msgstr "Зареждане на календар"
 
 #: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
-msgstr "Календарът �е зарежда..."
+msgstr "Календарът �е зарежда…"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Съобщение на �ървър:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Пред�едател�тващи"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "�ужни уча�тници"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Възможни други уча�тници"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ре�ур�и"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "При�ъ�тващи"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Индивидуално"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Ре�ур�"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Помещение"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Пред�едател"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "За�вен уча�тник"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Възможен уча�тник"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "�е е уча�тник"
 
-#: ../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 "�еобходими дей�тви�"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "Пробен"
 
-#: ../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:737
+#: ../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
 msgid "Delegated"
 msgstr "Делегиран"
 
 #. 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:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Мол�, отговорете"
 
-#: ../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 "В прогре�"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7870,85 +8271,81 @@ 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Извън офи�а"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "��ма информаци�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
-msgstr "_При�ъ�тващи..."
+msgstr "_При�ъ�тващи…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "Оп_ции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Показване _�амо на работните ча�ове"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Показване като _умалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Обнов�ване на „�вободен/зает“"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_�вт. избиране"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_В�ички хора и ре�ур�и"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "В�и_чки хора и един ре�ур�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "�у_жни хора"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "�ужни хора и _един ре�ур�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_�ачало:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Край:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "При�ъ�тващ"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "�ати�нете тук, за да добавите при�ъ�тващ"
@@ -7981,8 +8378,8 @@ msgstr "_Изтриване на избраните бележки"
 msgid "Click to add a memo"
 msgstr "�ати�нете, за да добавите бележка"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7991,85 +8388,80 @@ msgstr ""
 "Грешка в %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Зареждане на бележки"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Отвар�не на бележки в %s"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
-msgstr "Изтриване на избраните обекти..."
+msgstr "Изтриване на избраните обекти…"
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Зареждане на задачи"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отвар�не на задачи в %s"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
-msgstr "Завършване на задачи..."
+msgstr "Завършване на задачи…"
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Изчи�тване на изтритите пи�ма"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "Обнов�ване на за�вката"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Личен изглед"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Запазване на лични� изглед"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
-msgstr "_Определ�не на изгледите..."
+msgstr "_Определ�не на изгледите…"
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Зареждане на �рещи от %s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Зареждане на задачи от %s"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Зареждане на бележки от %s"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Отвар�не на %s..."
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Прочи�тване"
 
@@ -8129,57 +8521,57 @@ msgstr "Септември"
 msgid "_Select Today"
 msgstr "_Избиране на днешна дата"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "Тр�бва да бъде зададен организатор."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "�еобходим е поне един уча�тник."
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Информаци� за �ъбитие"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Информаци� за задача"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Информаци� за бележка"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Информаци� �вободен/зает"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Календарна информаци�"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "О�ъвременен"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Презареждане"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Контра-предложение"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информаци� �вободен/зает (%s на %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar информаци�"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Тр�бва да �те уча�тник в �ъбитието."
 
@@ -8220,47 +8612,54 @@ msgstr "Ð�Ñ�ма наличен календар, за да Ñ�ъздавате Ð
 msgid "Memo Source Selector"
 msgstr "Избор на източниците за бележки"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "�ова бележка"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "_Бележка"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Създаване на нова бележка"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "�ова �поделена бележка"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
-msgstr "_Споделена бележка"
+msgstr "Спо_делена бележка"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Създаване на нова �поделена бележка"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "�ов �пи�ък � бележки"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "С_пи�ък � бележки"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Създаване на нов �пи�ък � бележки"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Печат на бележки"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Следващите 7 дни"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8270,9 +8669,9 @@ msgstr ""
 "Ме�тоположението и йерархи�та на папките �ъ� задачи на Evolution б�ха "
 "променени в новите вер�ии на програмата.\n"
 "\n"
-"Изчакайте, докато Evolution мигрира вашите папки..."
+"Изчакайте, докато Evolution мигрира вашите папки…"
 
-#: ../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"
@@ -8282,30 +8681,30 @@ msgstr ""
 "Ме�тоположението и йерархи�та на папките за календарите б�ха променени в "
 "новите вер�ии на програмата.\n"
 "\n"
-"Изчакайте, докато Evolution мигрира вашите папки..."
+"Изчакайте, докато Evolution мигрира вашите папки…"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "�еу�пех при мигрирането на �тарите на�тройки от evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "�еу�пех при мигрирането на календара „%s“"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "�еу�пех при мигрирането на задачите „%s“"
 
 #: ../calendar/gui/migration.c:1227
-#: ../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
+#: ../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 "Бележки"
 
@@ -8462,57 +8861,52 @@ msgstr "Пт"
 msgid "Sa"
 msgstr "Сб"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Среща"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Задача"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Обобщено: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "При�ъ�тващи: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Съ�то�ние: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "�дре�: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Пред�то�щи �рещи"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_�ов �пи�ък �ъ� задачи"
@@ -8543,39 +8937,46 @@ msgstr "Ð�Ñ�ма наличен календар, за да Ñ�ъздавате Ð
 msgid "Task Source Selector"
 msgstr "Избор на източниците за задачи"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "�ова задача"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Задача"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Създаване на нова задача"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "�овоназначена задача"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "�азначаване на за_дача"
+msgstr "З_ададена задача"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Създаване на новоназначена задача"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "�ов �пи�ък �ъ� задачи"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "Спи�_ък �ъ� задачи"
+msgstr "Спи�ък �ъ� _задачи"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Създаване на нов �пи�ък �ъ� задачи"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8587,1632 +8988,1833 @@ msgstr ""
 "\n"
 "�аи�тина ли и�кате да изтриете тези задачи?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Да не �е задава този въпро� отново."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Задачи за разпечатване"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% готово"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "В прогре�"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "е по-гол�мо от"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "е по малко от"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Срещи и �ъбрани�"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Отвар� �е календар"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Файлове iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Вно�ител на iCalendar файлове"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "�апомн�не!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Файлове, формат vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Вно�ител на файлове, формат vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Календарни �ъбити�"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентен интерфей� за вна��не на Evolution Calendar"
 
 #.
+#. *
+#. * 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 "�фрика/�биджан"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�фрика/�кра"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�фрика/�ди� �беба"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�фрика/�лжир"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�фрика/��мера"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�фрика/Бамако"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�фрика/Банги"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�фрика/Банжул"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�фрика/Би�ау"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "�фрика/Блантир"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�фрика/Бразавил"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�фрика/Буджумбура"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�фрика/Кайро"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�фрика/Казабланка"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�фрика/Селта"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�фрика/Конакри"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�фрика/Дакар"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "�фрика/Дар-е�-�алаам"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�фрика/Джибути"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "�фрика/Дуала"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "�фрика/Ел �аюн"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�фрика/Фрийтаун"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�фрика/Габороне"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�фрика/Хараре"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�фрика/Йохане�бург"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�фрика/Кампала"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�фрика/Харум"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�фрика/Кигали"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�фрика/Кинша�а"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�фрика/Лаго�"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�фрика/Либървил"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�фрика/Ломе"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�фрика/Луанда"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "�фрика/Любумбаши"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�фрика/Лу�ака"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�фрика/Малабо"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�фрика/Мапуто"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�фрика/Ма�еру"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�фрика/Мбабане"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "�фрика/Могадишо"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�фрика/Монрови�"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�фрика/�айроби"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�фрика/�джамена"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�фрика/�иамей"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�фрика/�уакшот"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�фрика/Уагадугу"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�фрика/Порто �ово"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "�фрика/Сао Томе"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�фрика/Тамбукту"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�фрика/Триполи"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�фрика/Туни�"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�фрика/Виндхук"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "�мерика/�дак"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "�мерика/�нкъридж"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "�мерика/�нгуила"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "�мерика/�нтигуа"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "�мерика/�рагуайна"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "�мерика/�руба"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "�мерика/��ун�ион"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "�мерика/Барбадо�"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "�мерика/Белем"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "�мерика/Белиз"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "�мерика/Боа_ви�та"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "�мерика/Богота"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "�мерика/Бои�"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "�мерика/Буено� �йре�"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "�мерика/Кеймбридж бей"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "�мерика/Канкун"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "�мерика/Карака�"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "�мерика/Катамарка"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "�мерика/Кайен"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "�мерика/Каймани"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "�мерика/Чикаго"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "�мерика/Чихуахуа"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "�мерика/Кордоба"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "�мерика/Ко�та Рика"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "�мерика/Ку�ба"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "�мерика/Кюра�ао"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "�мерика/Данмарк�хавен"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "�мерика/Доу�ън"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "�мерика/Доу�ън Крийк"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "�мерика/Денвър"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "�мерика/Детройт"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "�мерика/Доминика"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "�мерика/Едмонтън"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "�мерика/Ейрунепе"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "�мерика/Ел Славадор"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "�мерика/Форталеза"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "�мерика/Глей� Бей"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "�мерика/Годаб"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "�мерика/Гуу� Бей"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "�мерика/Гранд Тюрк"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "�мерика/Гренада"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "�мерика/Гваделупа"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "�мерика/Гватемала"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "�мерика/Гуа�кил"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "�мерика/Гайана"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "�мерика/Халифак�"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "�мерика/Хавана"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "�мерика/Хермо�ило"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "�мерика/Индиана/Индианаполи�"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "�мерика/Индиана/�ок�"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "�мерика/Индиана/Маренго"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "�мерика/Индиана/Вевей"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "�мерика/Индианаполи�"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "�мерика/Инувик"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "�мерика/Икалуит"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "�мерика/Ямайка"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "�мерика/Хухуй"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "�мерика/Жунеау"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "�мерика/Кентъки/Луи�вил"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "�мерика/Кентъки/Монтичело"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "�мерика/Ла Па�"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "�мерика/Лима"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "�мерика/Ло� �нжели�"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "�мерика/Луи�вил"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "�мерика/Ма�ейо"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "�мерика/Манагуа"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "�мерика/Манау�"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "�мерика/Мартиника"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "�мерика/Мазатлан"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "�мерика/Мендо�а"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "�мерика/Меноминее"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "�мерика/Мерида"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "�мерика/Мек�ико �ити"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "�мерика/Микелон"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "�мерика/Монтерей"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "�мерика/Монтевидео"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "�мерика/Монреал"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "�мерика/Мон�ерат"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "�мерика/�а�ау"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "�мерика/�ю Йорк"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "�мерика/�ипигон"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "�мерика/�оме"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "�мерика/�орон�"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "�мерика/Северна Дакота/Център"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "�мерика/Панама"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "�мерика/Пангниртунг"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "�мерика/Парамарибо"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "�мерика/Феник�"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "�мерика/Порт-о-Прен�"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "�мерика/Порт ъф Спейн"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "�мерика/Порто Велхо"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "�мерика/Пуерто Рико"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "�мерика/Рейни Ривър"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "�мерика/Ранкин"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "�мерика/Ре�ифе"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "�мерика/Реджина"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "�мерика/Рио Бранко"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "�мерика/Ро�арио"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "�мерика/Сант�го"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "�мерика/Санто Доминго"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "�мерика/Сао Паоло"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "�мерика/Скоре�би�унд"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "�мерика/Шипрок"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "�мерика/Сейнт Джон�"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "�мерика/Сейнт Кит�"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "�мерика/Санта Лу�и�"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "�мерика/Сейнт Тома�"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "�мерика/Сейнт Вин�ент"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "�мерика/Суифт карънт"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "�мерика/Тегу�игалпа"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "�мерика/Туле"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "�мерика/Тъндър Бей"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "�мерика/Тихуана"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "�мерика/Тортола"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "�мерика/Ванкувър"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "�мерика/Уайтхор�"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "�мерика/Уинипег"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "�мерика/Якутат"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "�мерика/Йелоунайф"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "�нтарктика/Кей�и"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "�нтарктика/Дейви�"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "�нтарктика/Дюмон Дюрвил"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "�нтарктика/Моу�ън"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "�нтарктика/МакМърдо"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "�нтарктика/Палмър"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "�нтарктика/Южни� полю�"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "�нтарктика/Сиова"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "�нтарктика/Во�ток"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "�рктика/Лонгиеарбиен"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "�зи�/�ден"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "�зи�/�лмати"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "�зи�/�ман"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "�зи�/�надир"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "�зи�/�ктау"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "�зи�/�ктобе"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "�зи�/�шхабад"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "�зи�/Багдад"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "�зи�/Бахрейн"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "�зи�/Баку"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "�зи�/Банкок"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "�зи�/Бейрут"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "�зи�/Бишкек"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "�зи�/Бруней"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "�зи�/Калкута"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "�зи�/Чойбал�ан"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "�зи�/Чонгкинг"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "�зи�/Коломбо"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "�зи�/Дама�к"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "�зи�/Дака"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "�зи�/Дили"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "�зи�/Дубай"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "�зи�/Душанбе"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "�зи�/Газа"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "�зи�/Харбин"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "�зи�/Хонг Конг"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "�зи�/Ховд"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "�зи�/Иркут�к"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "�зи�/Ин�танбул"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "�зи�/Джакарта"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "�зи�/Джа�пура"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "�зи�/Йеру�алим"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "�зи�/Кабул"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "�зи�/Камчатка"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "�зи�/Карачи"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "�зи�/Кашгар"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "�зи�/Катманду"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "�зи�/Кра�нодар�к"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "�зи�/Куала лумпур"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "�зи�/Кучинг"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "�зи�/Кувейт"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "�зи�/Макао"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "�зи�/Макау"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "�зи�/Магадан"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "�зи�/Мака�ар"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "�зи�/Манила"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "�зи�/Му�кат"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "�зи�/�икози�"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "�зи�/�ово�ибир�к"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "�зи�/Ом�к"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "�зи�/Орал"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "�зи�/Пном Пен"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "�зи�/Понтиак"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "�зи�/Пионги�нг"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "�зи�/Катар"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "�зи�/Кизилорда"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "�зи�/Рангун"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "�зи�/Риад"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "�зи�/Сайгон"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "�зи�/Сахалин"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "�зи�/Самарканд"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "�зи�/Сеул"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "�зи�/Шанхай"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "�зи�/Сингапур"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "�зи�/Тайпе"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "�зи�/Ташкент"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "�зи�/Тбили�и"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "�зи�/Техеран"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "�зи�/Тимпу"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "�зи�/Токио"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "�зи�/Уюнг Панданг"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "�зи�/Улан Батор"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "�зи�/Урумки"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "�зи�/Виентиан"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "�зи�/Владиво�ток"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "�зи�/Якут�к"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "�зи�/Екатеринбург"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "�зи�/Ереван"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "�тлантика/�зор�ки о�трови"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "�тлантика/Бермуд�ки о�трови"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "�тлантика/Канар�ки о�трови"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "�тлантика/Кабо Верде"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "�тлантик/Фарьор�ки о�трови"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "�тлантика/Ян Майен"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "�тлантика/Мадейра"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "�тлантик/Рейк�вик"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "�тлантика/Южна Джорджи�"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "�тлантиче�ки� океан/Св. Елена"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "�тлантиче�ки� океан/Стенли"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "�в�трали�/�делаида"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "�в�трали�/Бри�бейн"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "�в�трали�/Броукън Хил"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "�в�трали�/Дарвин"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "�в�трали�/Хобарт"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "�в�трали�/Линдеман"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "�в�трали�/Лорд Хауи"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "�в�трали�/Мелбърн"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "�в�трали�/Пърт"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "�в�трали�/Сидни"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Европа/�м�тердам"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Европа/�ндора"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Европа/�тина"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Европа/Белфа�т"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Европа/Белград"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Европа/Берлин"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Европа/Брати�лава"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Европа/Брюк�ел"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Европа/Букурещ"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Европа/Будапеща"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Европа/Кишинев"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Европа/Копенхаген"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Европа/Дъблин"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Европа/Гибралтар"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Европа/Хелзинки"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Европа/Ин�танбул"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Европа/Калининград"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Европа/Киев"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Европа/Ли�абон"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Европа/Любл�на"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Европа/Лондон"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Европа/Люк�ембург"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Европа/Мадрид"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Европа/Малта"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Европа/Мин�к"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Европа/Монако"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Европа/Мо�ква"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Европа/�икози�"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Европа/О�ло"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Европа/Париж"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Европа/Прага"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Европа/Рига"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Европа/Рим"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Европа/Самара"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Европа/Сан Марино"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Европа/Сараево"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Европа/Симферопол"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Европа/Скопие"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Европа/Софи�"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Европа/Стокхолм"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Европа/Талин"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Европа/Тирана"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Европа/Ужгород"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Европа/Вадуц"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Европа/Ватикана"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Европа/Виена"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Европа/Вилню�"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Европа/Варшава"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Европа/Загреб"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Европа/Запорожие"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Европа/Цюрих"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Индий�ки океан/�нтананариво"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Индий�ки океан/Каго�"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Индий�ки океан/Коледни о-ви"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Индий�ки океан/Коко�"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Индий�ки океан/Комор�ки о�трови"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Индий�ки океан/Кергуелен"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Индий�ки океан/Махе"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Индий�ки океан/Малдив�ки о�трови"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Индий�ки океан/Мавриций"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Индий�ки океан/Майот"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Индий�ки океан/Реюнион"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Тихи океан/�пиа"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Тихи океан/Оуклънд"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Тихи океан/Чатъм"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Тихи океан/Великден�ки о-ви"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Тихи океан/Ефате"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Тихи океан/Ендербъри"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Тихи океан/Факаофо"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Тихи океан/Фиджи"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Тихи океан/Фунафути"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Тихи океан/Галапаго�"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Тихи океан/Гамбие"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Тихи океан/Гуадалканал"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Тихи океан/Гуам"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Тихи океан/Хонолулу"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Тихи океан/Джон�тън"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Тихи океан/Киритимати"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Тихи океан/Ко�рае"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Тихи океан/Квахалеин"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Тихи океан/Маджуро"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Тихи океан/Маркеза�"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Тихи океан/Мидуей"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Тихи океан/�ауру"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Тихи океан/�иуе"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Тихи океан/�орфолк"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Тихи океан/�умеа"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Тихи океан/Паго-Паго"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Тихи океан/Палао"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Тихи океан/Питкеърн"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Тихи океан/Понапе"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Тихи океан/Порт Морзби"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Тихи океан/Раротонга"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Тихи океан/Сайпан"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Тихи океан/Таити"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Тихи океан/Тарава"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Тихи океан/Тонгатапу"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Тихи океан/Трук"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Тихи океан/Уейк"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Тихи океан/Уоли�"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Тихи океан/Яп"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "�ати�нете тук за адре�ника"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "�еу�пех при отвар�нето на автоматично запазени� файл"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Получател на пощата"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "�е може да �е получи �ъобщение от редактора"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Избор на папки, в които да бъде копирано пи�мото."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Прикреп�не на файл"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "�ати�нете тук, за да въведете папки, в които да бъде копирано пи�мото"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "_Прикреп�не"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "_Подпи�:"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Пи�мо без тема"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "_От:"
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "Прикреп�не на файл"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "От_говор до:"
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Затвар�не"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_До:"
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "Затвар�не на текущи� файл"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../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 "_Разпечатване…"
+
+#: ../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 "_Печатен преглед"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "Запазване на текущи� файл"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "Запазване к_ато…"
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "Запазване на текущи� файл � различно име"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "Запазване на _чернова"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "Запазване като чернова"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "_Изпращане"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "Изпращане на това пи�мо"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "Вмъкване на опции за изпращането"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "�ово _пи�мо"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Отвар�не на прозорец за ново пи�мо"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "_Кодиране на знаците"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "_Сигурно�т"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "_Шифриране � PGP"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "Шифриране � PGP"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "_Подпи� � PGP"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "Подпи�ване � ваши� ключ за PGP"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "_Приоритет на пи�мото"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "Вдигане на приоритета на пи�мото до ви�ок"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "_Изи�кване на изве�тие за прочитане"
+
+#: ../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 "Шифриране � _S/MIME"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Шифриране �ъ� �ертификат на S/MIME за шифриране"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "Подпи� � S/_MIME"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Подпи�ване � ваши� �ертификат за S/MIME за подпи�ване"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "Поле „_Скрито копие“"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+"Превключване между това дали полето „Скрито копие“ да бъде показвано или не"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "Поле „_Копие“"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "Превключване между това дали полето „Копие“ да бъде показвано или не"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "Поле „_От“"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Превключване между това дали полето „От“ да бъде показвано или не"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "Поле „Копие в _папка“"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr ""
+"Превключване между това дали полето „Копиране в папка“ да бъде показвано или "
+"не"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "Поле „_Отговор до“"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+"Превключване между това дали полето „Отговор до“ да бъде показвано или не"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "Поле „_Тема“"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Превключване между това дали полето „Съ�то�ние“ да �е показва или не"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "Поле „_До“"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "Превключване между това дали полето „До“ да бъде показвано или не"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Въведете получател(и) на пи�мото"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Копие:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Въведете адре�ите на получатели на копие на това пи�мо"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Скрито копие:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../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"
@@ -10220,30 +10822,66 @@ msgstr ""
 "Въведете адре�ите, които ще получат копие от пи�мото, без да �е по�в�ват в "
 "�пи�ъка на получателите."
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_От:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "От_говор до:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_До:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Копие:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Скрито копие:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "Копиране в _папка:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "_Прикреп�не"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "_Подпи�:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "При_креп�не на файл"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "�ати�нете тук за адре�ника"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Получател на пощата"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Избор на папки, в които да бъде копирано пи�мото."
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "�ати�нете тук, за да въведете папки, в които да бъде копирано пи�мото"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+msgid "Show _Attachment Bar"
+msgstr "Показв_ане на лентата за прикрепени файлове"
+
+#: ../composer/e-msg-composer.c:870
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Заминаващото пи�мо не може да бъде подпи�ано: за този абонамент н�ма зададен "
 "�ертификат за подпи�ване"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:877
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10251,42 +10889,23 @@ msgstr ""
 "Изпращащото �е пи�мо не може да бъде шифрирано: н�ма зададен �ертификат за "
 "шифриране към този абонамент"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1498 ../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:1554
 msgid "Hide _Attachment Bar"
 msgstr "Скрив_ане на лентата за прикрепени файлове"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "Показв_ане на лентата за прикрепени файлове"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Причината е неизве�тна"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "�е може да �е отвори файл"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "�е може да �е получи �ъобщение от редактора"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Пи�мо без тема"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Отвар�не на файл"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
 msgid "Compose Message"
 msgstr "Пи�ане на пи�мо"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4053
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10318,8 +10937,7 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Заради „{0}“, може да �е наложи да изберете други на�тройки на пощата."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Защото „{1}“."
 
@@ -10432,23 +11050,27 @@ msgstr "�е можете да прикрепите файла „{0}“ към
 msgid "You need to configure an account before you can compose mail."
 msgstr "Преди да изпращате пи�ма, тр�бва да на�троите поне един абонамент."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Продължаване на редактирането"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Без въз�танов�ване"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Въз�танов�ване"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Запазване на пи�мото"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Запазване на _чернова"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Пощен�ки клиент и календар (Evolution)"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Програма за работа в група"
 
@@ -10464,49 +11086,72 @@ msgstr "адре�на карта"
 msgid "calendar information"
 msgstr "календарна информаци�"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Грешка в Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Предупреждение на Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Информаци� за Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "За�вка на Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Вътрешна грешка, изи�ква �е непозната грешка „%s“"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Компонент"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "Име на компонента, за който ще �е запазват данни в журнала"
+
+#: ../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
+msgid "Enabled"
+msgstr "Включен"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Дали разширението е включено"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Възникна грешка при печатането"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Си�темата за печат докладва �ледните подробно�ти отно�но грешката:"
 
-#: ../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 ""
 "Си�темата за печат не докладва никакви допълнителни подробно�ти отно�но "
 "грешката."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Защото „{1}“."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "�еу�пех при отвар�нето на файл „{0}“."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "�еу�пех при запазването на файл „{0}“."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10514,7 +11159,7 @@ msgid "Do you wish to overwrite it?"
 msgstr "И�кате ли да �е презапише?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Файлът �ъще�твува „{0}“."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10525,49 +11170,65 @@ msgstr "Презапи�ване на файла?"
 msgid "_Overwrite"
 msgstr "Пре_запи�ване"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "�еу�пех при показването на ръковод�твото на Evolution."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Важно"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Служебно"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Лично"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Да �е направи"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_По-къ�но"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Име на етикет:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Редактиране на етикет"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Добав�не на етикет"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Името на етикета не може да бъде празно."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-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
+#, c-format
+msgid "GConf error: %s"
+msgstr "Грешка на GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "В�ички �ледващи грешки ще �е показват �амо в терминал."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10685,65 +11346,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Изберете време, за да го �равните �"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Избор на файл"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Проба"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Име на _правило:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Тър�ене на обекти, които отговар�т на �ледните критерии"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Добав�не на правило за филтър"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "�ко �а изпълнени в�ички критерии "
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "�ко е изпълнен н�кой от критериите"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Тър�ене на обекти:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "В�ички �вързани"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Отговори"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Отговори и първи пи�ма"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "��ма отговор или първо пи�мо"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "_Включване на нишките"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Вход�щи"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Изход�щи"
 
@@ -10767,7 +11428,7 @@ msgstr "Лип�ваща дата."
 msgid "Missing file name."
 msgstr "Лип�ващо име на файл."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Лип�ващо име."
 
@@ -10843,7 +11504,7 @@ msgstr "в бъдещето"
 msgid "months"
 msgstr "ме�еци"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "�екунди"
 
@@ -10855,9 +11516,10 @@ msgstr "текущото време"
 msgid "the time you specify"
 msgstr "времето, определено от ва�"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "�едмици"
 
@@ -10873,7 +11535,7 @@ msgstr "Добав�не на правило"
 msgid "Edit Rule"
 msgstr "Редактиране на правило"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Име на правило"
 
@@ -10897,57 +11559,69 @@ msgid "Configure your email accounts here"
 msgstr "�а�тройка на абонаменти"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "�а�тройки на мрежовата връзка"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Поща на 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 "Контрол за на�тройки на абонаменти към пощата на Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Компонент на пощата на Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Интерфей� за пи�ане на пи�ма към пощата на 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 "Контрол за на�тройки на редактора за пи�ане на пи�ма"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "�а�тройки на пощата на Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+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:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Поща"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "�бонаменти"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "�а�тройки на пощата"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "�а�тройки на мрежата"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Поща"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s лицензно �поразумение"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10960,115 +11634,109 @@ msgstr ""
 "за %s.\n"
 "След което декларирайте, че го приемате\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Избор на папка"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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
 msgid "Autogenerated"
 msgstr "�втоматично генериран"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Питане за в��ко пи�мо"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Потребител"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Получаване на пощата"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Проверка за _нова поща в�еки"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "_минути"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Изпращане на пи�мо"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Стандартни"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Сигурно�т"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Получаване на на�тройки"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Проверка за нови пи�ма"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор на абонаменти"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за абонаментите"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[По подразбиране]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Включен"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Име на абонамента"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "Без име"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Език/ци"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Добав�не на �крипт за подпи�"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Подпи�(и)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Препратено пи�мо --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "неизве�тен подател"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11076,11 +11744,11 @@ msgstr ""
 "В ${24Hour}:${Minute} ${TimeZone} на ${Day}.${Month}.${Year} "
 "(${AbbrevWeekdayName}), ${Sender} напи�а:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Оригинално пи�мо-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Правила за _филтриране"
 
@@ -11097,10 +11765,6 @@ msgstr "Определ�не на цв�т"
 msgid "Assign Score"
 msgstr "Определ�не на обхват"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Прикрепени файлове"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Скрито копие до"
@@ -11117,10 +11781,6 @@ msgstr "Копие до"
 msgid "Completed On"
 msgstr "Приключено на"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "�ъдържа"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Копиране в папка"
@@ -11134,7 +11794,7 @@ msgid "Date sent"
 msgstr "Изпратено на дата"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11145,10 +11805,6 @@ msgstr "Изтриване"
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "не �ъдържа"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "не завършва �"
@@ -11169,10 +11825,6 @@ msgstr "не звучи като"
 msgid "does not start with"
 msgstr "не започва �"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "�е �ъще�твува"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Чернова"
@@ -11181,10 +11833,6 @@ msgstr "Чернова"
 msgid "ends with"
 msgstr "завършва �"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Съще�твува"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "�ъще�твува"
@@ -11197,14 +11845,10 @@ msgstr "Израз"
 msgid "Follow Up"
 msgstr "Следващо пи�мо в разговор"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Важно"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "е"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "е �лед"
@@ -11217,18 +11861,6 @@ msgstr "е преди"
 msgid "is Flagged"
 msgstr "отбел�зано е"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "е по-гол�мо от"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "е по малко от"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "не е"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "не е отбел�зано"
@@ -11241,7 +11873,7 @@ msgstr "не е зададена"
 msgid "is set"
 msgstr "е зададена"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Спам"
@@ -11250,7 +11882,7 @@ msgstr "Спам"
 msgid "Junk Test"
 msgstr "Те�т за �пам"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Етикет"
 
@@ -11292,7 +11924,7 @@ 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Прочитане"
 
@@ -11364,10 +11996,9 @@ msgstr "започва �"
 msgid "Stop Processing"
 msgstr "Спиране на обработването"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11378,64 +12009,64 @@ msgid "Unset Status"
 msgstr "�еопределено �ъ�то�ние"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "След това"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Добав�не на _дей�твие"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
-msgstr "_Създаване на папка за тър�ене на чи�то..."
+msgstr "_Създаване на папка за тър�ене на чи�то…"
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "В�ички пи�ма"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "�епрочетени пи�ма"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "��ма етикет"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Прочетени пи�ма"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "По�ледни пи�ма"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Пи�мата от по�ледните 5 дни"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Пи�ма � прикачени файлове"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Важни пи�ма"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Пи�мата, които не �а �пам"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Тър�ене в абонамент"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Тър�ене във в�ички абонаменти"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "�епрочетено пи�мо:"
@@ -11443,31 +12074,51 @@ msgstr[1] "�епрочетени пи�ма:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Общо пи�мо:"
 msgstr[1] "Общо пи�ма:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Използвана квота (%s):"
+
+#: ../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:160
+#: ../mail/mail-component.c:581
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Пощен�ка кути�"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "�а�тройки на папката"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<нати�нете тук, за да изберете папка>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_Създаване"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Име на _папка:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Папки за тър�ене"
 
@@ -11476,29 +12127,21 @@ msgstr "Папки за тър�ене"
 msgid "UNMATCHED"
 msgstr "�ЯМ� СЪВП�ДЕ�ИЕ"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Чернови"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Пощен�ка кути�"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "За изпращане"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Изпратени"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
-msgstr "Зареждане..."
+msgstr "Зареждане…"
 
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. "%s" will be replaced by
@@ -11515,333 +12158,323 @@ msgstr "Зареждане..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Дърво на папката � пощата"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Преме�тване на папка %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копиране на папка %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преме�тване на пи�ма в папка %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копиране на пи�ма в папка %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�еу�пех при пу�кането на пи�мото(та) във ви�ше хранилище"
 
-#: ../mail/em-folder-tree.c:994 ../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 "_Копиране в папка"
 
-#: ../mail/em-folder-tree.c:995 ../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 "Преме�тване в _папка"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в „%s“"
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Изглед"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Отвар�не в _нов прозорец"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
-msgstr "_�ова папка..."
+msgstr "_�ова папка…"
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
-msgstr "Пре_ме�тване..."
+msgstr "Пре_ме�тване…"
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
-msgstr "П_реименуване..."
+msgstr "П_реименуване…"
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_Презареждане"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Изпращане на _чакащи пи�ма"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Изчи�тване на _кошчето"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Копиране на „%s“ в „%s“"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../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:83
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Копиране"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Създаване на папка „%s“"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Създаване на папка"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Указване къде да бъде �ъздадена папката:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "�еу�пех при изтриване на поща"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "��мате до�татъчно права, за да изтриете това пи�мо."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Отговор до подател�"
 
-#: ../mail/em-folder-view.c:1337 ../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 "_Препращане"
 
 #. 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:1341 ../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 "Р_едактиране като ново пи�мо..."
+msgstr "Р_едактиране като ново пи�мо…"
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Разпечатване..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "В_ъз�танов�ване на изтрито"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
-msgstr "Пре_ме�тване в папка..."
+msgstr "Пре_ме�тване в папка…"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
-msgstr "_Копиране в папка..."
+msgstr "_Копиране в папка…"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "От_бел�зване като прочетено"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Отбел�зване като _непрочетено"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Отбел�зване като ва_жно"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Отбел�зване като не_важно"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Отбел�зване като _�пам"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Отбел�зване като различ_но от �пам"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
-msgstr "Отбел�зване за про�ле_д�ване..."
+msgstr "Отбел�зване за про�ле_д�ване…"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Етикет"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Без"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_�ов етикет"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Фла_гът е завършен"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Из_чи�тване на отбел�зването"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "С_ъздаване на правило от пи�мо"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Папка за тър�ене по _тема"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Папка за тър�ене по _подател"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Папка за тър�ене по полу_чатели"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Папка за тър�ене по по_щен�ки �пи�ък"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Филтър по т_ема"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Филтър по п_одател"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Филтър по получ_атели"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Филтър по поще_н�ки �пи�ък"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "Стандартно"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Пи�мото не може да �е получи"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
-msgstr "Получаване на пи�мо..."
+msgstr "Получаване на пи�мо…"
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
-msgstr "_Свързване �..."
+msgstr "_Свързване �…"
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Създаване на п_апка за тър�ене"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_От този адре�"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_До този адре�"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "�ати�нете, за да изпратите пи�мо на %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "�ати�нете, за да �е �вържете � %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../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:515
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "Съвпадени�: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../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:683
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_Предишен"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_Следващ"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "_Зачитане на малки/големи"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "�еподпи�ано"
 
-#: ../mail/em-format-html-display.c:992
+#: ../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:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Валиден подпи�"
 
-#: ../mail/em-format-html-display.c:993
+#: ../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."
@@ -11849,11 +12482,11 @@ msgstr ""
 "Това пи�мо е подпи�ано и е валидно, което означава, че най-веро�тно е "
 "автентично."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "�евалиден подпи�"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11861,11 +12494,11 @@ msgstr ""
 "Подпи�ът на това пи�мо не може да бъде проверен. Възможно е то вече да е "
 "било променено, преди да бъде получено."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../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:995
+#: ../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."
@@ -11873,21 +12506,21 @@ msgstr ""
 "Това пи�мо е подпи�ано � валиден подпи�, но подател�т не може да бъде "
 "проверен."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../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:996
+#: ../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:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "�ешифрирано"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11895,11 +12528,11 @@ msgstr ""
 "Това пи�мо не е шифрирано. Докато пътува през Интернет, трети лица могат да "
 "вид�т неговото �ъдържание."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Слабо шифриране"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../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 "
@@ -11909,11 +12542,11 @@ msgstr ""
 "трудно, но не невъзможно, да дешифрират неговото �ъдържание за практиче�ки "
 "период от време."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Шифрирано"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../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."
@@ -11921,11 +12554,11 @@ msgstr ""
 "Това пи�мо е шифрирано. �а трети лица ще бъде много трудно да вид�т неговото "
 "�ъдържание."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Силно шифрирано"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../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 "
@@ -11934,94 +12567,89 @@ msgstr ""
 "Това пи�мо е шифрирано чрез �илен алгоритъм. За трети лица ще бъде много "
 "трудно да го дешифрират за практиче�ки период от време."
 
-#: ../mail/em-format-html-display.c:1107 ../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:1122
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "Този �ертификат не може да �е преглежда"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завършено на %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Про�рочено:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "� %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "_Вграден преглед"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "_Скриване"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_Съразмерно широчината"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "Оригинален раз_мер"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Прикрепен файл"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "Запазване на прикрепени� файл като"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "Изберете папка за запазване на в�ички прикрепени файлове"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
-msgstr "_Запазване на избраното..."
+msgstr "_Запазване на избраното…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../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:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "_Запазване"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "_Запазване на в�ички"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "��ма прикрепени файлове"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "_�еформатиран изглед"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "_Скриване на неформатираното"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "Отвар�не _�"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../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 ""
 "Това пи�мо е прекалено гол�мо и Evolution не може да го изобрази. Можете да "
@@ -12032,281 +12660,291 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Страница %d от %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Получаване на „%s“"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "�еизве�тна външна ча�т на т�лото на пи�мото"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Зле форматирана външна ча�т на т�лото на пи�мото"
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указател към FTP �айт (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указател към локален файл (%s), валиден на �айта „%s“"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указател към локален файл (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указател към отдалечени данни (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указател към неизве�тни външни данни (тип „%s“)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Форматиране на пи�мо"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
-msgstr "Форматиране на пи�мо..."
+msgstr "Форматиране на пи�мо…"
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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 "Копие"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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 "Скрито копие"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Пощен�ка програма"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../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:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Дата"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Това пи�мо е изпратено от <b>%s</b> от името на <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "От"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 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
+msgid "Date"
+msgstr "Дата"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Групи за новини"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s прикрепен файл"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "�еу�пех при анализирането на пи�мото във формат S/MIME: неизве�тна грешка"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "�еу�пех при анализирането на пи�мото във формат MIME. Показва �е в изходен "
 "код."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "�еподдържан метод за шифриране за multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "�еу�пех при анализирането на пи�мото във формат PGP/MIME"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "�еу�пех при анализирането на пи�мото във формат PGP/MIME: неизве�тна грешка"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "�еподдържан формат на подпи�а"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Грешка при проверката на подпи�а"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "�еизве�тна грешка при проверката на подпи�а"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "�еу�пех при анализирането на пи�мото във формат PGP"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "�еу�пех при анализирането на пи�мото във формат PGP: неизве�тна грешка"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "В�еки път"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Един път дневно"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Един път �едмично"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Един път ме�ечно"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Добав�не на �пециална заглавна ча�т за �пам"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Име на заглавната ча�т:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Съдържание:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Стойно�тта �ъдържа"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Цв�т"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Етикет"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "При�тавката „%s“ е налична и двоични� файл е ин�талиран."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "При�тавката „%s“ не е налична. Проверете дали пакета е ин�талиран."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Лип�ва при�тавка за �пам"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Тр�бва да �е направи"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "По-къ�но"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Ме�тоположението и йерархи�та на папките � поща б�ха променени в новите "
-"вер�ии на програмата.\n"
-"\n"
-"Изчакайте, докато Evolution мигрира вашите папки..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "�еу�пех при �ъздаването на новата папка „%s“: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "�еу�пех при копирането на папка „%s“ в „%s“: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "�еу�пех при �канирането за �ъще�твуващи пощен�ки кутии на „%s“: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Ме�тоположението и йерархи�та на папките � поща б�ха променени в новите "
+"вер�ии на програмата.\n"
+"\n"
+"Изчакайте, докато Evolution мигрира вашите папки…"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "�еу�пех при отвар�нето на �тари данни, пазени на POP �ървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "�еу�пех при �ъздаването на папка за данни, пазени на POP3 �ървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "�еу�пех при копирането на данни, пазени на POP3 �ървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "�еу�пех при �ъздаването на локалното хранилище за пощата „%s“: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"Форматът на обобщени�та в пощен�ките папки на Evolution е реализиран чрез "
+"SQLite от вер�и� 2.24 нататък.\n"
+"\n"
+"Изчакайте, докато Evolution мигрира вашите папки…"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "�еу�пех при �ъздаване на локални папки към „%s“: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12314,123 +12952,138 @@ msgstr ""
 "�еу�пех при четенето на на�тройките от предишната ин�талаци� на Evolution, "
 "„evolution/config.xmldb“ не �ъще�твува или е повреден."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Отговор на подател�"
 
-#: ../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 "Отговор до _�пи�ъка"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "Доб_ав�не към адре�ника"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Хранилището не поддържа запи�вани�, или те не �а включени."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "�бониран"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Изберете �ървър."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "�е е избран �ървър"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
-msgstr "_Това пи�мо да не �е показва отново."
+msgstr "_Това �ъобщение да не �е показва отново."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Пощен�ки _филтри"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "пи�мо"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
-msgstr "Запазване на пи�мо..."
+msgstr "Запазване на пи�мо…"
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Добав�не на адре�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Пи�ма от %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Папки за _тър�ене"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Източник на папка за тър�ене"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Ви�очина на прозореца „Изпращане и получаване на поща“"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Мак�имизирано �ъ�то�ние на прозореца „Изпращане и получаване на поща“"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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 да изобрази откъ� от тек�та � ограничен размер"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Винаги да �е изи�ква изве�тие за прочитане"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../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:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "�втоматично разпознаване на емотикони"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "�втоматично разпознаване на хипервръзки"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Провер�ване дали идващата поща не е �пам"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Цв�т, � който да �е отбел�зват цитатите"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Цв�т за отбел�зване на цитатите."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Стандартна ви�очина на прозореца за пи�ане на пи�ма"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Стандартна широчина на прозореца за пи�ане на пи�ма"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Папка за зареждане на прикрепени файлове"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Вме�тване на адре�ите на е-поща в „До/Копие/Скрито копие“"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12438,90 +13091,117 @@ msgstr ""
 "Вме�тване на адре�ите на е-поща в „До/Копие/Скрито копие“ до бро� указан в "
 "ключа address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 ""
+"Контролира колко че�то да �е �инхронизират локалните промени � отдалечени� "
+"�ървър за поща. Интервалът тр�бва да бъде поне 30 �екунди."
+
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "Стандартната кодова таблица, в ко�то да �е пишат пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Стандартната кодова таблица, в ко�то да �е пишат пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Стандартна кодова таблица, чрез ко�то да �е изобраз�ват пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Стандартна кодова таблица, чрез ко�то да �е изобраз�ват пи�мата."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Стандартен �тил на препращане"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Стандартната ви�очина на прозореца за пи�ане на пи�ма."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Стандартната ви�очина на прозореца за пи�ма."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Стандартната ви�очина на прозореца за абониране."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Стандартен �тил на отговор"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Стандартна �тойно�т за �ъ�то�нието на нишките"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Стандартната широчина на прозореца за пи�ане на пи�ма."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Стандартната широчина на прозореца за пи�ма."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Стандартна широчина на прозореца за абониране."
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../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:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "Определ� дали да �е тър�и в адре�ника за адре� на изпращача"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Определ� дали да �е тър�и за адре�а на изпращача в адре�ника. �ко е открит, "
 "не би тр�бвало да е �пам. Тър�и �е в адре�ници, които �а отбел�зани за "
-"автоматично довършване. Възможно е да е бавно, ако отдалечени адре�ници "
-"(като LDAP) �а отбел�зани за авт. довършване."
+"автоматично допи�ване. Възможно е да е бавно, ако отдалечени адре�ници (като "
+"LDAP) �а отбел�зани за авт. допи�ване."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../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:30
+#: ../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:31
+#: ../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."
@@ -12529,57 +13209,63 @@ msgstr ""
 "Определ� дали да �е използват �ъщите шрифтове за полетата „От“ и „Тема“ в "
 "колоната „Пи�ма“ при вертикален изглед."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Папка за зареждане/прикреп�не на файлове към пи�мото."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Папка за запазване на пи�мата и ча�тите им."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Изчи�тване на папките „Спам“ при �пирането на програмата"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Изчи�тване на папката „Кошче“ при �пирането на програмата"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Изчи�тване на в�ички папки �ъ� �пам при �пирането на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Изчи�тване на в�ички кошчета при �пирането на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../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:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Включване/изключване на магиче�ки� интервал"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
-msgstr "Включване/изключване на тър�ене � автоматично довършване"
+msgstr "Включване/изключване на тър�ене � автоматично допи�ване"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "�ктивиране на папки за тър�ене"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "�ктивиране на папки за тър�ене при �тартиране."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12587,11 +13273,11 @@ msgid ""
 "that folder."
 msgstr ""
 "Включване на тър�енето в �траничната лента. Това позвол�ва да �тартирате "
-"интерактивни тър�ени� като про�то въведете тек�та. �апример - така ле�но "
+"интерактивни тър�ени� като про�то въведете тек�та. �апример — така ле�но "
 "можете да откривате и да избирате папка в �траничната лента като въведете "
-"името й."
+"името �."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12599,27 +13285,27 @@ msgstr ""
 "�ктивирайте тази опци�, за да използвате интервала за прели�тване при "
 "преглед на пи�ма и папки."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Включване на изобраз�ването на тек�това ча�т � ограничен размер."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Включване/изключване на режим „Каретка“"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Ви�очина на панела �ъ� �пи�ъка на пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Ви�очина на пенела �ъ� �пи�ъка на пи�мата."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Скрива прегледа за папка и премахва избора"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12627,13 +13313,13 @@ msgstr ""
 "�ко потребител �е опита да отвори 10 или повече пи�ма едновременно, да бъде "
 "питан дали наи�тина и�ка да направи това."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../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:53
+#: ../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 "
@@ -12644,11 +13330,41 @@ msgstr ""
 "компонент, �ъдържащ �е в базата от данни за MIME-тип на GNOME, могат да "
 "бъдат използвани за изобраз�ване на �ъдържание."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 ""
+"Първоначална ви�очина на прозореца „Изпращане и получаване на поща“. "
+"Стойно�тта �е обнов�ва когато потребител� оразмер�ва прозореца вертикално."
+
+#: ../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 ""
+"Първоначално �ъ�то�ние на мак�имизиране на прозореца „Изпращане и получаване "
+"на поща“. Стойно�тта �е обнов�ва когато потребител� мак�имизира или "
+"демак�имизира прозореца. Забележете, че точно тази �тойно�т не �е използва "
+"от Evolution, понеже прозорецът „Изпращане и получаване на поща“ не може да "
+"бъде мак�имизиран. Този ключ �ъще�твува �амо като подробно�т по реализаци�та."
+
+#: ../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:55
+#: ../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."
@@ -12656,7 +13372,7 @@ msgstr ""
 "�ктивира/деактивира функционално�тта за повтар�щи �е запитвани� дали е "
 "необходима �инхронизаци� за режим „Изключен“."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../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 "
@@ -12666,31 +13382,31 @@ msgstr ""
 "от папка за тър�ене напълно изтрива пи�мото, а не �амо го премахва от "
 "резултатите от тър�енето."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "По�ледни�т път, когато е изчи�тван �пама"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "По�ледни�т път, когато е изпразвано кошчето"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "�иво, при което пи�мото тр�бва да �е опи�ва в журнала."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Спи�ък � етикети и техните а�оциирани цветове"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Спи�ък � приетите лицензи"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Спи�ък на абонаментите"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12698,11 +13414,16 @@ msgstr ""
 "Спи�ък � пощен�ките абонаменти в Evolution. Съдържа имена, които �е "
 "използват и за подпапките на /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Спи�ък на �пецифични заглавни ча�ти и дали �а активирани."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+"Спи�ък � кодове на езици, които да �е използват за проверка на правопи�а."
+
+#: ../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."
@@ -12710,139 +13431,139 @@ msgstr ""
 "Спи�ък � цветови етикети в Evolution. Съдържа двойки „име:цв�т“, където "
 "цветът е в ше�тнаде�етичен HTML формат."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Спи�ък � протоколни имена, чиито лицензи �а били приети."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Зареждане на изображени�та в пи�мата, форматирани в HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../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 ""
 "Зареждане на изображени� за пи�ма във формат HTML през http(s). Възможните "
-"�тойно�ти �а: 0 - никога не �е зареждат изображени� от мрежата, 1 - "
-"изображени�та �е зареждат, ако подател�т е в адре�ника и 2 - изображени�та "
+"�тойно�ти �а: „0“ — никога не �е зареждат изображени� от мрежата, „1“ — "
+"изображени�та �е зареждат, ако подател�т е в адре�ника и „2“ — изображени�та "
 "�е зареждат винаги."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Запи�ване на дейно�тта на филтрите в дневник"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Запи�ване в дневник на дейно�тта на филтрите в определен файл."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Файл за запи�ване дейно�тта на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Файл за запи�ване дейно�тта на филтрите."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Отбел�зване като вид�но �лед определено време"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Отбел�зване като вид�но �лед определено време."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Отбел�зване на цитатите в прегледа на пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Отбел�зване на цитатите в прегледа на пи�мата."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Стандартна ви�очина на прозореца за пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Стандартна широчина на прозореца за пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "�ачин на показване на пи�мата („обикновен“, „в�ички заглавни ча�ти“, "
 "„изходен код“)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Минимален брой дни между изчи�тване на �пама при �пиране на програмата"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Минимален брой дни между изчи�тване на кошчето при затвар�не на програмата"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Брой на адре�и, които да �е показват в До/Копие/Скрито копие"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Запитване при непопълнено поле „Тема“"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Запитване при изтриване на пи�ма в папка за тър�ене"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Запитване при изчи�тване"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Запитване, когато потребител�т попълни �амо „Скрито копие“"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Запитване, когато потребител�т �е опита да отвори 10 или повече пи�ма "
 "едновременно"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
@@ -12850,144 +13571,144 @@ msgstr ""
 "Запитване, когато потребител�т �е опита да изпрати пи�ма в HTML до "
 "получатели, които може да не и�кат да получават такава поща."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../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:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Запитване, когато потребител�т �е опита да изпрати нежелан HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Запитване при отбел�зване на множе�тво пи�ма"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Разпознаване на емотикони в тек�та и зам�на � изображени�."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Разпознаване на връзките в тек�та и заме�тването им."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Провер�ване на вход�щата поща за �пам."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Папка за запазване"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Search for the sender photo in local addressbooks"
-msgstr "Тър�ене за �нимка на подател� в локални� адре�ник"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
+msgstr "Тър�ене за �нимка на подател� в локалните адре�ници"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Изпращане на поща в HTML формат по подразбиране (не �е препоръчва)"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Изпращане на поща в HTML формат по подразбиране (не �е препоръчва)."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "�дре�а на подател� в колона в �пи�ъка � пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Интервал за �инхронизаци� �ъ� �ървъра"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Показване на анимации"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Показване на анимирани изображени� като анимации."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Показване на изтритите пи�ма в �пи�ъка � пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Показване на �нимка на подател�"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../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:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr "Указва заглавната ча�т, ко�то да �е провер�ва за �пам."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Указва заглавната ча�т за проверка за �пам. Форматът за gconf е заглавна "
-"ча�т=�тойно�т."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Вградена проверка на правопи�"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "Цв�т за �грешените думи"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "Езици за проверка на правопи�"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Стандартната ви�очина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Стандартната широчина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Терминален шрифт"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Ограничена тек�това ча�т от �ъобщение"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Стандартната при�тавка за �пам-филтър"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../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:124
+#: ../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:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Терминални�т шрифт за показване на пощата."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Използвани�т за показване на пи�мата пропорционален шрифт."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Възможни �а три �тойно�ти - 0 за грешки, 1 за предупреждени� и 2 за "
+"Възможни �а три �тойно�ти — „0“ за грешки, „1“ за предупреждени� и „2“ за "
 "�ъобщени� за изчи�тване на грешки."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -12996,7 +13717,7 @@ msgstr ""
 "форматирана от Evolution. По подразбиране е 4MB/4096KB. Размерът �е указва в "
 "KB."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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 "
@@ -13006,16 +13727,16 @@ msgstr ""
 "активирани. �ко указаната �тандартна при�тавка е изключена, тогава н�ма да "
 "�е ползват о�таналите."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../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 ""
 "Този ключ �е чете �амо веднъж и �лед прочитането му �е у�танов�ва на "
 "„false“. Това премахва маркирането на пощата в �пи�ъка и прегледа на тази "
 "папка."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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;"
@@ -13024,14 +13745,25 @@ msgid ""
 msgstr ""
 "Този ключ тр�бва да �ъдържа �пи�ък � XML �труктури, опи�ващи �пецифичните "
 "заглавни ча�ти, и дали да бъдат показвани. Форматът на XML �труктурата е "
-"„&lt;header enabled&gt; - set enabled“ в �лучай, че заглавната ча�т тр�бва "
+"„&lt;header enabled&gt; — set enabled“ в �лучай, че заглавната ча�т тр�бва "
 "да бъде показвана."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 ""
+"Тази опци� е �вързана � ключа „lookup_addressbok“. Използва �е за "
+"у�танов�ване дали да �е тър�и за адре�и в локални� адре�ник �амо за "
+"изключване на поща от проверка за �пам, когато е изпратена от познати "
+"контакти."
+
+#: ../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:133
+#: ../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."
@@ -13040,7 +13772,7 @@ msgstr ""
 "�тандартни� преглед. �ко има адре�и над бройката, това �е указва � "
 "многоточие."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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."
@@ -13048,7 +13780,7 @@ msgstr ""
 "Тази на�тройка указва дали нишките да бъдат разтвар�ни или �вивани по "
 "подразбиране. Изи�ква �е ре�тартиране на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
@@ -13058,108 +13790,117 @@ msgstr ""
 "пи�мо във в��ка нишка, вме�то �поред датата на пи�мото. Изи�ква �е "
 "ре�тартиране на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Подреждане на �пи�ъка � пи�ма в нишки."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Подреждане на �пи�ъка � пи�ма в нишки"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Подреждане на �пи�ъка � пи�ма в нишки на о�новата на „Тема“."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Време за отбел�зване на дадено пи�мо като прочетено"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Време за отбел�зване на дадено пи�мо като прочетено."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "�из UID на �тандартни� абонамент."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "Използване на демона и клиента на SpamAsssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Използване на демона и клиента на SpamAsssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Използване на лични шрифтове"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Използване на лични шрифтове за показване на пощата."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Използване �амо на локални �пам те�тове."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Използване �амо на локални �пам те�тове (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Да �е ползва широк изглед"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Пропорционален шрифт"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "„Изглед/Скрито копие“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "„Изглед/Скрито копие“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "„Изглед/Копие“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "„Изглед/Копие“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "„Изглед/От“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "„Изглед/От“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "„Изглед/Копиране в папка“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "„Изглед/Копиране в папка“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "„Изглед/Отговор до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "„Изглед/Отговор до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../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:161
+#: ../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."
@@ -13167,44 +13908,44 @@ msgstr ""
 "Дали да �е използва преглед на пи�мата в нишки по „Тема“, когато те не "
 "�ъдържат заглавни ча�ти „В отговор на“ или „Препратки“."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../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:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Широчина на панела �ъ� �пи�ъка на пи�мата"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Широчина на пенела �ъ� �пи�ъка на пи�мата."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Вна��т �е данни от Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Elm"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Вна�� �е поща от Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Целева папка:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Избор в ко� папка да �е вне�е"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Пощен�ка кути� Berkley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Вна��не на пощен�ки папки формат Berkley"
 
@@ -13212,7 +13953,7 @@ msgstr "Вна��не на пощен�ки папки формат Berkley"
 msgid "Importing mailbox"
 msgstr "Вна�� �е пощен�ка кути�"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Вна��не на „%s“"
@@ -13222,175 +13963,190 @@ msgstr "Вна��не на „%s“"
 msgid "Scanning %s"
 msgstr "Сканиране на „%s“"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Вна��не на данни от Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Вно�ител от Pine"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Вна��не на поща от Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Поща до %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 "Поща от %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Темата е %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s пощен�ки �пи�ък"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Добав�не на правило за филтър"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Шаблони"
+
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d избрано, "
 msgstr[1] "%d избрани, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d изтрито"
 msgstr[1] "%d изтрити"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �пам"
 msgstr[1] "%d �пам"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d чернова"
 msgstr[1] "%d чернови"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] " %d изпратено"
 msgstr[1] " %d изпратени"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] " %d неизпратено"
 msgstr[1] " %d неизпратени"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d непрочетено, "
 msgstr[1] "%d непрочетени, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
-msgstr[0] "Общо %d"
-msgstr[1] "Общо %d"
+msgstr[0] "общо %d"
+msgstr[1] "общо %d"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "�ово _пи�мо"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
-msgstr "_Пи�мо"
+msgstr "�ово _пи�мо"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Създаване на ново пи�мо"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "�ова пощен�ка папка"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
-msgstr "По_щен�ка папка"
+msgstr "�ова пап_ка"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Създаване на нова пощен�ка папка"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "�еу�пех при обнов�ването на пощен�ките на�тройки или папки."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Грешка"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Грешки"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Предупреждени� и грешки"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Информаци� за изчи�тване на грешки"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Съобщени� за грешки, предупреждени� и �пециална информаци�"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Журнали за изчи�тване на грешки"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Показване на _грешките в лентата за �ъ�то�ние за"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
-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
+msgid "second(s)."
+msgstr "�екунда/и."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Журнали за:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "�иво"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Време"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Пи�ма"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Затвар�не на този прозорец"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " Про_верка за поддържани видове "
@@ -13404,7 +14160,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Тази вер�и� на Evolution е компилирана без поддръжка на SSL</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Снимка на подател�</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13485,77 +14241,77 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Печатани шрифтове</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">�а�тройки за �ървър-по�редник</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">�ужна информаци�</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Сигурно�т</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Изпратени пи�ма и чернови</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">�а�тройки на �ървъра</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Вид _удо�товер�ване</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Мениджър на абонамент"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "Добав�не на но_в подпи�..."
+msgstr "Добав�не на но_в подпи�…"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Добав�не на _�крипт"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "Когато �е използва този абонамент, _винаги да �е подпи�ват изпращаните пи�ма"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Да �е _шифрира и �ъ� �об�твени� ключ, когато �е изпраща шифрирана поща"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Винаги _копие (cc) до:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Винаги _�крито копие (bcc) до:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Винаги да �е _довер�ва на ключове от �об�твени� набор от ключове при "
 "шифриране"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 "Винаги да �е шифрира �ъ� �об�твени� кл_юч, когато �е изпраща шифрирана поща"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "_Изи�кване на изве�тие за прочитане"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Прикреп�не на оригиналното пи�мо"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "�втоматично _вмъкване на емотикони"
@@ -13573,13 +14329,13 @@ msgid "C_haracter set:"
 msgstr "Кодова _таблица:"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "Проверка на _�пециални заглавни ча�ти за �пам"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Проверка за поддържани видове "
 
+#: ../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 "Провер�ване на _вход�щата поща за �пам"
@@ -13641,18 +14397,18 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Цифрово _подпи�ване на пращаните пи�ма (по подразбиране)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "Да _не �е отбел�зват пи�мата като �пам, ако изпращача е в адре�ника"
-
-#: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "Тек�товото �ъдържание на пи�мата да _не �е форматира, ако размерът му "
 "надхвърл�"
 
+#: ../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 original message"
-msgstr "Без цитиране на оригиналното пи�мо"
+msgid "Do not quote"
+msgstr "Да не �е цитира"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13715,71 +14471,89 @@ msgid "HTML Messages"
 msgstr "Пи�ма в HTML"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "Сървър-по�редник за H_TTP:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Заглавни ча�ти"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "Отбел�зване на _цитатите �"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "В т�лото на пи�мото"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr "В т�лото на оригиналното пи�мо (като Outlook)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Етикети"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Таблица � езици"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "�а�тройка на пощата"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "Таблица �ъ� заглавните ча�ти"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Ме�тоположение на пощен�ката кути�"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Пи�ане на пи�ма"
 
-#: ../mail/mail-config.glade.h:105
+#: ../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:106
+#: ../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:107
+#: ../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 "Ор_ганизаци�:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор на _ключ за PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../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."
@@ -13787,7 +14561,7 @@ msgstr ""
 "Добавете опи�ателно име за този абонамент в м��тото долу.\n"
 "Това име ще бъде използвано �амо � цел показване."
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13795,7 +14569,7 @@ msgstr ""
 "Въведете информаци� отно�но начина, по който ще изпращате поща. �ко не �те "
 "�игурни, попитайте �и�темни� админи�тратор или до�тавчика ви на Интернет."
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13805,115 +14579,123 @@ msgstr ""
 "тр�бва да бъдат попълвани, о�вен ако не и�кате да включвате тази информаци� "
 "в пи�мата, които изпращате."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Изберете от �ледните опции"
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 ""
 "_�апомн�не при изпращане на пи�ма � получатели �амо в полето „Скрито копие:“"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Цитиране на оригиналното пи�мо"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "За_помн�не на паролата"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Отго_вор до:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Запомн�не на па_ролата"
 
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "Хо�т на S_OCKS:"
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "_Тър�ене за �нимка на подател� �амо в локалните адре�ници"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
-msgstr "_Избор..."
+msgstr "_Избор…"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Изпращане на изве�ти� за прочитане:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Стандартен шрифт:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Избор на равноширок шрифт за HTML"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Избор на равноширок шрифт за HTML за разпечатване"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Избор на пропорционален шрифт за HTML"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Избор на пропорционален шрифт за HTML за разпечатване"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Изпраща �е поща"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Папка за изп_ратените пи�ма:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Сървърът изи�ква _удо�товер�ване"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Тип �_ървър:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Се_ртификат за подпи�и:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "По_дпи�:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Подпи�и"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Таблица за подпи�ите"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Проверка на правопи�а"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Започване на _пи�ане от кра� на пи�мото при отговор"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "Т_ип:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Спи�ъкът на езиците отраз�ва �амо езиците, за които има ин�талиран речник."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13923,14 +14705,7 @@ msgstr ""
 "подпи� на пи�мата ви. Името ще �е използва\n"
 "�амо за отличаване. "
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Тази опци� н�ма да �е отчита, ако има �ъвпадение на �пециални заглавни ча�ти "
-"за �пам."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13938,16 +14713,26 @@ msgstr ""
 "�апишете името, чрез което и�кате да отличавате този абонамент.\n"
 "�апример: „Служебен“ или „Личен“"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "Потребител�ко _име:"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Използване на _удо�товер�ване"
+
+#: ../mail/mail-config.glade.h:156 ../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:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Пропорционален:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13957,101 +14742,125 @@ msgstr ""
 "\n"
 "�ати�нете „�апред“, за да започнете. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Добав�не на подпи�"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Винаги да �е зареждат изобра_жени� от Интернет"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "_�дре� за автоматична конфигураци� на �ървър-по�редник:"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Стандартна при�тавка за �пам-филтър:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "_Директна връзка � Интернет"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Да не �е подпи�ват за�вки за �ъбрани� (за �ъвме�тимо�т � Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Препращане в �тил:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "По�тав�не на п_одпи�а над оригиналното пи�мо при отговор"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Зареждане на изображени�та от адре�и в адре�ника"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "_Тър�ене �амо в локални� адре�ник"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Избиране на този абонамент за о�новен"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "_Ръчна на�тройка на �ървър-по�редник:"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Отбел�зване на пи�мата като прочетени �лед"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_�икога да не �е зареждат изображени� от Интернет"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Път:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "Запит_ване при изпращане на пи�ма � HTML до контакти, които не ги жела�т"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Запитва_не при изпращане на пи�ма � празно поле „Тема“"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Сти_л на отговор:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "_Сигурен �ървър-по�редник по HTTP:"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
-msgstr "_Избор..."
+msgstr "_Избор…"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Показване на анимации"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Показване на _�нимка на подател� при преглед на пи�мото"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Вме_�тване на „До/Копие/Скрито копие“"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Използване на �игурна връзка (SSL):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "Използване на _�тандартни"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Използване на �ъщите шрифтове като о�таналите програми"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "адре�и"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "цв�т"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "опи�ание"
 
@@ -14091,45 +14900,45 @@ msgstr "_Зачитане на малки/големи букви"
 msgid "Co_mpleted"
 msgstr "За_вършено"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Тър�ене:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Тър�ене в пи�мото"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr ""
 "Отбел�зване като �ледващо\n"
 "пи�мо от разговор"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "�бонаменти за папки"
 
-#: ../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 "��ма избрани"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "С_ървър:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Информаци� за �игурно�тта"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Определени папки"
 
-#: ../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."
@@ -14137,23 +14946,23 @@ msgstr ""
 "Пи�мата, които �те избрали като �ледващи в разговор, �а изброени долу.\n"
 "Изберете подход�щото дей�твие от менюто „Отбел�зване“."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Приемане на лиценз"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Краен �рок:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Отбел�зване:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Сложете отметка тук, за да �е �ъгла�ите � лицензното �поразумение"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Провер�ване на %s"
@@ -14200,99 +15009,104 @@ msgstr "Изпращане на пи�мо %d от %d"
 msgid "Failed to send %d of %d messages"
 msgstr "�еу�пех при изпращането на %d от %d пи�ма"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Отменено."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Приключено."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Запазване на пи�мото в папка"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Преме�тване на пи�ма в %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на пи�ма в %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Препратени пи�ма"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отвар�не на папка %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Извличане на информаци� за квотата на папка %s"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Отвар�не на хранилище %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтриване на папка %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка „%s“"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Зачеркване и запазване на абонамент „%s“"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Запазване на абонамент „%s“"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "О�вежаване на папка"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Изчи�тване на кошчето в „%s“"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Локални папки"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получаване на пи�мо %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Получаване на %d пи�мо"
 msgstr[1] "Получаване на %d пи�ма"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Запазване на %d пи�мо"
 msgstr[1] "Запазване на %d пи�ма"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14301,11 +15115,11 @@ msgstr ""
 "Грешка при запазване на пи�ма в: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Запазване на прикрепен файл"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14314,89 +15128,89 @@ msgstr ""
 "�еу�пех при �ъздаването на изходен файл: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�еу�пех при запи�ването на данните: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Изключване от %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторно �вързване � %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Подготовка на абонамент „%s“ за режим „Изключен“"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Проверка на у�лугата"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
-msgstr "Отм�на..."
+msgstr "Отм�на…"
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Изпращане и получаване на поща"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Отказване на _в�ички"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
-msgstr "Обнов�ване..."
+msgstr "Обнов�ване…"
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
-msgstr "Изчакване..."
+msgstr "Изчакване…"
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Проверка за нови пи�ма"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Въведете парола за %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Въвеждане на парола"
 
-#: ../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 "Въведете парола за %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Въвеждане на парола"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Потребител�т отмени операци�та."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Редактиране на подпи�"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Запазване и затвар�не"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Въведете име за този подпи�."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Редактиране на подпи�"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Име:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "_Име на подпи�а:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14411,7 +15225,7 @@ msgstr "Опит за преме�тване на източник, различ
 #: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Препратено пи�мо - %s"
+msgstr "Препратено пи�мо — %s"
 
 #: ../mail/mail-tools.c:258
 msgid "Forwarded message"
@@ -14437,27 +15251,25 @@ msgstr "ОбновÑ�ване на папки за Ñ‚ÑŠÑ€Ñ�ене за „%s:%sâ€
 msgid "Updating Search Folders for '%s'"
 msgstr "Обнов�ване на папките за тър�ене за „%s“"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Редактиране на папките за тър�ене"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "�ова папка за тър�ене"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "Вече �ъще�твува папка � име „{1}“. Изберете друго име."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Вече �ъще�твува папка � име „{0}“. Изберете друго име."
 
 #: ../mail/mail.error.xml.h:2
-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 "Вече �ъще�твува папка � име „{1}“. Изберете друго име."
 
 #: ../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."
@@ -14469,16 +15281,16 @@ 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 ""
 "Било изи�кано уведом�ване за прочитане за „{1}“. Да �е изпрати ли "
 "уведомление до {0}?"
 
 #: ../mail/mail.error.xml.h:7
 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 "Подпи� � име „{0}“ вече �ъще�твува. Изберете друго име."
 
 #: ../mail/mail.error.xml.h:8
@@ -14521,10 +15333,10 @@ msgstr ""
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
 "Сигурни ли �те, че и�кате да премахнете за по�то�нно в�ички изтрити пи�ма в "
-"папката „{0}“?"
+"папка „{0}“?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14541,11 +15353,11 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Сигурни ли �те, че и�кате да изпратите пи�мото без тема?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "Защото „{0}“."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "Защото „{2}“."
 
 #: ../mail/mail.error.xml.h:21
@@ -14553,15 +15365,15 @@ msgid "Blank Signature"
 msgstr "Празен подпи�"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "�еу�пех при добав�нето на папката за тър�ене „{0}“."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "�еу�пех при копирането на папка „{0}“ в „{1}“."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "�еу�пех при �ъздаването на папка „{0}“."
 
 #: ../mail/mail.error.xml.h:25
@@ -14569,54 +15381,53 @@ msgid "Cannot create temporary save directory."
 msgstr "�е може да �е �ъздаде временна директори� за запазвани�."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "�е може да �е �ъздаде директори� за запазването, защото „{1}“"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "�е може да �е �ъздаде папка за запазването, защото „{1}“"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "�еу�пех при изтриването на папката „{0}“."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Си�темната папка „{0}“ не може да бъде изтрита."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "�е може да �е редактира папката за тър�ене „{0}“, защото т� не �ъще�твува."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "�еу�пех при преме�тването на папка „{0}“ в „{1}“."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "�еу�пех при отвар�нето на източника „{1}“."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "�еу�пех при отвар�нето на източника „{2}“."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "�еу�пех при отвар�нето на целта „{2}“."
 
 #: ../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 ""
 "Файлът � лиценза „{0}“ не може да �е прочете поради проблем � ин�талаци�та. "
 "��ма да можете да използвате този до�тавчик, преди да приемете негови� "
 "лиценз."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "�еу�пех при преименуването на „{0}“ в „{1}“."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Си�темната папка „{0}“ не може да бъде преименувана или преме�тена."
 
 #: ../mail/mail.error.xml.h:37
@@ -14624,18 +15435,22 @@ msgid "Cannot save changes to account."
 msgstr "�еу�пех при запазването на промените в абонамента."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "�еу�пех при запазването в папка „{0}“."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "�еу�пех при запазването във файл „{0}“."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "�е може да �е зададе �крипт за подпи�ване „{0}“."
 
 #: ../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."
@@ -14644,46 +15459,42 @@ msgstr ""
 "големите и малките букви имат значение. Може би клавишът „Caps Lock“ е "
 "нати�нат."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "�еу�пех при запазването на файла � подпи�а."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
 msgstr "Изтриване на „{0}“?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Изтриване на абонамента?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Изтриване на пи�мата в папката за тър�ене „{0}“?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Изтриване на пи�мата в папката за тър�ене?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Игнориране на промените?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Да не �е _изтрива"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Да не �е изтрива"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Да не �е изключва"
 
-#: ../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 "
@@ -14734,7 +15545,7 @@ 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
@@ -14793,34 +15604,26 @@ msgid "Mark all messages as read"
 msgstr "Отбел�зване на в�ички пи�ма като прочетени"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Отбел�зване на в�ички пи�ма в тази папка и подпапките като прочетени?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Лип�ваща папка."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "��ма избрани източници."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Само в _текущата папка"
-
-#: ../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."
@@ -14829,7 +15632,7 @@ msgstr ""
 "чрез нати�кане на бутона „До:“, който �е намира до полето за въвеждане на "
 "адре�и."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14839,34 +15642,42 @@ msgstr ""
 "във формат HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Въведете уникално име за идентификаци�та на този подпи�."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Изчакайте."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблем по време на мигрирането на папка �ъ� �тара поща „{0}“."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Обръщане към �ървър"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Сървърът �е провер�ва за поддържаните методи на удо�товер�ване."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Изи�кано е изве�тие за прочитане."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "�аи�тина ли и�кате да изтриете папката „{0}“ и в�ички нейни подпапки?"
 
+#: ../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 "Папките за тър�ене �а автоматично обновени."
@@ -14916,7 +15727,7 @@ 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 ""
 "Следните папки за тър�ене:\n"
@@ -14930,7 +15741,7 @@ 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 ""
 "Следните правила за филтри:\n"
@@ -15051,7 +15862,7 @@ msgstr ""
 "папки, или и двете."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Влизането в �ървъра „{0}“ като „{0}“ е неу�пешно."
 
 #: ../mail/mail.error.xml.h:135
@@ -15074,22 +15885,22 @@ msgstr "_Изчи�тване"
 msgid "_Open Messages"
 msgstr "Отвар�не на _пи�ма"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "в текущата папка и _подпапките"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "�епрегледано"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Прегледано"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Отговорено"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Препратено"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Множе�тво непрегледани пи�ма"
@@ -15114,37 +15925,50 @@ msgstr "Ви�ока"
 msgid "Highest"
 msgstr "�ай-ви�ока"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Дне� %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../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 "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "Генериране на �пи�ък на пи�мата"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"�ито едно пи�мо не �ъвпада � критериите ви за тър�ене. Променете ги или "
+"изчи�тете тър�енето � „Тър�ене“->„Изчи�тване“."
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "В тази папка н�ма пи�ма."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Краен �рок"
@@ -15174,39 +15998,39 @@ msgstr "Изпратени �ъобщени�"
 msgid "Size"
 msgstr "Размер"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Обаждане"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Без препращане"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "По�ледвал отговор"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "За ваша информаци�"
 
-#: ../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 "Препращане"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "�е е нужен отговор"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Отговор"
 
-#: ../mail/message-tag-followup.c:84 ../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 "Отговор на в�ички"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "За преглед"
 
@@ -15231,6 +16055,10 @@ msgid "Subject contains"
 msgstr "Темата �ъдържа"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Темата или получателите �ъдържат"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Темата или подател�т �ъдържат"
 
@@ -15243,14 +16071,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Предо�тав� о�новната функционално�т за локални адре�ници."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "�ктивиране на при�тавката за напомн�не за прикрепени файлове"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "�ктивиране на при�тавката за напомн�не за прикрепени файлове."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15258,7 +16078,7 @@ msgstr ""
 "Спи�ък � под�казки на при�тавката за напомн�не за прикрепени файлове. Т�лото "
 "на пи�мото �е претър�ва за т�х"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15266,14 +16086,11 @@ msgstr ""
 "Спи�ък � под�казки на при�тавката за напомн�не за прикрепени файлове. Т�лото "
 "на пи�мото �е претър�ва за т�х."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Ключови думи"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "�апомн�не за _лип�ващи прикрепени файлове"
-
 #: ../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"
@@ -15299,9 +16116,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Пи�мото н�ма прикрепени файлове"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Продължаване на редактирането"
+#: ../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 ""
@@ -15315,27 +16132,27 @@ msgstr ""
 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 "Избор на архив на Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Ре�тартиране на Evolution �лед �ъздаването на резервно копие"
 
-#: ../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 "Избор на архив на Evolution за въз�танов�ване"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Ре�тартиране на Evolution �лед въз�танов�ването"
 
-#: ../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"
@@ -15345,97 +16162,123 @@ msgstr ""
 "може да въз�танов�ва поща, календари, задачи, бележки и контакти. \n"
 "Въз�танов�ва и в�ички лични на�тройки, пощен�ки филтри и т.н."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Въз�танов�ване на 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
 msgid "Choose a file to restore"
 msgstr "Избор на файл за въз�танов�ване"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Създаване на резервно копие на директори�та на Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Въз�танов�ване на директори�та Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Проверка на архива на Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Ре�тартиране на Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "С графичен потребител�ки интерфей�"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Спиране на Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Създаване на резервно копие на абонаментите и на�тройките на Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Създаване на резервно копие на данните на Evolution (поща, контакти, "
 "календари, задачи, бележки)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Създаването на резервно копие е завършено"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Ре�тартиране на Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Създаване на резервно копие на текущите данни на Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Извличане на файловете от архива"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Зареждане на на�тройките на Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Премахване на временните файлове на архива"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../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 "�рхивиране на папка %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Въз�танов�ване на папка %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "�рхивиране на данните на Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Въз�танов�ване на данните на Evolution"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Създаване на резервно копие на текущите данни на Evolution"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Изчакайте, докато Evolution направи резервно копие на данните."
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Въз�танов�ване на данните на Evolution"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Изчакайте, докато Evolution въз�танови данните."
+
+#: ../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 ""
@@ -15471,14 +16314,22 @@ 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 "�евалиден архивен файл на Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Изберете валиден файл за въз�танов�ване."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15500,62 +16351,83 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
-msgstr "_Въз�танов�ване на на�тройките..."
+msgstr "_Въз�танов�ване на на�тройките…"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
-msgstr "_Създаване на резервно копие на на�тройките..."
+msgstr "_Създаване на резервно копие на на�тройките…"
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�втоматични контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "_�втоматично добав�не на контакти в адре�ника, при отговор на пи�мо от т�х"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Избор на адре�ник за автоматични контакти"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Контакти � възможно�т за мигновени �ъобщени�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "Периодично �инхронизиране на контактите и изображени�та � Pidgin"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Синхронизиране на контактите и изображени�та � Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Избор на адре�ник за �пи�ъка � при�тели на Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 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 ""
 "�втоматично попълва адре�ника � имена и адре�и на е-поща при отговар�не на "
-"пи�ма. Попълва и информаци� за бързи �ъобщени� от �пи�ъка � контакти."
+"пи�ма. Попълва и информаци� за бързи �ъобщени� от �пи�ъците � контакти."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 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:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Възникна грешка при изпълнението на %s: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Дъщерни�т проце� на Bogofilter не отговар�, прекрат�ване…"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+"Изчакването за дъщерни� проце� на Bogofilter е прекъ�нато, прекрат�ване…"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+"�еу�пех при изграждането на програмен канал към Bogofilter, код за грешка: %"
+"d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Преобразуване на тек�та на пи�мото в „_Уникод“"
 
@@ -15576,20 +16448,25 @@ msgid "Bogofilter Options"
 msgstr "Опции на Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "При�тавка за филтър за �пам на Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Филтрира пи�ма тип �пам чрез Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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 "_�дре�:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../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 "Използване на _SSL"
 
@@ -15609,17 +16486,18 @@ msgstr "Локални календари"
 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:375
-msgid "_Refresh:"
-msgstr "Оп_ре�н�ване:"
+#: ../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:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Сигурна връзка"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Потребител�ко _име:"
 
@@ -15721,14 +16599,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "И�кате ли да направите Evolution �тандартната пощен�ка програма?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Обозначаване _като �тандартна папка"
+#: ../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"
@@ -15736,12 +16625,61 @@ msgstr "Стандартни източници"
 
 #: ../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:558
+msgid "_Custom Header"
+msgstr "_Потребител�ки заглавни ча�ти"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Ключ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 ""
+"Форматът за указване на потребител�ка заглавна ча�т е:\n"
+"Име на заглавната ча�т �тойно�ти, разделени � „;“."
+
+#: ../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 "Отвар�не на папката на друг потребител"
@@ -15759,12 +16697,12 @@ msgid "_User:"
 msgstr "Потребител�ко _име:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Сигурна парола"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15772,21 +16710,21 @@ msgstr ""
 "При тази опци� �вързването � Exchange �ървъра �тава чрез �игурно (NTLM) "
 "удо�товер�ване."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Обикновена парола в тек�тов формат"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "Свързване към �ървъра, тип Exchange, чрез �тандартно удо�товер�ване."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Извън офи�а"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15794,83 +16732,87 @@ msgstr ""
 "Пи�мото, по�очено по-долу, ще бъде пращано автоматично до в�еки, \n"
 "който ви изпрати пи�мо, докато �те извън офи�а."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "В момента не �ъм в офи�а"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "В момента �ъм в офи�а"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "См�на на паролата за Exchange �метката"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "См�на на паролата"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Управление на на�тройките за делегиране за Exchange �метката"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Помощник по делегирането"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Разни"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Преглед на размера на в�ички Exchange папки"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Размер на папките"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "�а�тройки на Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_�дре� за OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "_Удо�товер�ване"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Пощен�ка кути�:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Тип _удо�товер�ване"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Проверка за поддържани типове"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%sKB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15883,7 +16825,7 @@ 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"
@@ -15891,7 +16833,7 @@ 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 "Двете пароли не �ъвпадат. Въведете наново паролите."
 
@@ -15911,38 +16853,38 @@ msgstr "�ова парола:"
 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 "Паролата ви ще изтече в �ледващите %d дни"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Личен"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Редактор (четене, �ъздаване, редактиране)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "�втор (четене, �ъздаване)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Преглеждащ (�амо четене)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Правомощи� на делегата"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Права за %s"
@@ -15950,7 +16892,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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15960,66 +16902,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "�е ви е позволено да виждате личните ми обекти."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "�азначени �те за делегат на %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Делегиране на"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Премахване на делегата %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "�еу�пех при до�тигането на активната папка"
 
-#: ../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 "Делегатът %s не може да бъде открит в �ктивната директори�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "�еу�пех при премахването на делегата %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "�еу�пех при обнов�ването на �пи�ъка � делегатите."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "�еу�пех при добав�нето на делегата %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Грешка при зареждане на �пи�ъка � делегатите."
 
@@ -16067,20 +17009,25 @@ msgstr "_Обобщаване на правомощи�та"
 msgid "_Tasks:"
 msgstr "_Задачи:"
 
-#: ../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
 msgid "Permissions..."
-msgstr "Права..."
+msgstr "Права…"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Име на папка"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Размер на папката"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. 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 "�бониране за папката на друг потребител"
@@ -16089,20 +17036,20 @@ msgstr "Ð�бониране за папката на друг потребитеÐ
 msgid "Exchange Folder Tree"
 msgstr "Дървовидна �труктура на Exchange"
 
-#: ../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
 msgid "Unsubscribe Folder..."
-msgstr "Преу�танов�ване на абонамент за папката..."
+msgstr "Преу�танов�ване на абонамент за папката…"
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Отпи�ване от папка „%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Спиране на абонамента за „%s“"
@@ -16157,25 +17104,28 @@ msgstr "Да, �ъ�то�нието да �е промени"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "Предупреждение за изтичане на парола..."
+msgstr "Предупреждение за изтичане на парола…"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "Паролата ви ще изтече �лед 7 дни..."
+msgstr "Паролата ви ще изтече �лед 7 дни…"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
 msgstr "_См�на на паролата"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(До�тъпът е отказан)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Потребител�ко име:"
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Добав�не на потребител"
 
@@ -16245,7 +17195,7 @@ msgstr "<b>�а�тройки за про�лед�ването</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:3
 msgid "Exchange - Send Options"
-msgstr "Exchange - на�тройки за изпращане"
+msgstr "Exchange — на�тройки за изпращане"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:4
 msgid "I_mportance: "
@@ -16293,17 +17243,13 @@ msgstr "_Поверително�т"
 msgid "_User"
 msgstr "_Потребител:"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Избор на потребител"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
-msgstr "�дре�ник..."
+msgstr "�дре�ник…"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -16315,7 +17261,7 @@ msgstr "Ð�бониране за календара на друг потребиÑ
 
 #: ../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 ""
 "При�тавка, ко�то дава до�тъп до ча�т от �пецифичните при абонамент към "
@@ -16408,10 +17354,16 @@ msgid "Could not update out-of-office state"
 msgstr "Съ�то�нието „Извън офи�а“ не може да бъде обновено"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"�еобходимо е ре�тартиране на Evolution, за да �е зареди пощен�ката кути� на "
+"абонирани� потребител."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "�бонаментът към Exchange е в режим „Изключен“"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16431,7 +17383,7 @@ msgstr ""
 "е изключена или блокирана. (Обикновено това не е\n"
 "нарочно решение). �дмини�траторът на Exchange ще\n"
 "тр�бва да включи тази функционално�т, за да можете\n"
-"да ползвате да  Evolution Exchange Connector.\n"
+"да ползвате да Evolution Exchange Connector.\n"
 "\n"
 "Информаци�та, ко�то тр�бва да предо�тавите\n"
 "на админи�траторите на Exchange �е намира\n"
@@ -16440,32 +17392,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "�еу�пех при обнов�ването на делегатите:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Папката вече �ъще�твува"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Папката не �ъще�твува"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Папката е в режим „Изключена“"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Грешка"
 
-#: ../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."
@@ -16473,74 +17425,74 @@ msgstr ""
 "�ко OWA е �тартиран � различен път, тр�бва да го укажете в диалога за "
 "на�тройките на абонамента."
 
-#: ../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 "Пощен�ката кути� за {0} не е на този �ървър."
 
-#: ../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 "��ма пощен�ка кути� за потребител� {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "��ма потребител: {0}"
 
-#: ../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
 msgid "Please restart Evolution for changes to take effect"
 msgstr "За да вл�зат промените в �ила, ре�тартирайте Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Изберете потребител."
 
-#: ../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 "�бонаментът към Exchange ще бъде изключен, щом затворите Evolution."
 
-#: ../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 "�бонаментът към Exchange ще бъде премахнат, щом затворите Evolution."
 
-#: ../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 "Сървърът за Exchange не е �ъвме�тим � Exchange Connector."
 
-#: ../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."
@@ -16548,7 +17500,7 @@ msgstr ""
 "�а �ървъра върви Exchange 5.5 Exchange Connector \n"
 "поддържа �амо Microsoft Exchange 2000 и 2003."
 
-#: ../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"
@@ -16562,39 +17514,40 @@ msgstr ""
 "\n"
 "Възможно е и про�то да �те напи�али погрешно паролата �и."
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "�еу�пех при добав�не на потребител� към �пи�ъка за контрол на до�тъпа:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "�еу�пех при редактирането на делегатите."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "�еизве�тна грешка при преглеждането на {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "�еизве�тна грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "�еизве�тен вид"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Операци�та не �е поддържа"
 
-#: ../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."
@@ -16602,26 +17555,26 @@ 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 "Може да на�троите �амо един абонамент към Exchange"
 
-#: ../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 ""
 "В момента �те заели: {0}KB. О�вободете малко м��то като изтриете пи�ма."
 
-#: ../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."
@@ -16629,7 +17582,7 @@ msgstr ""
 "В момента �те заели: {0}KB. ��ма да можете нито да пращате, нито да "
 "получавате пи�ма."
 
-#: ../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."
@@ -16637,19 +17590,19 @@ msgstr ""
 "В момента �те заели: {0}KB. ��ма да можете да изпращате пи�ма, докато не "
 "о�вободите м��то като изтриете малко пи�ма."
 
-#: ../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 "{0} не може да бъде добавен към �пи�ъка за контрол на до�тъпа"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} вече е делегат."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} вече е в �пи�ъка"
 
@@ -16661,6 +17614,15 @@ msgstr "Ð�бониране за задачите на друг потребитÐ
 msgid "Check folder permissions"
 msgstr "Проверка на правата на папката"
 
+#: ../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 "
@@ -16674,23 +17636,61 @@ msgstr ""
 msgid "External Editor"
 msgstr "Външен редактор"
 
+#: ../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 "Пи�ане чрез външен редактор"
+msgid "Compose in _External Editor"
+msgstr "Пи�ане чрез _външен редактор"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Пи�ане на пи�ма чрез външен редактор"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr "Команда, ко�то да бъде изпълнена за �тартиране на редактора: "
+
+# Heresy!  Heresy!  Ще го докладвам като грешка.
+# ;-) Докладвай, Яворе, докладвай до дупка. ;-)
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"За Emacs използвайте „emacs“\n"
+"За Vi използвайте „gvim“"
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Избор на изображение, формат PNG (48*48, размер < 700 байта)"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Файлове, формат PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Лице"
 
@@ -16701,9 +17701,9 @@ msgid ""
 "faces This will be used in messages that are sent further."
 msgstr ""
 "Добав�не на заглавна ча�т „Лице“ („Face“) към изход�щите пи�ма. Първоначално "
-"потребител�т тр�бва да зададе изображение във формат PNG (48*48).  Кодирано "
-"е в base64 и �е запазва в ~/.evolution/faces, ще бъде използвано в "
-"изход�щите пи�ма."
+"потребител�т тр�бва да зададе изображение във формат PNG (48*48). Кодирано е "
+"в base64 и �е запазва в ~/.evolution/faces, ще бъде използвано в изход�щите "
+"пи�ма."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -16727,20 +17727,54 @@ msgstr "Преу�танов�ване на абонамент за папки"
 msgid "_Unsubscribe"
 msgstr "О_тпи�ване"
 
-#: ../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
 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 "Въведете парола за потребител %s за до�тъп до абонираните календари."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"�еу�пех при четенето на данни от �ървъра на Google.\n"
+"%s"
+
+#: ../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 "<b>Сървър</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "При�тавка за на�тройване на календар на Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "При�тавка за на�тройване на календар и контакти на Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Източници на Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Спи�ък � отметки"
 
@@ -16786,18 +17820,18 @@ msgstr "Ин�талиране на �поделената папка"
 msgid "Shared Folder Installation"
 msgstr "Ин�талиране на �поделената папка"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "�а�тройки за �пам"
 
-#: ../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 "�а�тройки за �пам"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
-msgstr "�а�тройки за �пам..."
+msgstr "�а�тройки за �пам…"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
@@ -16821,10 +17855,22 @@ msgid "_Junk List"
 msgstr "С_пи�ък �ъ� �пам"
 
 #: ../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 "Пи�мото е оттеглено у�пешно"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Оттегл�не на пощата"
 
@@ -16832,12 +17878,6 @@ msgstr "Оттегл�не на пощата"
 msgid "Add Send Options to groupwise messages"
 msgstr "Добав�не на опции за изпращане в пи�мото тип groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "�а�тройки за изпращане"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "При�тавка за абонаменти за работа в група."
@@ -16846,7 +17886,80 @@ msgstr "При�тавка за абонаменти за работа в гру
 msgid "Groupwise Features"
 msgstr "Възможно�ти за работа в група"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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 "�еправилен потребител"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+"�е може да бъде предо�тавен до�тъп до �ървъра-по�редник на потребител „{0}“."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+"Вече �те предо�тавили определени права за �ървър-по�редник на този "
+"потребител."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "Вече �ъще�твува абонамент � име „{0}“. Проверете дървото � папки."
+
+#: ../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 ""
+"�еу�пешно влизане чрез �ървър-по�редник като „{0}“. Проверете адре�а �и за е-"
+"поща и опитайте отново."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "Това е повтар�ща �е �реща"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "И�кате ли да � приемете?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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 "�е може да �подел�те папка �ъ� зададени� потребител „{0}“."
+
+#: ../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 ""
+"Тр�бва да зададете потребител�ко име, което и�кате да добавите към �пи�ъка"
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Приемане временно"
 
@@ -16860,10 +17973,10 @@ msgstr "_ПерÑ�онализиране на Ñ�ъобщението за увеÐ
 
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Con_tacts..."
-msgstr "_Контакти..."
+msgstr "_Контакти…"
 
 #: ../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 "Пи�мо"
 
@@ -16881,7 +17994,7 @@ msgstr "_�е �а �поделени"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
-msgstr "_Споделено � ..."
+msgstr "_Споделено � …"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -16944,9 +18057,9 @@ msgstr "<b>Име на абонамента</b>"
 msgid "Proxy Login"
 msgstr "Влизане в �ървъра-по�редник"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16955,42 +18068,46 @@ msgstr "%sВъведете парола за %s (потребител %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
-msgstr "_Влизане в �ървъра-по�редник..."
+msgstr "_Влизане в �ървъра-по�редник…"
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "Разделът „Сървър-по�редник“ ще е наличен, �амо когато режимът е „Включен“."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "Разделът „Сървър-по�редник“ ще е наличен, �амо когато абонаментът е включен."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Потребители"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Въвеждане на потребители и задаване на привилегии"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
-msgstr "�ова _�поделена папка..."
+msgstr "�ова _�поделена папка…"
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Сподел�не"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Специфично уведомление"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Добав�не"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Пром�на"
 
@@ -17045,7 +18162,7 @@ msgstr "�едо�тавено: "
 
 #: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
-msgstr "Следене на �ъ�то�нието на пи�мото..."
+msgstr "Следене на �ъ�то�нието на пи�мото…"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
@@ -17055,11 +18172,11 @@ msgstr "При�тавка за на�тройване на източницит
 msgid "Hula Account Setup"
 msgstr "�а�тройки на абонамент за Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
-msgstr "Потребилел�ки заглавни ча�ти"
+msgstr "Потребител�ки заглавни ча�ти"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Заглавни ча�ти за IMAP"
 
@@ -17114,28 +18231,28 @@ msgstr "При�тавка за възможно�тите за абонамен
 msgid "IMAP Features"
 msgstr "Възможно�ти на IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Вна��не в календара"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Вна��не към задачите"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Вна��не на ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Избор на �пи�ък �ъ� задачи"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Избор на календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Вна��не"
 
@@ -17173,13 +18290,14 @@ msgstr ""
 "Evolution не у�п� да открие iPod, � който да �е �инхронизира. У�трой�твото "
 "не е �вързано към �и�темата или не е включено."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "файлов формат на iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Синхронизиране на избраната задача/бележка/календар/адре�ник � Apple iPod"
 
@@ -17191,133 +18309,133 @@ msgstr "Синхронизиране � iPod"
 msgid "iPod Synchronization"
 msgstr "Синхронизаци� � iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Календарът „%s“ не може да �е зареди."
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Среща в календара „%s“ �е за�тъпва � това �ъбрание"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Срещата е открита в календара „%s“."
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "�е може да �е открие нито един календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Това �ъбрание не може да �е открие в никой календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Тази задача не може да �е открие в нито един �пи�ък �ъ� задачи"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Тази бележка не може да �е открие в нито един �пи�ък � бележки"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Тър�ене за �ъще�твуваща вер�и� на тази �реща"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "�еу�пех при анализирането на елемента"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "�е може да �е изпрати елемент към календара „%s“.  %s"
+msgstr "�е може да �е изпрати елемент към календара „%s“. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Изпратено до календар „%s“ като прието"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Изпратено до календар „%s“ като не�игурен"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Изпратено до календар „%s“ като отказ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Изпратено до календар „%s“ като отменено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатора е махнал делегата %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "�а делегата е изпратено изве�тие за отм�на"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "�е може да �е изпрати изве�тие за отм�на на делегатите"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Съ�то�нието на при�ъ�тващи� не може да бъде обновено заради невалидно "
 "�ъ�то�ние"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "�еу�пех при обнов�ването на уча�тник. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Съ�то�нието на при�ъ�тващи� е обновено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Изпратена информаци� за �ъбрание"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Изпратена информаци� за задача"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Изпратена информаци� за бележка"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "�еу�пех при изпращането на информаци� за �ъбрание, �ъбранието не �ъще�твува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "�еу�пех при изпращането на информаци� за задача, задачата не �ъще�твува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "�еу�пех при изпращането на информаци� за бележка, бележката не �ъще�твува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Добавени�т календар е невалиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17325,15 +18443,15 @@ msgstr ""
 "Пи�мото би тр�бвало да �ъдържа календар, но календарът не е валиден "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Обектът в календара не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17341,11 +18459,11 @@ msgstr ""
 "Пи�мото �ъдържа календар, но в календара н�ма �ъбити�, задачи или данни за "
 "�вободен/зает."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Добавени�т календар �ъдържа множе�тво обекти"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17367,213 +18485,213 @@ msgstr "Тази бележка е повтар�ща �е"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Изтриване на пи�мото �лед дей�твието"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Тър�ене на за�тъпвани�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Избор на календари за проверка за за�тъпвани� в �ъбрани�та"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Дне�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Дне� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Дне� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Дне� %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Утре"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Утре %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Утре %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Утре %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Утре %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Отговорете от името на <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Получено от името на <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> чрез %s публикува �ледната информаци� за �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> публикува �ледната информаци� за �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> делегира �ледното �ъбрание на ва�:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> през %s изи�ква вашето при�ъ�твие на �ледното �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> изи�ква вашето при�ъ�твие на �ледното �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> чрез %s и�ка да бъде добавен към �ъще�твуващо �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> и�ка да бъде добавен към �ъще�твуващо �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17581,88 +18699,88 @@ msgid ""
 msgstr ""
 "<b>%s</b> чрез %s и�ка да получи по�ледната информаци� за �ледното �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> и�ка да получи по�ледната информаци� за �ледното �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> чрез %s изпрати обратно �ледни� отговор отно�но �ъбранието:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> изпрати обратно �ледни� отговор отно�но �ъбранието:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> чрез %s отмени �ледното �ъбрание:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> отмени �ледното �ъбрание."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> чрез %s предложи �ледните промени в �ъбранието."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> предложи �ледните промени в �ъбранието."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> чрез %s отказа �ледните промени в �ъбранието:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> отказа �ледните промени в �ъбранието."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> чрез %s публикува �ледната задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> публикува �ледната задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> изи�ква назначаването на %s за �ледната задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> чрез %s ви назначи �ледната задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ви назначи �ледната задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> чрез %s и�ка да бъде добавен към �ъще�твуваща задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> и�ка да бъде добавен към �ъще�твуваща задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17671,136 +18789,136 @@ msgstr ""
 "<b>%s</b> чрез %s желае да получи по�ледната информаци� за �ледната "
 "назначена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> и�ка да получи по�ледната информаци� за задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> чрез %s отговори отно�но назначената задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> отговори отно�но назначената задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> чрез %s отмени �ледните назначени задачи:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> отмени �ледната назначена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> чрез %s предложи �ледните промени в назначената задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> предложи �ледните промени в назначените задачи:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> чрез %s отказа �ледната назначена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> отказа �ледната назначена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> чрез %s публикува �ледната бележка:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> публикува �ледната бележка:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> чрез %s и�ка да допише �ъще�твуваща бележка:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> и�ка да допише �ъще�твуваща бележка:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> чрез %s отмени �ледната �поделена бележка:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> отмени �ледната �поделена бележка:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Отвар�не на календар"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Отказване"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Приемане"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Отказване на в�ичко"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_�еокончателно приемане на в�ичко"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_�еокончателно приемане"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Приемане на в�ичко"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Изпращане на информаци�"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Обнов�ване на �ъ�то�нието на при�ъ�тващите"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Обнов�ване"
 
@@ -17901,9 +19019,10 @@ msgstr "Генерира �ъобщение за D-Bus при при�тиган
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"�ко е „true“, изпълнение на звук - в противен �лучай на звуков файл при "
+"�ко е „true“, изпълнение на звук — в противен �лучай на звуков файл при "
 "при�тигане на нова поща."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17955,8 +19074,16 @@ msgstr "Дали уведомлението да е за нови пиÑ�ма Ñ�Ð
 msgid "Generate a _D-Bus message"
 msgstr "Генериране на �ъобщение за _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Уведом�ване за поща"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17971,55 +19098,55 @@ msgstr[1] ""
 "Получихте %d нови пи�ма\n"
 "в %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "�ова поща"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Показване на икона в _обла�тта за уведом�ване"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Мигаща икона в обла�тта за уведом�ване"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Показване на _�ъобщение � иконата"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Издаване на _звук при при�тигане на нова поща"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Издаване на звук"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Изпълнение на зву_ков файл"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Задаване на име на _файла:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Избор на звуков файл"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "_Изпълнение"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Уведом�ване за нови пи�ма �амо в „_Пощен�ка кути�“"
 
@@ -18050,12 +19177,12 @@ msgstr "Прео_бразуване в �ъбрание"
 msgid "Mail to meeting"
 msgstr "Е-поща до �ъбрание"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "�еу�пех при отвар�нето на каледнара. %s"
+msgstr "�еу�пех при отвар�нето на календара. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18107,8 +19234,8 @@ msgstr "Пощен�ки _�пи�ък"
 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"
@@ -18167,7 +19294,7 @@ msgstr "Изпращане на пиÑ�мо към пощенÑ�киÑ� Ñ�пиÑ�ÑŠÐ
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18250,6 +19377,26 @@ msgstr "_�бониране за �пи�ък"
 msgid "_Unsubscribe from List"
 msgstr "_Спиране на абонамента за �пи�ък"
 
+#: ../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 "Отбел�зване на в�ичко като прочетено"
@@ -18293,7 +19440,7 @@ msgstr "ПриÑ�тавка за управление кои приÑ�тавки Ñ
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Мениджър на при�тавките"
 
@@ -18305,34 +19452,25 @@ msgstr "Включване и изключване на при�тавки"
 msgid "_Plugins"
 msgstr "_При�тавки"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "�втор(и)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Опи�ание"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "�а�тройки"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Бележка: ��кои промени ще вл�зат в �ила �лед ре�тартиране на програмата"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Обобщение"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "�а�тройки"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "��ма опции за на�тройка за тази при�тавка."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "При�тавка"
 
@@ -18357,41 +19495,22 @@ msgstr "Режим обикновен тек�т"
 msgid "Prefer plain-text"
 msgstr "Предпочитане на обикновен тек�т"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Показване на HTML, ако има такъв"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Предпочитане на ОБИК�ОВЕ�"
 
-#: ../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
 msgid "HTML _Mode"
 msgstr "Режим „_HTML“"
 
-#: ../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 "Разпечатване на пи�мото"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_Печатен преглед"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Разпечатване на �ъобщението"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "�нализатор на Evolution"
@@ -18416,13 +19535,7 @@ msgstr "Ме�тоположени�"
 msgid "_Publish Calendar Information"
 msgstr "_Информаци� за публикуването на календар"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Въведете паролата за „%s“"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Сигурни ли �те, че и�кате да премахнете този адре�?"
 
@@ -18510,15 +19623,78 @@ msgstr ""
 "iCal\n"
 "Свободен/зает"
 
+#: ../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:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (вграден)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "Това ще направи филтъра по-надежден, но по-бавен"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, 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
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "�еу�пех при �ъздаването на програмен канал: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Грешка �лед разклон�ване на проце�: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "Дъщерни�т проце� на SpamAssassin не отговар�, прекрат�ване…"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+"Изчакването за дъщерни� проце� на SpamAssassin е прекъ�нато, прекрат�ване…"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+"�еу�пех при изграждането на програмен канал към SpamAssassin, код за грешка: "
+"%d."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin не е наличен."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "Това ще направи SpamAssassin по-надежден, но по-бавен"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "_Използване на правила за филтриране, намиращи �е на отдалечен �ървър"
 
@@ -18546,28 +19722,27 @@ 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:314
 msgid "Save attachments"
 msgstr "Запазване на прикрепените файлове"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments..."
-msgstr "Запазване на прикрепените файлове..."
+msgstr "Запазване на прикрепените файлове…"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Запазване на в�ички прикрепени файлове"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Избор на о�новното име за запи�"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "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:347
 msgid "Save"
 msgstr "Запазване"
 
@@ -18575,79 +19750,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Спи�ък � опи�ани�"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Спи�ък � категории"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Спи�ък � коментари"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Създадено"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Спи�ък � контакти"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "�ачало"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Край"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "приключено в проценти"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "�дре�"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Спи�ък на при�ъ�тващите"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Променено"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Допълнителни опции за формата CSV"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Добав�не на заглавна ча�т"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Разделител на �тойно�т:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Разделител на запи�ите:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Заграждане на �тойно�тите �:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Тек�тов файл � разделители (.csv)"
 
@@ -18668,15 +19843,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:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Формат RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Избор на целеви файл"
 
@@ -18701,22 +19876,22 @@ msgid "Show _only this Task List"
 msgstr "Показване _�амо на този �пи�ък �ъ� задачи"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "При�тавка за начални� помощник."
+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 "Помощник"
+msgid "Setup Assistant"
+msgstr "Помощник за на�тройки"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Помощник за на�тройка на Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Добре дошли"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18728,29 +19903,29 @@ msgstr ""
 "\n"
 "�ати�нете бутона „�апред“. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Вна��не на файлове"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Изберете информаци�та, ко�то и�кате да вне�ете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Вна��не на данни."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Изчакайте"
 
@@ -18769,10 +19944,34 @@ msgid "Thread messages by subject"
 msgstr "Подреждане на �пи�ъка � пи�ма в нишки на о�новата на „Тема“."
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "Показване на �пи�ъка � пи�ма като нишки по _тема"
 
+#: ../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:615
+msgid "No title"
+msgstr "Без заглавие"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Запазване като _шаблон"
+
+#: ../plugins/templates/templates.c:745
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -18783,6 +19982,28 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "Прикрепени файлове формат TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "При�тавка за на�тройване на контакти по WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Контакти по WebDAV"
+
+#: ../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 "WebDAV"
+
+#: ../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 "_Изб�гване на IfMatch (необходимо за Apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Обвивка на Evolution"
@@ -18800,16 +20021,16 @@ msgid "Evolution Test component"
 msgstr "Компонент за те�тове на Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Тек�тово опи�ание на текущите на�тройки за печатането."
+msgid "Authenticate proxy server connections"
+msgstr "Удо�товер�ване на �вързвани� �ъ� �ървъри-по�редници"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "Вер�и� на конфигураци�та"
+msgid "Automatic proxy configuration URL"
+msgstr "�дре� за автоматично конфигуриране на �ървър-по�редник"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Решава дали да �е провер�ва за предишно забиване на програмата или не."
+msgid "Configuration version"
+msgstr "Вер�и� на конфигураци�та"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18828,73 +20049,179 @@ msgid "Default window width"
 msgstr "Стандартна широчина на прозореца"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Включва на�тройките за �ървър-по�редник при до�тъп до HTTP/HTTPS по Интернет."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr "Хо�т на �ървър-по�редник по HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr "Парола за �ървър-по�редник по HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "Порт на �ървър-по�редник по HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "Потребител�ко име за �ървър-по�редник по HTTP"
+
+#: ../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:9
+#: ../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 ""
+"�ко е „true“, �вързвани�та към �ървъра-по�редник изи�кват удо�товер�ване. "
+"Потребител�кото име �е извлича от ключа на GConf „/apps/evolution/shell/"
+"network_config/authentication_user“, а паролата от gnome-keyring или файла � "
+"пароли ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "По�ледната обновена вер�и� на конфигураци�та"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../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:11
+#: ../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 "Парола за удо�товер�ване пред �ървъра-по�редник по HTTP."
+
+#: ../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 "Хо�т на �ървър-по�редник по SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr "Порт на �ървър-по�редник по SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr "Хо�т на �ървър-по�редник по HTTPS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr "Порт на �ървър-по�редник по HTTPS"
+
+#: ../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 ""
+"Избор на режим за на�тройка на �ървър-по�редник. Поддържаните �тойно�ти �а "
+"0, 1, 2 и три, които отговар�т �ъответно на „използване на �и�темните "
+"на�тройки“, „без �ървър-по�редник“, „ръчна на�тройка на �ървър-по�редник“ и "
+"„автоматична на�тройка чрез зареждане на адре�“."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Страничната лента е видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr ""
 "Пропу�кане на диалогови� прозорец � предупреждението за разработващата �е "
 "вер�и�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "Пропу�кане на диалогови� прозорец � предупреждението за въз�танов�ване"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Стартиране в режим „Изключен“"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Лентата за �ъ�то�нието е видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../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 ""
-"Подробна вер�и� на на�тройките на Evolution - номер на вер�и�/подвер�и�/"
+"Подробна вер�и� на на�тройките на Evolution — номер на вер�и�/подвер�и�/"
 "конфигурационно ниво (напр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Стандартната ви�очина на о�новни� прозорец, в пик�ели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Стандартната широчина на о�новни� прозорец, в пик�ели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Стандартна широчина на �траничната лента, в пик�ели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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 ""
-"Подробна вер�и� на по�ледните на�тройки на Evolution - номер на вер�и�/"
+"Подробна вер�и� на по�ледните на�тройки на Evolution — номер на вер�и�/"
 "подвер�и�/конфигурационно ниво (напр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr "Името на машината, �ървър-по�редник по HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Името на машината, �ървър-по�редник по HTTPS."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr "Името на машината, �ървър-по�редник по SOCKS."
+
+#: ../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 ""
+"Портът на машината, зададена в като �ървър-по�редник в „/apps/evolution/"
+"shell/network_config/http_host“."
+
+#: ../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 ""
+"Портът на машината, зададена като �ървър-по�редник в „/apps/evolution/shell/"
+"network_config/secure_host“."
+
+#: ../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 ""
+"Портът на машината, зададена като �ървър-по�редник в “/apps/evolution/shell/"
+"network_config/socks_host“."
+
+#: ../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 "
@@ -18904,57 +20231,71 @@ msgstr ""
 "„toolbar“. �ко зададете „toolbar“, �тилът на изобраз�ване ще зави�и от "
 "�тандартните на�тройки на GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 ""
+"Този ключ �ъдържа �пи�ък � хо�тове за директно �вързване, вме�то през �ървър-"
+"по�редник (ако е включен). Стойно�тите могат да бъдат имена на хо�тове, "
+"домейни (използвайки първоначален шаблон като *.foo.com), адре�и по IP (IPv4 "
+"и IPv6), както и мрежови адре�и � мрежова ма�ка (например 192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Лентата � ин�трументи е видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../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 "Използване на �ървър-по�редник по HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "Потребител�ко име за удо�товер�ване пред �ървъра-по�редник по HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Дали Evolution да �тартира в режим „Изключен“, вме�то в режим „Включен“."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr "Дали да �е провер�ва за предишно забиване на програмата"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Дали прозорецът да е мак�имизиран"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Дали �траничната лента е видима."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Дали лентата за �ъ�то�нието тр�бва да е видима."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Дали лентата � ин�трументи тр�бва да е видима."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Дали предупредителното �ъобщение в не�табилните вер�ии на Evolution, да бъде "
 "показвано."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Дали предупредителното �ъобщение за въз�танов�ване на Evolution да �е "
-"пропу�ка."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Дали бутоните на прозорците да �а видими."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Стил на бутоните на прозорците"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Бутоните на прозорците �а видими"
 
@@ -18971,29 +20312,23 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "�ати�нете „Да“, за да затворите връзките и да преминете в режим „Изключен“"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Изберете типа на вно�ител� за изпълнение:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 "Изберете файла, който и�кате да вне�ете в Evolution и изберете типа му от "
-"�пи�ъка.\n"
-"\n"
-"�ко не знаете, може да изберете „�втоматично“ и Evolution ще �е опита да го "
-"определи."
+"�пи�ъка."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Изберете къде да бъде вне�ена тази информаци�"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -19005,23 +20340,23 @@ msgstr ""
 "намерено нищо за вна��не. �ко и�кате да\n"
 "опитате отново, то нати�нете бутона „�азад“.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Име на _файл:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Тип на файла:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Вна��не на информаци� и на�тройки от по-_�тари програми"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Вна��не на _единичен файл"
 
@@ -19029,54 +20364,34 @@ msgstr "Вна��не на _единичен файл"
 msgid "Evolution Preferences"
 msgstr "�а�тройки на Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Папката н�ма име."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "В името на папката не може да �е �ъдържа знака „Return“"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "В името на папката не може да �е �ъдържа знака „/“."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "В името на папката не може да �е �ъдържа знака „#“."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "„.“ и „..“ �а запазени имена на папка."
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
-msgstr "%s - Evolution"
+msgstr "%s — 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 "Ин�трументите GNOME Pilot изглежда не �а ин�талирани на тази �и�тема."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка при изпълнение на %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy не е ин�талиран."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "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:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Владимир „Kaladan“ Петков <vpetkov@i-space,org>\n"
@@ -19089,69 +20404,73 @@ msgstr ""
 "�аучете повече за на� на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Уеб�айт на Evolution"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Грешка при отвар�не на уеб-�траницата за че�то задавани въпро�и."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Работа в режим „_Включен“"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Работа в режим „_Изключен“"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Работа в режим „Изключен“"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution в момента е в режим „Включен“. �ати�нете този бутон, за да влезете "
-"в режим „Изключен“."
+"Evolution в момента е в режим „Включен“.\n"
+"�ати�нете този бутон, за да влезете в режим „Изключен“."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution в момента влиза в режим „Изключен“."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution в момента е в режим „Изключен“. �ати�нете този бутон, за да "
-"влезете в режим „Включен“."
+"Evolution в момента е в режим „Изключен“.\n"
+"�ати�нете този бутон, за да влезете в режим „Включен“."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Превключване към %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "�епозната �и�темна грешка."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Да"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Грешни аргументи"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "�е може да реги�трира в OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Конфигурационната база от данни не е намерена"
 
@@ -19161,15 +20480,16 @@ msgstr "Конфигурационната база от данни не е на
 msgid "New"
 msgstr "�ов"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "�ова проба"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
 msgstr "_Проба"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Създаване на нов те�тови елемент"
 
@@ -19212,7 +20532,7 @@ msgstr ""
 "вна��не на външни файлове в Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19246,7 +20566,7 @@ msgstr ""
 "�ад�ваме �е резултатът от у�илената ни работа да ви радва\n"
 "и � нетърпение очакваме да ни помогнете в разработката!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19254,67 +20574,53 @@ msgstr ""
 "Благодарно�ти\n"
 "От екипа на Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Да не �е показва отново"
 
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr "Предишно забиване на Evolution"
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "_Пренебрегване"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Изглежда програмата Evolution е �пр�ла неочаквано по�ледни� път.\n"
-"Като предпазна м�рка, в�ички панели за преглед ще бъдат �крити.\n"
-"Може да ги въз�тановите от менюто „Изглед“.\n"
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "Това �ъобщение да _не �е показва отново."
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
-msgstr "Стартиране на Evolution, активирайки избрани� компонент"
+msgstr ""
+"Стартиране на Evolution, активирайки\n"
+"                                    избрани� компонент"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Стартиране в режим „Включен“"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
-msgstr "Принудително затвар�не на в�ички компоненти на Evolution"
+msgstr ""
+"Принудително затвар�не на в�ички компоненти\n"
+"                                    на Evolution"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Принудително мигриране от Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr ""
-"Изпращане изхода за изчи�тване на грешки на в�ички компоненти във файл."
+"Изпращане изхода за изчи�тване на грешки на\n"
+"                                    в�ички компоненти във файл."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
-msgstr "Спиране зареждането на каквито и да е при�тавки."
+msgstr ""
+"Спиране зареждането на каквито и да е\n"
+"                                    при�тавки."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "Изключване на панела за преглед за Поща, Контакти и Задачи."
+msgstr ""
+"Изключване на панела за преглед за Поща,\n"
+"                                    Контакти и Задачи."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
-msgstr " - организатор и пощен�ки клиент - Evolution"
+msgstr " — организатор и пощен�ки клиент — Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19457,7 +20763,7 @@ msgstr ""
 "�ко изберете да продължите, може да н�мате до�тъп до ча�т от �тарите �и "
 "данни.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19468,7 +20774,7 @@ msgstr ""
 "\n"
 "Редактиране на на�тройките за доверие:"
 
-#: ../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 "
@@ -19478,7 +20784,7 @@ 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 "
@@ -19492,7 +20798,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:380
 #: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
-msgstr "Избор на �ертификат за вна��не..."
+msgstr "Избор на �ертификат за вна��не…"
 
 #: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
@@ -19536,22 +20842,27 @@ msgstr "�дре� на е-поща"
 msgid "All CA certificate files"
 msgstr "В�ички файлове �ъ� �ертификати на УО (CA)"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Интерфей� за преглед на �ертификати: %s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Въведете паролата за „%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 "Въведете нова парола за базата от данни �ъ� �ертификати"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Въвеждане на нова парола"
 
 #. 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"
@@ -19560,7 +20871,7 @@ msgstr ""
 "Издаден на:\n"
 "  Заглавие: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19569,7 +20880,7 @@ msgstr ""
 "Издаден от:\n"
 "  Заглавие: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Избор на �ертификат"
 
@@ -19760,7 +21071,7 @@ msgid "_Edit CA Trust"
 msgstr "_Редактиране на CA доверие"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Сертификатът вече �ъще�твува"
 
@@ -19927,15 +21238,15 @@ msgstr "Уникален идентификатор на �убекта"
 msgid "Certificate Signature Value"
 msgstr "Стойно�т на подпи�а на �ертификата"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 файлова парола"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Въведете парола за PKCS12 файла:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Вне�ен �ертификат"
 
@@ -19962,21 +21273,20 @@ msgstr "Пром�на на�тройките за избраната папка
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "Ко_пиране на в�ички контакти в..."
+msgstr "Ко_пиране на в�ички контакти в…"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "Пре_глед на контакта"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копиране"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Копиране на избраните контакти в друга папка..."
+msgstr "Копиране на избраните контакти в друга папка…"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -19988,14 +21298,13 @@ msgstr "Копиране на избраното"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr "Копиране в папка..."
+msgstr "Копиране в папка…"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Създаване на нова папка за адре�ници"
 
-#: ../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 "Изр�зване"
@@ -20022,11 +21331,11 @@ msgstr "Препращане на контакт"
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "Преме�т_ване на в�ички контакти в..."
+msgstr "Преме�т_ване на в�ички контакти в…"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Преме�тване на избраните контакти в друга папка..."
+msgstr "Преме�тване на избраните контакти в друга папка…"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -20034,10 +21343,9 @@ msgstr "Преме�тване на контактите от избраната
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
-msgstr "Преме�тване в папка..."
+msgstr "Преме�тване в папка…"
 
-#: ../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 "По�тав�не"
@@ -20064,7 +21372,7 @@ msgstr "З_апазване на адре�ника като VCard"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
-msgstr "Запазване като VCard..."
+msgstr "Запазване като VCard…"
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
@@ -20074,13 +21382,11 @@ msgstr "Запазване на избраните контакти като VCa
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Запазване на контактите от избраната папка като VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Избор на в�ичко"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Избор на _в�ичко"
 
@@ -20127,7 +21433,7 @@ msgstr "_Дей�тви�"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "_Копиране на контакт в..."
+msgstr "_Копиране на контакт в…"
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
@@ -20139,17 +21445,17 @@ msgstr "_Изтриване на контакт"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
-msgstr "_Препращане на контакт..."
+msgstr "_Препращане на контакт…"
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "Пре_ме�тване на контакта в..."
+msgstr "Пре_ме�тване на контакта в…"
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
 msgstr "Пре_ме�тване на папката � контакти в"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_�ов"
 
@@ -20159,7 +21465,7 @@ msgstr "П_реименуване"
 
 #: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
-msgstr "_Запазване на контакта като VCard..."
+msgstr "_Запазване на контакта като VCard…"
 
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
@@ -20167,7 +21473,7 @@ msgstr "_Запазване на контактите от папката кат
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
-msgstr "_Изпращане на пи�мо до контакт..."
+msgstr "_Изпращане на пи�мо до контакт…"
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -20210,7 +21516,7 @@ msgid "Month"
 msgstr "Ме�ец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Следващ"
 
@@ -20219,7 +21525,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Предишен"
 
@@ -20287,234 +21593,6 @@ msgstr "Работна �едмица"
 msgid "_Open Appointment"
 msgstr "_Отвар�не на �реща"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Копиране на избрани� тек�т в буфера за обмен"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Копиране на избраното в буфера за обмен"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "По�тав�не на тек�та в буфера за обмен"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Изр�зване на избраното в буфера за обмен"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "По�тав�не от буфера за обмен"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "По�тав�не на тек�т от буфера за обмен"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Избиране на цели� тек�т"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Прикреп�не"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "�ати�нете тук, за да прикрепите файл"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "�ати�нете тук, за да затворите текущи� прозорец"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "�ати�нете тук, за да запазите текущи� прозорец"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "�ати�нете тук, за да прегледате наличната помощ"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Затвар�не"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Вмъква_не"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Прикрепен..."
-
-#: ../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 "_Затвар�не"
-
-#: ../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:42
-msgid "_File"
-msgstr "_Файл"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Помощ"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_�а�тройки"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Събитие за ц�л ден"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Събитие за _ц�л ден"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Отбел�зване като поверително"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Отбел�зване като лично"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Отбел�зване като публично"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "�ати�нете тук, за да въведете или премахнете аларми за това �ъбитие"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Вмъкване на допълнителни опции за изпращането"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Събитието да е повтар�емо"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_Публично"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Запитване за информаци�та „�вободен/зает“ за при�ъ�тващите"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Поле „_Рол�“"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "�а�тройки за _изпращане"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Показване на времето като _заето"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Ча�ови _по��"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr ""
-"Превключване между това дали полето „Вид на уча�тника“ да �е показва или не"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
-"Превключване между това дали полето „Мол�, отговорете“ да �е показва или не"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Превключване между това дали полето „Рол�“ да �е показва или не"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Превключване между това дали полето „Съ�то�ние“ да �е показва или не"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Превключване между това дали полето „Ча�ови по��“ да �е показва или не"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Превключване между това полето „Категори�“ да �е показва или не"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Превключване между това дали �ъбитието е за ц�л ден или не"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Превключване между това дали времето да �е показва като заето или не"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_�ларми"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Категории"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Отбел�зано като"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Поверително"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Свободен/зает"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Лично"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_Мол� отговорете"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Повторение"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Поле за _�ъ�то�ние"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Поле за _вид"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Прекъ�ване на текущата пощен�ка операци�"
@@ -20544,7 +21622,6 @@ msgid "Empty _Trash"
 msgstr "Изчи�тване на _кошчето"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "П_апка"
 
@@ -20591,7 +21668,7 @@ msgstr "_Кла�иче�ки изглед"
 
 #: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
-msgstr "_Копиране на папката в..."
+msgstr "_Копиране на папката в…"
 
 #: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
@@ -20607,11 +21684,11 @@ msgstr "Пощен�ки _филтри"
 
 #: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
-msgstr "Пре_ме�тване на папка в..."
+msgstr "Пре_ме�тване на папка в…"
 
 #: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
-msgstr "_�ов..."
+msgstr "_�ов…"
 
 #: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
@@ -20704,7 +21781,7 @@ msgstr "Изтриване за по�то�нно на тази папка"
 
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
-msgstr "Пре_зареждане..."
+msgstr "Пре_зареждане…"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
@@ -20762,7 +21839,7 @@ msgstr "Изглед по нишки"
 msgid "_Group By Threads"
 msgstr "_Групиране по нишки"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "Пи_�мо"
@@ -20890,23 +21967,23 @@ msgstr "Показване на предишно непрочетено пи�м
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
-msgstr "_Препращане като..."
+msgstr "_Препращане като…"
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "Филтър по пощен�ки _�пи�ък..."
+msgstr "Филтър по пощен�ки _�пи�ък…"
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
-msgstr "Филтър по _подател..."
+msgstr "Филтър по _подател…"
 
 #: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
-msgstr "Филтър по п_олучатели..."
+msgstr "Филтър по п_олучатели…"
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
-msgstr "Филтър по _тема..."
+msgstr "Филтър по _тема…"
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
@@ -20918,7 +21995,7 @@ msgstr "ОтбелÑ�зване на избраното пиÑ�мо за отгоÐ
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
-msgstr "Про_�лед�ване..."
+msgstr "Про_�лед�ване…"
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -21062,11 +22139,11 @@ msgstr "СъхранÑ�ване на пиÑ�мото като текÑ�тов фаÐ
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "Папка за тър�ене на база _пощен�ки �пи�ък..."
+msgstr "Папка за тър�ене на база _пощен�ки �пи�ък…"
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipien_ts..."
-msgstr "Папка за тър�ене на база п_олучатели..."
+msgstr "Папка за тър�ене на база п_олучатели…"
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -21074,7 +22151,7 @@ msgstr "Папка за тър�ене на база _тема"
 
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "Папка за тър�ене на база _подател..."
+msgstr "Папка за тър�ене на база _подател…"
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
@@ -21097,129 +22174,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Показване на мигащ кур�ор в т�лото на показаните пи�ма"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Показване на пи�мо в нормален �тил"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Показване на пи�мо � в�ички заглавни ча�ти"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Показване на необработени� изходен код на пи�мото"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Връщане от кошчето на избраните пи�ма"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_�е е важно"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_�амал�ване"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Прикрепен"
 
-#: ../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
 msgid "_Clear Flag"
 msgstr "Из_чи�тване на флага"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Изтриване на пи�мо"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
-msgstr "_Тър�ене в пи�мо..."
+msgstr "_Тър�ене в пи�мо…"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_Отбел�зването е завършено"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Отиване до"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_В т�лото на пи�мото"
 
-#: ../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 "Зареждане на _изображени�"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Код на пи�_мото"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Следващо пи�мо"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_�ормален размер"
 
-#: ../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 "Отвар�не в _нов прозорец"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Предишно пи�мо"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Цитирано"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "П_рочитане"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "_Запазване на пи�мо..."
+msgstr "_Запазване на пи�мо…"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Въз�танов�ване на пи�мо"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_�епрочетено"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Увеличаване"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_�амал�ване"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Затвар�не на този прозорец"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Затвар�не"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21257,294 +22330,6 @@ msgstr "Преглед на избраната бележка"
 msgid "_Open Memo"
 msgstr "Отвар�не на _бележка"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Прикреп�не на файл"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Затвар�не на текущи� файл"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Изтриване на в�ичко о�вен подпи�а"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Шифриране � PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Шифриране �ъ� �ертификат на S/MIME за шифриране"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Формат"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Получаване на изве�тие, когато пи�мото ви е прочетено"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Вмъкване на опции за изпращането"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Отвар�не на файл"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Шифриране � PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Подпи� � PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "_Шифриране � PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "_Подпи� � PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "_Изи�кване на изве�тие за прочитане"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "Шифриране � _S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Шифриране � S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "Подпи� � S/_MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Подпи� � S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "_Изпращане"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Запазване като"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Запазване на чернова"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Запазване к_ато..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Запазване на _чернова"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Запазване като чернова"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Запазване в папка..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Запазване на текущи� файл"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Запазване на текущи� файл � различно име"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Запазва пи�мото в определена папка"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Изпращане"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Изпращане на пи�мото в HTML формат"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Изпращане на това пи�мо"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Вдигане на приоритета на пи�мото до ви�ок"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Подпи�ване � ваши� ключ за PGP"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Подпи�ване � ваши� �ертификат за S/MIME за подпи�ване"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr ""
-"Превключване между това дали полето „Скрито копие“ да бъде показвано или не"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Превключване между това дали полето „Копие“ да бъде показвано или не"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Превключване между това дали полето „От“ да бъде показвано или не"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
-"Превключване между това дали полето „Копиране в папка“ да бъде показвано или "
-"не"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
-"Превключване между това дали полето „Отговор до“ да бъде показвано или не"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Превключване между това дали полето „До“ да бъде показвано или не"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Поле „_Скрито копие“"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Поле „_Копие“"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Изтриване на _в�ичко"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Поле „_От“"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Отвар�не..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Поле „Копие в _папка“"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Приоритет на пи�мото"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Поле „_Отговор до“"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Сигурно�т"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_�а�тройки за изпращане"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "Поле „_До“"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Затвар�не"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Запазване и затвар�не"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Запазване и _затвар�не"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Запазване на текущи� файл и затвар�не на прозореца"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Добав�не на папка към �пи�ъка � абонирани папки"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Опре�н�ване на �пи�ъка"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Опре�н�ване на �пи�ъка от папки"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Изтриване на папка от �пи�ъка � абонирани папки"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "�бониране"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Отпи�ване"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Обърнат избор"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "�ати�нете пром�на/прегледайте �ъ�то�нието на задачата"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Съ�то�ние"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Ча�ови по��"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Съ�то�ние"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Копиране на избраните задачи"
@@ -21599,7 +22384,7 @@ msgstr "_Отвар�не на задача"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
-msgstr "Отно�но Evolution..."
+msgstr "Отно�но Evolution…"
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -21648,7 +22433,7 @@ msgstr "Скриване на бутоните за прозореца"
 
 #: ../ui/evolution.xml.h:14
 msgid "I_mport..."
-msgstr "_Вна��не..."
+msgstr "_Вна��не…"
 
 #: ../ui/evolution.xml.h:15
 msgid "Icons _and Text"
@@ -21672,7 +22457,7 @@ msgstr "Отвар�не на уеб-�траницата за че�то зад
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
-msgstr "_�а�тройки на �траницата..."
+msgstr "_�а�тройки на �траницата…"
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -21680,11 +22465,11 @@ msgstr "_�а�тройки"
 
 #: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
-msgstr "Изпращане/получаване"
+msgstr "Поща"
 
 #: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
-msgstr "_Изпращане/получаване"
+msgstr "П_оща"
 
 #: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
@@ -21739,50 +22524,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Показване/Скриване на лентата за �ъ�то�нието"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Работа в режим „_Изключен“"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Отно�но"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "Зат_вар�не на този прозорец"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Изчи�тване на запомнените _пароли"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Че�то задавани въпро�и"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Скриване на бутоните"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Са_мо икони"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Бърза �правка"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Изглед на превключвател"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr "Опции за _�инхронизаци�..."
+msgstr "Опции за _�инхронизаци�…"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Само _тек�т"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Прозорец"
 
@@ -21859,11 +22648,11 @@ msgid "With _Status"
 msgstr "Съ� _�ъ�то�ние"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21880,7 +22669,7 @@ msgid "Select a Time Zone"
 msgstr "Избор на ча�ови по��"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
+msgid "Timezone drop-down combination box"
 msgstr "Падащо меню за ча�ови по��"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
@@ -21893,19 +22682,19 @@ msgstr ""
 "изберете ча�ови по��.\n"
 "Използвайте де�ни� бутон, за да намалите мащаба."
 
-#: ../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 "Определ�не на изгледите за %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 "Определ�не на изгледите"
 
@@ -21915,17 +22704,17 @@ msgid "Define Views for \"%s\""
 msgstr "Определ�не на изгледите за „%s“"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Пример"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Запазване на текущи� изглед"
 
@@ -21939,7 +22728,7 @@ msgstr "_Зам�на на �ъще�твуващи� изглед"
 
 #. 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 "Личен изглед"
 
@@ -21948,40 +22737,40 @@ msgid "Save Custom View"
 msgstr "Запазване на лични� изглед"
 
 #: ../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 "Определ�не на изгледите..."
+msgstr "Определ�не на изгледите…"
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "_Текущ изглед"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Избор на вид изглед: %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 "Запазване на лични� изглед..."
+msgstr "Запазване на лични� изглед…"
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Запазване на текущи� изглед"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Създаване или редактиране на изглед"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Фабрика"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Определ�не на нов изглед"
 
@@ -21997,17 +22786,17 @@ msgstr "Вид изглед"
 msgid "Type of view:"
 msgstr "Вид изглед:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Лента за прикрепени файлове"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "�е може да �е прикрепи файла %s: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "�е може да �е прикрепи файла %s: не е обикновен файл"
@@ -22029,33 +22818,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Предлагане на автоматично показване на прикрепен обект"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Ме�ечен календар"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 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:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Запълващ пунктир"
 
@@ -22079,30 +22867,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "Минимална широчина"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "Минимална широчина"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Раз�то�ние"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Сега"
 
-#: ../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 "Датата тр�бва да е въведена в �ледни� формат: %s"
@@ -22111,152 +22899,150 @@ msgstr "Датата Ñ‚Ñ€Ñ�бва да е въведена в Ñ�ледниÑ� Ñ„Ð
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Стойно�тта на процентите тр�бва да е между 0 и 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 "Балтий�ко"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
-msgstr "Центалноевропей�ко"
+msgstr "Централноевропей�ко"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Китай�ко"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Кирилица"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Гръцко"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Япон�ко"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Корей�ко"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Тай�ко"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Тур�ко"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Уникод"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Западноевропей�ко"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "�ово западноевропей�ко"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Традиционно"
 
-#: ../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 "Опро�тено"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Украин�ко"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Визуално"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "�еизве�тна кодова таблица: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Кодиране на знаците"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Въведете ко� кодова таблица да �е използва"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
-msgstr "Друга..."
+msgstr "Друга…"
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Кодир_ане на знаците"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Дата и време"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Тек�тов запи� за въвеждане на дата"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "�ати�нете за показване на календар"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
 msgstr "Падащо меню за избор на време"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Сега"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Дне�"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "�евалидна �тойно�т на датата"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "�евалидна �тойно�т на времето"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Разширен"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Дали разширител� е разширен или не"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Тек�т на етикета на разширител�"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Използване на подчертаване"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22264,107 +23050,115 @@ msgstr ""
 "�ко е зададено, подчертаването в тек�та обозначава, че �ледващи� знак тр�бва "
 "да �е използва като клавиш за мнемоничен у�корител"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Раз�то�ние, което да бъде по�тавено между етикета и детето"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Графичен обект за етикети"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Графичен обект за показване на м��то на обичайни� етикет на разширител�"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Размер на разширител�"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Размер на �трелката на разширител�"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Раз�то�ние на индикатора"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Раз�то�ние около �трелката за оразмер�ване"
 
 #. 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:748
+#: ../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 "Допълнително тър�ене"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Запазване на тър�енето"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Тър�ени�"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Тър�ени�"
 
-#: ../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 "_Запазване на тър�енето..."
+msgstr "_Запазване на тър�енето…"
 
-#: ../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 "_Редактиране на запазени тър�ени�..."
+msgstr "_Редактиране на запазени тър�ени�…"
 
-#: ../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 "_Разширено тър�ене..."
+msgstr "_Разширено тър�ене…"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "В�ички абонаменти"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Текущ абонамент"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Текуща папка"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Текущо пи�мо"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Карта на �вета"
 
-#: ../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-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "Режим „Включен“"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "Съ�то�нието на бутона е „Включен“"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Синхронизаци� �:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Синхронизиране на лични запи�и:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Синхронизиране на категории:"
 
@@ -22380,74 +23174,74 @@ msgstr "Модел на изливане на тек�та"
 msgid "Column width"
 msgstr "Широчина на колоната"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Тър�ене"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "�ати�нете тук, за да промените типа тър�ене"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Тър�ене"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_�амиране �ега"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "Изчи�тв_ане"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Идентификатор на елемента"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " _в "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Ред на показалец"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Колона на показалец"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Подреждане по"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Режим на избиране"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Режим на показалеца"
 
@@ -22475,10 +23269,6 @@ msgstr "<b>Про�лед�ване на �ъ�то�нието</b>"
 msgid "A_uto-delete sent item"
 msgstr "_�втоматично изтриване на изпратените пи�ма"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Кла�ифициране"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Създаван_е на запи� за про�лед�ване на информаци�"
@@ -22559,50 +23349,51 @@ msgstr "_След:"
 msgid "_All information"
 msgstr "_Ц�лата информаци�"
 
-#: ../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 "_Забав�не до�тав�нето на пи�мото"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_До�тавено"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Задаване на дата на изтичане"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Докато:"
 
-#: ../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 "При _отвар�не:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:255
 #, c-format
 msgid "%s (...)"
-msgstr "%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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% приключено)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "�ати�нете тук, за да отидете на адре�"
 
 #: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
-msgstr "Редактиране на главни� �пи�ък � категории..."
+msgstr "Редактиране на главни� �пи�ък � категории…"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
@@ -22616,7 +23407,7 @@ msgstr "_�алични категории:"
 msgid "categories"
 msgstr "категории"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "из�качащ �пи�ък"
 
@@ -22636,23 +23427,23 @@ msgstr "Фоку�ирана колона"
 msgid "Unselected Column"
 msgstr "�еизбрана колона"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Зачертана колона"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Подчертана колона"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Получерна колона"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Оцветена колона"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Фонов цв�т на колона"
 
@@ -22690,7 +23481,7 @@ msgid "A_vailable Fields:"
 msgstr "_�алични полета:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Възход�що"
 
@@ -22703,7 +23494,7 @@ msgid "Clear _All"
 msgstr "Изчи�тване на _в�ичко"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "�изход�що"
 
@@ -22745,11 +23536,11 @@ msgstr "След това по"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
-msgstr "_Показани полета..."
+msgstr "_Показани полета…"
 
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
-msgstr "_Групиране по..."
+msgstr "_Групиране по…"
 
 #: ../widgets/table/e-table-config.glade.h:22
 msgid "_Show field in View"
@@ -22761,25 +23552,25 @@ msgstr "_Показване на тези полета в реда:"
 
 #: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
-msgstr "_Подреждане..."
+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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "ИиП код"
 
 #: ../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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Пълна заглавна ча�т"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
-msgstr "Добав�не на колона..."
+msgstr "Добав�не на колона…"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -22793,303 +23584,303 @@ msgstr ""
 "За да добавите колона към таблицата �и � изтеглете\n"
 "към м��тото, където и�кате т� да �е по�ви."
 
-#: ../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 обекта)"
 msgstr[1] "%s : %s (%d обект)"
 
-#: ../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 обекта)"
 msgstr[1] "%s (%d обект)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Смен�щи �е цветове на редовете"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Хоризонтална решетка"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Вертикална решетка"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Ри�уване на фоку�"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Режим на показалеца"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Модел на избиране"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Праг по дължина"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Стандартна ви�очина на колона"
 
-#: ../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 "От"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Пер�онифициране на текущи� изглед"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "_Възход�що подреждане"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "_�изход�що подреждане"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Премахване на подреждането"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "_Групиране по това поле"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Групиране по _кути�"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Према_хване на тази колона"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
-msgstr "Добав�не на к_олона..."
+msgstr "Добав�не на к_олона…"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "По_дравн�ване"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "С_ъразмерно екрана"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
-msgstr "_Форматиране на колони..."
+msgstr "_Форматиране на колони…"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
-msgstr "Пер�онифи_циране на текущи� изглед..."
+msgstr "Пер�онифи_циране на текущи� изглед…"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Подреждане по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Личен"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Опи�ание на шрифт"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Информаци� за подреждането"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Дърво"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Заглавка на таблицата"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Модел на таблицата"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Ред на показалеца"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Винаги да �е тър�и"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "�ати�кане за добав�не"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "�даптер за таблица ETree"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Ретро изглед"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Изчертаване на линиите и знаците за разшир�ване „+“ и „-“"
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Методи за вход"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Проце�ор на �ъбити�"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Получерно"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Зачертано"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Котва"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Подравн�ване"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
-msgstr "Широчина на изр�зката"
+msgstr "Широчина на изрезката"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
-msgstr "Ви�очина на изр�зката"
+msgstr "Ви�очина на изрезката"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
-msgstr "Изр�зка"
+msgstr "Изрезка"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
-msgstr "Запълване на изр�зка"
+msgstr "Запълване на изрезка"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "От�тъп по X"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "От�тъп по Y"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Широчина на тек�та"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Ви�очина на тек�та"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Използване на многоточие"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Многоточие"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Прена��не на редове"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Прена��не на знаците"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Мак�имум линии"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Изри�уване на рамки"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Позвол�ване на нови редове"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Изри�уване на фон"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Изри�уване на бутон"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Позици� на показалеца"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Контек�т за IM"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Управление на из�качащи прозорци"
diff --git a/po/ca.po b/po/ca.po
index f584236ba7..3e66307388 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,13 +11,14 @@
 # Gil Forcada <gilforcada@guifi.net>, 2006
 # David Planella Molas <david.planella@gmail.com>, 2007, 2008
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-30 11:24+0000\n"
-"PO-Revision-Date: 2008-05-13 21:40+0200\n"
-"Last-Translator: David Planella Molas <david.planella@gmail.com>\n"
+"POT-Creation-Date: 2008-09-11 01:50+0200\n"
+"PO-Revision-Date: 2008-09-04 20:17+0200\n"
+"Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,21 +27,21 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "llibreta d'adreces de l'Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Contacte nou"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Llista de contactes nova"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -63,63 +64,63 @@ msgstr "Contacte: "
 msgid "evolution minicard"
 msgstr "minitargeta de l'Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Té alarmes."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Té recurrències."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "És una reunió."
 
-#: ../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 "Esdeveniment del calendari: el resum és %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 "Esdeveniment de calendari: no té resum."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "visualització del calendari per a un esdeveniment"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Captura el focus"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Cita nova"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Esdeveniment de tot el dia nou"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Reunió nova"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Vés a avui"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Vés a una data"
 
-#: ../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 "una taula per a visualitzar i seleccionar l'interval de temps 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."
@@ -128,14 +129,14 @@ msgstr[1] "Té %d esdeveniments."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../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 "No té esdeveniments."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Visualització de setmana laboral: %s. %s"
@@ -143,21 +144,21 @@ msgstr "Visualització de setmana laboral: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Visualització diària: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "visualització del calendari per a una setmana laboral"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "visualització de calendari per a un o més dies"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %B del %Y"
 
@@ -167,30 +168,30 @@ msgstr "%A, %d de %B del %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:750
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../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/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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d de %B del %Y"
 
@@ -199,61 +200,59 @@ msgstr "%d de %B del %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:776
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../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/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:766
 msgid "Gnome Calendar"
 msgstr "Calendari del Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barra de cerca"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "barra de cerca del calendari de l'Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Botó per a saltar"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Feu clic aquí per a veure més esdeveniments."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visualització 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 "Visualització setmanal: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "visualització del calendari per a 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 "visualització del calendari per a una o més setmanes"
 
-# gal/e-table/e-table-config.glade.h:7
-# gal/e-table/e-table-config-no-group.glade.h:7
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "emergent"
 
 #. 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 "desplega un fill"
 
@@ -265,12 +264,12 @@ msgstr "edita"
 msgid "begin editing this cell"
 msgstr "comença a editar aquesta cel·la"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "commuta"
 
 #. 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 "commuta la cel·la"
 
@@ -290,50 +289,47 @@ msgstr "contreu"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contreu la fila de l'ETree que conté aquesta cel·la"
 
-# gal/menus/gal-view-factory-etable.c:38
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Cel·la de taula"
 
-#: ../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 "feu clic per a afegir"
 
-# gal/widgets/color-palette.c:579
-#: ../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 "feu clic"
 
-# gal/e-table/e-table-header-item.c:1467
-#: ../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 "ordena"
 
-#: ../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 "Calendari: de %s a %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "element de calendari de l'Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Botó combinat"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Activa el predeterminat"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Menú emergent"
 
@@ -348,12 +344,12 @@ msgstr "activa"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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}» és una font de llibreta d'adreces a la qual no és permès escriure-hi. "
-"Canvieu a la visualització de contactes i ressalteu una llibreta d'adreces "
-"que pugui acceptar contactes."
+"«{0}» és una llibreta d'adreces a la qual no és permès escriure-hi. Hauríeu "
+"de seleccionar una llibreta d'adreces diferent de la barra lateral de la "
+"visualització de Contactes."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -394,14 +390,14 @@ msgid "Could not get schema information for LDAP server."
 msgstr "No s'ha pogut obtenir la informació d'esquema per al servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "No s'ha pogut suprimir la llibreta d'adreces."
 
 #: ../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 ""
 "Només podeu accedir a llibretes d'adreces del sistema de Groupwise des de "
 "l'Evolution. Hauríeu d'utilitzar un altre client de correu GroupWise una "
@@ -413,7 +409,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Voleu suprimir la llibreta d'adreces «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "S'ha produït un error en carregar la llibreta d'adreces."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -426,7 +422,7 @@ msgstr "No es pot autenticar amb el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "No s'ha pogut suprimir el contacte"
 
@@ -449,7 +445,7 @@ msgstr ""
 "servidor actual"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "La llibreta d'adreces de l'Evolution ha sortit inesperadament."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -471,32 +467,32 @@ msgstr ""
 "compatibles."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Se suprimirà la llibreta d'adreces de manera permanent."
+msgid "This address book could not be opened."
+msgstr "No s'ha pogut obrir aquesta llibreta d'adreces."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
-msgstr "No s'ha pogut obrir la llibreta d'adreces."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Aquest servidor de llibreta d'adreces no té cap base de cerca suggerida."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "O bé no es pot contactar amb el servidor de la llibreta d'adreces, o bé el "
 "seu nom està mal escrit, o potser no esteu connectats a la xarxa."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Se suprimirà la llibreta d'adreces de manera permanent."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Aquest servidor no és compatible amb la informació d'esquema LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "No s'ha pogut obrir la llibreta d'adreces"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -513,7 +509,7 @@ msgstr "Voleu desar els canvis?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Esteu intentant moure un contacte d'una llibreta d'adreces a una altra, però "
@@ -531,10 +527,10 @@ msgstr ""
 "versió compatible"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr "No teniu els permisos suficients per a esborrar aquest correu."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"No teniu els permisos suficients per a suprimir contactes d'aquesta llibreta "
+"d'adreces."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -549,7 +545,7 @@ msgstr ""
 "Fins que no torneu a iniciar l'Evolution no estaran disponibles els vostres "
 "contactes per a {0}"
 
-#: ../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
@@ -572,9 +568,9 @@ msgstr "_Canvia de mida"
 msgid "_Use as it is"
 msgstr "_Utilitza tal com és"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:147
-#: ../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}"
 
@@ -583,17 +579,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Adreça de sincronització predeterminada:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "No s'ha pogut carregar la llibreta d'adreces"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreces del pilot"
 
@@ -615,10 +611,10 @@ msgstr "Configureu la compleció automàtica aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Contactes"
 
@@ -627,7 +623,6 @@ msgid "Evolution Address Book"
 msgstr "Llibreta d'adreces de l'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Address Book address popup"
 msgstr ""
 "Finestra emergent de les adreces de la llibreta d'adreces de l'Evolution"
@@ -645,7 +640,7 @@ msgid "Evolution Address Book component"
 msgstr "Component de la llibreta d'adreces de l'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Control de la gestió dels certificats S/MIME de l'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -660,12 +655,13 @@ msgstr "Gestioneu els vostres certificats S/MIME aquí"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1475
+#: ../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
 msgid "On This Computer"
 msgstr "En aquest ordinador"
 
@@ -678,123 +674,112 @@ msgstr "En aquest ordinador"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Contacte"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Crea un contacte nou"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "_Llista de contactes"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Crea una llista de contactes nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Llibreta d'adreces nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Lli_breta d'adreces"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Crea una llibreta d'adreces nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "No s'han pogut actualitzar els paràmetres o el directori de la llibreta "
 "d'adreces."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tipus:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copia el contingut de la _llibreta localment per a treballar fora de línia"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:257 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Informació del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalls"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Cerca"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Baixada"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "S'està migrant..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "S'està migrant «%s»:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -848,76 +833,82 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les vostres dades del Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Canvia el nom de la carpeta «%s» a:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Canvia el nom de la carpeta"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "El nom de la carpeta no pot contenir el caràcter «/»"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "Llibreta d'adreces _nova"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Desa com a vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../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 "_Suprimeix"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Propietats..."
+#: ../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 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Propietats"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Seleccionador de fonts de contacte"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "S'està accedint anònimament al servidor d'LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "S'ha produït un error en l'autenticació.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Introduïu la contrasenya per a %s (usuari %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduïu la contrasenya"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
-msgstr "Longitud per a autocompletar"
+msgstr "Longitud abans d'autocompletar"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
@@ -1005,7 +996,7 @@ msgid "Add Address Book"
 msgstr "Afegeix una llibreta d'adreces"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Sempre"
 
@@ -1013,75 +1004,80 @@ msgstr "Sempre"
 msgid "Anonymously"
 msgstr "Anònimament"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "Na_vega per aquesta llibreta fins arribar al límit establert"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Bàsic"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nom distingit"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "L'Evolution utilitzarà aquesta adreça de correu electrònic per autenticar-"
 "vos al servidor"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Troba les bases de cerca possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Entra:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Mai"
 
 #. 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:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sense xifratge"
 
 # És el nom d'un mètode
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "One"
 
 #. 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:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Xifratge SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtre de cerca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Ba_se de la cerca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Fil_tre de cerca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtre de cerca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1090,7 +1086,7 @@ msgstr ""
 "El filtre de cerca és el tipus d'objecte cercat. Si no es modifica, per "
 "defecte la cerca es realitzarà sobre la classe d'objectes «persona»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1098,7 +1094,7 @@ msgstr ""
 "Si seleccioneu aquesta opció l'Evolution només es connectarà al servidor "
 "d'LDAP si aquest funciona amb l'SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1106,7 +1102,7 @@ msgstr ""
 "Si seleccioneu aquesta opció l'Evolution només es connectarà al servidor "
 "d'LDAP si aquest funciona amb el TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1117,23 +1113,23 @@ msgstr ""
 "vulnerables als atacs de seguretat."
 
 # És el nom d'un mètode
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de cerca compatibles"
 
 #. 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:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Xifratge TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1143,7 +1139,7 @@ msgstr ""
 "cerques. Si la deixeu en blanc, la cerca començarà a l'arrel de l'arbre de "
 "directoris."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1155,14 +1151,14 @@ msgstr ""
 "les entrades per sota de la base de la cerca. L'àmbit de cerca «one» només "
 "inclourà les entrades un nivell per sota de la vostra base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "El nom complet del servidor d'LDAP. Per exemple, «ldap.lamevaempresa.cat»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1170,7 +1166,7 @@ msgstr ""
 "És el nombre màxim d'entrades a baixar. Si especifiqueu un nombre massa "
 "gran, la llibreta d'adreces funcionarà més lentament."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1180,7 +1176,7 @@ msgstr ""
 "l'opció «Adreça de correu electrònic» necessita accés anònim al servidor "
 "d'LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1188,7 +1184,7 @@ msgstr ""
 "El nom que apareixerà a la llista de carpetes de l'Evolution per a aquest "
 "servidor. Només s'utilitzarà per a visualitzar-lo."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1198,75 +1194,76 @@ msgstr ""
 "una llista de ports estàndard. Pregunteu a l'administrador del sistema quin "
 "port heu d'especificar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Utilitza el nom distingit (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Utilitza l'adreça de correu electrònic"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Sempre que sigui possible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Afegeix una llibreta d'adreces"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Límit de baixa_da:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "Cerca les _bases de cerca possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Mè_tode d'entrada:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Àmbit de la c_erca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Temps d'espera:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Utilitza una connexió segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "targetes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minuts"
 
@@ -1307,7 +1304,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Feina</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1319,16 +1316,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacte"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../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
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
@@ -1341,7 +1338,7 @@ msgid "Image"
 msgstr "Imatge"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "Missatgeria de l'MSN"
 
@@ -1354,7 +1351,7 @@ msgid "Nic_kname:"
 msgstr "Sobre_nom:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Groupwise de Novell"
 
@@ -1368,11 +1365,11 @@ msgstr "Telèfon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Feina"
 
@@ -1394,8 +1391,8 @@ msgid "_Birthday:"
 msgstr "A_niversari:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendari:"
@@ -1484,1121 +1481,1121 @@ msgstr "_On:"
 msgid "_Zip/Postal Code:"
 msgstr "Codi posta_l:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "Adreça"
 
-#: ../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:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Estats Units"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algèria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../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: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 "Antàrtida"
 
-#: ../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 i Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armènia"
 
-#: ../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 "Àustria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaitjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahames"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangla Desh"
 
-#: ../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 "Bielorússia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../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 "Benín"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../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 "Bòsnia i Hercegovina"
 
-#: ../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 "Illa Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../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 "Territori Britànic de l'Oceà �ndic"
 
-#: ../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"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgària"
 
-#: ../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 "Cambodja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Camerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cap Verd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Illes Caiman"
 
-#: ../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 "República Centreafricana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Txad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Xile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Xina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Illa Christmas"
 
-#: ../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 "Illes Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colòmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../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 "Congo, República Democràtica del"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Illes Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../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:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Costa d'Ivori"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croàcia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Xipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "República Txeca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../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:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Equador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egipte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../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:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinea Equatorial"
 
-#: ../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ònia"
 
-#: ../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 "Illes Malvines (Falkland)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Illes Fèroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "França"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Guaiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polinèsia Francesa"
 
-#: ../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 "Territoris Francesos del Sud"
 
-#: ../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 "Gàmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Geòrgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../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ècia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenlàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadaloupe"
 
-#: ../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
-#, fuzzy
+#: ../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:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../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 "Illa Heard i Illes McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Ciutat de Vaticà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Hondures"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../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:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hongria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "�ndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonèsia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../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 "Illa de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japó"
 
-#: ../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ània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea del Nord"
 
-#: ../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 "Corea del Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: ../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 "Letònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Líban"
 
-#: ../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íbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../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 "Malàisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldives"
 
-#: ../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 "Illes Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Maurici"
 
-#: ../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 "Mèxic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronèsia"
 
-#: ../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 "Moldàvia, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Mònaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongòlia"
 
-#: ../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 "Marroc"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Moçambic"
 
-#: ../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 "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Països Baixos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../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:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nova Caledò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 "Nova Zelanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Níger"
 
-#: ../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 "Illes 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 "Illes Marianes del Nord"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../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 "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panamà"
 
-#: ../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 Nova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipines"
 
-#: ../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 "Polònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../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:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../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 "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Federació Russa"
 
-#: ../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 "Saint Christopher i 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 "Saint 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 "Saint Vincent i les Grenadines"
 
-#: ../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 Tomé i Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Aràbia Saudita"
 
-#: ../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 "Sèrbia i Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../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 "Eslovàquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Eslovènia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Illes Salomó"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somàlia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../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:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Illes Geòrgia del Sud i Sandwich del Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../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:339
+#: ../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:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre i Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../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 "Illes Svalbard i Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swazilàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suïssa"
 
-#: ../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 "Tadjikistan"
 
-#: ../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 "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 "Tailàndia"
 
-#: ../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 "Trinitat i Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../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 "Illes Turks i Caicos"
 
-#: ../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 "Ucraïna"
 
-#: ../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 "Unió dels Emirats Àrabs"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
-#: ../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 "Illes Perifèriques menors dels Estats Units"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../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 "Veneçuela"
 
-#: ../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 "Illes Verge Britàniques"
 
-#: ../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 "Illes Verge Americanes"
 
-#: ../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 "Illes Wallis i Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../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:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Iemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zàmbia"
 
-#: ../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
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nom"
 
-#: ../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 "Missatgeria instantània de l'AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Missatgeria del Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Missatgeria Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "Servei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Particular"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Altres"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Llibreta d'adreces d'origen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Llibreta d'adreces de destinació"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "És un contacte nou"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Camps d'escriptura"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Camps necessaris"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Modificat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a aquest contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "Cap _imatge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2606,47 +2603,47 @@ msgstr ""
 "Les dades del contacte no són vàlides:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» té un format no vàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» té un format no vàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» és buit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Contacte no vàlid."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Afegeix un contacte ràpidament"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Edita sencer"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "No_m complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "Correu electrò_nic"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Seleccioneu la llibreta d'adreces"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2655,7 +2652,7 @@ msgstr ""
 "Segur que voleu\n"
 "suprimir la llista de contactes (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2663,7 +2660,7 @@ msgstr ""
 "Segur que voleu\n"
 "suprimir aquestes llistes de contactes?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2672,7 +2669,7 @@ msgstr ""
 "Segur que voleu\n"
 "suprimir el contacte (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2782,7 +2779,7 @@ msgstr "Serve_i 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:242
+#: ../plugins/exchange-operations/exchange-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Ubicació:"
@@ -2792,7 +2789,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Membres</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 de la llista de contactes"
 
@@ -2813,25 +2810,25 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Escriviu una adreça de correu o arrossegueu un con_tacte a la llista de sota:"
 
-#: ../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 "Membres de la llista de contactes"
 
-#: ../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 "_Membres"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Llibreta"
 
-#: ../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 "És una llista nova"
 
@@ -2872,40 +2869,40 @@ msgstr ""
 "Ja existeix el nom o l'adreça de correu electrònic d'aquest contacte\n"
 "en aquesta carpeta. Voleu afegir-l'hi de totes maneres?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Fusiona el contacte"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Fusiona"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Fusiona el contacte"
+
+#: ../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:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Adreça electrònica"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:166
-#: ../calendar/gui/cal-search-bar.c:81 ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Qualsevol camp conté"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "El correu electrònic comença per"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Name begins with"
-msgstr "El nom comença per"
+msgid "Name contains"
+msgstr "El nom conté"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2919,10 +2916,10 @@ msgstr[0] "%d contacte"
 msgstr[1] "%d contactes"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Consulta"
 
@@ -2930,122 +2927,119 @@ msgstr "Consulta"
 msgid "Error getting book view"
 msgstr "S'ha produït un error en obtenir la visualització de la llibreta"
 
-#: ../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:3335
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "El nom comença per"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Font"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../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 "Tipus"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Desa com a vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Obre"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "Contacte _nou..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "_Llista de contactes nova..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "De_sa com a vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Reenvia el contacte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "R_eenvia contactes"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Envia _un missatge al contacte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "En_via un missatge a la llista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Envia un _missatge als contactes"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Cop_ia a la llibreta d'adreces..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Mou a la lli_breta d'adreces..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Re_talla"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2009 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2065
+#: ../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 ../mail/em-folder-tree.c:1005
+#: ../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-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "Engan_xa"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1523
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Un altre error"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3077,7 +3071,7 @@ msgstr "Telèfon del cotxe"
 
 #: ../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:143
+#: ../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
@@ -3178,9 +3172,9 @@ msgid "Radio"
 msgstr "Ràdio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../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 "Rol"
 
@@ -3216,38 +3210,38 @@ msgid "Web Site"
 msgstr "Lloc web"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
+#: ../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
 msgid "Width"
 msgstr "Amplada"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
+#: ../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
 msgid "Height"
 msgstr "Alçada"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Té el focus"
 
@@ -3267,11 +3261,21 @@ msgstr "Model del text"
 msgid "Max field name length"
 msgstr "Longitud màxima del nom del camp"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Amplada de la columna"
 
-#: ../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"
+"S'estan cercant els contactes..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3285,7 +3289,7 @@ msgstr ""
 "\n"
 "o feu doble clic per a crear-ne un de nou."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3299,7 +3303,7 @@ msgstr ""
 "\n"
 "Feu doble clic aquí per a crear un contacte nou."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3309,7 +3313,7 @@ msgstr ""
 "\n"
 "Cerca el contacte."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3319,41 +3323,41 @@ msgstr ""
 "\n"
 "Aquesta visualització no té cap element per a mostrar."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Correu de la feina"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Correu particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Un altre correu"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Seleccionada"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Té el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "Envia un mi_ssatge nou a..."
 
@@ -3396,25 +3400,23 @@ msgid "Video Chat"
 msgstr "Xat de vídeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2372
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../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
+#: ../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-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 "Calendari"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Lliure/ocupat"
 
@@ -3436,12 +3438,14 @@ msgid "Web Log"
 msgstr "Bloc web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2360
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Aniversari"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2361
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Commemoració"
 
@@ -3487,7 +3491,7 @@ msgstr "No s'ha definit cap contacte propi"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
@@ -3509,11 +3513,11 @@ msgstr "El protocol no és compatible"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "S'ha cancel·lat"
 
@@ -3549,40 +3553,50 @@ msgstr "No existeix tal font"
 msgid "Not available in offline mode"
 msgstr "No està disponible en mode fora de línia"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Un altre error"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "La versió del servidor no és vàlida"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "El mètode d'autenticació no està implementat"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 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 ""
 "No s'ha pogut obrir la llibreta d'adreces. Això significa que la llibreta no "
 "està marcada per a ser utilitzada fora de línia, o que encara no s'ha "
 "baixat. Carregueu la llibreta d'adreces un cop estigueu en línia per a poder "
 "baixar el seu contingut"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, 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 ""
-"No s'ha pogut obrir la llibreta d'adreces. Comproveu que el camí %s existeix "
+"No s'ha pogut obrir la llibreta d'adreces. Comproveu que existeix el camí %s "
 "i que hi teniu permís d'accés."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 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 ""
 "No s'ha pogut obrir la llibreta d'adreces perquè l'URI que heu introduït és "
 "incorrecte o el servidor d'LDAP no està disponible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
@@ -3592,20 +3606,24 @@ msgstr ""
 "voleu utilitzar l'Evolution amb l'LDAP heu d'obtenir un paquet de "
 "l'Evolution preparat per a treballar amb l'LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 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 ""
 "No s'ha pogut obrir la llibreta d'adreces perquè l'URI introduït és "
 "incorrecte o el servidor no està disponible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error:"
+msgstr "Informació detallada de l'error:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 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 ""
 "El nombre de targetes que compleixen els criteris de la \n"
 "consulta superen el nombre màxim que pot visualitzar l'Evolution, \n"
@@ -3614,59 +3632,59 @@ msgstr ""
 "a les preferències del servidor de directoris d'aquesta llibreta \n"
 "d'adreces."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 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 ""
 "El temps d'execució d'aquesta consulta ha superat el límit del servidor o\n"
 "l'especificat en la configuració de la llibreta d'adreces. Feu una consulta\n"
 "més específica o augmenteu el límit de temps en les preferències del\n"
 "servidor de directori de la llibreta d'adreces."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
-"El rerefons de la llibreta d'adreces no ha pogut analitzar la consulta."
+"El rerefons de la llibreta d'adreces no ha pogut analitzar aquesta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "El rerefons de la llibreta d'adreces ha refusat realitzar aquesta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "S'ha produït un error en l'execució d'aquesta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "S'ha produït un error en afegir la llista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "S'ha produït un error en afegir el contacte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "S'ha produït un error en modificar la llista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "S'ha produït un error en modificar el contacte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "S'ha produït un error en suprimir la llista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "S'ha produït un error en suprimir el contacte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3681,16 +3699,16 @@ msgstr[1] ""
 "En obrir %d contactes també s'obriran %d finestres noves.\n"
 "Segur que voleu mostrar tots aquests contactes?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_No els mostris"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "_Mostra tots els contactes"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3699,70 +3717,70 @@ msgstr ""
 "Ja existeix %s\n"
 "El voleu sobreescriure?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacte"
 msgstr[1] "contactes"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "targeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Seleccioneu la llibreta d'adreces"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "llista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Mou el contacte a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Copia el contacte a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Mou els contactes a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Copia els contactes a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
 msgid "Multiple vCards"
 msgstr "vCard múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard per a %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
 #, c-format
 msgid "Contact information"
 msgstr "Informació del contacte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informació de contacte per a %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "S'està consultant la llibreta d'adreces..."
 
@@ -3783,50 +3801,50 @@ msgid "Show Compact vCard"
 msgstr "Mostra la vCard compacta"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Visualització de targeta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "S'està important..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV o Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de l'Outlook CSV i Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV o Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de CSV i Tab del Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV o Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador CSV i Tab de l'Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format d'intercanvi de dades LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF de l'Evolution"
 
@@ -3879,12 +3897,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Capçalera"
 
@@ -3986,8 +4004,8 @@ msgstr "Ombrejat"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Mida:"
@@ -4005,7 +4023,7 @@ msgid "Top:"
 msgstr "Superior:"
 
 #: ../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 "Tipus:"
 
@@ -4017,36 +4035,36 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Tipus de _lletra..."
 
-#: ../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 "Prova de l'editor d'estil d'impressió de contactes"
 
-#: ../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 "Copyright (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 ""
 "Això hauria de provar el giny d'edició d'estils d'impressió de contactes"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Prova de la impressió de contactes"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Això hauria de provar el codi d'impressió de contactes"
 
-#: ../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 "No es pot obrir el fitxer"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "No s'ha pogut obtenir la llista de llibretes d'adreces"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4062,7 +4080,7 @@ msgid "OUTPUTFILE"
 msgstr "FITXERDESORTIDA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Llista les carpetes de llibretes d'adreces locals"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4115,23 +4133,22 @@ msgstr "Error no gestionat"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{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}» és una font de calendari a la qual no és permès escriure-hi. Canvieu a "
-"la visualització de calendari i ressalteu un calendari que pugui acceptar "
-"cites."
+"«{0}» és un calendari de només lectura, per la qual cosa no es pot modificar. "
+"Hauríeu de seleccionar-ne un de diferent a la barra lateral de la "
+"visualització de Calendari."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "«{0}» és una font de calendari a la qual no és permès escriure-hi. Canvieu a "
-"la visualització de calendari i ressalteu un calendari que pugui acceptar "
+"la visualització de calendari i seleccioneu un calendari que pugui acceptar "
 "cites."
 
 #: ../calendar/calendar.error.xml.h:5
@@ -4226,19 +4243,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Segur que voleu suprimir aquesta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Segur que voleu suprimir aquesta reunió?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Segur que voleu suprimir aquesta anotació?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Segur que voleu suprimir aquesta tasca?"
@@ -4260,9 +4277,8 @@ msgid "Cannot create a new event"
 msgstr "No es pot crear un esdeveniment nou"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Cannot save event"
-msgstr "No es pot crear un esdeveniment nou"
+msgstr "No es pot desar l'esdeveniment"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
@@ -4395,8 +4411,9 @@ msgid "The calendar is not marked for offline usage."
 msgstr "No s'ha marcat el calendari per a l'ús en mode fora de línia."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "No s'ha marcat la llista d'anotacions per a l'ús en mode fora de línia"
+msgid "The memo list is not marked for offline usage."
+msgstr ""
+"No s'ha marcat la llista d'anotacions per a l'ús en mode fora de línia."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4487,12 +4504,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Fins que no reinicieu l'Evolution no estaran disponibles les tasques."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Descarta els canvis"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Desa"
 
@@ -4501,8 +4517,8 @@ msgid "_Save Changes"
 msgstr "De_sa els canvis"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:145
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../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 "_Envia"
 
@@ -4515,55 +4531,56 @@ msgstr "E_nvia l'avís"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Divideix els esdeveniments de múltiples dies:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "No s'ha pogut iniciar l'evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de calendari del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'anotacions del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "No s'ha pogut escriure el bloc d'aplicació d'anotacions del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Prioritat predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de tasques del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de tasques del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendari i tasques"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendaris"
 
@@ -4605,25 +4622,25 @@ msgid "Memo_s"
 msgstr "Anotacion_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1698 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "Anotacions"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1570 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../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: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 "Tasques"
@@ -4641,25 +4658,26 @@ msgstr "_Tasques"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servei de notificació per alarma del calendari de l'Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: ../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:396
+#: ../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:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Hora d'inici"
 
@@ -4670,9 +4688,9 @@ msgstr "Cites"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ubicació:"
@@ -4682,15 +4700,15 @@ msgid "Snooze _time:"
 msgstr "_Temps de migdiada:"
 
 #: ../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:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../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 "_Edita"
 
@@ -4702,32 +4720,32 @@ msgstr "Mi_gdiada"
 msgid "location of appointment"
 msgstr "ubicació de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "No hi ha cap descripció disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "No hi ha cap informació d'ubicació disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Teniu %d alarmes."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Avís"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4739,7 +4757,7 @@ msgstr ""
 "es va configurar per a enviar un correu. En lloc d'això, \n"
 "l'Evolution mostrarà un quadre de diàleg de recordatori normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4756,15 +4774,15 @@ msgstr ""
 "\n"
 "Segur que voleu executar-lo?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "No em facis més preguntes sobre aquest programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4772,13 +4790,13 @@ msgstr ""
 "No s'ha pogut crear la fàbrica de serveis de notificació per alarma. Potser "
 "ja s'està executant..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "l'hora no es 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:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4786,8 +4804,8 @@ 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:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4797,8 +4815,8 @@ msgstr[1] "%d minuts"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5055,12 +5073,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostra el camp d'estat a l'editor d'esdeveniments/tasques/reunions"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Mostra la subfinestra «Previsualització»"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Mostra la subfinestra «Previsualització»."
 
@@ -5113,7 +5131,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "L'última vegada que es va executar l'alarma, en time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Fus horari"
 
@@ -5137,8 +5155,8 @@ msgstr "Unitats per al recordatori predeterminat, «minuts», «hores» o «dies
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Unitats per a determinar quan s'han d'amagar les tasques, «minuts», «hores» "
-"o «dies»."
+"Unitats per a determinar quan s'han d'amagar les tasques, «minuts», «hores» o "
+"«dies»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -5265,66 +5283,66 @@ msgstr "Minut d'inici de la jornada laboral"
 msgid "daylight savings time"
 msgstr "horari d'estiu"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "El resum conté"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "La descripció conté"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "La categoria és"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "El comentari conté"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "La ubicació conté"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Sense coincidència"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Tasques dels propers 7 dies"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Tasques actives"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Tasques vençudes"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Tasques completades"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tasques amb fitxers adjunts"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Cites actives"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Cites dels propers 7 dies"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Imprimeix"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5333,15 +5351,16 @@ msgstr ""
 "Aquesta operació suprimirà tots els esdeveniments anteriors a l'interval de "
 "temps seleccionat; si continueu no podreu recuperar-los."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Buida els esdeveniments anteriors a"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
+#: ../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 "dies"
@@ -5351,132 +5370,312 @@ msgstr "dies"
 #. 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:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
+#: ../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 "A Internet"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversaris i commemoracions"
 
 #. 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 "Temps"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "Calendari no_u"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1045 ../mail/em-folder-tree.c:2101
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Propietats"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "No s'han pogut actualitzar els calendaris."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "No s'ha pogut obrir el calendari «%s» per a crear-hi esdeveniments i reunions"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hi ha cap calendari disponible per a crear esdeveniment i reunions"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Selector de la font del calendari"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Cita nova"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "Cit_a"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crea una cita nova"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Reunió nova"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "R_eunió"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crea una sol·licitud de reunió nova"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Cita de tot el dia nova"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "Cita de tot el _dia"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita de tot el dia nova"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Calendari nou"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "Cale_ndari"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crea un calendari nou"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Visualització diària"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Visualització de setmana laborable"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Visualització setmanal"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Visualització mensual"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Qualsevol camp"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Fitxers adjunts"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Assistents"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Negocis"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Categoria"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classificació"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competició"
+
+#: ../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/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ó"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "La descripció conté"
 
-#: ../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:22
+msgid "Do Not Exist"
+msgstr "No existeix"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existeix"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Preferits"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Regals"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Fites/Objectius"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vacances"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Postals"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contactes importants"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Idees"
+
+#: ../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 "Client important"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Miscel·lània"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Els propers 7 dies"
+
+#: ../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 "Organitzador"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Trucades"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privat"
+
+#: ../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:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Públic"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Periodicitat"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estat"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Estratègies"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Resum"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "El resum conté"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Proveïdors"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Temps i despeses"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "Personalitat"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "En espera"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "conté"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "no conté"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "és"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "no és"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "S'ha produït un error en obrir el calendari"
@@ -5489,11 +5688,11 @@ msgstr "S'ha trobat un mètode no compatible en obrir el calendari"
 msgid "Permission denied to open the calendar"
 msgstr "No teniu permís per a obrir el calendari"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Edita l'alarma"
 
@@ -5526,17 +5725,17 @@ msgid "Mes_sage:"
 msgstr "Mi_ssatge:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Reprodueix un so"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Mostra una alerta emergent"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Executa un programa"
 
@@ -5549,7 +5748,7 @@ msgid "Send To:"
 msgstr "Envia a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Envia un correu electrònic"
 
@@ -5604,7 +5803,7 @@ msgstr "minuts"
 msgid "start of appointment"
 msgstr "inici de la cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Acció/activador"
 
@@ -5615,16 +5814,15 @@ msgstr "A_fegeix"
 #: ../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 "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggereix visualitzar l'adjunció automàticament"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Adjunta fitxers"
 
@@ -5695,8 +5893,8 @@ msgid "Display"
 msgstr "Visualització"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "divendres"
 
@@ -5713,8 +5911,8 @@ msgstr ""
 
 # Apareix al mig d'una frase, per això ha d'anar en minúscula (dpm)
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "dilluns"
 
@@ -5738,7 +5936,7 @@ msgstr ""
 "diumenge"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Seleccioneu un color"
 
@@ -5748,8 +5946,8 @@ msgid "S_un"
 msgstr "d_g"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -5766,8 +5964,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostra el _número de setmana en el navegador de dates"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -5785,13 +5983,13 @@ msgid "Template:"
 msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Dijous"
 
 #: ../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 "Fu_s horari:"
 
@@ -5800,14 +5998,14 @@ msgid "Time format:"
 msgstr "Format de l'hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dimarts"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -5887,325 +6085,466 @@ msgstr "d_c"
 msgid "before every appointment"
 msgstr "abans de cada cita"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Copi_a el contingut dels calendaris localment per a treballar fora de línia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_ia localment el contingut de la llista de tasques per a treballar fora "
 "de línia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Cop_ia localment el contingut de la llista d'anotacions per a treballar fora "
 "de línia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "C_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Llista de tasques"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Llista d'anotacions"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Propietats del calendari"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Calendari nou"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Propietats de la llista de tasques"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
-msgstr "Llista de tasques _nova"
+msgstr "Llista de tasques nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
-msgstr "Propietats de la llista de tasques"
+msgstr "Propietats de la llista d'anotacions"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Llista d'anotacions nova"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "S'ha suprimit l'esdeveniment."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "S'ha suprimit la tasca."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "S'ha suprimit l'anotació."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Heu realitzat canvis. Voleu desfer els canvis i tancar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No heu realitzat cap canvi, voleu tancar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "S'ha modificat l'esdeveniment."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "S'ha modificat la tasca."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "S'ha modificat l'anotació."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No heu realitzat cap canvi, voleu actualitzar l'editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "S'ha produït un error de validació: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Completada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Completada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Venciment "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Venciment "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Missatge adjunt - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1723
-#: ../composer/e-msg-composer.c:1942
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Missatge adjunt"
 msgstr[1] "%d missatges adjunts"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2010
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mou"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cance_l·la l'arrossegament"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "adjunció"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "No s'ha pogut actualitzar l'objecte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Edita la cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunió - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tasca assignada - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Tasca - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Anotació - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Sense resum"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Feu clic per a tancar la finestra actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Copia el text seleccionat al porta-retalls"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Retalla el text seleccionat al porta-retalls"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Feu clic per a veure l'ajuda disponible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Enganxa el text del porta-retalls"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Feu clic per a desar la finestra actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Selecciona tot el text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Classificació"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Fitxer"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Insereix"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Opcions"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "_Visualitza"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "Fitxer _adjunt..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Feu clic per a adjuntar un fitxer"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Commuta la visualització de categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Fus h_orari"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Commuta la visualització del fus horari"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Pú_blic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Classifica com a públic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Classifica com a privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Classifica com a confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "Camp del r_ol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Commuta la visualització del camp del rol"
+
+# Prové de «Répondez s'il-vous-plaît» (dpm)
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "Esperem la vostra _resposta"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Commuta si s'ha de mostrar el camp RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "Camp d'e_stat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Commuta la visualització del camp d'estat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "Camp de _tipus"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Commuta la visualització del camp del tipus d'assistent"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "Documents _recents"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Adjunta"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fitxer adjunt"
 msgstr[1] "<b>%d</b> fitxers adjunts"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Amaga la _barra d'adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Mostra la barra _d'adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1044
+#: ../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
 #: ../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 "Sup_rimeix"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../composer/e-msg-composer.c:1047
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1046
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Afegeix una adjunció..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Mostra les adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Premeu la barra d'espai per a commutar la barra d'adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Edita la cita"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunió - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tasca assignada - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Tasca - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Anotació - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "Sense resum"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Els canvis realitzats en aquest element es descartaran en produir-se una "
 "actualització"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "No s'ha pogut utilitzar la versió actual"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "No s'ha pogut obrir la font"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "No s'ha pogut obrir la destinació"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "La destinació és de només lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Voleu suprimir aquest element _de totes les bústies dels altres destinataris?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'anotació perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'element perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir la tasca perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'anotació perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'element perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'anotació perquè s'ha produït un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'element perquè s'ha produït un error"
 
@@ -6214,7 +6553,7 @@ msgid "Contacts..."
 msgstr "Contactes..."
 
 #: ../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 "Delega a:"
 
@@ -6222,136 +6561,184 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Introduïu el delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../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 ""
+"Feu clic aquí per a seleccionar o desfer la selecció d'alarmes per a "
+"l'esdeveniment"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Periodicitat"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Fes-lo un esdeveniment periòdic"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opcions d'enviament"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Insereix opcions avançades d'enviament"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "Esdeveniment de tot el _dia"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Commuta per tenir l'esdeveniment tot el dia"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Mostra el temps com a _ocupat"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Commuta la visualització del temps com a ocupat"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Lliure/ocupat:"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Sol·licita la informació de lliure/ocupat dels assistents"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Ci_ta"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Periodicitat"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Aquest esdeveniment té alarmes"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganitzador:"
 
 # FIXME: [l10n-bug] (dpm)
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "De_legats"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Assist_ents"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "L'esdeveniment no té data d'inici"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "L'esdeveniment no té data de finalització"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "La data d'inici és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "La data de finalització és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "L'hora d'inici és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "L'hora de finalització és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "L'organitzador seleccionat ja no té cap compte."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Cal un organitzador."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Cal un assistent com a mínim."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Afegeix "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No s'ha pogut obrir el calendari «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Esteu actuant en representació de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia abans de la cita"
 msgstr[1] "%d dies abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora abans de la cita"
 msgstr[1] "%d hores abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut abans de la cita"
 msgstr[1] "%d minuts abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personalitza"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
-#: ../widgets/misc/e-signature-combo-box.c:69
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "Cap"
 
@@ -6376,23 +6763,25 @@ msgid "Custom Alarm:"
 msgstr "Alarma personalitzada:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escripció:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Descripció de l'esdeveniment"
 
-#: ../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 "Resu_m:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../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ó:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Temps:"
@@ -6423,28 +6812,24 @@ msgstr "Can_via l'organitzador"
 msgid "Co_ntacts..."
 msgstr "Co_ntactes..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organitzador"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organitzador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Anotació"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No s'han pogut obrir les anotacions a «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "Per a"
 
@@ -6457,63 +6842,59 @@ msgstr "Data d'ini_ci:"
 msgid "T_o:"
 msgstr "_A:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descripció:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grup:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Esteu modificant un esdeveniment periòdic. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Esteu delegant un esdeveniment periòdic. Què voleu delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Esteu modificant una tasca periòdica. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Esteu modificant una anotació periòdica. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Només aquest cas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Aquests casos i els anteriors"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Aquests casos i els futurs"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Tots els casos"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Aquesta cita conté periodicitats que l'Evolution no pot editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "La data de periodicitat no és 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "el"
 
@@ -6521,7 +6902,7 @@ msgstr "el"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primer"
 
@@ -6530,7 +6911,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "segon"
 
@@ -6538,7 +6919,7 @@ msgstr "segon"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tercer"
 
@@ -6546,7 +6927,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "quart"
 
@@ -6554,13 +6935,13 @@ msgstr "quart"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "últim"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Un altra data"
 
@@ -6568,7 +6949,7 @@ msgstr "Un altra 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "de l'1 al 10"
 
@@ -6576,7 +6957,7 @@ msgstr "de l'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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "de l'11 al 20"
 
@@ -6584,45 +6965,45 @@ msgstr "de l'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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "dia"
 
 #. 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "al"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "aparicions"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Afegeix una excepció"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "No s'ha pogut obtenir una selecció per a modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modifica l'excepció"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "No s'ha pogut obtenir una selecció per a suprimir."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Data/hora"
 
@@ -6673,12 +7054,12 @@ msgstr "setmanes"
 msgid "year(s)"
 msgstr "anys"
 
-#: ../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 "La data de finalització és errònia"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Pàgina web"
 
@@ -6693,51 +7074,55 @@ msgstr "<span weight=\"bold\">Estat</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:252
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Completada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "En procés"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "No s'ha iniciat"
 
@@ -6750,7 +7135,7 @@ msgid "Stat_us:"
 msgstr "_Estat:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "No s'ha definit"
 
@@ -6767,25 +7152,38 @@ msgstr "_Prioritat:"
 msgid "_Web Page:"
 msgstr "Pàgina _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "Detalls de l'e_stat"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr ""
+"Feu clic per a canviar o visualitzar els detalls de l'estat de la tasca"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "_Opcions d'enviament"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Tasca"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Detalls de la tasca"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organit_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "La data de venciment és errònia"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No s'han pogut obrir les tasques a «%s»."
@@ -6799,19 +7197,15 @@ msgid "Categor_ies..."
 msgstr "Ca_tegories..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "Desc_ripció:"
+msgid "D_ue date:"
+msgstr "_Data de venciment:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fus horari:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Data de venciment:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6819,142 +7213,126 @@ msgstr[0] "%d dia"
 msgstr[1] "%d dies"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d setmana"
 msgstr[1] "%d setmanes"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Es desconeix l'acció a realitzar"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s abans de començar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s després de començar la cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s en començar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s abans de finalitzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s després de la cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s en finalitzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s per a un tipus d'activador desconegut"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Feu clic per a obrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../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:857
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../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'inici:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../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ó:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Pàgina web:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../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 "Resum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Data de venciment:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioritat:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Públic"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privat"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidencial"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data de finalització"
@@ -6964,21 +7342,14 @@ msgstr "Data de finalització"
 msgid "Start Date"
 msgstr "Data d'inici"
 
-#: ../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:365
-msgid "Summary"
-msgstr "Resum"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Lliure"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Ocupat"
 
@@ -6992,67 +7363,67 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../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
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Es desconeix"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Periòdic"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Assignat"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccioneu la carpeta on desar les adjuncions..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imatge_sense_nom.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "De_fineix-la com a fons"
 
@@ -7060,131 +7431,157 @@ msgstr "De_fineix-la com a fons"
 msgid "_Save Selected"
 msgstr "D_esa els seleccionats"
 
-#: ../calendar/gui/e-cal-popup.c:439 ../mail/em-popup.c:853
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Sense resum *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organitzador: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organitzador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Comença:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Venciment:"
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:679 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:809 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1235 ../calendar/gui/e-memo-table.c:821
+#: ../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:277
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "_Tasca nova"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Obre una pàgina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Im_primeix..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Re_talla"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1674
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Engan_xa"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "R_eenvia com a iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca les tasques seleccionades com a acabades"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marca com a incomplet"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marca les tasques seleccionades com a incompletes"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix les tasques selecciona_des"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Feu clic per a afegir una tasca"
@@ -7207,7 +7604,8 @@ msgid "Due date"
 msgstr "Data de venciment"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -7215,127 +7613,108 @@ msgstr "Prioritat"
 msgid "Start date"
 msgstr "Data d'inici"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Estat"
-
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Desplaçament d'elements"
 
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Còpia d'elements"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Cit_a nova..."
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "_Esdeveniment de tot el dia nou"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Re_unió nova"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "Visualització a_ctual"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Selecciona av_ui"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Seleccioneu una data..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Im_primeix..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delega una reunió..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "Planifica una _reunió..."
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Respon"
 
-#: ../calendar/gui/e-calendar-view.c:1703 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Respon a _tots"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Per_met moure aquesta aparició"
 
-#: ../calendar/gui/e-calendar-view.c:1709 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2232
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organitzador: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2236
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organitzador: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2252 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Ubicació: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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"
@@ -7360,44 +7739,34 @@ msgstr "%02i divisions de minut"
 #. 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:837 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1549
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 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:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:789 ../calendar/gui/e-week-view.c:524
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (periodicitat complexa)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada dia"
 msgstr[1] "Cada %d dies"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7405,9 +7774,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Cada setmana"
 msgstr[1] "Cada %d setmanes"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7415,51 +7782,35 @@ msgstr[0] "Cada setmana el "
 msgstr[1] "Cada %d setmanes el "
 
 #. 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 " i "
 
-#. 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 "El %s dia de "
 
-#. 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 "El %s %s de "
 
-#. 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
+#: ../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 mesos"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada any"
 msgstr[1] "Cada %d anys"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7467,341 +7818,341 @@ msgstr[0] " una vegada"
 msgstr[1] " un total de %d vegades"
 
 #. 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 ", finalitza el "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Comença"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Acaba"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Venciment"
 
-#: ../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 "Informació de l'iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Error de l'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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 desconeguda"
 
 #. 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>Reviseu la informació següent i seleccioneu una acció del menú de sota."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../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:2034
 msgid "Accepted"
 msgstr "Acceptat"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Acceptat provisionalment"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../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:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../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:2040
 msgid "Declined"
 msgstr "Declinat"
 
-#: ../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 ""
 "S'ha cancel·lat la reunió, tot i que no s'ha trobat als vostres calendaris"
 
-#: ../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 ""
 "S'ha cancel·lat la tasca, tot i que no s'ha trobat a la vostra llista de "
 "tasques"
 
-#: ../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 "En/na <b>%s</b> ha publicat la informació de la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informació de la reunió"
 
-#: ../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 "En/na <b>%s</b> sol·licita la presència de %s a la reunió."
 
-#: ../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 "En/na <b>%s</b> sol·licita la vostra presència a una reunió."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposició de reunió"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Actualització de la reunió"
 
-#: ../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 "En/na <b>%s</b> voldria rebre l'última informació de la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Sol·licitud d'actualització de la reunió"
 
-#: ../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 "En/na <b>%s</b> ha contestat a la sol·licitud d'una reunió."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Resposta de la reunió"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "En/na <b>%s</b> ha cancel·lat la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Cancel·lació de la reunió"
 
-#: ../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 "En/na <b>%s</b> ha enviat un missatge inintel·ligible."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Missatge de reunió erroni"
 
-#: ../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 "En/na <b>%s</b> ha publicat la informació de la tasca."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informació de la tasca"
 
-#: ../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 "En/na <b>%s</b> sol·licita que en/na %s realitzi una tasca."
 
-#: ../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 "En/na <b>%s</b> us sol·licita que realitzeu una tasca."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Proposició d'una tasca"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Actualització de la tasca"
 
-#: ../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 "En/na <b>%s</b> voldria rebre l'última informació de la tasca."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Sol·licitud d'actualització de la tasca"
 
-#: ../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 "En/na <b>%s</b> ha contestat a l'assignació d'una tasca."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Resposta de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "En/na <b>%s</b> ha cancel·lat la tasca."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Cancel·lació de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Missatge de tasca erroni"
 
-#: ../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 "En/na <b>%s</b> ha publicat la informació de lliure/ocupat."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Informació de lliure/ocupat"
 
-#: ../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 "En/na <b>%s</b> us sol·licita la informació de lliure/ocupat."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Sol·licitud de lliure/ocupat"
 
-#: ../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 "En/na <b>%s</b> ha contestat a la sol·licitud de lliure/ocupat."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Resposta de lliure/ocupat"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Missatge de lliure/ocupat erroni"
 
-#: ../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 "El missatge no està ben format"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "El missatge només conté sol·licituds no compatibles."
 
-#: ../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 "L'adjunció no conté cap missatge de calendari vàlid"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "El fitxer adjunt no té cap element de calendari visualitzable"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "S'ha completat l'actualització\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objecte no és vàlid i no es pot actualitzar\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Aquesta resposta no està associada a cap assistent actual. Voleu afegir-lo "
 "com a assistent?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "No s'ha pogut actualitzar l'estat de l'assistent perquè l'estat és no vàlid\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "S'ha actualitzat l'estat de l'assistent\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "No es pot actualitzar l'estat de l'assistent perquè l'element ja no existeix"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "S'ha enviat l'element.\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "No s'ha pogut enviar l'element.\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Escolliu una acció:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Accepta"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Accepta provisionalment"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Declina"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Envia la informació lliure/ocupat"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Actualitza l'estat de la resposta"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Envia l'última informació"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -7830,113 +8181,113 @@ msgstr "S'està carregant el calendari..."
 msgid "Server Message:"
 msgstr "Missatge del servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Presidents"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Participants obligatoris"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Participants opcionals"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Assistents"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Grup"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Recurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Habitació"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "President"
 
-#: ../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-store.c:744 ../calendar/gui/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Participant obligatori"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Participant opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "No hi participa"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../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 "Precisa una acció"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../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
 msgid "Tentative"
 msgstr "Provisionalment"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../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
 msgid "Delegated"
 msgstr "Delegat"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Assistent"
 
 # Prové de «Répondez s'il-vous-plaît» (dpm)
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Esperem la vostra resposta"
 
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "En procés"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7944,85 +8295,81 @@ 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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Cap informació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Ass_istents..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_pcions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "M_ostra només les hores de treball"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "Tria _automàtica"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Pe_rsones necessàries"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Assistents"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Feu clic per a afegir un assistent"
@@ -8055,8 +8402,8 @@ msgstr "Suprimeix les anotacions selecciona_des"
 msgid "Click to add a memo"
 msgstr "Feu clic per a afegir una anotació"
 
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2860
+#: ../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"
@@ -8065,84 +8412,80 @@ msgstr ""
 "S'ha produït un error en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "S'estan carregant les anotacions"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "S'estan obrint les anotacions a %s"
 
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "S'estan suprimint els objectes seleccionats..."
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "S'estan carregant les tasques"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan obrint les tasques a %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "S'estan acabant les tasques..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "S'està buidant"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Seleccioneu un fus horari"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:339 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:825
-msgid "Updating query"
-msgstr "S'està actualitzant la consulta"
-
-#: ../calendar/gui/gnome-cal.c:2497
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Visualització personalitzada"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "De_sa la visualització personalitzada"
 
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Defineix les visualitzacions..."
 
-#: ../calendar/gui/gnome-cal.c:2684
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "S'estan carregant les cites a %s"
 
-#: ../calendar/gui/gnome-cal.c:2703
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "S'estan carregant les tasques a %s"
 
-#: ../calendar/gui/gnome-cal.c:2712
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "S'estan carregant les anotacions a %s"
 
-#: ../calendar/gui/gnome-cal.c:2819
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
-#: ../calendar/gui/gnome-cal.c:3776
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "S'està buidant"
 
@@ -8202,57 +8545,57 @@ msgstr "setembre"
 msgid "_Select Today"
 msgstr "_Selecciona avui"
 
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../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 "S'ha d'especificar un organitzador."
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Cal un assistent com a mínim"
 
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Informació de l'esdeveniment"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informació de la tasca"
 
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Informació de l'anotació"
 
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Informació lliure/ocupat"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informació del calendari"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Actualitzat"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Refresca"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informació lliure/ocupat (%s a %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Informació de l'iCalendar"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Heu de ser un assistent de l'esdeveniment."
 
@@ -8293,47 +8636,39 @@ msgstr "No hi ha cap calendari disponible per a crear anotacions"
 msgid "Memo Source Selector"
 msgstr "Selector de font d'anotacions"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Anotació nova"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "An_otació"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crea una anotació nova"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Anotació compartida nova"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "Anotació _compartida"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crea una anotació compartida nova"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Llista d'anotacions nova"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Ll_ista d'anotacions"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crea una llista d'anotacions nova"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Imprimeix anotacions"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Els propers 7 dies"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8345,7 +8680,7 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les carpetes..."
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8358,7 +8693,7 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes..."
 
 #. 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 ""
@@ -8366,21 +8701,21 @@ msgstr ""
 "xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "No s'ha pogut actualitzar el calendari «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "No s'han pogut actualitzar les tasques «%s»"
 
-#: ../calendar/gui/migration.c:1232
-#: ../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
+#: ../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"
 
@@ -8537,57 +8872,52 @@ msgstr "dv"
 msgid "Sa"
 msgstr "ds"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tasca"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Resum: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Assistents: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritat: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentatge completat: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contactes:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Properes cites"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "Llista de tasques _nova"
@@ -8616,39 +8946,31 @@ msgstr "No hi ha cap calendari disponible per a crear tasques"
 msgid "Task Source Selector"
 msgstr "Selector de font de la tasca"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Tasca nova"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crea una tasca nova"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Tasca assignada nova"
 
 #: ../calendar/gui/tasks-component.c:1335
-msgid "Assigne_d Task"
-msgstr "Tasca assigna_da"
-
-#: ../calendar/gui/tasks-component.c:1336
 msgid "Create a new assigned task"
 msgstr "Crea una tasca assignada nova"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Llista de tasques nova"
 
 #: ../calendar/gui/tasks-component.c:1343
-msgid "Tas_k list"
-msgstr "Llista de tas_ques"
-
-#: ../calendar/gui/tasks-component.c:1344
 msgid "Create a new task list"
 msgstr "Crea una llista de tasques nova"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8660,1596 +8982,1635 @@ msgstr ""
 "\n"
 "Segur que voleu suprimir aquestes tasques?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "No m'ho tornis a demanar."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Imprimeix les tasques"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% acabat"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "S'ha cancel·lat"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "En procés"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "és més gran que"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "és més petita que"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Cites i reunions"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Calendari d'apertura"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Fitxers de l'iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Importador de l'iCalendar de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Recordatori"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Fitxers del vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Importador del vCalendar de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Esdeveniments del calendari"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intel·ligent del calendari de l'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 "Àfrica/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Àfrica/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Àfrica/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Àfrica/Algiers"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Àfrica/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Àfrica/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Àfrica/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Àfrica/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Àfrica/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Àfrica/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Àfrica/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Àfrica/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Àfrica/Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Àfrica/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Àfrica/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Àfrica/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Àfrica/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Àfrica/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Àfrica/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Àfrica/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Àfrica/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Àfrica/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Àfrica/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Àfrica/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Àfrica/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Àfrica/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Àfrica/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Àfrica/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Àfrica/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Àfrica/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Àfrica/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Àfrica/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Àfrica/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Àfrica/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Àfrica/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Àfrica/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Àfrica/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Àfrica/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Àfrica/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Àfrica/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Àfrica/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Àfrica/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Àfrica/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Àfrica/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Àfrica/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Àfrica/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Àfrica/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Àfrica/Sao_Tomé"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Àfrica/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Àfrica/Trípoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Àfrica/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Àfrica/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Amèrica/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Amèrica/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Amèrica/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amèrica/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Amèrica/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Amèrica/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Amèrica/Asunción"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Amèrica/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Amèrica/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Amèrica/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Amèrica/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Amèrica/Bogotà"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Amèrica/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Amèrica/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Amèrica/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Amèrica/Cancún"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Amèrica/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Amèrica/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Amèrica/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Amèrica/Caiman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Amèrica/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Amèrica/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Amèrica/Córdoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Amèrica/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Amèrica/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Amèrica/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Amèrica/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Amèrica/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Amèrica/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Amèrica/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Amèrica/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Amèrica/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Amèrica/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Amèrica/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Amèrica/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Amèrica/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Amèrica/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Amèrica/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Amèrica/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Amèrica/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Amèrica/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Amèrica/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Amèrica/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Amèrica/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Amèrica/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Amèrica/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Amèrica/L'Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Amèrica/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Amèrica/Indiana/Indianàpolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amèrica/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amèrica/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amèrica/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amèrica/Indianàpolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Amèrica/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Amèrica/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Amèrica/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Amèrica/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Amèrica/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Amèrica/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Amèrica/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Amèrica/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Amèrica/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Amèrica/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Amèrica/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Amèrica/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Amèrica/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Amèrica/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Amèrica/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Amèrica/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Amèrica/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Amèrica/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Amèrica/Mérida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Amèrica/Ciutat_de_Mèxic"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amèrica/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amèrica/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Amèrica/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Amèrica/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Amèrica/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Amèrica/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Amèrica/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Amèrica/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Amèrica/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Amèrica/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Amèrica/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Amèrica/Panamà"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Amèrica/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Amèrica/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Amèrica/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Amèrica/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Amèrica/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Amèrica/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Amèrica/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Amèrica/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Amèrica/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Amèrica/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Amèrica/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Amèrica/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Amèrica/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Amèrica/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Amèrica/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Amèrica/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Amèrica/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Amèrica/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Amèrica/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Amèrica/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Amèrica/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Amèrica/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Amèrica/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Amèrica/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Amèrica/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Amèrica/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Amèrica/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Amèrica/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Amèrica/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Amèrica/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Amèric/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Amèrica/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Amèrica/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antàrtida/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antàrtida/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antàrtida/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antàrtida/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antàrtida/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antàrtida/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antàrtida/Pol_Sud"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antàrtida/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antàrtida/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Àrtic/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Àsia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Àsia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Àsia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Àsia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Àsia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Àsia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Àsia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Àsia/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Àsia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Àsia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Àsia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Àsia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Àsia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Àsia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Àsia/Calcuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Àsia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Àsia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Àsia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Àsia/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Àsia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Àsia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Àsia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Àsia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Àsia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Àsia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Àsia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Àsia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Àsia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Àsia/Istambul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Àsia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Àsia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Àsia/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Àsia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Àsia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Àsia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Àsia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Àsia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Àsia/Krasnojarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Àsia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Àsia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Àsia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Àsia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Àsia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Àsia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Àsia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Àsia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Àsia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Àsia/Nicòsia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Àsia/Novosibrisk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Àsia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Àsia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Àsia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Àsia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Àsia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Àsia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Àsia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Àsia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Àsia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Àsia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Àsia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Àsia/Samarcanda"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Àsia/Seül"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Àsia/Shangai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Àsia/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Àsia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Àsia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Àsia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Àsia/Teheran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Àsia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Àsia/Tòkio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Àsia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Àsia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Àsia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Àsia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Àsia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Àsia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Àsia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Àsia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlàntic/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlàntic/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlàntic/Canàries"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlàntic/Cap_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlàntic/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlàntic/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlàntic/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlàntic/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlàntic/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlàntic/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlàntic/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Austràlia/Adelaida"
 
-#: ../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/Sidney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Àmsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atenes"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlín"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Brusel·les"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublín"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istambul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisbon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Mònaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moscou"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/París"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallin"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticà"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsaw"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zuric"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "�ndic/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "�ndic/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "�ndic/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "�ndic/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "�ndic/Comores"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "�ndic/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "�ndic/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "�ndic/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "�ndic/Maurici"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "�ndic/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "�ndic/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacífic/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacífic/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacífic/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacífic/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacífic/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacífic/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacífic/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacífic/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacífic/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacífic/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacífic/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífic/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacífic/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacífic/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacífic/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacífic/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacífic/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacífic/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacífic/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacífic/Marqueses"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacífic/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacífic/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacífic/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacífic/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacífic/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífic/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacífic/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacífic/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacífic/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífic/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacífic/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacífic/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacífic/Tahití"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacífic/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacífic/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacífic/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacífic/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacífic/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacífic/Yap"
 
 #: ../composer/e-composer-autosave.c:275
-#, fuzzy
 msgid "Could not open autosave file"
-msgstr "No es pot obrir el fitxer"
+msgstr "No es pot obrir el fitxer de desament automàtic"
 
 #: ../composer/e-composer-autosave.c:282
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge de l'editor"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Insereix un fitxer adjunt"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "Adjun_ta"
 
@@ -10257,199 +10618,184 @@ msgstr "Adjun_ta"
 msgid "Untitled Message"
 msgstr "Missatges sense títol"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "Fitxer _adjunt..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-subscribe.xml.h:9
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "Tan_ca"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../composer/e-composer-actions.c:473
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primeix..."
 
-#: ../composer/e-composer-actions.c:485 ../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_visualització d'impressió"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Desa el fitxer actual"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "_Anomena i desa..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Desa el fitxer actual amb un nom diferent"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "_Desa com a esborrany"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Desa com a esborrany"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "E_nvia"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Envia aquest missatge"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Opcions d'enviament"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Insereix opcions d'enviament"
 
-#: ../composer/e-composer-actions.c:529
-#, fuzzy
-msgid "Character _Encoding"
-msgstr "Codificació dels caràcters"
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "_Missatge nou"
 
 #: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Obre la finestra de missatge nou"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "_Codificació dels caràcters"
+
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Seguretat"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "_Xifra amb PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Xifra aquest missatge amb el PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "_Signa amb PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Signa aquest missatge amb la vostra clau PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Prioritza el missatge"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Estableix el missatge a prioritat alta"
 
-#: ../composer/e-composer-actions.c:570
-#, fuzzy
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "Sol·licita la confirmació de l_ectura"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Obteniu una notificació d'entrega quan es llegeixi el missatge"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "Xi_fra amb S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Xifra aquest missatge amb el vostre certificat de xifratge S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "Si_gna amb S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signa aquest missatge amb el vostre certificat de signatures S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "Camp _CCO"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commuta la visualització del camp «CCO»"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "Camp _CC"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commuta la visualització del camp «CC»"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "Camp _De"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commuta la visualització del camp «De»"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "Cam_p Envia-a"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Commuta la visualització del camp «Envia-a»"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Camp _Respon-a"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Commuta la visualització del camp «Respon-a»"
 
-#: ../composer/e-composer-actions.c:634
-#, fuzzy
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
-msgstr "Camp _CC"
+msgstr "Camp de l'_Assumpte"
 
-#: ../composer/e-composer-actions.c:636
-#, fuzzy
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
-msgstr "Commuta la visualització del camp d'estat"
+msgstr "Commuta la visualització del camp de l'Assumpte"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "Camp _Per a"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Commuta la visualització del camp «Per a»"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Adjunta"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Introduïu els destinataris del missatge"
@@ -10498,39 +10844,34 @@ msgstr "Ass_umpte:"
 msgid "Si_gnature:"
 msgstr "Si_gnatura:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Feu clic aquí per a anar a la llibreta d'adreces"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Destinació de l'enviament"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Escolliu a quines carpetes s'enviarà el missatge."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Feu clic per a seleccionar les carpetes on enviar"
 
-#: ../composer/e-composer-private.c:65
-#, fuzzy
-msgid "Recent _Documents"
-msgstr "percentatge fet"
-
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1557
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
 msgid "Show _Attachment Bar"
 msgstr "Mostra la barra _de fitxers adjunts"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:870
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No s'ha pogut signar el missatge de sortida: no s'ha definit cap certificat "
 "de signatura per a aquest compte"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:877
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10538,24 +10879,23 @@ msgstr ""
 "No s'ha pogut xifrar el missatge de sortida: no s'ha definit cap certificat "
 "de xifratge per a aquest compte"
 
-#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1498 ../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
-#, fuzzy
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Fitxer adjunt"
-msgstr[1] "Fitxer adjunt"
+msgstr[1] "Fitxers adjunts"
 
-#: ../composer/e-msg-composer.c:1555
+#: ../composer/e-msg-composer.c:1554
 msgid "Hide _Attachment Bar"
 msgstr "Amaga la _barra de fitxers adjunts"
 
-#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2739
+#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
 msgid "Compose Message"
 msgstr "Redacta un missatge"
 
-#: ../composer/e-msg-composer.c:4029
+#: ../composer/e-msg-composer.c:4053
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10702,23 +11042,27 @@ msgstr "No es pot adjuntar el fitxer «{0}» a aquest missatge."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Heu de configurar un compte abans de poder redactar un correu."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continua amb l'edició"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "N_o el recuperis"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "R_ecupera"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "De_sa el missatge"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Desa l'_esborrany"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Correu i calendari de l'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Aplicacions de treball en grup"
 
@@ -10734,116 +11078,134 @@ msgstr "targeta d'adreça"
 msgid "calendar information"
 msgstr "informació del calendari"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Error de l'Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Avís de l'Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Informació de l'Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Consulta de l'Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error intern, s'ha sol·licitat l'error desconegut «%s»"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Component"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "Nom del component que s'està enregistrant"
+
+#: ../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
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Si el connector està habilitat"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "S'ha produït un error mentre s'estava imprimint"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "El sistema d'impressió ha llistat els detalls següents sobre l'error:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "El sistema d'impressió no ha llistat cap detall addicional sobre l'error."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Because \"{1}\"."
-msgstr "Degut a &quot;{1}&quot;."
+msgstr "Degut a «{1}»."
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr "No es pot obrir el fitxer"
+msgstr "No es pot obrir el fitxer «{0}»."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
-msgstr "No es pot desar el fitxer &quot;{0}&quot;."
+msgstr "No es pot desar el fitxer «{0}»."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "El voleu sobreescriure?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists \"{0}\"."
-msgstr "El fitxer &quot;{0}&quot; ja existeix."
+msgstr "El fitxer «{0}» ja existeix."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:144
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "S_obreescriu"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "No s'ha pogut mostrar l'ajuda de l'Evolution."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "Imp_ortant"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "F_eina"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "P_ersonal"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "P_er fer"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "D_esprés"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Nom de l'etiqueta:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Edita l'etiqueta"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Afegeix una etiqueta"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "En nom de l'etiqueta no pot ser buit."
 
-#: ../e-util/e-util-labels.c:362
-#, fuzzy
+#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10851,13 +11213,13 @@ msgstr ""
 "Ja existeix una etiqueta amb el mateix nom. Hauríeu de tornar-la a anomenar."
 
 #: ../e-util/gconf-bridge.c:1218
-#, fuzzy, c-format
+#, c-format
 msgid "GConf error: %s"
-msgstr "S'ha produït un error del camel: %s"
+msgstr "S'ha produït un error del GConf: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "La resta d'errors es mostraran només al terminal."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10975,65 +11337,65 @@ msgstr "%d/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccioneu amb quina hora es compararà"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Escolliu un fitxer"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Prova"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nom de la _regla:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Troba els elements que compleixen els criteris següents"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "A_fegeix un criteri de filtre"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Si es compleixen tots els criteris"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Si es compleix qualsevol criteri"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Cerca elements:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Tots els relacionats"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Respostes"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Respostes i pares"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Sense resposta o pare"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_nclou els fils"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrada"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Sortida"
 
@@ -11057,7 +11419,7 @@ msgstr "Manca la data."
 msgid "Missing file name."
 msgstr "Manca el nom de fitxer."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:77
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Manca el nom."
 
@@ -11135,7 +11497,7 @@ msgstr "en el futur"
 msgid "months"
 msgstr "mesos"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "segons"
 
@@ -11147,9 +11509,10 @@ msgstr "l'hora actual"
 msgid "the time you specify"
 msgstr "l'hora que indiqueu"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "setmanes"
 
@@ -11165,7 +11528,7 @@ msgstr "Afegeix una regla"
 msgid "Edit Rule"
 msgstr "Edita la regla"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nom de la regla"
 
@@ -11183,7 +11546,7 @@ msgstr ""
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
-"Configureu la correcció ortogràfica, les signatures i el redactor de "
+"Configureu la comprovació ortogràfica, les signatures i el redactor de "
 "missatges"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
@@ -11191,9 +11554,8 @@ msgid "Configure your email accounts here"
 msgstr "Configureu els vostres comptes de correu"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Configure your network connection settings here"
-msgstr "Configureu els vostres comptes de correu"
+msgstr "Configureu els paràmetres de connexió a la xarxa"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
@@ -11220,20 +11582,19 @@ msgid "Evolution Mail preferences control"
 msgstr "Control de preferències de correu de l'Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
 msgid "Evolution Network configuration control"
-msgstr "Control de configuració del calendari de l'Evolution"
+msgstr "Control de configuració de la xarxa de l'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
-#: ../mail/mail-component.c:749
+#: ../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:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correu"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Comptes de correu"
 
@@ -11243,20 +11604,19 @@ msgid "Mail Preferences"
 msgstr "Preferències del correu"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-#, fuzzy
 msgid "Network Preferences"
-msgstr "Preferències"
+msgstr "Preferències de la xarxa"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Correu"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acord de llicència de %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11269,115 +11629,109 @@ msgstr ""
 "per a %s que es mostra a sota\n"
 "i marqueu la casella de verificació per a acceptar-lo\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../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
 msgid "Autogenerated"
 msgstr "Generat automàticament"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Pregunta per cada missatge"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identitat"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recepció de correu"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Comprova si hi ha correu _nou cada"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_ts"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Enviament de correu"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Opcions predeterminades"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Seguretat"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Opcions de recepció"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Comprovació de correu nou"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de comptes"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Auxiliar per als comptes de l'Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Predeterminat]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:978
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:689
-msgid "Enabled"
-msgstr "Habilitat"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Nom del compte"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:299 ../mail/em-composer-prefs.c:434
-#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
+#: ../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 "Sense nom"
 
-#: ../mail/em-composer-prefs.c:982
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Idiomes"
 
-#: ../mail/em-composer-prefs.c:1031
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Afegeix un script de signatura"
 
-#: ../mail/em-composer-prefs.c:1073
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Missatge reenviat --------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "un remitent anònim"
 
 #. 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:1801
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11385,11 +11739,11 @@ msgstr ""
 "El ${AbbrevWeekdayName} ${Day} de ${Month} de ${Year} a les ${24Hour}:"
 "${Minute} ${TimeZone}, en/na ${Sender} va escriure:"
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Missatge original-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Regles del _filtre"
 
@@ -11406,10 +11760,6 @@ msgstr "Assigna el color"
 msgid "Assign Score"
 msgstr "Assigna la puntuació"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Fitxers adjunts"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "CCO"
@@ -11426,10 +11776,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Completat el"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "conté"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copia a carpeta"
@@ -11443,7 +11789,7 @@ msgid "Date sent"
 msgstr "Data d'enviament"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11454,10 +11800,6 @@ msgstr "Suprimeix"
 msgid "Deleted"
 msgstr "Suprimit"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "no conté"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "no acaba amb"
@@ -11478,10 +11820,6 @@ msgstr "no sona com"
 msgid "does not start with"
 msgstr "no comença amb"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "No existeix"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Esborrany"
@@ -11490,10 +11828,6 @@ msgstr "Esborrany"
 msgid "ends with"
 msgstr "acaba amb"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existeix"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existeix"
@@ -11506,14 +11840,10 @@ msgstr "Expressió"
 msgid "Follow Up"
 msgstr "Respondre"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Important"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "és"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "és després de"
@@ -11526,18 +11856,6 @@ msgstr "és abans de"
 msgid "is Flagged"
 msgstr "està senyalat"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "és més gran que"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "és més petita que"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "no és"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "no està senyalat"
@@ -11559,7 +11877,7 @@ msgstr "Correu brossa"
 msgid "Junk Test"
 msgstr "Prova de correu brossa"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11601,7 +11919,7 @@ msgstr "Reprodueix un so"
 
 #. 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:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Llegit"
 
@@ -11673,9 +11991,9 @@ msgstr "comença amb"
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11688,11 +12006,11 @@ msgstr "Desfés la definició de l'estat"
 # gal/e-table/e-table-config.glade.h:16
 # gal/e-table/e-table-config-no-group.glade.h:16
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Llavors"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Afegeix una a_cció"
 
@@ -11736,16 +12054,16 @@ msgstr "Missatges importants"
 msgid "Messages Not Junk"
 msgstr "Missatges que no són brossa"
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Cerca al compte"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Cerca a tots els comptes"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Missatge sense llegir:"
@@ -11753,36 +12071,53 @@ msgstr[1] "Missatges sense llegir:"
 
 #. 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:182
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Missatge en total:"
 msgstr[1] "Missatges en total:"
 
-#: ../mail/em-folder-properties.c:198 ../mail/em-folder-properties.c:200
-#, fuzzy
+# FIXME (dpm)
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota d'utilització d'espai (%s):"
+
+# FIXME (dpm)
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
-msgstr "Missatge en total:"
+msgstr "Quota d'utilització d'espai"
+
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Safata d'entrada"
 
-#: ../mail/em-folder-properties.c:362
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propietats de la carpeta"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<feu clic per a seleccionar una carpeta>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nom de la carpeta:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Carpetes de cerca"
 
@@ -11791,353 +12126,323 @@ msgstr "Carpetes de cerca"
 msgid "UNMATCHED"
 msgstr "Cap concordança"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Esborranys"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Enviat"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "S'està carregant..."
 
-#. 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 "%s (%u)"
-
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Arbre de carpetes de correu"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "S'està movent la carpeta %s"
 
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "S'està copiant la carpeta %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No es poden deixar anar els missatges al magatzem del nivell superior"
 
-#: ../mail/em-folder-tree.c:996 ../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 "_Copia a la carpeta"
 
-#: ../mail/em-folder-tree.c:997 ../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 "_Mou a la carpeta"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan analitzant les carpetes a «%s»"
 
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Visualitza"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Obre e_n una finestra nova"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Carpeta _nova..."
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Mou..."
 
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Can_via el nom..."
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Re_fresca"
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Bui_da la safata de sortida"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:141
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Buida la _paperera"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "S'està copiant «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../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:83
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opia"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "S'està creant la carpeta «%s»"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Crea una carpeta"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:71
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ha fallat la supressió del correu"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No teniu els permisos suficients per a esborrar aquest correu."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
-#: ../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 "_Reenvia"
 
 #. 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:1342 ../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 "_Edita com a missatge nou..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Desfés la su_pressió"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marca com a _no llegit"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marca com a no _important"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marca'l com a bro_ssa"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a brossa"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marca per al se_guiment..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../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:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Cap"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Sen_yala-ho com a completat"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "N_eteja el senyalador"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "C_rea una regla a partir del missatge"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Carpeta de cerca a partir de l'a_ssumpte"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Carpeta de cerca a partir del remite_nt"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Carpeta de cerca a partir dels destinata_ris"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Carpeta de cerca a partir de la _llista de correu"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtre a partir de l'a_ssumpte"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtre a partir del remi_tent"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtre a partir dels _destinataris"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Fil_tre a partir de la llista de correu"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. 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 "Predeterminat"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "No s'ha pogut recuperar el missatge"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "S'està recuperant el missatge..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Truca..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Crea una carpeta de _cerca"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "D'a_questa adreça"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "Per a aques_ta adreça"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Feu clic per a enviar un correu a en/na %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Feu clic per a trucar en/na %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Feu clic per a mostrar/amagar adreces"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "Concordances: %d"
 
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "Ce_rca:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_Següent"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "Concord_ança de majúscules i minúscules"
 
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Sense signar"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12145,11 +12450,11 @@ msgstr ""
 "Aquest missatge no està signat. No hi ha cap garantia que el remitent del "
 "missatge sigui l'autèntic."
 
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "La signatura és vàlida"
 
-#: ../mail/em-format-html-display.c:972
+#: ../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."
@@ -12157,11 +12462,11 @@ msgstr ""
 "Aquest missatge està signat i és vàlid. És molt probable que el remitent del "
 "missatge sigui l'autèntic."
 
-#: ../mail/em-format-html-display.c:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "La signatura no és vàlida"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12169,11 +12474,11 @@ msgstr ""
 "No es pot verificar la signatura del missatge. Pot ser que s'hagi alterat "
 "durant la transmissió."
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "La signatura és vàlida però no es pot verificar el remitent"
 
-#: ../mail/em-format-html-display.c:974
+#: ../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."
@@ -12181,11 +12486,11 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no es pot "
 "verificar el remitent del missatge."
 
-#: ../mail/em-format-html-display.c:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La signatura existeix, però es necessita la clau pública"
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12193,11 +12498,11 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no se li ha "
 "trobat la clau pública corresponent."
 
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Sense xifrar"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12205,11 +12510,11 @@ msgstr ""
 "Aquest missatge no està xifrat. Es podria visualitzar el seu contingut en el "
 "transport per internet."
 
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Xifrat, feble"
 
-#: ../mail/em-format-html-display.c:983
+#: ../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 "
@@ -12220,11 +12525,11 @@ msgstr ""
 "visualitzar el contingut d'aquest missatge en una quantitat de temps "
 "raonable."
 
-#: ../mail/em-format-html-display.c:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Xifrat"
 
-#: ../mail/em-format-html-display.c:984
+#: ../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."
@@ -12232,11 +12537,11 @@ msgstr ""
 "Aquest missatge està xifrat. Seria molt difícil que una persona desconeguda "
 "visualitzés el contingut d'aquest missatge."
 
-#: ../mail/em-format-html-display.c:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Xifrat, fort"
 
-#: ../mail/em-format-html-display.c:985
+#: ../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 "
@@ -12246,93 +12551,93 @@ msgstr ""
 "difícil que alguna persona desconeguda pugui visualitzar el contingut "
 "d'aquest missatge en una quantitat de temps raonable."
 
-#: ../mail/em-format-html-display.c:1086 ../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 "_Visualitza el certificat"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "No es pot visualitzar aquest certificat"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completat el %d de %B del %Y, a les %H:%M"
 
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Vençut:"
 
 # Consulteu man 3 strftime per comprendre aquest format
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pel %d de %B del %Y, a les %H:%M"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "_Visualitza inserit"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "A_maga"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "A_justa a l'amplada"
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "Mostra la mida _original"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "Anomena i desa el fitxer adjunt"
 
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "Seleccioneu la carpeta on desar tots els fitxers adjunts"
 
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "_Desa els seleccionats..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d fi_txer adjunt"
 msgstr[1] "%d fi_txers adjunts"
 
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "_Desa"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "De_sa'ls tots"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "Cap fitxer adjunt"
 
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "Mostra'l sense _format"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "Amaga'l _sense format"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "O_bre amb"
 
-#: ../mail/em-format-html-display.c:2489
+#: ../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 ""
-"L'Evolution no pot mostrar correctament aquest correu perquè és massa llarg. "
+"L'Evolution no pot mostrar correctament aquest correu perquè és massa gros. "
 "Podeu veure'l sense formatar, o amb un editor de text extern."
 
 #: ../mail/em-format-html-print.c:156
@@ -12340,207 +12645,207 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Pàgina %d de %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "S'està obtenint «%s»"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "La part del cos externa és desconeguda."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "La part del cos externa està mal formada."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punter al lloc FTP (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punter a un fitxer local (%s) vàlid al lloc «%s»"
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punter al fitxer local (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punter a dades remotes (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punter a dades externes (tipus «%s»)"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "S'està formatant el missatge"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "S'està formatant el missatge..."
 
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../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:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../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 "CCO"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Generador del correu"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a a les %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1772
+#: ../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:1903
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Aquest missatge fou enviat per <b>%s</b> en nom de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Respon"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../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
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
-#: ../mail/em-format.c:1156
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "fitxer adjunt %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarà com a codi font."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "El tipus de xifratge per a multipart/encrypted no està implementat"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME: error desconegut"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "El format de la signatura no està implementat"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "S'ha produït un error en verificar la contrasenya"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "No s'ha pogut analitzar el missatge PGP"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP: error desconegut"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "cada vegada"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "una vegada al dia"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "una vegada a la setmana"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "una vegada al mes"
 
 # FIXME: s'ha de mirar si és massa llarg (dpm)
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Afegeix una capçalera de correu brossa personalitzada"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Nom de la capçalera:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "El valor de la capçalera conté:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Conté el valor"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Color"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "El connector %s està disponible i el fitxer binari està instal·lat."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -12548,73 +12853,85 @@ msgstr ""
 "El connector %s no està disponible. Comproveu que el seu paquet estigui "
 "instal·lat."
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "No hi ha cap connector de correu brossa disponible"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Per fer"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Més tard"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"La ubicació i la jerarquia de les carpetes de les bústies de correu ha "
-"canviat des de l'Evolution 1.x.\n"
-"\n"
-"Espereu mentre l'Evolution migra les vostres carpetes..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "No es pot crear la carpeta nova «%s»: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "No es pot copiar la carpeta «%s» a «%s»: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "No es poden cercar bústies de correu existents a «%s»: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"La ubicació i la jerarquia de les carpetes de les bústies de correu ha "
+"canviat des de l'Evolution 1.x.\n"
+"\n"
+"Espereu mentre l'Evolution migra les vostres carpetes..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "No s'han pogut obrir les dades velles «%s» POP3 keep-on-server: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "No s'ha pogut crear el directori de dades «%s» POP3 keep-on-server: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "No s'han pogut copiar les dades «%s» POP3 keep-on-server: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "No s'ha pogut crear el magatzem de correu local «%s»: %s"
 
-#: ../mail/em-migrate.c:2852
+#: ../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 ""
+"El format del resum de les carpetes de les bústies de correu de l'Evolution "
+"s'ha convertit a l'Sqlite a partir de la versió 2.24.\n"
+"\n"
+"Espereu mentre l'Evolution migra les vostres carpetes..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "No s'ha pogut crear les carpetes de correu local a «%s»: %s"
 
-#: ../mail/em-migrate.c:2871
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12622,42 +12939,44 @@ msgstr ""
 "No s'ha pogut llegir la configuració de la instal·lació anterior de "
 "l'Evolution. El fitxer «evolution/config.xmldb» no existeix o està malmès."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Respon al remitent"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:874
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Afegeix a la llibreta d'adreces"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "El magatzem no permet subscripcions, o no estan habilitades."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscrit"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Heu de seleccionar un servidor."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "No s'ha seleccionat cap servidor"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "No _tornis a mostrar aquest missatge."
 
@@ -12683,27 +13002,25 @@ msgstr "Afegeix una adreça"
 msgid "Messages from %s"
 msgstr "Missatges de %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Car_petes de cerca"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Origen de la carpeta de cerca"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Send and Receive Mail\" window height"
-msgstr "Envia i rep el correu"
+msgstr "Alçada de la finestra «Envia i rep el correu»"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr ""
+msgstr "Estat de maximització de la finestra «Envia i rep el correu»"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Send and Receive Mail\" window width"
-msgstr "Envia i rep el correu"
+msgstr "Amplada de la finestra «Envia i rep el correu»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
@@ -12762,90 +13079,95 @@ msgstr ""
 "adress_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Custom headers to use while checking for junk."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr ""
-"Especifica la capçalera a utilitzar per a la comprovació de correu brossa."
+"Controla cada quan se sincronitzaran els canvis locals amb el servidor "
+"remot. L'interval ha de ser 30 segons com a mínim."
 
 #: ../mail/evolution-mail.schemas.in.h:18
-#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "Capçaleres a utilitzar per a la comprovació de correu brossa."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"Especifica la capçalera a cercar per la detecció de correu brossa. El format "
-"és nomdelacapçalera=valor al gconf."
+"Especifica les capçaleres personalitzades a cercar per la detecció de correu "
+"brossa. El format és «nomdelacapçalera=valor»."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Joc de caràcters predeterminat amb què es visualitzaran els missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Joc de caràcters predeterminat amb què es redactaran els missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Joc de caràcters predeterminat amb què es visualitzaran els missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Joc de caràcters predeterminat amb què es visualitzaran els missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Estil de reenviament predeterminat"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Alçada predeterminada de la finestra del redactor."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Amplada predeterminada de la finestra de missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Alçada predeterminada del diàleg de subscripció."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Estil de resposta predeterminat"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valor per defecte par a l'estat de l'expansió dels fils"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Amplada predeterminada de la finestra del redactor."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Amplada predeterminada de la finestra dels missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Amplada predeterminada del diàleg de subscripció."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
-"Determina si s'ha de cercar l'adreça del remitent a la llibreta d'adreces"
+"Determina si s'han de cercar només les adreces de les llibretes d'adreces "
+"locals en comprovar si hi ha correu brossa"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si s'ha de cercar l'adreça del remitent a la llibreta d'adreces"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Determina si s'ha de buscar l'adreça del remitent a la llibreta d'adreces. "
@@ -12854,14 +13176,14 @@ msgstr ""
 "lent en llibretes d'adreces remotes (p.ex. LDAP) marcades per a "
 "l'autocompleció."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si s'han d'utilitzar capçaleres personalitzades per a detectar el "
 "correu brossa"
 
 # FIXME [l10n-bug] (dpm)
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -12871,7 +13193,7 @@ msgstr ""
 "el que és correu brossa. Si s'habilita aquesta opció i es mencionen les "
 "capçaleres, s'incrementarà la velocitat de detecció del correu brossa."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -12880,61 +13202,63 @@ msgstr ""
 "tipus de lletra per a les línies dels camps «De» i «Assumpte» a la columna "
 "dels «Missatges»."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directori des d'on carregar/adjuntar fitxers al redactor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directori on desar fitxers del component de correu."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
+"Habilita o inhabilita l'escurçament amb punts suspensius dels noms de les "
+"carpetes en l'arbre de carpetes"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marca els errors ortogràfics a les paraules mentre s'escriu."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Buida les carpetes de correu brossa en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Buida les papereres en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Buida totes les carpetes de correu brossa en sortir de l'Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Buida les carpetes de paperera en sortir de l'Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Habilita la modalitat de cursor, de manera que vegeu un cursor en llegir el "
 "correu."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Habilita o inhabilita la tecla d'espai màgica"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Habilita o inhabilita la cerca mentre escriviu"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Habilita les carpetes de cerca"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Habilita les carpetes de cerca a l'inici."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -12946,7 +13270,7 @@ msgstr ""
 "trobar fàcilment una carpeta a la barra lateral, que se seleccionarà "
 "automàticament."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12955,43 +13279,43 @@ msgstr ""
 "previsualització dels missatges, en la llista dels missatges i en la de les "
 "carpetes."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Habiliteu-ho per representar la part de text del missatge de mida limitada."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Habilita/inhabilita el mode de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Alçada de la subfinestra de la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Alçada de la subfinestra de la llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la previsualització per a cada carpeta i suprimeix la selecció"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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 ""
 "Pregunta a l'usuari si de debò vol obrir deu o més missatges a la vegada."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../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 la subfinestra de «Previsualització» està activada, mostra-la al costat "
-"en comptes de verticalment."
+"Si la subfinestra de «Previsualització» està activada, mostra-la al costat en "
+"comptes de verticalment."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -13002,13 +13326,15 @@ msgstr ""
 "amb un visualitzador bonobo-component de la base de dades mime del GNOME "
 "poden ser utilitzats per a visualitzar-ne el contingut."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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 ""
+"Alçada inicial de la finestra «Envia i rep el correu». El valor s'actualitza "
+"a mesura que l'usuari canvia la mida vertical de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -13016,18 +13342,25 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"Estat de maximització inicial de la finestra «Envia i rep el correu». El "
+"valor s'actualitza a mesura que l'usuari maximitza o minimitza  la finestra. "
+"Tingueu en compte que l'Evolution no utilitza aquest valor degut al fet que "
+"aquesta finestra no es pot maximitzar. Aquesta clau existeix només com a "
+"detall d'implementació."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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 ""
+"Amplada inicial de la finestra «Envia i rep el correu». El valor s'actualitza "
+"a mesura que l'usuari canvia la mida horitzontal de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Habilita/inhabilita preguntar en marcar múltiples missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -13035,7 +13368,7 @@ msgstr ""
 "Inhabilita la funcionalitat per la qual es demana múltiples vegades a "
 "l'usuari si vol dur a terme la sincronització per a treballar fora de línia."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -13046,31 +13379,31 @@ msgstr ""
 "permanent, i que no només implica la supressió d'aquests en els resultats de "
 "la cerca."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "La darrera vegada que es va buidar la paperera de correu brossa"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "La darrera vegada que es va buidar la paperera"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nivell per sobre del qual s'enregistrarà el missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Llista d'etiquetes i els seus colors associats"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Llista de llicències acceptades"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Llista de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -13079,15 +13412,17 @@ msgstr ""
 "llista conté cadenes referents a subdirectoris relatius a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Llista de capçaleres personalitzades i si estan habilitades."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
+"Llista dels codis de llengua dels diccionaris a utilitzar per a la "
+"verificació ortogràfica."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -13096,134 +13431,134 @@ msgstr ""
 "llista conté cadenes de tipus nom:color, on color fa servir la codificació "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Llista de tipus MIME per als quals es cercaran components de visualització "
 "del Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Llista de noms de protocol per als quals s'ha acceptat la llicència."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Carrega les imatges dels missatges HTML a través de l'HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
 "Carrega imatges per a missatges HTML a través de l'HTTP(S). Els valors "
-"possibles són: 0 - mai carreguis imatges de la xarxa, 1 - carrega imatges "
-"dels contactes, 2 - carrega sempre les imatges de la xarxa."
+"possibles són: «0» - mai carreguis imatges de la xarxa, «1»- carrega imatges "
+"dels contactes, «2» - carrega sempre les imatges de la xarxa."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Registra les accions del filtre"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Registra les accions al fitxer de registre especificat."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Fitxer on registrar accions de filtre"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Fitxer on enregistrar accions de filtre."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marca com a vist després del temps d'espera"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marca com a vist després del temps d'espera."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marca les citacions en la «Previsualització» del missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marca les citacions en la «Previsualització» del missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Alçada predeterminada de la finestra de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Amplada predeterminada de la finestra de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estil de visualització de missatges a normal («normal»), capçaleres senceres "
 "(«full headers»), font («source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Mínim nombre de dies entre buidatges de la paperera de correu brossa en "
 "sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Mínim nombre de dies entre buidatges de la paperera en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Temps mínim entre buidatges de la paperera de correu brossa en sortir, en "
 "dies."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Temps mínim entre buidatges de la paperera en sortir, en dies."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adreces a mostrar a Per a/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Pregunta quan l'assumpte sigui buit"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pregunta l'usuari quan intenti buidar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pregunta quan l'usuari intenti enviar un missatge sense assumpte."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Pregunta si l'usuari vol treballar fora de línia immediatament"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Pregunta quan se suprimeixin els missatges d'una carpeta de cerca"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Pregunta quan l'usuari buidi"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Pregunta quan l'usuari només entri el camp CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pregunta quan l'usuari intenti obrir deu o més missatges a la vegada"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -13231,76 +13566,80 @@ msgstr ""
 "Pregunta quan l'usuari intenti enviar correu HTML a destinataris que no "
 "volen rebre correu HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Pregunta quan l'usuari intenti enviar un missatge sense destinataris a Per a "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pregunta quan l'usuari intenti enviar correu HTML no desitjat"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Pregunta en marcar múltiples missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconeix les emoticones en el text i reemplaça-les per les seves imatges."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Reconeix els enllaços en el text i remplaça'ls."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Executa la prova de brossa per al correu d'entrada."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Directori on desar"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-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 "Cerca la foto del remitent a les llibretes d'adreces locals"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Envia els missatges en format HTML per defecte"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Envia els missatges en format HTML per defecte."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correu del remitent a la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Interval de sincronització amb el servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Mostra les animacions"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Mostra les imatges animades com a animacions."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Mostra els missatges suprimits a la llista de missatges (amb una ratlla a "
 "sobre)"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Mostra els missatges suprimits a la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Mostra la foto del remitent"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13308,73 +13647,71 @@ msgstr ""
 "Mostra el correu del remitent en una columna separada a la llista de "
 "missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostra la foto del remitent a la subfinestra de lectura de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Comprovació ortogràfica mentre s'escriu"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
-msgstr "Verificació d'ortografia"
+msgstr "Color de la verificació ortogràfica"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
-msgstr "Comprovació ortogràfica mentre s'escriu"
+msgstr "Llengües per a la verificació ortogràfica"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Alçada predeterminada de la finestra de subscripció"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Amplada predeterminada de la finestra de subscripció"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Tipus de lletra de terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Límit de la part del missatge de text"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "El connector de correu brossa per defecte"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "La darrera vegada que es va buidar la paperera de correu brossa, en dies des "
 "de l'inici de l'època Unix (01.01.1970)."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "La darrera vegada que es va buidar la paperera, en dies des de l'inici de "
 "l'època Unix (01.01.1970)."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "El tipus de lletra de terminal per a visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "El tipus de lletra de mida variable per a visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Això pot tenir tres valors possibles: 0 per als errors, 1 per als avisos, i "
-"2 per als missatges de depuració."
+"Això pot tenir tres valors possibles: «0» per als errors, «1» per als avisos, "
+"i «2» per als missatges de depuració."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13382,7 +13719,7 @@ msgstr ""
 "Això decideix la mida màxima de la part de text que es pot formatar sota "
 "l'Evolution. Per defecte són 4MB (4096 KB), i s'especifica en KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13392,16 +13729,16 @@ msgstr ""
 "connectors habilitats. Si s'inhabilita aquest connector per defecte, "
 "l'Evolution tampoc recorrerà als altres connectors disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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 ""
 "Aquesta hauria de ser una clau per llegir una sola vegada i llavors ser "
-"reinicialitzada com a falsa. Això fa que es desfaci la selecció dels correus "
-"de la llista i que se suprimeixi la previsualització de la carpeta."
+"reinicialitzada com a falsa. Això provoca que es desfaci la selecció dels "
+"correus de la llista i que se suprimeixi la previsualització de la carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13413,18 +13750,22 @@ msgstr ""
 "l'estructura XML és &lt;capçalera enabled&gt;. Indiqueu «enabled» si s'ha de "
 "visualitzar la capçalera en la visualització del correu."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
+"Aquesta opció està relacionada amb la clau lookup_addressbook i s'utilitza "
+"per a determinar si s'han de cercar adreces només en les llibretes d'adreces "
+"locals amb la finalitat d'excloure els correus enviats per contactes "
+"coneguts del filtratge de correu brossa."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Aquesta opció ajudaria a millorar la velocitat de recollida."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
@@ -13432,7 +13773,7 @@ msgstr ""
 "Això estableix el nombre d'adreces per mostrar a la visualització de la "
 "llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13440,7 +13781,7 @@ msgstr ""
 "Aquest paràmetre especifica si l'estat per defecte dels fils és expandit o "
 "contret. Haureu de reiniciar l'Evolution perquè els canvis tinguin efecte."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13450,117 +13791,119 @@ msgstr ""
 "missatge de cadascun d'ells, o bé segons la data del missatge. Haureu de "
 "reiniciar l'Evolution perquè els canvis tinguin efecte."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Crea fils basats en la llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Crea fils basats en la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Crea fils basats en l'assumpte en la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Temps d'espera per a marcar un missatge com a llegit"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Temps d'espera per a marcar un missatge com a llegit."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Cadena d'identificació d'usuari del compte predeterminat."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
+msgstr "Color de subratllat per a "
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Utilitza el client i el dimoni de l'SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Utilitza el client i el dimoni de l'SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Utilitza tipus de lletra personalitzats"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Utilitza tipus de lletra personalitzats per a visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Fes només proves de correu no desitjat locals."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Fes només proves de correu no desitjat locals (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Utilitza una disposició de costat o ampla"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Tipus de lletra de mida variable"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "L'element del menú Visualitza/CCO està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "L'element del menú Visualitza/CCO està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "L'element del menú Visualitza/Cc està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "L'element del menú Visualitza/Cc està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "L'element del menú Visualitza/De està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "L'element del menú Visualitza/De està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "L'element del menú Visualitza/Envia a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "L'element del menú Visualitza/Envia a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'element del menú Visualitza/Respon a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'element del menú Visualitza/Respon a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Si s'afegirà una sol·licitud de confirmació de lectura per a cada missatge "
 "de manera predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr ""
+"Si s'ha d'inhabilitar la funcionalitat d'escurçar els noms de les carpetes "
+"amb punts suspensius en l'arbre de carpetes."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../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."
@@ -13568,43 +13911,43 @@ msgstr ""
 "Si s'ha de provar de crear fils per temes quan els missatges no continguin "
 "les capçaleres References o In-Reply-To."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Si s'han d'ordenar els fils basant-se en el seu l'últim missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Amplada de la subfinestra de la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Amplada de la subfinestra de la llista de missatges."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "S'estan important dades de l'Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Importador Elm de l'Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "S'està important correu de l'Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Carpeta de destí:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Seleccioneu a quina carpeta s'importarà"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Bústia de correu de Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetes de correu de format Berkeley"
 
@@ -13612,7 +13955,7 @@ msgstr "Importador de carpetes de correu de format Berkeley"
 msgid "Importing mailbox"
 msgstr "S'està important una bústia"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "S'està important «%s»"
@@ -13622,178 +13965,180 @@ msgstr "S'està important «%s»"
 msgid "Scanning %s"
 msgstr "S'està examinant %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "S'estan important dades del Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Importador del Pine de l'Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importa correu del Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per 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 "Correu de %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "L'assumpte és %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Plantilles"
+
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
-msgstr[0] "%d seleccionada, "
-msgstr[1] "%d seleccionades, "
+msgstr[0] "%d seleccionat, "
+msgstr[1] "%d seleccionats, "
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d suprimit"
 msgstr[1] "%d suprimits"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d brossa"
 msgstr[1] "%d brossa"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d esborrany"
 msgstr[1] "%d esborranys"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviat"
 msgstr[1] "%d enviats"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sense enviar"
 msgstr[1] "%d sense enviar"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sense llegir,"
 msgstr[1] "%d sense llegir,"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Missatge de correu nou"
 
-#: ../mail/mail-component.c:906
-msgid "_Mail Message"
-msgstr "_Missatge de correu"
-
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge de correu nou"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Carpeta de correu nova"
 
-#: ../mail/mail-component.c:914
-msgid "Mail _Folder"
-msgstr "Car_peta de correu"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correu nova"
 
-#: ../mail/mail-component.c:1062
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "No s'ha pogut actualitzar la configuració o les carpetes."
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Error"
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Errors"
 
-#: ../mail/mail-component.c:1536
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Avisos i errors"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Depuració"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Errors, avisos i missatges de depuració"
 
-#: ../mail/mail-component.c:1647
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Registres de depuració"
 
-#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1652
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Mostra els e_rrors a la barra d'estat per a"
 
-#. Translators: This is the second part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1660
-#, fuzzy
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "segons."
 
-#: ../mail/mail-component.c:1670
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Missatges de registre:"
 
-#: ../mail/mail-component.c:1722
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Nivell de registre"
 
-#: ../mail/mail-component.c:1729 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1736 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Missatges"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Tanca aquesta finestra"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "Comprova els tipus _permesos "
@@ -13807,7 +14152,6 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Aquest muntatge de l'Evolution no funciona amb l'SSL</b>"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Fotografia del remitent</b>"
 
@@ -13891,9 +14235,8 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipus de lletra per a l'impressió</span>"
 
 #: ../mail/mail-config.glade.h:27
-#, fuzzy
 msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">Estat</span>"
+msgstr "<span weight=\"bold\">Paràmetres del servidor intermediari</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -13983,7 +14326,6 @@ msgid "Ch_eck for Supported Types "
 msgstr "Comprova _els tipus suportats "
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
 msgstr "Comprova s_i les capçaleres personalitzades són brossa"
 
@@ -14047,20 +14389,18 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Signa digitalment els missatges de sortida (per defecte)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "No formatis el text dels correus si la mida e_xcedeix"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "No mar_quis els missatges com a brossa si el remitent és a la meva llibreta "
 "d'adreces"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Do not quote"
-msgstr "No ho suprimeixis"
+msgstr "Sense citacions"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -14123,9 +14463,8 @@ msgid "HTML Messages"
 msgstr "Missatges HTML"
 
 #: ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "H_TTP Proxy:"
-msgstr "A_partat de correus:"
+msgstr "Servidor intermediari per a l'H_TTP:"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Headers"
@@ -14140,7 +14479,6 @@ msgid "Inline"
 msgstr "Inserit"
 
 #: ../mail/mail-config.glade.h:96
-#, fuzzy
 msgid "Inline (Outlook style)"
 msgstr "Missatge original en línia (a l'estil de l'Outlook)"
 
@@ -14174,7 +14512,7 @@ msgstr "Redactor de missatges"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
-msgstr ""
+msgstr "No uti_litzis el servidor intermediari per a:"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -14192,19 +14530,24 @@ msgstr ""
 "vegada"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"S'ignorarà aquesta opció si es produeix una concordança amb les capçaleres "
+"de correu brossa personalitzades."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "_Organització:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "Id. de _clau PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
-#, fuzzy
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Contrasen_ya:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -14212,7 +14555,7 @@ msgstr ""
 "Introduïu un nom descriptiu per a aquest compte aquí sota.\n"
 "Aquest nom només s'utilitzarà per a visualitzar-lo."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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."
@@ -14220,7 +14563,7 @@ msgstr ""
 "Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
 "pregunteu-ho a l'administrador del sistema o al vostre proveïdor d'Internet."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "
@@ -14230,112 +14573,115 @@ msgstr ""
 "«opcionals» no són necessaris, a menys que els vulgueu afegir en els correus "
 "que envieu."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Seleccioneu alguna de les següents opcions"
 
-#: ../mail/mail-config.glade.h:118
-#, fuzzy
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
-msgstr "_Port:"
+msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pregunta quan s'enviïn missatges amb destinataris n_omés al camp CCO"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citat"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Recorda la contrasenya"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Respon-A:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Recorda la contrasen_ya"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
-msgstr ""
+msgstr "Ordinador S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "Ce_rca la foto del remitent només a les llibretes d'adreces locals"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_elecciona..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Envia confirmacions de lectura:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Tipus de lletra estàndard:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa per imprimir"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable per imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Enviament de correu"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _missatges enviats:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requereix autenticació"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipus de servidor:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Ce_rtificat de signatura:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ura:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Taula de signatures"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
-msgstr "Verificació d'ortografia"
+msgstr "Verificació ortogràfica"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Inici de la redac_ció al final en respondre"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ipus:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14343,7 +14689,7 @@ msgstr ""
 "Aquesta llista reflecteix només els idiomes per als quals teniu instal·lat "
 "un diccionari."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14353,14 +14699,7 @@ msgstr ""
 "per a la vostra signatura. El nom que especifiqueu\n"
 "només s'utilitzarà per a visualitzar-lo."
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"S'ignorarà aquesta opció si es produeix una concordança amb les capçaleres "
-"de correu brossa personalitzades."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14368,26 +14707,26 @@ msgstr ""
 "Escriviu el nom que vulgueu fer servir per referir-vos a aquest compte.\n"
 "Per exemple: «Feina» o «Personal»"
 
-#: ../mail/mail-config.glade.h:153
-#, fuzzy
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "Nom d'_usuari:"
 
-#: ../mail/mail-config.glade.h:154
-#, fuzzy
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
-msgstr "Autenticació"
+msgstr "Utilitza au_tenticació"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../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 "Nom d'_usuari:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Amplada variable:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14398,130 +14737,126 @@ msgstr ""
 "\n"
 "Feu clic a «Endavant» per a començar. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Afegeix la signatura"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "C_arrega sempre les imatges d'Internet"
 
-#: ../mail/mail-config.glade.h:162
-#, fuzzy
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
-msgstr "Reconeix automàticament les icones de caretes"
+msgstr "URL de configuració _automàtica del servidor intermediari:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Connector de correu brossa per _defecte:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "Connexió _directa a Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "No signis les sol·licituts _de reunió (compatible amb l'Outlook)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Estil de reen_viament:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 "Mantin_gues la signatura a la part superior del missatge original en "
 "respondre"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Carrega les imatges dels correus dels contactes"
 
-#: ../mail/mail-config.glade.h:170
-#, fuzzy
-msgid "_Lookup in local addressbook only"
-msgstr "Llista les carpetes de llibretes d'adreces locals"
-
 #: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "_Cerca només a les llibretes d'adreces locals"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Fes-lo el meu compte per _defecte"
 
-#: ../mail/mail-config.glade.h:172
-#, fuzzy
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
-msgstr "Configuració del correu"
+msgstr "Configuració _manual del servidor intermediari:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marca els missatges com a llegits al cap de"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_No carreguis mai les imatges d'Internet"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Camí:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Pregunta quan s'enviïn missatges HTML als contactes que no ho volen"
-
 #: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Pregunta quan s'enviïn missatges HTML als contactes que no ho vulguin"
+
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Pregunta quan s'enviïn missatges amb l'assumpte buit"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Estil de la _resposta:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "Servidor intermediari per a l'HTTP _segur:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "S_elecciona..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "M_ostra les animacions"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostra la fotografia del remitent en la previsualització del correu"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Reduei_x les capçaleres Per a/ CC / CCO a "
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "E_mpra una connexió segura:"
 
-#: ../mail/mail-config.glade.h:189
-#, fuzzy
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
-msgstr "Pre_determinat"
+msgstr "Utilitza els paràmetres p_redeterminats del sistema"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilitza el mateix tipus de lletra que la resta d'aplicacions"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "adreces"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "descripció"
 
@@ -14561,43 +14896,43 @@ msgstr "Diferencia les majú_scules de les minúscules"
 msgid "Co_mpleted"
 msgstr "Co_mpletat"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "Ce_rca:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Cerca en el missatge"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Senyala per respondre"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Subscripció a carpetes"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Acord de llicència"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Cap seleccionat"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Informació sobre seguretat"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Carpetes específiques"
 
-#: ../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."
@@ -14605,23 +14940,23 @@ msgstr ""
 "Els missatges que heu seleccionat per a respondre es llisten a sota.\n"
 "Seleccioneu una acció per respondre-hi al menú «Senyalador»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Accepteu la llicència"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Venciment:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "Sen_yalador:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Habili_teu-lo per a acceptar l'acord de llicència"
 
-#: ../mail/mail-folder-cache.c:831
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
@@ -14668,104 +15003,106 @@ msgstr "S'està enviant el missatge %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "No s'han pogut enviar %d de %d missatges"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "S'ha cancel·lat."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Completat."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "S'està desant el missatge a la carpeta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "S'estan movent els missatges a %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "S'estan copiant els missatges a %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Missatges reenviats"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "S'està obrint la carpeta %s"
 
-#: ../mail/mail-ops.c:1270
-#, fuzzy, c-format
+# FIXME (dpm)
+#: ../mail/mail-ops.c:1272
+#, c-format
 msgid "Retrieving quota information for folder %s"
-msgstr "Informació de contacte per a %s"
+msgstr ""
+"S'està recuperant la informació de la quota d'espai per a la carpeta %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "S'està obrint el magatzem %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "S'està suprimint la carpeta %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S'està emmagatzemant la carpeta «%s»"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "S'està buidant i emmagatzemant el compte «%s»"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "S'està emmagatzemant el compte «%s»"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "S'està refrescant la carpeta"
 
-#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "S'està suprimint la carpeta"
 
-#: ../mail/mail-ops.c:1701
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està buidant la paperera a «%s»"
 
-#: ../mail/mail-ops.c:1702
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Carpetes locals"
 
-#: ../mail/mail-ops.c:1783
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "S'està recuperant el missatge %s"
 
-#: ../mail/mail-ops.c:1890
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "S'està recuperant %d missatge"
 msgstr[1] "S'estan recuperant %d missatges"
 
-#: ../mail/mail-ops.c:1975
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "S'està desant %d missatge"
 msgstr[1] "S'estan desant %d missatges"
 
-#: ../mail/mail-ops.c:2053
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14774,11 +15111,11 @@ msgstr ""
 "S'ha produït un error en desar els missatges a: %s.\n"
 " %s"
 
-#: ../mail/mail-ops.c:2125
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "S'està desant el fitxer adjunt"
 
-#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14787,99 +15124,89 @@ msgstr ""
 "No s'ha pogut crear el fitxer de sortida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està desconnectant de %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està tornant a connectar a %s"
 
-#: ../mail/mail-ops.c:2408
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "S'està preparant el compte «%s» per a treballar fora de línia"
 
-#: ../mail/mail-ops.c:2494
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Comprovació del servei"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "S'està cancel·lant..."
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Envia i rep el correu"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "C_ancel·la-ho tot"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "S'està actualitzant..."
 
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "S'està esperant..."
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprovació de correu nou"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduïu la contrasenya per a %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Introduïu la contrasenya"
 
-#: ../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 "Introduïu la contrasenya per a %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "L'usuari ha cancel·lat l'operació."
 
 #: ../mail/mail-signature-editor.c:201
-#, fuzzy
 msgid "_Save and Close"
-msgstr "Desa i tanca"
-
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Fitxer"
+msgstr "De_sa i tanca"
 
 #: ../mail/mail-signature-editor.c:355
-#, fuzzy
 msgid "Edit Signature"
 msgstr "Edita la signatura"
 
 #: ../mail/mail-signature-editor.c:370
-#, fuzzy
 msgid "_Signature Name:"
-msgstr "Taula de signatures"
+msgstr "Nom de la _signatura:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14920,58 +15247,47 @@ msgstr "S'estan actualitzant les carpetes de cerca per a «%s:%s»"
 msgid "Updating Search Folders for '%s'"
 msgstr "S'estan actualitzant les carpetes de cerca per a «%s»"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Edita les carpetes de cerca"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Carpeta de cerca nova"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr ""
-"Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
-"diferent."
+msgstr "Ja existeix una carpeta anomenada «{0}». Feu servir un nom diferent."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
-"diferent."
+msgstr "Ja existeix una carpeta anomenada «{1}». Feu servir un nom diferent."
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"Ja existeix una carpeta que no és buida a &quot;{1}&quot;.\n"
+"Ja existeix una carpeta que no és buida a «{1}».\n"
 "\n"
 "Podeu escollir ignorar aquesta carpeta, sobreescriure o afegir al seu "
-"contingut, o sortir."
+"contingut, o bé sortir."
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr ""
-"S'ha sol·licitat una confirmació de lectura per a &quot;{1}&quot;. Voleu "
-"enviar la confirmació de lectura a {0}?"
+"S'ha sol·licitat una confirmació de lectura per a «{1}». Voleu enviar la "
+"confirmació de lectura a {0}?"
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr ""
-"Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
-"diferent."
+msgstr "Ja existeix una signatura anomenada «{0}». Feu servir un nom diferent."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -15007,13 +15323,12 @@ msgstr ""
 "les carpetes?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"Segur que voleu suprimir permanentment tots els missatges suprimits de totes "
-"les carpetes?"
+"Segur que voleu suprimir permanentment tots els missatges suprimits de la "
+"carpeta «{0}»?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15028,123 +15343,101 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Segur que voleu enviar un missatge sense assumpte?"
 
 #: ../mail/mail.error.xml.h:18
-#, fuzzy
 msgid "Because \"{0}\"."
-msgstr "Degut a &quot;{0}&quot;."
+msgstr "Degut a «{0}»."
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Because \"{2}\"."
-msgstr "Degut a &quot;{2}&quot;."
+msgstr "Degut a «{2}»."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Signatura buida"
 
 #: ../mail/mail.error.xml.h:22
-#, fuzzy
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "No es pot afegir la carpeta de cerca &quot;{0}&quot;."
+msgstr "No es pot afegir la carpeta de cerca «{0}»."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "No es pot copiar la carpeta &quot;{0}&quot; a &quot;{1}'."
+msgstr "No es pot copiar la carpeta «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot create folder \"{0}\"."
-msgstr "No s'ha pogut crear la carpeta &quot;{0}&quot;."
+msgstr "No s'ha pogut crear la carpeta «{0}»."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "No s'ha pogut crear el directori temporal per desar."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "No s'ha pogut crear el directori per desar degut a &quot;{1}&quot;"
+msgstr "No s'ha pogut crear el directori per desar degut a «{1}»"
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr "No s'ha pogut suprimir la carpeta &quot;{0}&quot;."
+msgstr "No s'ha pogut suprimir la carpeta «{0}»."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "No es pot suprimir la carpeta de sistema &quot;{0}&quot;."
+msgstr "No es pot suprimir la carpeta de sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr ""
-"No es pot editar la carpeta de cerca &quot;{0}&quot; perquè no existeix."
+msgstr "No es pot editar la carpeta de cerca «{0}» perquè no existeix."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "No es pot moure la carpeta &quot;{0}&quot; a &quot;{1}&quot;."
+msgstr "No es pot moure la carpeta «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "No s'ha pogut obrir la font &quot;{1}&quot;"
+msgstr "No s'ha pogut obrir l'origen «{1}»"
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "No s'ha pogut obrir l'origen &quot;{2}&quot;."
+msgstr "No s'ha pogut obrir l'origen «{2}»."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr "No es pot obrir la destinació &quot;{2}&quot;."
+msgstr "No es pot obrir la destinació «{2}»."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
 msgstr ""
-"No es pot llegir el fitxer de llicència &quot;{0}&quot; degut a un problema "
+"No es pot llegir el fitxer de llicència «{0}» degut a un problema "
 "d'instal·lació. No podreu utilitzar aquest proveïdor fins que no n'accepteu "
 "la llicència."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "No es pot canviar el nom &quot;{0}&quot; com &quot;{1}&quot;."
+msgstr "No es pot canviar el nom de «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr ""
-"No s'ha pogut canviar el nom o moure la carpeta de sistema &quot;{0}&quot;."
+msgstr "No s'ha pogut canviar el nom o moure la carpeta de sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "No es poden desar els canvis al compte."
 
 #: ../mail/mail.error.xml.h:38
-#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr "No s'ha pogut desar al directori &quot;{0}&quot;."
+msgstr "No s'ha pogut desar al directori «{0}»."
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr "No es pot desar al fitxer &quot;{0}&quot;."
+msgstr "No es pot desar al fitxer «{0}»."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr "No s'ha pogut establir l'script per a la signatura &quot;{0}&quot;."
+msgstr "No s'ha pogut establir l'script de signatura «{0}»."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "Comprova si hi ha _brossa"
+msgstr "Ha fallat la comprovació de correu brossa"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15160,18 +15453,16 @@ msgid "Could not save signature file."
 msgstr "No s'ha pogut desar el fitxer de signatura."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Suprimit: "
+msgstr "volu suprimir «{0}»?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Voleu suprimir el compte?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Voleu suprimir els missatges de la carpeta de cerca?"
+msgstr "Voleu suprimir els missatges de la carpeta de cerca «{0}»?"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
@@ -15194,10 +15485,6 @@ msgid "Do not disable"
 msgstr "No ho inhabilitis"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Voleu que també s'apliqui l'operació a les subcarpetes?"
-
-#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -15205,43 +15492,43 @@ msgstr ""
 "Voleu sincronitzar localment les carpetes marcades per a treballar fora de "
 "línia?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Voleu marcar tots els missatges com a llegits?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Voleu desar els canvis?"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Introduïu la contrasenya."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "S'ha produït un error en carregar les definicions de filtre."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "S'ha produït un error en realitzar l'operació."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "S'ha produït un error en {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "El fitxer existeix però no es pot sobreescriure."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "El fitxer existeix però no és un fitxer normal."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continueu, no podreu recuperar aquests missatges."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -15249,11 +15536,11 @@ msgstr ""
 "Si suprimiu la carpeta, tots els continguts i els de les seves subcarpetes "
 "se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continueu, els comptes apoderats se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15261,11 +15548,11 @@ msgstr ""
 "Si continueu, la informació dels comptes i\n"
 "i la informació de l'apoderat se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continueu, la informació dels comptes se suprimirà permanentment."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15273,19 +15560,19 @@ msgstr ""
 "Si sortiu, aquests missatges no s'enviaran fins que s'iniciï l'Evolution de "
 "nou."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Autenticació no vàlida"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "S'han actualitzat automàticament els filtres de correu."
 
-#: ../mail/mail.error.xml.h:73
+#: ../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 "
@@ -15298,42 +15585,32 @@ msgstr ""
 "missatges. Per evitar-ho, hauríeu d'afegir almenys un destinatari «Per a:» o "
 "«CC:»."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Marca com a llegits tots els missatges"
 
-#: ../mail/mail.error.xml.h:75
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr ""
-"Voleu marcar tots els missatges d'aquesta carpeta i les seves subcarpetes "
-"com a llegits?"
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Manca la carpeta."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "No s'ha seleccionat cap font."
 
-#: ../mail/mail.error.xml.h:79
-msgid "Only on _Current Folder"
-msgstr "Només a la _carpeta actual"
-
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Si obriu molts missatges a la vegada pot ser que s'hi trigui molt de temps."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Comproveu la configuració de comptes i torneu-ho a provar."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Habiliteu el compte o bé envieu amb un altre compte."
 
-#: ../mail/mail.error.xml.h:83
+#: ../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."
@@ -15342,7 +15619,7 @@ msgstr ""
 "cercar adreces de correu si feu clic en el botó Per a: al costat de "
 "l'entrada de text."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15352,71 +15629,65 @@ msgstr ""
 "format HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduïu un nom únic per a identificar aquesta signatura."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Espereu."
 
-#: ../mail/mail.error.xml.h:88
-#, fuzzy
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
-"Hi ha hagut un problema en migrar la carpeta de correu antiga &quot;{0}"
-"&quot;."
+msgstr "Hi ha hagut un problema en migrar la carpeta de correu antiga «{0}»."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "S'està consultant el servidor"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "S'estan consultant els mecanismes d'autenticació compatibles al servidor."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "S'ha sol·licitat una confirmació de lectura."
 
-#: ../mail/mail.error.xml.h:92
-#, fuzzy
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr ""
-"Voleu suprimir la carpeta &quot;{0}&quot; i totes les seves subcarpetes?"
+msgstr "Voleu suprimir la carpeta «{0}» i totes les seves subcarpetes?"
 
-#: ../mail/mail.error.xml.h:93
-#, fuzzy
+#: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
-msgstr "Importa un fitxer"
+msgstr "Ha fallat el marcatge com a correu brossa"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "Ha fallat el marcatge com a correu que no és brossa"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "S'han actualitzat les carpetes de cerca automàticament."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Envia la confirmació"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "La signatura ja existeix"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Sincronitza"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 "Voleu sincronitzar les carpetes localment per a treballar fora de línia?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -15424,7 +15695,7 @@ msgstr ""
 "L'Evolution necessita les carpetes del sistema per funcionar correctament i "
 "no se les pot tornar a anomenar, moure ni suprimir."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15441,8 +15712,7 @@ msgstr ""
 "tots els missatges. Per a evitar-ho, hauríeu d'afegir almenys un destinatari "
 "«Per a:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:104
-#, fuzzy
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15453,11 +15723,10 @@ msgstr ""
 "Les carpetes de cerca següents:\n"
 "{0}\n"
 "feien servir la carpeta suprimida:\n"
-"    &quot;{1}&quot;\n"
+"    «{1}»\n"
 "i s'han actualitzat."
 
-#: ../mail/mail.error.xml.h:109
-#, fuzzy
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15468,14 +15737,14 @@ msgstr ""
 "Les regles de filtre següents:\n"
 "{0}\n"
 "feien servir la carpeta suprimida:\n"
-"    &quot;{1}&quot;\n"
+"    «{1}»\n"
 "i s'han actualitzat."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "El fitxer de l'script ha de ser executable."
 
-#: ../mail/mail.error.xml.h:115
+#: ../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."
@@ -15484,7 +15753,7 @@ msgstr ""
 "Aneu a l'editor de carpetes de cerca per a afegir-la explícitament en cas "
 "que sigui necessari."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -15492,13 +15761,13 @@ msgstr ""
 "No es pot enviar el missatge perquè el compte que heu escollit per enviar no "
 "està habilitat"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Aquest missatge no es pot enviar perquè no se n'ha indicat cap destinatari"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -15506,11 +15775,11 @@ msgstr ""
 "El servidor no funciona amb el tipus d'autenticació sol·licitat. És possible "
 "que no permeti cap tipus d'autenticació."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Aquesta signatura s'ha modificat, però no s'ha desat."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -15518,11 +15787,11 @@ msgstr ""
 "Això marcarà tots els missatges com a llegits en el directori seleccionat i "
 "els seus subdirectoris."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es pot connectar al servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -15530,19 +15799,19 @@ msgstr ""
 "No s'ha pogut obrir la carpeta d'esborranys d'aquest compte. Voleu fer "
 "servir la carpeta d'esborranys del sistema?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "No es pot llegir el fitxer de la llicència."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Pre_determinat"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Voleu utilitzar la carpeta d'esborranys predeterminada?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../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"
@@ -15552,27 +15821,27 @@ msgstr ""
 "missatge original de la carpeta local o remota.\n"
 "Esteu segur que voleu fer-ho?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "No heu introduït tota la informació necessària."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Teniu missatges sense enviar. Voleu sortir de totes maneres?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "No és possible crear dos comptes amb el mateix nom."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Heu d'assignar un nom a aquesta carpeta de cerca."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Heu d'especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:135
+#: ../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 "
@@ -15582,47 +15851,46 @@ msgstr ""
 "Podeu fer-ho seleccionant les carpetes individualment, i/o seleccionant "
 "totes les carpetes locals, totes les remotes, o ambdues."
 
-#: ../mail/mail.error.xml.h:137
-#, fuzzy
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Ha fallat l'entrada al servidor &quot;{0}&quot; com a &quot;{0}&quot;."
+msgstr "Ha fallat l'entrada al servidor «{0}» com a «{0}»."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Afegeix"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Descarta els canvis"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "N_o sincronitzis"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "Bui_da"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Obre els missatges"
 
-#: ../mail/mail.error.xml.h:146
-msgid "on Current Folder and _Subfolders"
-msgstr "a la carpeta actual i a les seves _subcarpetes"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "No vist"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Vist"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Respost"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Reenviat"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples missatges sense veure"
@@ -15647,47 +15915,49 @@ msgstr "Més alta"
 msgid "Highest"
 msgstr "La més alta"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Avui a les %k:%M"
 
-#: ../mail/message-list.c:1630 ../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 "Ahir a les %k:%M"
 
-#: ../mail/message-list.c:1642 ../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 a les %k:%M"
 
-#: ../mail/message-list.c:1650 ../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 "el %d de %b a les %k:%M"
 
-#: ../mail/message-list.c:1652 ../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 de %b del %Y"
 
-#: ../mail/message-list.c:3838
+#. 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
 msgid "Generating message list"
 msgstr "S'està generant la llista de missatges"
 
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"No hi ha cap missatge que satisfaci els vostres criteris de cerca. Netegeu "
+"la cerca a través de l'element de menú Cerca -> Neteja, o bé canvieu-la."
 
-#: ../mail/message-list.c:4103
-#, fuzzy
-msgid "There is currently no message in this folder."
-msgstr "Envia una resposta a un missatge en una carpeta pública"
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "No hi ha cap missatge en aquesta carpeta."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15718,39 +15988,39 @@ msgstr "Missatges enviats"
 msgid "Size"
 msgstr "Mida"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Crida"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "No ho reenviïs"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Respondre"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Per a la vostra informació"
 
-#: ../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 "Reenvia"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "No és necessària cap resposta"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Respon"
 
-#: ../mail/message-tag-followup.c:84 ../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 "Respon a tots"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Ressenya"
 
@@ -15775,6 +16045,10 @@ msgid "Subject contains"
 msgstr "L'assumpte conté"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "L'assumpte o els destinataris contenen"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "L'assumpte o el remitent conté"
 
@@ -15787,14 +16061,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Proporciona funcionalitat central per la llibreta d'adreces local."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Habilita el connector de recordatori d'adjuncions"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Habilita el connector de recordatori d'adjuncions."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15802,7 +16068,7 @@ msgstr ""
 "Llista de pistes que el connector de recordatori d'adjuncions cercarà en el "
 "cos del missatge"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15810,14 +16076,11 @@ msgstr ""
 "Llista de pistes que el connector de recordatori d'adjuncions cercarà en el "
 "cos del missatge."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Paraules clau"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Re_corda'm l'adjunció de fitxers"
-
 #: ../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"
@@ -15843,8 +16106,7 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "El missatge no té cap fitxer adjunt"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-#, fuzzy
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Edita el missatge"
 
@@ -15860,29 +16122,29 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Connector d'àudio"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccioneu el nom del fitxer de còpia de seguretat de l'Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Reinicia l'Evolution després de la còpia de seguretat"
 
-#: ../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 ""
 "Seleccioneu el nom del fitxer de còpia de seguretat de l'Evolution a "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Reinicia l'Evolution després de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Restaura a partir de la còpia de seguretat"
 
-#: ../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"
@@ -15894,99 +16156,129 @@ msgstr ""
 "També possibilita la restauració de la vostra configuració personal, filtres "
 "de correu, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaura l'Evolution a partir del fitxer de còpia de seguretat"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccioneu l'arxiu de l'Evolution a restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Escolliu un fitxer a restaurar"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Fes una còpia de seguretat del directori de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Restaura el directori de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Comprova la còpia de seguretat de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Reinicia l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Amb interfície gràfica d'usuari"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "S'està sortint de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 "S'està fent una còpia de seguretat dels comptes i la configuració de "
 "l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "S'està fent una còpia de seguretat de les dades de l'Evolution (Correu, "
 "Contactes, Calendari, Tasques, Anotacions)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "S'ha completat la còpia de seguretat"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "S'està reiniciant l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Fes una còpia de seguretat de les dades de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "S'estan extraient els fitxers de la còpia de seguretat"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "S'està carregant la configuració de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "S'estan suprimint els fitxers de còpia de seguretat temporals"
 
-#: ../plugins/backup-restore/backup.c:249
+# FIXME (dpm)
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "Comprovació de les fonts originals"
+
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "S'està fent una còpia de seguretat a la carpeta %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "S'està restaurant la còpia de seguretat de la carpeta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Còpia de seguretat de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Restauració de l'Evolution"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "S'està fent una còpia de seguretat de les dades de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+"Espereu mentre l'Evolution fa una còpia de seguretat de les vostres dades."
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "S'està restaurant la còpia de seguretat de les dades de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+"Espereu mentre l'Evolution restaura la còpia de seguretat de les vostres "
+"dades."
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Depenent de la quantitat de dades del vostre compte, això pot trigar una "
+"estona."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -16023,15 +16315,23 @@ msgstr ""
 "commutador."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "No teniu els permisos necessaris"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "El fitxer de còpia de seguretat de l'Evolution no és vàlid"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr ""
 "Seleccioneu un fitxer de còpia de seguretat de l'Evolution vàlid a restaurar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "La carpeta seleccionada és de només lectura."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h: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 "
@@ -16058,54 +16358,50 @@ msgstr "Configuració de la _restauració..."
 msgid "_Backup Settings..."
 msgstr "Configuració de la _còpia de seguretat..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactes automàtics"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
-"Crea _automàticament entrades a la llibreta d'adreces quan es respongui al "
-"correu"
+"Crea _automàticament entrades a la llibreta d'adreces en respondre correus"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccioneu la llibreta d'adreces per als contactes automàtics"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Contactes de la missatgeria instantània"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronitza periòdicament la informació de contactes i les imatges de la "
-"llista d'amics del Pidgin"
+"Sincronitza la informació de contactes i les imatges de la llista d'amics "
+"del Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccioneu la llibreta d'adreces per a la llista d'amics del Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronitza amb la me_va llista d'amics"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
-"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 ""
 "Omple automàticament la llibreta d'adreces amb noms i adreces de correu en "
 "respondre als correus. També omple la informació de contactes de missatgeria "
-"a partir de la vostra llista d'amics."
+"instantània a partir de la vostra llista d'amics."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16113,24 +16409,27 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "S'ha produït un error mentre s'estava imprimint"
+msgstr "S'ha produït un error en executar %s: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "El procés fill del Bogofilter no respon; se suprimirà..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
+"S'ha interromput l'espera per al procés fill del Bogofilter; es terminarà..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
+"Ha fallat la creació d'un conducte cap al Bogofilter; el codi d'error fou: %"
+"d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
@@ -16153,25 +16452,25 @@ msgid "Bogofilter Options"
 msgstr "Opcions del Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Bogofilter junk plugin"
-msgstr "Opcions del Bogofilter"
+msgstr "Connector de correu brossa del Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra els missatges de correu brossa amb el Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "Utilitza l'_SSL"
 
@@ -16191,18 +16490,18 @@ msgstr "Calendaris locals"
 msgid "Provides core functionality for local calendars."
 msgstr "Proporciona funcionalitat central per als calendaris locals."
 
-#: ../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:375
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
-msgstr "Re_fresca"
+msgstr "Re_fresca:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Utilitza una connexió _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Nom d'_usuari:"
 
@@ -16303,29 +16602,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Voleu que l'Evolution sigui el vostre gestor de correu predeterminat?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#, fuzzy
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
-msgstr "Marca com a _carpeta predeterminada"
+msgstr "Marca-la com a llibreta d'adreces pre_determinada"
 
-#: ../plugins/default-source/default-source.c:102
-#, fuzzy
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
-msgstr "Marca com a _carpeta predeterminada"
+msgstr "Marca'l com a calendari pre_determinat"
 
-#: ../plugins/default-source/default-source.c:103
-#, fuzzy
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
-msgstr "Marca com a _carpeta predeterminada"
+msgstr "Marca-la com a llista de tasques pre_determinada"
 
-#: ../plugins/default-source/default-source.c:104
-#, fuzzy
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
-msgstr "Marca com a _carpeta predeterminada"
+msgstr "Marca-la com a llista d'anotacions pre_determinada"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16333,12 +16628,63 @@ msgstr "Fonts predeterminades"
 
 #: ../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 ""
 "Proporciona funcionalitat per a marcar com a predeterminats un calendari o "
 "una llibreta d'adreces."
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "Capçalera personalit_zada"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Clau"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valors"
+
+#. 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 ""
+"El format per a especificar un valor per a una clau de capçalera "
+"personalitzada és:\n"
+"Nom dels valors de clau de capçalera personalitzada separats per «;»."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Capçalera personalitzada de correu electrònic"
+
+#. 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 "Afegeix una capçalera personalitzada als missatges que s'enviïn."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Capçalera personalitzada"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Llista de les capçaleres personalitzades"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"La clau especifica la llista de capçaleres personalitzades que podeu afegir "
+"a un missatge que envieu. El format per a especificar una capçalera i el seu "
+"valor és: el nom de la capçalera seguit del signe d'igualtat («=») i els "
+"valors separats per punts i comes («;»)."
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Obre la carpeta d'un altre usuari"
@@ -16356,12 +16702,12 @@ msgid "_User:"
 msgstr "_Usuari:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Contrasenya segura"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16369,11 +16715,11 @@ msgstr ""
 "Amb aquesta opció es connectarà al servidor Exchange utilitzant autenticació "
 "basada en contrasenya segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Contrasenya sense xifrar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16381,11 +16727,11 @@ msgstr ""
 "Amb aquesta opció es connectarà al servidor Exchange mitjançant una "
 "contrasenya de text sense xifrar."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Fora de l'oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -16394,83 +16740,87 @@ msgstr ""
 "persones\n"
 "que us enviïn un correu quan no sigueu a l'oficina."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "No sóc a l'oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Sóc a l'oficina"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Canvia la contrasenya per al compte de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gestiona la configuració de delegats per al compte de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Assistent de delegació"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Miscel·lània"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Visualitza la mida de totes les carpetes de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Mida de les carpetes"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configuració de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utenticació"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Bústia de correu:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipus d'_autenticació"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Comprova els tipus _disponibles"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16483,7 +16833,7 @@ 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"
@@ -16491,7 +16841,7 @@ msgstr ""
 "La contrasenya actual no concorda amb l'existent en el vostre compte. "
 "Introduïu la contrasenya correcta"
 
-#: ../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 "Les contrasenyes són diferents. Torneu a introduir les contrasenyes."
 
@@ -16511,38 +16861,38 @@ msgstr "Contrasenya nova:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "La contrasenya actual ha vençut. Hauríeu de canviar-la ara."
 
-#: ../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 "La contrasenya vencerà en els propers %d dies"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (llegir, crear, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (llegir, crear)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (només lectura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permisos del delegat"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permisos per a %s"
@@ -16550,7 +16900,7 @@ msgstr "Permisos per a %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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -16561,66 +16911,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Heu obtingut els permisos següents sobre les meves 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "També teniu permís per a veure els meus elements privats."
 
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Tot i això, no teniu permís per a veure els meus elements privats."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Heu estat designat delegat per a %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delega a"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Voleu suprimir el delegat %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "No s'ha pogut accedir l'Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "No se us ha trobat en l'Active Directory"
 
-#: ../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 "No s'ha pogut trobar el delegat %s en l'Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "No s'ha pogut suprimir el delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "No s'ha pogut actualitzar la llista de delegats."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "No s'ha pogut afegir el delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "S'ha produït un error en llegir la llista de delegats."
 
@@ -16668,26 +17018,25 @@ msgstr "_Resumeix els permisos"
 msgid "_Tasks:"
 msgstr "_Tasques:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../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:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Nom de la carpeta"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Mida de les carpetes"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
-msgstr "_Usuari"
+msgstr "Usuari"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../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 "Subscriu-me a la carpeta d'un altre usuari"
@@ -16696,20 +17045,20 @@ msgstr "Subscriu-me a la carpeta d'un altre usuari"
 msgid "Exchange Folder Tree"
 msgstr "Arbre de carpetes de l'Exchange"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "Cancel·la la subscripció a una carpeta..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Segur que voleu cancel·lar la subscripció a la carpeta «%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Cancel·la la subscripció a «%s»"
@@ -16774,18 +17123,18 @@ msgstr "La contrasenya vencerà en 7 dies..."
 msgid "_Change Password"
 msgstr "_Canvia la contrasenya"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(S'ha denegat el permís.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Afegeix un usuari:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../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
 msgid "Add User"
 msgstr "Afegeix un usuari"
 
@@ -16903,16 +17252,11 @@ msgstr "_Sensibilitat: "
 msgid "_User"
 msgstr "_Usuari"
 
-# FIXME [l10n-bug] (dpm)
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccioneu l'usuari"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Llibreta d'adreces..."
 
@@ -16926,11 +17270,11 @@ msgstr "Subscriu-me al calendari d'un altre usuari"
 
 #: ../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 ""
-"Un connector que gestiona una col·lecció d'operacions i característiques "
-"específiques de comptes de l'Exchange"
+"Un connector que gestiona una col·lecció d'operacions i funcions "
+"específiques de comptes de l'Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17020,10 +17364,16 @@ msgid "Could not update out-of-office state"
 msgstr "No s'ha pogut actualitzar l'estat d'absència de l'oficina"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Cal reiniciar l'Evolution per a poder carregar la subscripció a la bústia de "
+"correu de l'usuari"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "El compte de l'Exchange està fora de línia."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -17050,32 +17400,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "No s'han pogut actualitzar els delegats:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "La carpeta ja existeix"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "La carpeta no existeix"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Carpeta fora de línia"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Error genèric"
 
-#: ../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 "No es pot trobar el servidor del catàleg global"
 
-#: ../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."
@@ -17083,77 +17433,77 @@ msgstr ""
 "Si l'OWA s'està executant en un camí diferent, heu d'especificar-ho en el "
 "diàleg de configuració del compte."
 
-#: ../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 "La bústia de correu per a {0} no és en aquest servidor."
 
-#: ../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 "Assegureu-vos que l'URL és correcte i torneu-ho a provar."
 
-#: ../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 ""
 "Assegureu-vos que el nom del servidor està escrit correctament i torneu-ho a "
 "provar."
 
-#: ../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 ""
 "Assegureu-vos que el nom d'usuari i la contrasenya són correctes i torneu-ho "
 "a provar."
 
-#: ../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 "No s'ha configurat un servidor de catàleg global per a aquest compte."
 
-#: ../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 "L'usuari {0} no té bústia de correu a {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "No existeix l'usuari {0}"
 
-#: ../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 "S'ha canviat la contrasenya correctament."
 
-#: ../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 ""
 "Introduïu un identificador de delegat o bé inhabiliteu l'opció d'enviar com "
 "a delegat"
 
-#: ../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 "Assegureu-vos que el nom del servidor de catàleg global és correcte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Heu de reiniciar l'Evolution perquè s'apliquin els canvis"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Seleccioneu un usuari."
 
-#: ../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 "El servidor ha rebutjat la contrasenya perquè és massa feble."
 
-#: ../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 "El compte d'Exchange s'inhabilitarà quan sortiu de l'Evolution"
 
-#: ../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 "El compte d'Exchange se suprimirà quan sortiu de l'Evolution"
 
-#: ../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 "El servidor d'Exchange no és compatible amb l'Exchange Connector."
 
-#: ../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."
@@ -17161,7 +17511,7 @@ msgstr ""
 "El servidor està executant l'Exchange 5.5. L'Exchange Connector\n"
 "només pot treballar amb Microsoft Exchange 2000 i 2003."
 
-#: ../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"
@@ -17175,60 +17525,61 @@ msgstr ""
 "\n"
 "O potser simplement heu escrit malament la contrasenya."
 
-#: ../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 "Proveu-ho de nou amb una contrasenya diferent."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "No s'ha pogut afegir l'usuari a la llista de control d'accés:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "No es poden editar els delegats."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "S'ha produït un error desconegut en cercar {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "S'ha produït un error desconegut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tipus desconegut"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "L'operació no està implementada"
 
-#: ../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 ""
 "Us esteu acostant a la vostra quota disponible per a emmagatzemar correus en "
 "aquest servidor."
 
-#: ../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 "Només podeu enviar un missatge en nom d'un sol delegant a la vegada."
 
-#: ../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 "No podeu ser el vostre propi delegat"
 
-#: ../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 ""
 "Heu superat la vostra quota per a emmagatzemar correus en aquest servidor."
 
-#: ../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 "Només podeu configurar un únic compte d'Exchange."
 
-#: ../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."
@@ -17236,13 +17587,13 @@ msgstr ""
 "El vostre ús actual és: {0} KB. Intenteu netejar una mica d'espai esborrant "
 "alguns correus."
 
-#: ../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 "El vostre ús actual és: {0} KB. No podreu enviar ni rebre correus."
 
-#: ../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."
@@ -17250,19 +17601,19 @@ msgstr ""
 "El vostre ús actual és: {0} KB. No podreu enviar correus fins que netegeu "
 "una mica d'espai esborrant alguns correus."
 
-#: ../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 "La contrasenya ha vençut."
 
-#: ../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 "No es pot afegir {0} a la llista de control d'accés"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ja és un delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} ja és a la llista"
 
@@ -17275,13 +17626,12 @@ msgid "Check folder permissions"
 msgstr "Comproveu els permisos de la carpeta"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
-#, fuzzy
 msgid "Default External Editor"
-msgstr "Editor extern"
+msgstr "Editor extern predeterminat"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "L'ordre predeterminada a utilitzar com a editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
@@ -17297,53 +17647,58 @@ msgid "External Editor"
 msgstr "Editor extern"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
-#, fuzzy
 msgid "Cannot create Temporary File"
-msgstr "No s'ha pogut crear el directori temporal per desar."
+msgstr "No s'ha pogut crear el fitxer temporal"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "No es pot executar l'editor"
 
 #: ../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 ""
+"L'Evolution no pot crear un fitxer temporal per a emmagatzemar el correu. "
+"Torneu-ho a provar d'aquí a una estona."
 
 #: ../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 ""
+"No es pot executar l'editor extern especificat a les preferències del "
+"connector. Intenteu de seleccionar-ne un altre."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Redacció en un editor extern"
+msgid "Compose in _External Editor"
+msgstr "Redacció en un editor e_xtern"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Redacteu els missatges utilitzant un editor extern"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "Ordre a executar per a iniciar l'editor: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
+"Utilitzeu «xemacs» per a l'Emacs\n"
+"Utilitzeu «gvim» per alrespòn  VIM"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Seleccioneu un fitxer PNG de 48 x 48 i menys de 700 bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Fitxers PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Cara"
 
@@ -17381,20 +17736,56 @@ msgstr "Cancel·la les subscripcions a carpetes"
 msgid "_Unsubscribe"
 msgstr "Cancel·la la s_ubscripció"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Hauríeu d'introduir el nom d'usuari abans de res."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduïu la contrasenya de l'usuari %s per a accedir a la llista de "
+"subscripcions a calendaris."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"No es poden llegir les dades del servidor del Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "_Calendari:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Recupera la _llista"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
-msgstr "Un connector per a configurar el calendari del Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un connector per a configurar el calendari i els contactes del Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Fonts del Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Llista de comprovació"
 
@@ -17439,16 +17830,16 @@ msgstr "Instal·la la carpeta compartida"
 msgid "Shared Folder Installation"
 msgstr "Instal·lació de la carpeta compartida"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Configuració del correu brossa"
 
-#: ../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ó del correu brossa"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Configuració del correu brossa..."
 
@@ -17474,10 +17865,22 @@ msgid "_Junk List"
 msgstr "_Llista de correu brossa"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Retirada de missatges"
+
+#: ../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 ""
+"Si retireu un missatge és probable que se suprimeixi de la bústia de correu "
+"del destinatari. Segur que voleu fer-ho?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "S'ha retirat el correu amb èxit"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Retira el correu"
 
@@ -17485,12 +17888,6 @@ msgstr "Retira el correu"
 msgid "Add Send Options to groupwise messages"
 msgstr "Afegeix opcions d'enviament als missatges de Groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opcions d'enviament"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un connector per a les característiques dels comptes GroupWise"
@@ -17500,80 +17897,79 @@ msgid "Groupwise Features"
 msgstr "Característiques GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "S'ha retirat el correu amb èxit"
+msgstr "Ha fallat la retirada del correu"
 
 #: ../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 "Converteix el missatge seleccionat en una tasca nova"
+msgstr "El servidor no ha permès retirar el missatge seleccionat."
 
 #: ../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 "La signatura no és vàlida"
+msgstr "L'usuari no és vàlid"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "No es pot desar al fitxer &quot;{0}&quot;."
+msgstr "No es pot atorgar accés al servidor intermediari a l'usuari «{0}»."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
-#, fuzzy
 msgid "Specify User"
 msgstr "Seleccioneu l'usuari"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "Heu obtingut els permisos següents sobre les meves carpetes:"
+msgstr ""
+"Ja heu atorgat permisos d'accés al servidor intermediari a aquest usuari."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
+"Heu d'especificar un nom d'usuari vàlid per a atorgar-li permisos de "
+"servidor intermediari."
 
 #: ../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 ""
-"Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
-"diferent."
+"Ja existeix un compte anomenat «{0}». Hauríeu de comprovar l'arbre de "
+"carpetes."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "La signatura ja existeix"
+msgstr "Ja existeix el compte"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
+"No s'ha pogut entrar al servidor intermediari com a «{0}». Hauríeu de "
+"comprovar l'adreça de correu electrònic introduïda i tornar-ho a intentar."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "Fes-lo un esdeveniment periòdic"
+msgstr "Aquesta és una reunió periòdica"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
-msgid "What would you like to {0}?"
-msgstr "Voleu desar els canvis?"
+msgid "Would you like to accept it?"
+msgstr "Ho voleu acceptar?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-#, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "No s'ha pogut desar el fitxer de còpia automàtica &quot;{0}&quot;."
+msgid "Would you like to decline it?"
+msgstr "Ho voleu cancel·lar?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "No podeu compartir la carpeta amb l'usuari que heu especificat («{0}»)."
+
+#: ../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 ""
+"Heu d'especificar el nom de l'usuari al qual vulgueu afegir a la llista"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Accepta provisionalment"
 
@@ -17590,7 +17986,7 @@ msgid "Con_tacts..."
 msgstr "Con_tactes..."
 
 #: ../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 "Missatge"
 
@@ -17667,13 +18063,14 @@ msgstr "Servidor intermediari"
 msgid "<b>Account Name</b>"
 msgstr "<b>Nom del compte</b>"
 
+# Vegeu el comentari de sota referent a aquesta mateixa cadena (dpm)
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
-msgstr "Entrada per al servidor intermediari"
+msgstr "Entrada com a delegat"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17682,49 +18079,48 @@ msgstr "%sIntroduïu la contrasenya per a %s (usuari %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:509
 msgid "_Proxy Login..."
 msgstr "Entrada com a _delegat..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "La pestanya del delegat només estarà disponible quan el compte estigui en "
 "línia."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "La pestanya del delegat només estarà disponible quan el compte estigui "
 "habilitat."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Introduïu els usuaris i establiu els permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "_Carpeta compartida nova..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Compartició"
 
-#: ../plugins/groupwise-features/share-folder.c:544
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
-msgstr "Justificació"
+msgstr "Notificació personalitzada"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Afegeix   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modifica"
 
@@ -17789,11 +18185,11 @@ msgstr "Un connector per a configurar fonts de calendari Hula."
 msgid "Hula Account Setup"
 msgstr "Configuració del compte Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Capçaleres personalitzades"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Capçaleres IMAP"
 
@@ -17867,8 +18263,8 @@ msgstr "Seleccioneu una llista de tasques"
 msgid "Select Calendar"
 msgstr "Seleccioneu un calendari"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importa"
 
@@ -17905,13 +18301,14 @@ msgstr ""
 "L'Evolution no ha trobat cap iPod amb el qual poder-se sincronitzar. Pot ser "
 "que aquest no estigui connectat al sistema o bé que estigui apagat."
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Format de l'iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Sincronitza la llibreta d'adreces, calendari o tasca seleccionats amb un "
 "iPod d'Apple"
@@ -17924,131 +18321,131 @@ msgstr "Sincronitza l'iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronització de l'iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No s'ha pogut carregar el calendari «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Un esdeveniment del calendari «%s» coincideix amb aquesta reunió"
 
 # c-format
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "S'ha trobat l'esdeveniment al calendari «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "No s'ha pogut trobat cap calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "No s'ha pogut trobar aquesta reunió en cap calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "No s'ha pogut trobar la tasca a la llista de tasques"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "No s'ha pogut trobar aquesta anotació a la llista d'anotacions"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "S'està buscant una versió existent d'aquesta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "No s'ha pogut analitzar l'element"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No s'ha pogut enviar l'element al calendari «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "S'ha enviat al calendari «%s» com a acceptat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "S'ha enviat al calendari «%s» com a provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "S'ha enviat al calendari «%s» com a rebutjat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "S'ha enviat al calendari «%s» com a cancel·lat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organitzador ha suprimit el delegat %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envia un avís de cancel·lació al delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No s'ha pogut enviar un avís de cancel·lació al delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'estat de l'assistent no s'ha pogut actualitzar perquè l'estat no és vàlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No s'ha pogut actualitzar l'assistent. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "S'ha actualitzat l'estat de l'assistent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "S'ha enviat la informació de la reunió"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "S'ha enviat la informació de la tasca"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "S'ha enviat la informació de l'anotació"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No s'ha pogut enviar la informació de la reunió; la reunió no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "No s'ha pogut enviar la informació de la tasca; la tasca no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "No s'ha pogut enviar la informació de l'anotació; l'anotació no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "El calendari adjunt no és vàlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18056,15 +18453,15 @@ msgstr ""
 "El missatge no conté un calendari iCalendar vàlid, tot i que diu contenir-ne "
 "un."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "L'element en el calendari no és vàlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18072,11 +18469,11 @@ msgstr ""
 "El missatge conté un calendari, però el calendari no conté esdeveniments, "
 "tasques o informació de lliure/ocupat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "El calendari adjunt conté múltiples elements"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18084,234 +18481,234 @@ msgstr ""
 "Per processar tots els elements, s'hauria de desar el fitxer i importar el "
 "calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Aquesta _reunió és periòdica"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Aquesta tas_ca és periòdica"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Aquesta a_notació és periòdica"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "Suprimeix el missatge _després d'actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Cerca de conflictes"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccioneu els calendaris on cercar conflictes entre reunions"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Avui"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Avui a les %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Avui a les %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Avui a les %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Demà"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Demà a les %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Demà a les %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Demà a les %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demà a les %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A a les %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A a les %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A a les %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A a les %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../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:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B a les %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B a les %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B a les %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B a les %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B del %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B del %Y a les %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B del %Y a les %H:%M:%S"
 
 # consulteu man 3 strftime per comprendre aquest format
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B del %Y a les %l:%M %p"
 
 # consulteu man 3 strftime per comprendre aquest format
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B del %Y a les %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Responeu en nom de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Rebut en nom de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha publicat la següent informació de la "
 "reunió:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "En/na <b>%s</b> ha publicat la següent informació de la reunió:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "En/na <b>%s</b> us ha delegat la següent reunió:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, sol·licita la vostra presència a la reunió "
 "següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "En/na <b>%s</b> sol·licita la vostra presència a la reunió següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, es voldria afegir a una reunió existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18320,93 +18717,93 @@ msgstr ""
 "En/na <b>%s</b>, a través de %s, voldria rebre l'última informació sobre la "
 "reunió següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha retornat la resposta de reunió següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "En/na <b>%s</b> ha retornat la resposta de reunió següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "En/na <b>%s</b>, a través de %s, ha cancel·lat la reunió següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "En/na <b>%s</b> ha cancel·lat la següent reunió."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha proposat els següents canvis a la reunió."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "En/na <b>%s</b> ha proposat els següents canvis a la reunió."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha rebutjat els següents canvis a la reunió:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "En/na <b>%s</b> ha rebutjat els següents canvis a la reunió."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha publicat la següent informació de tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "En/na <b>%s</b> ha publicat la següent tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "En/na <b>%s</b> sol·licita assignar la següent tasca a %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "En/na <b>%s</b>, a través de %s, us ha assignat una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "En/na <b>%s</b> us ha assignat una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, es voldria afegir a una tasca existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18415,7 +18812,7 @@ msgstr ""
 "En/na <b>%s</b>, a través de %s, voldria rebre l'última informació per a la "
 "següent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18424,7 +18821,7 @@ msgstr ""
 "En/na <b>%s</b> voldria rebre l'última informació per a la següent tasca "
 "assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18432,23 +18829,23 @@ msgstr ""
 "En/na <b>%s</b>, a través de %s, ha retornat la següent resposta de la tasca "
 "assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "En/na <b>%s</b> ha retornat la següent resposta de la tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha cancel·lat la següent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "En/na <b>%s</b> ha cancel·lat la següent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18456,107 +18853,107 @@ msgstr ""
 "En/na <b>%s</b>, a través de %s, ha proposat els següents canvis "
 "d'assignació d'una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "En/na <b>%s</b> ha proposat els següents canvis d'assignació d'una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha rebutjat la següent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "En/na <b>%s</b> ha rebutjat la següent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "En/na <b>%s</b>, a través de %s, ha publicat la següent anotació:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "En/na <b>%s</b> ha publicat la següent anotació:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s es voldria afegir a una anotació existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "En/na <b>%s</b> es voldria afegir a una anotació existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr ""
 "En/na <b>%s</b>, a través de %s, ha cancel·lat l' anotació compartida "
 "següent:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "En/na <b>%s</b> ha cancel·lat l'anotació compartida següent:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "Obre el ca_lendari"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Declina"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Accepta"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Declina'ls tots"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Tots provisionalment"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "Provisionalmen_t"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Accepta'ls tots"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "Informació d'en_viament"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "Act_ualitza l'estat de l'assistent"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "Act_ualitza"
 
@@ -18661,7 +19058,8 @@ msgstr "Genera un missatge del D-Bus quan arribi correu nou."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Si es defineix com a cert, s'emetrà un to en rebre correu nou. En cas "
 "contrari, es reproduirà un fitxer de so."
@@ -18715,8 +19113,16 @@ msgstr "Si s'ha de notificar només per al correu nou a la safata d'entrada."
 msgid "Generate a _D-Bus message"
 msgstr "Genera un missatge del _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Notificació de correu de l'Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "Propietats de la notificació de correu"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18727,55 +19133,55 @@ msgid_plural ""
 msgstr[0] "Heu rebut %d missatge nou a %s."
 msgstr[1] "Heu rebut %d missatges nous a %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Heu rebut %d missatge nou."
 msgstr[1] "Heu rebut %d missatges nous."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Correu nou"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Mostra una icona a l'àrea de _notificació"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "Parpe_lleja la icona a l'àrea de notificació"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Mostra un _missatge emergent juntament amb la icona"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Re_produeix un de so quan arribi correu nou"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Emet un to"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "_Reprodueix un fitxer de so"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Especifiqueu un nom de _fitxer:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Seleccioneu un fitxer de so"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Reproduei_x"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Notifica només per als missatges a la safata _d'entrada"
 
@@ -18808,12 +19214,12 @@ msgstr "Con_verteix a reunió"
 msgid "Mail to meeting"
 msgstr "Correu a reunió"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No es pot obrir el calendari. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18927,7 +19333,7 @@ msgstr "Voleu enviar un correu electrònic a la llista?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. 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 ""
@@ -19015,6 +19421,26 @@ msgstr "_Subscriu a la llista"
 msgid "_Unsubscribe from List"
 msgstr "Cancel·la la s_ubscripció a la llista"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Also mark messages in subfolders?"
+msgstr "Voleu que també es marquin els missatges de les subcarpetes?"
+
+#: ../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 ""
+"Voleu marcar els missatges com a llegits només a la carpeta seleccionada, o "
+"bé a la carpeta seleccionada i a totes les seves subcarpetes?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+msgid "Current Folder and _Subfolders"
+msgstr "A la carpeta actual i a les seves _subcarpetes"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "_Només a la carpeta actual"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marca'ls tots com a llegits"
@@ -19059,7 +19485,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Administrador de connectors"
 
@@ -19071,33 +19497,24 @@ msgstr "Habilita i inhabilita connectors"
 msgid "_Plugins"
 msgstr "_Connectors"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autors"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Descripció"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Configuració"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Avís: alguns canvis només s'aplicaran després de reinciar"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Resum"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuració"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Aquest connector no té cap opció de configuració."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Connector"
 
@@ -19122,19 +19539,19 @@ msgstr "Mode de text sense format"
 msgid "Prefer plain-text"
 msgstr "Prefereixo text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:158
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Mostra HTML si n'hi ha"
 
-#: ../plugins/prefer-plain/prefer-plain.c:159
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Prefereixo text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:160
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Mostra només text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
@@ -19251,52 +19668,75 @@ msgstr ""
 "iCal\n"
 "Lliure/ocupat"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hola Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Proves del carregador del connector del Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Connector de prova del Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Carregador de l'EPlugin del connector de prova del Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Un connector que carrega altres connectors escrits en Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Carregador del Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (integrat)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "Connector de correu brossa de l'SpamAssassin"
+msgstr "No s'ha trobat l'SpamAssassin, codi retornat: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create pipe: %s"
-msgstr ""
-"No s'ha pogut crear el fitxer de sortida: %s\n"
-" %s"
+msgstr "No s'ha pogut crear el conducte («pipe»): %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"S'ha produït un error en %s:\n"
-" %s"
+msgstr "S'ha produït un error després de la crida «fork»: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "El procés fill de l'SpamAssassin no respon; se suprimirà..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
 msgstr ""
+"S'ha interromput l'espera per al procés fill del Spamassassin; es "
+"terminarà..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
+"Ha fallat la creació d'un conducte cap al SpamAssassin; el codi d'error fou: "
+"%d."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "Les opcions d'enviament no estan disponibles."
+msgstr "L'SpamAssassin no està disponible."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Això farà que l'SpamAssassin sigui més fiable, però més lent"
 
@@ -19328,7 +19768,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:314
 msgid "Save attachments"
 msgstr "Desa els fitxers adjunts"
 
@@ -19340,16 +19780,15 @@ msgstr "Desa els fitxers adjunts..."
 msgid "Save all attachments"
 msgstr "Desa tots els fitxers adjunts"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Selecciona el nom base per a desar"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Tipus MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Desa"
 
@@ -19357,79 +19796,79 @@ msgstr "Desa"
 #. * 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:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Llista de descripció"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Llista de categories"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Llista de comentaris"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Creat"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Llista de contactes"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Comença"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Acaba"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "percentatge fet"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Llista d'assistents"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modificat"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Opcions avançades del format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Afegeix una capçalera al començament"
 
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Separador de valors:"
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Separador de registres:"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsula els valors amb:"
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Format de valors separats per comes (.csv)"
 
@@ -19450,15 +19889,15 @@ msgstr "_Desa a disc"
 #. * 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:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Format RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Seleccioneu el fitxer destí"
 
@@ -19483,22 +19922,22 @@ msgid "Show _only this Task List"
 msgstr "Mo_stra només aquesta llista de tasques"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Un connector que gestiona l'auxiliar d'inici."
+msgid "Guides you through your initial account setup."
+msgstr "Us guiarà a través de la configuració del vostre compte inicial."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Auxiliar de l'inici"
+msgid "Setup Assistant"
+msgstr "Auxiliar de configuració"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Auxiliar de la configuració de l'Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Us donem la benvinguda"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19511,29 +19950,29 @@ msgstr ""
 "\n"
 "Feu clic a «Endavant» per a continuar."
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importació de fitxers"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccioneu la informació que voleu importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importació de dades."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Espereu"
 
@@ -19552,10 +19991,35 @@ msgid "Thread messages by subject"
 msgstr "Crea fils basats en l'assumpte"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Crea _fils segons l'assumpte dels missatges de manera predeterminada"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Llista de parells de clau/valor que el connector de plantilles substituirà "
+"en el cos d'un missatge."
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "Sense títol"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Desa com a _plantilla"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Desa com a plantilla"
+
+# FIXME (dpm)
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Connector de plantilla basat en esborranys"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -19566,6 +20030,28 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "Descodificador de fitxers adjunts TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un connector per a configurar els contactes WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactes WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Evita l'IfMatch (requerit per a l'Apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Intèrpret d'ordres de l'Evolution"
@@ -19583,146 +20069,147 @@ msgid "Evolution Test component"
 msgstr "Component de prova de l'Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Una cadena de descripció de la configuració d'impressió actual."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
+"Utilitza l'autenticació per a les connexions a través del servidor "
+"intermediari"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
-msgstr "Reconeix automàticament les icones de caretes"
+msgstr "URL de configuració automàtica del servidor intermediari"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Versió de la configuració"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Decideix si s'ha d'executar o no la funció de detecció de fallades."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Amplada predeterminada de la barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Alçada predeterminada de la finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Estat predeterminat de la finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Amplada predeterminada de la finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
+"Habilita els paràmetres de servidor intermediari en accedir a l'HTTP/HTTP "
+"segur a través d'Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "Nom de servidor del servidor intermediari per a l'HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
-msgstr "Introduïu la contrasenya"
+msgstr "Contrasenya del servidor intermediari per a l'HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "Port del servidor intermediari per a l'HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "Nom d'usuari per al servidor intermediari per a l'HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 àlies del component a mostrar per defecte a l'inici de manera "
-"predeterminada."
+"Identificador o sobrenom del component a mostrar per defecte a l'inici de "
+"manera predeterminada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"Si és cert, caldrà autenticar-se en connectar-se al servidor intermediari. "
+"El nom d'usuari s'obté de la clau «/apps/evolution/shell/network_config/"
+"authentication_user» del GConf, i la contrasenya de l'anell de claus del "
+"Gnome o bé del fitxer de contrasenyes ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
-msgstr "Última versió de la configuració actualitzada"
+msgstr "Versió de la darrera actualització de la configuració"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Llista de camins de les carpetes a sincronitzar al disc per a la utilització "
 "fora de línia"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "Ordinadors sense servidor intermediari"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Contrasenya a utilitzar per a l'autenticació al servidor intermediari."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
-msgstr "Configuració"
+msgstr "Mode de configuració del servidor intermediari"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "Nom de servidor del servidor intermediari per al SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "Port del servidor intermediari per al SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "Nom de servidor del servidor intermediari per a l'HTTP segur"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "Port del servidor intermediari per a l'HTTP segur"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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 ""
+"Selecciona el mode de configuració del servidor intermediari. Els valors "
+"permesos són 0, 1, 2 i 3, els quals representen, respectivament, «use system "
+"settings» (utilitza els paràmetres del sistema), «use manual proxy "
+"configuration» (utilitza la configuració manual del servidor intermediari) i "
+"«use proxy configuration provided in the autoconfig url» (utilitza la "
+"configuració del servidor intermediari proporcionada a l'URL de configuració "
+"automàtica)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "La barra lateral és visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Omet el diàleg d'avís de versió de desenvolupament"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Omet el diàleg d'avís de recuperació"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Inicia en mode fora de línia"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "La barra d'estat és visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19730,19 +20217,19 @@ msgstr ""
 "La versió de la configuració de l'Evolution, amb nivell major/menor/"
 "configuració (per exemple «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Alçada predeterminada de la finestra principal, en píxels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Amplada predeterminada de la finestra principal, en píxels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "L'amplada predeterminada de la barra lateral, en píxels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../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\")."
@@ -19750,119 +20237,125 @@ msgstr ""
 "La darrera versió actualitzada de  la configuració de l'Evolution, amb "
 "nivell major/menor/configuració (per exemple «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr ""
+"El nom de la màquina que actuarà com a servidor intermediari per a l'HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
+"El nom de la màquina que actuarà com a servidor intermediari per a l'HTTP "
+"segur."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr ""
+"El nom de la màquina que actuarà com a servidor intermediari per al SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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 ""
+"El port de la màquina definit a «/apps/evolution/shell/network_config/"
+"http_host», a través del qual s'accedeix al servidor intermediari."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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 ""
+"El port de la màquina definit a «/apps/evolution/shell/network_config/"
+"secure_host», a través del qual s'accedeix al servidor intermediari."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 ""
+"El port de la màquina definit a «/apps/evolution/shell/network_config/"
+"socks_host», a través del qual s'accedeix al servidor intermediari."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 ""
-"L'estil dels botons de la finestra. Pot ser «text», «icons», "
-"«both» (ambdós), o «toolbar» (barra d'eines). Si s'habilita «toolbar», "
-"l'estil dels botons es determina mitjançant la configuració de la barra "
-"d'eines del GNOME."
+"L'estil dels botons de la finestra. Pot ser «text», «icons», «both» (ambdós), o "
+"«toolbar» (barra d'eines). Si s'habilita «toolbar», l'estil dels botons es "
+"determina mitjançant la configuració de la barra d'eines del GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../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 ""
+"Aquesta clau conté una llista d'ordinadors als quals es connectarà "
+"directament en lloc d'utilitzar el servidor intermediari (en cas que s'hagi "
+"activat). Els valors poden ser noms d'ordinadors, dominis (amb comodins com "
+"ara *.exemple.cat), adreces IP d'ordinadors (tant IPv4 com IPv6), i adreces "
+"de xarxa amb màscara de xarxa (com per exemple 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "La barra d'eines és visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
-msgstr "Última versió de la configuració actualitzada"
+msgstr ""
+"URL que proporciona els valors de configuració del servidor intermediari."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "Utilitza un servidor intermediari HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
+"Nom d'usuari a utilitzar per a l'autenticació quan es faci servir un "
+"servidor intermediari HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Si l'Evolution s'inicia en mode fora de línia en comptes del mode en línia."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Si s'ha d'executar la detecció de fallades o no"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Si s'ha de maximitzar la finestra."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Si s'ha de veure la barra lateral."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Si s'ha de veure la barra d'estat."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Si s'ha de veure la barra d'eines."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Si s'ha de mostrar el diàleg d'avís per a indicar que s'està executant una "
 "versió de desenvolupament de l'Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Si s'ha de mostrar el diàleg d'avís quan es produeixi una recuperació de "
-"l'Evolution."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Si s'han de veure els botons de la finestra."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Estil del botó de la finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Els botons de la finestra són visibles"
 
@@ -19880,29 +20373,23 @@ msgstr ""
 "Feu clic a d'acord per a tancar aquestes connexions i passar a mode fora de "
 "línia"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Escolliu el tipus d'importador a executar:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 "Escolliu el fitxer que vulgueu importar a l'Evolution i seleccioneu-ne el "
-"tipus de la llista.\n"
-"\n"
-"En cas de desconèixer el tipus, podeu seleccionar l'opció «Automàtic» i "
-"l'Evolution intentarà descobrir-lo."
+"tipus de la llista."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Escolliu la destinació per a aquesta importació"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -19914,23 +20401,23 @@ msgstr ""
 "No s'ha trobat cap configuració que es pugui importar. Si ho\n"
 "voleu tornar a intentar, feu clic al botó «Endarrere».\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Nom del f_itxer:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Tipus de fitxer:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importador de les dades i la configuració de pr_ogrames vells"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Impo_rtador de fitxers individuals"
 
@@ -19938,29 +20425,9 @@ msgstr "Impo_rtador de fitxers individuals"
 msgid "Evolution Preferences"
 msgstr "Preferències de l'Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "No s'ha especificat cap nom de carpeta."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "El nom de la carpeta no pot contenir el caràcter «retorn»."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "El nom de la carpeta no pot contenir el caràcter «/»."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "El nom de la carpeta no pot contenir el caràcter «#»."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "«.» i «..» són noms de carpeta reservats."
-
 #. 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:50 ../shell/e-shell-window.c:343
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19986,7 +20453,7 @@ msgstr "No es pot executar el Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Víctor Nieto <vnie2025@alu-etsetb.upc.es>\n"
@@ -19998,69 +20465,73 @@ msgstr ""
 "Gil Forcada <gilforcada@guifi.net>\n"
 "David Planella Molas <david.planella@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Lloc web de l'Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "S'ha produït un error en obrir la pàgina web de les PMF."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Treballa en línia"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Treballa fora de línia"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Treballa fora de línia"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"L'Evolution està en línia. Feu clic en aquest botó per a treballar fora de "
-"línia."
+"L'Evolution està en línia.\n"
+"Feu clic en aquest botó per a treballar fora de línia."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "L'Evolution està procedint a treballar fora de línia."
 
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"L'Evolution està fora de línia. Feu clic en aquest botó per a treballar en "
-"línia."
+"L'Evolution està fora de línia.\n"
+"Feu clic en aquest botó per a treballar en línia."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Commuta a %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "S'ha produït un error desconegut del sistema."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "D'acord"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Els arguments no són vàlids"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "No s'ha pogut registrar a l'OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "No s'ha pogut trobar la base de dades de configuració."
 
@@ -20070,15 +20541,11 @@ msgstr "No s'ha pogut trobar la base de dades de configuració."
 msgid "New"
 msgstr "Nou"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Prova nova"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "P_rova"
-
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Crea un element de prova nou"
 
@@ -20122,7 +20589,7 @@ msgstr ""
 "per a importar fitxers externs a l'Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20158,7 +20625,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feina, i esperem\n"
 "ansiosament les vostres contribucions.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20166,69 +20633,45 @@ msgstr ""
 "Gràcies\n"
 "L'equip de l'Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "No ho tornis a mostrar"
 
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr "Detecció de fallades de l'Evolution"
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "I_gnora"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Sembla que l'Evolution va finalitzar de manera inesperada l'últim cop \n"
-"que es va executar. Com a mesura preventiva, s'ocultaran totes les \n"
-"subfinestres de previsualització, les quals podreu restaurar manualment \n"
-"des del menú Visualitza.\n"
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "_No tornis a mostrar aquest missatge."
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Inicia en mode en línia"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Força l'aturada de tots els components de l'Evolution"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Força tornar a migrar des de l'Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de depuració de tots els components a un fitxer."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Inhabilita la càrrega de connectors."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 "Inhabilita la subfinestra de previsualització per al Correu, Contactes i "
 "Tasques."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "EL gestor d'informació personal i client de correu de l'Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20373,7 +20816,7 @@ msgstr ""
 "Si decidiu continuar, potser no podreu accedir a algunes de les vostres "
 "dades antigues.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20384,7 +20827,7 @@ msgstr ""
 "\n"
 "Editeu la configuració de la confiança:"
 
-#: ../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 "
@@ -20394,7 +20837,7 @@ msgstr ""
 "certificat, confieu en l'autenticitat d'aquest certificat a no ser que aquí "
 "s'especifiqui el contrari"
 
-#: ../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 "
@@ -20452,27 +20895,27 @@ msgstr "Adreça de correu electrònic"
 msgid "All CA certificate files"
 msgstr "Tots els fitxers de certificat d'entitats certificadores"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualitzador de certificats: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduïu la contrasenya per a «%s»"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Introduïu una contrasenya nova per a la base de dades de certificats"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Introduïu la contrasenya nova"
 
 #. 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"
@@ -20481,7 +20924,7 @@ msgstr ""
 "Emès per a:\n"
 "  Assumpte: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20490,7 +20933,7 @@ msgstr ""
 "Emès per:\n"
 "  Assumpte: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Seleccioneu el certificat"
 
@@ -20684,7 +21127,7 @@ msgid "_Edit CA Trust"
 msgstr "_Edita la confiança en l'entitat certificadora"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "El certificat ja existeix"
 
@@ -20854,15 +21297,15 @@ msgstr "Identificador únic de l'assumpte"
 msgid "Certificate Signature Value"
 msgstr "Valor de la signatura de certificat"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "Fitxer de contrasenya PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduïu la contrasenya per al fitxer PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Certificat importat"
 
@@ -20917,7 +21360,7 @@ msgid "Copy to Folder..."
 msgstr "Copia a una carpeta..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Crea una carpeta de llibreta d'adreces nova"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -21002,8 +21445,7 @@ msgstr "Desa els contactes de la carpeta seleccionada com a VCard."
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Seleccion_a-ho tot"
 
@@ -21072,7 +21514,7 @@ msgstr "_Mou el contacte a..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mou la carpeta de contactes a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nou"
 
@@ -21133,7 +21575,7 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Següent"
 
@@ -21142,7 +21584,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el calendari que s'ha d'imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
@@ -21210,201 +21652,6 @@ msgstr "Setmana laborable"
 msgid "_Open Appointment"
 msgstr "_Obre una cita:"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Feu clic per a adjuntar un fitxer"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Feu clic per a tancar la finestra actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Feu clic per a desar la finestra actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Feu clic per a veure l'ajuda disponible"
-
-#.
-#. <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-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Tanca"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copia el text seleccionat al porta-retalls"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Retalla el text seleccionat al porta-retalls"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nsereix"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Enganxa el text del porta-retalls"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Selecciona tot el text"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "A_juda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opcions"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Esdeveniment de tot el dia"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Esdeveniment de tot el _dia"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Classifica com a confidencial"
-
-#: ../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 "Classifica com a privat"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Classifica com a públic"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Feu clic aquí per a seleccionar o desfer la selecció d'alarmes per a "
-"l'esdeveniment"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Insereix opcions avançades d'enviament"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Fes-lo un esdeveniment periòdic"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blic"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Sol·licita la informació de lliure/ocupat dels assistents"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Camp del r_ol"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opcions d'enviament"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Mostra el temps com a _ocupat"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Fus h_orari"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Commuta la visualització del camp del tipus d'assistent"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Commuta si s'ha de mostrar el camp RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Commuta la visualització del camp del rol"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Commuta la visualització del camp d'estat"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Commuta la visualització del fus horari"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Commuta la visualització de categories"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Commuta per tenir l'esdeveniment tot el dia"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Commuta la visualització del temps com a ocupat"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmes"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categories"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Classificació"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Lliure/ocupat:"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-# Prové de «Répondez s'il-vous-plaît» (dpm)
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "Esperem la vostra _resposta"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Periodicitat"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Camp d'e_stat"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Camp de _tipus"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancel·la l'operació de correu actual"
@@ -21436,7 +21683,6 @@ msgid "Empty _Trash"
 msgstr "Buida la _paperera"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "C_arpeta"
 
@@ -21658,7 +21904,7 @@ msgstr "Llista de missatges amb fils"
 msgid "_Group By Threads"
 msgstr "Agrupa per _fils"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Missatges"
@@ -21997,130 +22243,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra un cursor parpellejant en el cos dels missatges visualitzats"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Mostra els missatges amb l'estil normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Mostra els missatges amb totes les capçaleres"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Mostra el codi del missatge de correu"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Desfés la supressió dels missatges seleccionats"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Poc i_mportant"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "A_llunya"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Adjuntat"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Mode de _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "Nete_ja el senyalador"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "Suprimeix el _missatge"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Cerca en el missatge..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Sen_yalador completat"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Vés a"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Important"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Inserit"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Brossa"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Carrega i_matges"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Font del _missatge"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "Missatge següe_nt"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Mida _normal"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_No és brossa"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Obre en una finestra nova"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Missa_tge anterior"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citat"
 
-# FIXME: This has double meaning. jm
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Llegit"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "De_sa el missatge..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "Desfés la s_upressió del missatge"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "No ll_egit"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "A_propa"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "A_propa"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Tanca aquesta finestra"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Tanca"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -22158,82 +22399,6 @@ msgstr "Visualitza l'anotació seleccionada"
 msgid "_Open Memo"
 msgstr "_Obre l'anotació"
 
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "Ta_nca"
-
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mat"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Desa i tanca"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Desa i tan_ca"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Desa el fitxer actual i tanca la finestra"
-
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Envia el missatge en format HTML"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Afegeix una carpeta a la llista de carpetes subscrites"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Actualitza la llista"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Actualitza la llista de carpetes"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Suprimeix la carpeta de la llista de carpetes subscrites"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Subscriu-me"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Cancel·la la subscripció"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverteix la selecció"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-"Feu clic per a canviar / visualitzar els detalls de l'estat de la tasca"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detalls de l'estat"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fus horari"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detalls de l'e_stat"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copia les tasques seleccionades"
@@ -22429,50 +22594,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Mostra/amaga la barra d'estat"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Treballa _fora de línia"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Tanca la finestra"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Preguntes Més Freqüents"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "O_culta els botons"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Només _icones"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "Referència rà_pida"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Aparença de l'_intercanviador"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opcions de _sincronització..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Només _text"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Finestra"
 
@@ -22549,11 +22718,11 @@ msgid "With _Status"
 msgstr "Amb e_stat"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -22571,7 +22740,7 @@ msgstr "Seleccioneu una fus horari"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Quadre combinat per a seleccionar el fus horari"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22583,19 +22752,19 @@ msgstr ""
 "seleccioneu un fus horari.\n"
 "Feu servir el botó dret del ratolí per desfer l'ampliació anterior."
 
-#: ../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 "Col·lecció"
 
-#: ../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 "Defineix les visualitzacions per a %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 "Defineix les visualitzacions"
 
@@ -22612,11 +22781,11 @@ msgstr "Defineix les visualitzacions per a «%s»"
 msgid "Table"
 msgstr "Taula"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instància"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Desa la visualització actual"
 
@@ -22630,7 +22799,7 @@ msgstr "_Reemplaça la visualització actual"
 
 #. 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 "Visualització personalitzada"
 
@@ -22639,42 +22808,42 @@ msgid "Save Custom View"
 msgstr "Desa la visualització personalitzada"
 
 #: ../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 "Defineix les visualitzacions..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Vis_ualització actual"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Seleccioneu la visualització: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "La visualització actual ha estat personalitzada"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Desa la visualització personalitzada..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Desa la visualització personalitzada actual"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Crea o edita visualitzacions"
 
 # gal/widgets/e-categories-master-list-dialog.c:194
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fàbrica"
 
 # gal/menus/gal-define-views.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Defineix una visualització nova"
 
@@ -22690,44 +22859,17 @@ msgstr "Tipus de visualització"
 msgid "Type of view:"
 msgstr "Tipus de visualització:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, fuzzy, c-format
-msgid "%.1f KB"
-msgstr "%s KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, fuzzy, c-format
-msgid "%.1f MB"
-msgstr "%.0fM"
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, fuzzy, c-format
-msgid "%.1f GB"
-msgstr "%.0fG"
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra de fitxers adjunts"
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "percentatge fet"
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No s'ha pogut adjuntar el fitxer %s: %s"
 
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "No s'ha pogut adjuntar el fitxer %s: no és un fitxer normal"
@@ -22749,11 +22891,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Calendari mensual"
 
@@ -22800,30 +22942,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "Amplada mínima"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "Amplada mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Espaiat"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Ara"
 
-#: ../widgets/misc/e-cell-date-edit.c:797
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "L'hora ha d'estar en el format: %s"
@@ -22832,151 +22974,150 @@ msgstr "L'hora ha d'estar en el format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdós inclosos"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Aràbic"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Bàltic"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Centreeuropeu"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Xinès"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grec"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japonès"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Coreà"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Tai"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../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 "Europeu occidental"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Europeu occidental, nou"
 
-#: ../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 "Simplificat"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
-#: ../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 "Joc de caràcters desconegut: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Codificació dels caràcters"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Introduïu el joc de caràcters a utilitzar"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Altres..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Codificació dels c_aràcters"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Data i hora"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Entrada de text per a la data"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Feu clic a aquest botó per a mostrar un calendari"
 
-#: ../widgets/misc/e-dateedit.c:409
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Quadre combinat per a seleccionar l'hora"
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "A_ra"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "A_vui"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "El valor de la data no és vàlid"
 
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "El valor de l'hora no és vàlid"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Expandit"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Si l'expansor està expandit"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Text de l'etiqueta de l'expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Utilitza el caràcter de subratllat"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22984,93 +23125,92 @@ msgstr ""
 "Si està habilitat, caràcter de subratllat en el text indicarà que el "
 "caràcter següent s'ha d'utilitzar com a tecla acceleradora"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Espai que es posarà entre l'etiqueta i el fill"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Element d'interfície gràfica d'etiqueta"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Un element d'interfície gràfica a mostrar en comptes de l'etiqueta "
 "d'expansió habitual"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Mida de l'expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Mida de la fletxa de l'expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Espaiat de l'indicador"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Espaiat al voltant de la fletxa de l'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 "Cerca avançada"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Desa la cerca"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Cerques"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Cerques"
 
-#: ../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 "De_sa la cerca..."
 
-#: ../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 "_Edita les cerques desades..."
 
-#: ../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 "Cerca _avançada..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Comptes de correu"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Compte actual"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Missatge actual"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Escolliu una imatge"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa del món"
 
-#: ../widgets/misc/e-map.c:628
-#, fuzzy
+#: ../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."
@@ -23078,15 +23218,23 @@ msgstr ""
 "Mapa interactiu per seleccionar el fus horari amb el ratolí. Els usuaris amb "
 "teclat haurien de seleccionar el fus horari amb el quadre combinat de sota."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "En línia"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "L'estat del botó és en línia"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sincronitza amb:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sincronitza els registres privats:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Categories de sincronització:"
 
@@ -23102,74 +23250,74 @@ msgstr "Model de reflux"
 msgid "Column width"
 msgstr "Amplada de la columna"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Cerca"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Feu clic aquí per a canviar el tipus de cerca"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Cerca ara"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Neteja"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID de l'element"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1018
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "Mos_tra: "
 
 #. 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:1035
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "Cer_ca: "
 
 #. 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:1047
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " _a "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Fila del cursor"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Columna del cursor"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Tipus d'ordenació"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Mode de selecció"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Mode del cursor"
 
@@ -23197,10 +23345,6 @@ msgstr "<b>Seguiment de l'estat</b>"
 msgid "A_uto-delete sent item"
 msgstr "S_uprimeix l'element enviat automàticament"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classificació"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Cr_ea un element enviat per seguir la informació"
@@ -23307,19 +23451,19 @@ msgid "_When opened:"
 msgstr "En _obrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completat)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Feu clic per a anar a l'URL"
 
@@ -23537,95 +23681,95 @@ msgstr ""
 "Per afegir una columna a la vostra taula, arrossegueu-la\n"
 "a la ubicació on vulgueu que aparegui."
 
-#: ../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 element)"
 msgstr[1] "%s : %s (%d elements)"
 
-#: ../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 element)"
 msgstr[1] "%s (%d elements)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alterna els colors de fila"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Graella de dibuix horitzontal"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Graella de dibuix vertical"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Dibuixa el focus"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Mode del cursor"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Model de selecció"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Llindar de la longitud"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Alçada de fila uniforme"
 
-#: ../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 "Aturat"
 
@@ -23703,7 +23847,7 @@ msgid "Font Description"
 msgstr "Descripció del tipus de lletra"
 
 #: ../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 "Ordena informació"
 
@@ -23713,36 +23857,36 @@ msgstr "Ordena informació"
 msgid "Tree"
 msgstr "Arbre"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Capçalera de la taula"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Model de la taula"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Cerca sempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Afegeix amb un clic"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Adaptador de taula ETree"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Aparença retro"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Dibuixa línies i expansors +/-."
 
@@ -23839,7 +23983,6 @@ msgstr "Dibuixa el fons"
 msgid "Draw button"
 msgstr "Dibuixa el botó"
 
-# gal/widgets/color-palette.c:438
 #: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Posició del cursor"
@@ -23852,6 +23995,256 @@ msgstr "Context de MI"
 msgid "Handle Popup"
 msgstr "Menú emergent de l'ansa"
 
+#~ msgctxt "New"
+#~ msgid "_Contact"
+#~ msgstr "_Contacte"
+
+#~ msgctxt "New"
+#~ msgid "Contact _List"
+#~ msgstr "_Llista de contactes"
+
+#~ msgctxt "New"
+#~ msgid "Address _Book"
+#~ msgstr "Lli_breta d'adreces"
+
+#~ msgctxt "New"
+#~ msgid "_Appointment"
+#~ msgstr "Cit_a"
+
+#~ msgctxt "New"
+#~ msgid "M_eeting"
+#~ msgstr "R_eunió"
+
+#~ msgctxt "New"
+#~ msgid "All Day A_ppointment"
+#~ msgstr "Cita de tot el _dia"
+
+#~ msgctxt "New"
+#~ msgid "Cale_ndar"
+#~ msgstr "Cale_ndari"
+
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Do_cuments recents"
+
+#~ msgctxt "New"
+#~ msgid "Mem_o"
+#~ msgstr "An_otació"
+
+#~ msgctxt "New"
+#~ msgid "_Shared memo"
+#~ msgstr "Anotació _compartida"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Ll_ista d'anotacions"
+
+#~ msgctxt "New"
+#~ msgid "_Task"
+#~ msgstr "_Tasca"
+
+#~ msgctxt "New"
+#~ msgid "Assigne_d Task"
+#~ msgstr "Tasca assigna_da"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "Llista de tas_ques"
+
+#~ msgctxt "folder-display"
+#~ msgid "%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgctxt "New"
+#~ msgid "_Mail Message"
+#~ msgstr "_Missatge de correu"
+
+#~ msgctxt "New"
+#~ msgid "Mail _Folder"
+#~ msgstr "Carpeta de correu"
+
+#~ msgctxt "New"
+#~ msgid "_Test"
+#~ msgstr "P_rova"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propietats..."
+
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "«{0}» és una font de calendari a la qual no és permès escriure-hi. Canvieu "
+#~ "a la visualització de calendari i ressalteu un calendari que pugui "
+#~ "acceptar cites."
+
+#~ msgid "D_escription:"
+#~ msgstr "D_escripció:"
+
+#~ msgid "De_scription:"
+#~ msgstr "Desc_ripció:"
+
+#~ msgid "Updating query"
+#~ msgstr "S'està actualitzant la consulta"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Properes cites"
+
+#~ msgid "_Save Message"
+#~ msgstr "De_sa el missatge"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Voleu que també s'apliqui l'operació a les subcarpetes?"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr ""
+#~ "Voleu marcar tots els missatges d'aquesta carpeta i les seves subcarpetes "
+#~ "com a llegits?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Només a la _carpeta actual"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Habilita el connector de recordatori d'adjuncions"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Habilita el connector de recordatori d'adjuncions."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "Re_corda'm l'adjunció de fitxers"
+
+# FIXME [l10n-bug] (dpm)
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Aquest connector no té cap opció de configuració."
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "Un connector que gestiona l'auxiliar d'inici."
+
+#~ msgid "Startup wizard"
+#~ msgstr "Auxiliar de l'inici"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Una cadena de descripció de la configuració d'impressió actual."
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Decideix si s'ha d'executar o no la funció de detecció de fallades."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Omet el diàleg d'avís de recuperació"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Si s'ha d'executar la detecció de fallades o no"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Si s'ha de mostrar el diàleg d'avís quan es produeixi una recuperació de "
+#~ "l'Evolution."
+
+#~ msgid "No folder name specified."
+#~ msgstr "No s'ha especificat cap nom de carpeta."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "El nom de la carpeta no pot contenir el caràcter «retorn»."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "El nom de la carpeta no pot contenir el caràcter «/»."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "El nom de la carpeta no pot contenir el caràcter «#»."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "«.» i «..» són noms de carpeta reservats."
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Detecció de fallades de l'Evolution"
+
+#~ msgid "Ig_nore"
+#~ msgstr "I_gnora"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Sembla que l'Evolution va finalitzar de manera inesperada l'últim cop \n"
+#~ "que es va executar. Com a mesura preventiva, s'ocultaran totes les \n"
+#~ "subfinestres de previsualització, les quals podreu restaurar manualment \n"
+#~ "des del menú Visualitza.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_No tornis a mostrar aquest missatge."
+
+#~ msgid "I_nsert"
+#~ msgstr "I_nsereix"
+
+#~ msgid "All Day Event"
+#~ msgstr "Esdeveniment de tot el dia"
+
+#~ msgid "Send _Options"
+#~ msgstr "_Opcions d'enviament"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Mostra els missatges amb l'estil normal"
+
+#~ msgid "C_lose"
+#~ msgstr "Ta_nca"
+
+#~ msgid "For_mat"
+#~ msgstr "For_mat"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and Close"
+#~ msgstr "Desa i tanca"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Desa i tan_ca"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Desa el fitxer actual i tanca la finestra"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Envia el missatge en format HTML"
+
+#~ msgid "Refresh List"
+#~ msgstr "Actualitza la llista"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Actualitza la llista de carpetes"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Suprimeix la carpeta de la llista de carpetes subscrites"
+
+#~ msgid "Subscribe"
+#~ msgstr "Subscriu-me"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Cancel·la la subscripció"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverteix la selecció"
+
+#~ msgid "Status Details"
+#~ msgstr "Detalls de l'estat"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fus horari"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
 #~ msgid "Permission Denied."
 #~ msgstr "S'ha denegat el permís."
 
@@ -23899,9 +24292,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgstr ""
 #~ "Voleu suprimir els missatges de la carpeta de cerca &quot;{0}&quot;?"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "_Continua amb l'edició"
-
 #~ msgid "_Refresh:"
 #~ msgstr "Actualit_za:"
 
@@ -23947,9 +24337,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Save As"
 #~ msgstr "Anomena i desa"
 
-#~ msgid "Save Draft"
-#~ msgstr "Desa l'esborrany"
-
 #~ msgid "Save in folder..."
 #~ msgstr "Desa a la carpeta..."
 
@@ -24087,216 +24474,258 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "MTWTFSS"
 #~ msgstr "LMXJVSD"
 
-#~ msgid "_Phone List"
-#~ msgstr "Llista de telè_fons"
-
 #~ msgid "Emulate label resize"
 #~ msgstr "Emula l'escalat d'etiquetes"
 
 #~ msgid "Task sort"
 #~ msgstr "Ordre de les tasques"
 
-# gal/e-table/e-table-config.c:307
 #~ msgid "Memo sort"
-#~ msgstr "Ordena les anotacions"
+#~ msgstr "Ordre de les anotacions"
 
+#, fuzzy
 #~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "El gestor d'informació personal i client de correu de l'Evolution"
+#~ msgstr "EL gestor d'informació personal i client de correu de l'Evolution"
 
+#, fuzzy
 #~ msgid "HTML Mail"
-#~ msgstr "Correu HTML"
+#~ msgstr "Missatges HTML"
 
+#, fuzzy
 #~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "Seleccioneu un fitxer png de 48 x 48 i menys de 720 bytes"
+#~ msgstr "Seleccioneu un fitxer PNG de 48 x 48 i menys de 700 bytes"
 
+#, fuzzy
 #~ msgid "<- _Remove"
-#~ msgstr "<- Sup_rimeix"
+#~ msgstr "Sup_rimeix"
 
+#, fuzzy
 #~ msgid "Sh_ow these fields in order:"
-#~ msgstr "M_ostra aquests camps en ordre:"
+#~ msgstr "Mo_stra aquests camps en ordre:"
 
+#, fuzzy
 #~ msgid "_Add ->"
-#~ msgstr "_Afegeix ->"
+#~ msgstr "_Afegeix "
 
+#, fuzzy
 #~ msgid "A Folder with this name already exists"
-#~ msgstr "Ja existeix una carpeta amb el mateix nom"
+#~ msgstr "La carpeta ja existeix"
 
+#, fuzzy
 #~ msgid "_Address: "
-#~ msgstr "_Adreça: "
+#~ msgstr "_Adreça:"
 
+#, fuzzy
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
-#~ "L'adreça de correu o el nom canviat d'aquest contacte\n"
-#~ "ja existeix en aquesta carpeta. Voleu afegir-lo?"
+#~ "Ja existeix el nom o l'adreça de correu electrònic d'aquest contacte en "
+#~ "aquesta carpeta. Voleu afegir-l'hi de totes maneres?"
 
+#, fuzzy
 #~ msgid "Print cards"
-#~ msgstr "Imprimeix les targetes"
+#~ msgstr "Imprimeix les tasques"
 
+#, fuzzy
 #~ msgid "Organization"
-#~ msgstr "Organització"
+#~ msgstr "_Organització:"
 
+#, fuzzy
 #~ msgid "E-mail"
 #~ msgstr "Adreça electrònica"
 
+#, fuzzy
 #~ msgid "GTK Tree View"
-#~ msgstr "Visualització d'arbre del GTK"
+#~ msgstr "Visualització setmanal"
 
+#, fuzzy
 #~ msgid "Print envelope"
-#~ msgstr "Imprimeix el sobre"
+#~ msgstr "Pre_visualització d'impressió"
 
+#, fuzzy
 #~ msgid "Print contacts"
-#~ msgstr "Imprimeix els contactes"
+#~ msgstr "Imprimeix els contactes seleccionats"
 
+#, fuzzy
 #~ msgid "Print contact"
-#~ msgstr "Imprimeix el contacte"
+#~ msgstr "Imprimeix els contactes seleccionats"
 
+#, fuzzy
 #~ msgid "Error loading default addressbook."
-#~ msgstr ""
-#~ "S'ha produït un error en carregar la llibreta d'adreces predeterminada."
+#~ msgstr "S'ha produït un error en carregar la llibreta d'adreces."
 
+#, fuzzy
 #~ msgid "Input File"
-#~ msgstr "Fitxer d'entrada"
+#~ msgstr "Importa un fitxer"
 
+#, fuzzy
 #~ msgid ""
 #~ "All information in these journal entries will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
-#~ "Se suprimirà tota la informació d'aquestes entrades al diari i no es "
-#~ "podrà recuperar."
+#~ "Se suprimirà tota la informació en aquestes anotacions i no es podrà "
+#~ "recuperar."
 
+#, fuzzy
 #~ msgid ""
 #~ "All information on this journal entry will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
-#~ "Se suprimirà tota la informació d'aquesta entrada al diari, i no es podrà "
-#~ "recuperar."
+#~ "Se suprimirà tota la informació d'aquesta cita i no es podrà recuperar."
 
+#, fuzzy
 #~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "Segur que voleu suprimir l'entrada al diari «{0}»?"
+#~ msgstr "Segur que voleu suprimir l'anotació «{0}»?"
 
+#, fuzzy
 #~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "Segur que voleu suprimir aquestes {0} entrades al diari?"
+#~ msgstr "Segur que voleu suprimir aquestes {0} cites?"
 
+#, fuzzy
 #~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "Segur que voleu suprimir aquesta entrada al diari?"
+#~ msgstr "Segur que voleu suprimir aquest compte?"
 
-# NOTA: Aquesta entrada no té sentit, només és aquí perquè s'ha reutilitzat
-#   codi. Això fa rederència a VJOURNAL, que no permet ATTENDEES.
-#
+#, fuzzy
 #~ msgid ""
 #~ "If you do not send a cancelation notice, the other participants may not "
 #~ "know the journal has been deleted."
 #~ msgstr ""
 #~ "Si no envieu un avís de cancel·lació, els altres participants no sabran "
-#~ "que s'ha esborrat el diari."
+#~ "que s'ha suprimit l'anotació."
 
+#, fuzzy
 #~ msgid "Add Calendar"
-#~ msgstr "Afegeix un calendari"
+#~ msgstr "Calendari"
 
+#, fuzzy
 #~ msgid "Add Task List"
-#~ msgstr "Afegeix una llista de tasques"
+#~ msgstr "Llista de tasques"
 
+#, fuzzy
 #~ msgid "_Add Calendar"
-#~ msgstr "_Afegeix un calendari"
+#~ msgstr "_Calendari:"
 
+#, fuzzy
 #~ msgid "_Add Task List"
-#~ msgstr "_Afegeix una llista de tasques"
+#~ msgstr "Llista de tasques _nova"
 
+#, fuzzy
 #~ msgid "This journal entry has been deleted."
-#~ msgstr "S'ha suprimit aquesta entrada al diari."
+#~ msgstr "S'ha suprimit l'esdeveniment."
 
+#, fuzzy
 #~ msgid "This journal entry has been changed."
-#~ msgstr "S'ha canviat aquesta entrada al diari."
+#~ msgstr "S'ha modificat l'esdeveniment."
 
 #~ msgid "Journal entry - %s"
 #~ msgstr "Entrada al diari - %s"
 
+#, fuzzy
 #~ msgid "The journal entry could not be deleted due to a corba error"
 #~ msgstr ""
-#~ "No s'ha pogut suprimir l'entrada al diari perquè s'ha produït un error "
-#~ "del CORBA"
+#~ "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error del "
+#~ "CORBA"
 
+#, fuzzy
 #~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr ""
-#~ "No s'ha pogut suprimir l'entrada al diari perquè no en teniu el permís"
+#~ msgstr "No s'ha pogut suprimir l'esdeveniment perquè no en teniu permís"
 
+#, fuzzy
 #~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr ""
-#~ "No s'ha pogut suprimir l'entrada al diari perquè s'ha produït un error"
+#~ msgstr "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error"
 
+#, fuzzy
 #~ msgid "<b>Calendar options</b>"
-#~ msgstr "<b>Opcions del calendari</b>"
+#~ msgstr "<b>Opcions d'entrega</b>"
 
+#, fuzzy
 #~ msgid "Add New Calendar"
-#~ msgstr "Afegeix un calendari nou"
+#~ msgstr "Calendari nou"
 
+#, fuzzy
 #~ msgid "Calendar Group"
-#~ msgstr "Grup del calendari"
+#~ msgstr "Error de l'iCalendar"
 
+#, fuzzy
 #~ msgid "Calendar Location"
-#~ msgstr "Ubicació del calendari"
+#~ msgstr "Informació del calendari"
 
+#, fuzzy
 #~ msgid "Calendar Name"
-#~ msgstr "Nom del calendari"
+#~ msgstr "Calendari"
 
+#, fuzzy
 #~ msgid "<b>Task List Options</b>"
-#~ msgstr "<b>Opcions de la llista de tasques</b>"
+#~ msgstr "<b>Opcions de seguiment</b>"
 
+#, fuzzy
 #~ msgid "Add New Task List"
-#~ msgstr "Afegeix una llista de tasques nova"
+#~ msgstr "Llista de tasques nova"
 
+#, fuzzy
 #~ msgid "Task List Group"
-#~ msgstr "Grup de la llista de tasques"
+#~ msgstr "Llista de tasques"
 
+#, fuzzy
 #~ msgid "Task List Name"
-#~ msgstr "Nom de la llista de tasques"
+#~ msgstr "Llista de tasques"
 
+#, fuzzy
 #~ msgid ""
 #~ "You are modifying a recurring journal entry. What would you like to "
 #~ "modify?"
-#~ msgstr ""
-#~ "Esteu modificant una entrada periòdica al diari. Què voleu modificar?"
+#~ msgstr "Esteu modificant un esdeveniment periòdic. Què voleu modificar?"
 
 #~ msgid "<b>Free/Busy C_alendars</b>"
 #~ msgstr "<b>C_alendaris lliure/ocupat</b>"
 
+#, fuzzy
 #~ msgid "<b>Publishing Frequency</b>"
-#~ msgstr "<b>Freqüència de publicació</b>"
+#~ msgstr "_Freqüència de publicació:"
 
+#, fuzzy
 #~ msgid "<b>Publishing _Location</b>"
-#~ msgstr "<b>Ubicació de _la publicació</b>"
+#~ msgstr "Ubicació de la publicació"
 
+#, fuzzy
 #~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "Configuració de la publicació lliure/ocupat"
+#~ msgstr "Informació lliure/ocupat"
 
+#, fuzzy
 #~ msgid "_Daily"
-#~ msgstr "_Diari"
+#~ msgstr "_Correu"
 
+#, fuzzy
 #~ msgid "_Manual"
-#~ msgstr "_Manual"
+#~ msgstr "_Correu"
 
+#, fuzzy
 #~ msgid "_Weekly"
-#~ msgstr "_Setmanalment"
+#~ msgstr "Setmana"
 
+#, fuzzy
 #~ msgid "Enter the password for %s"
-#~ msgstr "Introduïu la contrasenya de %s"
+#~ msgstr "Introduïu la contrasenya per a «%s»"
 
+#, fuzzy
 #~ msgid "Journal information"
-#~ msgstr "Informació del diari"
+#~ msgstr "Informació del contacte"
 
 #~ msgid "Selected day (%a %b %d %Y)"
 #~ msgstr "Dia seleccionat (%a %b %d %Y)"
 
+#, fuzzy
 #~ msgid "%a %b %d"
-#~ msgstr "%a %b %d"
+#~ msgstr "%a %d %b"
 
+#, fuzzy
 #~ msgid "%a %d %Y"
-#~ msgstr "%a %d %Y"
+#~ msgstr "%a %d %b"
 
+#, fuzzy
 #~ msgid "%a %b %d %Y"
-#~ msgstr "%a %b %d %Y"
+#~ msgstr "%d de %b del %Y"
 
 #~ msgid "Selected week (%s - %s)"
 #~ msgstr "Setmana seleccionada (%s - %s)"
@@ -24304,23 +24733,28 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Selected month (%b %Y)"
 #~ msgstr "Mes seleccionat (%b %Y)"
 
+#, fuzzy
 #~ msgid "Selected year (%Y)"
-#~ msgstr "Any seleccionat (%Y)"
+#~ msgstr "Seleccioneu l'usuari"
 
+#, fuzzy
 #~ msgid "Print Item"
-#~ msgstr "Imprimeix l'element"
+#~ msgstr "Imprimeix anotacions"
 
 #~ msgid "%.0fK"
 #~ msgstr "%.0fK"
 
+#, fuzzy
 #~ msgid "No, Do not Change Status"
 #~ msgstr "No, no canviïs l'estat"
 
+#, fuzzy
 #~ msgid "<b>Receiving Email</b>"
-#~ msgstr "<b>Rebre correu electrònic</b>"
+#~ msgstr "Recepció de correu"
 
+#, fuzzy
 #~ msgid "<b>Sending Email:</b>"
-#~ msgstr "<b>Enviar correu electrònic:</b>"
+#~ msgstr "Enviament de correu"
 
 #~ msgid ""
 #~ "<small>This page allows you to choose if you want to be notified via a "
@@ -24340,12 +24774,13 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Never send back a read receipt"
 #~ msgstr "No enviïs mai una confirmació de lectura"
 
+#, fuzzy
 #~ msgid "Read Receipts"
-#~ msgstr "Confirmacions de lectura"
+#~ msgstr "Envia la confirmació"
 
+#, fuzzy
 #~ msgid "Request a read receipt for all messages I send"
-#~ msgstr ""
-#~ "Sol·licita una confirmació de lectura per a tots els missatges que enviï"
+#~ msgstr "Demana un avís de lectu_ra per a aquest missatge"
 
 #~ msgid ""
 #~ "Unless the message is sent to a mailing list, and not to me personally"
@@ -24360,20 +24795,25 @@ msgstr "Menú emergent de l'ansa"
 #~ "Què ha de fer l'Evolution en rebre un correu pel qual es sol·liciti una "
 #~ "confirmació de lectura?"
 
+#, fuzzy
 #~ msgid "The orientation of the tray."
-#~ msgstr "L'orientació de la safata."
+#~ msgstr "Hi ha un altre contacte."
 
+#, fuzzy
 #~ msgid "Enable"
-#~ msgstr "Habilita"
+#~ msgstr "Habilitat"
 
+#, fuzzy
 #~ msgid "<b>Then</b>"
-#~ msgstr "<b>Llavors</b>"
+#~ msgstr "<b>Tipus:</b>"
 
+#, fuzzy
 #~ msgid "Valid signature, cannot verify sender"
 #~ msgstr "La signatura és vàlida però no es pot verificar el remitent"
 
+#, fuzzy
 #~ msgid "Priority Filter \"%s\""
-#~ msgstr "Filtre de prioritat «%s»:"
+#~ msgstr "Prioritat: %s"
 
 #~ msgid ""
 #~ "Some of your Netscape email filters are based on\n"
@@ -24428,14 +24868,17 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Evolution is importing your old Netscape data"
 #~ msgstr "L'Evolution està important les vostres antigues dades del Netscape"
 
+#, fuzzy
 #~ msgid "Importing Netscape data"
-#~ msgstr "S'està important dades del Netscape"
+#~ msgstr "S'estan important dades del Pine"
 
+#, fuzzy
 #~ msgid "Settings"
-#~ msgstr "Configuració"
+#~ msgstr "Configuració del correu brossa"
 
+#, fuzzy
 #~ msgid "Mail Filters"
-#~ msgstr "Filtres de correu"
+#~ msgstr "Carpeta de correu"
 
 #~ msgid ""
 #~ "Evolution has found Netscape mail files.\n"
@@ -24444,32 +24887,41 @@ msgstr "Menú emergent de l'ansa"
 #~ "L'Evolution ha trobat fitxers de correu del Netscape.\n"
 #~ "Voleu importar-los a l'Evolution?"
 
+#, fuzzy
 #~ msgid "<span weight=\"bold\">Filter Options</span>"
-#~ msgstr "<span weight=\"bold\">Opcions de filtre</span>"
+#~ msgstr "<span weight=\"bold\">Opcions</span>"
 
+#, fuzzy
 #~ msgid "Mark as _Read"
-#~ msgstr "Ma_rca com a llegit"
+#~ msgstr "Mar_ca'l com a llegit"
 
+#, fuzzy
 #~ msgid "_Do not Mark as Read"
-#~ msgstr "No _marquis com a llegit"
+#~ msgstr "Mar_ca'l com a llegit"
 
+#, fuzzy
 #~ msgid "<b>Junk Mail Settings</b>"
-#~ msgstr "<b>Opcions del correu brossa</b>"
+#~ msgstr "Configuració del correu brossa"
 
+#, fuzzy
 #~ msgid "<b>Subject</b> :"
-#~ msgstr "<b>Assumpte</b> :"
+#~ msgstr "Assumpte:"
 
+#, fuzzy
 #~ msgid "<b>From</b> :"
-#~ msgstr "<b>De:</b> :"
+#~ msgstr "<b>Casa</b>"
 
+#, fuzzy
 #~ msgid "<b>Recipients </b>"
-#~ msgstr "<b>Destinataris </b>"
+#~ msgstr "<b>Respostes</b>"
 
+#, fuzzy
 #~ msgid "<b>Action</b>"
-#~ msgstr "<b>Acció</b>"
+#~ msgstr "<b>Opcions</b>"
 
+#, fuzzy
 #~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Data i hora</b>"
+#~ msgstr "Data i hora"
 
 #~ msgid ""
 #~ "The output directory was not found on iPod! Please ensure that iPod has "
@@ -24478,94 +24930,119 @@ msgstr "Menú emergent de l'ansa"
 #~ "No s'ha trobat el directori de sortida a l'iPod. Assegureu-vos que l'iPod "
 #~ "s'ha configurat correctament i torneu-ho a provar."
 
+#, fuzzy
 #~ msgid "Could not export data!"
-#~ msgstr "No s'han pogut exportar les dades!"
+#~ msgstr "No s'han pogut escriure les dades: %s"
 
+#, fuzzy
 #~ msgid "Exporting data failed."
-#~ msgstr "L'importació de dades ha fallat."
+#~ msgstr "Importació de dades."
 
+#, fuzzy
 #~ msgid "Could not open addressbook!"
-#~ msgstr "No s'ha pogut obrir la llibreta d'adreces"
+#~ msgstr "No s'ha pogut carregar la llibreta d'adreces"
 
+#, fuzzy
 #~ msgid "Could not open the Evolution addressbook to export data."
-#~ msgstr ""
-#~ "No s'ha pogut obrir la llibreta d'adreces de l'Evolution per a exportar "
-#~ "dades."
+#~ msgstr "La llibreta d'adreces de l'Evolution ha sortit inesperadament."
 
+#, fuzzy
 #~ msgid "Could not open calendar/todo!"
-#~ msgstr "No s'ha pogut obrir el calendari/tasques!"
+#~ msgstr "No s'ha pogut obrir la destinació"
 
+#, fuzzy
 #~ msgid "Could not open the Evolution calendar/todo list to export data."
-#~ msgstr ""
-#~ "No s'ha pogut obrir la llista de tasques per fer o el calendari "
-#~ "d'Evolution per a exportar les dades."
+#~ msgstr "No s'ha pogut enviar un avís de cancel·lació al delegat"
 
+#, fuzzy
 #~ msgid "Unable to find this journal entry in any journal"
-#~ msgstr "No es pot trobar aquesta entrada de diari a cap diari"
+#~ msgstr "No s'ha pogut trobar aquesta reunió en cap calendari"
 
+#, fuzzy
 #~ msgid "New mail notify"
-#~ msgstr "Notificació de correu nou"
+#~ msgstr "Tipus de notificació de correu nou"
 
+#, fuzzy
 #~ msgid "(Untitled)"
-#~ msgstr "(Sense títol)"
+#~ msgstr "Sense títol"
 
+#, fuzzy
 #~ msgid "An attachment to add."
-#~ msgstr "Afegeix un fitxer adjunt."
+#~ msgstr "Barra de fitxers adjunts"
 
 #~ msgid "Content type of the attachment."
 #~ msgstr "Tipus de contingut del fitxer adjunt."
 
+#, fuzzy
 #~ msgid "The filename to display in the mail."
-#~ msgstr "El nom de fitxer que es mostrarà en el correu."
+#~ msgstr ""
+#~ "Utilitza tipus de lletra personalitzats per a visualitzar el correu."
 
+#, fuzzy
 #~ msgid "Description of the attachment."
-#~ msgstr "Descripció del fitxer adjunt."
+#~ msgstr "La descripció conté"
 
+#, fuzzy
 #~ msgid "Mark attachment to be shown inline by default."
-#~ msgstr "Marca el fitxer adjunt perquè es mostri inserit per defecte."
+#~ msgstr ""
+#~ "Identificador o sobrenom del component a mostrar per defecte a l'inici de "
+#~ "manera predeterminada."
 
+#, fuzzy
 #~ msgid "_Edit..."
-#~ msgstr "_Edita..."
+#~ msgstr "_Edita"
 
+#, fuzzy
 #~ msgid "..."
-#~ msgstr "..."
+#~ msgstr "_Nova..."
 
+#, fuzzy
 #~ msgid "%H:%M"
-#~ msgstr "%H:%M"
+#~ msgstr "%A a les %H:%M"
 
+# gal/e-table/e-cell-date.c:58
+#, fuzzy
 #~ msgid "%I:%M %p"
-#~ msgstr "%I:%M %p"
+#~ msgstr "%l:%M %p"
 
 #~ msgid "Minicard Test"
 #~ msgstr "Prova de la minitargeta"
 
+#, fuzzy
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
 
+#, fuzzy
 #~ msgid "This should test the minicard canvas item"
-#~ msgstr "Es provarà el codi de l'element del llenç de la minitargeta"
+#~ msgstr "Això hauria de provar el codi d'impressió de contactes"
 
+#, fuzzy
 #~ msgid "range"
-#~ msgstr "rang"
+#~ msgstr "França"
 
-# Part de l'UI d'interfice de cerca
+#, fuzzy
 #~ msgid "Fo_rward"
-#~ msgstr "E_ndavant"
+#~ msgstr "Reenvia"
 
+#, fuzzy
 #~ msgid "Printer settings"
-#~ msgstr "Configuració de la impressora"
+#~ msgstr "Configuració del correu brossa"
 
+#, fuzzy
 #~ msgid "Fontset"
-#~ msgstr "Tipus de lletra"
+#~ msgstr "Tipus de lletres"
 
+#, fuzzy
 #~ msgid "Font"
-#~ msgstr "Tipus de lletra"
+#~ msgstr "Tipus de lletres"
 
+#, fuzzy
 #~ msgid "GDKFont"
-#~ msgstr "GDKFont"
+#~ msgstr "Tipus de lletres"
 
+#, fuzzy
 #~ msgid "Print Preview"
-#~ msgstr "Previsualització de la impressió"
+#~ msgstr "Pre_visualització d'impressió"
 
 #~ msgid ""
 #~ "A file by that name already exists.\n"
@@ -24574,26 +25051,33 @@ msgstr "Menú emergent de l'ansa"
 #~ "Ja existeix una fitxer amb aquest nom.\n"
 #~ "El voleu sobreescriure?"
 
+#, fuzzy
 #~ msgid "ok_button"
-#~ msgstr "Botó d'acord"
+#~ msgstr "Botó combinat"
 
+#, fuzzy
 #~ msgid "_Send New Message To ..."
 #~ msgstr "Envia un mi_ssatge nou a..."
 
+#, fuzzy
 #~ msgid "Importing ..."
 #~ msgstr "S'està important..."
 
+#, fuzzy
 #~ msgid "Su_mmary"
-#~ msgstr "Resu_m"
+#~ msgstr "Resu_m:"
 
+#, fuzzy
 #~ msgid "_Memo Content:"
-#~ msgstr "_Contingut de les anotacions:"
+#~ msgstr "Context de MI"
 
+#, fuzzy
 #~ msgid "Filtering Folder"
-#~ msgstr "S'està filtrant la carpeta"
+#~ msgstr "S'està refrescant la carpeta"
 
+#, fuzzy
 #~ msgid " New "
-#~ msgstr " Nou "
+#~ msgstr "Nou"
 
 #~ msgid "*"
 #~ msgstr "*"
@@ -24601,74 +25085,98 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Video Conferencing"
 #~ msgstr "Videoconferència"
 
+#, fuzzy
 #~ msgid "work"
-#~ msgstr "feina"
+#~ msgstr "Feina"
 
 #~ msgid "WWW"
 #~ msgstr "www"
 
+#, fuzzy
 #~ msgid "personal"
-#~ msgstr "personal"
+#~ msgstr "Personal"
 
 #~ msgid "The calendar you have selected is read-only"
 #~ msgstr "El calendari que heu seleccionat és només de lectura"
 
+#, fuzzy
 #~ msgid "Cale_ndar:"
-#~ msgstr "Cale_ndari:"
+#~ msgstr "Cale_ndari"
 
+#, fuzzy
 #~ msgid "Locat_ion:"
-#~ msgstr "Ubicac_ió:"
+#~ msgstr "Ubicació:"
 
+# FIXME: [l10n-bug] (dpm)
+#, fuzzy
 #~ msgid "Dele_gatees"
 #~ msgstr "De_legats"
 
+#, fuzzy
 #~ msgid "Memo:"
-#~ msgstr "Anotacions:"
+#~ msgstr "Anotació"
 
+#, fuzzy
 #~ msgid "%P %%"
-#~ msgstr "%P %%"
+#~ msgstr "%a %d %b"
 
+#, fuzzy
 #~ msgid "date-end"
-#~ msgstr "Data de finalització"
+#~ msgstr "Actualitzat"
 
+#, fuzzy
 #~ msgid "date-start"
-#~ msgstr "Data d'inici"
+#~ msgstr "Inici de setmana"
 
+#, fuzzy
 #~ msgid "Properties..."
-#~ msgstr "Propietats..."
+#~ msgstr "_Propietats..."
 
+#, fuzzy
 #~ msgid "_Memo"
-#~ msgstr "_Anotació"
+#~ msgstr "A_notacions"
 
+#, fuzzy
 #~ msgid "      "
-#~ msgstr "      "
+#~ msgstr "    "
 
+#, fuzzy
 #~ msgid "_Subscribe"
-#~ msgstr "_Subscriu"
+#~ msgstr "Subscriu-me"
 
+#, fuzzy
 #~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "Marca tots els missatges com a llegits en la carpeta seleccionada"
+#~ msgstr ""
+#~ "Això marcarà tots els missatges com a llegits en el directori seleccionat "
+#~ "i els seus subdirectoris."
 
+#, fuzzy
 #~ msgid "Original Location"
-#~ msgstr "Ubicació original"
+#~ msgstr "Contacte original:"
 
+#, fuzzy
 #~ msgid "Search Type"
-#~ msgstr "Tipus de cerca"
+#~ msgstr "Cerques"
 
+#, fuzzy
 #~ msgid "Subitem ID"
-#~ msgstr "ID del subelement"
+#~ msgstr "ID de l'element"
 
+#, fuzzy
 #~ msgid "Find _Now"
-#~ msgstr "Cerca _ara"
+#~ msgstr "_Cerca ara"
 
+#, fuzzy
 #~ msgid "C_lassification"
-#~ msgstr "C_lassificació"
+#~ msgstr "Classificació"
 
+#, fuzzy
 #~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d elements)"
+#~ msgstr "%s : %s (%d element)"
 
+#, fuzzy
 #~ msgid "%s (%d items)"
-#~ msgstr "%s (%d elements)"
+#~ msgstr "%s (%d element)"
 
 #~ msgid ""
 #~ "The message was sent via the &quot;sendmail&quot; external application. "
@@ -24685,38 +25193,45 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "No s'ha entregat el missatge amb assumpte &quot;{0}&quot;."
 
-#~ msgid "_Insert"
-#~ msgstr "_Insereix"
-
+#, fuzzy
 #~ msgid "(%ld seconds)"
-#~ msgstr "(%ld segons)"
+#~ msgstr "%d segon"
 
+#, fuzzy
 #~ msgid "(%d %s %d %s)"
-#~ msgstr "(%d %s %d %s)"
+#~ msgstr "%A, %d de %B de %Y"
 
+#, fuzzy
 #~ msgid "(%d %s)"
-#~ msgstr "(%d %s)"
+#~ msgstr "%d %b"
 
+#, fuzzy
 #~ msgid " %u second"
-#~ msgstr "%u segon"
+#~ msgstr "%d segon"
 
+#, fuzzy
 #~ msgid " %u seconds"
-#~ msgstr "%u segons"
+#~ msgstr "%d segon"
 
+#, fuzzy
 #~ msgid " %u minute"
-#~ msgstr "%u minut"
+#~ msgstr "%d minut"
 
+#, fuzzy
 #~ msgid " %u minutes"
-#~ msgstr "%u minuts"
+#~ msgstr "%d minut"
 
+#, fuzzy
 #~ msgid "%u hour"
-#~ msgstr "%u hora"
+#~ msgstr "%d hora"
 
+#, fuzzy
 #~ msgid "%u hours"
-#~ msgstr "%u hores"
+#~ msgstr "%d hora"
 
+#, fuzzy
 #~ msgid "(%d seconds)"
-#~ msgstr "(%d segons)"
+#~ msgstr "%d segon"
 
 #~ msgid ""
 #~ "Selecting this option means that Evolution will only try to use SSL/TLS "
@@ -24729,178 +25244,230 @@ msgstr "Menú emergent de l'ansa"
 #~ "d'LDAP darrere un tallafoc, l'Evolution no necessita utilitzar l'SSL/TLS "
 #~ "perquè la vostra connexió ja és segura."
 
+#, fuzzy
 #~ msgid "Task Table"
-#~ msgstr "Taula de tasques"
+#~ msgstr "Actualització de la tasca"
 
 # gal/menus/gal-view-factory-etable.c:38
+#, fuzzy
 #~ msgid "Memo Table"
-#~ msgstr "Taula d'anotacions"
+#~ msgstr "Taula"
 
+#, fuzzy
 #~ msgid "Timezone Button"
-#~ msgstr "Botó de fus horari"
+#~ msgstr "Fus horari"
 
+#, fuzzy
 #~ msgid "The Evolution Groupware Suite"
-#~ msgstr "El paquet d'aplicacions de treball en grup Evolution"
+#~ msgstr "Aplicacions de treball en grup"
 
+#, fuzzy
 #~ msgid "Mail Accounts Table"
-#~ msgstr "Taula de comptes de correu"
+#~ msgstr "Comptes de correu"
 
+#, fuzzy
 #~ msgid "Attachment Button"
-#~ msgstr "Botó de fitxers adjunts"
+#~ msgstr "Barra de fitxers adjunts"
 
+#, fuzzy
 #~ msgid "Filters"
-#~ msgstr "Filtres"
+#~ msgstr "Arxiva com a"
 
+#, fuzzy
 #~ msgid "_Show animated images"
-#~ msgstr "Mo_stra les imatges animades"
+#~ msgstr "Mostra les imatges animades com a animacions."
 
+#, fuzzy
 #~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
+#~ msgstr "<b>Usuaris:</b>"
 
 # c-format
 #~ msgid "<b>%s</b> : %s"
 #~ msgstr "<b>%s</b> : %s"
 
+#, fuzzy
 #~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
+#~ msgstr "<b>Feina</b>"
 
+#, fuzzy
 #~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Contactes automàtics</span>"
+#~ msgstr "<span weight=\"bold\">Ubicació</span>"
 
+#, fuzzy
 #~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Contactes de missatgeria instantània</span>"
+#~ msgstr "<span weight=\"bold\">Tipus de lletra dels missatges</span>"
 
+#, fuzzy
 #~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Cerca conflictes</span>"
+#~ msgstr "<span weight=\"bold\">Configuració</span>"
 
+#, fuzzy
 #~ msgid "Delete this Occurrence"
-#~ msgstr "Suprimeix aquest esdeveniment"
+#~ msgstr "Suprimeix aquesta a_parició"
 
+#, fuzzy
 #~ msgid "Alar_ms"
-#~ msgstr "Alar_mes"
+#~ msgstr "Alarmes"
 
+#, fuzzy
 #~ msgid "_All day Event"
-#~ msgstr "Esdeveniment de tot el di_a"
+#~ msgstr "Esdeveniment de tot el dia"
 
+#, fuzzy
 #~ msgid "Previous Button"
-#~ msgstr "Botó anterior"
+#~ msgstr "Anterior"
 
 #~ msgid "Text Date Entry"
 #~ msgstr "Entrada de text de data"
 
+#, fuzzy
 #~ msgid "Date Button"
-#~ msgstr "Botó de data"
+#~ msgstr "Dibuixa el botó"
 
+#, fuzzy
 #~ msgid "Time Combo Box"
-#~ msgstr "Caixa combinada d'hora"
+#~ msgstr "Quadre combinat del fus horari"
 
+#, fuzzy
 #~ msgid "Search Text Entry"
-#~ msgstr "Entrada de cerca de text"
+#~ msgstr "Filtre de cerca"
 
+#, fuzzy
 #~ msgid "Addressbook"
 #~ msgstr "Llibreta d'adreces"
 
+#, fuzzy
 #~ msgid "Removal Complete"
-#~ msgstr "S'ha acabat la supressió"
+#~ msgstr "% acabat"
 
+#, fuzzy
 #~ msgid "Advanced..."
-#~ msgstr "Avançat..."
+#~ msgstr "Cerca _avançada..."
 
+#, fuzzy
 #~ msgid "_Advanced..."
-#~ msgstr "A_vançat..."
+#~ msgstr "Cerca _avançada..."
 
+#, fuzzy
 #~ msgid "Select target addressbook."
-#~ msgstr "Selecciona la llibreta d'adreces destí."
+#~ msgstr "Seleccioneu la llibreta d'adreces"
 
+#, fuzzy
 #~ msgid "(none)"
-#~ msgstr "(cap)"
+#~ msgstr "Cap"
 
+#, fuzzy
 #~ msgid "Primary Email"
-#~ msgstr "Adreça electrònica principal"
+#~ msgstr "Telèfon principal"
 
+#, fuzzy
 #~ msgid "Select an Action"
-#~ msgstr "Seleccioneu una acció"
+#~ msgstr "Seleccioneu una ubicació"
 
+#, fuzzy
 #~ msgid "Create a new contact \"%s\""
-#~ msgstr "Crea un nou contacte «%s»"
+#~ msgstr "Crea un contacte nou"
 
 #~ msgid "Add address to existing contact \"%s\""
 #~ msgstr "Afegeix l'adreça al contacte existent «%s»"
 
+#, fuzzy
 #~ msgid "Merge E-Mail Address"
-#~ msgstr "Combina les adreces electròniques"
+#~ msgstr "Adreça de correu electrònic"
 
+#, fuzzy
 #~ msgid "_Configure Alarms"
-#~ msgstr "_Configura les alarmes"
+#~ msgstr "Con_figura"
 
+#, fuzzy
 #~ msgid "<b>Publishing</b>"
-#~ msgstr "<b>Publicació</b>"
+#~ msgstr "<b>Permisos</b>"
 
+#, fuzzy
 #~ msgid "Publishing Table"
-#~ msgstr "Taula de publicació"
+#~ msgstr "Ubicació de la publicació"
 
+#, fuzzy
 #~ msgid "_Add URL"
-#~ msgstr "_Afegeix un URL"
+#~ msgstr "_Afegeix "
 
+#, fuzzy
 #~ msgid "Or_ganizer"
-#~ msgstr "Or_ganitzador"
+#~ msgstr "Or_ganitzador:"
 
+#, fuzzy
 #~ msgid "_Set alarm\t"
-#~ msgstr "_Estableix l'alarma\t"
+#~ msgstr "_Repeteix l'alarma"
 
+#, fuzzy
 #~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Dele_gats</b>"
+#~ msgstr "<b>Repetició</b>"
 
+#, fuzzy
 #~ msgid "<span weight=\"bold\">Basics</span>"
-#~ msgstr "<span weight=\"bold\">Bàsics</span>"
+#~ msgstr "<span weight=\"bold\">Llista de tasques</span>"
 
+#, fuzzy
 #~ msgid "Classi_fication:"
-#~ msgstr "Classi_ficació:"
+#~ msgstr "Classificació"
 
+#, fuzzy
 #~ msgid "_Group"
 #~ msgstr "_Grup:"
 
+#, fuzzy
 #~ msgid "_Attachment Bar"
-#~ msgstr "Barra de fitxers _adjunts"
+#~ msgstr "Barra de fitxers adjunts"
 
+#, fuzzy
 #~ msgid "T_erminal Font:"
-#~ msgstr "Tipus d_e lletra del terminal:"
+#~ msgstr "Tipus de lletra de terminal"
 
+#, fuzzy
 #~ msgid "Server: %s, Type: %s"
-#~ msgstr "Servidor: %s, tipus: %s"
+#~ msgstr "_Tipus de servidor:"
 
 #~ msgid "Path: %s, Type: %s"
 #~ msgstr "Camí: %s, tipus: %s"
 
+#, fuzzy
 #~ msgid "Type: %s"
-#~ msgstr "Tipus: %s"
+#~ msgstr "T_ipus:"
 
 #~ msgid "dialog1"
 #~ msgstr "diàleg1"
 
+#, fuzzy
 #~ msgid "Id"
-#~ msgstr "Id"
+#~ msgstr "I"
 
+#, fuzzy
 #~ msgid "Path"
-#~ msgstr "Camí"
+#~ msgstr "_Camí:"
 
+#, fuzzy
 #~ msgid "Evolution Settings"
-#~ msgstr "Configuració de l'Evolution"
+#~ msgstr "S'està carregant la configuració de l'Evolution"
 
+#, fuzzy
 #~ msgid "_Select All"
-#~ msgstr "_Selecciona-ho tot"
+#~ msgstr "Selecciona-ho tot"
 
+#, fuzzy
 #~ msgid "Show Time _Zone"
-#~ msgstr "Mostra el fu_s horari"
+#~ msgstr "Fus h_orari"
 
+#, fuzzy
 #~ msgid "_About Evolution..."
-#~ msgstr "Qu_ant a l'Evolution..."
+#~ msgstr "Quant a l'Evolution..."
 
+#, fuzzy
 #~ msgid "Discard Changes"
-#~ msgstr "Descarta els canvis"
+#~ msgstr "_Descarta els canvis"
 
+#, fuzzy
 #~ msgid "description of appointment"
-#~ msgstr "descripció de la cita"
+#~ msgstr "ubicació de la cita"
 
 #~ msgid "Dismiss"
 #~ msgstr "Descarta"
@@ -24919,62 +25486,81 @@ msgstr "Menú emergent de l'ansa"
 #~ "S'incia a %s\n"
 #~ "Finalitza a %s"
 
+#, fuzzy
 #~ msgid "Remove"
-#~ msgstr "Suprimeix"
+#~ msgstr "Sup_rimeix"
 
+#, fuzzy
 #~ msgid "Don't Remove"
-#~ msgstr "No el suprimeixis"
+#~ msgstr "N_o el recuperis"
 
+#, fuzzy
 #~ msgid "05 minutes"
-#~ msgstr "05 minuts"
+#~ msgstr "minuts"
 
+#, fuzzy
 #~ msgid "10 minutes"
-#~ msgstr "10 minuts"
+#~ msgstr "minuts"
 
+#, fuzzy
 #~ msgid "15 minutes"
-#~ msgstr "15 minuts"
+#~ msgstr "minuts"
 
+#, fuzzy
 #~ msgid "30 minutes"
-#~ msgstr "30 minuts"
+#~ msgstr "minuts"
 
+#, fuzzy
 #~ msgid "60 minutes"
-#~ msgstr "60 minuts"
+#~ msgstr "minuts"
 
+#, fuzzy
 #~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>Servidor predeterminat de lliure/ocupat</b>"
+#~ msgstr "<span weight=\"bold\">Servidor lliure/ocupat predeterminat</span>"
 
+#, fuzzy
 #~ msgid "<b>General</b>"
-#~ msgstr "<b>General</b>"
+#~ msgstr "<b>Repetició</b>"
 
+#, fuzzy
 #~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Llista de tasques</b>"
+#~ msgstr "<b>Llista de correu brossa:</b>"
 
+#, fuzzy
 #~ msgid "<b>Time</b>"
-#~ msgstr "<b>Hora</b>"
+#~ msgstr "<b>Casa</b>"
 
+#, fuzzy
 #~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>Setmana laborable</b>"
+#~ msgstr "<b>Feina</b>"
 
+#, fuzzy
 #~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Configuració del calendari i les tasques"
+#~ msgstr "Calendari i tasques"
 
+#, fuzzy
 #~ msgid "Color for overdue tasks"
-#~ msgstr "Color de les tasques retrassades"
+#~ msgstr "Tasq_ues endarrerides:"
 
+#, fuzzy
 #~ msgid "Color for tasks due today"
-#~ msgstr "Color de les tasques que vencen avui"
+#~ msgstr "T_asques que vencen avui:"
 
+#, fuzzy
 #~ msgid "Days"
-#~ msgstr "Dies"
+#~ msgstr "Dia"
 
+#, fuzzy
 #~ msgid "Hours"
-#~ msgstr "Hores"
+#~ msgstr "hora"
 
+#, fuzzy
 #~ msgid "Minutes"
-#~ msgstr "Minuts"
+#~ msgstr "minuts"
 
+#, fuzzy
 #~ msgid "option menu to choose reminder units"
-#~ msgstr "menú d'opcions per a les unitats del recordatori"
+#~ msgstr "Unitats predeterminades pels recordatoris"
 
 #~ msgid "option menu to choose time units"
 #~ msgstr "menú d'opcions per escollir la unitat del temps"
@@ -24982,83 +25568,109 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "_Attachment Bar (drop attachments here)"
 #~ msgstr "Barra de fitxers _adjunts (deixeu-hi anar els fitxers adjunts)"
 
+#, fuzzy
 #~ msgid "Scheduling"
-#~ msgstr "Planificació"
+#~ msgstr "Ombrejat"
 
+#, fuzzy
 #~ msgid "Invitations"
-#~ msgstr "Invitacions"
+#~ msgstr "Internacional"
 
+#, fuzzy
 #~ msgid "This appointment has customized alarms"
-#~ msgstr "Aquesta cita té alarmes personalitzades"
+#~ msgstr "Aq_uesta cita és periòdica"
 
+# gal/e-table/e-table-header-item.c:1475
+#, fuzzy
 #~ msgid "Assignment"
-#~ msgstr "Assignació"
+#~ msgstr "Ali_neació"
 
+#, fuzzy
 #~ msgid "_Publish Free/Busy Information"
-#~ msgstr "_Publica la informació lliure/ocupat"
+#~ msgstr "Informació de lliure/ocupat"
 
+#, fuzzy
 #~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#, fuzzy
 #~ msgid "%a %m/%d/%Y %H:%M"
-#~ msgstr "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M:%S"
 
+#, fuzzy
 #~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a %m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#, fuzzy
 #~ msgid "%a %m/%d/%Y %H"
-#~ msgstr "%a %m/%d/%Y %H"
+#~ msgstr "%a %d/%m/%Y"
 
+#, fuzzy
 #~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#, fuzzy
 #~ msgid "%m/%d/%Y %H:%M:%S"
-#~ msgstr "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%a %d/%m/%Y %H:%M:%S"
 
+#, fuzzy
 #~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#, fuzzy
 #~ msgid "%m/%d/%Y %H:%M"
-#~ msgstr "%m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M:%S"
 
+#, fuzzy
 #~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#, fuzzy
 #~ msgid "%m/%d/%Y %H"
-#~ msgstr "%m/%d/%Y %H"
+#~ msgstr "%d/%m/%Y"
 
+#, fuzzy
 #~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
+#~ msgstr "%A a les %l:%M:%S %p"
 
+#, fuzzy
 #~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
+#~ msgstr "%A a les %H:%M:%S"
 
+# gal/e-table/e-cell-date.c:58
+#, fuzzy
 #~ msgid "%I %p"
-#~ msgstr "%I %p"
+#~ msgstr "%l:%M %p"
 
+#, fuzzy
 #~ msgid "If"
-#~ msgstr "Si"
+#~ msgstr "I"
 
+#, fuzzy
 #~ msgid "Execute actions"
-#~ msgstr "Executa les accions"
+#~ msgstr "Operacions de l'Exchange"
 
 #~ msgid "Execute Command..."
 #~ msgstr "Executa l'ordre..."
 
+#, fuzzy
 #~ msgid "Automatic contacts"
 #~ msgstr "Contactes automàtics"
 
 #~ msgid "Exchange Connector access error."
 #~ msgstr "Error d'accés de l'Exchange Connector"
 
+#, fuzzy
 #~ msgid "Meetings and Tasks"
-#~ msgstr "Reunions i tasques"
+#~ msgstr "Calendari i tasques"
 
+#, fuzzy
 #~ msgid "Plugin manager"
-#~ msgstr "Gestor de connectors"
+#~ msgstr "Administrador de connectors"
 
+#, fuzzy
 #~ msgid "Uid"
-#~ msgstr "Uid"
+#~ msgstr "Unicode"
 
 #~ msgid "Url"
 #~ msgstr "Url"
@@ -25076,8 +25688,9 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "OU"
 #~ msgstr "OU"
 
+#, fuzzy
 #~ msgid "O"
-#~ msgstr "O"
+#~ msgstr "D'acord"
 
 #~ msgid "L"
 #~ msgstr "L"
@@ -25094,23 +25707,36 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "E"
 #~ msgstr "E"
 
+#, fuzzy
 #~ msgid "_Preview Pane"
-#~ msgstr "Subfinestra de _previsualització"
+#~ msgstr "_Previsualització"
 
+#, fuzzy
 #~ msgid "Customize My Evolution"
-#~ msgstr "Personalitza l'Evolution"
+#~ msgstr "%s - Evolution"
 
+#, fuzzy
 #~ msgid "Move"
-#~ msgstr "Mou"
+#~ msgstr "_Mou"
 
+#, fuzzy
 #~ msgid "_Send / Receive"
-#~ msgstr "_Envia / rep"
+#~ msgstr "Envia / rep"
 
+#, fuzzy
 #~ msgid "Always Search"
 #~ msgstr "Cerca sempre"
 
+#, fuzzy
 #~ msgid "Check Evolution archive"
-#~ msgstr "Comprova l'arxiu de l'Evolution"
+#~ msgstr "Comprova la còpia de seguretat de l'Evolution"
 
+#, fuzzy
 #~ msgid "With GUI"
-#~ msgstr "Amb interfície gràfica"
+#~ msgstr "Amplada"
+
+#~ msgid "Username:"
+#~ msgstr "Nom d'usuari:"
+
+#~ msgid "Update every"
+#~ msgstr "Actualitza cada"
diff --git a/po/de.po b/po/de.po
index 11ef0c7409..3e3296d897 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,14 +16,14 @@
 # bcc = Blindkopie
 # send options = Versandoptionen
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-29 20:15+0200\n"
-"PO-Revision-Date: 2008-07-29 20:15+0200\n"
-"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
+"POT-Creation-Date: 2008-09-06 16:31+0200\n"
+"PO-Revision-Date: 2008-09-06 17:32+0200\n"
+"Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,16 +33,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "Evolution-Adressbuch"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
@@ -69,63 +69,63 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "Evolution-Minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Es enthält Alarme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Es enthält Wiederholungen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../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 "Kalender-Ereignis: Die Zusammenfassung lautet %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 "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Neues ganztägiges Ereignis"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Gehe zu Datum"
 
-#: ../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 "Eine Tabelle zur Ansicht und Auswahl der momentanen Zeitspanne"
 
 #. 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."
@@ -134,14 +134,14 @@ msgstr[1] "Sie enthält %d Ereignisse."
 
 #. 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 "Sie enthält keine Ereignisse."
 
 #. 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 "Arbeitswochenansicht: %s. %s"
@@ -149,21 +149,21 @@ msgstr "Arbeitswochenansicht: %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 "Tagesansicht: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "Kalenderansicht für eine Arbeitswoche"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -173,30 +173,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:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../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
 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:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %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:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -205,59 +205,59 @@ 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:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../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
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "Suchleiste"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "Evolution Kalender-Suchleiste"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Sprungknopf"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Ereignisse zu sehen."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "Kalenderansicht für einen Monat"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht für eine oder mehrere Wochen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "Aufklappen"
 
 #. 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 "Kind aufklappen"
 
@@ -269,12 +269,12 @@ msgstr "Bearbeiten"
 msgid "begin editing this cell"
 msgstr "Zelle bearbeiten"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "Umschalten"
 
 #. 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 "Zelle umschalten"
 
@@ -294,67 +294,66 @@ msgstr "Einrollen"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Die Zeile des ETrees einrollen, die diese Zelle enthält"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Zelle"
 
-#: ../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 "Klicken zum Hinzufügen"
 
-#: ../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 "Klicken"
 
-#: ../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 "Sortieren"
 
-#: ../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 "Kalender: von %s bis %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "Evolution Kalenderelement"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Auswahllistenknopf"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Vorgabe verwenden"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Kontextmenü"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Anlagenleiste ein-/ausblenden"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "aktivieren"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
 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}« ist ein schreibgeschütztes Adressbuch. Wechseln Sie zur Kontakte-"
-"Ansicht und wählen Sie ein Adressbuch aus, das Kontakte akzeptieren kann."
+"Ansicht und wählen Sie ein anderes Adressbuch aus."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -396,11 +395,10 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Schemainformationen für LDAP-Server konnten nicht abgerufen werden."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Adressbuch konnte nicht entfernt werden."
 
 #: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
@@ -416,7 +414,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Adressbuch »{0}« löschen?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Fehler beim Laden eines Adressbuchs."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -429,7 +427,7 @@ msgstr "Legitimation am LDAP-Server gescheitert."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
@@ -452,7 +450,7 @@ msgstr ""
 "arbeiten"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Das Evolution-Adressbuch wurde unerwartet beendet."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -473,32 +471,32 @@ msgstr ""
 "Sie Ihren Systemadministrator nach unterstützten Suchbasen."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Dieses Adressbuch wird unwiderruflich gelöscht."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Dieses Adressbuch konnte nicht geöffnet werden."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 ""
 "Dieser Adressbuch-Server verfügt über keine der unterstützten Suchbasen."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Möglicherweise ist dieser Adressbuch-Server nicht erreichbar, Sie haben den "
 "Server-Namen falsch angegeben oder Ihre Netzwerkverbindung ist inaktiv."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Dieses Adressbuch wird unwiderruflich gelöscht."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Dieser Server unterstützt keine LDAPv3-Schemainformationen."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Adressbuch konnte nicht geöffnet werden"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -515,12 +513,12 @@ msgstr "Wollen Sie die vorgenommenen Änderungen speichern?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Beim Versuch, einen Kontakt zwischen Adressbüchern zu verschieben, konnte "
-"dieser nicht aus der Quelle entfernt werden. Wollen Sie stattdessen eine "
-"Kopie speichern?"
+"dieser nicht aus dem Quelladressbuch entfernt werden. Wollen Sie stattdessen "
+"eine Kopie speichern?"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid ""
@@ -534,7 +532,6 @@ msgstr ""
 "Version aktualisiert werden."
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Sie haben keine ausreichenden Rechte um Kontakte in diesem Adressbuch zu "
@@ -555,7 +552,7 @@ msgstr ""
 "Ihre Kontakte für {0} sind nicht verfügbar, solange Evolution nicht neu "
 "gestartet wurde."
 
-#: ../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
@@ -578,7 +575,7 @@ msgstr "_Größe verändern"
 msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
-#. 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."
+#. 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}"
@@ -595,7 +592,7 @@ msgstr "Voreingestellte Synchronisierungsadresse:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Adressbuch konnte nicht geladen werden"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -621,10 +618,10 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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-folder.c:582
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -633,9 +630,8 @@ msgid "Evolution Address Book"
 msgstr "Evolution-Adressbuch"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Address Book address popup"
-msgstr "Adressenfenster des Evolution-Adressbuchs"
+msgstr "Adressfenster des Evolution-Adressbuchs"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -650,8 +646,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution-Adressbuchkomponente"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution-S/MIME-Bedienelement zur Zertifikatverwaltung"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution-S/MIME-Zertifikatverwaltung"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -665,13 +661,13 @@ msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../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:196 ../mail/em-folder-tree-model.c:200
+#: ../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:1456
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "Auf diesem Computer"
 
@@ -684,10 +680,10 @@ msgstr "Auf diesem Computer"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../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:205
+#: ../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 "Persönlich"
@@ -698,94 +694,82 @@ msgstr "Persönlich"
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "A_dressbuch"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Aktualisieren der Adressbucheinstellungen oder -ordner gescheitert."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allgemein"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:965
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
@@ -796,9 +780,9 @@ msgid "Migrating..."
 msgstr "Migrationsvorgang …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "»%s« wird migriert:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -852,70 +836,76 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten …"
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
+#: ../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:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
+#: ../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
+#: ../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 "_Löschen"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
-msgstr "Ei_genschaften …"
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "Ei_genschaften"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Kontaktquellenauswahl"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Geben Sie das Passwort für %s ein (Benutzer %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
@@ -1017,73 +1007,78 @@ msgstr "Immer"
 msgid "Anonymously"
 msgstr "Anonym"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "Grundlegend"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Eindeutiger Name"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution verwendet diese E-Mail-Adresse, um Sie beim Server zu legitimieren."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Unterstützte Suchbasen suchen"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "Anm_eldename:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nie"
 
 #. 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:23
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Eins"
 
 #. 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:25
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Suchfilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Such_basis:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Such_filter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Suchfilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1093,7 +1088,7 @@ msgstr ""
 "soll. Wird der Suchfilter nicht verändert, wird nach die Suche per Vorgabe "
 "in der Objektklasse der Art »Person« durchgeführt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1101,7 +1096,7 @@ msgstr ""
 "Wenn Sie diese Option auswählen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem LDAP-Server her, falls dieser SSL unterstützt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1109,7 +1104,7 @@ msgstr ""
 "Wenn Sie diese Option auswählen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem LDAP-Server her, falls dieser TLS unterstützt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1119,23 +1114,23 @@ msgstr ""
 "Verbindung zu Ihrem LDAP-Server her. Das bedeutet, dass Ihre Verbindung "
 "unsicher ist und dadurch ein Sicherheitsproblem entsteht."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Unterstützte Suchbasen"
 
 #. 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:36
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1145,7 +1140,7 @@ msgstr ""
 "Eintrags, bei dem die Suche beginnt. Wenn Sie dieses Feld leer lassen, "
 "beginnt die Suche an der Wurzel des Verzeichnisbaums."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1157,7 +1152,7 @@ msgstr ""
 "Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die Ebene "
 "unterhalb des Ausgangspunktes der Suche ein."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1165,7 +1160,7 @@ msgstr ""
 "Dies ist der vollständige Name des LDAP-Servers. Zum Beispiel: »ldap."
 "meinefirma.de«."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1173,7 +1168,7 @@ msgstr ""
 "Dies ist die maximale Anzahl herunterzuladender Einträge. Wenn diese Zahl zu "
 "hoch angesetzt ist, werden Vorgänge im Adressbuch verlangsamt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1183,7 +1178,7 @@ msgstr ""
 "Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
 "ist, wenn Sie dies auf »E-Mail-Adresse« einstellen."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1191,7 +1186,7 @@ msgstr ""
 "Dies ist der Name für diesen Server, der in der Ordnerliste von Evolution "
 "angezeigt wird. Er dient lediglich zu Anzeigezwecken. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1201,75 +1196,76 @@ msgstr ""
 "soll. Es wurde bereits eine Liste der Standard-Ports bereitgestellt. Fragen "
 "Sie Ihren Systemadministrator, welchen Port Sie angeben müssen."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (DN) verwenden"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Immer, wenn möglich"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "Adressbuch _hinzufügen"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Download-Limit:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "Unterstützte Suchbasen _suchen"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "An_meldemethode:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Suchbereich:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Zeitüberschreitung:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "Karten"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:401
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "Minuten"
 
@@ -1310,7 +1306,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Geschäftlich</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1322,16 +1318,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorien …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -1371,8 +1367,8 @@ msgstr "Telefon"
 
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1397,8 +1393,8 @@ msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
@@ -1496,15 +1492,15 @@ msgstr "Adresse"
 #: ../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:293
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../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:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
 #: ../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-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
+#: ../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
 msgid "Editable"
@@ -2481,9 +2477,9 @@ msgstr "Simbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
 #: ../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/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
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
@@ -2496,7 +2492,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:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2510,7 +2506,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:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2531,78 +2527,78 @@ msgstr "Ort"
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Privat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Weitere"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Benötigte Felder"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Geändert"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2610,23 +2606,23 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
@@ -2784,7 +2780,7 @@ msgstr "_IM-Dienst:"
 #: ../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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "O_rt:"
@@ -2794,7 +2790,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Mitglieder</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 "Kontaktlisteneditor"
 
@@ -2816,25 +2812,25 @@ msgstr ""
 "_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
 "untenstehende Liste:"
 
-#: ../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 "Kontaktlistenmitglieder"
 
-#: ../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 "_Mitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Buch"
 
-#: ../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 "Ist neue Liste"
 
@@ -2875,15 +2871,16 @@ msgstr ""
 "Der Namen oder die E-Mail-Adresse dieses Kontakts existiert\n"
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Kontakte zusammenführen"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Kontakte zusammenführen"
+
+#: ../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
@@ -2894,14 +2891,14 @@ msgid "Email"
 msgstr "E-Mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
@@ -2921,10 +2918,10 @@ msgstr[0] "%d Kontakte"
 msgstr[1] "%d Kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2932,28 +2929,28 @@ msgstr "Abfrage"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../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
 msgid "Model"
 msgstr "Modell"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Quelle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2961,96 +2958,90 @@ msgstr "Quelle"
 msgid "Type"
 msgstr "Art"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../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:1680 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Neuer Kontakt …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Neue Kontakt_liste …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "Als VCard _speichern …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Drucken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "In Adressbuch _kopieren …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "In Adressbuch _verschieben …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../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:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../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 "_Kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "E_infügen"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Anderer Fehler"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3185,7 +3176,7 @@ msgstr "Funk"
 #: ../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 "Position"
 
@@ -3223,13 +3214,13 @@ msgstr "Website"
 
 #: ../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
+#: ../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-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-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
@@ -3239,12 +3230,12 @@ msgstr "Breite"
 
 #: ../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
+#: ../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-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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
@@ -3273,12 +3264,11 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Spaltenbreite"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3286,9 +3276,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Suche nach dem Kontakt."
+"Suche nach Kontakten …"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3302,7 +3292,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3316,7 +3306,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3326,7 +3316,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3336,7 +3326,7 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3361,16 +3351,16 @@ msgstr "Gewählt"
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
@@ -3414,23 +3404,22 @@ msgstr "Video-Chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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-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 "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
@@ -3452,13 +3441,13 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Jahrestag"
@@ -3531,7 +3520,7 @@ msgstr "Protokoll nicht unterstützt"
 #: ../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:2523
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -3567,16 +3556,26 @@ msgstr "Keine derartige Quelle"
 msgid "Not available in offline mode"
 msgstr "Im Offline-Modus nicht verfügbar"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Anderer Fehler"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Ungültige Server-Version"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Nicht unterstützte Legitimationsmethode"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
 "dieses Adressbuch nicht für die Offline-Benutzung markiert wurde oder bis "
@@ -3584,25 +3583,25 @@ msgstr ""
 "laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
 "herunterzuladen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dürfen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
 "Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
 "erreichbar ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3612,82 +3611,86 @@ msgstr ""
 "Falls Sie LDAP in Evolution verwenden wollen, müssen Sie eine LDAP-mächtige "
 "Evolution-Version installieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
 "Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
 "ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Ausführlicher Fehler:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "Ihre Abfrage führte zu mehr Treffern als dieser Server übertragen\n"
-"oder Evolution anzeigen darf. Bitte präzisieren Sie Ihre Suche\n"
+"oder Evolution anzeigen soll. Bitte präzisieren Sie Ihre Suche\n"
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "Die für das Ausführen der Abfrage erforderliche Zeit hat das Zeitlimit des\n"
 "Servers oder das von Ihnen für dieses Adressbuch festgelegte überschritten.\n"
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte die Syntax dieser "
 "Abfrage nicht analysieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "ausführen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3704,17 +3707,17 @@ msgstr[1] ""
 "geöffnet werden.\n"
 "Wollen Sie wirklich all diese Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
 # CHECK der Kontakt -> diesen?
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3723,70 +3726,70 @@ msgstr ""
 "%s existiert bereits\n"
 "Soll er überschrieben werden?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Ãœberschreiben"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "Kontakt"
 msgstr[1] "Kontakte"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Adressbuch auswählen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "Mehrere VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "VCard für %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:297
 msgid "Querying Address Book..."
 msgstr "Adressbuch wird abgefragt …"
 
@@ -3807,14 +3810,14 @@ msgid "Show Compact vCard"
 msgstr "Kompakt-VCard anzeigen"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "In Adressbuch speichern"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Kartenansicht"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../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
@@ -3822,27 +3825,27 @@ msgstr "Kartenansicht"
 msgid "Importing..."
 msgstr "Importieren …"
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV oder 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- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV oder 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- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV oder 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- und Tab-Importeur"
 
@@ -3903,12 +3906,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../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:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Kopfzeile"
 
@@ -4010,8 +4013,8 @@ msgstr "Schattierung"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1055
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Größe:"
@@ -4029,7 +4032,7 @@ msgid "Top:"
 msgstr "Oben:"
 
 #: ../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 "Art:"
 
@@ -4041,35 +4044,35 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift …"
 
-#: ../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 "Kontakt-Druckstileditortest"
 
-#: ../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 "Copyright (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 "Dies sollte das Kontakt-Druckstileditor-Widget testen"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Kontaktdrucktest"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Dies sollte die Kontaktdruck-Anwendungsroutinen testen"
 
-#: ../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 "Datei konnte nicht geöffnet werden"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Adressbuchliste konnte nicht abgerufen werden"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4085,7 +4088,7 @@ msgid "OUTPUTFILE"
 msgstr "AUSGABEDATEI"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Lokale Adressbuchordner auflisten"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4140,10 +4143,11 @@ 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}« ist ein schreibgeschützter Kalender. Wechseln Sie zur Kalenderansicht "
+"und wählen Sie einen anderen Kalender aus."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-#, fuzzy
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -4249,19 +4253,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen Termin löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sind Sie sicher, dass Sie diese Notiz löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
@@ -4429,7 +4433,6 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Der Kalender ist nicht für eine Offline-Benutzung markiert."
 
 #: ../calendar/calendar.error.xml.h:54
-#, fuzzy
 msgid "The memo list is not marked for offline usage."
 msgstr "Die Notizliste ist nicht für eine Offline-Benutzung markiert."
 
@@ -4535,11 +4538,11 @@ msgstr ""
 "wurde."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -4548,7 +4551,7 @@ msgid "_Save Changes"
 msgstr "Änderungen _speichern"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../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 "Ab_schicken"
@@ -4604,12 +4607,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -4653,24 +4657,24 @@ msgstr "_Notizen"
 
 #: ../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:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../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
 msgid "Memos"
 msgstr "Notizen"
 
 #: ../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:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/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
+#: ../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 "Aufgaben"
@@ -4688,19 +4692,20 @@ msgstr "_Aufgaben"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../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:402
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "Stunde"
@@ -4717,8 +4722,8 @@ msgstr "Termine"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4729,14 +4734,14 @@ msgid "Snooze _time:"
 msgstr "Schlummer_zeit:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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
 #: ../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:41
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -4749,32 +4754,32 @@ msgstr "_Schlummer"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Keine Ortinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
-#: ../mail/mail-component.c:1585
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4787,7 +4792,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4804,7 +4809,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -4820,13 +4825,13 @@ msgstr ""
 "Fabrik für Alarmbenachrichtigungsdienst konnte nicht erstellt werden, "
 "gegebenenfalls läuft diese bereits."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "ungültige Zeit"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c: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:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4834,8 +4839,8 @@ msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c: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:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4845,8 +4850,8 @@ msgstr[1] "%d Minuten"
 #. 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:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5100,12 +5105,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
@@ -5156,7 +5161,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Zeit der letzten Alarmauslösung im »time_t«-Format."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Zeitzone"
 
@@ -5306,56 +5311,56 @@ msgstr "Minute, zu der der Arbeitstag beginnt"
 msgid "daylight savings time"
 msgstr "Sommerzeit"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Kategorie ist"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Ort enthält"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
@@ -5383,7 +5388,8 @@ msgstr "Ereignisse löschen älter als"
 #: ../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:403
+#: ../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 "Tage"
@@ -5392,58 +5398,50 @@ msgstr "Tage"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../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:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "Ei_genschaften"
-
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Auffrischen der Kalender gescheitert."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Der Kalender »%s« konnte nicht zum Anlegen von Ereignissen und Besprechungen "
 "geöffnet werden"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Es ist kein Kalender zum Anlegen von Ereignissen und Besprechungen verfügbar"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Kalenderquellenauswahl"
 
@@ -5451,10 +5449,6 @@ msgstr "Kalenderquellenauswahl"
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/calendar-component.c:1597
-msgid "_Appointment"
-msgstr "_Termin"
-
 #: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
@@ -5463,10 +5457,6 @@ msgstr "Einen neuen Termin anlegen"
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1605
-msgid "M_eeting"
-msgstr "_Besprechung"
-
 #: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
@@ -5475,10 +5465,6 @@ msgstr "Eine neue Besprechungsanfrage anlegen"
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1613
-msgid "All Day A_ppointment"
-msgstr "_Ganztagstermin"
-
 #: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
@@ -5487,27 +5473,23 @@ msgstr "Einen neuen ganztätigen Termin anlegen"
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:1621
-msgid "Cale_ndar"
-msgstr "Ka_lender"
-
 #: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Tagesansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Arbeitswochenansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Wochenansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Monatsansicht"
 
@@ -5545,19 +5527,18 @@ msgstr "Einstufung"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
 #: ../calendar/gui/tasktypes.xml.h:12
-#, fuzzy
 msgid "Competition"
-msgstr "Abschlussdatum"
+msgstr "Wettbewerb"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../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/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #: ../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 "Beschreibung"
@@ -5590,7 +5571,7 @@ msgstr "Geschenke"
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:20
 msgid "Goals/Objectives"
-msgstr ""
+msgstr "Zielsetzungen"
 
 #: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -5619,9 +5600,8 @@ msgstr "International"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
 #: ../calendar/gui/tasktypes.xml.h:28
-#, fuzzy
 msgid "Key Customer"
-msgstr "Anpassen"
+msgstr "Hauptkunden"
 
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
 #: ../calendar/gui/tasktypes.xml.h:30
@@ -5629,9 +5609,8 @@ msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
 #: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-#, fuzzy
 msgid "Next 7 days"
-msgstr "Aufgaben der nächsten 7 Tage"
+msgstr "Nächsten 7 Tage"
 
 #: ../calendar/gui/caltypes.xml.h:28
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
@@ -5641,24 +5620,23 @@ msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
 #: ../calendar/gui/tasktypes.xml.h:36
-#, fuzzy
 msgid "Phone Calls"
-msgstr "Telefon"
+msgstr "Telefonanrufe"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../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/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../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
 msgid "Public"
 msgstr "Öffentlich"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "Wiederholung"
 
@@ -5692,9 +5670,8 @@ msgstr "Zusammenfassung enthält"
 
 #: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
 #: ../calendar/gui/tasktypes.xml.h:42
-#, fuzzy
 msgid "Suppliers"
-msgstr "Antworten"
+msgstr "Lieferanten"
 
 #: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
@@ -5743,11 +5720,11 @@ msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Alarm bearbeiten"
 
@@ -5851,7 +5828,6 @@ msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -5859,7 +5835,7 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Aktion/Auslöser"
 
@@ -5873,12 +5849,12 @@ msgstr "_Hinzufügen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
@@ -6041,7 +6017,7 @@ msgid "Thursday"
 msgstr "Donnerstag"
 
 #: ../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 "Zeit_zone:"
 
@@ -6135,398 +6111,397 @@ msgstr "M_i"
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../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 ""
 "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../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 "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_Farbe:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Notizlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Diese Notiz wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Diese Notiz wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "aktualisieren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Beigelegte Nachricht - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../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:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "Den in der Zwischenablage befindlichen Text einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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:54
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "Klicken Sie hier, um eine Datei beizulegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
-#, fuzzy
 msgid "Recent Docu_ments"
-msgstr "Prozent abgeschlossen"
+msgstr "_Zuletzt geöffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anlage"
 msgstr[1] "<b>%d</b> Anlagen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "_Entfernen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Durch Drücken der Leertaste wird die Anlagenleiste ein bzw. ausgeblendet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -6542,62 +6517,62 @@ msgstr "Ziel konnte nicht geöffnet werden"
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 "Diese Notiz konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden"
 
@@ -6606,7 +6581,7 @@ msgid "Contacts..."
 msgstr "Kontakte …"
 
 #: ../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 "Delegieren an:"
 
@@ -6614,181 +6589,181 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klicken Sie hier, um Alarme für dieses Ereignis einzustellen"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "_Wiederholung"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Versandoptionen"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Erweiterte Versandoptionen einfügen"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "_Ganztägiges Ereignis"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "Festlegen, ob es ein ganztägiges Ereinis ist"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "Zeit als b_eschäftigt anzeigen"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "_Verfügbarkeit"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthält Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegaten"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Hinzufügen"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Anpassen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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:943
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Keine"
 
@@ -6813,23 +6788,25 @@ msgid "Custom Alarm:"
 msgstr "Benutzerdefinierter Alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "Bes_chreibung:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
-#: ../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 "Zusa_mmenfassung:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "A_larm"
 
+#: ../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 "_Beschreibung:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Zeit:"
@@ -6865,7 +6842,7 @@ msgstr "Ko_ntakte …"
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Notiz"
 
@@ -6876,7 +6853,7 @@ msgstr "Notizen in »%s« konnten nicht geöffnet werden."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "An"
@@ -6890,10 +6867,6 @@ msgstr "_Anfangsdatum:"
 msgid "T_o:"
 msgstr "A_n:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Beschreibung:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -7114,12 +7087,12 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: ../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 "Das Fertigstellungsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Website"
 
@@ -7140,7 +7113,7 @@ msgstr "<b>Status</b>"
 #: ../calendar/gui/e-calendar-table.c:238
 #: ../calendar/gui/e-calendar-table.c:642 ../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:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Abgeschlossen"
@@ -7148,7 +7121,7 @@ msgstr "Abgeschlossen"
 #: ../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:1064
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Hoch"
 
@@ -7158,21 +7131,21 @@ msgstr "Hoch"
 #: ../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:2517
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: ../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:1062
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Niedrig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "Normal"
 
@@ -7181,7 +7154,7 @@ msgstr "Normal"
 #: ../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:2514
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Nicht begonnen"
@@ -7212,27 +7185,25 @@ msgstr "_Priorität:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "S_tatusdetails"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
-#, fuzzy
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr ""
-"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern"
+"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern."
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
@@ -7259,17 +7230,13 @@ msgid "Categor_ies..."
 msgstr "Ka_tegorien …"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Beschreibung:"
+msgid "D_ue date:"
+msgstr "_Fällig am:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Zeitzone:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Fällig am:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7347,13 +7314,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Namenlos"
 
@@ -7408,12 +7375,12 @@ msgstr "Enddatum"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-cal-model-calendar.c:187
 #: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Frei"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
@@ -7429,7 +7396,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7437,7 +7404,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7445,51 +7412,51 @@ msgid "No"
 msgstr "Nein"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-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:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../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
+#: ../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 "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
 #: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
@@ -7497,19 +7464,18 @@ msgstr "Zum _Hintergrund machen"
 msgid "_Save Selected"
 msgstr "Auswahl _speichern"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen …"
 
 #: ../calendar/gui/e-calendar-table.c:338
-#, fuzzy
 msgid "* No Summary *"
-msgstr "Keine Zusammenfassung"
+msgstr "* Keine Zusammenfassung *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -7517,20 +7483,18 @@ msgstr "Organisator: %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:2228
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #: ../calendar/gui/e-calendar-table.c:408
-#, fuzzy
 msgid "Start: "
-msgstr "Anfang"
+msgstr "Anfang:"
 
 #: ../calendar/gui/e-calendar-table.c:420
-#, fuzzy
 msgid "Due: "
-msgstr "Fällig am "
+msgstr "Fälligkeit:"
 
 #: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
@@ -7577,23 +7541,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Speichern unter …"
 
 #: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
@@ -7602,20 +7566,20 @@ msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Drucken …"
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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 "_Ausschneiden"
 
 #: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
 #: ../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"
@@ -7682,108 +7646,108 @@ msgstr "Priorität"
 msgid "Start date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Datum wählen …"
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %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:115
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %k:%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:118
 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:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7796,7 +7760,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:587
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
@@ -7807,20 +7771,20 @@ msgstr "%02i Minuten-Unterteilungen"
 #. 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:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../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
 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:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "PM"
 
@@ -7918,12 +7882,12 @@ msgstr "iCalendar-Fehler"
 
 #: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
@@ -7940,12 +7904,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Angenommen"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
@@ -7953,7 +7917,7 @@ msgstr "Vorläufig angenommen"
 #: ../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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Abgelehnt"
 
@@ -8179,7 +8143,7 @@ msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
@@ -8202,7 +8166,7 @@ msgid "Update"
 msgstr "Aktualisieren"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Annehmen"
 
@@ -8211,7 +8175,7 @@ msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Ablehnen"
 
@@ -8278,49 +8242,49 @@ msgstr "Teilnehmer"
 
 #: ../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:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../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:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../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:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../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:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Raum"
 
 #: ../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:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../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:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../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:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../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:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
@@ -8339,7 +8303,7 @@ msgstr "Vorläufig"
 #: ../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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegiert"
 
@@ -8360,7 +8324,7 @@ msgstr "In Bearbeitung"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
 #: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
@@ -8369,14 +8333,14 @@ msgstr "%a, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel-item.c:476
 #: ../calendar/gui/e-meeting-time-sel.c:2153
 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:480
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -8477,7 +8441,7 @@ msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8516,54 +8480,50 @@ msgstr "Aufgaben werden abgeschlossen …"
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Zeitzone auswählen"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:347 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "Abfrage wird aktualisiert"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "Ansichten _definieren …"
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Notizen unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -8678,40 +8638,40 @@ msgstr "iCalendar-Informationen"
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d gewählt"
 msgstr[1] ", %d gewählt"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Auffrischen der Notizen gescheitert."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Die Notizliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Es ist kein Kalender zum Anlegen von Notizen verfügbar"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Notizquellenauswahl"
 
@@ -8719,10 +8679,6 @@ msgstr "Notizquellenauswahl"
 msgid "New memo"
 msgstr "Neue Notiz"
 
-#: ../calendar/gui/memos-component.c:1261
-msgid "Mem_o"
-msgstr "N_otiz"
-
 #: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
@@ -8731,10 +8687,6 @@ msgstr "Eine neue Notiz anlegen"
 msgid "New shared memo"
 msgstr "Neue gemeinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1269
-msgid "_Shared memo"
-msgstr "_Gemeinsame Notiz"
-
 #: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
@@ -8743,22 +8695,17 @@ msgstr "Eine neue gemeinsame Notiz anlegen"
 msgid "New memo list"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:1277
-msgid "Memo li_st"
-msgstr "Noti_zenliste"
-
 #: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
 #: ../calendar/gui/memotypes.xml.h:25
-#, fuzzy
-msgid "Next 7 Days'"
-msgstr "Aufgaben der nächsten 7 Tage"
+msgid "Next 7 Days"
+msgstr "Nächsten 7 Tage"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
@@ -8804,9 +8751,9 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
 
 #: ../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 "Notizen"
 
@@ -8963,84 +8910,79 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Bevorstehende Termine"
-
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Auffrischen der Aufgaben gescheitert."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Die Aufgabenliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Aufgabenquellenauswahl"
 
@@ -9056,10 +8998,6 @@ msgstr "Eine neue Aufgabe anlegen"
 msgid "New assigned task"
 msgstr "Zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1334
-msgid "Assigne_d Task"
-msgstr "_Zugewiesene Aufgabe"
-
 #: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
@@ -9068,10 +9006,6 @@ msgstr "Eine neue zugewiesene Aufgabe anlegen"
 msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:1342
-msgid "Tas_k list"
-msgstr "Aufgabenl_iste"
-
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
@@ -9089,7 +9023,7 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Nicht mehr rückfragen."
 
@@ -9124,7 +9058,7 @@ msgstr "Termine und Besprechungen"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
@@ -9157,1532 +9091,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
 #.
+#. *
+#. * 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/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Algier"
 
-#: ../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 "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/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/Dschibuti"
 
-#: ../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_Aaium"
 
-#: ../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/Gaboron"
 
-#: ../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/Tripoli"
 
-#: ../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/Araguania"
 
-#: ../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/Karakas"
 
-#: ../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/Costa_Rica"
 
-#: ../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/Guyana"
 
-#: ../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/Jamaika"
 
-#: ../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/Martinique"
 
-#: ../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/Puerto_Rico"
 
-#: ../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 "Antarktis/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/Süd_Pol"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asien/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asien/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asien/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asien/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asien/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asien/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asien/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asien/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asien/Bahrein"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asien/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asien/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asien/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asien/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asien/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asien/Kalkutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asien/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asien/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asien/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asien/Damaskus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asien/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asien/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asien/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asien/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asien/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asien/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asien/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asien/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asien/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asien/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asien/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asien/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asien/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asien/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asien/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asien/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asien/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asien/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asien/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asien/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asien/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asien/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asien/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asien/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asien/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asien/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asien/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asien/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asien/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asien/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asien/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asien/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asien/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asien/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asien/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asien/Katar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asien/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asien/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asien/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asien/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asien/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asien/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asien/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asien/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asien/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asien/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asien/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asien/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asien/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asien/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asien/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asien/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asien/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asien/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asien/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asien/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asien/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asien/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asien/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azoren"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudas"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanaren"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kap_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../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/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Gerorgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St._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 "Australien/Adelaid"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australien/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australien/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australien/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australien/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australien/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australien/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australien/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australien/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australien/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Athen"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Brüssel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisabon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moskau"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Rom"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tiran"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Warschau"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaüorozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indisch/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indisch/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indisch/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indisch/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indisch/Komoren"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indisch/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indisch/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indisch/Malediven"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indisch/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indisch/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indisch/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pazifik/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pazifik/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pazifik/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pazifik/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pazifik/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pazifik/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pazifik/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pazifik/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pazifik/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pazifik/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pazifik/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pazifik/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pazifik/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pazifik/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pazifik/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pazifik/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pazifik/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pazifik/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pazifik/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pazifik/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pazifik/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pazifik/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pazifik/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pazifik/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pazifik/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pazifik/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pazifik/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pazifik/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pazifik/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pazifik/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pazifik/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pazifik/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pazifik/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pazifik/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pazifik/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pazifik/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pazifik/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pazifik/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
@@ -10703,190 +10656,187 @@ msgstr "Anlage hinzufügen"
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../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 "S_chließen"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../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 "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "_Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Versandoptionen einfügen"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:537
-#, fuzzy
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
-msgstr "Neue Nachricht _schicken an …"
+msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Von-Wähler anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "V_eröffentlichen-in-Feld"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:649
-#, fuzzy
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
-msgstr "_Kopie-Feld"
+msgstr "_Betreff-Feld"
 
-#: ../composer/e-composer-actions.c:651
-#, fuzzy
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
-msgstr "Statusfeld anzeigen/verbergen"
+msgstr "Betrefffeld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "A_n-Feld"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "An-Feld anzeigen/verbergen"
 
@@ -10939,39 +10889,38 @@ msgstr "Be_treff:"
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
 #: ../composer/e-composer-private.c:65
-#, fuzzy
 msgid "Recent _Documents"
-msgstr "Prozent abgeschlossen"
+msgstr "_Zuletzt geöffnet"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10979,23 +10928,23 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11150,17 +11099,21 @@ msgstr "Sie können die Datei »{0}« dieser Nachricht nicht beilegen."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Sie müssen ein Konto einrichten, bevor Sie E-Mails verfassen können."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "Nachricht _bearbeiten"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Verwerfen"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Wiederherstellen"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "Nachricht _speichern"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Entwurf _speichern"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
@@ -11204,35 +11157,34 @@ msgstr "Evolution-Abfrage"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler »%s« angefordert"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Komponente"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
-msgstr ""
+msgstr "Name der Komponente, die protokolliert wird"
 
 #: ../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/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Aktiv"
 
 #: ../e-util/e-plugin.c:309
-#, fuzzy
 msgid "Whether the plugin is enabled"
-msgstr "Ist der Ausklapper ausgeklappt?"
+msgstr "Legt fest, ob das Plugin aktiviert ist"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Während des Druckens ist ein Fehler aufgetreten"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Das Drucksystem hat folgende Details zum Fehler berichtet:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -11240,7 +11192,6 @@ msgstr ""
 "berichtet."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Because \"{1}\"."
 msgstr "Grund: »{1}«."
 
@@ -11249,7 +11200,6 @@ msgid "Cannot open file \"{0}\"."
 msgstr "Die Datei »{0}« konnte nicht geöffnet werden."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
 msgstr "Die Datei »{0}« konnte nicht gespeichert werden."
 
@@ -11269,6 +11219,10 @@ msgstr "Datei überschreiben?"
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Wichtig"
@@ -11324,7 +11278,7 @@ msgstr "GConf-Fehler: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -11451,57 +11405,57 @@ msgstr "Eine Datei wählen"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:851
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Regel_name:"
 
-#: ../filter/filter-rule.c:879
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Objekte suchen, die folgenden Kriterien entsprechen"
 
-#: ../filter/filter-rule.c:913
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "Filter_kriterien hinzufügen"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Falls alle Kriterien zutreffen"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Falls irgendein Kriterium zutrifft"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "Objekte _suchen:"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Alle mit Bezug"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Antworten"
 
 # CHECK
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Antworten und Vorgänger"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Ohne Antwort oder Vorgänger"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "_Threads einschließen"
 
-#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -11617,7 +11571,8 @@ msgstr "die von Ihnen angegebene Zeit"
 
 #: ../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:404
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "Wochen"
 
@@ -11659,9 +11614,8 @@ msgid "Configure your email accounts here"
 msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Configure your network connection settings here"
-msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+msgstr "Hier können Sie Ihre Netzwerkeinstellungen konfigurieren"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
@@ -11688,14 +11642,13 @@ msgid "Evolution Mail preferences control"
 msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
 msgid "Evolution Network configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
+msgstr "Verwaltung der Netzwerkeinstellungen"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../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:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:758
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-Mail"
@@ -11737,13 +11690,13 @@ msgstr ""
 " Lizenzvereinbarung für %s.\n"
 "Haken Sie das Kontrollkästchen ab, um sie zu akzeptieren.\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
 #: ../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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
@@ -11759,42 +11712,42 @@ msgstr "Identität"
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Vorgaben"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sicherheit"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
@@ -11828,18 +11781,18 @@ msgstr "Signaturskript hinzufügen"
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11847,7 +11800,7 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
@@ -12099,9 +12052,9 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:318
+#: ../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
 msgid "Subject"
@@ -12112,64 +12065,64 @@ msgid "Unset Status"
 msgstr "Status nicht setzen"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Dann"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
 #. 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] "Ungelesene Nachrichten:"
@@ -12177,18 +12130,32 @@ msgstr[1] "Ungelesene Nachrichten:"
 
 #. 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] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
-#, fuzzy
+#: ../mail/em-folder-properties.c:196
+#, fuzzy, c-format
+msgid "Quota usage (%s):"
+msgstr "Nachrichten insgesamt:"
+
+#: ../mail/em-folder-properties.c:198
+#, fuzzy, c-format
 msgid "Quota usage"
 msgstr "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:385
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
@@ -12221,14 +12188,6 @@ msgstr "OHNE TREFFER"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Eingang"
-
 #: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Ausgang"
@@ -12241,26 +12200,6 @@ msgstr "Verschickt"
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
-#. 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:380
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
@@ -12275,12 +12214,12 @@ msgstr "Ordner %s wird verschoben"
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
@@ -12290,15 +12229,15 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-tree.c:1003 ../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 "In Ordner _kopieren"
 
-#: ../mail/em-folder-tree.c:1004 ../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 "In Ordner _verschieben"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
@@ -12332,232 +12271,237 @@ msgstr "E-Mails aus A_usgang verschicken"
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "»%s« wird nach »%s« kopiert"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
+#: ../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
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Ordner »%s« wird angelegt"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../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 "_Weiterleiten"
 
 #. 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:1342 ../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 "Als neue Nachricht _bearbeiten …"
+msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Löschen rü_ckgängig"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
-msgstr "In Ordner verschie_ben …"
+msgstr "In Ordner _verschieben …"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
-msgstr "Als gelesen mar_kieren"
+msgstr "Als _gelesen markieren"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
-msgstr "Als u_ngelesen markieren"
+msgstr "Als _ungelesen markieren"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
-msgstr "Als u_nerwünscht markieren"
+msgstr "Als un_erwünscht markieren"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
-msgstr "Als Folg_enachricht markieren …"
+msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "Bes_chriftung"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Keine"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
-msgstr "Re_gel aus Nachricht anlegen"
+msgstr "_Regel aus Nachricht anlegen"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Suchordner über _Betreff"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Suchordner über Abse_nder"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Suchordner über _Empfänger"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Suchordner über Mailing_liste"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filter über Be_treff"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filter über Ab_sender"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filter über Em_pfänger"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filter über Ma_ilingliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#. 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 "Vorgabe"
 
-#: ../mail/em-folder-view.c:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Nachricht wird abgerufen …"
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Anrufen …"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../mail/em-folder-view.c:3328
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12565,12 +12509,12 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12578,11 +12522,11 @@ msgstr ""
 "Diese Nachricht ist signiert und gültig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12590,11 +12534,11 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
 "Möglicherweise wurde sie bei der Übertragung verändert."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12602,11 +12546,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der öffentliche Schlüssel benötigt"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12614,11 +12558,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, jedoch ist kein "
 "passender öffentlicher Schlüssel vorhanden."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12626,11 +12570,11 @@ msgstr ""
 "Diese Nachricht ist nicht verschlüsselt. Daher kann ihr Inhalt bei der "
 "Übertragung über das Internet möglicherweise ausgespäht werden."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12640,11 +12584,11 @@ msgstr ""
 "jedoch schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch "
 "nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12652,11 +12596,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12666,88 +12610,88 @@ msgstr ""
 "verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Inline (eingebettet) anzeigen"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "In der Breite ein_passen"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "In _Originalgröße anzeigen"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Anlage speichern als"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Ordner zum Speichern aller Anlagen auswählen"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "Gewählte _speichern …"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d A_nlage"
 msgstr[1] "%d A_nlagen"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "_Speichern"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Keine Anlagen"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "Ö_ffnen mit"
 
-#: ../mail/em-format-html-display.c:2467
+#: ../mail/em-format-html-display.c:2473
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12807,19 +12751,19 @@ msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  …"
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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 "Kopie"
 
 #: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../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 "Blindkopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Mailer"
@@ -12842,13 +12786,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Diese Nachricht wurde von <b>%s</b> im Namen von <b>%s</b> gesendet"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:314
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Von"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Antwort an"
@@ -12868,49 +12812,49 @@ msgstr "Newsgroups"
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
 "Unbekannter Fehler"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 "Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
@@ -12985,11 +12929,6 @@ msgstr "Zu erledigen"
 msgid "Later"
 msgstr "Später"
 
-#: ../mail/em-migrate.c:1247
-#, fuzzy, c-format
-msgid "Migrating '%s':"
-msgstr "»%s« wird migriert:"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -13039,15 +12978,14 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %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 ""
-"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
-"Evolution 1.x verändert.\n"
+"Das Zusammenfassungsformat der Evolution-E-Mail-Ordner hat sich inEvolution "
+"2.24 verändert.\n"
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
@@ -13064,17 +13002,17 @@ msgstr ""
 "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
 "gelesen werden, »evolution/config.xmldb« existiert nicht oder ist fehlerhaft."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "Zum Adressbuch _hinzufügen"
 
@@ -13128,27 +13066,25 @@ msgstr "Adresse hinzufügen"
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Suchordner-Quelle"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Send and Receive Mail\" window height"
-msgstr "E-Mails verschicken und abrufen"
+msgstr "Höhe des Fensters »E-Mails verschicken und abrufen«"
 
 #: ../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 "E-Mails verschicken und abrufen"
+msgstr "Weite des Fensters »E-Mails verschicken und abrufen«"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
@@ -13210,92 +13146,97 @@ msgstr ""
 "die im Schlüssel »address_count« angegebene Anzahl reduzieren."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Custom headers to use while checking for junk."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr ""
-"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird."
 
 #: ../mail/evolution-mail.schemas.in.h:18
-#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+"Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
+"genutzt werden."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird. "
-"Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
+"Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
+"genutzt werden.Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Die Vorgabehöhe des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Die Vorgabehöhe des Nachrichtenfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Die Vorgabehöhe des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Die Vorgabebreite des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Die Vorgabebreite des Nachrichtenfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Die Vorgabebreite des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
-"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
-"wird"
+"Legt fest, ob nur in lokalen Adressbüchern nach der E-Mail-Adresse des "
+"Absenders für das Filtern unerwünschter Nachrichten gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
 "wird"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
+#, fuzzy
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
@@ -13304,13 +13245,13 @@ msgstr ""
 "markiert sind. Diese Funktion kann langsam sein falls entfernte Adressbücher "
 "(wie LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung "
 "benutzt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -13321,7 +13262,7 @@ msgstr ""
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die Prüfung auf "
 "Unerwünschtheit beschleunigt."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -13329,61 +13270,61 @@ msgstr ""
 "Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in "
 "der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeverzeichnis für Anlagen im Nachrichteneditor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../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:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle Unerwünscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
 "angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -13395,7 +13336,7 @@ msgstr ""
 "Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
 "sofort zu diesem Ordner."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13403,29 +13344,29 @@ msgstr ""
 "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Verarbeiten von Nachrichten-Textteilen von begrenzter Größe aktivieren/"
 "deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
@@ -13433,7 +13374,7 @@ msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, "
 "wird er gefragt, ob er es wirklich tun will."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13442,7 +13383,7 @@ msgstr ""
 "darunter anzeigen."
 
 # CHECK - etwas holprig
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -13453,13 +13394,13 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -13468,20 +13409,20 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Die Anzeige während dem Markieren mehrerer Nachrichten aktivieren/"
 "deaktivieren"
 
 # FIXME
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -13489,7 +13430,7 @@ msgstr ""
 "Legt fest, ob jedes Mal vorm Setzen des Offline-Statuses gefragt werden "
 "soll, ob für den Offline-Modus synchronisiert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -13499,31 +13440,31 @@ msgstr ""
 "Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur "
 "aus den Suchergebnissen entfernt."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Letzte Unerwünscht-Ordner-Leerung"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Letzte Müllleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -13532,16 +13473,16 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -13551,141 +13492,141 @@ msgstr ""
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentenbetrachter hin überprüft "
 "werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. Mögliche Werte sind: 0 - "
 "Niemals Bilder aus dem Netz laden, 1 - Bilder laden falls Absender im "
 "Adressbuch, 2 - Immer Bilder aus dem Netz laden."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Vorgabehöhe des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Vorgabebreite des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline gehen "
 "möchte"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -13693,74 +13634,79 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
 "verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Emoticons im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-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 "In den lokalen Adressbüchern nach dem Photo des Absenders suchen"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "S_ynchronisationsoptionen …"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Photo des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13768,71 +13714,69 @@ msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Photos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
-msgstr "Rechtschreibprüfung"
+msgstr "Farbe für Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
-msgstr "Rechtschreibprüfung an Ort und Stelle"
+msgstr "Sprachen für Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Vorgabehöhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Vorgabebreite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Textnachrichtenteil-Begrenzung"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem "
 "01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit dem 01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Hier sind drei verschiedene Werte möglich: 0 für Fehler, 1 für Warnungen, 2 "
-"für Diagnosemeldungen."
+"Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
+"»2« für Diagnosemeldungen."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13840,7 +13784,7 @@ msgstr ""
 "Dies entscheidet die maximale Größe des Textteils, der von Evolution "
 "formatiert wird. Die Vorgabe sind 4MB/4096kb und ist in KB angegeben."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13850,10 +13794,11 @@ msgstr ""
 "aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
 "so wird nicht auf eines der anderen Plugins zurückgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 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 ""
 "Dieser Wert wird einmalig beim Aufruf von Evolution eingelesen und danach "
 "wieder auf den Vorgabewert »FALSE« zurückgesetzt. Falls TRUE, so wird das "
@@ -13861,7 +13806,7 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13873,18 +13818,18 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"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:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
@@ -13892,7 +13837,7 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor »…« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13901,7 +13846,7 @@ msgstr ""
 "werden sollen. Evolution muss nach Ändern dieses Wertes hierfür neu "
 "gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13911,28 +13856,18 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ändern dieses Wertes hierfür neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
@@ -14084,7 +14019,7 @@ msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "»%s« wird importiert"
@@ -14106,173 +14041,164 @@ msgstr "Evolution-Pine-Importeur"
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "E-Mail an %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:371
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
 #: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
 #: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#, fuzzy
 msgid "Templates"
-msgstr "Vorlage:"
+msgstr "Vorlagen"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:915
-msgid "_Mail Message"
-msgstr "_E-Mail-Nachricht"
-
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Neuer E-Mail-Ordner"
 
-#: ../mail/mail-component.c:923
-msgid "Mail _Folder"
-msgstr "E-Mail-_Ordner"
-
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../mail/mail-component.c:1071
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Auffrischen der E-Mail-Einstellungen oder -Ordner gescheitert."
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Fehler"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Fehler"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Warnungen und Fehler"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Fehlerdiagnose"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Fehler, Warnungen und Diagnosemeldungen"
 
-#: ../mail/mail-component.c:1713
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Fehlerdiagnose-Protokoll"
 
-#: ../mail/mail-component.c:1727
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "_Fehlermeldungen in der Statusleiste 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:1743
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "Sekunden anzeigen."
 
-#: ../mail/mail-component.c:1749
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Protokollmeldungen:"
 
-#: ../mail/mail-component.c:1790
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Protokolltyp"
 
-#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
@@ -14528,22 +14454,17 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
 #: ../mail/mail-config.glade.h:71
-#, fuzzy
 msgid "Do not format messages when text si_ze exceeds"
-msgstr ""
-"Textinhalt in E-Mails nicht formatieren wenn folgende Text_größe "
-"überschritten wird:"
+msgstr "E-Mail-Textinhalte nicht formatieren wenn Text _größer als"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
-"_Nachrichten nicht als Unerwünscht markieren, wenn der Absender im "
-"Adressbuch steht"
+"_Nachrichten nicht als Unerwünscht markieren, wenn Absender im Adressbuch"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Do not quote"
-msgstr "Nicht löschen"
+msgstr "Nicht zitieren"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -14623,9 +14544,8 @@ msgid "Inline"
 msgstr "Eingebettet"
 
 #: ../mail/mail-config.glade.h:96
-#, fuzzy
 msgid "Inline (Outlook style)"
-msgstr "Original-Nachricht inline weiterleiten"
+msgstr "Inline (Outlook-Stil)"
 
 #: ../mail/mail-config.glade.h:98
 msgid "KB"
@@ -14675,11 +14595,10 @@ msgstr ""
 "eine Verbindung mit dem Server aufbauen"
 
 #: ../mail/mail-config.glade.h:109
-#, fuzzy
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"Diese Einstellung wird ignoriert wenn ein Treffer für eine "
-"benutzerdefinierte Kopfzeile vorgefunden wird."
+"Einstellung wird ignoriert, falls eine benutzerdefinierte unerwünschte "
+"Kopfzeile gefunden wird."
 
 #: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
@@ -14756,8 +14675,8 @@ msgid "S_OCKS Host:"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "_Nach Photo des Absenders nur in den lokalen Adressbüchern suchen"
+msgid "S_earch for sender photograph only in local address books"
+msgstr "_Nach Photo des Absenders nur in lokalen Adressbüchern suchen"
 
 #: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
@@ -14865,8 +14784,10 @@ msgstr "_Benutzername:"
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:364
+#: ../mail/mail-config.glade.h:156 ../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 "_Benutzername:"
 
@@ -14903,7 +14824,7 @@ msgstr "_Vorgabe-Unerwünscht-Plugin:"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "_Direkte Internetverbindung"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
@@ -14923,7 +14844,7 @@ msgstr "Bilder in Nachrichten von Kontakten _laden"
 
 #: ../mail/mail-config.glade.h:171
 #, fuzzy
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "Lokale Adressbuchordner auflisten"
 
 #: ../mail/mail-config.glade.h:172
@@ -14948,7 +14869,6 @@ msgid "_Path:"
 msgstr "_Pfad:"
 
 #: ../mail/mail-config.glade.h:178
-#, fuzzy
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
@@ -14992,7 +14912,6 @@ msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
 #: ../mail/mail-config.glade.h:190
-#, fuzzy
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
@@ -15056,7 +14975,7 @@ msgstr "S_uchen:"
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
@@ -15109,7 +15028,7 @@ msgstr "_Markierung:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -15156,104 +15075,104 @@ msgstr "Nachricht %d von %d wird verschickt"
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, fuzzy, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15262,11 +15181,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15275,91 +15194,89 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' wird für Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Absagevorgang …"
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Aktualisieren …"
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../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:713
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
 #: ../mail/mail-signature-editor.c:201
-#, fuzzy
 msgid "_Save and Close"
-msgstr "Speichern und schließen"
+msgstr "_Speichern und schließen"
 
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Signatur bearbeiten"
 
 #: ../mail/mail-signature-editor.c:370
-#, fuzzy
 msgid "_Signature Name:"
-msgstr "Signaturtabelle"
+msgstr "_Signaturname:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -15434,7 +15351,6 @@ msgstr ""
 "oder abbrechen."
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -15443,12 +15359,11 @@ msgstr ""
 "geschickt werden?"
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
-"Es existiert bereits eine Signatur namens »{0}«. Bitte verwenden Sie einen "
+"Es existiert bereits eine Signatur namens »{0}«. Bitte verwenden Sie einen  "
 "anderen Namen."
 
 #: ../mail/mail.error.xml.h:8
@@ -15489,13 +15404,12 @@ msgstr ""
 "Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus allen "
-"Ordnern entfernen wollen?"
+"Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus dem "
+"Ordner »{0}« entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15607,9 +15521,8 @@ msgid "Cannot set signature script \"{0}\"."
 msgstr "Signaturskript »{0}« konnte nicht festgelegt werden."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "Über_prüfung auf unerwünschte Nachrichten"
+msgstr "Überprüfung auf Unerwünschtheit fehlgeschlagen"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15625,18 +15538,16 @@ msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Gelöscht: "
+msgstr "»{0}« löschen?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Konto löschen?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Nachrichten im Suchordner löschen?"
+msgstr "Nachrichten im Suchordner »{0}« löschen?"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
@@ -15821,7 +15732,6 @@ msgid "Please wait."
 msgstr "Bitte warten."
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners »{0}«."
 
@@ -15840,18 +15750,16 @@ msgid "Read receipt requested."
 msgstr "Lesebestätigung angefordert."
 
 #: ../mail/mail.error.xml.h:89
-#, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ordner »{0}« und alle seine Unterordner wirklich löschen?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid "Report Junk Failed"
-msgstr "Datei importieren"
+msgstr "Bericht über Unerwünschtheit fehlgeschlagen"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "Bericht über Erwünschtheit fehlgeschlagen"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -16043,9 +15951,8 @@ msgstr ""
 "das Wählen aller lokalen, aller fernen Ordner oder beider."
 
 #: ../mail/mail.error.xml.h:134
-#, fuzzy
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Das Anmelden am Server »{0}« als »{0}« ist gescheitert."
+msgstr "Anmedlung am Server »{0}« als »{0}« ist gescheitert."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -16067,91 +15974,87 @@ msgstr "_Säubern"
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:1595 ../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:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1611 ../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 "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1623 ../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 %I:%M %p"
 
-#: ../mail/message-list.c:1631 ../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:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../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:3885 ../mail/message-list.c:4321
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
-#: ../mail/message-list.c:4176
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4178
-#, fuzzy
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
-msgstr ""
-"\n"
-"\n"
-"In dieser Ansicht existieren keine anzuzeigenden Einträge."
+msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -16239,6 +16142,10 @@ msgid "Subject contains"
 msgstr "Betreff enthält"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Betreff oder Empfänger enthält"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Betreff oder Absender"
 
@@ -16313,27 +16220,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Audio-Einbettungs-Plugin"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswählen"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Evolution-Sicherungsarchiv zur Wiederherstellung wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16343,119 +16250,117 @@ msgstr ""
 "Alle E-Mails, Kalender, Aufgaben, Notizen und Adressbücher sowie alle\n"
 "persönlichen Einstellungen, Filter etc. können wiederhergestellt werden."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-Archiv zur Wiederherstellung wählen:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Evolution-Sicherungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Dateien aus dem Sicherungsarchiv extrahieren"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Entfernen der temporären Sicherungsdateien"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../plugins/backup-restore/backup.c:494
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
-msgstr "Evolution-Daten sichern"
+msgstr "Sichern der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
+msgstr "Bitte warten Sie, während Evolution Ihre Daten sichert."
 
-#: ../plugins/backup-restore/backup.c:497
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
-msgstr "Evolution wird neugestartet"
+msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
-msgstr ""
+msgstr "Bitte warten Sie, während Evolution Ihre Daten wiederherstellt."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
@@ -16495,9 +16400,8 @@ msgstr ""
 "soll."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Insufficient Permissions"
-msgstr "Berechtigungen des Delegaten"
+msgstr "Fehlende Berechtigungen"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
@@ -16508,9 +16412,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Bitte wählen Sie ein gültiges Evolution-Archiv zur Wiederherstellung."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
+msgid "The selected folder is not writable."
+msgstr "Der gewählte Ordner ist schreibgeschützt."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16539,46 +16442,46 @@ msgstr "Einstellungen _zurücksetzen …"
 msgid "_Backup Settings..."
 msgstr "Einstellungen sic_hern …"
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
+#: ../plugins/bbdb/bbdb.c:567
 #, fuzzy
-msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Beantwortung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Adressbuch für automatische Kontakte auswählen"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
+#: ../plugins/bbdb/bbdb.c:603
 #, fuzzy
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und Bilder regelmäßig mit der Pidgin-Buddy-Liste "
 "abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Adressbuch für die Pidgin-Kontaktliste auswählen"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Jetzt mit der _Buddy-Liste abgleichen"
 
 #: ../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 ""
@@ -16624,7 +16527,7 @@ msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
 msgstr ""
-"E-Mail-Text nach _Unicode konvertieren, um die Unerwünscht-Elemente aus "
+"E-Mail-Text in Unicode/UTF-8 umwandeln, um die unerwünschten Elemente aus "
 "verschiedenen Zeichenkodierungen einheitlich zu erkennen."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -16640,17 +16543,18 @@ msgstr "Bogofilter-Optionen"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtert unerwünschte Nachrichten unter Verwendung von Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../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:357
+#: ../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 "_SSL verwenden"
 
@@ -16672,10 +16576,10 @@ msgstr "Stellt Kernfunktionalität für lokale Kalender zur Verfügung."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:381
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
-msgstr "Auf_frischen"
+msgstr "Auf_frischen:"
 
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
@@ -16785,23 +16689,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 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 "Als _Vorgabeadressbuch markieren"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Als _Vorgabekalender markieren"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Als _Vorgabeaufgabenliste markieren"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Als _Vorgabenotizliste markieren"
 
@@ -16811,25 +16715,24 @@ msgstr "Vorgabequellen"
 
 #: ../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 ""
 "Stellt Funktionalität zum Markieren von Kalendern und Adressbüchern als "
 "Vorgabe zur Verfügung."
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "Benutzerdefinierte _Kopfzeile"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
-msgstr "Kenia"
+msgstr "Schlüssel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
-msgstr ""
+msgstr "Werte"
 
 #. 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
@@ -16852,7 +16755,7 @@ msgid "Custom Header"
 msgstr "Benutzerdefinierte Kopfzeile"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Liste der benutzerdefinierten Kopfzeilen"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16968,40 +16871,39 @@ msgstr "Ordnergröße"
 msgid "Exchange Settings"
 msgstr "Exchange-Einstellungen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "_Legitimation"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
-msgstr "_E-Mail"
+msgstr "_Postfach:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -17014,7 +16916,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -17022,7 +16924,7 @@ msgstr ""
 "Das aktuelle Passwort stimmt nicht mit dem vorhandenen Passwort Ihres Kontos "
 "überein. Bitte geben Sie das korrekte Passwort ein."
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 "Die beiden Passworte stimmen nicht überein. Bitte geben Sie sie erneut ein."
@@ -17043,13 +16945,13 @@ msgstr "Neues Passwort:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Ihr aktuelles Passwort ist abgelaufen. Bitte ändern Sie es jetzt."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:665
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Ihr Passwort wird in den nächsten %d Tagen ablaufen"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
@@ -17074,7 +16976,7 @@ msgid "Delegate Permissions"
 msgstr "Berechtigungen des Delegaten"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Berechtigungen für %s"
@@ -17117,43 +17019,43 @@ msgstr ""
 msgid "You have been designated as a delegate for %s"
 msgstr "Sie wurden als Delegat für %s eingetragen"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegieren an"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Den Delegaten %s entfernen?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Zugriff auf Active Directory gescheitert"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Eigener Eintrag wurde in Active Directory nicht gefunden"
 
-#: ../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 "Delegat %s wurde in Active Directory nicht gefunden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Delegat %s konnte nicht entfernt werden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Liste der Delegaten konnte nicht aktualisiert werden."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Delegat %s konnte nicht hinzugefügt werden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Fehler beim Lesen der Delegatenliste."
 
@@ -17202,25 +17104,25 @@ msgstr "_Berechtigungen zusammenfassen"
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Berechtigungen …"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Ordnername"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Ordnergröße"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Benutzer"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Ordner eines anderen Benutzers abonnieren"
@@ -17229,20 +17131,20 @@ msgstr "Ordner eines anderen Benutzers abonnieren"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-Ordnerbaum"
 
-#: ../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 "Ordner abbestellen …"
 
-#: ../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 "Den Ordner »%s« wirklich abbestellen?"
 
-#: ../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 "Abbestellen von »%s«"
@@ -17307,16 +17209,16 @@ msgstr "Ihr Passwort wird in 7 Tagen ablaufen …"
 msgid "_Change Password"
 msgstr "Passwort ä_ndern"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Erlaubnis verweigert.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Benutzer hinzufügen:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../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
 msgid "Add User"
@@ -17436,10 +17338,6 @@ msgstr "_Empfindlichkeit: "
 msgid "_User"
 msgstr "_Benutzer"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Benutzer auswählen"
@@ -17457,7 +17355,6 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Kalender eines anderen Benutzers abonnieren"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A plugin that manages a collection of Exchange account specific operations "
 "and features."
@@ -17607,7 +17504,7 @@ msgid "Folder offline"
 msgstr "Ordner offline"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -17737,6 +17634,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Unbekannter Fehler beim Suchen von {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -17826,9 +17724,8 @@ msgid "Check folder permissions"
 msgstr "Ordnerberechtigungen überprüfen"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
-#, fuzzy
 msgid "Default External Editor"
-msgstr "Externer Editor"
+msgstr "Vorgabe für Externen Editor"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
@@ -17848,13 +17745,12 @@ msgid "External Editor"
 msgstr "Externer Editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
-#, fuzzy
 msgid "Cannot create Temporary File"
-msgstr "Temporäres Speicherverzeichnis konnte nicht angelegt werden."
+msgstr "Temporäre Datei konnte nicht angelegt werden"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "Editor kann nicht gestartet werden"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
 msgid ""
@@ -17867,34 +17763,38 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
+"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht "
+"gestartet werden. Bitte benutzen Sie einen anderen Editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Im externen Editor verfassen"
+msgid "Compose in _External Editor"
+msgstr "Im e_xternen Editor verfassen"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "E-Mails mit einem externen Editor verfassen"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "Auszuführender Befehl, um den Editor zu starten:"
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
+"Benutzen Sie »xemacs« für Emacs\n"
+"Benutzen Sie »gvim« für VI"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Wählen Sie eine 48*48-Pixel-PNG-Datei kleiner als 700 Bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG-Dateien"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Gesicht"
 
@@ -17931,39 +17831,54 @@ msgstr "Ordner abbestellen"
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../plugins/google-account-setup/google-source.c:73
-#: ../plugins/google-account-setup/google-source.c:80
+#: ../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-contacts-source.c:198
+#: ../plugins/google-account-setup/google-source.c:439
 #, fuzzy
-msgid "<b>Server</b>"
-msgstr "<b>Mitglieder</b>"
+msgid "Please enter user name first."
+msgstr "Bitte wählen Sie einen anderen Namen."
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-#, fuzzy
-msgid "Username:"
-msgstr "_Benutzername:"
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
+
+#: ../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 "_Kalender:"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:230
+#: ../plugins/google-account-setup/google-source.c:728
 #, fuzzy
-msgid "Update every"
-msgstr "Abfrage wird aktualisiert"
+msgid "Retrieve _list"
+msgstr "»%s« wird abgerufen"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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 "Ein Plugin zum Einrichten des Google-Kalenders."
+msgstr "Einrichtung von Google-Kalender und -Kontakten."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-Quellen"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Checkliste"
 
@@ -18008,16 +17923,16 @@ msgstr "Gemeinsamen Ordner einrichten"
 msgid "Shared Folder Installation"
 msgstr "Einrichten von Gemeinsamen Ordnern"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Einstellungen zu unerwünschten Nachrichten"
 
-#: ../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 "Einstellungen zu unerwünschten Nachrichten"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Einstellungen zu unerwünschten Nachrichten …"
 
@@ -18129,15 +18044,17 @@ msgid "Account Already Exists"
 msgstr "Konto existiert bereits"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
+"Es existiert bereits ein Ordner namens »{0}«. Bitte verwenden Sie einen "
+"anderen Namen."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "Dies zu einem wiederkehrenden Ereignis machen"
+msgstr "Dies ist ein wiederkehrendes Ereignis"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 #, fuzzy
@@ -18158,7 +18075,7 @@ msgstr "Automatisches Speichern in Datei »{0}« gescheitert."
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr ""
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Vorläufig annehmen"
 
@@ -18175,7 +18092,7 @@ msgid "Con_tacts..."
 msgstr "Kon_takte …"
 
 #: ../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 "Nachricht"
 
@@ -18279,20 +18196,20 @@ msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto online ist."
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto aktiviert ist."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Eingabe der Benutzer und Festlegen der Rechte"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Neue Ordner_freigabe …"
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Freigeben"
 
@@ -18448,8 +18365,8 @@ msgstr "Aufgabenliste auswählen"
 msgid "Select Calendar"
 msgstr "Kalender auswählen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importieren"
 
@@ -18493,7 +18410,8 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar-Format (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Die ausgewählten Aufgaben, Notizen, Kalender oder Adressbücher mit dem Apple "
 "iPod synchronisieren"
@@ -18506,135 +18424,135 @@ msgstr "Synchronisieren mit iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-Synchronisation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Der Kalender »%s« konnte nicht geladen werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein Termin im Kalender »%s« überschneidet sich mit dieser Besprechung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Element kann nicht zu Kalender »%s« gesendet werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Delegaten %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Delegaten wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Die Absagenachricht konnte dem Delegaten nicht zugestellt werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Teilnehmerstatus konnte auf Grund eines ungültigen Zustands nicht "
 "aktualisiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Verschicken der Besprechungsinformationen nicht möglich, die Besprechung "
 "existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert "
 "nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18642,15 +18560,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18658,11 +18576,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18670,229 +18588,229 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../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:273
+#: ../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:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "Bitte antworten Sie im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Erhalten im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> hat folgende Besprechung an Sie delegiert:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18901,7 +18819,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht, aktuelle Informationen zu folgender Besprechung "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18909,82 +18827,82 @@ msgstr ""
 "<b>%s</b> wünscht, aktuelle Informationen zu folgender Besprechung zu "
 "erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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> durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> hat folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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> durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> hat folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18993,7 +18911,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht aktuelle Informationen zu folgender zugewiesener "
 "Aufgabe zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -19002,7 +18920,7 @@ msgstr ""
 "<b>%s</b> wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -19010,23 +18928,23 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe "
 "geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -19034,103 +18952,103 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Änderungen an der Aufgabenzuweisung "
 "vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> hat die folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> hat durch %s folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> hat folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> hat folgende gemeinsame Notiz gelöscht:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "Ab_lehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "An_nehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "_Vorläufig"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "Alles anneh_men"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "Informationen über_mitteln"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "A_ktualisieren"
 
@@ -19235,7 +19153,8 @@ msgstr "Erzeugung einer D-Bus-Nachricht, wenn eine neue E-Mail eintrifft."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben "
 "wird (»TRUE«) oder eine Klangdatei abgespielt wird (»FALSE«)."
@@ -19289,22 +19208,21 @@ msgstr ""
 "Legt fest, ob nur über Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "Eine _D-Bus-Nachricht erzeugen"
 
-#: ../plugins/mail-notification/mail-notification.c:361
+#: ../plugins/mail-notification/mail-notification.c:377
 #, fuzzy
 msgid "Evolution's Mail Notification"
 msgstr "Benachrichtigung bei neuen E-Mails"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:398
 msgid "Mail Notification Properties"
-msgstr "Benachrichtigung bei neuen E-Mails"
+msgstr "Einstellungen zur E-Mail-Benachrichtigung"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19312,58 +19230,62 @@ msgid ""
 msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
-msgstr[0] "Sie haben %d neue Nachricht in %s."
-msgstr[1] "Sie haben %d neue Nachrichten in %s."
+msgstr[0] ""
+"Sie haben %d neue Nachricht\n"
+"in %s."
+msgstr[1] ""
+"Sie haben %d neue Nachrichten\n"
+"in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
-#: ../plugins/mail-notification/mail-notification.c:457
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Neue E-Mail"
 
-#: ../plugins/mail-notification/mail-notification.c:519
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:522
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Blinkendes Symbol im Benachrichtigungsfeld"
 
-#: ../plugins/mail-notification/mail-notification.c:524
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:705
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:711
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:712
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Klang_datei abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: ../plugins/mail-notification/mail-notification.c:724
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "A_bspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:782
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
@@ -19395,12 +19317,12 @@ msgstr "In eine Bes_prechung umwandeln"
 msgid "Mail to meeting"
 msgstr "E-Mail zu Besprechung"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geöffnet werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19511,15 +19433,14 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Die Nachricht an die Mailingliste schicken?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Die Aktion konnte nicht ausgeführt werden. Das bedeutet, dass der Kopf keine "
-"Informationen für diese Aktion bereitstellt.\n"
+"Die Aktion konnte nicht ausgeführt werden. Das bedeutet, dass die Kopfzeilen "
+"der E-Mail keine Informationen für diese Aktion bereitstellen.\n"
 "\n"
 "Kopf: {0}"
 
@@ -19599,27 +19520,27 @@ msgstr "Liste _abonnieren"
 msgid "_Unsubscribe from List"
 msgstr "Liste _abbestellen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Sollen alle Nachrichten in Unterordnern als gelesen markiert werden?"
-
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Soll diese Aktion auch in den Unterordnern ausgeführt werden?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Alle Nachrichten als gelesen markieren"
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../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 ""
+"Dies wird alle Nachrichten im gewählten Ordner und seinen Unterordnern als "
+"gelesen markieren."
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
-msgstr "im derzeitigen Ordner und in _Unterordnern"
+msgstr "Im derzeitigen Ordner und in _Unterordnern"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
-msgstr "Derzeitiger Ordner"
+msgstr "Nur im _derzeitiger Ordner"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19663,7 +19584,7 @@ msgstr "Ein Plugin zur Verwaltung der Plugin-Aktivierungszustände."
 
 #. 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 "Plugin-Verwaltung"
 
@@ -19675,24 +19596,24 @@ msgstr "Plugins aktivieren und deaktivieren"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: ../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 "Hinweis: Einige Änderungen werden erst nach einem Neustart wirksam."
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Ãœberblick"
 
-#: ../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"
 
@@ -19718,19 +19639,19 @@ msgstr "Einfacher Textmodus"
 msgid "Prefer plain-text"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
@@ -19847,39 +19768,37 @@ msgstr ""
 "Verfügbarkeit"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-#, fuzzy
 msgid "Hello Python"
-msgstr "Telefon, privat"
+msgstr "Hello Python"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr ""
+msgstr "Python-Plugin-Loader-Tests"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
-msgstr ""
+msgstr "Python-Plugin"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
-msgstr ""
+msgstr "Python-Plugin-Loader."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using python."
-msgstr ""
+msgstr "Lädt andere Plugins, die in Python geschrieben wurden."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-#, fuzzy
 msgid "Python Loader"
-msgstr "Mono-Loader"
+msgstr "Python-Loader"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (eingebaut)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "SpamAssassin-Unerwünscht-Plugin"
+msgstr "SpamAssassin nicht gefunden, Fehler-Code: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
@@ -19907,12 +19826,12 @@ msgstr ""
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "Weiterleitung an SpamAssassin fehlgeschlagen, Fehler-Code: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "Die Versandoptionen sind nicht verfügbar."
+msgstr "SpamAssassin ist nicht verfügbar."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
 msgid "This will make SpamAssassin more reliable, but slower"
@@ -20102,23 +20021,22 @@ msgid "Show _only this Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin that manages the Startup wizard."
-msgstr "Ein Plugin zur Bereitstellung eines Einrichtungsassistenten."
+msgid "Guides you through your initial account setup."
+msgstr "Hilft Ihnen beim erstmaligen Erstellen von Konten."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Einrichtungsassistent"
+msgid "Setup Assistant"
+msgstr "Setup-Assistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution-Einrichtungsassistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -20131,29 +20049,29 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um fortzufahren. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Dateien werden importiert"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Daten werden importiert."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -20172,7 +20090,7 @@ msgid "Thread messages by subject"
 msgstr "Betreffsbezogenes Threading der Nachrichten"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Zurückfallen auf be_treffsbezogenes Threading der Nachrichten"
 
@@ -20185,20 +20103,17 @@ msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht."
 
-#: ../plugins/templates/templates.c:614
-#, fuzzy
+#: ../plugins/templates/templates.c:615
 msgid "No title"
-msgstr "Tätigkeit"
+msgstr "Kein Titel"
 
 #: ../plugins/templates/templates.c:743
-#, fuzzy
 msgid "Save as _Template"
-msgstr "Als Entwurf speichern"
+msgstr "Als _Entwurf speichern"
 
 #: ../plugins/templates/templates.c:745
-#, fuzzy
 msgid "Save as Template"
-msgstr "Als Entwurf speichern"
+msgstr "Als Vorlage speichern"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
@@ -20212,6 +20127,28 @@ msgstr "Ein Plugin, welches ytnef benutzt, um tnef-Anlagen zu dekodieren."
 msgid "TNEF Attachment decoder"
 msgstr "TNEF-Anlagen-Dekodierer"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Ein Plugin zum Einrichten von WebDAV-Kontakten."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV-Kontakte"
+
+#: ../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 "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 "Evolution-Bedienoberfläche"
@@ -20242,102 +20179,98 @@ msgid "Configuration version"
 msgstr "Konfigurationsversion"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr ""
-"Legt fest, ob die Wiederabsturzverhinderung gestartet werden soll oder nicht."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Voreingestellte Seitenleistenbreite"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Voreingestellte Fensterhöhe"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Voreingestllter Fensterzustand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "Passwort eingeben"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "Kennung oder Alias der Komponente, die per Vorgabe beim Start angezeigt "
 "werden soll."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"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:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste der Pfade für Ordner, die für eine Offline-Benutzung auf der Platte "
 "synchronisiert werden sollen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../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:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "Konfiguration"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -20345,27 +20278,23 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Absturzverhinderung-Warndialog nicht anzeigen"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statusleiste ist sichtbar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20373,19 +20302,19 @@ msgstr ""
 "Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
 "Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Die Vorgabehöhe des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Die Vorgabebreite des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Die Vorgabebreite der Seitenleiste in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20393,37 +20322,37 @@ msgstr ""
 "Die zuletzt aktualisierte Konfigurationsversion von Evolution mit Haupt-, "
 "Unter- und Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../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:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../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 "
@@ -20433,7 +20362,7 @@ msgstr ""
 "und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der GNOME-"
 "Einstellungen festgelegt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20441,70 +20370,58 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Werkzeugleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../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:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Soll Evolution im Offline- statt im Online-Modus gestartet werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr ""
-"Legt fest, ob die Wiederabsturzverhinderung durchgeführt werden soll oder "
-"nicht"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Soll das Fenster maximiert werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Soll die Seitenleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Soll der Warndialog in Evolution-Entwicklerversionen nicht angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Legt fest, ob der Warndialog der Wiederabsturzverhinderung angezeigt werden "
-"soll."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Sollen die Fensterknöpfe angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Fensterknopfstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
@@ -20521,29 +20438,23 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Wählen Sie den auszuführenden Importeur:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../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.\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 ""
 "Wählen Sie die Datei, die Sie in Evolution importieren wollen und legen Sie "
-"anhand der Liste den Dateityp fest.\n"
-"\n"
-"Falls er Ihnen unbekannt ist, können Sie »Automatisch« wählen. Evolution wird "
-"dann versuchen, ihn selbst zu bestimmen."
+"den Dateitypenanhand der Auswahlliste fest."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Wählen Sie das Ziel dieses Imports"
 
-#: ../shell/e-shell-importer.c:147
+#: ../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"
@@ -20556,33 +20467,33 @@ msgstr ""
 "gefunden. Klicken Sie bitte den »Zurück«-Knopf an, falls\n"
 "Sie es noch einmal versuchen wollen.\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
 #. 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20633,7 +20544,7 @@ msgstr "Fehler beim Öffnen der FAQ-Webseite."
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
@@ -20641,73 +20552,67 @@ msgstr "_Offline arbeiten"
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: ../shell/e-shell-window.c:377
-#, fuzzy
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr ""
-"Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um offline "
-"zu arbeiten."
+"Evolution ist im Augenblick online.\n"
+"Klicken Sie auf diesen Knopf, um offline zu arbeiten."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution geht gerade offline."
 
-#: ../shell/e-shell-window.c:391
-#, fuzzy
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr ""
-"Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um online "
-"zu arbeiten."
+"Evolution ist im Augenblick offline.\n"
+"Klicken Sie auf diesen Knopf, um online zu arbeiten."
 
-#: ../shell/e-shell-window.c:780
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Unbekannter Systemfehler."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Neu"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Neuer 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 "Ein neues Testobjekt anlegen"
 
@@ -20752,7 +20657,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20791,7 +20696,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20799,67 +20704,43 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Evolution-Wiederabsturzverhinderung"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norieren"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Es scheint, als ob Evolution bei der letzten Nutzung nicht korrekt\n"
-"beendet wurde. Als Vorsichtsmaßnahme wird der Vorschaubereich\n"
-"nicht angezeigt. Dieser kann wieder unter dem Menüpunkt\n"
-"»Ansicht« aktiviert werden.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "Diese _Meldung nicht mehr anzeigen"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21088,27 +20969,27 @@ msgstr "E-Mail-Adresse"
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Zertifikatbetrachter: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Geben Sie das Passwort für »%s« ein"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Geben Sie ein neues Passwort für die Zertifikatdatenbank ein"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21117,7 +20998,7 @@ msgstr ""
 "Ausgestellt auf:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21126,7 +21007,7 @@ msgstr ""
 "Aussteller:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Zertifikat wählen"
 
@@ -21549,7 +21430,7 @@ msgid "Copy to Folder..."
 msgstr "In Ordner kopieren …"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Einen neuen Adressbuchordner anlegen"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -21703,7 +21584,7 @@ msgstr "Kontakt _verschieben nach …"
 msgid "_Move Folder Contacts To"
 msgstr "Ordnerkontakte verschie_ben nach"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Neu"
 
@@ -22093,7 +21974,7 @@ msgstr "Nachrichtenliste nach Threads sortieren"
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Nachricht"
@@ -22428,123 +22309,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Nachrichten im normalen Stil anzeigen"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "Beige_legt"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "An Or_t und Stelle"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Zitiert"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "Nachricht _speichern …"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
@@ -22782,50 +22659,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Statusleiste anzeigen/verbergen"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "_Offline arbeiten"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Info"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Passwörter ver_werfen"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Häufig gestellte Fragen"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "Schaltflächen verber_gen"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der _Schaltflächen"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "S_ynchronisationsoptionen …"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Fenster"
 
@@ -22925,7 +22806,7 @@ msgstr "Eine Zeitzone wählen"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Auswahlliste für die Zeitzone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22938,7 +22819,7 @@ msgstr ""
 "Mit der rechten Maustaste können Sie die Ansicht verkleinern."
 
 #: ../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 "Sammlung"
 
@@ -22983,7 +22864,7 @@ msgstr "Vorhandene Ansicht erset_zen"
 
 #. 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 "Benutzerdefinierte Ansicht"
 
@@ -22992,32 +22873,32 @@ msgid "Save Custom View"
 msgstr "Benutzerdefinierte Ansicht speichern"
 
 #: ../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 "Ansichten definieren …"
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Ansicht auswählen: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Benutzerdefinierte Ansicht speichern …"
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
@@ -23045,13 +22926,13 @@ msgstr "Art der Ansicht:"
 msgid "Attachment Bar"
 msgstr "Anlagenleiste"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Datei konnte nicht beigelegt werden: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
@@ -23073,7 +22954,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1272
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -23122,30 +23003,30 @@ msgstr "Y1"
 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
 msgid "Minimum width"
 msgstr "Mindestbreite"
 
-#: ../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
 msgid "Minimum Width"
 msgstr "Mindestbreite"
 
-#: ../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:204
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Jetzt"
 
-#: ../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 "Die Zeit muss folgendes Format haben: %s"
@@ -23154,99 +23035,99 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../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 "Westeuropäisch"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Westeuropäisch, neu"
 
-#: ../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 "Traditionell"
 
-#: ../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 "Vereinfacht"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 # CHECK
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Weitere …"
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "_Zeichenkodierung"
 
@@ -23263,7 +23144,6 @@ msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
 #: ../widgets/misc/e-dateedit.c:394
-#, fuzzy
 msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
@@ -23321,11 +23201,11 @@ msgstr ""
 "Ein Widget, das anstatt der normalen Ausklapperbeschriftung angezeigt werden "
 "soll"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Ausklappergröße"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Größe des Ausklapppfeils"
 
@@ -23338,62 +23218,61 @@ msgid "Spacing around expander arrow"
 msgstr "Polsterung um Aufklapppfeil"
 
 #. 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 "Erweiterte Suche"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Suche speichern"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../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 "Suche _speichern …"
 
-#: ../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 "Gespeicherte Suchen _bearbeiten …"
 
-#: ../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 "Er_weiterte Suche …"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Derzeitige Nachricht"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Bild wählen"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../widgets/misc/e-map.c:627
-#, fuzzy
+#: ../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."
@@ -23402,24 +23281,23 @@ msgstr ""
 "Tastaturbenutzer sollten die Zeitzone stattdessen mit der Auswahlliste im "
 "unteren Bereich festlegen."
 
-#: ../widgets/misc/e-online-button.c:112
-#, fuzzy
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
-msgstr "Eingebettet"
+msgstr "Online"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
-msgstr ""
+msgstr "Der Status des Knopfes ist »online«"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Synchronisieren mit:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Private Einträge synchronisieren:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Kategorien synchronisieren"
 
@@ -23435,52 +23313,52 @@ msgstr "Rückfluss-Modell"
 msgid "Column width"
 msgstr "Spaltenbreite"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Suchen"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Verwerfen"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "An_zeigen: "
 
 #. 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "S_uchen: "
 
 #. 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " _in "
 
@@ -23494,19 +23372,19 @@ msgstr "Cursor-Zeile"
 msgid "Cursor Column"
 msgstr "Cursor-Spalte"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Sortierer"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Markierungsmodus"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Cursor-Modus"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Wenn ge_löscht:"
 
@@ -23636,19 +23514,19 @@ msgid "_When opened:"
 msgstr "_Wenn geöffnet:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Klicken Sie hier, um zur Adresse zu gehen"
 
@@ -23668,7 +23546,7 @@ msgstr "Ver_fügbare Kategorien:"
 msgid "categories"
 msgstr "Kategorien"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "Popup-Liste"
 
@@ -23845,93 +23723,93 @@ msgstr ""
 "Um eine Spalte zur Tabelle hinzuzufügen, ziehen Sie\n"
 "sie an die Stelle, an der die Spalte erscheinen soll."
 
-#: ../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 Objekt)"
 msgstr[1] "%s: %s (%d Objekt)"
 
-#: ../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 Objekt)"
 msgstr[1] "%s (%d Objekt)"
 
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "Wechselnde Zeilenfarben"
 
+#: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Horizontales Zeichengitter"
 
+#: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Vertikales Zeichengitter"
 
+#: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Fokus zeichnen"
 
+#: ../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
 msgid "Cursor mode"
 msgstr "Cursor-Modus"
 
+#: ../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
 msgid "Selection model"
 msgstr "Markierungsmodell"
 
+#: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Längenschwellwert"
 
+#: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Einheitliche Zeilenhöhe"
 
+#: ../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"
@@ -23999,7 +23877,7 @@ msgid "Font Description"
 msgstr "Schriftbeschreibung"
 
 #: ../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 "Sortierinfos"
 
@@ -24021,8 +23899,8 @@ msgstr "Tabellenvorlage"
 msgid "Cursor row"
 msgstr "Cursor-Zeile"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Immer suchen"
 
@@ -24030,17 +23908,17 @@ msgstr "Immer suchen"
 msgid "Use click to add"
 msgstr "Klick zum Hinzufügen verwenden"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree-Tabellenadapter"
 
 # CHECK
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retro-Look"
 
 # CHECK
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Linien und »+/-«-Ausklapper anzeigen."
 
@@ -24147,224 +24025,3 @@ msgstr "EM-Kontext"
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Handle-Popup"
-
-#, fuzzy
-#~ msgid ""
-#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
-#~ "accept appointments."
-#~ msgstr ""
-#~ "»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur "
-#~ "Kalenderansicht und wählen Sie einen Kalender aus, der Termine "
-#~ "akzeptieren kann."
-
-#~ msgid "Unknown reason"
-#~ msgstr "Unbekannter Grund"
-
-#~ msgid "Open File"
-#~ msgstr "Datei öffnen"
-
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "Die Datei »{0}« konnte nicht geöffnet werden."
-
-#~ msgid "Enter a name for this signature."
-#~ msgstr "Geben Sie einen Namen für diese Signatur ein."
-
-#~ msgid "Name:"
-#~ msgstr "Name:"
-
-#~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie alle gelöschten Nachrichten endgültig aus dem "
-#~ "Ordner »{0}« entfernen wollen?"
-
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "»{0}« löschen?"
-
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "Nachrichten im Suchordner »{0}« löschen?"
-
-#~ msgid "Only on _Current Folder"
-#~ msgstr "Nur im der_zeitigen Ordner"
-
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "Anlagenerinnerung-Plugin aktivieren"
-
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "Anlagenerinnerung aktivieren."
-
-#~ msgid "Remind _missing attachments"
-#~ msgstr "An vergessene Anlagen _erinnern"
-
-#~ msgid "_Continue Editing"
-#~ msgstr "Nachricht _bearbeiten"
-
-#, fuzzy
-#~ msgid "All instances"
-#~ msgstr "Alle Instanzen"
-
-#, fuzzy
-#~ msgid "This instance"
-#~ msgstr "Nur diese Instanz"
-
-#~ msgid "There is no configuration option for this plugin."
-#~ msgstr "Für dieses Plugin bestehen keine Konfigurationsoptionen."
-
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr ""
-#~ "Bereitstellung einer Möglichkeit zum Drucken von E-Mails aus dem Editor "
-#~ "heraus."
-
-#~ msgid "Print Message"
-#~ msgstr "Nachricht drucken"
-
-#~ msgid "Prints the message"
-#~ msgstr "Nachricht drucken"
-
-#~ msgid "A string description of the current printer settings."
-#~ msgstr "Eine Textbeschreibung der derzeitigen Druckereinstellungen."
-
-#~ msgid "No folder name specified."
-#~ msgstr "Kein Ordnername angegeben."
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
-
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "Ordnername darf das Slash-Zeichen »/« nicht enthalten."
-
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
-
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "'.' und '..' sind reservierte Ordnernamen."
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Auswahl in die Zwischenablage kopieren"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "Auswahl in die Zwischenablage verschieben"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "Inhalt der Zwischenablage einfügen"
-
-#~ msgid "All Day Event"
-#~ msgstr "Ganztägiges Ereignis"
-
-#~ msgid "Send _Options"
-#~ msgstr "_Sendeoptionen"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "Alles außer Signatur löschen"
-
-#~ msgid "For_mat"
-#~ msgstr "_Format"
-
-#~ msgid "HT_ML"
-#~ msgstr "_HTML"
-
-#~ msgid "Open a file"
-#~ msgstr "Eine Datei öffnen"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "Mit PGP verschlüsseln"
-
-#~ msgid "PGP Sign"
-#~ msgstr "Mit PGP signieren"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "Mit S/MIME verschlüsseln"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "Mit S/MIME signieren"
-
-#~ msgid "Save As"
-#~ msgstr "Speichern unter"
-
-#~ msgid "Save Draft"
-#~ msgstr "Entwurf speichern"
-
-#~ msgid "Save in folder..."
-#~ msgstr "In Ordner speichern …"
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Die Nachricht in einem bestimmten Ordner speichern"
-
-#~ msgid "Send"
-#~ msgstr "Abschicken"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Diese E-Mail im HTML-Format verschicken"
-
-#~ msgid "_Delete all"
-#~ msgstr "Alle _löschen"
-
-#~ msgid "_Open..."
-#~ msgstr "Ö_ffnen …"
-
-#~ msgid "C_lose"
-#~ msgstr "S_chließen"
-
-#~ msgid "H_TML"
-#~ msgstr "_HTML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "Speichern und s_chließen"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "Die momentan geöffnete Datei speichern und das Fenster schließen"
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
-
-#~ msgid "Refresh List"
-#~ msgstr "Liste auffrischen"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Ordnerliste auffrischen"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
-
-#~ msgid "Subscribe"
-#~ msgstr "Abonnieren"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Abbestellen"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "Auswahl _umkehren"
-
-#~ msgid "Status Details"
-#~ msgstr "Statusdetails"
-
-#~ msgid "Time Zone"
-#~ msgstr "Zeitzone"
-
-#~ msgid "TimeZone Combobox"
-#~ msgstr "Zeitzonen-Auswahlliste"
-
-#~ msgid "Permission Denied."
-#~ msgstr "Erlaubnis verweigert."
-
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>Anzeigen</b>"
-
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Server-Informationen</b>"
-
-#~ msgid "Attach original message"
-#~ msgstr "Originalnachricht anhängen"
-
-#~ msgid "Do not quote original message"
-#~ msgstr "Originalnachricht nicht zitieren"
-
-#~ msgid "Quote original message"
-#~ msgstr "Originalnachricht zitieren"
-
-#~ msgid "_Refresh:"
-#~ msgstr "A_ktualisieren:"
-
-#~ msgid "_Versandoptionen"
-#~ msgstr "_Sendeoptionen"
diff --git a/po/dz.po b/po/dz.po
index de636c99a4..f5f01ff807 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.dz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-20 03:18+0100\n"
-"PO-Revision-Date: 2007-04-20 12:14+0530\n"
-"Last-Translator: sonam pelden <sonaa_peldn@yahoo.com>\n"
+"POT-Creation-Date: 2008-06-29 19:52+0000\n"
+"PO-Revision-Date: 2008-09-03 15:23+0530\n"
+"Last-Translator: Dawa pemo <daws_403@hotmail.com>\n"
 "Language-Team: DZONGKHA <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -25,12 +25,12 @@ msgid "evolution addressbook"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ �་བྱང་ཀི་དེབ�"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:223
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "འབྲེལ་ས་གསརཔ�"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "འབྲེལ་ས་གསར་པའི་�ོ་ཡིག"
 
@@ -83,7 +83,7 @@ msgstr "ཟླ་à½�ོའི་བྱུང་ལས་: འདི་ལུ་à
 msgid "calendar view event"
 msgstr "ཟླ་�ོའི་མ�ོང་སྣང་བྱུང་ལས�"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "ཆེད་དམིགས་བཟུང་�"
 
@@ -107,7 +107,7 @@ msgstr "ད་རིས་ལུ་འགྱོ�"
 msgid "Go to Date"
 msgstr "ཚེས་གྲངས་ལུ་འགྱོ�"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "ད་ལྟོའི་དུས་ཡུན་�ྱབ་ཚད་ བལྟ་ནི་དང་ སེལ་འ�ུ་འབད་ནིའི་�ིག་�ྲམ་ཅིག"
@@ -154,7 +154,7 @@ msgid "calendar view for one or more days"
 msgstr "ཉིནམ་གཅིག་གམ་ དེ་ལས་མང་བའི་ཟླ་�ོའི་མ�ོང་སྣང་�"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:747
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -165,9 +165,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:191
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1363
+#: ../calendar/gui/e-day-view.c:2162
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -176,9 +176,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -186,10 +186,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -199,25 +199,25 @@ 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:221
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1367
+#: ../calendar/gui/e-day-view.c:2178
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "ཇི་ནོམ་ཟླ་�ོ�"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "འཚོལ་ཞིབ་ཕྲ་རིང་�"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཟླ་�ོའི་འཚོལ་ཞིབ་ཕྲ་རིང་�"
 
@@ -273,19 +273,19 @@ msgstr "སོར་སྟོན�"
 msgid "toggle the cell"
 msgstr "ནང་�ིག་སོར་སྟོན་འབད�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "རྒྱ་འཕར�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "ནང་�ིག་འདི་འཛིན་�ེ་ཡོད་མི་ ཨི་ཊི་ནང་ལུ་ གྲལ་�ིག་གི་རྒྱ་འཕར�་ཨིན�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "ཧྲམ་ནི�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ནང་�ིག་འདི་འཛིན་�ེ་ཡོད་མི་ ཨི་ཊི་ནང་ལུ་ གྲལ་�ིག་དེ་ཧྲམ་ག�ངམ་ཨིན�"
 
@@ -295,7 +295,7 @@ msgstr "�ིག་�ྲམ་གྱི་ནང་�ིག�"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "�་ས�ོང་བར�ྱབ་ནི་ལུ་ ཨེབ་ག�ང་འབད�"
 
@@ -341,176 +341,185 @@ msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སོར་སྟོ
 msgid "activate"
 msgstr "ཤུགས་ལྡན་བཟོ�"
 
-#: ../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 source. Switch to Contacts View and highlight an address book that can accept contacts."
+msgstr "'{0}' འདི་ ཧེ་མ་ལས་རང་ �་བྱང་ཀི་དེབ་ཀྱི་ འབྱུང་�ུངས་ཨིན་མས�  འབྲེལ་ས་མ�ོང་སྣང་ལུ་ སོར་བསྒྱུར་འབད་ཞིནམ་ལས་ འབྲེལ་ས་ཚུ་དང་ལེན་འབད་བ�ུབ་པའི་འབྲེལ་ས་གི་ �་བྱང་ཀི་དེབ་ཅིག་ གཙོ་དམིགས་འབད� "
+
+#: ../addressbook/addressbook.error.xml.h:3
 msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr "�་བྱང་འདི་དང་གཅིག་�ར་ འབྲེལ་ས་ཅིག་ ཧེ་མ་ལས་རང་འདུག  �ྱོད་ཀྱིས་�་བྱང་འདི་དང་གཅིག་�ར་ ཤོག་བྱང་གསརཔ་ཅིག་ གང་རུང་སྦེ་ �་ས�ོང་བར�ྱབ་ནི་ཨིན་ན?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "�་བྱང་{0}'དེ་ ཧེ་མ་ལས་རང་འདུག"
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "འབྲེལ་ས་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད་མ་ཚུགས་ "
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "འབྲེལ་ས་དེ་ སྤོ་བཤུད་འབད་མི་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "དབྱེ་རིམ་ཞུན་དགཔམིན་འདུག"
 
-#: ../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 "ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱི་དོན་ལས་ ལས་འཆར་བརྡ་དོན་ �ོབ་མ་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove addressbook."
 msgstr "�་བྱང་ཀི་དེབ་ རྩ་བས�ྲད་བ�ང་མ་ཚུགས�"
 
-#: ../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."
 msgstr "ད་ལྟོ་�ྱོད་ཀྱིས་ཇི་ནོམ་ནང་ལས་ སྡེ་རིམ་རིམ་ལུགས་�་བྱང་ཀི་དེབ་ར�ྱངམ་གཅིག་ལུ་ འཛུལ་སྤྱོད་འབད་ཚུགས� �ྱོད་རའི་སྡེ་རིམ་གྱི་འཕྲལ་འཕྲལ་འབྱུང་མི་འབྲེལ་ས་དང་ སྡེ་རིམ་གྱི་རང་དོན་འབྲལ་སའི་སྣོད་འཛིན་ཚུ་འ�ོབ་ནིའི་དོན་ལུ་ �ེངས་གཅིག་སྡེ་རིམ་ཡིག་འཕྲིན་གྱི་ཞབས་�ོག་སྤྱོད་མི་གཞན་ཅིག་ ལག་ལེན་འ�བ་གནང་�"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "�་བྱང་ཀི་དེབ་'{0}'བ�ོན་བ�ང་ག?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading addressbook."
 msgstr "�་བྱང་ཀི་དེབ་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0}དེ་ {1}: {2} ལུ་ བསྲུང་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ བདེན་བཤད་འབད་མ་ཚུགས�"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
 msgid "Failed to delete contact"
 msgstr "འབྲེལ་ས་བ�ོན་ག�ང་མ་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "སྡེ་རིམ་�་བྱང་ཀི་དེབ་གསར་བས�ྲུན་:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ ནུས་ཅན་ལས་འཆར་བརྡ་དོན་ལུ་ ངོས་ལན་འབད་མ་བ�ུབ�"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Permission Denied."
 msgstr "གནང་བ་བྱིན་མ་བ�ུབ�"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "སར་བར་ �ོན་རིམ�"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Some features may not work properly with your current server"
 msgstr "�ྱད་རྣམ་ལ་ལོ་ཅིག་གིས་ �ྱོད་ཀྱི་ད་ལྟོའི་སར་བར་དང་གཅིག་�ར་ ལེགས་ཤོམ་སྦེ་ ལཱ་འབད་མི་བ�ུབ་འོང་�"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ �་བྱང་ཀི་དེབ་དེ་ རེ་བ་མེད་པར་ སྤངས་ད་ནུག"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 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:24
 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
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "�་བྱང་ཀི་དེབ་འདི་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་འགྱོ་འོང་�"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook could not be opened."
 msgstr "�་བྱང་ཀི་དེབ་འདི་ �་ཕྱེ་མ་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "�་བྱང་ཀི་དེབ་ཀྱི་ སར་བར་འདི་ལུ་ བསམ་འཆར་བཀོད་མི་ འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་ ག་ནི་ཡང་མིན་འདུག"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr "�་བྱང་ཀི་དེབ་ཀྱི་ སར་བར་འདི་ ལྷོད་སར་མིན་འདུག་ ཡང་ཅིན་ སར་བར་གྱི་མིང་གི་ ཡིག་སྡེབ་འཛོལ་སོངཔ་དང་ ཡང་ཅིན་ ཡོངས་འབྲེལ་གྱི་ མ�ུད་ལམ་མེདཔ་འོང་ནི་མས�"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This server does not support LDAPv3 schema information."
 msgstr "སར་བར་འདི་གིས་ LDAPv3 གྱི་ ལས་འཆར་བརྡ་དོན་ལུ་ རྒྱབ་ས�ྱོར་མིན་འདུག"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to open addressbook"
 msgstr "�་བྱང་ཀི་དེབ་ �་ཕྱེ་མ་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to perform search."
 msgstr "འཚོལ་ཞིབ་ལག་ལེན་འ�བ་མ་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Unable to save {0}."
 msgstr "{0}བསྲུང་མི་ཚུགས་པས�"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Would you like to save your changes?"
 msgstr "�ྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ བསྲུང་ནི་ཨིན་ན?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
 msgstr "�ྱོད་ཀྱིས་འབྲེལ་ས་ཅིག་ �་བྱང་ཀི་དེབ་ གཅིག་ལས་གཅིག་ལུ་ སྤོ་བཤུད་འབད་ནིའི་ དཔའ་བཅམ་ཨིན་རུང་ འབྱུང་�ུངས་ནང་ལས་ རྩ་བས�ྲད་ག�ང་མི་ཚུགས་པས� དེ་གི་ཚབ་ལུ་ འདྲ་བཤུས་ཅིག་བསྲུང་ནི་ཨིན་ན?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
 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: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 "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་ �ྱོད་ཀྱི་འབྲེལ་ས་{0}དེ་འ�ོབ་མི་ཚུགས�"
 
-#: ../addressbook/addressbook.error.xml.h:35
-#: ../mail/em-vfolder-rule.c:510
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:512
 #: ../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 "�་ས�ོང་ར�ྱབས� (_A)"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "བ�ོན་བཀོག (_D)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "སྲུང་བཞག་མ་འབད་(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "ཚད་བས�ྱར་ལོག་བཟོ་(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "ག་ཨིནམ་སྦཻ་རང་ལག་ལེན་འ�བ(_U)"
 
 #. 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:79
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 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 "(༡)"
 
@@ -518,13 +527,13 @@ msgstr "(༡)"
 msgid "Default Sync Address:"
 msgstr "མཉམ་འབྱུང་�་བྱང་ སྔོན་སྒྲིག་འབད་:"
 
-#: ../addressbook/conduit/address-conduit.c:1315
-#: ../addressbook/conduit/address-conduit.c:1316
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
 msgid "Could not load addressbook"
 msgstr "�་བྱང་ཀི་དེབ་ མངོན་གསལ་འབད་མ་ཚུགས�"
 
-#: ../addressbook/conduit/address-conduit.c:1393
-#: ../addressbook/conduit/address-conduit.c:1396
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
 msgstr "པའི་ལོཊི་གི་ �་བྱང་གློག་རིམ་སྡེབ་ཚན་ ལྷག་མ་ཚུགས�"
 
@@ -546,10 +555,11 @@ msgstr "ནཱ་ལུ་ རང་བཞིན་མཇུག་སྡུདà¼
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:272
-#: ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:285
+#: ../calendar/gui/migration.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "འབྲེལ་ས་ཚུ�"
 
@@ -587,18 +597,18 @@ msgstr "�ྱོད་རའི་ ཨེསི་/མ་ཡིམ་ ལག་
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195
-#: ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572
-#: ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191
-#: ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200
+#: ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:583
+#: ../calendar/gui/migration.c:1096
+#: ../calendar/gui/tasks-component.c:196
+#: ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202
+#: ../mail/mail-component.c:307
+#: ../mail/mail-vfolder.c:216
 msgid "On This Computer"
 msgstr "གློག་རིག་འདི་གུ�"
 
@@ -607,145 +617,142 @@ msgstr "གློག་རིག་འདི་གུ�"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203
-#: ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580
-#: ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199
-#: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:104
+#: ../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/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:248
+#: ../calendar/gui/memos-component.c:209
+#: ../calendar/gui/migration.c:492
+#: ../calendar/gui/migration.c:591
+#: ../calendar/gui/migration.c:1104
+#: ../calendar/gui/tasks-component.c:205
+#: ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "རང་དོན�"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "ཨེལ་ཌི་ཨེ་པི་ སར་བར་གུ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "འབྲེལ་ས� (C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "འབྲེལ་ས་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "འབྲེལ་སའི་�ོ་ཡིག (_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "འབྲེལ་སའི་�ོ་ཡིག་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
-#: ../addressbook/gui/component/addressbook-config.c:1208
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "�་བྱང་ཀི་དེབ་གསརཔ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "�་བྱང་ཀི་དེབ� (_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "�་བྱང་ཀི་དེབ་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../addressbook/gui/component/addressbook-component.c:404
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�་བྱང་ཀི་དེབ་ཀྱི་གཞི་སྒྲིག་གམ་ སྣོད་འཛིན་ཚུ་ ཡར་ས�ྱེད་འབད་མ་ཚུགས�"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "གཞི་རྟེན�"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:172
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Type:"
 msgstr "དབྱེ་བ་: (_T)"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ཀི་དེབ་ཀྱི་ནང་དོན་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་ར�ྱབས��"
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy _book content locally for offline operation"
+msgstr "གློག་ལམ་མེདཔ་ད་ བཀོལ་སྤྱོད་འབད་ནིའི་དོན་ལེ་ ཀ་དེབ་ཀྱི་ནང་དོན་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་ར�ྱབས་ "
 
-#: ../addressbook/gui/component/addressbook-config.c:984
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:365
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../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:85
-#: ../plugins/itip-formatter/itip-formatter.c:2087
+#: ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2363
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ཡོངས་�ྱབ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:387
 msgid "Address Book"
 msgstr "�་བྱང་ཀི་དེབ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "སར་བར་བརྡ་དོན�"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "བདེན་བཤད�"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "རྒྱས་བཤད�"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:939
 msgid "Searching"
 msgstr "འཚོལ་ཞིབ་འབད་དོ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "ཕབ་ལེན་འབད་དོ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:1206
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "�་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དངོས�"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:155
-#: ../mail/em-migrate.c:1202
+#: ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "གཞིས་སྤོ་དོ་..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:202
-#: ../mail/em-migrate.c:1243
+#: ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s':གཞིས་སྤོ་དོ�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "ཨེལ་ཌི་ཨེ་པི་ སར་བར�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "རང་བཞིན་མཇུག་སྡུད་ གཞི་སྒྲིག་ཚུ�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
@@ -755,7 +762,7 @@ msgstr ""
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་ �ྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་བའི་རིང་ལུ་ བཟོད་པ་བསྒོམ་གནང་� "
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -765,7 +772,7 @@ msgstr ""
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་བའི་རིང་ལུ་ བཟོད་པ་བསྒོམ་གནང་�..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -775,7 +782,7 @@ msgstr ""
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་བའི་རིང་ལུ་ བཟོད་པ་བསྒོམ་གནང་�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -801,45 +808,37 @@ msgstr "སྣོད་འཛིན་ལུ་བས�ྱར་མིང་བ
 msgid "Folder names cannot contain '/'"
 msgstr "སྣོད་འཛིན་གྱི་མིང་ཚུ་ནང་'/' མི་ཤོམ་པས�"
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "མིང་འདི་ཡོད་མི་ སྣོད་འཛིན་ཅིག་ཧེ་མ་ལས་རང་འདུག"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:954
 msgid "_New Address Book"
 msgstr "�་བྱང་ཀི་དེབ་གསརཔ�(_N)"
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:990
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1303
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-memo-table.c:919
-#: ../calendar/gui/memos-component.c:453
-#: ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2103
-#: ../mail/em-folder-view.c:1149
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "�ི་ཤོག་བྱང་སྦེ་ སྲུངས་..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-view.c:1709
+#: ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:468
+#: ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-view.c:1349
 #: ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:35
 #: ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "བ�ོན་ག�ང་� (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "�ི་ཤོག་བྱང་སྦེ་སྲུངས་..."
-
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454
-#: ../calendar/gui/tasks-component.c:445
 msgid "_Properties..."
 msgstr "རྒྱུ་དངོས་ཚུ་...(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "འབྲེལ་སའི་འབྱུང་�ུངས་སེལ་བྱེད�"
 
@@ -847,55 +846,62 @@ msgstr "འབྲེལ་སའི་འབྱུང་�ུངས་སེལ
 msgid "Accessing LDAP Server anonymously"
 msgstr "མིང་མེད་�ོག་ལས་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ འཛུལ་སྤྱོད་འབད་དོ�"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "བདེན་བཤད་འབད་མ་ཚུགས�\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s གི་དོན་ལས་ ཆོག་ཡིག་བཙུགས� (ལག་ལེན་པ་%s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:51
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "ཆོག་ཡིག་བཙུགས�"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "རང་བཞིན་མཇུག་སྡུད་་རིང་ཚད�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "མཇུག་བསྡུ་བའི་ ཡུ་ཨར་ཨའི་ཚུ་གི་ �ོ་ཡིག་གི་དོན་ལས་ ཨི་ཕཱོལ་ཌར་ལིསིཊི་ ཨེགསི་ཨེམ་ཨེལ�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "མཇུག་བསྡུ་བའི་ ཡུ་ཨར་ཨའི་ཚུ་གི་ �ོ་ཡིག་གི་དོན་ལས་ ཨི་ཕཱོལ་ཌར་ལིསིཊི་ ཨེགསི་ཨེམ་ཨེལ�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../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 "ཤོག་བྱང་དང་ �ོ་ཡིག་མ�ོང་སྣང་ དེ་ལས་ སྔོན་ལྟའི་པེན་གྱི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "སྔོན་ལྟའི་པེན་སྟོན�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../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."
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱིས་ རང་བཞིན་མཇུག་བསྡུ་ མ་འབད་བའི་ཧེ་མར་ ཡིག་འབྲུའི་ཨང་གྲངས་ཚུ་ ཡིག་དཔར་བར�ྱབ་དགོ"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "མིང་སེལ་འ�ུའི་ཌའི་ལོག་ནང་ མ�འ་མཇུག་་ལག་ལེན་འ�བ་མི་སྣོད་འཛིན་གྱི་དོན་ལུ་ ཡུ་ཨར་ཨའི�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../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.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "ཀེར་ཕྲང་པེན་གྱི་གནས་ས�"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "སྔོན་ལྟའི་པེན་ སྟོན་ནི་ཨིན་ན�"
 
@@ -920,238 +926,228 @@ msgid "636"
 msgstr "༦༣༦"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>བདེན་བཤད�</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>བཀྲམ་སྟོན་</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>ཕབ་ལེན་འབད་དོ�</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>འཚོལ་ཞིབ་འབད་དོ�</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>སར་བར་གྱི་བརྡ་དོན�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>དབྱེ་བ:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "�་བྱང་ཀི་དེབ་ �་ས�ོང་ར�ྱབས�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "ཨ་རྟག་རང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "མིང་མེད་�ོག་ལས�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "གཞི་རྩ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "�ྱད་འཕགས་ཅན་གྱི་མིང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "གློག་འཕྲིན་�་བྱང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་སར་བར་དང་གཅིག་�ར་ བདེན་བཤད་འབད་ནིའི་དོན་ལུ་ གློག་འཕྲིན་�་བྱང་འདི་ ལག་ལེན་འ�བ་འོང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ གཞི་རྟེན་ཚུ་འཚོལ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "ནང་བཀོད་འབད་: (_g)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "ནམ་ཡང་�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "གསང་བཟོ་འབད་ནི་མེད�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "གཅིག"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "ཨེསི་ཨེསི་ཨེལ་གསང་བཟོ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "འཚོལ་ཞིབ་ཚགས་མ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "འཚོལ་ཞིབ་གཞི་རྟེན་: (_b)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "ཚགས་མ་འཚོལ་ཞིབ་འབད་:(_f)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "ཚགས་མ་འཚོལ་ཞིབ་འབད�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
 msgstr "འཚོལ་ཞིབ་ཚགས་མ་དེ་ འཚོལ་ཞིབ་འབད་བའི་ས�བས་འཚོལ་མི་ དངོས་པའི་དབྱེ་བ་དེ་ཨིན�  འདི་ལེགས་བཅོས་མ་འབད་བ་ཅིན་ སྔོན་སྒྲིག་�ོག་ལས་ དངོས་པོའི་དབྱེ་བ་\"person\" ལུ་ འཚོལ་ཞིབ་འབད་འོང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
 msgstr "གདམ་�་འདི་ སེལ་འ�ུ་འབད�་ད་ �ྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ལུ་ རྒྱབ་ས�ྱོར་ཡོད་པ་ཅིན་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ར�ྱངམ་གཅིག་མ�ུད་འོང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
 msgstr "གདམ་�་འདི་ སེལ་འ�ུ་འབད�་ད་ �ྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་ས�ྱོར་ཡོད་པ་ཅིན་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ར�ྱངམ་གཅིག་མ�ུད་འོང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "གདམ་�་འདི་སེལ་འ�ུ་འབད�་ད་ �ྱོད་ཀྱི་སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ ཡང་ན་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་ས�ྱོར་མི་འབད� འདི་གིས་སྦེ་ �ྱོད་ཀྱི་མ�ུད་ལམ་ལུ་ མ�འ་བཙན་མེདཔ་ལས་ གནོད་ཉེན་ཡོད�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "ཡན་ལག"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "རྒྱབ་ས�ྱོར་ཡོད་པའི་ འཚོལ་ཞིབ་གཞི་རྟེན�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "ཊི་ཨེལ་ཨེསི་གསང་བཟོ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr "འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འདི་ �ྱོད་ཀྱི་འཚོལ་ཞིབ་ འགོ་བཙུགས་སའི་ �ོ་བཀོད་ཀྱི་�ྱད་འཕགས་མིང་(ཌི་ཨེན)དེ་ཨིན� �ྱོད་ཀྱིས་འདི་སྟོངམ་སྦེ་བཞག་པ་ཅིན་ འཚོལ་ཞིབ་དེ་ སྣོད་�ོ་རྩ་འབྲེལ་གྱི་རྩ་བ་ལས་ འགོ་བཙུགས་འོང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr "འཚོལ་ཞིབ་ཀྱི་འོས་ས�བས་འདི་གིས་ སྣོད་�ོ་རྩ་འབྲེལ་ལུ་ ག�ིང་ཟབ་ག་དེ་ཚུན་ཚོད་ འཚོལ་ཞིབ་འབད་ནི་ཨིན་ན་ ངེས་འཛིན་འབད�་ཨིན� འཚོལ་ཞིབ་འོས་ས�བས་ \"sub\" ནང་ �ྱོད་ཀྱི་འཚོལ་ཞིབ་གཞི་རྟེན་གྱི་ འོག་ལུ་ཡོད་མི་ �ོ་བཀོད་ཆ་མཉམ་ཚུདཔ་ཨིན� འཚོལ་ཞིབ་འོས་ས�བས་ \"one\" ནང་ �ྱོད་རའི་གཞི་རྟེན་གྱི་འོག་གི་ སྡེ་རིམ་གཅིག་ནང་གི་ �ོ་བཀོད་ཚུ་ཚུདཔ་ཨིན�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "འདི་�ྱོད་ཀྱི་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་མིང་ ཆ་ཚང་ཨིན� དཔྱེ་འབད་བ་ཅིན་ \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 msgstr "འདི་ཕབ་ལེན་འབད་ནིའི་ �ོ་བཀོད་ཀྱི་གྱངས་�་ མང་མ�འ་ཨིན� གྱངས་�་མ�ོ་དྲགས་སྦེ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ �ྱོད་ཀྱི་�་བྱང་ཀི་དེབ་ཀྱི་ མགྱོགས་ཚད་ལུ་ ལྷོད་ཆ་ཞུགས་འོང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 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 "ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་བདེན་བཤད་འབད་ནིའི་ �བས་ལམ་འདི་ཨིན� འདི་ \"Email Address\" གུ་བཀལ�་ད་ �ྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ མིང་མེད་ཀྱི་འཛུལ་སྤྱོད་དགོ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
 msgstr "སར་བར་འདི་གི་དོན་ལས་ �ྱོད་ཀྱི་ཨི་བོ་ལེ་ཤཱན་ སྣོད་འཛིན་ནང་ འ�ོན་ནིའི་མིང་འདི་ཨིན� འདི་་བཀྲམ་སྟོན་གྱི་དོན་ལས་ར�ྱངམ་གཅིག་ཨིན�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr "ཨི་བོ་ལེ་ཤཱན་གྱིས་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་གུ་མ�ུད་ནིའི་ མ�ུད་ལམ་འདི་ཨིན� ཚད་ལྡན་མ�ུད་ལམ་གྱི་ �ོ་ཡིག་ཅིག་བྱིན་�ེ་ཡོདཔ་ལས་ མ�ུད་ལམ་ག་ཅི་ གསལ་བཀོད་འབད་དགོཔ་ཨིན་ན་ �ྱོད་རའི་རིམ་ལུགས་བདག་ས�ྱོང་པ་ལུ་དྲིས�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "�ྱད་འཕགས་ཅན་གྱི་མིང་(ཌི་ཨེན) ལག་ལེན་འ�བ་དོ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "གློག་འཕྲིན་�་བྱང་ ལག་ལེན་འ�བ་དོ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "ནམ་འབད་ཚུགསཔ་ཅིག"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "�་བྱང་ཀི་དེབ་�་ས�ོང་ར�ྱབས� (_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "ཕབ་ལེན་གྱི་བཅད་ཚད་:(_D)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འཚོལ� (_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "ནང་བས�ྱོད་�བས་ཤེས་: (_L)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:225
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "མིང་: (_N)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "འདྲེན་ལམ་: (_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "འཚོལ་ཞིབ་ཀྱི་འོས་ས�བས་: (_S)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "སར་བར་:(_S)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "ངལ་མཚམས་: (_T)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "མ�འ་བཙན་ལྡན་པའི་ མ�ུད་ལམ་ལག་ལེན་འ�བ་: (_U)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "ཤོག་བྱང་�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:395
 msgid "minutes"
 msgstr "ས�ར་མ�"
 
@@ -1192,99 +1188,99 @@ msgid "<b>Work</b>"
 msgstr "<b>ལཱ་གཡོག་</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "ཨེ་ཨའི་ཨེམ�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "དབྱེ་རིམ་ཚུ་...(_t)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "འབྲེལ་ས�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../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
 msgid "Contact Editor"
 msgstr "འབྲེལ་སའི་ཞུན་དགཔ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "མིང་ཆ་ཚང་...(_N)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "གཟུགས་བརྙན�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "ཨེམ་ཨེསི་ཨེན་ མེ་སེན་ཇར་�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "ཡིག་ག�ོང་�་བྱང་�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "ས�ྱོན་མིང་...(_c)"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr "ས�ྱོན་མིང: (_c)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "ནོ་བེལ་ སྡེ་རིམ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "རང་དོན་བརྡ་དོན�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "བརྒྱུད་འཕྲིན�"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:121
-#: ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
 msgid "Work"
 msgstr "ལཱ་གཡོག"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
-msgstr "�་བྱང་:(_A)"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "�་བྱང་...(_A)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "ལོ་བསྟར་དུས་དྲན་: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "ལས་རོགས་: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "ས�ྱེ་བའི་ཉིནམ་: (_B)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1716
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "ཟླ་�ོ་: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "དབྱེ་རིམ་ཚུ་...(_C)"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "གྲོང་སྡེ་: (_C)"
@@ -1361,7 +1357,7 @@ msgid "_Web Log:"
 msgstr "�ེབ་དྲན་དེབ་: (_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "ག་�ེ་: (_W)"
 
@@ -1370,28 +1366,26 @@ msgid "_Zip/Postal Code:"
 msgstr "གནས་ཡུལ་/འགྲེམ་ཨང་: (_Z)"
 
 #: ../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/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "�་བྱང་�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../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:398
+#: ../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:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1831
-#: ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-#: ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1836
+#: ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "ཞུན་དག་འབད་བ�ུབཔ�"
 
@@ -2364,11 +2358,14 @@ msgid "Zimbabwe"
 msgstr "ཛིམ་བབ་�ི�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../mail/em-mailer-prefs.c:481
+#: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:56
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "མིང་�"
 
@@ -2377,8 +2374,8 @@ msgid "AOL Instant Messenger"
 msgstr "ཨེ་ཨོ་ཨེལ་ འཕྲལ་མྱུར་ མེ་སེན་ཇར�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "ཇེབ་བར�"
 
@@ -2391,8 +2388,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "ག་ཌུ་-ག་ཌུ་ མེ་སེན་ཇར�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ཨའི་སི་ཀིའུ�"
 
@@ -2402,9 +2399,9 @@ msgstr "ཞབས་�ོག"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
 msgstr "གནས་�ོངས�"
 
@@ -2413,76 +2410,76 @@ msgid "Username"
 msgstr "ལག་ལེན་པའི་མིང་�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "�ྱིམ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "གཞན�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "ཡ་ཧུ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "ག་ཌུ་-ག་ཌུ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "ཨེམ་ཨེསི་ཨེན�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "སྡེ་རིམ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "འབྱུང་�ུངས་ཀི་དེབ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "དམིགས་ག�ད་ཀི་དེབ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "འབྲེལ་ས་གསརཔ་ཨིན�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "འབྲི་བ�ུབ་པའི་ས་སྒོ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "དགོ་པའི་ས་སྒོ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "བསྒྱུར་བཅོས་འབད་ཡོདཔ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "འབྲེལ་སའི་ཞུན་དགཔ་ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid "Please select an image for this contact"
 msgstr "འབྲེལ་ས་འདི་གི་དོན་ལུ་ གཟུགས་བརྙན་ཅིག་ སེལ་འ�ུ་འབད�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2796
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid "_No image"
 msgstr "གཟུགས་བརྙན་མིན་འདུག(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2490,43 +2487,43 @@ msgstr ""
 "འབྲེལ་སའི་གནད་སྡུད་དེ་ ནུས་མེད་ཨིན་པས�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'ལུ་ནུས་མེད་རྩ་སྒྲིག་ཅིག་འདུག"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'ལུ་ནུས་མེད་རྩ་སྒྲིག་ཅིག་འདུག"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'སྟོངམ་ཨིན་མས�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
 msgid "Invalid contact."
 msgstr "ནུས་མེད་འབྲེལ་ས�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:292
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
 msgid "Contact Quick-Add"
 msgstr "ཀུ་ཡིག་-ཨེཌི་ལུ་འབྲེལ་བ་འ�བ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:295
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "_Edit Full"
 msgstr "ཆ་ཚང་ཞུན་དག (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:336
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
 msgid "_Full name"
 msgstr "མིང་ཆ་ཚང་� (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "E_mail"
 msgstr "གློག་འཕྲིན� (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "_Select Address Book"
 msgstr "�་བྱང་ཀི་དེབ་སེལ་འ�ུ་འབད�(_S)"
 
@@ -2580,10 +2577,6 @@ msgstr "རྒྱལ་�བ་:  (_y)"
 msgid "Full Address"
 msgstr "�་བྱང་ཆ་ཚང་�"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "�་བྱང་...(_A)"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "གནས་ཡུལ་ཨང་:  (_Z)"
@@ -2597,7 +2590,7 @@ msgid "Esq."
 msgstr "ཨི་ཨེསི་ཀིའུ�"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "མིང་ཆ་ཚང་�"
 
@@ -2674,67 +2667,51 @@ msgid "_Location:"
 msgstr "གནས་�ོངས:་ (_L)"
 
 #: ../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 "�ོ་ཡིག་ལུ་ གློག་འཕྲིན་ཅིག་ �་ས�ོང་ར�ྱབས�"
+msgid "<b>Members</b>"
+msgstr "<b>འ�ུས་མི་ཚུ་</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "འབྲེལ་སའི་�ོ་ཡིག་ཞུན་དགཔ�"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "�་བྱང་ཀི་དེབ་ནང་ལས་ གློག་འཕྲིན་�་བྱང་ཚུ་བཙུགས�"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "འ�ུས་མི་ཚུ�"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "�ོ་ཡིག་ནང་ལས་ གློག་འཕྲིན་�་བྱང་ཅིག་ རྩ་བས�ྲད་ག�ང་�"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "སེལ་འ�ུ་འབད་..."
 
-#: ../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 "�ོ་ཡིག་འདི་ནང་ ཡིག་འཕྲིན་བ�ངམ་ད་ �་བྱང་ཚུ་སྦ་བཞག(_H)"
 
-#: ../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 "�ོ་ཡིག་མིང་: (_L)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "སེལ་འ�ུ་འབད� (_S)"
-
-#: ../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 "འོག་གི་�ོ་ཡིག་ནང་ལུ་ གློག་འཕྲིན་�་བྱང་ཅིག་ ཡིག་དཔར་ར�ྱབས་ ཡང་ཅིན་ འབྲེལ་ས་ཅིག་ འདྲུད་དེ་ས�ྱེལ� (_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "འབྲེལ་སའི་�ོ་ཡིག་འ�ུས་མི�"
+
+#: ../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:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../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
 msgid "Book"
 msgstr "ཀི་དེབ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "�ོ་ཡིག་གསརཔ་ཨིན�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 msgid "_Members"
 msgstr "འ�ུས་མི་ཚུ� (_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "འབྲེལ་སའི་�ོ་ཡིག་འ�ུས་མི�"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "བསྒྱུར་བཅོས་འབད་ཡོད་པའི་འབྲེལ་ས་:"
@@ -2749,12 +2726,8 @@ msgid "Duplicate Contact Detected"
 msgstr "འབྲེལ་ས་རྫུན་མ་ ས�ྱོན་འཛིན་བྱུང་ཡི�"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"བསྒྱུར་བཅོས་འབད་མི་ གློག་འཕྲིན་ནམ་ འབྲེལ་ས་འདི་གི་མིང་ ཧེ་མ་ལས་རང་ སྣོད་འཛིན་འདི་ནང་འདུག\n"
-" ཨིན་རུང་ �ྱོད་ཀྱིས་�་ས�ོང་བར�ྱབ་ནི་ཨིན་ན?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+msgstr "འབྲེལ་ས་འདི་གི་མིང་ངམ་ གློག་འཕྲིན་�་བྱང་ ཧེ་མ་ལས་རང་ སྣོད་འཛིན་འདི་ནང་འདུག��ྱོད་ཀྱིས་ འདི་གང་རུང་འབད་ �་ས�ོང་བར�ྱབ་ནི་ཨིན་ན?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2772,19 +2745,41 @@ msgstr ""
 "འབྲེལ་ས་འདི་གི་མིང་ངམ་ གློག་འཕྲིན་�་བྱང་ ཧེ་མ་ལས་རང་ སྣོད་འཛིན་འདི་ནང་འདུག\n"
 "�ྱོད་ཀྱིས་ འདི་གང་རུང་འབད་ �་ས�ོང་བར�ྱབ་ནི་ཨིན་ན?"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+msgid "Merge Contact"
+msgstr "མཉམ་བསྡོམས་ འབྲེལ་ས་ "
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+msgid "_Merge"
+msgstr "མཉམ་བསྡོམས་འབད་ (_M)"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../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:860
+#: ../plugins/groupwise-features/junk-settings.c:425
+#: ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "གློག་འཕྲིན�"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../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
 msgid "Any field contains"
 msgstr "ས་སྒོ་གང་རུང་ནང་ཡོད་པ�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "གློག་འཕྲིན་འདི་གིས་ འགོ་བཙུགསཔ་ཨིན�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "མིང་འདི་གིས་ འགོ་བཙུགསཔ་ཨིན�"
 
@@ -2800,8 +2795,8 @@ msgstr[0] "འབྲེལ་ས %d�"
 msgstr[1] "འབྲེལ་ས་%d�"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../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
 msgid "Query"
@@ -2811,112 +2806,105 @@ msgstr "འདྲི་དཔྱད�"
 msgid "Error getting book view"
 msgstr "ཀི་དེབ་ཀྱི་མ�ོང་སྣང་ ལེན་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3340
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207
-#: ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3489
-#: ../widgets/text/e-text.c:3490
+#: ../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:3335
+#: ../widgets/table/e-tree-selection-model.c:821
+#: ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "དཔེ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "ཤོག་བྱང་ལེགས་བཅོས་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "འབྱུང་�ུངས�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:501
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "དབྱེ་བ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2181
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "�ི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུངས�..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
+msgstr "�ི་ཤོག་བྱང་་སྦེ་ སྲུངས ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-calendar-view.c:1698
-#: ../calendar/gui/e-memo-table.c:902
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "�་ཕྱེ� (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_New Contact..."
 msgstr "འབྲེལ་ས་གསརཔ་…(_N)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "New Contact _List..."
 msgstr "འབྲེལ་སའི་�ོ་ཡིག་གསརཔ་…(_L)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
-msgid "_Save as VCard..."
-msgstr "�ི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུང་བཞག་འབད་...(_S)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as vCard..."
+msgstr "�ི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུང་བཞག་འབད...(_S)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contact"
 msgstr "འབྲེལ་ས་གདོང་བས�ྱོད་འབད�(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Forward Contacts"
 msgstr "འབྲེལ་ས་ཚུ་གདོང་བས�ྱོད་འབད�(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contact"
 msgstr "འབྲེལ་ས་ལུ་ འཕྲིན་དོན་ག�ང་�(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to List"
 msgstr "�ོ་ཡིག་ལུ་འཕྲིན་དོན་ག�ང་�(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Send _Message to Contacts"
 msgstr "འབྲེལ་ས་ཚུ་ལུ་ འཕྲིན་དོན་ག�ང་�(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "_Print"
 msgstr "དཔར་བས�ྲུན�(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cop_y to Address Book..."
 msgstr "�་བྱང་ཀི་དེབ་ནང་ འདྲ་བཤུས་ར�ྱབས་...(_y)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Mo_ve to Address Book..."
 msgstr "�་བྱང་ཀི་དེབ་ནང་ སྤོ་བཤུད་འབད་...(_v)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../ui/evolution-composer-entries.xml.h:4
 #: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "བ�ོག (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:988
-#: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1705
-#: ../calendar/gui/e-memo-table.c:910
-#: ../calendar/gui/memos-component.c:452
-#: ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3177
-#: ../mail/em-folder-tree.c:1004
-#: ../mail/em-folder-view.c:1135
-#: ../mail/message-list.c:1922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:457
+#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:3100
+#: ../mail/em-folder-tree.c:996
+#: ../mail/em-folder-view.c:1334
+#: ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13
@@ -2927,30 +2915,26 @@ msgstr "བ�ོག (_t)"
 msgid "_Copy"
 msgstr "འདྲ་བཤུས� (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 msgid "P_aste"
 msgstr "སྦྱར�(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../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
 msgid "Any Category"
 msgstr "དབྱེ་རིམ་གང་རུང་�"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1872
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1929
-msgid "Print cards"
-msgstr "ཤོག་བྱང་དཔར་བས�ྲུན་འབད�"
-
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Other error"
 msgstr "འཛོལ་བ་གཞན�"
 
 #: ../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 "ལས་རོགས�"
 
@@ -2980,6 +2964,7 @@ msgstr "སྣུམ་འ�ོར་བརྒྱུད་འཕྲིན�"
 
 #: ../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-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2987,87 +2972,78 @@ msgid "Categories"
 msgstr "དབྱེ་རིམ་ཚུ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "ཚོང་སྡེའི་བརྒྱུད་འཕྲིན�"
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "ཚོང་སྡེ་"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:780
-#: ../plugins/groupwise-features/junk-settings.c:425
-#: ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "གློག་འཕྲིན�"
+msgid "Company Phone"
+msgstr "ཚོང་སྡེའི་བརྒྱུད་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "གློག་འཕྲིན་༢པ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "གློག་འཕྲིན་༣པ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "བཟའ་ཚང་མིང་�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "དེ་སྦེ་བཙུགས�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "མིང་དང་པམ་�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "�ྱིམ་ནང་གི་དཔར་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "�ྱིམ་ནང་གི་བརྒྱུད་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "�ྱིམ་ནང་གི་བརྒྱུད་འཕྲིན་༢པ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ཨའི་ཨེསི་ཌི་ཨེན་བརྒྱུད་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "གསར་དེབ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "འཛིན་ས�ྱོང་པ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "འགྲུལ་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "ས�ྱོན་མིང་�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "དྲན་འཛིན�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "ཡིག་ཚང་�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-msgid "Organization"
-msgstr "ལས་སྡེ�"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "དཔར་འཕྲིན་གཞན�"
@@ -3089,15 +3065,14 @@ msgid "Radio"
 msgstr "རེ་ཌིའོ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "ལས་གན�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "བཟའ་ཟླ�"
 
@@ -3129,40 +3104,40 @@ msgstr "�ེབ་ས་�ོངས�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436
-#: ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../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-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/table/e-table-item.c:3078
+#: ../widgets/table/e-table-item.c:3079
+#: ../widgets/text/e-text.c:3729
+#: ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "རྒྱ་ཚད�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108
-#: ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444
-#: ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../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-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030
-#: ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3675
-#: ../widgets/text/e-text.c:3676
+#: ../widgets/table/e-table-item.c:3084
+#: ../widgets/table/e-table-item.c:3085
+#: ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "མ�ོ་ཚད�"
 
@@ -3264,17 +3239,17 @@ msgid "Has Cursor"
 msgstr "འོད་རྟགས་འདུག"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:637
 msgid "_Open Link in Browser"
 msgstr "བརའུ་ཟར་ནང་ལུ་ འབྲེལ་ལམ་�་ཕྱེ� (_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2586
+#: ../mail/em-folder-view.c:2812
 msgid "_Copy Link Location"
 msgstr "འབྲེལ་ལམ་གནས་�ོངས་ འདྲ་བཤུས་ར�ྱབས� (_C)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:638
 msgid "_Send New Message To..."
 msgstr "འཕྲིན་དོན་གསརཔ་....ལུ་ག�ང་� (_S)"
 
@@ -3284,214 +3259,220 @@ msgid "Copy _Email Address"
 msgstr "གློག་འཕྲིན་�་བྱང་ཚུ་འདྲ་བཤུས་ར�ྱབས�(_E)"
 
 #: ../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:758
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
 msgid "List Members"
 msgstr "འ�ུས་མི་ཚུ་�ོ་བཀོད་འབད�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "ལས་�ུངས�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "�ྱད་ལས�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "གནས་ས�"
 
-#: ../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:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/gnome-cal.c:2306
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../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:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../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/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "ཟླ་�ོ�"
 
-#: ../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:370
+#: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "དལ�/�ོམ་མེད�"
 
-#: ../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 "བརྒྱུད་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "དཔར་འཕྲིན�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "�ྱིམ་གྱི་ཤོག་ལེབ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "�ེབ་དྲན་དེབ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2340
 msgid "Birthday"
 msgstr "ས�ྱེ་བའི་ཉིནམ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2341
 msgid "Anniversary"
 msgstr "ལོ་བསྟར་དུས་དྲན�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:776
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
 msgid "Job Title"
 msgstr "ལས་གཡོག་གི་མགོ་མིང་�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
 msgid "Home page"
 msgstr "�ྱིམ་གྱི་ཤོག་ལེབ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Blog"
 msgstr "བོལོག"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Success"
 msgstr "མ�ར་འ�ྱོལ�"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Backend busy"
 msgstr "རྒྱབ་མ�འ་�ོམ་མེད�"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Repository offline"
 msgstr "མཛོད་གནས་ ཨོཕ་ལ་ཡིན�"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Address Book does not exist"
 msgstr "�་བྱང་ཀི་དེབ་གནས་�ེ་མིན་འདུག"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 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:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "གནང་བ་བྱིན་མ་བ�ུབ�"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Contact not found"
 msgstr "འབྲེལ་ས་འཚོལ་མ་�ོབ�"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact ID already exists"
 msgstr "འབྲེལ་སའི་ཨའི་ཌི་ ཧེ་མ་ལས་འདུག"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Protocol not supported"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ལུ་ རྒྱབ་ས�ྱོར་མིན་འདུག"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:464
-#: ../calendar/gui/print.c:2516
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:436
+#: ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "ཆ་མེད་བ�ང་ཡོད�"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Could not cancel"
 msgstr "ཆ་མེད་བ�ང་མ་ཚུགས�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "བདེན་བཤད་འབད་མ་བ�ུབ�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Authentication Required"
 msgstr "བདེན་བཤད་འབད་དགོཔ་འདུག"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "TLS not Available"
 msgstr "ཊི་ཨེལ་ཨེསི་ འ�ོབ་མི་ཚུགས་པས�"
 
 #. 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:73
 msgid "No such source"
 msgstr "འདི་བཟུམ་མའི་འབྱུང་�ུངས་མིན་འདུག"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Not available in offline mode"
 msgstr "ཨོཕ་ལ་ཡིན་�བས་ལམ་ནང་ འ�ོབ་མི་ཚུགས�"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Invalid server version"
 msgstr "ནུས་མེད་སར་བར་�ོན་རིམ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
 msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
 msgstr "ང་བཅས་ཀྱིས་ �་བྱང་ཀི་དེབ་འདི་ �་ཕྱེ་མ་ཚུགས� འདི་གི་དོན་དག་ ཀི་དེབ་འདི་ ཡང་ཅིན་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལ�་དང་ ཡང་ཅིན་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཕབ་ལེན་མ་འབད�་འོང་ནི་མས� �་བྱང་ཀི་དེབ་ཀྱི་ནང་དོན་ཚུ་ ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ �་བྱང་ཀི་དེབ་དེ་ ཨཱོན་ལ་ཡིན་�བས་ལམ་གུ་ ཚར་གཅིག་མངོན་གསལ་འབད་གནང་�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
 #, c-format
 msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
 msgstr "ང་བཅས་ཀྱིས་ �་བྱང་ཀི་དེབ་འདི་ �་ཕྱེ་མ་ཚུགས� འགྲུལ་ལམ་%s ཡོད་མེད་དང་ དེ་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་ གནང་བ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་གནང་�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
 msgstr "ང་བཅས་ཀྱིས་ �་བྱང་ཀི་དེབ་འདི་ �་ཕྱེ་མ་ཚུགས� འདི་གི་དོན་དག་ ཡང་ཅིན་ �ྱོད་ཀྱིས་ བདེན་མེད་ཀྱི་ ཡུ་ཨར་ཨའི་ བཙུགས་ཡོདཔ་ད་ ཡང་ཅིན་ སར་བར་དེ་ བདའ་མ་ཟུནམ་འོང་ནི་མས�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ �ོན་རིམ་འདི་ནང་ལུ་ ཨེལ་ཌི་ཨེ་པི་གི་རྒྱབ་ས�ྱོར་ ཕྱོགས་སྒྲིག་འབད་འབད�་མིན་འདུག �ྱོད་ཀྱིས་ ཨི་བོ་ལུ་ཤཱན་ནང་ ཨེལ་ཌི་ཨེ་པི་ ལག་ལེན་འ�བ་དགོ་པ་ཅིན་ ཨེལ་ཌི་ཨེ་པི་-ལྕོགས་ཅན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་ �ུམ་སྒྲིལ་ཅིག་ གཞི་བཙུགས་འབད་དགོ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
 msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
 msgstr "ང་བཅས་ཀྱིས་ �་བྱང་ཀི་དེབ་འདི་ �་ཕྱེ་མ་ཚུགས� འདི་གི་དོན་དག་ ཡང་ཅིན་ �ྱོད་ཀྱིས་ བདེན་མེད་ཡུ་ཨར་ཨའི་ཅིག་ བཙུགས་ཡོདཔ་ད་ ཡང་ཅིན་ སར་བར་དེ་ བདའ་མ་ཟུནམ་འོང་ནི་མས�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3503,7 +3484,7 @@ msgstr ""
 "�ྱོད་ཀྱི་འཚོལ་ཞིབ་དེ་ དམིགས་བསལ་གསལ་བཀོད་འབད་དགོཔ་ད་ ཡང་ཅིན་ \n"
 "�་བྱང་ཀི་དེབ་འདི་གི་དོན་ལུ་ སྣོད་�ོ་ སར་བར་ དགའ་གདམ་ནང་ གྲུབ་འབྲས་ཀྱི་ཚད་ ཡར་སེང་འབད་གནང་�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 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"
@@ -3515,45 +3496,45 @@ msgstr ""
 " �ྱོད་ཀྱི་འཚོལ་ཞིབ་དེ་ དམིགས་བསལ་གསལ་བཀོད་འབད་དགོཔ་ད་\n"
 " ཡང་ཅིན་ སྣོད་�ོའི་སར་བར་ དུས་ཚོད་ཀྱི་ཚད་ ཡར་སེང་འབད་གནང་�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "�་བྱང་ཀི་དེབ་འདི་གི་ རྒྱབ་མ�འ་དེ་གིས་ འདྲི་དཔྱད་འདི་ མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "�་བྱང་ཀི་དེབ་འདི་གི་ རྒྱབ་མ�འ་དེ་གིས་ འདྲི་དཔྱད་འདི་ ལག་ལེན་འ�བ་མ་བ�ུབ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
 msgstr "འདྲི་དཔྱད་འདི་ མ�ར་འ�ྱོལ་སྦེ་ མཇུག་བསྡུ་མ་ཚུགས�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
 msgstr "�ོ་ཡིག་�་ས�ོང་བར�ྱབ་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:710
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "འབྲེལ་ས་�་ས�ོང་བར�ྱབ་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying list"
 msgstr "�ོ་ཡིག་ལེགས་བཅོས་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying contact"
 msgstr "འབྲེལ་ས་ལེགས་བཅོས་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Error removing list"
 msgstr "�ོ་ཡིག་རྩ་བས�ྲད་ག�ང་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:660
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "འབྲེལ་ས་རྩ་བས�ྲད་ག�ང་ནི་ལུ་འཛོལ་བ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3568,8 +3549,16 @@ msgstr[1] ""
 "འབྲེལ་ས་%d�་ཕྱེ�་ད་ �ིན་ཌོསི་གསརཔ་%dཡང་ �་ཕྱེ�་ཨིན�.\n"
 "�ྱོད་ཀྱིས་ ངེས་པར་དུ་ འབྲེལ་ས་དེ་ཚུ་ཆ་མཉམ་ བཀྲམ་སྟོན་འབད་ནི་ཨིན་ན?"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
+msgid "_Don't Display"
+msgstr "བཀྲམ་སྟོན་མ་འབད་(_D)"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
+msgid "Display _All Contacts"
+msgstr "འབྲེལ་ས་ཆ་མཉམ་བཀྲམ་སྟོན་འབད་ (_A)"
+
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3578,64 +3567,65 @@ msgstr ""
 "%s ཧེ་མ་ལས་འདུག\n"
 "འདི་ཚབ་སྲུང་འབད་ནི་ཨིན་ན?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:329
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
 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:376
 #: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "འབྲེལ་ས�"
 msgstr[1] "འབྲེལ་ས�"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
 msgid "card.vcf"
 msgstr "ཤོག་བྱང་.�ི་སི་ཨེཕ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:464
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
 msgid "Select Address Book"
 msgstr "�་བྱང་ཀི་དེབ་སེལ་འ�ུ་འབད�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:605
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
 msgid "list"
 msgstr "�ོ་ཡིག"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Move contact to"
 msgstr "འབྲེལ་ས་ལུ་ སྤོ་བཤུད་འབད�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
 msgid "Copy contact to"
 msgstr "འབྲེལ་ས་ལུ་ འདྲ་བཤུས་ར�ྱབས�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Move contacts to"
 msgstr "འབྲེལ་ས་ཚུ་སྤོ་བཤུད་འབད་ཡུལ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:778
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Copy contacts to"
 msgstr "འབྲེལ་ས་ཚུ་འདྲ་བཤུས་བར�ྱབ་ཡུལ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-msgid "Multiple VCards"
-msgstr "སྣ་མང་�ི་ཤོག་བྱང་�"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "སྣ་མང་�ི་ཤོག་བྱང་"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
 #, c-format
-msgid "VCard for %s"
-msgstr "%sགི་དོན་ལས་ �ི་ཤོག་བྱང་�"
+msgid "vCard for %s"
+msgstr "%sགི་དོན་ལས་ �ི་ཤོག་བྱང་"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1048
-#: ../addressbook/gui/widgets/eab-gui-util.c:1066
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#, c-format
 msgid "Contact information"
 msgstr "འབྲེལ་སའི་བརྡ་དོན�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1068
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
 #, c-format
 msgid "Contact information for %s"
 msgstr "%sགི་དོན་ལུ་འབྲེལ་སའི་བརྡ་དོན�"
@@ -3652,15 +3642,15 @@ msgstr[0] "འབྲེལ་ས་གཞན་མི་ གཅིག་འདà½
 msgstr[1] "འབྲེལ་ས་གཞན་མི་%dའདུག"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:281
-msgid "Show Full VCard"
-msgstr "�ི་ཤོག་བྱང་ ཆ་ཚང་སྟོན�"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "�ི་ཤོག་བྱང་ ཆ་ཚང་སྟོན་"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:232
-msgid "Show Compact VCard"
-msgstr "སྲབ་ཆུང་གི་ �ི་ཤོག་བྱང་སྟོན�"
+msgid "Show Compact vCard"
+msgstr "སྲབ་ཆུང་གི་ �ི་ཤོག་བྱང་སྟོན་"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:286
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
 msgstr "�་བྱང་ཀི་དེབ་ནང་སྲུངས�"
 
@@ -3668,17 +3658,11 @@ msgstr "�་བྱང་ཀི་དེབ་ནང་སྲུངས�"
 msgid "Card View"
 msgstr "ཤོག་བྱང་མ�ོང་སྣང་�"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "ཇི་ཊི་ཀེ་ རྩ་འབྲེལ་མ�ོང་སྣང་�"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../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
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
 #: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ནང་འདྲེན་འབད་དོ་..."
@@ -3707,35 +3691,21 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ སི་ཨེསà½
 msgid "Evolution CSV and Tab Importer"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ སི་ཨེསི་�ི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ�"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ཨེལ་ཌི་ཨེ་པི་ གནད་སྡུད་ཕན་ཚུན་བརྗེ་སོར་རྩ་སྒྲིག(.ཨེལ་ཌི་ཨའི་ཨེཕ)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:667
 msgid "Evolution LDIF importer"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨེལ་ཌི་ཨའི་ཨེཕ་ ནང་འདྲེན་པ�"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "�ི་ཤོག་བྱང་� (.vcf, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "�ི་ཤོག་བྱང་ (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ �ི་ཤོག་བྱང་ ནང་འདྲེན་པ�"
-
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "ཡིག་ཤུབས་དཔར་བས�ྲུན་འབད�"
-
-#: ../addressbook/printing/e-contact-print.c:851
-msgid "Print contacts"
-msgstr "འབྲེལ་ས་ཚུ་དཔར་བས�ྲུན་འབད�"
-
-#: ../addressbook/printing/e-contact-print.c:877
-#: ../addressbook/printing/e-contact-print.c:904
-msgid "Print contact"
-msgstr "འབྲེལ་ས་དཔར་བས�ྲུན་འབད�"
+msgid "Evolution vCard Importer"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ �ི་ཤོག་བྱང་ ནང་འདྲེན་པ་ "
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3778,12 +3748,13 @@ msgid "Format"
 msgstr "རྩ་སྒྲིག"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1893
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:447
+#: ../widgets/table/e-table-click-to-add.c:503
+#: ../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-selection-model.c:310
 msgid "Header"
 msgstr "མགོ་ཡིག"
 
@@ -3836,7 +3807,6 @@ msgid "Options"
 msgstr "གདམ་��"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "ཕྱོགས�"
 
@@ -3886,7 +3856,7 @@ msgstr "ནག་གྲིབ་བཟོ་བ�"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:1057
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3922,7 +3892,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "འབྲེལ་སའི་དཔར་བས�ྲུན་གྱི་ བཟོ་རྣམ་ཞུན་དག་པའི་བརྟག་ཞིབ�"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:44
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "དྲ་བཤུས་བདག་དབང་ (C) ༢༠༠༠ ཟི་མི་ཡཱན་ ཨའི་ཨེན་སི�"
 
@@ -3930,16 +3900,16 @@ msgstr "དྲ་བཤུས་བདག་དབང་ (C) ༢༠༠༠ ཟི
 msgid "This should test the contact print style editor widget"
 msgstr "འདི་གིས་འབྲེལ་སའི་ དཔར་བས�ྲུན་བཟོ་རྣམ་ཞུན་དག་པའི་ �ི་གེཊི་ལུ་ བརྟག་ཞིབ་འབད་དགོ"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
 msgstr "འབྲེལ་སའི་དཔར་བས�ྲུན་བརྟག་ཞིབ�"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:46
 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:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "ཡིག་སྣོད་�་ཕྱེ་མི་ཚུགས་པས�"
@@ -3977,8 +3947,8 @@ msgid "Export in asynchronous mode"
 msgstr "གནད་སྡུད་རྒྱུན་སྤེལ་གྱི་ �བས་ལམ་ནང་ ཕྱིར་འདྲེན་འབད�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in out output file in asynchronous mode, default size 100."
-msgstr "གནད་སྡུད་རྒྱུན་སྤེལ་གྱི་ �བས་ལམ་ནང་  ཨའུཊི་པུཊི་ཡིག་སྣོད་ནང་གི་ ཤོག་བྱང་གི་གྲངས་  སྔོན་སྒྲིག་ཚད་ ༡༠༠�"
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "གནད་སྡུད་རྒྱུན་སྤེལ་གྱི་ �བས་ལམ་ནང་ ཨའུཊི་པུཊི་ཡིག་སྣོད་ནང་གི་ ཤོག་བྱང་གི་གྲངས་  སྔོན་སྒྲིག་ཚད་ ༡༠༠�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
@@ -4004,381 +3974,372 @@ msgstr "སྤྱིར་བà½�ང་à½�བས་ལམ་ནང་ ཚད་à½
 msgid "Unhandled error"
 msgstr "ལེགས་ས�ྱོང་མ་འ�བ་པའི་འཛོལ་བ�"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "སྔོན་སྒྲིག་�་བྱང་ཀི་དེབ་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "ཨིན་པུཊི་ཡིག་སྣོད�"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "ཡིག་སྣོད་ཀྱི་མིང་ མ་བྱིན་པས�"
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid "'{0}' is a read-only calendar source. Switch to Calendar View and highlight a calendar that can accept appointments."
+msgstr "'{0}' ལྷག་ཡོད་པའི་ ཟླ་�ོའི་བྱུང་�ུངས་ཅིག་ཨིན་མས� ཟླ་�ོ་ མ�ོང་སྣང་ལུ་ སོར་བསྒྱུར་འབད་ཞིནམ་ལས་ ངོ་འཕྲད་ཚུ་ དང་ལེན་འབད་ཚུགས་པའི་ ཟླ་�ོ་ཅིག་ གཙོ་དམིགས་འབད� "
 
-#: ../calendar/calendar.error.xml.h:1
+#: ../calendar/calendar.error.xml.h:3
 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:4
 msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
 msgstr "�ྱོད་ཀྱི་ལས་ཀ་ལུ་ དོན་ལྡན་གྱི་བཅུད་དོན་ཅིག་ �་ས�ོང་བར�ྱབ་པ་ཅིན་ �ྱོད་རའི་ལེན་མ�ན་ཚུ་ལུ་ �ྱོད་ཀྱི་ལས་ཀ་དེ་ ག་ཅི་གི་ས�ོར་ལས་ཨིན་ན་ ཧ་གོ་ནི་ལུ་ ཕན་�བས་ཡོད�"
 
-#: ../calendar/calendar.error.xml.h:3
-msgid "All information in these journal entries will be deleted and can not be restored."
-msgstr "གསར་དེབ་�ོ་བཀོད་འདི་ཚུ་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
+#: ../calendar/calendar.error.xml.h:5
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "བརྗེད་�ོ་འདི་ཚུ་ནང་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་དང་ སོར་ཆུད་འབད་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
-msgstr "གསར་དེབ་འདི་ནང་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
+#: ../calendar/calendar.error.xml.h:6
+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:7
 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:8
 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:9
 msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "ངོ་འཕྲད་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:8
-msgid "All information on this journal entry will be deleted and can not be restored."
-msgstr "གསར་དེབ་�ོ་བཀོད་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
-
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "འཛོམས་འདུ་་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:11
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "བརྗེད་�ོ་འདི་གུ་ཡོད་པའི་བརྡ་དོན་ཚུ་ག་ར་ བ�ོན་ག�ང་ནི་ཨིནམ་དང་ སོར་ཆུད་འབད་མི་ཚུགས� "
+
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "ལས་ཀ་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "�ྱོད་ཀྱིས་ ལས་ཀ་[༠]འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "�ྱོད་ཀྱིས་ ངོ་འཕྲད་མགོ་མིང་[༠]འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "�ྱོད་ཀྱིས་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "�ྱོད་ཀྱིས་ བརྗེད་�ོ་  '{0}'འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "�ྱོད་ཀྱིས་ ངོ་འཕྲད་[༠]འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "�ྱོད་ཀྱིས་ [༠]འབད་མི་ གསར་དེབ་�ོ་བཀོད་འདི་ཚུ་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་་ཨིན་ན?"
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "�ྱོད་ཀྱིས་ [༠]བརྗེད་�ོ་དེ་   བ�ོན་ག�ང་ནི་ ངེས་ག�ན་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "�ྱོད་ཀྱིས་ [༠]འབད་མི་ ལས་ཀ་འདི་ཚུ་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this appointment?"
 msgstr "�ྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "�ྱོད་ཀྱིས་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
-
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:183
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "�ྱོད་ཀྱིས་ འཛོམས་འདུ་་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "�ྱོད་ཀྱིས་ བརྗེད་�ོ་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
+
+#: ../calendar/calendar.error.xml.h:22
 #: ../calendar/gui/dialogs/delete-comp.c:186
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "�ྱོད་ཀྱིས་ ལས་ཀ་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "�ྱོད་ཀྱིས་ བརྗེད་�ོ་དེ་  བཅུད་དོན་མེད་པར་ སྲུངས་ནི་ཨིན་ན?"
+
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "�ྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ བཅུད་དོན་མེད་པར་ ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "�ྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཅུད་དོན་མེད་པར་ ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:26
 msgid "Cannot create a new event"
 msgstr "ལས་ཀ་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད་མ་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete calendar '{0}'?"
 msgstr "ཟླ་�ོ་[༠]བ�ོན་ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:28
 msgid "Delete memo list '{0}'?"
 msgstr "ལས་ཀའི་�ོ་ཡིག་'{0}'བ�ོན་ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:29
 msgid "Delete task list '{0}'?"
 msgstr "ལས་ཀའི་�ོ་ཡིག་[༠]བ�ོན་ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:30
 msgid "Do _not Send"
 msgstr "མ་བ�ང་�(_n)"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ཕབ་ལེན་འབད་དོ� �ྱོད་ཀྱིས་ངོ་འཕྲད་དེ་བསྲུང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ཕབ་ལེན་འབད་བའི་བསྒང་ཡོད� �ྱོད་ཀྱིས་ལས་ཀ་དེ་བསྲུང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Editor could not be loaded."
 msgstr "ཞུན་དགཔ་མངོན་གསལ་འབད་མ་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "བཅའ་མར་ག�ོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་�ོག་ལས་ མགྲོན་བརྡ་བ�ང་ཞིནམ་ལས་ ལས་ཀ་འདི་ལུ་ ངོས་ལེན་འབད་བཅུག"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "བཅའ་མར་ག�ོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་�ོག་ལས་ མགྲོན་བརྡ་ག�ང་ཞིནམ་ལས་ ངོས་ལེན་འབད་བཅུག"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading calendar"
 msgstr "ཟླ་�ོ་མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid "Error loading memo list"
 msgstr "བརྗེད་�ོའི་�ོ་ཡིག་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Error loading task list"
 msgstr "ལས་ཀའི་�ོ་ཡིག་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../calendar/calendar.error.xml.h:36
-msgid "If you do not send a cancelation notice, the other participants may not know the journal has been deleted."
-msgstr "�ྱོད་ཀྱིས་ཆ་མེད་བརྡ་བས�ུལ་མ་བ�ང་པ་ཅིན་ བཅའ་མར་ག�ོགས་མི་གཞན་ཚུ་གིས་ ཇོར་ནཱལ་དེ་ བ�ོན་བ�ང་ཡོདཔ་མི་ཤེས�"
-
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:39
 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:40
+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:41
 msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
 msgstr "�ྱོད་ཀྱིས་ ཆ་མེད་བརྡ་བས�ུལ་མ་བ�ང་པ་ཅིན་ བཅའ་མར་ག�ོགས་མི་ གཞན་ཚུ་གིས་ ལས་ཀ་དེ་ བ�ོན་བ�ང་ཡོདཔ་མི་ཤེས�"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "དུས་མ�ུན་གྱི་ བརྡ་དོན་ག�ང་ནི་དེ་གིས་ བཅའ་མར་ག�ོགས་མི་གཞན་ཚུ་ལུ་ �ོང་རའི་ཟླ་�ོ་ཚུ་ དུས་མ�ུན་སྦེ་ བཞག་ཚུགསཔ་ཨིན�"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "དུས་མ�ུན་གྱི་ བརྡ་དོན་ག�ང་ནི་དེ་གིས་ བཅའ་མར་ག�ོགས་མི་གཞན་ཚུ་ལུ་ �ོང་རའི་ལས་ཀའི་�ོ་ཡིག་ཚུ་ དུས་མ�ུན་སྦེ་ བཞག་ཚུགསཔ་ཨིན�"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ� ངོ་འཕྲད་དེ་སྲུང་བཞག་འབད�་ད་ མཉམ་སྦྲགས་དེ་ཚུ་ བརླག་སྟོར་ཞུགས་འོང་�"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ� ལས་ཀ་དེ་ སྲུང་བཞག་འབད�་ད་ མཉམ་སྦྲགས་ཚུ་དེ་ཚུ་ བརླག་སྟོར་ཞུགས་འོང་�"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Some features may not work properly with your current server."
 msgstr "�ྱད་རྣམ་ལ་ལོ་ཅིག་གིས་ �ྱོད་ཀྱི་ད་ལྟོའི་སར་བར་དང་གཅིག་�ར་ ལེགས་ཤོམ་སྦེ་ ལཱ་འབད་མི་བ�ུབ་འོང་�"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཟླ་�ོ་དེ་ རེ་བ་མེད་པར་ སྤངས་ད་ནུག"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ བརྗེད་�ོ་དེ་ རེ་བ་མེད་པར་ སྤངས་ད་ནུག"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ལས་ཀ་དེ་ རེ་བ་མེད་པར་ སྤངས་ད་ནུག"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The calendar is not marked for offline usage."
 msgstr "ཟླ་�ོ་དེ་ ཨོཕ་ལ་ཡིན་ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལ་བས�"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The memo list is not marked for offline usage"
 msgstr "བྲརྗེད་�ོའི་�ོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས�"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The task list is not marked for offline usage."
 msgstr "ལས་ཀ་འདི་ ཨོཕ་ལ་ཡིན ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས�"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "This calendar will be removed permanently."
 msgstr "ཟླ་�ོ་འདི་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་འགྱོ་འོང་�"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "This memo list will be removed permanently."
 msgstr "བརྗེད་�ོའི་�ོ་ཡིག་དེ་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་འགྱོ་འོང་�"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "This task list will be removed permanently."
 msgstr "ལས་ཀ་འདི་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་འགྱོ་འོང་�"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this appointment?"
 msgstr "�ྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བསྲུང་ནི་ཨིན་ན?�"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to save your changes to this memo?"
 msgstr "�ྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ བརྗེད་�ོ་འདི་ནང་ བསྲུང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to save your changes to this task?"
 msgstr "�ྱོད་ཀྱིས་ ལས་ཀ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བསྲུང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "�ྱོད་ཀྱིས་གསར་དེབ་�ོ་བཀོད་འདི་གི་དོན་ལས་ ཆ་མེད་བརྡ་བས�ུལ་ཅིག་ ག�ང་ནི་ཨིན་ན?"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "�ྱོད་ཀྱིས་བརྗེད་�ོ་་འདི་གི་དོན་ལས་ ཆ་མེད་བརྡ་བས�ུལ་ཅིག་ ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�ྱོད་ཀྱིས་ ཅའ་མར་ག�ོགས་མི་ཆ་མཉམ་ལུ་ ཆ་མེད་བརྡ་བས�ུལ་ཅིག་ ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�ྱོད་ཀྱིས་ བཅའ་མར་ག�ོགས་མི་ཚུ་ལུ་ འཛོམས་འདུའི་ མགྲོན་བརྡ་ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send this task to participants?"
 msgstr "�ྱོད་ཀྱིས་ བཅའ་མར་ག�ོགས་མི་ཚུ་ལུ་ དུས་མ�ུན་གྱི་ ལས་ཀའི་བརྡ་དོན་ ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "�ྱོད་ཀྱིས་ བཅའ་མར་ག�ོགས་མི་ཆ་མཉམ་ལུ་ དུས་མ�ུན་གྱི་ འཛོམས་འདུ་བརྡ་དོན་ ག�ང་ནི་ཨིན་ན?�"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send updated task information to participants?"
 msgstr "�ྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཅའ་མར་ག�ོགས་མི་ཚུ་ལུ་ ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
 msgstr "�ྱོད་ཀྱིས་རྒྱབ་ས�ྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་ མ�ུད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འ�བ་ནི་ལུ་ དཀའ་ངལ་འབྱུང་འོང་� གྲུབ་འབྲས་ཡང་དག་འབྱུང་�བས་ལུ་ སར་བར་དེ་ རྒྱབ་ས�ྱོར་ཡོད་པའི་�ོན་རིམ་ཅིག་ལུ་ ཡར་ས�ྱེད་འབད་དགོ"
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments."
-msgstr "�ྱོདལུ་ལྷག་ནི་ཙམ་གྱི་ ཟླ་�ོའི་འབྱུང་�ུངས་ཅིག་སེལ་འ�ུ་འབད་དེ་འདུག� ཟླ་�ོའི་མ�ོང་སྣང་ལུ་ བསྒྱུར་ཞིནམ་ལས་ ངོ་ཕྲད་ལུ་དང་ལེན་འབད་ཚུགས་མི་ ཟླ་�ོ་ཅིག་ལུ་ གཙོ་དམིགས་འབད�"
-
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�ྱོད་ཀྱིས་ངོ་འཕྲད་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབད�་ད་ ད་ཚུན་མ་བསྲུངས་པས�"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
 msgid "You have changed this task, but not yet saved it."
 msgstr "�ྱོད་ཀྱིས་ལས་ཀ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབད�་ད་ ད་ཚུན་མ་བསྲུངས་པས�"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:68
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�ྱོད་ཀྱིས་བརྗེད་�ོ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབད�་ད་ ད་ཚུན་མ་བསྲུངས་པས�"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་ �ྱོད་ཀྱི་ཟླ་�ོ་ འ�ོབ་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་ �ྱོད་ཀྱི་བརྗེད་�ོ་ཚུ་ འ�ོབ་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་ �ྱོད་ཀྱི་ལས་ཀ་ འ�ོབ་མི་ཚུགས�"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "བསྒྱུར་བཅོས་ཚུ་ བ�ོན་བཀོག (_D)"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:73
 #: ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "སྲུངས� (_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:74
 msgid "_Save Changes"
 msgstr "བསྒྱུར་བཅོས་ཚུ་སྲུངས�(_S)"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:75
 #: ../composer/mail-composer.error.xml.h:33
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ག�ང་� (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:76
 msgid "_Send Notice"
 msgstr "བརྡ་བས�ུལ་ག�ང་�(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:77
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/common/authentication.c:49
-#: ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "ཆོག་ཡིག་བཙུགས�"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:253
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "ཉིན་མོའི་སྣ་མང་བྱུང་ལས་ཚུ་གཤག"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1504
-#: ../calendar/conduits/calendar/calendar-conduit.c:1505
-#: ../calendar/conduits/memo/memo-conduit.c:930
-#: ../calendar/conduits/memo/memo-conduit.c:931
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1107
+#: ../calendar/conduits/calendar/calendar-conduit.c:1519
+#: ../calendar/conduits/calendar/calendar-conduit.c:1520
+#: ../calendar/conduits/memo/memo-conduit.c:818
+#: ../calendar/conduits/memo/memo-conduit.c:819
+#: ../calendar/conduits/todo/todo-conduit.c:1016
+#: ../calendar/conduits/todo/todo-conduit.c:1017
 msgid "Could not start evolution-data-server"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ གནད་སྡུད་སར་བར་ འགོ་བཙུགས་མ་ཚུགས�"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1612
-#: ../calendar/conduits/calendar/calendar-conduit.c:1615
+#: ../calendar/conduits/calendar/calendar-conduit.c:1627
+#: ../calendar/conduits/calendar/calendar-conduit.c:1630
 msgid "Could not read pilot's Calendar application block"
 msgstr "པའི་ལོཊི་གི་ ཟླ་�ོའི་གློག་རིམ་སྡེབ་ཚན་ ལྷག་མ་ཚུགས�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1024
-#: ../calendar/conduits/memo/memo-conduit.c:1027
+#: ../calendar/conduits/memo/memo-conduit.c:912
+#: ../calendar/conduits/memo/memo-conduit.c:915
 msgid "Could not read pilot's Memo application block"
 msgstr "པའི་ལོཊི་གི་ བརྗེད་�ོ་འཇུག་སྤྱོད་སྡེབ་ཚན་ ལྷག་མ་ཚུགས�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1071
-#: ../calendar/conduits/memo/memo-conduit.c:1074
+#: ../calendar/conduits/memo/memo-conduit.c:959
+#: ../calendar/conduits/memo/memo-conduit.c:962
 msgid "Could not write pilot's Memo application block"
 msgstr "པའི་ལོཊི་གི་ བརྗེད་�ོ་འཇུག་སྤྱོད་སྡེབ་ཚན་ འབྲི་མ་ཚུགས�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
 msgstr "སྔོན་སྒྲིག་གཙོ་རིམ་:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1190
-#: ../calendar/conduits/todo/todo-conduit.c:1193
+#: ../calendar/conduits/todo/todo-conduit.c:1100
+#: ../calendar/conduits/todo/todo-conduit.c:1103
 msgid "Could not read pilot's ToDo application block"
 msgstr "པའི་ལོཊི་གི་ ཊུ་ཌུ གློག་རིམ་སྡེབ་ཚན་ ལྷག་མ་ཚུགས�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1235
-#: ../calendar/conduits/todo/todo-conduit.c:1238
+#: ../calendar/conduits/todo/todo-conduit.c:1145
+#: ../calendar/conduits/todo/todo-conduit.c:1148
 msgid "Could not write pilot's ToDo application block"
 msgstr "པའི་ལོཊི་གི་ ཊུ་ཌུ འཇུག་སྤྱོད་སྡེབ་ཚན་ འབྲི་མ་ཚུགས�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2354
 msgid "Calendar and Tasks"
 msgstr "ཟླ་�ོ་དང་ ལས་ཀ་ཚུ�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1392
 msgid "Calendars"
 msgstr "ཟླ་�ོ་ཚུ�"
 
@@ -4419,28 +4380,31 @@ msgid "Memo_s"
 msgstr "བརྗེད་�ོ་ཚུ�(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:324
-#: ../calendar/gui/e-memos.c:1094
-#: ../calendar/gui/gnome-cal.c:1637
-#: ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:280
+#: ../calendar/gui/e-memos.c:1152
+#: ../calendar/gui/gnome-cal.c:1701
+#: ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101
+#: ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
 msgid "Memos"
 msgstr "བརྗེད་�ོ་ཚུ�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:527
-#: ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1509
-#: ../calendar/gui/print.c:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013
-#: ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/e-calendar-table.c:495
+#: ../calendar/gui/e-tasks.c:1442
+#: ../calendar/gui/gnome-cal.c:1573
+#: ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:539
+#: ../calendar/gui/tasks-component.c:1090
+#: ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ལས་ཀ་ཚུ�"
@@ -4458,26 +4422,26 @@ msgstr "ལས་ཀ་ཚུ� (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཟླ་�ོའི་འཇིགས་བརྡ་གི་ བརྡ་བས�ུལ་ཞབས་�ོག"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ས�ར་མ�"
 msgstr[1] "ས�ར་མ་ཚུ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../calendar/gui/dialogs/event-page.glade.h:19
 #: ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:396
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ཆུ་ཚོད་ཚུ�"
 msgstr[1] "ཆུ་ཚོད་ཚུ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
 msgid "Start time"
 msgstr "འགོ་བཙུགས་དུས་ཚོད�"
 
@@ -4488,10 +4452,10 @@ msgstr "ངོ་འཕྲད་ཚུ�"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1622
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1628
-#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:943
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/e-itip-control.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "གནས་�ོངས་:�"
 
@@ -4502,7 +4466,7 @@ msgstr "ཉིན་གཉིད་ཀྱི་དུས་ཚོད་: (_t)"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51
@@ -4511,11 +4475,12 @@ msgstr "ཉིན་གཉིད་ཀྱི་དུས་ཚོད་: (_t)"
 #: ../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:47
+#: ../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:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "ཞུན་དག (_E)"
 
@@ -4527,31 +4492,32 @@ msgstr "ཉིན་གཉིད་�ུག་ནི� (_S)"
 msgid "location of appointment"
 msgstr "ངོ་འཕྲད་ཀྱི་གནས་�ོངས�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 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:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
 msgstr "འགྲེལ་བཤད་མི་འ�ོབ་པས�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
 msgstr "གནས་�ོངས་ཀྱི་བརྡ་དོན་མི་འ�ོབ་པས�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
 #, c-format
 msgid "You have %d alarms"
 msgstr "འདི་ལུ་འཇིགས་བརྡ་%dའདུག"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1523
 msgid "Warning"
 msgstr "ཉེན་བརྡ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4563,7 +4529,7 @@ msgstr ""
 "ག�ང་ནིའི་དོན་ལུ་ རིམ་སྒྲིག་འབད་ནུག དེ་གི་ཚབ་ལུ་ ཨི་བོ་ལུ་ཤཱན་ \n"
 "དུས་རྒྱུན་གྱི་ ཌའི་ལོག་སྒྲོམ་ཅིག་ བཀྲམ་སྟོན་འབད་འོང་�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4578,7 +4544,7 @@ msgstr ""
 "\n"
 "�ྱོད་ཀྱིས་ ལས་རིམ་འདི་ གཡོག་བཀོལ་ནི་ ངེས་�ིག་ཨིན་ན�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1754
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "ང་ལུ་ ལས་རིམ་འདི་གི་ས�ོར་ལས་ ལོག་སྟེ་མ་འདྲི�"
 
@@ -4587,8 +4553,8 @@ msgid "Could not initialize Bonobo"
 msgstr "བོ་ནོ་བོ་ འགོ་འབྱེད་འབད་མ་ཚུགས"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "འཇིགས་བརྡའི་བརྡ་བས�ུལ་ཞབས་�ོག་གི་འཕྲུལ་�ང་ གསར་བས�ྲུན་འབད་མ་ཚུགས�"
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
+msgstr "འཇིགས་བརྡའི་བརྡ་བས�ུལ་ཞབས་�ོག་གི་འཕྲུལ་�ང་ གསར་བས�ྲུན་འབད་མ་ཚུགས� ཡང་ཅིན་ ཧེ་མ་ལས་རང་གཡོག་བཀོལ་དེ་ཡོདཔ་འོང་་་་་་་"
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4626,407 +4592,437 @@ msgid_plural "%d seconds"
 msgstr[0] "ས�ར་ཆ་%d"
 msgstr[1] "ས�ར་ཆ་%d"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "འཇིགས་བརྡའི་ལས་རིམ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "རྣམ་གྲངས་ཚུ་བ�ོན་བ�ང་བའི་ས�བས་ ངེས་ག�ན་སྦེ་དྲིས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "ད་རིས་ \"#rrggbb\" རྩ་སྒྲིག་་ནང་ དུས་ཚོད་རན་མི་ ལས་ཀའི་རྒྱབ་གཞིའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "\"#rrggbb\" རྩ་སྒྲིག་ནང་ ཧེ་མ་ལས་ དུས་ཚོད་རན་མི་ ལས་ཀའི་རྒྱབ་གཞིའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "འཇིགས་བརྡ་གཡོག་བཀོལ་ནིའི་དོན་ལུ་ ཟླ་�ོ་ཚུ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../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 "ཆུ་ཚོད་ཕྲ་རིང་ནང་ མར་ཀཱསི་བཱེནསི་ �ིག་འ�ེན་ནིའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ཉིན་མའི་མ�ོང་སྣང་ནང་ མར་ཀཱསི་བཱེནསི་ �ིག་འ�ེན་ནིའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "བདུན་མ�འ་ཚུ་ ཟླའི་མ�ོང་སྣང་ནང་ ཨེབ་བཙུགས་འབད�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "རྩ་མེད་ག�ང་ནི་ ངེས་ག�ན་སྦེ་དྲིས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ལཱ་གི་ཆུ་ཚོད་ཚུ་གི་ འགོ་བཙུགས་དང་ མཇུག་བསྡུ་བའི་བརྡ་ སྟོན་ནིའི་གཟའ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "སྔོན་སྒྲིག་ངོ་འཕྲད་ཀྱི་དྲན་བས�ུལ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "སྔོན་སྒྲིག་དྲན་བས�ུལ་ཆ་ཕྲན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "སྔོན་སྒྲིག་དྲན་བས�ུལ་གྱི་བེ་ལུ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "འཇིགས་བརྡ་རྣར་ཉན་ཡིག་སྣོད་ཚུ་ལག་ལེན་འ�བ་ནིའི་དོན་ལུ་ སྣོད་�ོ་"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "བྱུང་ལས་ཀྱི་སྟེགས་རིས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "འབྱུང་ལས་ཀྱི་དྭངས་གསལ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "སར་བར་ཡུ་ཨར་ཨེལ་ དལ�/�ོམ་མེད�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "ཊེམ་པེལེཊི་ ཡུ་ཨར་ཨེལ་ དལ�/�ོམ་མེད�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "ཟླ་�ོ་མ�ོང་བྱེད་ནང་ བྱུང་ལས་ཀྱི་སྟེགས་རིས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "མཇུག་བསྡུ་ཚར་མི་ལས་ཀ་ཚུ་ སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "ལས་ཀའི་ཆ་ཕྲན་ཚུ་སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "ལས་ཀའི་བེ་ལུ་ སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "�ད་སྙོམས་པེན་གྱི་གནས་ས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ཉིན་ལཱ་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ ཆུ་ཚོད་�ལ་གཅིག་བཞི་གི་རྩ་སྒྲིག་ནང་ ༠ ལས་ ༢༣ སྦེ་བཟོ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ཉིན་ལཱ་འགོ་བཙུགས་པའི་ཆུ་ཚོད་ ཆུ་ཚོད་�ལ་གཅིག་བཞི་གི་རྩ་སྒྲིག་ནང་ ༠ ལས་ ༢༣ སྦེ་བཟོ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "བར་མཚམས་ཚུ་ ཉིན་མའི་གྲངས་ནང་སྟོན་ཡོདཔ་དང་ ལཱ་གི་བདུན་ཕྲག་མ�ོང་སྣང་ནང་ ས�ར་མའི་གྲངས་ནང་སྟོན་ཡོད�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "འཇིགས་བརྡའི་ཆུ་ཚོད་མཇུག་མམ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "དལ�་/�ོམ་མེད་དཔེ་བས�ྲུན་གྱི་དོན་ལུ་ སར་བར་ཡུ་ཨར་ཨེལ་གྱི་�ོ་ཡིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "མར་ཀཱསི་བཱེནསི་�ིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "མར་ཀཱསི་བཱེནསི་ �ིག་གི་ཚོས་གཞི་ - ཉིན་མའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "མར་ཀཱསི་བཱེནསི་ �ིག་གི་ཚོས་གཞི་ - ཆུ་ཚོད་ཕྲ་རིང་�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ཉིན་ལཱ་མཇུག་བསྡུ་བའི་ས�ར་མ་ ༠ ལས་ ༥༩�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ཉིན་ལཱ་འགོ་བཙུགས་ཀྱི་ས�ར་མ་ ༠ ལས་ ༥༩�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "�ད་སྙོམས་པེན་གནས་སའི་ ཟླ་བའི་མ�ོང་སྣང་�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "ཀེར་ཕྲང་པེན་གནས་སའི་ ཟླ་བའི་མ�ོང་སྣང་�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "སྔོན་སྒྲིག་དྲན་བས�ུལ་ཅིག་ �ག་བཅད་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "ལས་ཀ་ཚུ་ ནམ་སྦ་བཞག་དགོཔ་ཨིན་ན་ བརྡ་སྟོན་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "ཧེ་མ་ལས་རན་པའི་ ལས་ཀའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../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 "ཟླ་བའི་མ�ོང་སྣང་ནང་མེན་པའི་ས�བས་ ཚེས་གྲངས་འགྲུལ་བས�ྱོད་པའི་ཟླ་�ོ་དང་ ལས་ཀའི་�ོ་ཡིག་གི་བར་ན་ �ད་སྙོམས་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../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 "ཟླ་བའི་མ�ོང་སྣང་ནང་ མ�ོང་སྣང་དང་ ཚེས་གྲངས་འགྲུལ་བས�ྱོད་པའི་ཟླ་�ོ་ དེ་ལས་ ལས་ཀའི་�ོ་ཡིག་གི་བར་ན་ �ད་སྙོམས་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../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 "ཟླ་�ོའི་�ོ་ཡིག་ཚུ་དང་ ཚེས་གྲངས་འགྲུལ་བས�ྱོད་ཟླ་�ོའི་བར་ནའི་  ཀེར་ཕྲང་པེན་གྱི་གནས་ས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../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 "ལས་ཀའི་�ོ་ཡིག་དང་ ལས་ཀའི་སྔོན་ལྟ་པེན་གྱི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../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 "ཟླ་བའི་མ�ོང་སྣང་ནང་ མ�ོང་སྣང་དང་ ཚེས་གྲངས་འགྲུལ་བས�ྱོད་པའི་ཟླ་�ོ་ དེ་ལས་ ལས་ཀའི་�ོ་ཡིག་གི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../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 "ཟླ་བའི་མ�ོང་སྣང་ནང་ མ�ོང་སྣང་དང་ ཚེས་གྲངས་འགྲུལ་བས�ྱོད་པའི་ཟླ་�ོ་ དེ་ལས་ ལས་ཀའི་�ོ་ཡིག་གི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "འཇིགས་བརྡ་གིས་ གཡོག་བཀོལ་ཆོག་པའི་ ལས་རིམ་ཚུ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "འཇིགས་བརྡ་རྣར་ཉན་གྱི་དོན་ལུ་ སྣོད་�ོ་སྲུང་བཞག་འབད་"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ངོས་ལེན་གྱི་ས་སྒོ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ལས་འགན་གྱི་ས་སྒོ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མ�ོང་སྣང་ཚུ་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཚུ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ལས་འགན་གྱི་ས་སྒོ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "བརྡ་བས�ུལ་ནང་ བཀྲམ་སྟོན་འཇིགས་བརྡ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ གནས་ཚད་ཀྱི་ས་སྒོ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Show the \"Preview\" pane"
 msgstr "\"Preview\" གི་པེན་དེ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Show the \"Preview\" pane."
 msgstr "\"Preview\" གི་པེན་དེ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ དབྱེ་བའི་ས་སྒོ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "ཚེས་གྲངས་འགྲུལ་བས�ྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་ཚུ་སྟོན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "ད་རིས་རན་པའི་ ལས་ཀའི་ཚོས་གཞི�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "ལས་ཀའི་ཀེར་ཕྲང་ པེན་གྱི་གནས་ས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../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 "དལ�་དང་�ོམ་མེད་ གནད་སྡུད་ཀྱི་ གློ་བུར་རྒྱབ་�ག་སྦེ་ ལག་ལེན་འ�བ་ནིའི་ ཡུ་ཨར་ཨེལ་ཊེམ་པེལེཊི� %uགི་ཚབ་ལུ་ ཡིག་འཕྲིན་�་བྱང་ ལག་ལེན་པའི་ཡན་ལག་བཙུགས་ནི་དང་ %dགི་ཚབ་ལུ་ ཌོ་མེན་བཙུགས་ནི་ཨིན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../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 "ཟླ་�ོའི་ནང་ ཨཱོལ་སེན་ ཆུ་ཚོད་གླིང་སྡེའི་ གནད་སྡུད་གཞི་རྟེན་གནས་�ོངས་ དཔེར་ན་ \"America/New York\" བཟུམ་སྦེ་ ས�ད་བསྒྱུར་མ་འབད་བར་ ཟླ་�ོའི་ནང་ ཚེས་གྲངས་དང་ ཆུ་ཚོད་ཀྱི་དོན་ལུ་ ལག་ལེན་འ�བ་ནིའི་ སྔོན་སྒྲིག་ཆུ་ཚོད་ཀྱི་གླིང་སྡེ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "ཆུ་ཚོད་བགོ་བཀྲམ� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "མ�འ་མཇུག་འཇིགས་བརྡ་བྱིན་པའི་ཆུ་ཚོད་ ཆུ་ཚོད་ཊི་ནང་� (_t)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 #: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "ཆུ་ཚོད་གླིང་སྡེ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../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 "ཟླ་�ོའི་མ�ོང་སྣང་ཚུ་ནང་ འབྱུང་ལས་ཚུ་གི་དྭངས་གསལ� ༠(དྭངས་གསལ་ཅན) དང་ ༡(དྭངས་སྒྲིབ་ཅན)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "ཆུ་ཚོད་�ལ་གཅིག་བཞི་གི་ དུས་ཚོད་རྩ་་སྒྲིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "སྔོན་སྒྲིག་དྲན་བས�ུལ་པ་ཅིག་གི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་ \"minutes\", \"hours\" ཡང་ན་ \"days\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ལས་ཀ་སྦ་བཞག་ནིའི་ བརྡ་སྟོན་གྱི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་  \"minutes\", \"hours\" ཡང་ན་ \"days\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "བདུན་ཕྲག་འགོ་བཙུགས�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "བདུན་ཕྲག་འགོ་བཙུགས་ཀྱི་ཉིནམ་ གཟའ་ཟླ�་(༠)ལས་ གཟའ་ཉིམ་(༦)�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "འཇིགས་བས�ུལ་བཀྲམ་སྟོན་གྱི་དོན་ལུ་ བརྡ་བས�ུལ་སྣོད་ ལག་ལེན་འ�བ་ནི་ཨིན་ན་མེན� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ངོ་འཕྲད་དམ་ ལས་ཀ་ཅིག་ བ�ོན་བ�ང་བའི་ས�བས་ ངེས་ག�ན་སྦེ་ འདྲི་དགོཔ་ཨིན་ན� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ངོ་འཕྲད་དམ་ ལས་ཀ་ཚུ་ རྩ་མེད་བ�ང་བའི་ས�བས་ ངེས་ག�ན་སྦེ་ འདྲི་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../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 "གཟའ་ཉིམ་དང་ཟླ�་གཉིས་ བདུན་ཕྲག་གི་ ཉིནམ་གཅིག་གི་ ས་སྟོང་ནང་བཙུགས་ནིའི་དོན་ལུ་ བདུན་མ�འ་ཚུ་ ཟླ་བའི་མ�ོང་སྣང་ནང་ ཨེབ་བཙུགས་འབད་དགོཔ་ཨིན་ན� "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../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 "བྱུང་ལས་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་དེ་ བདུན་ཕྲག་དང་ ཟླ་བའི་མ�ོང་སྣང་ཚུ་ནང་ བཀྲམ་སྟོན་འབད་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../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 "ཟླ་�ོའི་ནང་ མར་ཀཱསི་བཱེནསི་�ིག་(ད་ལྟོའི་ཆུ་ཚོད་ཀྱི་�ིག་) འ�ེན་ནི་ཨིན་ཨིན་མེན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་ ལས་ཀའི་མ�ོང་སྣང་ནང་ སྦ་བཞག་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "ངོ་འཕྲད་ཚུ་གི་དོན་ལས་ སྔོན་སྒྲིག་བརྡ་བས�ུལ་པ་ཅིག་ གཞི་སྒྲིག་འབད་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ངོས་ལེན་སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ དབྱེ་�ག་ཚུ་སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ལས་འགན་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ གནས་ཚད་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "སྔ་ཆ་/ཕྱི་ཆའི་ཚབ་ལུ་ དུས་ཚོད་ཚུ་ ཆུ་ཚོད་�ལ་གཅིག་བཞི་གི་ རྩ་སྒྲིག་ནང་ སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "འབྱུང་ལས་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ཆུ་ཚོད་གླིང་སྡེ་སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ དབྱེ་བའི་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ཚེས་གྲངས་འགྲུལ་བས�ྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་གྲངས་ཚུ་ སྟོན་དགོཔ་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "བྱུང་ལས་ཚུ་བཀྲམ་སྟོན་འབད་བའི་ས�བས་ ཉིན་མདངས་སྲུང་བཞག་དུས་ཚོད་ ལག་ལེན་འ�བ་ནི་ཨིན་ན�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "ལཱ་གི་ཉིནམ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "ལཱ་གི་ཉིནམ་ མཇུག་བསྡུ་བའི་ཆུ་ཚོད�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "ལཱ་གི་ཉིནམ་ མཇུག་བསྡུ་བའི་ས�ར་མ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱི་ཆུ་ཚོད�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱི་ས�ར་མ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "ཉིན་མདངས་སྲུང་བཞག་དུས་ཚོད�"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "བཅུད་དོན་ནང་ཡོདཔ�"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "འགྲེལ་བཤད་ནང་ཡོདཔ�"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Category is"
 msgstr "དབྱེ་རིམ་ཨིན་�"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "བསམ་བཀོད་ནང་ཡོདཔ�"
 
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Location contains"
 msgstr "གནས་�ོངས་ནང་ཡོདཔ�"
 
-#: ../calendar/gui/cal-search-bar.c:432
+#: ../calendar/gui/cal-search-bar.c:623
+#: ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "མ�ུན་མིན�"
 
-#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 Days' Tasks"
+msgstr "ཤུལ་མའི་ཉིནམ་བདུན་གྱི་ལས་ཀ་ "
+
+#: ../calendar/gui/cal-search-bar.c:635
+msgid "Active Tasks"
+msgstr "ལས་ཀ་ཤུགས་ལྡན་ཚུ་ "
+
+#: ../calendar/gui/cal-search-bar.c:639
+msgid "Overdue Tasks"
+msgstr "ལས་ཀ་རན་པ་ཚུ་ "
+
+#: ../calendar/gui/cal-search-bar.c:643
+msgid "Completed Tasks"
+msgstr "མཇུག་བསྡུ་ཡོད་པའི་ལས་ཀ་ཚུ་ "
+
+#: ../calendar/gui/cal-search-bar.c:647
+msgid "Tasks with Attachments"
+msgstr "མཉམ་སྦྲགས་དང་བཅས་པའི་ལས་ཀ་ཚུ་ "
+
+#: ../calendar/gui/cal-search-bar.c:693
+msgid "Active Appointments"
+msgstr "ངོ་འཕྲད་ ཤུགས་ལྡན་ཚུ་ "
+
+#: ../calendar/gui/cal-search-bar.c:697
+msgid "Next 7 Days' Appointments"
+msgstr "ཤུལ་མའི་ཉིནམ་བདུན་གྱི་ ངོ་འཕྲད་ཚུ་ "
+
+#: ../calendar/gui/calendar-commands.c:99
 #: ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75
@@ -5035,20 +5031,20 @@ msgstr "མ�ུན་མིན�"
 msgid "Print"
 msgstr "དཔར་བས�ྲུན�"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr "བཀོལ་སྤྱོད་འདི་གིས་ སེལ་འ�ུ་འབད་བའི་ དུས་ཚོད་ལས་རྒས་པའི་ བྱུང་ལས་ཚུ་ཆ་མཉམ་ རྟག་བརྟན་སྦེ་ ཀྲེག་བ�ང་འོང་� �ྱོད་ཀྱིས་འཕྲོ་མ�ུད་དེ་རང་འབད་བ་ཅིན་ བྱུང་ལས་དེ་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས�"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "དེ་ལས་རྒས་པའི་ བྱུང་ལས་ཚུ་ ཕྱིར་བས�ྲད་ག�ང་�"
 
-#: ../calendar/gui/calendar-commands.c:359
+#: ../calendar/gui/calendar-commands.c:335
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:397
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "གཟའ�"
@@ -5057,92 +5053,110 @@ msgstr "གཟའ�"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222
-#: ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599
-#: ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235
+#: ../calendar/gui/migration.c:512
+#: ../calendar/gui/migration.c:610
+#: ../calendar/gui/migration.c:1123
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "�ེབ་གུ�"
 
-#: ../calendar/gui/calendar-component.c:278
-#: ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:296
+#: ../calendar/gui/migration.c:406
 msgid "Birthdays & Anniversaries"
 msgstr "ས�ྱེས་ཚེས་དང་ ལོ་བསྟར་དུས་དྲན་ཚུ�"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "གནམ་གཤིས�"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:605
 msgid "_New Calendar"
 msgstr "ཟླ་�ོ་གསརཔ�(_N)"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2090
+msgid "_Copy..."
+msgstr "འདྲ་བཤུས་...(_C)"
+
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/memos-component.c:471
+#: ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3631
+#: ../mail/em-folder-tree.c:2104
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "རྒྱུ་དངོས་ཚུ�(_P)"
+
+#: ../calendar/gui/calendar-component.c:939
 msgid "Failed upgrading calendars."
 msgstr "ཟླ་�ོ་ཚུ་ དུས་མ�ུན་བཟོ་མ་ཚུགས�"
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1238
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བས�ྲུན་དོན་ལུ་ ཟླ་�ོ་'%s' �་ཕྱེ་མ་ཚུགས�"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1254
 msgid "There is no calendar available for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བས�ྲུན་དོན་ལུ་ ཟླ་�ོ་འ�ོབ་མི་ཚུགས་པས�"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1367
 msgid "Calendar Source Selector"
 msgstr "ཟླ་�ོའི་འབྱུང་�ུངས་སེལ་བྱེད�"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1585
 msgid "New appointment"
 msgstr "ངོ་འཕྲད་གསརཔ�"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1586
 msgid "_Appointment"
 msgstr "ངོ་འཕྲད� (_A)"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1587
 msgid "Create a new appointment"
 msgstr "ངོ་འཕྲད་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1593
 msgid "New meeting"
 msgstr "འཛོམས་འདུ་གསརཔ�"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1594
 msgid "M_eeting"
 msgstr "འཛོམས་འདུ་� (_e)"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1595
 msgid "Create a new meeting request"
 msgstr "འཛོམས་འདུ་གསར་པའི་ཞུ་བ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1601
 msgid "New all day appointment"
 msgstr "ཉིནམ་གང་གི་ངོ་འཕྲད་ གསརཔ་བཟོ�"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1602
 msgid "All Day A_ppointment"
 msgstr "ཉིནམ་གང་གི་ངོ་འཕྲད� (_p)"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1603
 msgid "Create a new all-day appointment"
 msgstr "ཉིནམ་གང་གི་ ངོ་འཕྲད་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1609
 msgid "New calendar"
 msgstr "ཟླ་�ོ་གསརཔ�"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1610
 msgid "Cale_ndar"
 msgstr "ཟླ་�ོ� (_n)"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1611
 msgid "Create a new calendar"
 msgstr "ཟླ་�ོ་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
@@ -5162,24 +5176,36 @@ msgstr "བདུན་ཕྲག་མ�ོང་སྣང་�"
 msgid "Month View"
 msgstr "ཟླ་བའི་མ�ོང་སྣང་�"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+msgid "Description Contains"
+msgstr "འགྲེལ་བཤད་ནང་ཡོདཔ་ "
+
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Summary Contains"
+msgstr "བཅུད་དོན་ནང་ཡོདཔ་ "
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "ཟླ་�ོ་�་ཕྱེ་བའི་ས�བས་ལུ་འཛོལ་བ�"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "ཟླ་�ོ་�་ཕྱེ་བའི་ས�བས་ལུ་ �བས་ཤེས་ལུ་ རྒྱབ་ས�ྱོར་མིན་འདུག"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "ཟླ་�ོ་�་ཕྱེ་ནིའི་ གནང་བ་བྱིན་མ་བ�ུབ�"
 
-#: ../calendar/gui/comp-editor-factory.c:439
-#: ../shell/e-shell.c:1274
+#: ../calendar/gui/comp-editor-factory.c:429
+#: ../shell/e-shell.c:1290
 msgid "Unknown error"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
 msgstr "འཇིགས་བརྡ་ཞུན་དག་ར�ྱབས�"
 
@@ -5290,7 +5316,7 @@ msgstr "ས�ར་མ་(ཚུ)�"
 msgid "start of appointment"
 msgstr "ངོ་འཕྲད་ཀྱི་འགོ་བཙུགས�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr "བྱ་བ་/འབྱུང་སག་ས�"
 
@@ -5305,19 +5331,16 @@ msgstr "�་ས�ོང་ར�ྱབས� (_d)"
 msgid "Alarms"
 msgstr "འཇིགས་བརྡ་ཚུ�"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
 msgid "_Suggest automatic display of attachment"
 msgstr "མཉམ་སྦྲགས་རང་བཞིན་བཀྲམ་སྟོན་གྱི་ བསམ་འཆར་བཀོད�(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
 msgid "Attach file(s)"
 msgstr "ཡིག་སྣོད་(ཚུ)མཉམ་སྦྲགས་འབད�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
 msgstr "འཇིགས་བརྡའི་དོན་ལུ་ སེལ་འ�ུ་འབད་མི་ཟླ་�ོ་ཚུ�"
 
@@ -5341,7 +5364,7 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
 msgstr "<i>%u དང་%d གི་ཚབ་ལུ་ གློག་འཕྲིན་�་བྱང་ནང་ལས་ ལག་ལེན་པ་དང་ ཌོ་མེན་བཙུགས་ནི་ཨིན�</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\"> དྲན་བརྡ་</span>"
 
@@ -5350,7 +5373,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">སྔོན་སྒྲིག་སར་བར་དལ�་/�ོམ་མེད་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ཡོངས་�ྱབ་</span>"
@@ -5380,8 +5403,8 @@ msgid "Display"
 msgstr "བཀྲམ་སྟོན�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "སྤེན་པ�"
 
@@ -5396,8 +5419,8 @@ msgstr ""
 "ཉིནམ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "མིག་དམར�"
 
@@ -5418,8 +5441,7 @@ msgstr ""
 "སྤེན་པ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Pick a color"
 msgstr "ཚོས་གཞི་ཅིག་འ�ུ�"
 
@@ -5429,8 +5451,8 @@ msgid "S_un"
 msgstr "ཟླ་བ� (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "ཉི་མ�"
 
@@ -5447,8 +5469,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "ཚེས་གྲངས་འགྲུལ་བས�ྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་གྲངས་སྟོན�(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "ཟླ་བ�"
 
@@ -5466,8 +5488,8 @@ msgid "Template:"
 msgstr "ཊེམ་པེལེཊི�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "པ་སངས�"
 
@@ -5481,14 +5503,14 @@ msgid "Time format:"
 msgstr "ཆུ་ཚོད་ཀྱི་རྩ་སྒྲིག:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "ལྷག"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "ཕུར་བུ�"
 
@@ -5566,82 +5588,46 @@ msgstr "ཕུར� (_W)"
 msgid "before every appointment"
 msgstr "ངོ་འཕྲད་ཡོད་ཚད་གཅིག་གི་ཧེ་མར�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:268
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ཟླ་�ོའི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་འདྲ་བཤུས་ར�ྱབས�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ལས་ཀའི་�ོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་ར�ྱབས�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ བརྗེད་�ོའི་�ོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་ར�ྱབས�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:342
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "C_olor:"
 msgstr "ཚོས་གཞི: (_o)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "ལས་ཀའི་�ོ་ཡིག�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "བརྗེད་�ོའི་་�ོ་ཡིག�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:478
 msgid "Calendar Properties"
 msgstr "ཟླ་�ོའི་རྒྱུ་དངོས�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:480
 msgid "New Calendar"
 msgstr "ཟླ་�ོ་གསརཔ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:536
 msgid "Task List Properties"
 msgstr "ལས་ཀའི་�ོ་ཡིག་གི་རྒྱུ་དངོས�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:630
+#: ../calendar/gui/dialogs/calendar-setup.c:592
 msgid "New Memo List"
 msgstr "བརྗེད་�ོའི་�ོ་ཡིག་གསརཔ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "ཟླ་�ོ་�་ས�ོང་ར�ྱབས�"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "ལས་ཀའི་�ོ་ཡིག་�་ས�ོང་ར�ྱབས�"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "ཟླ་�ོ་�་ས�ོང་ར�ྱབས� (_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "ལས་ཀའི་�ོ་ཡིག་�་ས�ོང་ར�ྱབས� (_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "ཡང་སེལ་འ�ུ་འབད: (_R)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "ཡུ་ཨར་ཨེལ: (_U)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21
-#: ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "བདུན་ཕྲག་ཚུ�"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "བྱུང་ལས་འདི་ བ�ོན་བ�ང་ད་ནུག"
@@ -5651,8 +5637,8 @@ msgid "This task has been deleted."
 msgstr "ལས་ཀ་འདི་ བ�ོན་བ�ང་ད་ནུག"
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "གསར་དེབ་ཀྱི་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་ད་ནུག"
+msgid "This memo has been deleted."
+msgstr "བྱུང་ལས་འདི་ བ�ོན་བ�ང་ད་ནུག� "
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5673,8 +5659,8 @@ msgid "This task has been changed."
 msgstr "ལས་ཀ་འདི་ བསྒྱུར་བཅོས་འབད་ནུག"
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "གསར་དེབ་�ོ་བཀོད་འདི་ བསྒྱུར་བཅོས་འབད་ནུག"
+msgid "This memo has been changed."
+msgstr "བྱུང་ལས་འདི་ བསྒྱུར་བཅོས་འབད་ནུག� "
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5692,173 +5678,163 @@ msgid "Validation error: %s"
 msgstr "ནུས་ལྡན་བཟོ་ནི་ལུ་འཛོལ་བ�: %s "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2340
 msgid " to "
 msgstr "ལུ་�"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2396
+#: ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr "(མཇུག་བསྡུ་ཡོདཔ�"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2398
+#: ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "མཇུག་བསྡུ་ཡོདཔ�"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2403
+#: ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr "(རན་པ�"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2405
+#: ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "རན་པ�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:209
-#: ../composer/e-msg-composer.c:2914
+#: ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "མཉམ་སྦྲགས་འཕྲིན་དོན་-- %s�"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393
-#: ../composer/e-msg-composer.c:2919
-#: ../composer/e-msg-composer.c:3114
+#: ../calendar/gui/dialogs/comp-editor.c:387
+#: ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3037
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "མཉམ་སྦྲགས་འཕྲིན་དོན�"
 msgstr[1] "མཉམ་སྦྲགས་འཕྲིན་དོན་%d�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464
-#: ../composer/e-msg-composer.c:3178
-#: ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1031
-#: ../mail/message-list.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:458
+#: ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:997
+#: ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1195
+#: ../mail/message-list.c:2066
 msgid "_Move"
 msgstr "སྤོ་བཤུད་འབད� (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466
-#: ../composer/e-msg-composer.c:3180
-#: ../mail/em-folder-tree.c:1007
-#: ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:460
+#: ../composer/e-msg-composer.c:3103
+#: ../mail/em-folder-tree.c:999
+#: ../mail/message-list.c:2068
 msgid "Cancel _Drag"
 msgstr "འདྲུད་ནི་ཆ་མེད་ག�ང་� (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:663
+#: ../calendar/gui/dialogs/comp-editor.c:2821
+#: ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "མཉམ་སྦྲགས�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "Could not update object"
 msgstr "དངོས་པོ་དུས་མ�ུན་བཟོ་མ་ཚུགས�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
-#: ../composer/e-msg-composer.c:2530
+#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../composer/e-msg-composer.c:2487
 #, 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:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1007
 msgid "Hide Attachment _Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
-#: ../calendar/gui/dialogs/comp-editor.c:1532
+#: ../calendar/gui/dialogs/comp-editor.c:1010
+#: ../calendar/gui/dialogs/comp-editor.c:1558
 msgid "Show Attachment _Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན�(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../calendar/gui/dialogs/event-page.c:1898
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3685
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266
+#: ../composer/e-msg-composer.c:3630
 #: ../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 "རྩ་བས�ྲད་ག�ང་� (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3686
-#: ../mail/em-folder-tree.c:2107
-#: ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "_Properties"
-msgstr "རྒྱུ་དངོས་ཚུ�(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3688
+#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../composer/e-msg-composer.c:3633
 msgid "_Add attachment..."
 msgstr "མཉམ་སྦྲགས་�་ས�ོང་ར�ྱབས་...(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1556
-#: ../mail/em-format-html-display.c:2314
+#: ../calendar/gui/dialogs/comp-editor.c:1582
+#: ../mail/em-format-html-display.c:2415
 msgid "Show Attachments"
 msgstr "མཉམ་སྦྲགས་ཚུ་སྟོན�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1583
 msgid "Press space key to toggle attachment bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་ སོར་སྟོན་འབད་ནིའི་དོན་ལུ་ བར་སྟོང་ལྡེ་མིག་ཨེབ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2164
-#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2189
+#: ../calendar/gui/dialogs/comp-editor.c:2232
 msgid "Edit Appointment"
 msgstr "ངོ་འཕྲད་ཞུན་དག་ར�ྱབས�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
 #, c-format
 msgid "Meeting - %s"
 msgstr "འཛོམས་འདུ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2172
-#: ../calendar/gui/dialogs/comp-editor.c:2215
+#: ../calendar/gui/dialogs/comp-editor.c:2197
+#: ../calendar/gui/dialogs/comp-editor.c:2240
 #, c-format
 msgid "Appointment - %s"
 msgstr "ངོ་འཕྲད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "འགན་སྤྲོད་ལས་ཀ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2178
-#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 #, c-format
 msgid "Task - %s"
 msgstr "ལས་ཀ་- %s\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2181
-#: ../calendar/gui/dialogs/comp-editor.c:2224
+#: ../calendar/gui/dialogs/comp-editor.c:2206
+#: ../calendar/gui/dialogs/comp-editor.c:2249
 #, c-format
-msgid "Journal entry - %s"
-msgstr "གསར་དེབ་�ོ་བཀོད་- %s"
+msgid "Memo - %s"
+msgstr "བརྗེད་�ོ- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2192
-#: ../calendar/gui/dialogs/comp-editor.c:2234
+#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2259
 msgid "No summary"
 msgstr "བཅུད་དོན་མིན་འདུག"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2780
-#: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:350
-msgid "attachment"
-msgstr "མཉམ་སྦྲགས�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2869
-#: ../calendar/gui/dialogs/comp-editor.c:2923
-#: ../calendar/gui/dialogs/comp-editor.c:2947
+#: ../calendar/gui/dialogs/comp-editor.c:2910
+#: ../calendar/gui/dialogs/comp-editor.c:2964
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "དུས་མ�ུན་ཅིག་བྱུང་པ་ཅིན་ རྣམ་གྲངས་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བ�ོན་བཀོག་འོང་�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2976
+#: ../calendar/gui/dialogs/comp-editor.c:3017
 msgid "Unable to use current version!"
 msgstr "ད་ལྟོའི་�ོན་རིམ་དེ་ ལག་ལེན་འ�བ་མི་ཚུགས་པས�"
 
@@ -5887,8 +5863,8 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "ཀོར་བའི་འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ ལས་ཀ་ལས་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "ཀོར་བའི་འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
+msgid "The memo could not be deleted due to a corba error"
+msgstr "ར་བའི་འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ རྣམ་གྲངས་འདི་ བ�ོན་བ�ང་མ་ཚུགས་ "
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -5903,8 +5879,8 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "གནང་བ་བྱིན་མ་བ�ུབ་ལས་ ལས་ཀ་འདི་ བ�ོན་བ�ང་མ་ཚུགས��"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "གནང་བ་བྱིན་མ་བ�ུབ་ལས་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
+msgid "The memo could not be deleted because permission was denied"
+msgstr "གནང་བ་བྱིན་མ་བ�ུབ་ལས་ རྣམ་གྲངས་འདི་ བ�ོན་བ�ང་མ་ཚུགས་"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -5919,8 +5895,8 @@ msgid "The task could not be deleted due to an error"
 msgstr "འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ ལས་ཀ་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
+msgid "The memo could not be deleted due to an error"
+msgstr "འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ རྣམ་གྲངས་འདི་ བ�ོན་བ�ང་མ་ཚུགས་"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
@@ -5948,123 +5924,130 @@ msgstr "ངོ་འཕྲད�(_m)"
 msgid "Recurrence"
 msgstr "སླར་འབྱུང་�"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
 msgstr "འབྱུང་ལས་འདི་ལུ་འཇིགས་བརྡ་འདུག"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "འགོ་འདྲེན་པ་: (_g)"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "_Delegatees"
 msgstr "བགོ་སྤེལ་བྱ་ཡུལ�(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:946
 msgid "Atte_ndees"
 msgstr "ངོ་འཛོམས་པ་ཚུ�(_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1128
 msgid "Event with no start date"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས་མེད་པའི་བྱུང་ལས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1131
 msgid "Event with no end date"
 msgstr "མཇུག་བསྡུ་བའི་ཚེས་གྲངས་མེད་པའི་བྱུང་ལས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "Start date is wrong"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས་ཕྱི་འགྱུར་ཨིན་པས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1313
 msgid "End date is wrong"
 msgstr "མཇུག་བསྡུ་བའི་ཚེས་གྲངས་ཕྱི་འགྱུར་ཨིན་པས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1336
 msgid "Start time is wrong"
 msgstr "འགོ་བཙུགས་ཆུ་ཚོད་ཕྱི་འགྱུར་ཨིན་པས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End time is wrong"
 msgstr "མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཕྱི་འགྱུར་ཨིན་པས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1456
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
 msgid "The organizer selected no longer has an account."
 msgstr "སེལ་འ�ུ་འབད་མི་ འགོ་འདྲེན་པ་དེ་ལུ་ རྩིས་�ོ་མིན་འདུག"
 
-#: ../calendar/gui/dialogs/event-page.c:1462
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
 msgid "An organizer is required."
 msgstr "འགོ་འདྲེན་པ་ཅིག་དགོ་པས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1477
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
 msgid "At least one attendee is required."
 msgstr "ཉུང་མ�འ་ལུ་ ངོ་འཛོམས་པ་ཅིག་དགོ་པས�"
 
-#: ../calendar/gui/dialogs/event-page.c:1899
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
 msgid "_Add "
 msgstr "�་ས�ོང་ར�ྱབས� (_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ཟླ་�ོ་'%s'�་ཕྱེ་མ་ཚུགས�"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "�ྱོད་ཀྱིས་ %s གི་ཚབ་སྦེ་ ལཱ་འབད་དོ་ "
+
+#: ../calendar/gui/dialogs/event-page.c:3053
 #, 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:2936
+#: ../calendar/gui/dialogs/event-page.c:3059
 #, 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:2942
+#: ../calendar/gui/dialogs/event-page.c:3065
 #, 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:2955
+#: ../calendar/gui/dialogs/event-page.c:3078
 msgid "Customize"
 msgstr "སྲོལ་སྒྲིག་འབད�"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2960
+#: ../calendar/gui/dialogs/event-page.c:3083
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../composer/e-msg-composer.c:2314
-#: ../filter/filter-rule.c:890
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../filter/filter-rule.c:892
 #: ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../mail/em-account-editor.c:1425
+#: ../mail/em-account-prefs.c:445
+#: ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:205
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:247
-#: ../widgets/misc/e-dateedit.c:1503
-#: ../widgets/misc/e-dateedit.c:1717
+#: ../plugins/itip-formatter/itip-formatter.c:2017
+#: ../widgets/misc/e-cell-date-edit.c:249
+#: ../widgets/misc/e-dateedit.c:1533
+#: ../widgets/misc/e-dateedit.c:1747
+#: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "ཅི་མེད�"
 
@@ -6084,17 +6067,11 @@ msgstr "ངོ་འཕྲད་ཀྱི་ སà¾�ར་མ་ ༡༥གི་à
 msgid "Attendee_s..."
 msgstr "ངོ་འཛོམས་པ་ཚུ་...(_s)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "དབྱེ་རིམ་ཚུ་...(_t)"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "སྲོལ་སྒྲིག་འཇིགས་བརྡ་:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "འགྲེལ་བཤད་: (_D)"
 
@@ -6130,57 +6107,6 @@ msgstr "དོན་ལུ�"
 msgid "until"
 msgstr "ཚུན་ཚོད�"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "ངོ་འཛོམས་འབད་མི�"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "ངོ་འཛོམས་པ་ཅིག་ �་ས�ོང་བར�ྱབ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་ག�ང་འབད�"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "མ�ུན་མོང་གི་མིང་�"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "ག་�ེ་ལས་ བགོ་སྤེལ་འབད་ཡོདཔ�"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "ག་�ེ་ལུ་ བགོ་སྤེལ་འབད་ཡོདཔ�"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "ས�ད་ཡིག"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "འ�ུས་མི�"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "ལན་གསལ་གནང་ས�"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c: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 "གནས་ཚད�"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>ངོ་འཛོམས་པ་ཚུ་</b> (_e)"
@@ -6203,21 +6129,23 @@ msgid "Organizer:"
 msgstr "འགོ་འདྲེན་པ་:"
 
 #: ../calendar/gui/dialogs/memo-editor.c:219
-#: ../calendar/gui/print.c:2452
+#: ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "བརྗེད་�ོ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:952
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'ནང་ལུ་ བརྗེད་�ོ་ཚུ་�་ཕྱེ་མ་ཚུགས�"
 
-#: ../calendar/gui/dialogs/memo-page.c:1019
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1136
+#: ../mail/em-format-html.c:1553
+#: ../mail/em-format-html.c:1611
+#: ../mail/em-format-html.c:1637
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:92
+#: ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "ལུ�"
 
@@ -6235,90 +6163,58 @@ msgid "_Description:"
 msgstr "འགྲེལ་བཤད: (_D)"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "སྡེ་ཚན: (_G)"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>ཟླ་�ོའི་གདམ་�་ཚུ་</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "ཟླ་�ོ་གསརཔ་�་ས�ོང་ར�ྱབས�"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "ཟླ་�ོའི་སྡེ་ཚན�"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "ཟླ་�ོའི་གནས་�ོངས�"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "ཟླ་�ོའི་མིང་�"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>ལས་ཀའི་�ོ་ཡིག་གདམ་�་</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "ལས་ཀའི་�ོ་ཡིག་གསརཔ་ �་ས�ོང་ར�ྱབས�"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "ལས་ཀའི་�ོ་ཡིག་སྡེ་ཚན�"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "ལས་ཀའི་�ོ་ཡིག་མིང་�"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "�ྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "�ྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ བགོ་སྤེལ་འབད་དོ་ ག་ཅི་བགོ་སྤེལ་འབད་ནི་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "�ྱོད་ཀྱིས་སླར་འབྱུང་ལས་ཀ་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "�ྱོད་ཀྱིས་སླར་འབྱུང་གསར་དེབ་�ོ་བཀོད་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "�ྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ ལེགས་བཅོས་འབད་དོ�  ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "དུས་ས�བས་འདི་ལུ་ར�ྱངམ་གཅིག"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "དུས་ས�བས་འདི་དང་ཧེ་མམ་ཚུ�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "དུས་ས�བས་འདི་དང་ ཤུལ་མམ་ཚུ�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "དུས་ས�བས་ཆ་མཉམ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ངོ་འཕྲད་འདི་ནང་ ཨི་བོ་ལུ་ཤཱན་ ཞུན་དག་བར�ྱབ་མི་ཚུགས་པའི་ སླར་འབྱུང་ཚུ་འདུག"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
 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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
 msgid "on"
 msgstr "ལུ� "
 
@@ -6326,7 +6222,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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "first"
 msgstr "དང་པ�"
 
@@ -6335,7 +6231,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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "second"
 msgstr "གཉིས་པ�"
 
@@ -6343,7 +6239,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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "third"
 msgstr "གསུམ་པ�"
 
@@ -6351,7 +6247,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "བཞི་པ�"
 
@@ -6359,13 +6255,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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "Other Date"
 msgstr "ཚེས་གྲངས་གཞན�"
 
@@ -6373,7 +6269,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "1st to 10th"
 msgstr "དང་པ་ལས་ ༡༠ པ་ཚུན�"
 
@@ -6381,7 +6277,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] [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:1064
 msgid "11th to 20th"
 msgstr "༡༡ པ་ལས་ ༢༠ པ་ཚུན�"
 
@@ -6389,45 +6285,45 @@ 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] [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:1070
 msgid "21st to 31st"
 msgstr "༢༡ པ་ལས་ ༣༡ པ་ཚུན�"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 msgid "day"
 msgstr "གཟའ�"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
 msgid "on the"
 msgstr "ལུ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
 msgstr "འབྱུང་བ་�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Add exception"
 msgstr "དམིགས་བསལ་�་ས�ོང་ར�ྱབས་"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
 msgstr "ལེགས་བཅོས་འབད་ནིའི་དོན་ལས་ སེལ་འ�ུ་འ�ོབ་མི་ཚུགས�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
 msgid "Modify exception"
 msgstr "དམིགས་བསལ་ལེགས་བཅོས་འབད�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to delete."
 msgstr "བ�ོན་ག�ང་ནིའི་དོན་ལུ་ སེལ་འ�ུ་འ�ོབ་མ་ཚུགས�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
 msgstr "ཚེས་གྲངས/ཆུ་ཚོད�"
 
@@ -6436,7 +6332,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>གྲངས་སུ་མེདཔ་</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>སྔོན་ལྟ་</b>"
 
@@ -6498,56 +6394,59 @@ msgstr "<span weight=\"bold\">གནས་ཚད་</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:463
-#: ../calendar/gui/e-itip-control.c:923
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2513
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-itip-control.c:948
+#: ../calendar/gui/e-meeting-store.c:184
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2520
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "མཇུག་བསྡུ་ཡོདཔ�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:360
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "མ�ོ�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:230
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:462
-#: ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
+#: ../calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "ཡར་འཕེལ་འགྱོ་བའི་བསྒང་�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-calendar-table.c:390
-#: ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:362
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "དམའ�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model.c:924
-#: ../calendar/gui/e-calendar-table.c:389
-#: ../mail/message-list.c:1033
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:966
+#: ../calendar/gui/e-calendar-table.c:361
+#: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "སྤྱིར་བ�ང་�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:230
+#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/print.c:2514
 msgid "Not Started"
 msgstr "འགོ་མ་བཙུགསཔ�"
 
@@ -6560,7 +6459,7 @@ msgid "Stat_us:"
 msgstr "གནས་ཚད་:(_u)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:363
 msgid "Undefined"
 msgstr "ངེས་འཛིན་མ་འབད��"
 
@@ -6577,20 +6476,25 @@ msgstr "གཙོ་རིམ: (_P)"
 msgid "_Web Page:"
 msgstr "�ེབ་ཤོག་ལེབ: (_W)"
 
-#: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1325
 msgid "_Task"
 msgstr "ལས་ཀ� (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:428
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "ལས་ཀའི་རྒྱས་བཤད�"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "འགོ་འདྲེན་པ་:(_Z)"
+
+#: ../calendar/gui/dialogs/task-page.c:866
 msgid "Due date is wrong"
 msgstr "རན་པའི་ཚེས་གྲངས་ ཕྱི་འགྱུར་ཨིན་པས�"
 
-#: ../calendar/gui/dialogs/task-page.c:1648
+#: ../calendar/gui/dialogs/task-page.c:1885
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'ནང་ལུ་ ལས་ཀ་ཚུ་ �་ཕྱེ་མ་ཚུགས�"
@@ -6603,9 +6507,9 @@ msgstr "ངོ་འཛོམས་པ་ཚུ་...(_n)"
 msgid "Categor_ies..."
 msgstr "དབྱེ་རིམ་ཚུ�...(_i)"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "འགོ་འདྲེན་པ་: (_g)"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr "འགྲེལ་བཤད:(_S)"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
@@ -6615,49 +6519,6 @@ msgstr "ཆུ་ཚོད་གླིང་སྡེ་: "
 msgid "_Due date:"
 msgstr "རན་པའི་ཚེས་གྲངས: (_D)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>ཟླ་�ོ་ཚུ་ དལ�་/�ོམ་མེད་</b>(_a)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>དཔེ་བས�ྲུན་གྱི་འབྱུང་�ེངས་</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>དཔེ་བས�ྲུན་གྱི་གནས་�ོངས་</b> (_L)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "<b>དཔེ་བས�ྲུན་སྒྲིག་སྟངས་ དལ�་/�ོམ་མེད་</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "ཉིན་བསྟར� (_D)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "ལག་�ོག (_M)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "ཆོག་ཡིག: (_P)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "ཆོག་ཡིག་སེམས་�ར་བཞག (_R)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "ལག་ལེན་པའི་མིང་: (_U)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "བདུན་རིམ་བཞིན� (_W)"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6736,77 +6597,77 @@ msgstr "མ་ཤེས་པའི་རྒྱུ་ར�ྱེན་ཅིག
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:74
 #: ../calendar/gui/e-cal-component-preview.c:72
-#: ../mail/em-folder-view.c:2954
+#: ../mail/em-folder-view.c:3332
 #, c-format
 msgid "Click to open %s"
 msgstr "%s �་ཕྱེ་ནི་ལུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:157
-#: ../calendar/gui/e-cal-component-preview.c:157
-#: ../filter/filter-rule.c:804
+#: ../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
 msgid "Untitled"
 msgstr "མགོ་མིང་མ་བ�གསཔ�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:208
-#: ../calendar/gui/e-cal-component-preview.c:197
-#: ../calendar/gui/e-cal-component-preview.c:208
+#: ../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
 msgid "Start Date:"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:221
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-itip-control.c:1220
 #: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "འགྲེལ་བཤད:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:254
-#: ../calendar/gui/e-cal-component-preview.c:303
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Web Page:"
 msgstr "�ེབ་ཤོག་ལེབ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:190
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "བཅུད་དོན:"
 
-#: ../calendar/gui/e-cal-component-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Due Date:"
 msgstr "རན་པའི་ཚེས་གྲངས:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-itip-control.c:1188
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:968
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "གནས་ཚད:"
 
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Priority:"
 msgstr "གཙོ་རིམ:"
 
-#: ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:257
+#: ../calendar/gui/e-cal-model.c:318
+#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:338
 msgid "Public"
 msgstr "མི་མང་གི�"
 
-#: ../calendar/gui/e-cal-list-view.c:256
-#: ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-cal-list-view.c:258
+#: ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-calendar-table.c:339
 msgid "Private"
 msgstr "སྒེར་དོན�"
 
-#: ../calendar/gui/e-cal-list-view.c:257
-#: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
+#: ../calendar/gui/e-cal-list-view.c:259
+#: ../calendar/gui/e-cal-model.c:329
+#: ../calendar/gui/e-calendar-table.c:340
 msgid "Confidential"
 msgstr "གསང་བ�"
 
@@ -6815,30 +6676,30 @@ msgid "End Date"
 msgstr "མཇུག་བསྡུ་བའི་ཚེས་གྲངས�"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས�"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:4
 #: ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Summary"
 msgstr "བཅུད་དོན�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "Free"
 msgstr "དལ��"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "Busy"
 msgstr "�ོམ་མེད�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6848,185 +6709,179 @@ msgstr ""
 "\n"
 "༤༥.༤༣༦༨༤༥,༡༢༥.༨༦༢༥༠༡"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012
-#: ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:972
 #: ../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:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:749
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ཨིན�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012
-#: ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:972
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "མེན�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-cal-model.c:331
 #: ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124
 #: ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-itip-control.c:1345
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../mail/em-utils.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986
+#: ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "མ་ཤེསཔ�"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:968
 msgid "Recurring"
 msgstr "སླར་འབྱུང་�"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:970
 msgid "Assigned"
 msgstr "འགན་སྤྲོད་�"
 
 #: ../calendar/gui/e-cal-popup.c:177
-#: ../mail/em-popup.c:412
+#: ../mail/em-popup.c:426
 msgid "Save As..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:2159
+#: ../mail/em-format-html-display.c:2249
 msgid "Select folder to save selected attachments..."
 msgstr "སེལ་འ�ུ་འབད་མི་ མཉམ་སྦྲགས་ཚུ་ བསྲུང་ནི་འི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འ�ུ་འབད�"
 
-#: ../calendar/gui/e-cal-popup.c:222
-#: ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:225
+#: ../mail/em-popup.c:454
 #, c-format
 msgid "untitled_image.%s"
 msgstr "མགོ་མིང་མ་བ�གས་པའི་གཟུགས་བརྙན་%s� (_i)"
 
-#: ../calendar/gui/e-cal-popup.c:276
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1699
-#: ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1145
-#: ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:279
+#: ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1345
+#: ../mail/em-popup.c:571
+#: ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "དེ་སྦེ་སྲུངས་...(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:277
-#: ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:280
+#: ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
 msgid "Set as _Background"
 msgstr "རྒྱབ་གཞི་བཟུམ་སྦེ་གཞི་སྒྲིག་འབད� (_B)"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:281
 msgid "_Save Selected"
 msgstr "སེལ་འ�ུ་འབད་མི་སྲུངས�(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:399
-#: ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:402
+#: ../mail/em-popup.c:796
 #, c-format
 msgid "Open in %s..."
 msgstr "%sནང་ལུ་ �་ཕྱེ�..."
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:382
 msgid "0%"
 msgstr "%༠"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "10%"
 msgstr "%༡༠"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:384
 msgid "20%"
 msgstr "%༢༠"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "30%"
 msgstr "%༣༠"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:386
 msgid "40%"
 msgstr "%༤༠"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:387
 msgid "50%"
 msgstr "%༥༠"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:388
 msgid "60%"
 msgstr "%༦༠"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "70%"
 msgstr "%༧༠"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:390
 msgid "80%"
 msgstr "%༨༠"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "90%"
 msgstr "%༩༠"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:392
 msgid "100%"
 msgstr "%༡༠༠"
 
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:675
-#: ../calendar/gui/e-memo-table.c:483
+#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-view.c:681
+#: ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "སེལ་འ�ུ་འབད་མི་དངོས་པོ་ བ�ོན་བ�ང་དོ�"
 
-#: ../calendar/gui/e-calendar-table.c:958
-#: ../calendar/gui/e-calendar-view.c:803
-#: ../calendar/gui/e-memo-table.c:660
+#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-view.c:811
+#: ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "དངོས་པོ་དུས་མ�ུན་བཟོ་དོ�"
 
-#: ../calendar/gui/e-calendar-table.c:1107
-#: ../calendar/gui/e-calendar-view.c:1248
-#: ../calendar/gui/e-memo-table.c:799
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-view.c:1237
+#: ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
-#: ../calendar/gui/e-calendar-table.c:1278
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "New _Task"
 msgstr "ལས་ཀ་གསརཔ�(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-memo-table.c:903
+#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "�ེབ་ཤོག་ལེབ་�་ཕྱེ� (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1284
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700
-#: ../calendar/gui/e-memo-table.c:905
-#: ../mail/em-folder-view.c:1146
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124
-#: ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "དཔར་བས�ྲུན་...(_P)"
+#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr "དཔར་བས�ྲུན...( _P)"
 
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1704
-#: ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -7034,10 +6889,10 @@ msgstr "དཔར་བས�ྲུན་...(_P)"
 msgid "C_ut"
 msgstr "བ�ོག (_C)"
 
-#: ../calendar/gui/e-calendar-table.c:1290
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706
-#: ../calendar/gui/e-memo-table.c:911
+#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15
@@ -7047,38 +6902,38 @@ msgstr "བ�ོག (_C)"
 msgid "_Paste"
 msgstr "སྦྱར� (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1294
+#: ../calendar/gui/e-calendar-table.c:1378
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ལས་ཀ་འགན་སྤྲོད་འབད� (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1295
-#: ../calendar/gui/e-memo-table.c:915
+#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ཨའི་ཟླ་�ོ་བཟུམ་སྦེ་ གདོང་བས�ྱོད་འབད� (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1380
 msgid "_Mark as Complete"
 msgstr "མཇུག་བསྡུ�་སྦེ་ རྟགས་བཀལ� (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1381
 msgid "_Mark Selected Tasks as Complete"
 msgstr "སེལ་འ�ུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་བསྡུ�་སྦེ་ རྟགས་བཀལ� (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1382
 msgid "_Mark as Incomplete"
 msgstr "མཇུག་མ་བསྡུ�་སྦེ་ རྟགས་བཀལ� (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1299
+#: ../calendar/gui/e-calendar-table.c:1383
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "སེལ་འ�ུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་མ་བསྡུ�་སྦེ་ རྟགས་བཀལ� (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1304
+#: ../calendar/gui/e-calendar-table.c:1388
 msgid "_Delete Selected Tasks"
 msgstr "སེལ་འ�ུ་འབད་མི་ ལས་ཀ་ཚུ་བ�ོན་ག�ང་� (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1537
+#: ../calendar/gui/e-calendar-table.c:1625
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ལས་ཀ་ཅིག་ �་ས�ོང་བར�ྱབ་ནི་ལུ་ ཨེབ་ག�ང་འབད�"
@@ -7089,7 +6944,6 @@ msgid "% Complete"
 msgstr "%མཇུག་བསྡུ�"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
-#: ../mail/mail-send-recv.c:705
 msgid "Complete"
 msgstr "མཇུག་བསྡུ�"
 
@@ -7102,7 +6956,7 @@ msgid "Due date"
 msgstr "རན་པའི་ཚེས་གྲངས�"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "Priority"
 msgstr "གཙོ་རིམ�"
 
@@ -7110,109 +6964,117 @@ msgstr "གཙོ་རིམ�"
 msgid "Start date"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས�"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "ལས་ཀའི་དབྱེ་སེལ�"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "གནས་ཚད�"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1356
 msgid "Moving items"
 msgstr "འགུལ་བས�ྱོད་འབད་མི་རྣམ་གྲངས�"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1358
 msgid "Copying items"
 msgstr "རྣམ་གྲངས་ཚུ་ འདྲ་བཤུས་ར�ྱབ་དོ�"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "New _Appointment..."
 msgstr "ངོ་འཕྲད་གསརཔ་...(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1668
 msgid "New All Day _Event"
 msgstr "ཉིནམ་གང་གི་ བྱུང་ལས་གསརཔ�(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1669
 msgid "New _Meeting"
 msgstr "འཛོམས་འདུ་གསརཔ�(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1680
 msgid "_Current View"
 msgstr "ད་ལྟོའི་མ�ོང་སྣང་� (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Select T_oday"
 msgstr "ད་རིས་ སེལ་འ�ུ་འབད� (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "_Select Date..."
 msgstr "ཚེས་གྲངས་སེལ་འ�ུ་འབད་...(_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1689
+msgid "Pri_nt..."
+msgstr "དཔར་བས�ྲུན... (_P)"
+
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "Cop_y to Calendar..."
 msgstr "ཟླ་�ོ་ལུ་འདྲ་བཤུས་ར�ྱབས་...(_y)"
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "Mo_ve to Calendar..."
 msgstr "ཟླ་�ོ་ལུ་སྤོ་བཤུད་འབད་... (_v)"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1701
 msgid "_Delegate Meeting..."
 msgstr "འཛོམས་འདུ་བགོ་སྤེལ་འབད་...(_D)"
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "_Schedule Meeting..."
 msgstr "འཛོམས་འདུའི་འཆར་རིམ་བཀོད་...(_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "_Forward as iCalendar..."
 msgstr "ཨའི་ཟླ་�ོ་བཟུམ་སྦེ་ གདོང་བས�ྱོད་འབད་...(_F)"
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1704
 msgid "_Reply"
 msgstr "ལན་གསལ�(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716
-#: ../mail/em-folder-view.c:1140
-#: ../mail/em-popup.c:559
-#: ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1705
+#: ../mail/em-folder-view.c:1339
+#: ../mail/em-popup.c:576
+#: ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ཆ་མཉམ་ལུ་ལན་གསལ་ག�ང་� (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Make this Occurrence _Movable"
 msgstr "འབྱུང་བ་འདི་ སྤོ་བཤུད་འབད་བ�ུབ་བཟོ� (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1711
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "འབྱུང་བ་འདི་ བ�ོན་ག�ང་� (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1712
 msgid "Delete _All Occurrences"
 msgstr "འབྱུང་བ་ཆ་མཉམ་བ�ོན་ག�ང་� (_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2212
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "འགོ་འདྲེན་པ་:%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2216
 #, c-format
 msgid "Organizer: %s"
 msgstr "འགོ་འདྲེན་པ་:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/e-calendar-view.c:2232
+#: ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "གནས་�ོངས་:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2266
 #, c-format
 msgid "Time: %s %s"
 msgstr "ཆུ་ཚོད་:%s %s"
@@ -7251,61 +7113,49 @@ msgstr "%02i ས�ར་མའི་སྡེ་ཚན�"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1359
+#: ../calendar/gui/e-day-view.c:2145
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524
-#: ../calendar/gui/print.c:1643
+#: ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746
-#: ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:952
+#: ../calendar/gui/e-day-view.c:770
+#: ../calendar/gui/e-day-view.c:1123
+#: ../calendar/gui/e-week-view.c:511
+#: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "སྔ་ཆ�"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749
-#: ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:954
+#: ../calendar/gui/e-day-view.c:773
+#: ../calendar/gui/e-day-view.c:1126
+#: ../calendar/gui/e-week-view.c:514
+#: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "ཕྱི་ཆ�"
 
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:767
 msgid "Yes. (Complex Recurrence)"
 msgstr "ཨིན� (གོ་དཀའ་བའི་སླར་འབྱུང་)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:784
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ཉིན་བསྟར་བཞིན་དུ�"
 msgstr[1] "ཉིནམ་%d རེ་ནང་�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "བདུན་རིམ་བཞིན་དུ�"
 msgstr[1] "བདུན་ཕྲག་%d རེ་ནང་�"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:804
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7313,51 +7163,35 @@ msgstr[0] "བདུན་རིམ་བཞིན་དུ་ ལུ�"
 msgstr[1] "བདུན་ཕྲག་%d རེ་ནང་ ལུ��"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:815
 msgid " and "
 msgstr "དང་�"
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:824
 #, c-format
 msgid "The %s day of "
 msgstr "%s ཉིནམ་གི�"
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:821
+#: ../calendar/gui/e-itip-control.c:840
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s གི�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:834
+#: ../calendar/gui/e-itip-control.c:851
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ཟླ་རིམ་བཞིན་དུ�"
 msgstr[1] "ཟླ�་%dརེ་ནང་�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:843
+#: ../calendar/gui/e-itip-control.c:863
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ལོ་རིམ་བཞིན་དུ�"
 msgstr[1] "ལོ་%dརེ་ནང་�"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:876
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7365,339 +7199,339 @@ msgstr[0] "ལན་གྲངས་%dགི་བསྡོམས�"
 msgstr[1] "ལན་གྲངས་%dགི་བསྡོམས�"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:887
 msgid ", ending on "
 msgstr "མཇུག་བསྡུ་ཚེས�"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Starts"
 msgstr "འགོ་བཙུགསཔ་ཨིན�"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:923
 msgid "Ends"
 msgstr "མཇུག་བསྡུ�་ཨིན�"
 
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:963
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Due"
 msgstr "རན་ནི�"
 
-#: ../calendar/gui/e-itip-control.c:976
-#: ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:1062
 msgid "iCalendar Information"
 msgstr "ཨའི་ཟླ་�ོའི་བརྡ་དོན�"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1022
 msgid "iCalendar Error"
 msgstr "ཨའི་ཟླ་�ོའི་འཛོལ་བ�"
 
-#: ../calendar/gui/e-itip-control.c:1065
-#: ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092
-#: ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:477
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../calendar/gui/e-itip-control.c:1094
+#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-itip-control.c:1121
+#: ../calendar/gui/e-itip-control.c:1138
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "ངོ་མ་ཤེས་པའི་གང་ཟག་ཅིག"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../calendar/gui/e-itip-control.c:1145
 msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr "<br> འོག་གི་བརྡ་དོན་ཚུ་ བས�ྱར་ཞིབ་འབད་ཞིནམ་ལས་ འོག་གི་དཀར་ཆག་ནང་ལས་ བྱ་བ་ཅིག་སེལ་འ�ུ་འབད་གནང་�"
 
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1193
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:694
+#: ../plugins/itip-formatter/itip-formatter.c:2030
 msgid "Accepted"
 msgstr "དང་ལེན་འབད་ཡི�"
 
-#: ../calendar/gui/e-itip-control.c:1168
-#: ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/itip-utils.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:2033
 msgid "Tentatively Accepted"
 msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད་ཡི�"
 
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-itip-control.c:1201
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:693
-#: ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:729
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Declined"
 msgstr "དང་ལེན་མ་འབད�"
 
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../calendar/gui/e-itip-control.c:1285
 msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "འཛོམས་འདུ་དེ་ ཆ་མེད་བ�ང་ཡོད་རུང་ �ྱོད་ཀྱི་ཟླ་�ོ་ཚུ་ནང་ �ོབ་མ་ཚུགས�"
 
-#: ../calendar/gui/e-itip-control.c:1258
+#: ../calendar/gui/e-itip-control.c:1287
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "ལས་ཀ་དེ་ ཆ་མེད་བ�ང་ཡོད་རུང་ �ྱོད་ཀྱི་ལས་ཀའི་�ོ་ཡིག་ཚུ་ནང་ �ོབ་མ་ཚུགས�"
 
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> གིས་ འཛོམས་འདུའི་བརྡ་དོན་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Information"
 msgstr "འཛོམས་འདུའི་བརྡ་དོན�"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> གིས་%s ལུ་ འཛོམས་འདུ་ཅིག་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབད�་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> གིས་ �ྱོད་ལུ་འཛོམས་འདུ་ཅིག་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབད�་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Proposal"
 msgstr "འཛོམས་འདུའི་གྲོས་འཆར�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1381
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b>གིས་ ད་ལྟོའི་འཛོམས་འདུའི་ནང་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1382
 msgid "Meeting Update"
 msgstr "འཛོམས་འདུའི་དུས་མ�ུན�"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> གིས་ འཛོམས་འདུའི་མ�འ་མཇུག་གི་བརྡ་དོན་ཚུ་ འ�ོབ་ནིའི་འདོད་པ་བས�ྱེདཔ་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Update Request"
 msgstr "འཛོམས་འདུ་དུས་མ�ུན་བཟོ་དགོ་པའི་ཞུ་བ�"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>གིས་ འཛོམས་འདུའི་ཞུ་བ་ལུ་ ལན་གསལ་བྱིན་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Meeting Reply"
 msgstr "འཛོམས་འདུའི་ལན་གསལ�"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> གིས་ འཛོམས་འདུ་ཅིག་ ཆ་མེད་བ�ང་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1403
 msgid "Meeting Cancelation"
 msgstr "འཛོམས་འདུ་ཆ་མེད�"
 
-#: ../calendar/gui/e-itip-control.c:1385
-#: ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1490
+#: ../calendar/gui/e-itip-control.c:1530
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> གིས་ ཧ་གོ་མ་ཚུགས་པའི་ འཕྲིན་དོན་ཅིག་བ�ང་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1414
 msgid "Bad Meeting Message"
 msgstr "འཛོམས་འདུའི་འཕྲིན་དོན་བྱང་ཉེས�"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1441
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>གིས་ ལས་ཀའི་བརྡ་དོན་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1442
 msgid "Task Information"
 msgstr "ལས་ཀའི་བརྡ་དོན�"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> གིས་%s ལུ་ ལས་ཀ་ཅིག་འབད་དགོ་པའི་ ཞུ་བ་འབད�་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> གིས་ �ྱོད་ལུ་ལས་ཀ་ཅིག་འབད་དགོ་པའི་ ཞུ་བ་འབད�་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Proposal"
 msgstr "ལས་ཀའི་གྲོས་འཆར�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1458
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> གིས་ ད་ལྟོའི་ལས་ཀ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1459
 msgid "Task Update"
 msgstr "ལས་ཀའི་དུས་མ�ུན�"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> གིས་ མ�འ་མཇུག་གི་ལས་ཀའི་བརྡ་དོན་ འ�ོབ་འདོད་བས�ྱེདཔ་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Update Request"
 msgstr "ལས་ཀ་དུས་མ�ུན་བཟོ་དགོ་པའི་ཞུ་བ�"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>གིས་ ལས་ཀའི་འགན་སྤྲོད་འབད་མི་དེ་ལུ་ ལན་གསལ་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Task Reply"
 msgstr "ལས་ཀའི་ལན་གསལ�"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1479
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>གིས་ ལས་ཀ་ཅིག་ ཆ་མེད་བ�ང་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1480
 msgid "Task Cancelation"
 msgstr "ལས་ཀ་ཆ་མེད�"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1491
 msgid "Bad Task Message"
 msgstr "ལས་ཀའི་འཕྲིན་དོན་བྱང་ཉེས�"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1515
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>གིས་ དལ�/�ོམ་མེད་ཀྱི་བརྡ་དོན་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1516
 msgid "Free/Busy Information"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་བརྡ་དོན�"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1520
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> གིས་ �ྱོད་ཀྱི་ དལ�/�ོམ་མེད་བརྡ་དོན་གྱི་ ཞུ་བ་འབད�་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1521
 msgid "Free/Busy Request"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་ཞུ་བ�"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1525
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> གིས་ དལ�/�ོམ་མེད་ཀྱི་ཞུ་བ་ལུ་ ལན་གསལ་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1526
 msgid "Free/Busy Reply"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་ལན་གསལ�"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1531
 msgid "Bad Free/Busy Message"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་འཕྲིན་དོན་བྱང་ཉེས�"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1607
 msgid "The message does not appear to be properly formed"
 msgstr "འཕྲིན་དོན་དེ་ ཚུལ་ལྡན་སྦེ་ གཞི་བསྒྲུབས་མ་འབད�་བཟུམ་ཅིག་འདུག"
 
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1666
 msgid "The message contains only unsupported requests."
 msgstr "འཕྲིན་དོན་དེ་ནང་ རྒྱབ་ས�ྱོར་མེད་པའི་ ཞུ་བ་ཚུ་ར�ྱངམ་གཅིག་ཨིན་མས�"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1699
 msgid "The attachment does not contain a valid calendar message"
 msgstr "མཉམ་སྦྲགས་དེ་ནང་ ནུས་ཅན་གྱི་ ཟླ་�ོའི་འཕྲིན་དོན་མིན་འདུག"
 
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1737
 msgid "The attachment has no viewable calendar items"
 msgstr "མཉམ་སྦྲགས་དེ་ལུ་ མ�ོང་ཚུགས་པའི་ ཟླ་�ོའི་རྣམ་གྲངས་མིན་འདུག"
 
-#: ../calendar/gui/e-itip-control.c:1944
+#: ../calendar/gui/e-itip-control.c:1982
 msgid "Update complete\n"
 msgstr "དུས་མ�ུན་མཇུག་བསྡུ་ཡོདཔ�\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:2016
 msgid "Object is invalid and cannot be updated\n"
 msgstr "དངོས་པོ་དེ་ ནུས་མེད་ཨིནམ་ལས་ དུས་མ�ུན་བཟོ་མི་ཚུགས�\n"
 
-#: ../calendar/gui/e-itip-control.c:1994
+#: ../calendar/gui/e-itip-control.c:2033
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ངོས་ལན་འདི་ ད་ལྟོའི་ངོ་འཛོམས་པ་ཅིག་མེན་པས� ངོ་འཛོམས་པ་ཅིག་ �་ས�ོང་ར�ྱབས�"
 
-#: ../calendar/gui/e-itip-control.c:2012
+#: ../calendar/gui/e-itip-control.c:2051
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ནུས་མེད་གནས་ཚད་ཅིག་ལུ་བརྟེན་�ེ་ ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མ�ུན་བཟོ་མ་ཚུགས�\n"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2075
 msgid "Attendee status updated\n"
 msgstr "ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མ�ུན་བཟོ་ཡི�\n"
 
-#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2082
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "རྣམ་གྲངས་དེ་ གནས་�ེ་མེདཔ་ལས་ ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མ�ུན་བཟོ་མི་ཚུགས�"
 
-#: ../calendar/gui/e-itip-control.c:2074
-#: ../calendar/gui/e-itip-control.c:2131
+#: ../calendar/gui/e-itip-control.c:2113
+#: ../calendar/gui/e-itip-control.c:2170
 msgid "Item sent!\n"
 msgstr "རྣམ་གྲངས་བ�ང་ཡོད!\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../calendar/gui/e-itip-control.c:2139
+#: ../calendar/gui/e-itip-control.c:2119
+#: ../calendar/gui/e-itip-control.c:2178
 msgid "The item could not be sent!\n"
 msgstr "རྣམ་གྲངས་དེ་ བ�ང་མ་ཚུགས!\n"
 
-#: ../calendar/gui/e-itip-control.c:2220
+#: ../calendar/gui/e-itip-control.c:2258
 msgid "Choose an action:"
 msgstr "བྱ་བ་ཅིག་གདམ:"
 
-#: ../calendar/gui/e-itip-control.c:2292
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "དུས་མ�ུན་བཟོ�"
 
-#: ../calendar/gui/e-itip-control.c:2320
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "དང་ལེན་འབད�"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2358
 msgid "Tentatively accept"
 msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད�"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2359
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "དང་ལེན་མ་འབད�"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2388
 msgid "Send Free/Busy Information"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་བརྡ་དོན་བ�ང་�"
 
-#: ../calendar/gui/e-itip-control.c:2379
+#: ../calendar/gui/e-itip-control.c:2416
 msgid "Update respondent status"
 msgstr "ལན་བཀོད་པའི་གནས་ཚད་ དུས་མ�ུན་བཟོ�"
 
-#: ../calendar/gui/e-itip-control.c:2407
+#: ../calendar/gui/e-itip-control.c:2444
 msgid "Send Latest Information"
 msgstr "མ�འ་མཇུག་གི་བརྡ་དོན་བ�ང་�"
 
-#: ../calendar/gui/e-itip-control.c:2435
-#: ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/e-itip-control.c:2472
+#: ../calendar/gui/itip-utils.c:717
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ཆ་མེད�"
@@ -7747,76 +7581,83 @@ msgid "Attendees"
 msgstr "ངོ་འཛོམས་པ་ཚུ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89
+#: ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "ངོ་ར�ྱང་�"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-store.c:91
+#: ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966
+#: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "སྡེ་ཚན�"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93
+#: ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "�ོན་�ུངས�"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95
+#: ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "�ང་མིག"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "ར�ང་�ྲི�"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "དགོ་པའི་བཅའ་མར་ག�ོགས་མི�"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "གདམ་�་ཅན་གྱི་ བཅའ་མར་ག�ོགས་མི�"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "བཅའ་མར་མ་ག�ོགས་མི�"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
 msgid "Needs Action"
 msgstr "བྱ་བ་དགོཔ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr "ངེས་མེད�"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/e-meeting-store.c:182
+#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:703
+#: ../plugins/itip-formatter/itip-formatter.c:2039
 msgid "Delegated"
 msgstr "བགོ་སྤེལ་འབད་ཡོདཔ�"
 
@@ -7825,15 +7666,21 @@ msgstr "བགོ་སྤེལ་འབད་ཡོདཔ�"
 msgid "Attendee                          "
 msgstr "ངོ་འཛོམས་པ�"
 
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "ལན་གསལ་གནང་ས�"
+
+#: ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:209
 msgid "In Process"
 msgstr "ལས་སྦྱོར་འབད་བའི་བསྒང་�"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel.c:2137
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7842,7 +7689,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2149
+#: ../calendar/gui/e-meeting-time-sel.c:2168
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7852,87 +7699,110 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412
-#: ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Out of Office"
 msgstr "ཡིག་ཚང་གི་ཕྱི་�ར�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "No Information"
 msgstr "བརྡ་དོན་མིན་འདུག"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:430
 msgid "A_ttendees..."
 msgstr "ངོ་འཛོམས་པ་ཚུ་...(_t)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "O_ptions"
 msgstr "གདམ་�་ཚུ� (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _only working hours"
 msgstr "ལཱ་འབད་ནིའི་ཆུ་ཚོད་ར�ྱངམ་གཅིག་སྟོན� (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _zoomed out"
 msgstr "ནང་ཟུམ་འབད་ཡོདཔ་སྟོན� (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
 msgstr "དལ�/�ོམ་མེད་ དུས་མ�ུན་བཟོ� (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
 msgstr "_<< (_<)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "_Autopick"
 msgstr "རང་བཞིན་འ�ུ་བ� (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid ">_>"
 msgstr ">_>  (_>)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "_All people and resources"
 msgstr "མི་མང་དང་�ོན་�ུངས་ཆ་མཉམ� (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:567
 msgid "All _people and one resource"
 msgstr "མི་མང་ཆ་མཉམ་དང་ �ོན་�ུངས་གཅིག (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:576
 msgid "_Required people"
 msgstr "དགོ་པའི་མི་མང་� (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "Required people and _one resource"
 msgstr "དགོ་པའི་མི་མང་དང་ �ོན་�ུངས་གཅིག (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Start time:"
 msgstr "འགོ་བཙུགས་ཆུ་ཚོད་: (_S)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:648
 msgid "_End time:"
 msgstr "མཇུག་བསྡུ་བའི་ཆུ་ཚོད་: (_E)"
 
-#: ../calendar/gui/e-memo-table.c:920
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "ངོ་འཛོམས་འབད་མི�"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "ངོ་འཛོམས་པ་ཅིག་ �་ས�ོང་བར�ྱབ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་ག�ང་འབད�"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "མ�ུན་མོང་གི་མིང་�"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "ག་�ེ་ལས་ བགོ་སྤེལ་འབད་ཡོདཔ�"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "ག་�ེ་ལུ་ བགོ་སྤེལ་འབད་ཡོདཔ�"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "ས�ད་ཡིག"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "འ�ུས་མི�"
+
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "སེལ་འ�ུ་འབད་མི་བརྗེད་�ོ་ཚུ་བ�ོན་ག�ང་� (_D)"
 
-#: ../calendar/gui/e-memo-table.c:1071
+#: ../calendar/gui/e-memo-table.c:1093
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "བརྗེད་�ོ་ཅིག་ �་ས�ོང་བར�ྱབ་ནི་ལུ་ཨེབ་ག�ང་འབད�"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "བརྗེད་�ོ་དབྱེ་སེལ�"
-
-#: ../calendar/gui/e-memos.c:733
-#: ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2778
+#: ../calendar/gui/e-memos.c:791
+#: ../calendar/gui/e-tasks.c:923
+#: ../calendar/gui/gnome-cal.c:2871
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7941,39 +7811,34 @@ msgstr ""
 "%s ལུ་འཛོལ་བ་:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:782
+#: ../calendar/gui/e-memos.c:840
 msgid "Loading memos"
 msgstr "བརྗེད་�ོ་ཚུ་མངོན་གསལ་འབད་དོ�"
 
-#: ../calendar/gui/e-memos.c:863
+#: ../calendar/gui/e-memos.c:921
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%sལུ་ བརྗེད་�ོ་ཚུ་�་ཕྱེ་དོ�"
 
-#: ../calendar/gui/e-memos.c:1036
-#: ../calendar/gui/e-tasks.c:1249
+#: ../calendar/gui/e-memos.c:1094
+#: ../calendar/gui/e-tasks.c:1334
 msgid "Deleting selected objects..."
 msgstr "སེལ་འ�ུ་ཅན་གྱི་ དངོས་པོ་ཚུ་ བ�ོན་བ�ང་དོ�"
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "%sགི་དོན་ལས་ ཆོག་ཡིག་བཙུགས�"
-
-#: ../calendar/gui/e-tasks.c:894
+#: ../calendar/gui/e-tasks.c:976
 msgid "Loading tasks"
 msgstr "ལས་ཀ་ཚུ་ མངོན་གསལ་འབད་དོ�"
 
-#: ../calendar/gui/e-tasks.c:981
+#: ../calendar/gui/e-tasks.c:1066
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%sལུ་ ལས་ཀ་ཚུ་ �་ཕྱེ་དོ�"
 
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-tasks.c:1311
 msgid "Completing tasks..."
 msgstr "ལས་ཀ་ཚུ་ མཇུག་བསྡུ་དོ�"
 
-#: ../calendar/gui/e-tasks.c:1276
+#: ../calendar/gui/e-tasks.c:1361
 msgid "Expunging"
 msgstr "ཕྱིར་བས�ྲད་བ�ང་དོ�"
 
@@ -7986,47 +7851,47 @@ msgstr "དུས་ཚོད་གླིང་སྡེ་སེལ་འ�ུ
 #. 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:1624
+#: ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:828
 msgid "Updating query"
 msgstr "འདྲི་དཔྱད་དུས་མ�ུན་བཟོ་དོ�"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2508
 msgid "_Custom View"
 msgstr "སྲོལ་སྒྲིག་མ�ོང་སྣང་�(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2430
+#: ../calendar/gui/gnome-cal.c:2509
 msgid "_Save Custom View"
 msgstr "སྲོལ་སྒྲིག་མ�ོང་སྣང་སྲུངས�(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2435
+#: ../calendar/gui/gnome-cal.c:2514
 msgid "_Define Views..."
 msgstr "མ�ོང་སྣང་ངེས་འཛིན་འབད་...(_D)"
 
-#: ../calendar/gui/gnome-cal.c:2601
+#: ../calendar/gui/gnome-cal.c:2695
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%sལུ་ ངོ་འཕྲད་ཚུ་ མངོན་གསལ་འབད་དོ�"
 
-#: ../calendar/gui/gnome-cal.c:2620
+#: ../calendar/gui/gnome-cal.c:2714
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%sལུ་ ལས་ཀ་ཚུ་ མངོན་གསལ་འབད་དོ�"
 
-#: ../calendar/gui/gnome-cal.c:2629
+#: ../calendar/gui/gnome-cal.c:2723
 #, c-format
 msgid "Loading memos at %s"
 msgstr "བརྗེད་�ོ་ཚུ་%sམངོན་གསལ་འབད་དོ�"
 
-#: ../calendar/gui/gnome-cal.c:2737
+#: ../calendar/gui/gnome-cal.c:2830
 #, c-format
 msgid "Opening %s"
 msgstr "%s�་ཕྱེ་དོ�"
 
-#: ../calendar/gui/gnome-cal.c:3673
+#: ../calendar/gui/gnome-cal.c:3787
 msgid "Purging"
 msgstr "ཕྱིར་བས�ྲད་བ�ང་དོ�"
 
@@ -8086,138 +7951,139 @@ msgstr "སྤྱི་ཟླ་དགུ་པ�"
 msgid "_Select Today"
 msgstr "ད་རིས་ སེལ་འ�ུ་འབད� (_S)"
 
-#: ../calendar/gui/itip-utils.c:412
-#: ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:415
+#: ../calendar/gui/itip-utils.c:464
+#: ../calendar/gui/itip-utils.c:570
 msgid "An organizer must be set."
 msgstr "འགོ་འདྲེན་པ་ཅིག་ གཞི་སྒྲིག་འབད་དགོ"
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "ཉུང་མ�འ་ལུ་ ངོ་འཛོམས་པ་གཅིག་དགོ"
 
-#: ../calendar/gui/itip-utils.c:649
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:656
+#: ../calendar/gui/itip-utils.c:779
 msgid "Event information"
 msgstr "བྱུང་ལས་ཀྱི་བརྡ་དོན�"
 
-#: ../calendar/gui/itip-utils.c:651
-#: ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "ལས་ཀའི་བརྡ་དོན�"
 
-#: ../calendar/gui/itip-utils.c:653
-#: ../calendar/gui/itip-utils.c:776
-msgid "Journal information"
-msgstr "གསར་དེབ་ཀྱི་བརྡ་དོན�"
+#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:783
+msgid "Memo information"
+msgstr "བརྗེད་�ོ་ བརྡ་དོན་ "
 
-#: ../calendar/gui/itip-utils.c:655
-#: ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:662
+#: ../calendar/gui/itip-utils.c:801
 msgid "Free/Busy information"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་བརྡ་དོན�"
 
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:664
 msgid "Calendar information"
 msgstr "ཟླ་�ོའི་བརྡ་དོན�"
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:713
 msgid "Updated"
 msgstr "དུས་མ�ུན་བཟོ་བཟོ��"
 
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:721
 msgid "Refresh"
 msgstr "ཡང་སེལ�"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:725
 msgid "Counter-proposal"
 msgstr "གདོང་ལན་གྲོས་འཆར�"
 
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "དལ�/�ོམ་མེད་ཀྱི་བརྡ་དོན�(%sལས་%sལུ་)"
 
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "�ྱོད་ བྱུང་ལས་དེ་གི་ ངོ་འཛོམས་པ་ཅིག་ཨིན་དགོ"
 
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:975
 msgid "You must be an attendee of the event."
 msgstr "ཨའི་ཟླ་�ོའི་བརྡ་དོན�"
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "བརྗེད་�ོའི་�ོ་ཡིག་གསརཔ�(_N)"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "བརྗེད་�ོ་%d"
 msgstr[1] "བརྗེད་�ོ་%d"
 
-#: ../calendar/gui/memos-component.c:529
-#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/memos-component.c:546
+#: ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ",སེལ་འ�ུ་འབད་ཡོདཔ་%d�"
 msgstr[1] ",སེལ་འ�ུ་འབད་ཡོདཔ་%d�"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "བརྗེད་�ོ་ཚུ་ ཡར་བས�ྱེད་འབད་མ་ཚུགས�"
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བས�ྲུན་གྱི་དོན་ལུ་ བརྗེད་�ོའི་་�ོ་ཡིག་'%s' �་ཕྱེ་མ་ཚུགས�"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "བརྗེད་�ོ་ཚུ་ གསར་བས�ྲུན་གྱི་དོན་ལུ་ ཟླ་�ོ་འ�ོབ་མི་ཚུགས་པས�"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "བརྗེད་�ོའི་འབྱུང་�ུངས་སེལ་བྱེད�"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "བརྗེད་�ོ་གསརཔ�"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1260
 msgid "Mem_o"
 msgstr "བརྗེད་�ོ�(_o)"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "བརྗེད་�ོ་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་བརྗེད་�ོ་གསརཔ�"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1268
 msgid "_Shared memo"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་བརྗེད་�ོ�(_S)"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་བརྗེད་�ོ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "བརྗེད་�ོ་གསར་པའི་�ོ་ཡིག"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1276
 msgid "Memo li_st"
 msgstr "བརྗེད་�ོའི་�ོ་ཡིག(_s)"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "བརྗེད་�ོ་གསར་པའི་�ོ་ཡིག་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
 msgid "Print Memos"
 msgstr "བརྗེད་�ོ་ཚུ་དཔར་བས�ྲུན་འབད�"
 
@@ -8242,326 +8108,296 @@ msgstr ""
 "\"ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་�"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770
-#: ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:781
+#: ../calendar/gui/migration.c:949
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "ཨི་བོ་ལུ་ཤཱན་/ཀཱོན་ཕིག་.ཨེགསི་ཨེམ་ཨེལ་ཌི་བི་ནང་ལས་ གཞི་སྒྲིག་རྙིངམ་ཚུ་ གཞིས་སྤོ་འབད་མ་ཚུགས�"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:810
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ཟླ་�ོ་`%sགཞིས་སྤོ་འབད་མ་ཚུགས�"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:978
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "ལས་ཀ་`%sགཞིས་སྤོ་འབད་མ་ཚུགས�"
 
-#: ../calendar/gui/migration.c:1211
-#: ../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
+#: ../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
 msgid "Notes"
 msgstr "དྲན་འཛིན་ཚུ�"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "༡པ"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "༢པ"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "༣པ"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "༤པ"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "༥པ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "༦པ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "༧པ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "༨པ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "༩པ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "༡༠པ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "༡༡པ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "༡༢པ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "༡༣པ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "14th"
 msgstr "༡༤པ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "15th"
 msgstr "༡༥པ"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "༡༦པ"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "༡༧པ"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "༡༨པ"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "༡༩པ"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "༢༠པ"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "༢༡པ"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "༢༢པ"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "༢༣པ"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "༢༤པ"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "༢༥པ"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "༢༦པ"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "༢༧པ"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "༢༨པ"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "༢༩པ"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "༣༠པ"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "༣༡པ"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "ཟླ�"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "མིག"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "ལྷག"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "ཕུར�"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "སངས�"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "སྤེན�"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "ཉི�"
 
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "སེལ་འ�ུ་འབད་མི་གཟའ� (%a %b %d %Y)"
-
-#: ../calendar/gui/print.c:2072
-#: ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:2077
-#: ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "སེལ་འ�ུ་འབད་མི་བདུན་ཕྲག(%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "སེལ་འ�ུ་འབད་མི་ཟླ��(%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "སེལ་འ�ུ་འབད་མི་ལོ�(%Y)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2444
 msgid "Appointment"
 msgstr "ངོ་འཕྲད�"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2446
 msgid "Task"
 msgstr "ལས་ཀ�"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2468
 #, c-format
 msgid "Summary: %s"
 msgstr "བཅུད་དོན:%s"
 
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2490
+msgid "Attendees: "
+msgstr "ངོ་འཛོམས་པ་ཚུ: "
+
+#: ../calendar/gui/print.c:2530
 #, c-format
 msgid "Status: %s"
 msgstr "གནས་ཚད་%s�"
 
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2547
 #, c-format
 msgid "Priority: %s"
 msgstr "གཙོ་རིམ་: %s� "
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2559
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "བརྒྱ་ཆ་མཇུག་བསྡུ་ཡོདཔ་: %i"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "URL: %s"
 msgstr "ཡུ་ཨར་ཨེལ་: %s�"
 
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Categories: %s"
 msgstr "དབྱེ་རིམ་: %s�"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2595
 msgid "Contacts: "
 msgstr "འབྲེལ་ས་ཚུ�"
 
-#: ../calendar/gui/print.c:2653
-#: ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "དཔར་བས�ྲུན་རྣམ་གྲངས�"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2697
+msgid "Upcoming Appointments"
+msgstr "འཕྲལ་རང་འོང་བའི་ ངོ་འཕྲད་ཚུ་ "
 
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "ལས་ཀ་གསར་པའི་�ོ་ཡིག(_N)"
 
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "ལས་ཀ་%d"
 msgstr[1] "ལས་ཀ་%d�"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "ལས་ཀ་ཚུ་ ཡར་བས�ྱེད་འབད་མ་ཚུགས�"
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བས�ྲུན་དོན་ལུ་ ལས་ཀའི་�ོ་ཡིག་'%s' �་ཕྱེ་མ་ཚུགས�"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "ལས་ཀ་ཚུ་ གསར་བས�ྲུན་དོན་ལུ་ ཟླ་�ོ་འ�ོབ་མི་ཚུགས་པས�"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "ལས་ཀའི་འབྱུང་�ུངས་སེལ་བྱེད�"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1324
 msgid "New task"
 msgstr "ལས་ཀ་གསརཔ�"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1326
 msgid "Create a new task"
 msgstr "ལས་ཀ་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1332
 msgid "New assigned task"
 msgstr "གསར་སྤྲོད་འགན་ལས�"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1333
 msgid "Assigne_d Task"
 msgstr "འགན་སྤྲོད་ལས་ཀ� (_d)"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Create a new assigned task"
 msgstr "གསར་སྤྲོད་ལས་ཀ་གསརཔཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1340
 msgid "New task list"
 msgstr "ལས་ཀ་གསར་པའི་�ོ་ཡིག"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1341
 msgid "Tas_k list"
 msgstr "ལས་ཀའི་�ོ་ཡིག  (_k)"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Create a new task list"
 msgstr "ལས་ཀ་གསར་པའི་�ོ་ཡིག་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../calendar/gui/tasks-control.c:445
+#: ../calendar/gui/tasks-control.c:455
 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"
@@ -8571,25 +8407,23 @@ msgstr ""
 "\n"
 "�ྱོད་ཀྱིས་འཕྲོ་མ�ུད་པ་ཅིན་ ལས་ཀ་འདི་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས� ལས་ཀ་འདི་ཚུ་ �ད་རི་འབད་རི་ ཀྲེག་ག�ང་ནི་ཨིན་ན?"
 
-#: ../calendar/gui/tasks-control.c:448
+#: ../calendar/gui/tasks-control.c:458
+#: ../mail/em-folder-view.c:1135
 msgid "Do not ask me again."
 msgstr "ང་ལུ་ ལོག་སྟེ་མ་འདྲི�"
 
-#: ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
 msgstr "ལས་ཀ་ཚུ་ དཔར་བས�ྲུན་འབད�"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "ཨེསི་ཨེམ་ཊི་ཌབ་ལུ་ཊི་ཨེཕ་ཨེསི�"
-
 #: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "ངོ་འཕྲད་དང་ འཛོམས་འདུ་ཚུ�"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Opening calendar"
 msgstr "ཟླ་�ོ་�་ཕྱེ་དོ�"
 
@@ -10151,205 +9985,123 @@ msgstr "པེ་སི་ཕིག་/�་ལིསི�"
 msgid "Pacific/Yap"
 msgstr "པེ་སི་ཕིག་/ཡཔ�"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་�"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241
-#: ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439
-#: ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "ཡིག་སྣོད་%s: %sམཉམ་སྦྲགས་འབད་མ་ཚུགས�"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249
-#: ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "ཡིག་སྣོད་%s: མཉམ་སྦྲགས་འབད་མི་ཚུགས་པས� དུས་རྒྱུན་གྱི་ཡིག་སྣོད་ཅིག་མེན་པས�"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "མཉམ་སྦྲགས་ཀྱི་རྒྱུ་དངོས་ཚུ�"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "ཡིག་སྣོད་མིང་:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "མ་ཡིམ་གྱི་དབྱེ་བ:"
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "�་བྱང་ཀི་དེབ་ཀྱི་དོན་ལས་ ནཱ་ལུ་ཨེབ་ག�ང་འབད�"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-composer-post-header.c:117
 msgid "Posting destination"
 msgstr "གནས་བས�ྱོད་འགྲོ་ཡུལ�"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-composer-post-header.c:118
 msgid "Choose folders to post the message to."
 msgstr "འཕྲིན་དོན་གནས་བས�ྱོད་ཀྱི་དོན་ལས་ སྣོད་འཛིན་སེལ་འ�ུ་འབད�"
 
-#: ../composer/e-msg-composer-hdrs.c:602
-msgid "Click here for the address book"
-msgstr "�་བྱང་ཀི་དེབ་ཀྱི་དོན་ལས་ ནཱ་ལུ་ཨེབ་ག�ང་འབད�"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "གནས་བས�ྱོད་འབད་ནིའི་ ཡིག་སྣོད་ཚུ་སེལ་འ�ུ་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་ག�ང་འབད�"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:634
-msgid "_Reply-To:"
-msgstr "ལན་གསལ་ག�ང་ཡུལ་:(_R)"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:236
+msgid "Si_gnature:"
+msgstr "མིང་རྟགས:(_g)"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:641
+#: ../composer/e-msg-composer-hdrs.c:341
 msgid "Fr_om:"
 msgstr "ལས་:(_o)"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:648
-msgid "S_ubject:"
-msgstr "དོན་ཚན་:(_u)"
+#: ../composer/e-msg-composer-hdrs.c:347
+msgid "_Reply-To:"
+msgstr "ལན་གསལ་ག�ང་ཡུལ་:(_R)"
 
-#: ../composer/e-msg-composer-hdrs.c:657
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_To:"
 msgstr "ལུ་: (_T)"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:355
 msgid "Enter the recipients of the message"
 msgstr "འཕྲིན་དོན་ལེན་མ�ན་བཙུགས�"
 
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:361
 msgid "_Cc:"
 msgstr "ཤོག་ནང་འདྲ་བཤུས་: (_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:363
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "འཕྲིན་དོན་གྱི་ཤོག་གནག་འདྲ་བཤུས་ཅིག་འ�ོབ་ནིའི་ �་བྱང་ཚུ་བཙུགས�"
 
-#: ../composer/e-msg-composer-hdrs.c:665
+#: ../composer/e-msg-composer-hdrs.c:370
 msgid "_Bcc:"
 msgstr "མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་: (_B)"
 
-#: ../composer/e-msg-composer-hdrs.c:666
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
-msgstr "འཕྲིད་དོན་ལེན་མ�ན་གྱི་ �ོ་ཡིག་ནང་མ་�ོན་པར་ འཕྲིན་དོན་གྱི་ ཤོག་གནག་འདྲ་བཤུས་ཅིག་འ�ོབ་ནིའི་ �་བྱང་ཚུ་བཙུགས�"
+#: ../composer/e-msg-composer-hdrs.c:372
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "འཕྲིད་དོན་ལེན་མ�ན་གྱི་ �ོ་ཡིག་ནང་མ་�ོན་པར་ འཕྲིན་དོན་གྱི་ ཤོག་གནག་འདྲ་བཤུས་ཅིག་འ�ོབ་ནི་ཨིན་པའི་  �་བྱང་ཚུ་བཙུགས�"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:380
 msgid "_Post To:"
 msgstr "གནས་བས�ྱོད་ཡུལ་: (_P)"
 
-#: ../composer/e-msg-composer-hdrs.c:678
-msgid "Click here to select folders to post to"
-msgstr "གནས་བས�ྱོད་འབད་ནིའི་ ཡིག་སྣོད་ཚུ་སེལ་འ�ུ་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་ག�ང་འབད�"
-
-#: ../composer/e-msg-composer-hdrs.c:683
-msgid "Post To:"
-msgstr "གནས་བས�ྱོད་ཡུལ:"
+#: ../composer/e-msg-composer-hdrs.c:386
+msgid "S_ubject:"
+msgstr "དོན་ཚན་:(_u)"
 
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:77
 msgid "A_ttach"
 msgstr "མཉམ་སྦྲགས་འབད�(_t)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:198
 msgid "Insert Attachment"
 msgstr "མཉམ་སྦྲགསབཙུགས�"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:819
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ཕྱིར་ག�ང་འཕྲིན་དོན་ལུ་ མིང་རྟགས་བཀོད་མི་ཚུགས་པས� རྩིས་�ོ་འདི་གི་དོན་ལས་ མིང་རྟགས་ལག་�ྱེར་ གཞི་སྒྲིག་མ་འབད་བས�"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:826
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "ཕྱིར་ག�ང་འཕྲིན་དོན་ གསང་བ་བཟོ་མི་ཚུགས་པས� རྩིས་�ོ་འདི་གི་དོན་ལས་ གསང་བཟོའི་ལག་�ྱེར་ གཞི་སྒྲིག་མ་འབད་བས�"
 
-#: ../composer/e-msg-composer.c:1297
-#: ../composer/e-msg-composer.c:2559
+#: ../composer/e-msg-composer.c:1418
+#: ../composer/e-msg-composer.c:2516
 msgid "Hide _Attachment Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_A)"
 
-#: ../composer/e-msg-composer.c:1300
-#: ../composer/e-msg-composer.c:2562
-#: ../composer/e-msg-composer.c:3931
+#: ../composer/e-msg-composer.c:1421
+#: ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3878
 msgid "Show _Attachment Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན�(_A)"
 
-#: ../composer/e-msg-composer.c:1332
-#: ../composer/e-msg-composer.c:1366
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1453
+#: ../composer/e-msg-composer.c:1487
 msgid "Unknown reason"
 msgstr "རྒྱུ་མཚན་ཧ་མ་གོ"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1525
 msgid "Could not open file"
 msgstr "ཡིག་སྣོད་�་ཕྱེ་མ་ཚུགས�"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
 msgstr "ཞུན་དགཔ་ལས་ འཕྲིན་དོན་སླར་འདྲེན་འབད་མི་ཚུགས་པས�"
 
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
 msgstr "མགོ་མིང་མ་བ�གས་པའི་འཕྲིན་དོན�"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1856
 msgid "Open File"
 msgstr "ཡིག་སྣོད་�་ཕྱེ�"
 
-#: ../composer/e-msg-composer.c:2194
-#: ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "རང་བཞིན་གྱིས་བཟོ་བས�ྲུན་འབད་ཡོདཔ�"
-
-#: ../composer/e-msg-composer.c:2297
-msgid "Si_gnature:"
-msgstr "མིང་རྟགས:(_g)"
-
-#: ../composer/e-msg-composer.c:2573
-#: ../composer/e-msg-composer.c:3813
-#: ../composer/e-msg-composer.c:3816
+#: ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:3758
+#: ../composer/e-msg-composer.c:3761
 msgid "Compose Message"
 msgstr "འཕྲིན་དོན་བརྩམས�"
 
-#: ../composer/e-msg-composer.c:5041
+#: ../composer/e-msg-composer.c:5031
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(རྩོམ་མ�ན་ལུ་ ཞུན་དག་འབད་མ་བ�ུབ་པའི་ ཚིག་ཡིག་མེན་པའི་ འཕྲིན་དོན་མ་གཟུགས་ཅིག་འདུག�)<b>"
 
@@ -10470,6 +10222,7 @@ msgid "_Do not Recover"
 msgstr "སླར་སོར་མ་འབད�(_D)"
 
 #: ../composer/mail-composer.error.xml.h:31
+#: ../shell/main.c:317
 msgid "_Recover"
 msgstr "སླར་གསོ་འབད�(_R)"
 
@@ -10478,19 +10231,17 @@ msgid "_Save Message"
 msgstr "འཕྲིན་དོན་སྲུངས� (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:502
-msgid "Evolution"
-msgstr "ཨི་བོ་ལུ་ཤཱན�"
+msgid "Evolution Mail and Calendar"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་འཕྲིན་དང་ ཟླ་�ོ་ "
 
 #: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:584
+#: ../shell/e-shell-window-commands.c:753
 msgid "Groupware Suite"
 msgstr "གུ་རུབ་�ེར་ སུཊི�"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ ཡིག་འཕྲིན་ཞབས་�ོ་སྤྱོད་མི�"
+msgid "Manage your email, contacts and schedule"
+msgstr "�ྱོད་རའི་གློག་འཕྲིན་དང་ འབྲེལ་ས་ དེ་ལས་ འཆར་རིམ་ཚུ་ འཛིན་ས�ྱོང་འབད་ "
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10500,102 +10251,6 @@ msgstr "�་བྱང་ཤོག་བྱང་�"
 msgid "calendar information"
 msgstr "ཟླ་�ོའི་བརྡ་དོན�"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>ད་ལྟོ་�ྱོད་ཀྱི་ གནས་ཚད་དེ་ \"Out of the Office\" ཨིན་མས�</b>\n"
-"\n"
-"�ྱོད་ཀྱི་ གནས་ཚད་དེ་ \"In the Office\" ལུ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>ཡིག་ཚང་གི་འཕྲིན་དོན་ཕྱི་�ར་:</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>གནས་ཚད་:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small་>འོག་ལུ་གསལ་བཀོད་འབད་མི་ འཕྲིན་དོན་དེ་ �ྱོད་རང་ཡིག་ཚང་གི་ཕྱི་�ར་ཨིན་པའི་ས�བས་ \n"
-"�ྱོད་ལུ་ཡིག་འཕྲིན་ས�ྱེལ་མི་ ཆ་མཉམ་ལུ་ རང་བཞིན་གྱིས་བས�ྱལ་འོང་</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "ད་ལྟོ་ང་ ཡིག་ཚང་ནང་ཨིན�"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "ད་ལྟོ་ང་ ཡིག་ཚང་གི་ཕྱི་�ར་ཨིན�"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "མེན� གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད�"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "ཡིག་ཚང་ལས་རོགས་ཀྱི་ཕྱི་�ར�"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "བ�ུབ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད�"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>གློག་འཕྲིན་�ོབ་དོ�</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>གློག་འཕྲིན་ག�ང་དོ�</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
-msgstr "ཤོག་ལེབ་འདི་གིས་ �ྱོད་ཀྱིས་བ�ང་མི་འཕྲིན་དོན་དེ་ལྷག་པའི་ས�བས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་བརྒྱུད་དེ་ �ྱོད་ལུ་བརྡ་དོན་འབད་ནིའི་ གདམ་�་བར�ྱབ་ཚུགས་ནི་དང་ གཞན་མི་གཅིག་གིས་ �ྱོད་ལས་འབྱོར་རྟགས་དགོ་པའི་ཞུ་བ་འབད�་ད་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན་ གསལ་བཀོད་འབད་ཚུགས�"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "ཨ་རྟག་རང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ལོག་ས�ྱེལ་�"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "ང་ལུ་ ལྷག་ཡོད་པའི་ འབྱོར་རྟགས་ཅིག་ ག�ང་དགོ་ག་མི་དགོ་དྲིས�"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "ནམ་ཡང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ལོག་མ་ག�ང་�"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "འབྱོར་རྟགས་ཚུ་ལྷག"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "ང་གིས་བས�ྱལ་མི་ འཕྲིན་དོན་ཆ་མཉམ་གྱི་དོན་ལས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ས�ྱེལ་གནང་�"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "འཕྲིད་དོན་དེ་ འཕྲིན་ས�ྱེལ་�ོ་ཡིག་ཅིག་ནང་ བ�ངམ་མ་ག�ོགས ང་རང་ལུ་དངོས་སུ་མེན་པ་ཅིན�"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
-msgstr "�ྱོད་ཀྱིས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་དགོ་པའི་ ཞུ་བ་དང་སྦྲགས་�ེ་ འཕྲིད་དོན་ཅིག་�ོབ་པའི་ས�བས ཨི་བོ་ལུ་ཤཱན་གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན?"
-
 #: ../e-util/e-error.c:86
 #: ../e-util/e-error.c:87
 #: ../e-util/e-error.c:129
@@ -10617,11 +10272,23 @@ msgid "Evolution Query"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་འདྲི་དཔྱད�"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:458
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ནང་འ�ོད་ཀྱི་འཛོལ་བ་ མ་ཤེས་པའི་འཛོལ་བ་ '%s' ཞུ་བ་འབད་ཡོདཔ�"
 
+#: ../e-util/e-print.c:138
+msgid "An error occurred while printing"
+msgstr "དཔར་བས�ྲུན་འབད་བའི་ས�བས་ལུ་ འཛོལ་བ་ཅིག་འབྱུང་ནུག� "
+
+#: ../e-util/e-print.c:145
+msgid "The printing system reported the following details about the error:"
+msgstr "དཔར་བས�ྲུན་ རིམ་ལུགས་དེ་གིས་ འཛོལ་བ་དེའི་ས�ོར་ལས་ འོག་གི་ རྒྱས་བཤད་ཚུ་སྙན་ཞུ་འབད་ཡི:"
+
+#: ../e-util/e-print.c:151
+msgid "The printing system did not report any additional details about the error."
+msgstr "དཔར་བས�ྲུན་རིམ་ལུགས་དེ་གིས་ འཛོལ་བ་དེའི་ས�ོར་ལས་ རྒྱས་བཤད་ ཧེང་བཀལ་ག་ནི་ཡང་སྙན་ཞུ་མ་འབད� "
+
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "ཡིག་སྣོད་&quot;{0}&quot;�་ཕྱེ་མི་ཚུགས�"
@@ -10643,160 +10310,232 @@ msgid "Overwrite file?"
 msgstr "ཡིག་སྣོད་སླར་བསྲུང་འབད་ནི་ཨིན་ན?"
 
 #: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "ཚབ་སྲུང་འབད� (_O)"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "སྣོད་ཀྱི་ཕྱོགས�"
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "གལ་ཅན�(_m)"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "ལཱ་གཡོག(_W)"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "རང་དོན�(_P)"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "ཊུ་ཌུ�(_T)"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "ཤུལ་ལས�(_L)"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "�་ཡིག་གི་ མིང་: (_N)"
+
+#: ../e-util/e-util-labels.c:340
+msgid "Edit Label"
+msgstr "�་ཡིག་ ཞུན་དག་འབད་"
+
+#: ../e-util/e-util-labels.c:340
+msgid "Add Label"
+msgstr "�་ཡིག་ �་ས�ོང་ར�ྱབས་ "
+
+#: ../e-util/e-util-labels.c:359
+msgid "Label name cannot be empty."
+msgstr "�་ཡིག་གི་མིང་ སྟོངམ་བཞག་མི་བ�ུབ� "
 
-#: ../filter/filter-datespec.c:78
+#: ../e-util/e-util-labels.c:364
+msgid "Label with same tag already exists. Rename your label please."
+msgstr "ངོ་རྟགས་ཅོག་འ�དཔ་སྦེ་མི་ �་ཡིག་ཧེ་མ་ལས་རང་འདུག� �ྱོད་རའི་�་ཡིག་ལུ་ བས�ྱར་མིང་བ�གས� "
+
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "ས�ར་ཆ་ ༡ གི་ཧེ་མ�"
 msgstr[1] "ས�ར་ཆ་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "མ་འོངས་པ་ལུ་ ས�ར་ཆ་ ༡"
+msgstr[1] "མ་འོངས་པ་ལུ་ ས�ར་ཆ་ %d "
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "ས�ར་མ་ ༡ གི་ཧེ་མ�"
 msgstr[1] "ས�ར་མ་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "མ་འོངས་པ་ནང་ ས�ར་མ་ ༡"
+msgstr[1] "མ་འོངས་པ་ནང་ ས�ར་མ་ %d "
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "ཆུ་ཚོད་ ༡ གི་ཧེ་མ�"
 msgstr[1] "ཆུ་ཚོད་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "མ་འོངས་པ་ལུ་ ཆུ་ཚོད་ ༡"
+msgstr[1] "མ་འོངས་པ་ལུ་ ཆུ་ཚོད་ %d "
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "ཉིནམ་ ༡ གི་ཧེ་མ�"
 msgstr[1] "ཉིནམ་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "མ་འོངས་པ་ནང་ ཉིནམ་ ༡"
+msgstr[1] "མ་འོངས་པ་ནང་ ཉིནམ་ %d"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "བདུན་ཕྲག་ ༡ གི་ཧེ་མ�"
 msgstr[1] "བདུན་ཕྲག་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "མ་འོངས་པ་ལུ་ བདུན་ཕྲག་ ༡"
+msgstr[1] "མ་འོངས་པ་ལུ་ བདུན་ཕྲག་ %d"
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "ཟླ�་ ༡ གི་ཧེ་མ�"
 msgstr[1] "ཟླ�་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "མ་འོངས་པ་ནང་ ཟླ�་  ༡"
+msgstr[1] "མ་འོངས་པ་ནང་ ཟླ�་ %d"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "ལོ་ ༡ གི་ཧེ་མ�"
 msgstr[1] "ལོ་%d གི་ཧེ་མ�"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "མ་འོངས་པ་ནང་ ལོ་ ༡"
+msgstr[1] "མ་འོངས་པ་ནང་ ལོ་ %d"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "ཚེས་གྲངས་སེལ་འ�ུ་འབད་ནིའི་དོན་ལུ་ ནཱ་ལུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../filter/filter-datespec.c:288
-#: ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "ད་ལྟོ་�"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "ག་བསྡུར་བར�ྱབ་ནིའི་དོན་ལས་ དུས་ཚོད་ཅིག་སེལ་འ�ུ་འབད�"
 
-#: ../filter/filter-file.c:296
-#: ../filter/filter-file.c:302
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "ཡིག་སྣོད་ཅིག་ གདམ་�་ར�ྱབས�"
 
-#: ../filter/filter-label.c:120
-#: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
-#: ../mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "གལ་ཅན�"
-
-#. forest green
-#: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "ཊུ་ཌུ"
-
-#. blue
-#: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "ཤུལ་ལས�"
-
-#: ../filter/filter-part.c:532
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "བརྟག་ཞིབ�"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "མིང་འཚོལ་ཞིབ་འབད་: (_S)"
+#: ../filter/filter-rule.c:800
+msgid "R_ule name:"
+msgstr "ལམ་ལུགས་ཀྱི་མིང་: (_U)"
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "འོག་གི་�ྱད་ཚད་ཚང་མི་ རྣམ་གྲངས་ཚུ་འཚོལ�"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:862
+msgid "A_dd Filter Criteria"
+msgstr "ཚགས་མའི་ལམ་ལུགས་ �་ས�ོང་བར�ྱབ་ (_D)"
+
+#: ../filter/filter-rule.c:868
 msgid "If all criteria are met"
 msgstr "�ྱད་ཚད་ཆ་མཉམ་ཚང་པ་ཅིན�"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:868
 msgid "If any criteria are met"
 msgstr "�ྱད་ཚད་གང་རུང་ཚང་པ་ཅིན�"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:870
 msgid "_Find items:"
 msgstr "རྣམ་གྲངས་ཚུ་འཚོལ: (_F)"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "All related"
 msgstr "ཆ་མཉམ་འབྲེལ་བ་ཅན�"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "Replies"
 msgstr "ལན་གསལ་ཚུ�"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "Replies and parents"
 msgstr "ལན་གསལ་ཚུ་དང་ རྩ་ལག་ཚུ�"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "No reply or parent"
 msgstr "ལན་གསལ་ ཡང་ན་ མ་ལག་མིན་འདུག"
 
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
-msgstr "�ེརེཌི་གྲངས་སུ་བཙུགས�"
+#: ../filter/filter-rule.c:894
+msgid "I_nclude threads"
+msgstr "�ེརེཌི་གྲངས་སུ་བཙུགས་ (_N)"
 
-#: ../filter/filter-rule.c:987
+#: ../filter/filter-rule.c:990
 #: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "ནང་འབྱོར�"
 
-#: ../filter/filter-rule.c:987
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:990
+#: ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ཕྱིར་ག�ང་�"
 
@@ -10821,7 +10560,7 @@ msgid "Missing file name."
 msgstr "ཡིག་སྣོད་ཀྱི་མིང་བརླག་སྟོར�"
 
 #: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "མིང་བརླག་སྟོར�"
 
@@ -10889,36 +10628,47 @@ msgstr "ད་ལྟོའི་དུས་ཚོད་དང་འབྲེལ
 msgid "ago"
 msgstr "ཧེ་མ�"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr "མ་འོངས་པ་ལུ་ "
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "ཟླ��"
 
-#: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:19
+#: ../mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "ས�ར་ཆ�"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "ད་ལྟོའི་ཆུ་ཚོད"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "�ྱོད་ཀྱིས་གསལ་བཀོད་འབད་མི་ཆུ་ཚོད�"
 
 #: ../filter/filter.glade.h:22
+#: ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:398
+msgid "weeks"
+msgstr "བདུན་ཕྲག་ཚུ�"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "ལོ�"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "ལམ་ལུགས་�་ས�ོང་ར�ྱབས�"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "ལམ་ལུགས་ཞུན་དག་ར�ྱབས�"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "ལམ་ལུགས་ཀྱི་མིང་�"
 
@@ -10963,24 +10713,23 @@ msgid "Evolution Mail preferences control"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་འཕྲིན་གྱི་ དགའ་གདམ་ཚད་འཛིན�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:524
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:581
-#: ../mail/mail-component.c:582
-#: ../mail/mail-component.c:724
+#: ../mail/em-folder-view.c:614
+#: ../mail/importers/elm-importer.c:329
+#: ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:576
+#: ../mail/mail-component.c:740
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ཡིག་འཕྲིན�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:502
 msgid "Mail Accounts"
 msgstr "ཡིག་འཕྲིན་རྩིས་�ོ�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Preferences"
 msgstr "ཡིག་འཕྲིན་གྱི་དགའ་གདམ"
 
@@ -11008,133 +10757,135 @@ msgstr ""
 
 #: ../mail/em-account-editor.c:482
 #: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:510
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "སྣོད་འཛིན་སེལ་འ�ུ་འབད�"
 
+#: ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718
+#: ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "རང་བཞིན་གྱིས་བཟོ་བས�ྲུན་འབད་ཡོདཔ�"
+
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "འཕྲིན་དོན་རེ་རེའི་དོན་ལུ་དྲིས�"
 
-#: ../mail/em-account-editor.c:1812
-#: ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1826
+#: ../mail/mail-config.glade.h:93
 msgid "Identity"
 msgstr "ངོ་རྟགས�"
 
-#: ../mail/em-account-editor.c:1861
-#: ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1875
+#: ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "གློག་འཕྲིན་འ�ོབ་དོ�"
 
-#: ../mail/em-account-editor.c:2046
-msgid "Automatically check for _new mail every"
-msgstr "ཡིག་འཕྲིན་གསརཔ་ ཡོད་ཚད་གཅིགཔ་ རང་བཞིན་གྱིས་ ཞིབ་དཔྱད་འབད�(_n)"
+#: ../mail/em-account-editor.c:2057
+msgid "Check for _new messages every"
+msgstr "ཡིག་འཕྲིན་གསརཔ་  ཞིབ་དཔྱད་འབད་(_N)"
 
-#: ../mail/em-account-editor.c:2227
-#: ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2065
+msgid "minu_tes"
+msgstr "ས�ར་མ་ (_T)"
+
+#: ../mail/em-account-editor.c:2239
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Email"
 msgstr "གློག་འཕྲིན་ག�ང་དོ�"
 
-#: ../mail/em-account-editor.c:2286
-#: ../mail/mail-config.glade.h:65
+#: ../mail/em-account-editor.c:2298
+#: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "སྔོན་སྒྲིག"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352
-#: ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2364
+#: ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "སྲུང་ས�ྱོབ�"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389
-#: ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2401
+#: ../mail/em-account-editor.c:2492
 msgid "Receiving Options"
 msgstr "གདམ་�་འ�ོབ་དོ�"
 
-#: ../mail/em-account-editor.c:2390
-#: ../mail/em-account-editor.c:2481
-msgid "Checking for New Mail"
-msgstr "ཡིག་འཕྲིན་གསརཔ་ཡོད་མེད་ ཞིབ་དཔྱད་ར�ྱབ་དོ�"
+#: ../mail/em-account-editor.c:2402
+#: ../mail/em-account-editor.c:2493
+msgid "Checking for New Messages"
+msgstr "ཡིག་འཕྲིན་གསརཔ་ཡོད་མེད་ ཞིབ་དཔྱད་ར�ྱབ་དོ་"
 
-#: ../mail/em-account-editor.c:2832
-#: ../mail/mail-config.glade.h:31
+#: ../mail/em-account-editor.c:2844
+#: ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "རྩིས་�ོའི་ཞུན་དགཔ�"
 
-#: ../mail/em-account-editor.c:2832
-#: ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2844
+#: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ རྩིས་�ོའི་ལས་རོགས�"
 
-#: ../mail/em-account-prefs.c:331
-#: ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "ལྕོགས་མིན་བཟོ�"
-
-#: ../mail/em-account-prefs.c:331
-#: ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "ལྕོགས་ཅན་བཟོ�"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:436
 msgid "[Default]"
 msgstr "[སྔོན་སྒྲིག]�"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519
-#: ../mail/em-composer-prefs.c:941
-#: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:489
+#: ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
+#: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "ལྕོགས་ཅན�"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:495
 msgid "Account name"
 msgstr "རྩིས་�ོའི་མིང་�"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:497
 msgid "Protocol"
 msgstr "གནད་སྤེལ་ལམ་ལུགས�"
 
-#: ../mail/em-composer-prefs.c:310
-#: ../mail/em-composer-prefs.c:436
-#: ../mail/mail-config.c:1029
+#: ../mail/em-composer-prefs.c:304
+#: ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:1062
 msgid "Unnamed"
 msgstr "མིང་མ་བ�གསཔ�"
 
-#: ../mail/em-composer-prefs.c:947
+#: ../mail/em-composer-prefs.c:953
 msgid "Language(s)"
 msgstr "ས�ད་ཡིག་(ཚུ)�"
 
-#: ../mail/em-composer-prefs.c:990
+#: ../mail/em-composer-prefs.c:996
 msgid "Add signature script"
 msgstr "མིང་རྟགས་ཡིག་ཚུགས་ �་ས�ོང་ར�ྱབས�"
 
-#: ../mail/em-composer-prefs.c:1010
+#: ../mail/em-composer-prefs.c:1016
 msgid "Signature(s)"
 msgstr "མིང་རྟགས(ཚུ)"
 
-#: ../mail/em-composer-utils.c:874
-#: ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:902
+#: ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "-----གདོང་བས�ྱོད་འབད་ཡོད་པའི་འཕྲིན་དོན་-----"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1713
 msgid "an unknown sender"
 msgstr "ས�ྱེལ་མི་ ངོ་མ་ཤེསཔ་ཅིག"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1760
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "$ལུ་ (ཨེབ་བིརིབ་ �ིཀ་ཌེ་ ནེམ) $(ལོ)-$(ཟླ�)-$(གཟའ) $ ལུ(ཆུ་ཚོད་༢༤): $(ས�ར་མ)�$(ཆུ་ཚོད་གླིང་སྡེ)་$(ས�ྱེལ་མི) བྲིས་ཡོདཔ་:"
 
+#: ../mail/em-composer-utils.c:1901
+msgid "-----Original Message-----"
+msgstr "-----འཕྲིན་དོན་ངོ་མ་-----"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "བཙག་ནིའི་ལམ་ལུགས� (_F)"
@@ -11157,27 +10908,39 @@ msgid "Attachments"
 msgstr "མཉམ་སྦྲགས་ཚུ�"
 
 #: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "བི་བི་སི་ "
+
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "བརྡ་ས�ད་ར�ྱབས�"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "སི སི"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "མཇུག་བསྡུ་ཡོདཔ་ "
+
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "ནང་ན་ཡོད�"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "སྣོད་འཛིན་ནང་ འདྲ་བཤུས་ར�ྱབས�"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "ཚེས་གྲངས་�ོབ་ཡོད�"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "ཚེས་གྲངས་བ�ང་ཡོད�"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
 #: ../ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25
@@ -11186,283 +10949,306 @@ msgstr "ཚེས་གྲངས་བ�ང་ཡོད�"
 msgid "Delete"
 msgstr "བ�ོན་ག�ང་�"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "བ�ོན་བ�ང་ཡོད�"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ནང་ན་མེད�"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "�ོག་ལས་མཇུག་མི་བསྡུ�"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "གནས་�ེ་མིན་འདུག"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "སླར་མི་ལོག"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "བཟུམ་སྦེ་མི་གོ�་བས�"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "�ོག་ལས་འགོ་མི་བཙུགས�"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "གནས་�ེ་མིན་འདུག"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "ཟིན་བྲིས�"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "�ོག་ལས་་རྫོགསཔ་ཨིན�"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "གནས་�ེ་འདུག"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "གནས་�ེ་འདུག"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "གསལ་བརྗོད�"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "ཤུལ་དཔྱད�"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "གལ་ཅན�"
+
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "ཨིན�"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "ཤུལ་ལས་ཨིན�"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "ཧེ་མ་ཨིན�"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "ཟུར་རྟགས་བཀལ་ཡོད�"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "ལས་མངམ�"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "ལས་ཉུངམ�"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "མེན�"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ཟུར་རྟགས་མ་བཀལ་བས�"
 
-#: ../mail/em-filter-i18n.h:35
-#: ../mail/mail-config.glade.h:92
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "གཞི་སྒྲིག་འབད་དེ་མིན་ནུག་ "
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "གཞི་སྒྲིག་འབད་ནུག་ "
+
+#: ../mail/em-filter-i18n.h:40
+#: ../mail/mail-config.glade.h:96
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "མ�ོ་མེད�"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "མ�ོ་མེད་བརྟག་ཞིབ�"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:42
 #: ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "�་ཡིག"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "ཡིག་འཕྲིན་�ོ་ཡིག"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "ཆ་མཉམ་མ�ུན་སྒྲིག་འབད�"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "འཕྲིན་དོན་མ་གཟུགས�"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "འཕྲིན་དོན་མགོ་ཡིག"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "འཕྲིན་དོན་མ�ོ་མེད་ཨིན་པས�"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "འཕྲིན་དོན་མ�ོ་མེད་མེན་པས�"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ སྤོ་བཤུད་འབད�"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "ལས་རིམ་ལུ་མ�ུད�"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "སྒྲ་ས�ད་ག�ང་�"
 
-#: ../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:53
+#: ../mail/message-tag-followup.c:82
 msgid "Read"
 msgstr "ལྷག"
 
-#: ../mail/em-filter-i18n.h:48
-#: ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ལེན་མ�ན�"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "རི་ཇེགསི་ མ�ུན་སྒྲིག"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "ལུ་ལན་གསལ་བ�ང་ཡོད�"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "སླར་ལོག"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "ལས་མངམ་སྦེ་ སླར་ལོགཔ་ཨིན�"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "ལས་ཉུངམ་སྦེ་ སླར་ལོགཔ་ཨིན�"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "ལས་རིམ་གཡོག་བཀོལ�"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "ས�ུགས་གྲངས�"
 
-#: ../mail/em-filter-i18n.h:56
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ག�ང་མི�"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "�་ཡིག་ གཞི་སྒྲིག་འབད་ "
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "གནས་ཚད་གཞི་སྒྲིག་འབད�"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "ཚད་(ཀེ་བི)�"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "བཟུམ་སྦེ་གོ�་མས�"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "འབྱུང་�ུངས་རྩིས་�ོ�"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "དམིགས་བསལ་མགོ་ཡིག"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "�ོག་ལས་་འགོ་བཙུགསཔ་ཨིན�"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "ལས་སྦྱོར་བཀག"
 
-#: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1660
-#: ../mail/em-format-quote.c:313
-#: ../mail/em-format.c:852
-#: ../mail/em-mailer-prefs.c:94
-#: ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-format-html.c:1710
+#: ../mail/em-format-quote.c:322
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:95
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "དོན་ཚན�"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "གནས་ཚད་སྒྲིག་བཤོལ་འབད�"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>དེ་ལས་</b>"
+#: ../mail/em-filter-rule.c:489
+msgid "Then"
+msgstr "དེ་ལས་ "
 
-#: ../mail/em-folder-browser.c:168
+#: ../mail/em-filter-rule.c:517
+msgid "Add Ac_tion"
+msgstr "བྱ་བ་�་ས�ོང་ར�ྱབས་(_T)"
+
+#: ../mail/em-folder-browser.c:191
 msgid "C_reate Search Folder From Search..."
 msgstr "འཚོལ་ཞིབ་ནང་ལས་ འཚོལ་ཞིབ་སྣོད་འཛིན་ གསར་བས�ྲུན་འབད�(_r)"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:216
 msgid "All Messages"
 msgstr "འཕྲིན་དོན་ཆ་མཉམ�"
 
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:217
 msgid "Unread Messages"
 msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:219
 msgid "No Label"
 msgstr "�་ཡིག་མིན་འདུག�"
 
-#: ../mail/em-folder-browser.c:200
+#: ../mail/em-folder-browser.c:226
 msgid "Read Messages"
 msgstr "ལྷག་ཚར་མི་ འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:227
 msgid "Recent Messages"
 msgstr "འཕྲལ་གྱི་འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:228
 msgid "Last 5 Days' Messages"
 msgstr "འདས་པའི་ཉིནམ་ ༥ གི་འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:229
 msgid "Messages with Attachments"
 msgstr "མཉམ་སྦྲགས་དང་བཅས་པའི་འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:230
 msgid "Important Messages"
 msgstr "གལ་ཅན་འཕྲིན་དོན་ཚུ� "
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:231
 msgid "Messages Not Junk"
 msgstr "མ�ོ་མེད་མེན་པའི་འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/em-folder-browser.c:1028
+#: ../mail/em-folder-browser.c:1127
 msgid "Account Search"
 msgstr "རྩིས་�ོའི་འཚོལ་ཞིབ�"
 
-#: ../mail/em-folder-browser.c:1072
+#: ../mail/em-folder-browser.c:1180
 msgid "All Account Search"
 msgstr "རྩིས་�ོའི་འཚོལ་ཞིབ་ཆ་མཉམ�"
 
@@ -11482,59 +11268,61 @@ msgstr[0] "འཕྲིན་དོན་བསྡོམས་:"
 msgstr[1] "འཕྲིན་དོན་བསྡོམས་: "
 
 #: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "སྣོད་འཛིན་གྱི་རྒྱུ་དངོས་ཚུ�"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
 msgid "<click here to select a folder>"
 msgstr "<སྣོད་འཛིན་ཅིག་ སེལ་འ�ུ་འབད་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་ག�ང་འབད>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "གསར་བས�ྲུན་འབད"
+#: ../mail/em-folder-selector.c:262
+msgid "C_reate"
+msgstr "གསར་བས�ྲུན་འབད་(_R)"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "སྣོད་འཛིན་མིང་: (_n)"
 
-#: ../mail/em-folder-tree-model.c:203
-#: ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911
-#: ../mail/mail-vfolder.c:984
+#: ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:935
+#: ../mail/mail-vfolder.c:1020
 msgid "Search Folders"
 msgstr "སྣོད་འཛིན་ཚུ་འཚོལ་ཞིབ་འབད�"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209
-#: ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "མ�ུན་མིན�"
 
-#: ../mail/em-folder-tree-model.c:484
-#: ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:494
+#: ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "ཟིན་བྲིས་ཚུ�"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487
-#: ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:497
+#: ../mail/em-folder-tree.c:2540
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "ཨིན་བོགསི�"
 
-#: ../mail/em-folder-tree-model.c:490
-#: ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:500
+#: ../mail/mail-component.c:158
 msgid "Outbox"
 msgstr "ཨའུཊི་བོགསི"
 
-#: ../mail/em-folder-tree-model.c:492
-#: ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:502
+#: ../mail/mail-component.c:159
 msgid "Sent"
 msgstr "བ�ང་ཡོད�"
 
-#: ../mail/em-folder-tree-model.c:514
-#: ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:524
+#: ../mail/em-folder-tree-model.c:831
 msgid "Loading..."
 msgstr "མངོན་གསལ་འབད་དོ་...�"
 
@@ -11553,653 +11341,758 @@ msgstr "མངོན་གསལ་འབད་དོ་...�"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:367
+#: ../mail/em-folder-tree.c:372
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:719
+#: ../mail/em-folder-tree.c:732
 msgid "Mail Folder Tree"
 msgstr "ཡིག་འཕྲིན་སྣོད་འཛིན་གྱི་རྩ་འབྲེལ�"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:891
 #, c-format
 msgid "Moving folder %s"
 msgstr "འགུལ་བས�ྱོད་འབད་མི་སྣོད་འཛིན་%s"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Copying folder %s"
 msgstr "སྣོད་འཛིན་%sའདྲ་བཤུས་ར�ྱབ་དོ�"
 
-#: ../mail/em-folder-tree.c:888
-#: ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:900
+#: ../mail/message-list.c:1974
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་%sནང་ལུ་ སྤོ་བཤུད་འབད་དོ�"
 
-#: ../mail/em-folder-tree.c:890
-#: ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:902
+#: ../mail/message-list.c:1976
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་%sནང་ལུ་ འདྲ་བཤུས་ར�ྱབ་དོ�"
 
-#: ../mail/em-folder-tree.c:906
+#: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "འཕྲིན་དོན་(ཚུ)ཆེ་རིམ་མཛོད་�ང་ནང་ བཀོག་བཞག་མི་ཚུགས་པས�"
 
-#: ../mail/em-folder-tree.c:1002
+#: ../mail/em-folder-tree.c:994
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་ར�ྱབས� (_C)"
 
-#: ../mail/em-folder-tree.c:1003
+#: ../mail/em-folder-tree.c:995
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ སྤོ་བཤུད་འབད� (_M)"
 
-#: ../mail/em-folder-tree.c:1708
-#: ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1709
+#: ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "སྣོད་འཛིན་ཚུ་\"%s\"ནང་ལུ་ ཞིབ་ལྟ་འབད་དོ�"
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2082
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:29
+#: ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:58
+#: ../ui/evolution-message-composer.xml.h:63
 #: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "མ�ོང་སྣང་� (_V)"
 
-#: ../mail/em-folder-tree.c:2092
+#: ../mail/em-folder-tree.c:2083
 msgid "Open in _New Window"
 msgstr "�ིན་ཌོ་གསར་པའི་ནང་�་ཕྱེ� (_N)"
 
-#: ../mail/em-folder-tree.c:2096
-msgid "_Copy..."
-msgstr "འདྲ་བཤུས་...(_C)"
-
-#: ../mail/em-folder-tree.c:2097
-msgid "_Move..."
-msgstr "སྤོ་བཤུད་འབད་...(_M)"
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2088
 msgid "_New Folder..."
 msgstr "སྣོད་འཛིན་གསརཔ་...(_N)"
 
-#: ../mail/em-folder-tree.c:2104
-#: ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2091
+msgid "_Move..."
+msgstr "སྤོ་བཤུད་འབད་...(_M)"
+
+#: ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "བས�ྱར་མིང་བ�གས་...(_R)"
 
-#: ../mail/em-folder-tree.c:2109
-#: ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2099
+msgid "Re_fresh"
+msgstr "ཡང་སེལ་ (_F)"
+
+#: ../mail/em-folder-tree.c:2100
+msgid "Fl_ush Outbox"
+msgstr "ཨའུཊི་བོགསི་ སྟོངམ་སྟོན་ "
+
+#: ../mail/em-folder-tree.c:2106
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_ཕྱགས་ཧོད་སྟོངམ་བ�ོན� (_E)"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'ལས་`%s'ལུ་ འདྲ་བཤུས་ར�ྱབ་དོ"
 
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1031
-#: ../mail/em-folder-view.c:1046
+#: ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1195
+#: ../mail/em-folder-view.c:1210
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "སྣོད་འཛིན་སེལ་འ�ུ་འབད�"
 
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1046
+#: ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1210
 msgid "C_opy"
 msgstr "འདྲ་བཤུས� (_o)"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "སྣོད་འཛིན་`%s' གསར་བས�ྲུན་འབད་དོ�"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "སྣོད་འཛིན་གསར་བས�ྲུན་འབད�"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "སྣོད་འཛིན་ག་�ེ་ལུ་ གསར་བས�ྲུན་འབད་ནི་ཨིན་ན་ གསལ་བཀོད་འབད�"
 
-#: ../mail/em-folder-view.c:967
-#: ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:1099
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ཡིག་འཕྲིན་བ�ོན་ག�ང་ནི་འ�ུས་ཤོར་བྱུང་ནུག"
 
-#: ../mail/em-folder-view.c:968
-#: ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:1100
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ཡིག་འཕྲིན་འདི་བ�ོན་ག�ང་ནིའི་དོན་ལུ་ �ྱོད་ལུ་གནང་བ་ལངམ་སྦེ་མིན་འདུག"
 
-#: ../mail/em-folder-view.c:1139
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1338
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "ག�ང་མི་ལུ་ལན་གསལ་ག�ང་� (_R)"
 
-#: ../mail/em-folder-view.c:1141
-#: ../mail/em-popup.c:561
-#: ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1340
+#: ../mail/em-popup.c:578
+#: ../mail/em-popup.c:589
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "གདོང་བས�ྱོད� (_F)"
 
-#: ../mail/em-folder-view.c:1144
+#. 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:1344
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "འཕྲིན་དོན་གསརཔ་སྦེ་ ཞུན་དག་ར�ྱབས� (_E)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1346
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "དཔར་བས�ྲུན་...(_P)"
+
+#: ../mail/em-folder-view.c:1350
 msgid "U_ndelete"
 msgstr "བ�ོན་བཤོལ� (_n)"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1351
 msgid "_Move to Folder..."
 msgstr "སྣོད་འཛིན་ལུ་སྤོ་བཤུད་འབད་...(_M)"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1352
 msgid "_Copy to Folder..."
 msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་ར�ྱབས་...(_C)"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1355
 msgid "Mar_k as Read"
 msgstr "ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ� (_k)"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as _Unread"
 msgstr "མ་ལྷགཔ་སྦེ་ རྟགས་བཀལ� (_U)"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Important"
 msgstr "གལ་ཅན་སྦེ་ རྟགས་བཀལ� (_I)"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as Un_important"
 msgstr "གལ་ཅན་མེནམ་སྦེ་ རྟགས་བཀལ� (_i)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1359
 msgid "Mark as _Junk"
 msgstr "མ�ོ་མེད་སྦེ་ རྟགས་བཀལ� (_J)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1360
 msgid "Mark as _Not Junk"
 msgstr "མ�ོ་མེད་མེནམ་སྦེ་ རྟགས་བཀལ� (_N)"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1361
 msgid "Mark for Follo_w Up..."
 msgstr "ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ རྟགས་བཀལ་...(_w)"
 
-#: ../mail/em-folder-view.c:1163
+#: ../mail/em-folder-view.c:1363
 msgid "_Label"
 msgstr "�་ཡིག(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1164
-#: ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1364
+#: ../widgets/misc/e-dateedit.c:500
 msgid "_None"
 msgstr "ཅི་མེད�(_N)"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1367
+msgid "_New Label"
+msgstr "�་ཡིག་གསརཔ་ (_N)"
+
+#: ../mail/em-folder-view.c:1371
 msgid "Fla_g Completed"
 msgstr "ཟུར་རྟགས་མཇུག་བསྡུ་ཡོད� (_g)"
 
-#: ../mail/em-folder-view.c:1170
+#: ../mail/em-folder-view.c:1372
 msgid "Cl_ear Flag"
 msgstr "ཟུར་རྟགས་བསལ� (_e)"
 
-#: ../mail/em-folder-view.c:1173
+#: ../mail/em-folder-view.c:1375
 msgid "Crea_te Rule From Message"
 msgstr "འཕྲིན་དོན་ནང་ལས་ ལམ་ལུགས་གསར་བས�ྲུན་འབད� (_t)"
 
-#: ../mail/em-folder-view.c:1174
-msgid "Search Folder from _Subject"
-msgstr "དོན་ཚན་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད� (_S)"
+#. 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:1377
+msgid "Search Folder based on _Subject"
+msgstr "དོན་ཚན་གཞི་བཞག་�ོག་ལས་  སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་ (_S)"
 
-#: ../mail/em-folder-view.c:1175
-msgid "Search Folder from Se_nder"
-msgstr "ག�ང་མི་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད� (_n)"
+#: ../mail/em-folder-view.c:1378
+msgid "Search Folder based on Se_nder"
+msgstr "ག�ང་མི་ལུ་གཞི་བཞག་�ོག་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་ (_N)"
 
-#: ../mail/em-folder-view.c:1176
-msgid "Search Folder from _Recipients"
-msgstr "ལེན་མ�ན་ཚུ་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད� (_R)"
+#: ../mail/em-folder-view.c:1379
+msgid "Search Folder based on _Recipients"
+msgstr "ལེན་མ�ན་ཚུ་ལུ་གཞི་བཞག་�ོག་ལས་  སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་(_R)"
 
-#: ../mail/em-folder-view.c:1177
-msgid "Search Folder from Mailing _List"
-msgstr "འཕྲིན་ག�ང་�ོ་ཡིག་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད� (_L) "
+#: ../mail/em-folder-view.c:1380
+msgid "Search Folder based on Mailing _List"
+msgstr "འཕྲིན་ག�ང་�ོ་ཡིག་ལུ་གཞི་བཞག་�ོག་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་(_L) "
 
-#: ../mail/em-folder-view.c:1181
-msgid "Filter on Sub_ject"
-msgstr "དོན་ཚན་ལུ་བཙགས� (_j)"
+#. 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:1385
+msgid "Filter based on Sub_ject"
+msgstr "དོན་ཚན་ལུ་གཞི་བཞག་�ོག་ལས་ བཙགས� (_J)"
 
-#: ../mail/em-folder-view.c:1182
-msgid "Filter on Sen_der"
-msgstr "ག�ང་མི་ལུ་བཙགས� (_d)"
+#: ../mail/em-folder-view.c:1386
+msgid "Filter based on Sen_der"
+msgstr "ག�ང་མི་གཞི་བཞག་�ོག་ལས་ བཙགས� (_D)"
 
-#: ../mail/em-folder-view.c:1183
-msgid "Filter on Re_cipients"
-msgstr "ལེན་མ�ན་ཚུ་ལུ་བཙགས� (_c)"
+#: ../mail/em-folder-view.c:1387
+msgid "Filter based on Re_cipients"
+msgstr "ལེན་མ�ན་ཚུ་ལུ་གཞི་བཞག་�ོག་ལས་ བཙགས� (_c)"
 
-#: ../mail/em-folder-view.c:1184
-msgid "Filter on _Mailing List"
-msgstr "འཕྲིན་ག�ང་�ོ་ཡིག་ལུ་བཙགས� (_M)"
+#: ../mail/em-folder-view.c:1388
+msgid "Filter based on _Mailing List"
+msgstr "འཕྲིན་ག�ང་�ོ་ཡིག་ལུ་གཞི་བཞག་�ོག་ལས་ བཙགས� (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2037
-#: ../mail/em-folder-view.c:2081
+#: ../mail/em-folder-view.c:2271
+#: ../mail/em-folder-view.c:2315
 msgid "Default"
 msgstr "སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/em-folder-view.c:2186
-#: ../mail/em-folder-view.c:2191
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "འཕྲིན་དོན་དཔར་བས�ྲུན་འབད�"
-
-#: ../mail/em-folder-view.c:2350
+#: ../mail/em-folder-view.c:2533
 msgid "Unable to retrieve message"
 msgstr "འཕྲིན་དོན་སླར་འདྲེན་འབད་མི་ཚུགས་པས�"
 
-#: ../mail/em-folder-view.c:2371
-msgid "<b>Retrieving Message...</b>"
-msgstr "<b>འཕྲིན་དོན་སླར་འདྲེན་འབད་དོ...</b>"
+#: ../mail/em-folder-view.c:2552
+msgid "Retrieving Message..."
+msgstr "འཕྲིན་དོན་སླར་འདྲེན་འབད་དོ..."
 
-#: ../mail/em-folder-view.c:2410
-msgid "Retrieving Message"
-msgstr "འཕྲིན་དོན་སླར་འདྲེན་འབད་དོ་"
+#: ../mail/em-folder-view.c:2811
+msgid "C_all To..."
+msgstr "་་་་་་་ལུ་ བརྒྱུད་འཕྲིན་ག�ང་(_A)"
 
-#: ../mail/em-folder-view.c:2588
+#: ../mail/em-folder-view.c:2814
 msgid "Create _Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ གསར་བས�ྲུན་འབད�(_S)"
 
-#: ../mail/em-folder-view.c:2589
+#: ../mail/em-folder-view.c:2815
 msgid "_From this Address"
 msgstr "�་བྱང་འདི་ནང་ལས� (_F)"
 
-#: ../mail/em-folder-view.c:2590
+#: ../mail/em-folder-view.c:2816
 msgid "_To this Address"
 msgstr "�་བྱང་འདི་ནང་ལུ� (_T)"
 
-#: ../mail/em-folder-view.c:2947
+#: ../mail/em-folder-view.c:3313
 #, c-format
 msgid "Click to mail %s"
 msgstr "ཡིག་འཕྲིན་%sལུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../mail/em-folder-view.c:2952
+#: ../mail/em-folder-view.c:3325
+#, c-format
+msgid "Click to call %s"
+msgstr "%sལུ་ འབོ་ནིའི་དོན་ལུ་ ཨེབ་ག�ང་འབད་"
+
+#: ../mail/em-folder-view.c:3330
 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:517
 #, c-format
 msgid "Matches: %d"
 msgstr "%d མ�ུན་པས�"
 
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
-msgstr "འཚོལ་:(_n)"
+#: ../mail/em-format-html-display.c:661
+msgid "Fin_d:"
+msgstr "འཚོལ་:(_F)"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:685
 msgid "_Previous"
 msgstr "ཧེ་མམ་(_P)"
 
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:690
 msgid "_Next"
 msgstr "ཤུལ་མམ་ (_N)"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:695
 msgid "M_atch case"
 msgstr "ཡི་གུ་མ�ུན་སྒྲིག་འབད�(_a)"
 
-#: ../mail/em-format-html-display.c:937
-#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html.c:642
 msgid "Unsigned"
 msgstr "མིང་རྟགས་མ་བཀོདཔ�"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:994
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་མ་བཀོདཔ་ལས་ འཕྲིན་དོན་འདི་ བདེན་པ་ཨིན་པའི་ ཉེན་ལེན་འབད་མི་ཚུགས�"
 
-#: ../mail/em-format-html-display.c:938
-#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html.c:643
 msgid "Valid signature"
 msgstr "ནུས་ཅན་མིང་རྟགས�"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:995
 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:939
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html.c:644
 msgid "Invalid signature"
 msgstr "ནུས་མེད་མིང་རྟགས�"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:996
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "འཕྲིན་དོན་འདི་གི་ མིང་རྟགས་འདི་ བདེན་སྦྱོར་འབད་མི་ཚུགས་པས� ག�ོང་ལེན་ནང་ལུ་ མེདཔ་བ�ང་གདའཔ་འོང་ནི་མས�"
 
-#: ../mail/em-format-html-display.c:940
-msgid "Valid signature, cannot verify sender"
-msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་པས� དེ་འབད�་ད་ ག�ང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས�"
+#: ../mail/em-format-html-display.c:997
+#: ../mail/em-format-html.c:645
+msgid "Valid signature, but cannot verify sender"
+msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་རུང་ ག�ང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས་ "
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:997
 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:946
-#: ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:998
+#: ../mail/em-format-html.c:646
+msgid "Signature exists, but need public key"
+msgstr "མིང་རྟགས་ ཧེ་མ་ལས་རང་འདུག་   ཨིན་རུང་མི་མང་ ལྡེ་མིག་ཅིག་དགོ་པས་ "
+
+#: ../mail/em-format-html-display.c:998
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "འཕྲིན་དོན་འདི་ མིང་རྟགས་བཀོད་དེ་ཡོད་རུང་ དེ་དང་ཆ་མཉམ་པའི་ མི་མང་ལྡེ་མིག་མིན་ནུག� "
+
+#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html.c:652
 msgid "Unencrypted"
 msgstr "གསང་བ་མ་བཟོ��"
 
-#: ../mail/em-format-html-display.c:946
+#: ../mail/em-format-html-display.c:1005
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "འཕྲིན་དོན་འདི་ གསང་བ་མ་བཟོ�་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཨིན་ཊར་ནེཊི་བརྒྱུད་དེ་ ག�ོང་ལེན་འབད་བའི་ས�བས་མ�ོང་འོང་�"
 
-#: ../mail/em-format-html-display.c:947
-#: ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html.c:653
 msgid "Encrypted, weak"
 msgstr "གསང་བཟོ་ལེགས་ཤོམ་མ་འགྱོ་བས�"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:1006
 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:948
-#: ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:1007
+#: ../mail/em-format-html.c:654
 msgid "Encrypted"
 msgstr "གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:1007
 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:949
-#: ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:1008
+#: ../mail/em-format-html.c:655
 msgid "Encrypted, strong"
 msgstr "སྒྲིང་སྒྲིང་སྦེ་ གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:1008
 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:1050
+#: ../mail/em-format-html-display.c:1109
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ལག་�ྱེར་ལུ་སྟོན� (_V)"
 
-#: ../mail/em-format-html-display.c:1065
+#: ../mail/em-format-html-display.c:1124
 msgid "This certificate is not viewable"
 msgstr "ལག་�ྱེར་འདི་ མ�ོང་མི་ཚུགས�"
 
-#: ../mail/em-format-html-display.c:1384
+#: ../mail/em-format-html-display.c:1445
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ལུ་མཇུག་བསྡུ་ཡོད�"
 
-#: ../mail/em-format-html-display.c:1392
+#: ../mail/em-format-html-display.c:1453
 msgid "Overdue:"
 msgstr "ཧེ་མ་ལས་རན་ཡོདཔ�"
 
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1456
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %pལས�"
 
-#: ../mail/em-format-html-display.c:1455
+#: ../mail/em-format-html-display.c:1534
 msgid "_View Inline"
 msgstr "ཨིན་ལའིན་ལུ་སྟོན� (_V)"
 
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1535
 msgid "_Hide"
 msgstr "སྦ་བཞག (_H)"
 
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1536
 msgid "_Fit to Width"
 msgstr "རྒྱ་ཚད་ལུ་ཚུད་སྒྲིག་འབད�(_F)"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1537
 msgid "Show _Original Size"
 msgstr "�ོག་མའི་་ཚད་སྟོན� (_O)"
 
-#: ../mail/em-format-html-display.c:1899
-#: ../mail/em-format-html-display.c:2510
-#: ../mail/mail-config.glade.h:42
+#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2629
+#: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "མཉམ་སྦྲགས�"
 
-#: ../mail/em-format-html-display.c:2113
+#: ../mail/em-format-html-display.c:2203
 msgid "Save attachment as"
 msgstr "མཉམ་སྦྲགས་ཚུ་སྲུངས་"
 
-#: ../mail/em-format-html-display.c:2117
+#: ../mail/em-format-html-display.c:2207
 msgid "Select folder to save all attachments"
 msgstr "མཉམ་སྦྲགས་ཆ་མཉམ་བསྲུང་ནིའི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འ�ུ་འབད་"
 
-#: ../mail/em-format-html-display.c:2168
+#: ../mail/em-format-html-display.c:2258
 msgid "_Save Selected..."
 msgstr "སེལ་འ�ུ་འབད་མི་་སྲུངས་...(_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2235
+#: ../mail/em-format-html-display.c:2325
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "མཉམ་སྦྲགས་%d� (_t)"
 msgstr[1] "མཉམ་སྦྲགས་%d�(-t)"
 
-#: ../mail/em-format-html-display.c:2242
-#: ../mail/em-format-html-display.c:2320
+#: ../mail/em-format-html-display.c:2332
+#: ../mail/em-format-html-display.c:2421
 msgid "S_ave"
 msgstr "སྲུངས� (_a)"
 
-#: ../mail/em-format-html-display.c:2253
+#: ../mail/em-format-html-display.c:2343
 msgid "S_ave All"
 msgstr "ཆ་མཉམ་སྲུངས�(_a)"
 
-#: ../mail/em-format-html-display.c:2316
+#: ../mail/em-format-html-display.c:2417
 msgid "No Attachment"
 msgstr "མཉམ་སྦྲགས་མིན་འདུག"
 
-#: ../mail/em-format-html-display.c:2447
-#: ../mail/em-format-html-display.c:2483
+#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2602
 msgid "View _Unformatted"
 msgstr "རྩ་སྒྲིག་མ་འབད་མི་སྟོན་(_U)"
 
-#: ../mail/em-format-html-display.c:2449
+#: ../mail/em-format-html-display.c:2566
 msgid "Hide _Unformatted"
 msgstr "རྩ་སྒྲིག་མ་འབད་མི་སྦ་བཞག་(_U)"
 
-#: ../mail/em-format-html-display.c:2502
+#: ../mail/em-format-html-display.c:2621
 msgid "O_pen With"
 msgstr "དང་གཅིག་�ར་�་ཕྱེ་(_p)"
 
-#: ../mail/em-format-html-display.c:2571
+#: ../mail/em-format-html-display.c:2692
 msgid "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
 msgstr "གློག་འཕྲིན་འདི་ལེགས་ས�ྱོང་འ�བ་ནིའི་དོན་ལུ་ ཆེ་དྲག་ནི་དེ་གིས་ ཨི་བོ་ལུ་ཤཱན་ལྷག་སྟོན་འབད་མི་ཚུགས� �ྱོད་འདི་ རྩ་སྒྲིག་མ་འབད་སྦེ་མ�ོང་ཚུགས་ ཡང་ན་ ཕྱིའི་ཚིག་ཡིག་ཞུན་དག་ཅིག་དང་གཅིག་�ར་ མ�ོང་ཚུགས�"
 
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "ཤོག་གྲངས་%d ལས་%d�"
 
-#: ../mail/em-format-html.c:483
-#: ../mail/em-format-html.c:485
+#: ../mail/em-format-html.c:496
+#: ../mail/em-format-html.c:505
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s'སླར་འདྲེན་འབད་དོ�"
 
-#: ../mail/em-format-html.c:621
-msgid "Valid signature but cannot verify sender"
-msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་རུང་ ག�ང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས�"
+#: ../mail/em-format-html.c:917
+msgid "Unknown external-body part."
+msgstr "ཤེས་མ་ཚུགས་པའི་ ཕྱིའི་མ་གཟུགས་ཀྱི་ཡན་ལག� "
 
-#: ../mail/em-format-html.c:892
+#: ../mail/em-format-html.c:925
 msgid "Malformed external-body part."
 msgstr "ཕྱིའི་མ་གཟུགས་ཡན་ལག་གི་ བཟོ་རྣམ་གྱུར་སོང་ནུག"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:955
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "ཨེཕ་ཊི་པི་་ས་�ོངས་(%s)ལུ་ དཔག་བྱེད�"
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ས་�ོངས་\"%s\"ལུ་ ནུས་ཅན་ཨིན་མི་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་(%s)ལུ་དཔག་བྱེད�"
 
-#: ../mail/em-format-html.c:935
+#: ../mail/em-format-html.c:968
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ཉེ་གནས་ཀྱི་ཡིག་སྣོད་(%s)ལུ་དཔག་བྱེད�"
 
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:989
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�ག་རིང་གི་གནད་སྡུད་(%s)ལུ་དཔག་བྱེད�"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "མ་ཤེས་པའི་ ཕྱི་�འི་གནད་སྡུད་ (དབྱེ་བ་\"%s\" ལུ)དཔག་བྱེད�"
 
-#: ../mail/em-format-html.c:1194
+#: ../mail/em-format-html.c:1228
 msgid "Formatting message"
 msgstr "འཕྲིན་དོན་རྩ་སྒྲིག་འབད་དོ�"
 
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847
-#: ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "ལས�"
+#: ../mail/em-format-html.c:1402
+msgid "Formatting Message..."
+msgstr "འཕྲིན་དོན་རྩ་སྒྲིག་འབད་དོ..."
 
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848
-#: ../mail/em-mailer-prefs.c:90
-msgid "Reply-To"
-msgstr "ལན་གསལ་ག�ང་ཡུལ�"
-
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1554
+#: ../mail/em-format-html.c:1618
+#: ../mail/em-format-html.c:1640
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "ཤོག་ནག་འདྲ་བཤུས�"
 
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1555
+#: ../mail/em-format-html.c:1624
+#: ../mail/em-format-html.c:1643
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:890
+#: ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས�"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1664
-#: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1174
+#: ../mail/em-format-html.c:1714
+#: ../mail/em-format-quote.c:331
+#: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "སྦྲག་སྣོད"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1691
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1741
+msgid " (%a, %R %Z)"
+msgstr "<I> (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1694
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
+#: ../mail/em-format-html.c:1746
+msgid " (%R %Z)"
+msgstr "<I> (%R %Z)"
 
-#: ../mail/em-format-html.c:1704
-#: ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-format-html.c:1758
+#: ../mail/em-format-quote.c:338
+#: ../mail/em-format.c:892
+#: ../mail/em-mailer-prefs.c:96
 #: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "ཚེས་གྲངས�"
 
-#: ../mail/em-format-html.c:1727
-#: ../mail/em-format.c:854
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-format-html.c:1781
+#: ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "གནས་ཚུལ་སྡེ་ཚན�"
 
-#: ../mail/em-format.c:1118
+#. 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:1874
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr "ཕྲིན་དོན་འདི་ <b>%s</b>གིས་ <b>%s</b>གི་ ཚབ་སྦེ་ བ�ང་ནུག� "
+
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:90
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
+msgid "From"
+msgstr "ལས�"
+
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:91
+msgid "Reply-To"
+msgstr "ལན་གསལ་ག�ང་ཡུལ�"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s མཉམ་སྦྲགས�"
 
-#: ../mail/em-format.c:1157
-#: ../mail/em-format.c:1308
-#: ../mail/em-format.c:1610
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ཨེསི་/མ་ཡིམ་ འཕྲིན་དོན་ལུ་ མིང་དཔྱད་འབད་མ་ཚུགས: མ་ཤེས་པའི་འཛོལ་བ�"
 
-#: ../mail/em-format.c:1290
-#: ../mail/em-format.c:1446
+#: ../mail/em-format.c:1335
+#: ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "མ་ཡིམ་འཕྲིན་དོན་ལུ་ མིང་དཔྱད་འབད་མ་ཚུགས� འབྱུང་�ུངས་བཟུམ་ཅིག་སྦེ་ བཀྲམ་སྟོན་འབད་དོ�"
 
-#: ../mail/em-format.c:1298
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ཡན་ལག་སྣ་ཚོགས/གསང་བ་བཟོས་པའི་དོན་ལས་ རྒྱབ་ས�ྱོར་མེད་པའི་ གསང་བཟོ་བའི་དབྱེ་བ�"
 
-#: ../mail/em-format.c:1465
+#: ../mail/em-format.c:1353
+msgid "Could not parse PGP/MIME message"
+msgstr "པི་ཇི་པི་/མ་ཡིམ་ འཕྲིན་དོན་ལུ་ མིང་དཔྱད་འབད་མ་ཚུགས་ "
+
+#: ../mail/em-format.c:1353
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "ཨེསི་/མ་ཡིམ་ འཕྲིན་དོན་ལུ་ མིང་དཔྱད་འབད་མ་ཚུགས: མ་ཤེས་པའི་འཛོལ་བ་"
+
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "རྒྱབ་ས�ྱོར་མེད་པའི་ མིང་རྟགས་ཀྱི་རྩ་སྒྲིག"
 
-#: ../mail/em-format.c:1473
-#: ../mail/em-format.c:1539
+#: ../mail/em-format.c:1518
+#: ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../mail/em-format.c:1473
-#: ../mail/em-format.c:1539
+#: ../mail/em-format.c:1518
+#: ../mail/em-format.c:1580
+#: ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་ མ་ཤེས་པའི་འཛོལ་བ�"
 
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-format.c:1661
+msgid "Could not parse PGP message"
+msgstr "པི་ཇི་པི་ འཕྲིན་དོན་ མིང་དཔྱད་འདབ་མ་ཚུགས་ "
+
+#: ../mail/em-format.c:1661
+msgid "Could not parse PGP message: Unknown error"
+msgstr "པི་ཇི་པི་ འཕྲིན་དོན་མིང་དཔྱད་འབད་མ་ཚུགས: མ་ཤེས་པའི་འཛོལ་བ་"
+
+#: ../mail/em-mailer-prefs.c:108
 msgid "Every time"
 msgstr "ཨ་རྟག་ར�"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per day"
 msgstr "ཉིནམ་རེ་ཚར་རེ�"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per week"
 msgstr "བདུན་ཕྲག་རེ་ཚར་རེ�"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:111
 msgid "Once per month"
 msgstr "ཟླ�་རེ་ཚར་རེ�"
 
-#: ../mail/em-mailer-prefs.c:807
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr "སྲོལ་སྒྲིག་མ�ོ་མེད་ མགོ་ཡིག་ �་ས�ོངས་ར�ྱབས་ "
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr "མགོ་ཡིག་ མིང་: "
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr "མགོ་ཡིག་ བེ་ལུ་ ཡོད་པ་ "
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr "བེ་ལེ་ཡོདཔ་ "
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "ཚོས་གཞི་"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr "ངོ་རྟགས་ "
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086
+#: ../mail/em-mailer-prefs.c:1140
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s  པ་ལག་ཨིན་ འ�ོབ་ཚུགས་དེ་ཡོདཔ་དང་ ཟུང་ལྡན་དེ་ གཞི་བཙུགས་འབད་ཡོདཔ� "
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1094
+#: ../mail/em-mailer-prefs.c:1149
+#, c-format
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr "%s པ་ལག་ཨིན་དེ་ འ�ོབ་མ་ཚུགས� �ུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡི་ག་མ་འབད་ ཞིབ་དཔྱད་འབད� "
+
+#: ../mail/em-mailer-prefs.c:1115
 msgid "No Junk plugin available"
 msgstr "མ�ོ་མེད་པ་ལག་ཨིན་�ོབ་མ་ཚུགས་"
 
-#: ../mail/em-migrate.c:1210
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "ཊུ་ཌུ"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "ཤུལ་ལས�"
+
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
@@ -12209,109 +12102,109 @@ msgstr ""
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་གྱིས་ �ྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་�"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "སྣོད་འཛིན་གསརཔ་`%s': %sབཟོ་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "སྣོད་འཛིན་`%s' ལས་`%s': %sལུ་ འདྲ་བཤུས་བར�ྱབ་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s': %sལུ་ ཡོད་བཞིན་པའི་ འཕྲིན་སྒྲོམ་ཚུ་གི་དོན་ལས་ ཞིབ་ལྟ་འབད་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr " སར་བར་གནད་སྡུད་%s': %s གུ་བཞག་མི་ པོཔ་་རྙིངམ་�་ཕྱེ་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "སར་བར་གནད་སྡུད་སྣོད་�ོ་ `%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བར�ྱབ་མ་ཚུགས་ གསར་བས�ྲུན་འབད་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "སར་བར་གནད་སྡུད་`%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བར�ྱབ་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:2578
-#: ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579
+#: ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ཉེ་གནས་ཀྱི་ཡིག་འཕྲིན་ བསག་མཛོད་`%s': %sབཟོ་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:2709
+#: ../mail/em-migrate.c:2827
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s': %sལུ་ ཉེ་གནས་ཀྱི་ ཡིག་འཕྲིན་སྣོད་འཛིན་ གསར་བས�ྲུན་འབད་མ་ཚུགས�"
 
-#: ../mail/em-migrate.c:2728
+#: ../mail/em-migrate.c:2846
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "ཧེ་མའི་ ཨི་བོ་ལུ་ཤཱན་ གཞི་བཙུགས་འབད་མི་དེ་ནང་ལས་ གཞི་སྒྲིག་ཚུ་ ལྷག་མ་ཚུགས� `evolution/config.xmldb' མེདཔ་འོང་ནི་དང་ ཡང་ཅིན་ ངན་ཅན་ལུ་ གྱུར་སོངཔ་འོང་ནི་མས�"
 
-#: ../mail/em-popup.c:557
-#: ../mail/em-popup.c:568
+#: ../mail/em-popup.c:574
+#: ../mail/em-popup.c:585
 msgid "_Reply to sender"
 msgstr "ག�ང་མི་ལུ་ ལན་གསལ་ག�ང་� (_R)"
 
-#: ../mail/em-popup.c:558
-#: ../mail/em-popup.c:569
+#: ../mail/em-popup.c:575
+#: ../mail/em-popup.c:586
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "�ོ་ཡིག་ལུ་ ལན་གསལ་ག�ང་� (_L)"
 
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:639
 msgid "_Add to Address Book"
 msgstr "�་བྱང་ཀི་དེབ་ལུ་ �་ས�ོང་ར�ྱབས� (_A)"
 
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-subscribe-editor.c:595
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "མཛོད་�ང་འདི་གིས་ མ�ོ་མངགས་ལུ་ རྒྱབ་ས�ྱོར་མི་འབད་བས� ཡང་ཅིན་ དེ་ཚུ་ལྕོགས་ཅན་མེནམ་འོང་ནི་མས�"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:628
 msgid "Subscribed"
 msgstr "མ�ོ་མངགས་འབད་ཡོདཔ�"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:632
 msgid "Folder"
 msgstr "སྣོད་འཛིན� "
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:834
 msgid "Please select a server."
 msgstr "སར་བར་ཅིག་ སེལ་འ�ུ་འབད་གནང་�"
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:855
 msgid "No server has been selected"
 msgstr "སར་བར་གཅིག་ཡང་ སེལ་འ�ུ་མ་འབད་བས�"
 
-#: ../mail/em-utils.c:120
-msgid "Do not show this message again."
-msgstr "འཕྲིན་དོན་འདི་ ལོག་སྟེ་མ་སྟོན�"
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "འཕྲིན་དོན་འདི་ ལོག་སྟེ་མ་སྟོན� (_D)"
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "འཕྲིན་དོན་ཚགས་མ་ཚུ�"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "འཕྲིན་དོན�"
 
-#: ../mail/em-utils.c:557
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "འཕྲིན་དོན་སྲུངས་..."
 
-#: ../mail/em-utils.c:606
+#: ../mail/em-utils.c:694
 msgid "Add address"
 msgstr "�་བྱང་�་ས�ོང་ར�ྱབས�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1090
+#: ../mail/em-utils.c:1178
 #, c-format
 msgid "Messages from %s"
 msgstr "%sནང་ལས་ འཕྲིན་དོན་ཚུ�"
@@ -12320,565 +12213,675 @@ msgstr "%sནང་ལས་ འཕྲིན་དོན་ཚུ�"
 msgid "Search _Folders"
 msgstr "སྣོད་འཛིན་ཚུ་འཚོལ་ཞིབ་འབད�(_F)"
 
-#: ../mail/em-vfolder-rule.c:590
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "སྣོད་འཛིན་གྱི་འབྱུང་�ུངས་ འཚོལ་ཞིབ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
 msgstr "ཚད་ཅིག་སྦེ་ཡོད་མི་ཚིག་ཡིག་ཡན་ལག་བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ཅུགཔ་ཨིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Always request read receipt"
+msgstr "ཨ་རྟག་རང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ཞུ་བ་འབད་"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "དུས་ཚོད་ ཡོངས་བསྡོམས་ ས�ར་ཆ་ནང་ འཛོལ་བ་དེ་ གནས་ཚད་ ཕྲ་རིང་གུ་སྟོན་དེ་འོང་དགོ� "
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
+msgstr "རང་བཞིན་གྱི་གདོང་ཚབ་ ངོས་འཛིན�"
+
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "རང་བཞིན་གྱི་འབྲེལ་ལམ་ངོས་འཛིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "རང་བཞིན་གྱི་ སི་མའི་ལི་ ངོས་འཛིན�"
-
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Check incoming mail being junk"
 msgstr "མ�ོ་མེད་ནང་འབྱོར་ཡིག་འཕྲིན་ ཞིབ་དཔྱད་འབད་དོ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Citation highlight color"
 msgstr "བསྔགས་ཡིག་གཙོ་བ�ོན་ཚོས་གཞི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Citation highlight color."
 msgstr "བསྔགས་ཡིག་གཙོདམིགས་ཚོས་གཞི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Composer Window default height"
 msgstr "རྩོམ་མ�ན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་མ�ོ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Composer Window default width"
 msgstr "རྩོམ་མ�ན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་རྒྱ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr "རྩོམ་མ�ན་ མངོན་གསལ་/ སྣོད་�ོ་ མཉམ་བསྒྲགས་ "
+
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "ག�ང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ནང་ལུ་ �་བྱང་ཚུ་གི་བཀྲམ་སྟོན་ཨེབ་བཙུགས་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "�་བྱང་གྲངས་རྩིས་ནང་ལུ་ གསལ་བཀོད་འབད་མི་ཨང་གྲངས་ནང་ ག�ང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ནང་ལུ་ �་བྱང་ཚུ་གི་བཀྲམ་སྟོན་ཨེབ་བཙུགས་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to compose messages"
 msgstr "འཕྲིན་དོན་ཚུ་བརྩམ་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default charset in which to compose messages."
 msgstr "འཕྲིན་དོན་ཚུ་བརྩམ་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default charset in which to display messages"
 msgstr "འཕྲིན་དོན་ཚུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default charset in which to display messages."
 msgstr "འཕྲིན་དོན་ཚུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default forward style"
 msgstr "གདོང་བས�ྱོད་བཟོ་རྣམ་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "རྩོམ་མ�ན་གྱི་ སྒོ་སྒྲིག་་མ�ོ་ཚད་ སྔོན་སྒྲིག་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default height of the Composer Window."
+msgstr "རྩོམ་མ�ན་སྒོ་སྒྲིག་་གི་ མ�ོ་ཚད་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Message Window"
-msgstr "འཕྲིན་དོན་གྱི་ སྒོ་སྒྲིག་་མ�ོ་ཚད་ སྔོན་སྒྲིག་འབད"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default height of the message window."
+msgstr "འཕྲིན་དོན་ སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་མ�ོ་ཚད� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "མ�ོ་མངགས་ ཌའི་དྲན་དེབ་མ�ོ་ཚད་ སྔོན་སྒྲིག་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default height of the subscribe dialog."
+msgstr "མ�ོ་མངགས་ ཌའི་ལོག་གི་སྔོན་སྒྲིགམ�ོ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default reply style"
 msgstr "ལན་གསལ་བཟོ་རྣམ་ སྔོན་སྒྲིག་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Composer Window"
-msgstr "རྩོམ་མ�ན་གྱི་ སྒོ་སྒྲིག་་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default value for thread expand state"
+msgstr "�ེ་རེཌི་རྒྱ་འཕར་གནས་ལུགས་ཀྱི་དོན་ལུ་ སྔོན་སྒྲིག་ བེ་ལུ་ "
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default width of the Composer Window."
+msgstr "རྩོམ་མ�ན་�ིན་ཌོ་གི་ སྔོན་སྒྲིག་ རྒྱ་ཚད� "
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "འཕྲིན་དོན་ �ིན་ཌོ་གི་ སྔོན་སྒྲིག་ རྒྱ་ཚད� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Message Window"
-msgstr "འཕྲིན་དོན་གྱི་སྒོ་སྒྲིག་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "མ�ོ་མངགས་ ཌའི་ལོག་གི་ སྔོན་སྒྲིག་རྒྱ་ཚད� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
-msgid "Default width of the Subscribe dialog"
-msgstr "མ�ོ་མངགས་ཌའི་དྲན་དེབ་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr "གློག་འཕྲིན་ག�ང་མི་གི་ �་བྱང་ཀི་དེབ་ནང་ བལྟ་ནི་ཨིན་ན་མེན་ན་ ག�ན་འབེབས་ བཟོ�་ཨིན་ "
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
-msgid "Directory for saving mail component files"
-msgstr "ཡིག་འཕྲིན་ཆ་ཤས་ཡིག་སྣོད་ཚུ་སྲུག་བཞག་འབད་ནིའི་དོན་ལུ་ སྣོད་�ོ་"
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
+msgstr "གློག་འཕྲིན་ག�ང་མི་གི་�་བྱང་ཀི་དེབ་ནང་ བལྟ་ནི་་ཨིན་ན་མེན་ན་ ག�ན་འབེབས་བཟོ�་ཨིན� ག་དེམ་ཅིག་སྦེ་ འཚོལ་�ོབ་པ་ཅིན་ སི་པམ་སྦེ་ འོང་མི་དགོ� དེ་གིས་ རང་བཞིན་མཇུག་བསྡུའི་དོན་ལུ་ དེབ་རྟགས་བཀོད་ཡོད་པའི་ ཀི་དེབ་ཚེ་ནང་ བལྟ�་ཨིན� ག་དེམ་ཅིག་སྦེ་ ཉེ་གནས་�་བྱང་ཀི་དེབ་ (དཔེར་ན་ ཨའི་ཌི་ཨེ་པི་) རང་བཞིན་མཇུག་བསྡུ་གི་དོན་ལུ་ རྟགས་བ�ོད་དེ་ཡོད་པ་ཅིན་ དེ་ལྷོད་སུ་ཅིག་སྦེ་ འོང� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "མ�ོ་མེད་ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ སྲོལ་སྒྲིག་མགོ་ཡིག་ལག་ལེན་འ�བ་ནི་ཨིན་ན་མེན་ན་ ག�ན་འབེབས་བཟོ�་ཨིན་ "
+
+#: ../mail/evolution-mail.schemas.in.h:30
+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:31
+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:32
+msgid "Directory for loading/attaching files to composer."
+msgstr "རྩོམ་མ�ན་ལུ་ ཡིག་སྣོད་ཚུ་ མངོན་གསལ/ མཉམ་བསྒྲགས་ འབད་ནིའི་སྣོད་�ོ� "
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Directory for saving mail component files."
+msgstr "ཡིག་འཕྲིན་ཆ་ཤས་ཡིག་སྣོད་ཚུ་  སྲུག་བཞག་འབད་ནིའི་དོན་ལུ་ སྣོད་�ོ་"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Draw spelling error indicators on words as you type."
 msgstr "�ྱོད་ཀྱིས་ ཡིག་དཔར་བར�ྱབས་མི་ མིང་ཚིག་ཚུ་ལུ་ ཡིག་སྡེབ་འཛོལ་བའི་བརྡ་སྟོན་པ་འབྲི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Junk folders on exit"
 msgstr "ཕྱིར་�ོན་གུ་ མ�ོ་མེད་སྣོད་འཛིན་ཚུ་སྟོངམ་བ�ོན་"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty Trash folders on exit"
 msgstr "ཕྱིར་�ོན་ས�བས་ ཕྱགས་ཧོད་སྣོད་འཛིན་ཚུ་ སྟོངམ་བ�ོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཕྱིར་�ོན་ས�བས་ མ�ོ་མེད་སྣོད་འཛིན་ ཆ་མཉམ་སྟོངམ་བ�ོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཕྱིར་�ོན་ས�བས་ ཕྱགས་ཧོད་སྣོད་འཛིན་ ཆ་མཉམ་སྟོངམ་བ�ོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ཀེ་རེཊི་�བས་ལམ་ ལྕོགས་ཅན་བཟོ� དེ་ལས་�ྱོད་ཀྱིས་ ཡིག་འཕྲིན་ལྷག་པའི་ས�བས་ འོད་རྟགས་ཅིག་མ�ོང་ཚུགས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Enable or disable magic space bar"
+msgstr "མིག་འཕྲུལ་ བར་སྟོང་ཕར་རིང་ ལྕོགས་ཅན་ ཡང་ན་ ལྕོགས་མིན་བཟོ་ "
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Enable or disable type ahead search feature"
 msgstr "�ྱད་རྣམ་འཚོལ་ཞིབ་མ་འབད་བའི་གོང་ལུ་ དབྱེ་བ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ ལྕོགས་མིན་བཟོ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders"
+msgstr "སྣོད་འཛིན་ཚུ་འཚོལ་ཞིབ་ ལྕོགས་ཅན་བཟོ་ "
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Enable search folders on startup."
+msgstr "འགོ་བཙུགས་གུ་ལུ་ འཚོལ་ཞིབ་སྣོད་འཛིན་ཚུ་ ལྕོགས་ཅན་བཟོ� "
+
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder."
 msgstr "ཟུར་�འི་ཕྲ་རིང་འཚོལ་ཞིབ་�ྱད་རྣམ་དེ་ལྕོགས་ཅན་བཟོ� དེ་ལས་�ྱོད་ཀྱིས་ཚིག་ཡིག་ཡིག་དཔར་བར�ྱབས་�ོག་ལས་ ཕན་ཚུན་འབྲེལ་བའི་འཚོལ་ཞིབ་ འགོ་བཙུགས་ཚུགས� ལག་ལེན་དེ་ཡང་ �ྱོད་ཀྱིས་སྣོད་འཛིན་གྱི་མིང་དེ་ ཡིག་དཔར་བར�ྱབས་དང་ སྣོད་འཛིན་གྱི་མིང་དེ་ ཟུར་�འི་ཕྲ་རིང་ནང་ འཇམ་�ོང་�ོ་སྦེ་འཚོལ་འ�ོབ་ནི་དི་ སེལ་འ�ུ་དེ་གིས་ རང་བཞིན་གྱིས་སྣོད་འཛིན་དེ་�ར་ མཆོང་འགྱོ�་ཨིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "འཕྲིན་དོན་ སྔན་ལྟ་དང་ འཕྲིན་དོན་�ོ་ཡིག་ དེ་ལས་ སྣོད་འཛིན་ཚུ་ནང་ བར་སྟོང་ཕྲ་རིང་ ལྡེ་མིག་ལག་ལེན་འ�བ་དེ་ བཤུད་སྒྲིལ་འབད་ནིའི་དོན་ལས་ འདི་ ལྕོགས་ཅན་བཟོ� "
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable to render message text part of limited size."
 msgstr "ཚད་བཟོ་ཡོད་པའི་ཚད་ཀྱི་ ཚིག་ཡིག་འཕྲིན་དོན་ཡན་ལག་ ལྷག་སྟོན་འབད་ནིའི་དོན་ལས་ ལྕོགས་ཅན་བཟོ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable/disable caret mode"
 msgstr "ཀེ་རེཊི་�བས་ལམ་ ལྕོགས་ཅན་བཟོ/ལྕོགས་མིན་བཟོ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Height of the message-list pane"
 msgstr "འཕྲིན་དོན་�ོ་ཡིག་པེན་གྱི་མ�ོ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Height of the message-list pane."
 msgstr "འཕྲིན་དོན་�ོ་ཡིག་པེན་གྱི་ མ�ོ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "སྣོ་འཛིན་རེ་རེ་སྦེ་ སྔོན་ལྟ་འབད་ནི་སྦ་བཞགཔ་ཨིནམ་དང་ སོལ་འ�ུ་དེ་ རྩ་བས�ྲད་ག�ངམ་ཨིན་ "
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "ལག་ལེན་པ་ཅིག་གིས་ དུས་གཅིག་ལུ་ འཕྲིན་དོན་༡༠ ཡང་ན་ དེ་ལས་ལྷག་སྟེ་ �་ཕྱེ་�བས་འབད་བ་ཅིན་ ལག་ལེན་པ་དེ་ལུ་ ངེས་པར་དུ་ དེ་སྦེ་འབད་དགོཔ་ཨིན་ན་དྲིས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 msgstr "གལ་སྲིད་ \"Preview\" པེན་དེ་ ཨཱོན་ཡོད་པ་ཅིན་ དེ་ཀེར་ཕྲང་སྦེ་མེན་པར་ ཟུར་�ར་སྦེ་སྟོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ནང་ མ་ཡིམ་དབྱེ་བ་སོ་སོའི་དོན་ལུ་ ནང་བསྒྲིགས་མ�ོང་བྱེད་མེད་པ་ཅིན་ ནང་དོན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཇི་ནོམ་གྱི་ མ་ཡིམ་དབྱེ་བ་གི་ གནད་སྡུད་གཞི་རྟེན་གྱི་ �ོ་ཡིག་ནང་ བོ་ནོ་བོ་ཆ་ཤས་ནང་�ོན་མི་ མ་ཡིམ་དབྱེ་བ་ག་ཅི་ཨིན་རུང་ ལག་ལེན་འ�བ་ཚུགས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "དེ་གིས་སྣ་མང་འཕྲིན་དོན་ལུ་ རྟགས་བཀལ་བའི་ས�བས་ ནུས་སྤེལ་ལྕོགས་ཅན་/ལྕོགས་མིན་བཟོ�་ཨིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:55
+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:56
+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:57
 msgid "Last time empty junk was run"
 msgstr "མ�འ་མཇུག་མ�ོ་མེད་སྟོངམ་འདི་ལཱ་འབད་"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Last time empty trash was run"
 msgstr "མ�འ་མཇུག་ཕྱགས་ཧོད་སྟོངམ་ བ�ོན་པའི་དུས་ཚོད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Level beyond which the message should be logged."
+msgstr "འཕྲིན་དོན་ དྲན་དེབ་འབད་དགོ་པའི་ གནས་རིམ་གྱི་ཚད་གཞི� "
+
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "List of Labels and their associated colors"
 msgstr "�་ཡིག་ཚུ་གི་�ོ་ཡིག་དང་ དེ་ཚུ་དང་འབྲེལ་བའི་ཚོས་གཞི་ཚུ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "List of accepted licenses"
 msgstr "དང་ལེན་འབད་མི་ ཆོག་�མ་ཚུ་གི་�ོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "List of accounts"
 msgstr "རྩིས་�ོ་ཚུ་གི་�ོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ འཕྲིན་དོན་ཆ་ཤས་ཀྱིས་ ཧ་གོ་བའི་ རྩིས་�ོའི་�ོ་ཡིག �ོ་ཡིག་དེ་ནང་ གློག་རིམ་/ཨི་བོ་ལུ་ཤཱན་/ཡིག་འཕྲིན་/རྩིས་�ོ་ཚུ་དང་འབྲེལ་བའི་ ཡན་ལག་སྣོད་�ོ་ཚུ་གི་ ཡིག་རྒྱུན་ཚུ་ཡོད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "List of custom headers and whether they are enabled."
 msgstr "སྲོལ་སྒྲིག་མགོ་ཡིག་གི་ �ོ་ཡིག་དང་ དེ་ཚུ་ལྕོགས་ཅན་ཨིནམ་མེནམ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ འཕྲིན་དོན་ཆ་ཤས་ཀྱིས་ ཧ་གོ་བའི་ �་བྱང་�ོ་ཡིག �ོ་ཡིག་དེ་ནང་ ཚོས་གཞི་གིས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཧེགསི་ ཨིན་ཀོ་ཌིང་ ལག་ལེན་འ�བ་སའི་ ཚོས་གཞི་མིང་གི་ ཡིག་རྒྱུན་ཚུ་ཡོད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "བོ་ནོ་བོ་གི་ཆ་ཤས་ མ�ོང་བྱེད་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་ནིའི་ མ་ཡིམ་གྱི་ དབྱེ་བ་ཚུ་གི་�ོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "List of protocol names whose license has been accepted."
 msgstr "ཆོག་�མ་དང་ལེན་འབད་ཡོད་པའི་ གནད་སྤེལ་ལམ་ལུགས་ཀྱི་ མིང་ཚུ་གི་�ོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Load images for HTML messages over http"
 msgstr "ཨེཆ་ཊི་ཊི་པི་གུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་གྱི་དོན་ལུ་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
-msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
-msgstr "ཨེཆ་ཊི་ཊི་པི་ཚུ་གུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་གྱི་དོན་ལུ་ འཕྲིན་དོན་ཚུ་མངོན་གསལ་འབད� སྲིད་པའིང་བེ་ལུསི་ཚུ་:༠-ནམ་ཡང་ནེཊི་གི་ཕྱི་�ར་ གཟུགས་བརྙན་ཚུ་མངོན་གསལ་མ་འབད� ༡-འབྲེལ་ས་ཚུ་ནང་ལས་ ཡཔག་འཕྲིན་ནང་ གཟུགས་བརྙན་མངོན་གསལ་འབད� ༢-ཨ་རྟག་ར་ ནེཊི་གི་ཕྱི་�ར་ གཟུགས་བརྙན་མངོན་གསལ་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:69
+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.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions"
 msgstr "དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Log filter actions to the specified log file."
 msgstr "གསལ་བཀོད་འབད་མི་ དྲན་དེབ་སྣོད་འཛིན་ལུ་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Logfile to log filter actions"
 msgstr "དྲན་དེབ་སྣོད་འཛིན་ལས་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ་ལུ �"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Logfile to log filter actions."
 msgstr "དྲན་དེབ་སྣོད་འཛིན་ལས་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ་ལུ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Mark as Seen after specified timeout"
 msgstr "གསལ་བཀོད་འབད་མི་ ངལ་མཚམས་མ�ོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Mark as Seen after specified timeout."
 msgstr "གསལ་བཀོད་འབད་མི་ ངལ་མཚམས་མ�ོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Mark citations in the message \"Preview\""
 msgstr "འཕྲིན་དོན་གྱི་ \"Preview\" ནང་ལུ་ འདྲེན་ཚིག་ཚུ་ལུ་ རྟགས་བཀལ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Mark citations in the message \"Preview\"."
 msgstr "འཕྲིན་དོན་གྱི་ \"Preview\" ནང་ལུ་ འདྲེན་ཚིག་ཚུ་ལུ་ རྟགས་བཀལ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Message Window default height"
 msgstr "འཕྲིན་དོན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་མ�ོ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Message Window default width"
 msgstr "འཕྲིན་དོན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་རྒྱ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "འཕྲིན་དོན་བཀྲམ་སྟོན་གྱི་བཟོ་རྣམ�(\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ཕྱིར་�ོན་གུ་མ�ོ་མེད་སྟོངམ་བ�ོན་པའི་ བར་ན་གི་ ཉིན་གྲངས་ཉུང་མ�འ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ཕྱིར་�ོན་ས�བས་ ཕྱགས་ཧོད་སྟོངམ་བ�ོན་པའི་ བར་ན་གི་ ཉིན་གྲངས་ཉུང་མ�འ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ཕྱིར་�ོན་གུ་མ�ོ་མེད་སྟོངམ་བ�ོན་པའི་ བར་ན་གི་ དུས་ཚོད་ཉུང་མ�འ་ ཉིན་གྲངས་ནང་�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ཕྱིར་�ོན་ས�བས་ ཕྱགས་ཧོད་སྟོངམ་བ�ོན་པའི་ བར་ན་གི་ དུས་ཚོད་ཉུང་མ�འ་ ཉིན་གྲངས་ནང་�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
-msgid "New Mail Notify sound file"
-msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བས�ུལ་གྱི་སྒྲ་ས�ད་ཡིག་སྣོད�"
-
-#: ../mail/evolution-mail.schemas.in.in.h:68
-msgid "New Mail Notify type"
-msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བས�ུལ་གྱི་དབྱེ་བ�"
-
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ག�ང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ནང་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་�་བྱང་གི་གྱངས་��"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Prompt on empty subject"
 msgstr "དོན་ཚན་སྟོངམ་ལུ་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ལག་ལེན་པ་ �ོའམ་མོ་གིས་ སྣོད་འཛིན་ཅིག་ རྩ་མེད་ག�ང་ནིའི་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ལག་ལེན་པ་ �ོའམ་མོ་གིས་ དོན་ཚན་མེད་པའི་ འཕྲིན་དོན་ཅིག་ ག�ང་ནིའི་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr "ལག་ལེན་པ་དེ་ དེ་འཕྲལ་ལས་ གློག་ལམ་མེདཔ་སྦེ་ འགྱོ་ནི་ཨིན་པ་ཅིན་ ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ ནུས་སྤེལ་་"
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Prompt when deleting messages in search folder"
+msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ནང་ འཕྲིན་དོན་ཚུ་བ�ོན་བ�ང་བའི་ས�བས་ ནུས་སྤེལ་འབད་ "
+
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Prompt when user expunges"
 msgstr "ལག་ལེན་པ་གིས་ ཕྱིར་བས�ྲད་འབད�་ད་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Prompt when user only fills Bcc"
 msgstr "ལག་ལེན་པ་གིས་ མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ར�ྱངམ་གཅིག་བཀང་པའི་ས�བས་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ལག་ལེན་པ་གིས་ དུས་གཅིག་ལུ་ འཕྲིན་དོན་ ༡༠ པའམ་ དེ་ལས་མངམ་ �་ཕྱེ་ནིའི་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "ལག་ལེན་པ་གིས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཡིག་འཕྲིན་འ�ོབ་འདོད་མེད་མི་ཚུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ འཕྲིན་དོན་ག�ང་ནིའི་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ལག་ལེན་པ་གིས་ ག�ོང་ཡུལ་ ཡང་ ཤོག་ནག་འདྲ་བཤུས་ དེ་ལུ་ཟེར་མེད་པའི་ འཕྲིན་དོན་ག�ང་ནིའི་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ལག་ལེན་པ་གིས་ མ་དགོ་པའི་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ ག�ང་ནིའི་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt while marking multiple messages"
 msgstr "སྣ་མང་འཕྲིན་དོན་ཚུ་ལུ་ རྟགས་བཀལ་བའི་ས�བས་ ནུས་སྤེལ་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "ཚིག་ཡིག་ནང་ གདོང་ཚབ་ཚུ་ངོས་འཛིན་འབད་དེ་ དེ་ཚུ་གི་ཚབ་ལུ་ གཟུགས་བརྙན་བཙུགས�"
+
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Recognize links in text and replace them."
 msgstr "ཚིག་ཡིག་ཚུ་ནང་ འབྲེལ་ལམ་ངོས་འཛིན་འབད་དེ་ ཚབ་མ་བཙུགས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid "Recognize smileys in text and replace them with images."
-msgstr "ཚིག་ཡིག་ནང་ སིམའི་ལིསི་ ངོས་འཛིན་འབད་དེ་ དེ་ཚུ་གི་ཚབ་ལུ་ གཟུགས་བརྙན་བཙུགས�"
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Run junk test on incoming mail."
+msgstr "ནང་འབྱོར་ཡིག་འཕྲིན་ཚུ་ལུ་ མ�ོ་མེད་བརྟག་ཞིབ་ གཡོག་བཀོལ་ "
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Run junk test on incoming mail"
-msgstr "ནང་འབྱོར་ཡིག་འཕྲིན་ཚུ་ལུ་ མ�ོ་མེད་ཀྱི་བརྟག་ཞིབ་འབད�"
-
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Save directory"
 msgstr "སྣོད་�ོ་སྲུང་བཞག་འབད་"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Search for the sender photo in local addressbooks"
+msgstr "ཉེ་གནས་ �་བྱང་ཀི་དེབ་ཚུ་ནང་ལུ་ ག�ང་མི་གི་དཔར་འཚོལ་ "
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Send HTML mail by default"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ སྔོན་སྒྲིག་�ོག་ལས་ག�ང་� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Send HTML mail by default."
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ སྔོན་སྒྲིག་�ོག་ལས་ག�ང་�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Sender email-address column in the message list"
+msgstr "འཕྲིན་དོན་�ོ་ཡིག་གི་ནང་ལུ་ གློག་འཕྲིན་ག�ང་མི་གི་ གློག་འཕྲིན་�་བྱང་ ཀེར་�ིག་ "
+
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Show Animations"
 msgstr "བསྒུལ་པར་སྟོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Show animated images as animations."
 msgstr "བསྒུལ་པར་གཟུགས་བརྙན་ཚུ་ བསྒུལ་པར་བཟུམ་སྦེ་སྟོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "བ�ོན་ག�ང་མི་ འཕྲིན་དོན་ཚུ་ འཕྲིན་དོན་�ོ་ཡིག་ནང་ (སྦུག་འབྲེག་དང་བཅསཔ་སྦེ)སྟོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Show deleted messages in the message-list"
 msgstr "བ�ོན་ག�ང་མི་འཕྲིན་དོན་ཚུ་ འཕྲིན་དོན་�ོ་ཡིག་ནང་སྟོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-msgid "Show the email of the sender in the messages composite column in the message list"
-msgstr "འཕྲིན་དོན་�ོ་ཡིག་གི་ འཕྲིན་དོན་སྣ་སྡུད་ཀེར་�ིག་ནང་ ག�ང་མི་དེ་གི་ གློག་འཕྲིན་སྟོན�"
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Show photo of the sender"
+msgstr "ག�ང་མི་གི་ དཔར་སྟོན་ "
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid "Show the sender email in the messages column in the message list"
-msgstr "འཕྲིན་དོན་�ོ་ཡིག་གི་ འཕྲིན་དོན་ཀེར་�ིག་ནང་ ག�ང་མི་དེ་གི་ གློག་འཕྲིན་སྟོན�"
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Show the email-address of the sender in a separate column in the message list."
+msgstr "འཕྲིན་དོན་�ོ་ཡིག་ནང་ལུ་ འཕྲིན་དོན་ག�ང་མི་དེ་གི་ གློག་ཕྲིན་ �་བྱང་ ཀེར་�ིག་སོ་སོ་ནང་སྦེ་ སྟོན་ "
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
-msgid "Sound file to play when new mail arrives."
-msgstr "ཡིག་འཕྲིན་གསརཔ་ལྷོདཔ་ད་ ག�ང་ནིའི་སྒྲ་ས�ད་ཡིག་སྣོད�"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "འཕྲིན་དོན་ལྷག་ནིའི་ པེན་ནང་ལུ་  འཕྲིན་དོན་ ག�ང་མི་དེ་གི་ གློག་དཔར་ སྟོན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "ལག་ལེན་པ་གིས་ ལག་ལེན་འ�བ་འདོད་ཡོད་མི་ ཡིག་འཕྲིན་བརྡ་བས�ུལ་གསར་པའི་དབྱེ་བ་དེ་ གསལ་བཀོད་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Specifies the header to check for junk."
+msgstr "མ�ོ་མེད་ ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ མགོ་ཡིག་ གསལ་བཀོད་འབད�་ཨིན� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Specifies the header to check for junk. The format is headername=value in gconf."
+msgstr "མ�ོ་མེད་ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ མགོ་ཡིག་གསལ་་བཀོད་འབད�་ཨིན� རྩ་སྒྲིག་དེ་ མགོ་ཡིག་མིན་= ཇི་སི་ཨོ་ཨེན་ཨེཕ་ ནང་གི་བེ་ལུ་ ཨིན� "
+
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Spell check inline"
 msgstr "ཡིག་སྡེབ་ཞིབ་དཔྱད་ཀྱི་ ཨིན་ལའིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default height"
 msgstr "ཌའི་ལོག་སྔོན་སྒྲིག་གི་མ�ོ་ཚད་ མ�ོ་མངགས་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Subscribe dialog default width"
 msgstr "ཌའི་ལོག་སྔོན་སྒྲིག་གི་རྒྱ་ཚད་ མ�ོ་མངགས་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Terminal font"
 msgstr "ཊར་མི་ནཱལ་ ཡིག་གཟུགས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Text message part limit"
 msgstr "ཆིག་ཡིག་འཕྲིན་དོན་ཡན་ལག་ཚད་"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "The default plugin for Junk hook"
 msgstr "མ�ོ་མེད་གཟེར་གྱི་དོན་ལུ་སྔོན་སྒྲིག་པ་ལག་ཨིན་"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "གལ་ཅན་དུས་ཚོད་ལས་ཚུར་ མ�ོ་མེད་སྟོངམ་སྟོན་པའི་ མ�འ་མཇུག་གི་དུས་ཚོད་ ཉིན་གྲངས་ནང་�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "གལ་ཅན་དུས་ཚོད་ལས་ཚུར་ ཕྱགས་ཧོད་སྟོངམ་སྟོན་པའི་ མ�འ་མཇུག་གི་དུས་ཚོད་ ཉིན་གྲངས་ནང་�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
-msgid "The terminal font for mail display"
-msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཊར་མི་ནཱལ་ཡིག་གཟུགས�"
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "The terminal font for mail display."
+msgstr "ཡིག་འཕྲིན་ བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཊར་མི་ནཱལ་ཡིག་གཟུགས�"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "The variable width font for mail display."
+msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ འགྱུར་ཅན་ཡིག་གཟུགས་ཀྱི་རྒྱ་ཚད� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "The variable width font for mail display"
-msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཡིག་གཟུགས་རྒྱ་ཚད་ཀྱི་འགྱུར་བ�"
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr "འདི་ལུ་ འབྱུང་སྲིན་པའི་ བེ་ལུསི་གསུམ་འོང་� འཛོལ་བ་ཚུ་གི་དོན་ལུ་ ༠ � ཉེན་བརྡ་གི་དོན་ལུ་ ༡� ར�ྱེན་སེལ་ འཕྲིན་དོན་ཚུ་གི་དོན་ལུ་ ༢� "
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:128
 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."
 msgstr "འ་ནི་འདི་གིས་ ཨི་བོ་ལུ་ཤན་གི་འོག་ལུ་ རྩ་སྒྲིག་འབད་བ�ུབ་མི་ ཚིག་ཡིག་ཡན་ལག་འདི་གི་ མང་མ�འ་ཚད་འདི་གྲོས་�ག་བཅདཔ་ཨིན� སྔོན་སྒྲིག་འདི་ ༤ཨེམ་བི་ / ༤༠༩༦ ཀེ་བི་ཨིན་ དེ་ལས་འདི་ ཀེ་བི་ནང་གསལ་བཀོད་འབད་ཡོདཔ་ཨིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it wont fall back to the other available plugins."
-msgstr "སྣ་མང་པ་ལག་ཨིན་ཚུ་ལྕོགས་ཅན་བཟོ་དེ་ཡོད་རུང་  འདི་སྔོན་སྒྲིག་མ�ོ་མེད་པ་ལག་ཨིན་ཨིན�  སྔོན་སྒྲིག་�ོ་བཀོད་འབད་དེ་ཡོད་མི་པ་ལག་ཨིན་འདི་ལྕོགས་མེད་བཟོ་དེ་ཡོད་པ་ཅིན་  འདི་གིས་�ོབ་ཚུགས་པའི་པ་ལག་ཨིན་གཞན་མི་ལུ་གློ་བུར་རྒྱབ་�ག་མི་འབད�"
+#: ../mail/evolution-mail.schemas.in.h:129
+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.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "This key is read only once and reset to false after read. This unselects the mail in the list and removes the preview for that folder."
+msgstr "ལྡེ་མིག་འདི་ ཚར་གཅིག་ར�ྱངམ་ཅིག་ལྷཔ་ཡོདཔ་དང་ ལྷག་ཚར་བའི་ཤུལ་ལུ་ རྫུན་མ་སྦེ སླར་སྒྲིག་འབད་དེ་འདུག� དེ་གིས་ �ོ་ཡིག་ནང་ལས་ ཡིག་འཕྲིན་ སེལ་འ�ུ་མི་འབད�་ཨིནམ་དང་ སྣོད་འཛིན་གྱི་ སྔོན་ལྟ་ རྩ་བས�ྲད་ག�ངམ་ཨིན� "
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "ལྡེ་མིག་འདི་ནང་ ཨེགསི་ཨེམ་ཨེལ་གྱི་ གཞི་བཀོད་ཀྱི་�ོ་ཡིག་ཅིག་ཡོད་དགོཔ་ད་ དེ་གིས་སྲོལ་སྒྲིག་མགོ་ཡིག་ཚུ་དང་ དེ་ཚུ་བཀྲམ་སྟོན་ འབད་དགོ་ག་མིན་དགོ་ཚུ་ གསལ་བཀོད་འབད�་ཨིན� ཨེགསི་ཨེམ་ཨེལ་ གཞི་བཀོད་ཀྱི་རྩ་སྒྲིག་དེ་ &lt;header enabled&gtཨིན� ཡིག་འཕྲིན་མ�ོང་སྣང་ནང་ མགོ་ཡིག་བཀྲམ་སྟོན་ འབད་དགོ་པ་ཅིན་ ལྕོགས་ཅན་བཟོ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "This option would help in improving the speed of fetching."
+msgstr "གདམ་�་དེ་གིས་ ལེན་ནིའི་མགྱོགས་ཚད་ ལེགས་བཟོ་འབད་ནི་ལུ་ གྲོགས་རམ་འབད་འོང་� "
+
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
 msgstr "འདི་གིས་སྔོན་སྒྲིག་འཕྲིན་དོན་�ོ་ཡིག་མ�ོང་བྱེད་ནང་སྟོན་ནིའི་ �་བྱང་གི་གྱངས་�་གཞི་སྒྲིག་འབད�་ཨིན� དེ་ལས་བརྒལ�་ད་ '...' ཅིག་སྟོནམ་ཨིན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr "གཞི་སྒྲིག་འདི་གིས་ �ེ་རེཌི་ཚུ་ སྔོན་སྒྲིག་གིས་  རྒྱ་འཕར་ ཡང་ན་ རམ་ནིའི་གནས་ལུགས་ནང་འོང་དགིཔ་ཨིན་ན་མེན་ན་ གསལ་བཀོད་འབད�་ཨིན� ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་བཙུགས་དགོ་པས� "
+
+#: ../mail/evolution-mail.schemas.in.h:135
+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:136
 msgid "Thread the message list."
 msgstr "འཕྲིན་དོན་�ོ་ཡིག་ �ེ་རེཌི་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Thread the message-list"
 msgstr "འཕྲིན་དོན་�ོ་ཡིག་ �ེ་རེཌི་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Thread the message-list based on Subject"
 msgstr "དོན་ཚན་ལུ་ གཞི་བཞག་སྟེ་ འཕྲིན་དོན་�ོ་ཡིག་ �ེ་རེཌི་འབད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
-msgid "Timeout for marking message as Seen"
-msgstr "འཕྲིན་དོན་མ�ོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་དུས་ཚོད་ཀྱི་ ངལ་མཚམས�"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Timeout for marking message as seen"
+msgstr "འཕྲིན་དོན་མ�ོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་ དུས་ཚོད་ཀྱི་ ངལ་མཚམས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
-msgid "Timeout for marking message as Seen."
-msgstr "འཕྲིན་དོན་མ�ོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་དུས་ཚོད་ཀྱི་ ངལ་མཚམས�"
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Timeout for marking message as seen."
+msgstr "འཕྲིན་དོན་མ�ོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་ དུས་ཚོད་ཀྱི་ ངལ་མཚམས�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "UID string of the default account."
 msgstr "སྔོན་སྒྲིག་རྩིས་�ོའི་ ཡུ་ཨའི་ཌི་ ཡིག་རྒྱུན�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Use SpamAssassin daemon and client"
 msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ ཞབས་�ོག་སྤྱོད་མི་ ལག་ལེན་འ�བ་"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
-msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ཞབས་�ོག་སྤྱོད་མི་ ལག་ལེན་འ�བ�(ཨེསི་པི་ཨེ་ཨེམ་སི/ཨེསི་པི་ཨེ་ཨེམ་ཌི)"
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ཞབས་�ོག་སྤྱོད་མི་ ལག་ལེན་འ�བ་ (ཨེསི་པི་ཨེ་ཨེམ་སི/ཨེསི་པི་ཨེ་ཨེམ་ཌི)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Use custom fonts"
 msgstr "སྲོལ་སྒྲིག་ཡིག་གཟུགས་ ལག་ལེན་འ�བ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Use custom fonts for displaying mail"
-msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ སྲོལ་སྒྲིག་ཡིག་གཟུགས་ ལག་ལེན་འ�བ�"
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Use custom fonts for displaying mail."
+msgstr "ཡིག་འཕྲིན་ བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ སྲོལ་སྒྲིག་ཡིག་གཟུགས་ཚུ་  ལག་ལེན་འ�བ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only local spam tests."
 msgstr "ཉེ་གནས་ཀྱི་ སི་པམ་ བརྟག་ཞིབ་ར�ྱངམ་གཅིག་ ལག་ལེན་འ�བ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ཉེ་གནས་ཀྱི་ སི་པམ་བརྟག་ཞིབ་ར�ྱངམ་གཅིག་ ལག་ལེན་འ�བ� (ཌི་ཨེན་ཨེསི་ ལག་ལེན་མ་འ�བ)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Use side-by-side or wide layout"
 msgstr "ཟུར་�ར་ ཡང་ན་ རྒྱ་ཅན་སྒྲིག་བཀོད་ ལག་ལེན་འ�བ�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Variable width font"
 msgstr "འགྱུར་བའི་ཡིག་གཟུགས་ཀྱི་རྒྱ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "View/Bcc menu item is checked"
 msgstr "མ�ོང་སྣང་/མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "View/Bcc menu item is checked."
 msgstr "མ�ོང་སྣང་/མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "View/Cc menu item is checked"
 msgstr "མ�ོང་སྣང་/ཤོག་ནག་འདྲ་བཤུས་དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི��"
 
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "View/Cc menu item is checked."
 msgstr "མ�ོང་སྣང་/ཤོག་ནག་འདྲ་བཤུས་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི��"
 
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "View/From menu item is checked"
 msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ལས་ སྟོན་ནི་ཞིབ་དཔྱད་འབད་ཡི��"
 
-#: ../mail/evolution-mail.schemas.in.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "View/From menu item is checked."
 msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ལས་ སྟོན་ནི་ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "View/PostTo menu item is checked"
 msgstr "མ�ོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ གནས་བས�ྱོད་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "View/PostTo menu item is checked."
 msgstr "མ�ོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ གནས་བས�ྱོད་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "View/ReplyTo menu item is checked"
 msgstr "མ�ོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ ལན་གསལ་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "View/ReplyTo menu item is checked."
 msgstr "མ�ོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ ལན་གསལ་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "ལྷབ་ཡོད་པའི་ འབྱོར་རྟགས་ཀྱི་ ཞུ་བ་དེ་ འཕྲིན་དོན་ག་ར་ལུ་ སྔོན་སྒྲིག་གིས་ བསྡོབས་དེ་ཡོད་ག་མེད་ག� "
+
+#: ../mail/evolution-mail.schemas.in.h:161
 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.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "ཨ་ཕི་ �ེརེཌི་ནང་ལུ་ ཕྲིན་དོན་གསརཔ་ལུ་གཞི་བཞག་སྟེ་ �ེརེཌི་ཚུ་ "
+
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Width of the message-list pane"
 msgstr "འཕྲིན་དོན་�ོ་ཡིག་པེན་གྱི་རྒྱ་ཚད�"
 
-#: ../mail/evolution-mail.schemas.in.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Width of the message-list pane."
 msgstr "འཕྲིན་དོན་�ོ་ཡིག་པེན་གྱི་མ�ོ་ཚད�"
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:184
 msgid "Importing Elm data"
 msgstr "ཨི་ཨེལ་ཨེམ་ གནད་སྡུད་ནང་འདྲེན་འབད་དོ�"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:369
 msgid "Evolution Elm importer"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨི་ཨེལ་ཨེམ་ ནང་འདྲེན་པ�"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:370
 msgid "Import mail from Elm."
 msgstr "ཨི་ཨེལ་ཨེམ་ནང་ལས་ ཡིག་འཕྲིན་ནང་འདྲེན་འབད�"
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "འགྲོ་ཡུལ་སྣོད་འཛིན:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "ལུ་ ནང་འདྲེན་འབད་ནིའི་དོན་ལས་ སྣོད་འཛིན་སེལ་འ�ུ་འབད�"
 
@@ -12890,120 +12893,30 @@ msgstr "བར་ཀི་ལེ་ཡིག་སྒྲོམà¼� (ཡིག་à
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "བར་ཀེ་ལེ་ཡིག་སྒྲོམ་ རྩ་སྒྲིག་གི་སྣོད་འཛིན་ཚུ་གི་ནང་འདྲེན་པ�"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:515
-#, c-format
-msgid "Importing `%s'"
-msgstr "`%sནང་འདྲེན་འབད་དོ�"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
-msgid "Please wait"
-msgstr "བསྒུག་སྡོད་གནང་�"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "འཕྲིན་སྒྲོམ་ནང་འདྲེན་འབད་དོ�"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:232
+#: ../shell/e-shell-importer.c:518
 #, c-format
-msgid "Scanning %s"
-msgstr " %sཞིབ་ལྟ་འབད་དོ�"
+msgid "Importing `%s'"
+msgstr "`%sནང་འདྲེན་འབད་དོ�"
 
-#: ../mail/importers/netscape-importer.c:74
+#: ../mail/importers/mail-importer.c:372
 #, c-format
-msgid "Priority Filter \"%s\""
-msgstr "གཙོ་རིམ་གྱི་ཚགས་མ�\"%s\""
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"�ྱོད་ཀྱི་ནེཊི་སིཀེཔ་ གློག་འཕྲིན་ཚགས་མ་ལ་ལོ་ཅིག་ ཨི་བོ་ལུ་ཤཱན་ནང་\n"
-" ལག་ལེན་འ�བ་ནི་མེད་པའི་ གློག་འཕྲིན་གཙོ་རིམ་ལུ་ གཞི་བཞག་ནུག\n"
-"དེ་གི་ཚབ་ལུ་ ཨི་བོ་ལུ་ཤཱན་ གློག་འཕྲིན་ལུ་ འགན་སྤྲོད་འབད་དེ་\n"
-" དེ་དང་འ�ྲིལ་�ེ་ བཙགས་ཚུགས་པའི་ ས�ུགས་གྲངས་-༣ ལས་ ༣ གྱི་བར་ན་\n"
-" བྱིནམ་ཨིན�\n"
-"\n"
-"དེ་གི་དོན་ལུ་ \"Priority Filter\"ཟེར་མི་ ཚགས་མའི་ཆ་ཚན་ཅིག་\n"
-" �་ས�ོང་བར�ྱབས་མི་དེ་གིས་ ནེཊི་སིཀེཔ་གི་ གློག་འཕྲིན་གཙོ་རིམ་ཚུ་ ཨི་བོ་ལུ་ཤཱན་གྱི་ ས�ུགས་གྲངས་ལུ་\n"
-" གྱུར་བ�ང་དོ་ཡོདཔ་ལས་ གནོད་ས�ྱོན་བྱུང་མི་ ཚགས་མ་ཚུ་གིས་ གཙོ་རིམ་གྱི་ཚབ་ལུ་\n"
-" ས�ུགས་གྲངས་ཚུ་ ལག་ལེན་འ�བ་ཨིན� ལཱ་ཚུ་ཆ་མཉམ་ རེ་བ་ལྟར་དུ་ འབད་ནིའི་དོན་ལུ་\n"
-" ནང་འདྲེན་པའི་ ཚགས་མ་ཚུ་ལུ་ ཞིབ་དཔྱད་འབད�"
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"�ྱོད་ཀྱི་ ནེཊི་སིཀེཔ་ གློག་འཕྲིན་གྱི་ཚགས་མ་ ལ་ལོ་ཅིག་གིས་\n"
-" ཨི་བོ་ལུ་ཤཱན་ནང་ རྒྱབ་ས�ྱོར་མེད་པའི་�ྱད་རྣམ་ \"Ignore Thread\" ཡང་ཅིན་ \"Watch Thread\"\n"
-" ལག་ལེན་འ�བ་ཨིན�\n"
-" ཚགས་མ་འདི་ཚུ་ བཀོག་བཞག་འོང་�"
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"�ྱོད་ཀྱི་ ནེཊི་སིཀེཔ་ གློག་འཕྲིན་ཚགས་མ་ལ་ལོ་ཅིག་གིས་ \n"
-"ཨི་བོ་ལུ་ཤཱན་ནང་ རྒྱབ་ས�ྱོར་མེད་པའི་ ཡིག་རྒྱུན་ཅིག་གི་དོན་ལུ་ \n"
-"གློག་འཕྲིན་གྱི་མ་གཟུགས་ འདྲ་མཉམ་ཡོད་མེད་ \n"
-"བརྟག་ཞིབ་འབད�་ཨིན� ཚགས་མ་དེ་ཚུ་ ལེགས་བཅོས་འབད་དེ་ ཡིག་རྒྱུན་དེ་ \n"
-"འཕྲིན་དོན་མ་གཟུགས་ནང་ཡོད་མེད་ བརྟག་ཞིབ་འབད�་ཨིན�"
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ ནེཊི་སིཀེཔ་ གནད་སྡུད་རྙིངམ་ ནང་འདྲེན་འབད་དོ�"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "ནེཊི་སིཀེཔ་ གནད་སྡུད་ནང་འདྲེན་འབད་དོ�"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "གཞི་སྒྲིག་ཚུ�"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "ཡིག་འཕྲིན་གྱི་ཚགས་མ་ཚུ�"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ནེཊི་སིཀེཔ་ ཡིག་འཕྲིན་གྱི་ ཡིག་སྣོད་ཚུ་�ོབ་ནུག\n"
-"�ྱོད་ཀྱིས་ དེ་ཚུ་ཨི་བོ་ལུ་ཤཱན་ནང་ ནང་འདྲེན་འབད་ནི་ཨིན་ན?"
+msgid "Scanning %s"
+msgstr " %sཞིབ་ལྟ་འབད་དོ�"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "པ་ཡིན་གནད་སྡུད་ ནང་འདྲེན་འབད་དོ� "
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
 msgid "Evolution Pine importer"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ པ་ཡིན་ ནང་འདྲེན་པ�"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
 msgid "Import mail from Pine."
 msgstr "རྒྱུད་དུང་ནང་ལས་ ཡིག་འཕྲིན་ནང་འདྲེན་འབད� "
 
@@ -13032,320 +12945,355 @@ msgstr "%sགི་འཕྲིན་ག�ང་�ོ་ཡིག"
 msgid "Add Filter Rule"
 msgstr "ཚགས་མའི་ལམ་ལུགས་ �་ས�ོང་བར�ྱབ�"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:536
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "སེལ་འ�ུ་འབད་ཡོདཔ་%d"
+msgstr[1] "སེལ་འ�ུ་འབད་ཡོདཔ་%d"
+
+#: ../mail/mail-component.c:540
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%dབ�ོན་བ�ང་ཡི�"
 msgstr[1] "%dབ�ོན་བ�ང་ཡི�"
 
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "མ�ོ་མེད་%d�"
 msgstr[1] "མ�ོ་མེད་%d�"
 
-#: ../mail/mail-component.c:548
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "སེལ་འ�ུ་འབད་ཡོདཔ་%d"
-msgstr[1] "སེལ་འ�ུ་འབད་ཡོདཔ་%d"
-
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "ཟིན་བྲིས་%d�"
 msgstr[1] "ཟིན་བྲིས་%d�"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%dབ�ང་ཡོད�"
 msgstr[1] "%dབ�ང་ཡོད�"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d བ�ང་བཤོལ་འབད་ཡི�"
 msgstr[1] "%d བ�ང་བཤོལ་འབད་ཡི�"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:555
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%dམ་ལྷག"
 msgstr[1] "%dམ་ལྷགཔ�"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "བསྡོམས་%d�"
 msgstr[1] "བསྡོམས་%d�"
 
-#: ../mail/mail-component.c:871
+#: ../mail/mail-component.c:896
 msgid "New Mail Message"
 msgstr "ཡིག་འཕྲིན་གསར་པའི་འཕྲིན་དོན�"
 
-#: ../mail/mail-component.c:872
+#: ../mail/mail-component.c:897
 msgid "_Mail Message"
 msgstr "ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན� (_M)"
 
-#: ../mail/mail-component.c:873
+#: ../mail/mail-component.c:898
 msgid "Compose a new mail message"
 msgstr "ཡིག་འཕྲིན་གྱི་ འཕྲིན་དོན་གསརཔ་ཅིག་བརྩམ�"
 
-#: ../mail/mail-component.c:879
+#: ../mail/mail-component.c:904
 msgid "New Mail Folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན་གསརཔ�"
 
-#: ../mail/mail-component.c:880
+#: ../mail/mail-component.c:905
 msgid "Mail _Folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན� (_F)"
 
-#: ../mail/mail-component.c:881
+#: ../mail/mail-component.c:906
 msgid "Create a new mail folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན་གསརཔ་ཅིག་ གསར་བས�ྲུན་འབད�"
 
-#: ../mail/mail-component.c:1027
+#: ../mail/mail-component.c:1053
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ཡིག་འཕྲིན་གྱི་ སྒྲིག་སྟངས་སམ་ སྣོད་འཛིན་ཚུ་  ཡར་བས�ྱེད་འབད་མ་ཚུགས�"
 
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "གལ་ཅན�(_m)"
+#: ../mail/mail-component.c:1522
+msgid "Error"
+msgstr "འཛོལ་བ་ "
 
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "ལཱ་གཡོག(_W)"
+#: ../mail/mail-component.c:1522
+msgid "Errors"
+msgstr "འཛོལ་བ་ཚུ་ "
 
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "རང་དོན�(_P)"
+#: ../mail/mail-component.c:1523
+msgid "Warnings and Errors"
+msgstr "ཉེན་བརྡ་དང་འཛོལ་བ་ཚུ� "
 
-#. forest green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "ཊུ་ཌུ�(_T)"
+#: ../mail/mail-component.c:1524
+msgid "Debug"
+msgstr "ར�ྱེན་སེལ་ "
 
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "ཤུལ་ལས�(_L)"
+#: ../mail/mail-component.c:1524
+msgid "Error, Warnings and Debug messages"
+msgstr "འཛོལ་བ་  ཉེན་བརྡ་ དེ་ལས་ ར�ྱེན་སེལ་ འཕྲིན་དོན་ཚུ་ "
+
+#: ../mail/mail-component.c:1634
+msgid "Debug Logs"
+msgstr "ར�ྱེན་སེལ་ དྲན་དེབ་ "
+
+#: ../mail/mail-component.c:1638
+msgid "Show _errors in the status bar for"
+msgstr "གི་དོན་ལུ་ གནས་ཚད་ཕྲ་རིང་ནང་ལུ་ འཛོལ་བ་ཚུ་སྟོན་ (_E)"
+
+#: ../mail/mail-component.c:1645
+msgid "seconds."
+msgstr "ས�ར་ཆ� "
+
+#: ../mail/mail-component.c:1655
+msgid "Log Messages:"
+msgstr "ལོག་ འཕྲིན་དོན་ཚུ:"
+
+#: ../mail/mail-component.c:1707
+msgid "Log Level"
+msgstr "ལོག་ གནས་རིམ་ "
+
+#: ../mail/mail-component.c:1714
+#: ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "ཆུ་ཚོད�"
+
+#: ../mail/mail-component.c:1721
+#: ../mail/message-list.c:2408
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "འཕྲིན་དོན་ཚུ�"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "རྒྱབ་ས�ྱོར་ཡོད་པའི་དབྱེ་བའི་དོན་ལུ་་ཞིབ་དཔྱད་འབད� (_e)"
 
-#: ../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
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>ཨེསི་ཨེསི་ཨེལ་དེ་ ཨི་བོ་ལུ་ཤཱན་ གཟུགས་འདི་ནང་ རྒྱབ་ས�ྱོར་མིན་འདུག་</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>ག�ང་མི་གི་ དཔར་</b>"
+
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr " <b>མིང་རྟགས་ཚུ་</b> (_n)"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr "<b>གནས་བས�ྱོད་ གདམ་�་དྲག་ཤོས་</b> (འོས་སྦྱོར་མ་འབད་བས་)"
+
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr " <b>ས�ད་ཡིག་ཚུ་</b> (_L)"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\"> རྩིས་�ོའི་བརྡ་དོན་</span>"
 
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\"> བདེན་སྦྱོར་དབྱེ་བ་</span>"
-
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\"> བདེན་སྦྱོར་</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\"> འཕྲིན་དོན་འབྲི་རྩོམ་</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">རིམ་སྒྲིག་</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">སྔོན་སྒྲིག་སྤྱོད་ལམ་</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\"> ཡིག་འཕྲིན་བ�ོན་ག�ང་</span>"
 
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">བཀྲམ་སྟོན་འབད་མི་ ཡིག་འཕྲིན་མགོ་ཡིག་</span>(_H)"
-
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">�་ཡིག་དང་ཚོས་གཞི་</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">བཀྲམ་སྟོན་འབད་ཡོད་པའི་ ཕྲིན་དོན་ མགོ་ཡིག་ཚུ་</span>"
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\"> �་ཡིག་</span>"
+
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">གཟུགས་བརྙན་མངོན་གསལ་</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་བཀྲམ་སྟོན་</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་ཡིག་གཟུགས་</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་འབྱོར་རྟགས་ཚུ་</span>"
 
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">ཡིག་འཕྲིན་གྱི་བརྡ་དོན་གསརཔ་</span>"
-
-#: ../mail/mail-config.glade.h:22
+#: ../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\">གདམ་�འི་བརྡ་དོན་</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">གདམ་�་ཚུ་</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">གསང་བ་ཧ་ཅང་གིས་ལེགས་ཤོམ་(པི་ཇི་པི་/ཇི་པི་ཇི)</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">དཔར་བས�ྲུན་འབད་མི་ཡིག་གཟུགས་</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">དགོ་པའི་བརྡ་དོན་</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">མ�འ་བཙན་ལྡན་པའི་མ་ཡིམ་(ཨེསི་/མ་ཡིམ)</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">སྲུང་ས�ྱོབ་</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་བ�ང་བ�ངམ་དང་ཟིན་བྲིས་</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">སར་བར་རིམ་སྒྲིག་</span>"
 
 #: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\"> བདེན་སྦྱོར་དབྱེ་བ་</span> (_A)"
+
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "རྩིས་�ོའི་འཛིན་ས�ྱོང་�"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr "མིང་རྟགས་གསརཔ་�་ས�ོང་ར�ྱབས་...(_w)"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr "ཡིག་ཚུགས་�་ས�ོང་ར�ྱབས� (_S)"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ཨ་རྟག་ར་ རྩིས་�ོ་འདི་ ལག་ལེན་འ�བ་པའི་ས�བས་ ཕྱིར་ག�ང་འཕྲིན་དོན་ཚུ་ལུ་ མིང་རྟགས་བཀོད� (_w)"
 
-#: ../mail/mail-config.glade.h:36
-msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "གསང་བཟོས་འཕྲིན་དོན་ ག�ང་བའི་ས�བས་ རང་ཉིད་ལུ་ཡང་ གསང་བ་བཟོ� (_f)"
+#: ../mail/mail-config.glade.h:38
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "�ེ་མ་ཚད་ གསང་བཟོས་འཕྲིན་དོན་ ག�ང་བའི་ས�བས་ རང་ཉིད་ལུ་ཡང་ གསང་བ་བཟོ� (_F)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ཨ་རྟག་ར་ ཤོག་གནག་འདྲ་བཤུས་ག�ང་ཡུལ་:�(_s)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ཨ་རྟག་ར་ མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ག�ང་ཡུལ་: (_b)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ཨ་རྟག་ར་ གསང་བ་བཟོ་བའི་ས�བས་ ངེད་ཀྱི་ལྡེ་འ�ོར་ནང་ ལྡེ་མིག་ཚུ་ལུ་ བློ་ག�ད་འབད� (_t)"
 
-#: ../mail/mail-config.glade.h:40
-msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "ཨ་རྟག་ར་ གསང་བཟོས་འཕྲིན་དོན་ཚུ་ བ�ང་བའི་ས�བས་རང་ཉིད་ལུ་ གསང་བ་བཟོ� ((_m)"
+#: ../mail/mail-config.glade.h:42
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "ཨ་རྟག་ར་ གསང་བཟོས་འཕྲིན་དོན་ཚུ་ བ�ང་བའི་ས�བས་ང་རང་ལུ་ གསང་བ་བཟོ་ (_M)"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:43
+msgid "Always request rea_d receipt"
+msgstr "ཨ་རྟག་རང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ ཞུ་བ་འབད་ (_D)"
+
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "འཕྲིན་དོན་འདྲ་དང་པ་ མཉམ་སྦྲགས་འབད�"
 
-#: ../mail/mail-config.glade.h:43
-msgid "Automatically insert _smiley images"
-msgstr "རང་བཞིན་གྱིས་ སི་མའི་ལི་གཟུགས་བརྙན་ཚུ་བཙུགས� (_s)"
+#: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "རང་བཞིན་གྱིས་ གདོང་ཚབ་གཟུགས་བརྙན་ཚུ་བཙུགས་ (_E)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "བཱལ་ཊིཀ་(ཨའི་ཨེསི་ཨོ་-༨༨༥༩-༡༣)�"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "བཱལ་ཊིཀ་(ཨའི་ཨེསི་ཨོ་-༨༨༥༩-༤)�"
 
-#: ../mail/mail-config.glade.h:46
-msgid "Beep w_hen new mail arrives"
-msgstr "འཕྲིན་དོན་གསརཔ་ འབྱོར་བའི་ས�བས་ བརྡ་ས�ད་ར�ྱབས� (_h)"
-
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "ཡིག་འབྲུའི་ཆ་ཚན: (_h)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:50
+msgid "C_heck custom headers for junk"
+msgstr "ནང་འབྱོར་འཕྲིན་དོན་ མ�ོ་མེད་ཨིནམ་མེནམ་ ཞིབ་དཔྱད་འབད� (_H)"
+
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "རྒྱབ་ས�ྱོར་ལྡན་པའི་དབྱེ་བ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད� (_e)"
 
-#: ../mail/mail-config.glade.h:49
-msgid "Check in_coming mail for junk"
-msgstr "ནང་འབྱོར་འཕྲིན་དོན་ མ�ོ་མེད་ཨིནམ་མེནམ་ ཞིབ་དཔྱད་འབད� (_c)"
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr "ནང་འབྱོར་འཕྲིན་དོན་ མ�ོ་མེད་ཨིནམ་མེནམ་ ཞིབ་དཔྱད་འབད� (_M)"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "ང་གིས་ ཡིག་དཔར་ར�ྱབ་པའི་ས�བས་ ཡིག་སྡེབ་ཞིབ་དཔྱད་འབད� (_t)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "ནང་འབྱོར་འཕྲིན་དོན་ཚུ་ མ�ོ་མེད་ཨིནམ་མེནམ་ ཞིབ་དཔྱད་འབད�"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "བསལ� (_a)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "བསལ� (_r)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "སྡེབ་འཛོལ་མི་ མིང་ཚིག་ཚུ་གི་དོན་ལུ་ཚོས་གཞི་: (_m)"
 
-#: ../mail/mail-config.glade.h:55
-msgid "Colors"
-msgstr "ཚོས་གཞི་ཚུ�"
-
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "སྣོད་འཛིན་ཅིག་ རྩ་མེད་བ�ང་བའི་ས�བས་ ངེས་ག�ན་སྦེ་དྲིས� (_w)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13361,140 +13309,156 @@ msgstr ""
 "\n"
 "�ྱོད་རའི་སྒྲིག་སྟངས་ཚུ་ བསྲུང་ནི་ལུ་ \"Apply\" ལུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "སྔོན་སྒྲིག་འབད� (_f)"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "ཡིག་འབྲུའི་ཨིན་ཀོ་ཌིང་ སྔོན་སྒྲིག་འབད་: (_n)"
 
-#: ../mail/mail-config.glade.h:66
-msgid "Delete junk mails on e_xit"
-msgstr "ཕྱིར་�ོན་གུ་མ�ོ་མེད་ཡིག་འཕྲིན་ཚུ་བ�ོན་ག�ང་ (_x)"
-
 #: ../mail/mail-config.glade.h:68
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "ཕྱིར་ག�ང་འཕྲིན་དོན་ཚུ་ལུ་ ཌི་ཇི་ཊཱལ་གྱི་�ོག་ལས་ མིང་རྟགས་བཀོད� (སྔོན་སྒྲིག་�ོག་ལས)(_s) "
-
-#: ../mail/mail-config.glade.h:69
-msgid "Do not format text contents in mails if the text si_ze exceeds"
-msgstr "ཚིག་ཡིག་གི་ཚད་འདི་ལྷག་པ་ཅིན་ ཡིག་འཕྲིན་ནང་ ཚིག་ཡིག་ནང་དོན་ཚུ་ རྩ་སྒྲིག་མ་འབད་"
+msgid "Delete junk messages on e_xit"
+msgstr "ཕྱིར་�ོན་གུ་ མ�ོ་མེད་ཡིག་འཕྲིན་ ཚུ་བ�ོན་ག�ང་ (_X)"
 
 #: ../mail/mail-config.glade.h:70
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "ཕྱིར་ག�ང་འཕྲིན་དོན་ཚུ་ལུ་ ཌི་ཇི་ཊཱལ་གྱི་�ོག་ལས་ མིང་རྟགས་བཀོད་ (སྔོན་སྒྲིག་�ོག་ལས)(_U) "
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr "ག�ང་མི་འདི་ ངེའི་�་བྱང་ཀི་དེབ་ནང་ཡདོ་པ་ཅིན་ འཕྲིན་དོན་ཚུ་ མ�ོ་མེད་སྦེ་ རྟགས་མ་བཀལ་ (_N)"
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr "ཚིག་ཡིག་གི་ཚད་འདི་ལྷག་པ་ཅིན་ ཡིག་འཕྲིན་ནང་ ཚིག་ཡིག་ནང་དོན་ཚུ་ རྩ་སྒྲིག་མ་འབད་(_Z)"
+
+#: ../mail/mail-config.glade.h:73
 msgid "Do not quote original message"
 msgstr "འགོ་�ོག་འཕྲིན་དོན་ལུ་ འདྲེན་རྟགས་མ་བཀལ�"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "འབད་ཚར�"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་: (_F)"
 
-#: ../mail/mail-config.glade.h:73
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "ལྕོགས་ཅན་བཟོ� (_n)"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "གློག་འཕྲིན་རྩིས་�ོ�"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "གློག་འཕྲིན་�་བྱང་: (_A)�"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "ཕྱིར་�ོན་ས�བས་ ཕྱགས་ཧོད་སྟོངམ་བ�ོན� (_x)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr "མིག་འཕྲུལ་ བར་སྟོང་ཕྲ་རིང་ ལྕོགས་ཅན་བཟོ་ (_P)"
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "ཚོལ་ཞིབ་སྣོད་འཛིན་ཚུ་ ལྕོགས་ཅན་བཟོ་ (_R)"
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "གསང་བཟོ་བའི་ལག་�ྱེར་: (_p)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "ཕྱིར་ག�ང་འཕྲིན་དོན་ཚུ་གསང་བ་བཟོ� (སྔོན་སྒྲིག་�ོག་ལས) (_g)"
 
-#: ../mail/mail-config.glade.h:80
-msgid "Fi_xed width Font:"
-msgstr "རྒྱ་ཚད་ག�ན་བཟོས་ཡིག་གཟུགས་: (_x)"
-
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "ག�ན་བཟོས་རྒྱ་ཚད་: (_x)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr "རྒྱ་ཚད་ཡིག་གཟུགས་ག�ན་བཟོས་: (_E)"
+
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "ཡིག་གཟུགས་ཀྱི་རྒྱུ་དངོས�"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ནང་ འཕྲིན་དོན་ཚུ་རྩ་སྒྲིག་འབད� (_H"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "མིང་ཆ་ཚང་: (_e)"
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཕྲིན་དོན�"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:91
 msgid "Headers"
 msgstr "མགོ་ཡིག་ཚུ�"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:92
 msgid "Highlight _quotations with"
 msgstr "འདྲེན་ཚིག་ཚུ་འདི་གི་�ོག་ལས་ གཙོ་དམིགས་འབད� (_q)"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "ཨིན་ལའིན�"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:95
+msgid "Inline original message (Outlook style)"
+msgstr " གྱལ་རིམ་ནང་ འཕྲིན་དོན་ ངོ་མ་(སྣང་ཚུལ་ བཟོ་རྣམ་)"
+
+#: ../mail/mail-config.glade.h:97
 msgid "KB"
 msgstr "ཀེ་བི་"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:98
+#: ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "�་ཡིག་ཚུ་ "
+
+#: ../mail/mail-config.glade.h:99
 msgid "Languages Table"
 msgstr "ས�ད་ཡིག་ཚུ་གི་�ིག་�ྲམ�"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Configuration"
 msgstr "ཡིག་འཕྲིན་རིམ་སྒྲིག"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Headers Table"
 msgstr "ཡིག་འཕྲིན་མགོ་ཡིག་ཚུ་གི་�ིག་�ྲམ�"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "Mailbox location"
 msgstr "ཡིག་སྒྲོམ་གནས་�ོངས�"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:104
 msgid "Message Composer"
 msgstr "འཕྲིན་དོན་རྩོམ་མ�ན�"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "དྲན་འཛན: �་ཡིག་ མིན་ནང་གི་ཤམ་�ིག་དེ་ དཀར་ཆག་ནང་ ཨེམ་ནི་མོ་ནིཀ་ ངོས་འཛིན་པ་སྦེ་ ལག་ལེན་འ�བ་སྟེ་ཡོད� "
+
+#: ../mail/mail-config.glade.h:106
 msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "དྲན་འཛིན་: �ྱོད་ཀྱིས་�ེངས་དང་པ་ མ་མ�ུད་ཚུན་ཚོད་ �ྱོད་ལུ་ཆོག་ཡིག་གི་ ནུས་སྤེལ་མི་འ�ོབ�"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:107
 msgid "Or_ganization:"
 msgstr "ལས་སྡེ་: (_g)"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:108
 msgid "PGP/GPG _Key ID:"
 msgstr "པི་ཇི་པི་/ཇི་པི་ཇི་ལྡེ་མིག་གི་ཨའི་ཌི་: (_K)"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr "འཕྲིན་དོན་གསརཔ་འབྱོར�་ད་ སྒྲ་ས�ད་ཡིག་སྣོད་ག�ང་� (_v)"
-
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13502,127 +13466,119 @@ msgstr ""
 "འོག་གི་བར་སྟོང་ནང་ལུ་ རྩིས་�ོ་འདི་གི་དོན་ལས་ འགྲེལ་བཤད་ཅན་གྱི་ མིང་ཅིག་བཙུགས�\n"
 "མིང་འདི་ བཀྲམ་སྟོན་གྱི་དགོས་དོན་ལུ་ར�ྱངམ་གཅིག་ ལག་ལེན་འ�བ་ནི་ཨིན�"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 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:110
+#: ../mail/mail-config.glade.h:113
 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 "�ྱོད་རའི་མིང་དང་ གློག་འཕྲིན་�་བྱང་ཚུ་ འོག་ལུ་བཙུགས� �ྱོད་ཀྱིས་ག�ང་མི་ ཡིག་འཕྲིན་ནང་ བཙུགས་འདོད་ཡོད་ན་མ་ག�ོགས་ དེ་མིན་འོག་ལུ་ཡོད་མི་ \"optional\" ས་སྒོ་དེ་ བཀང་མི་དགོ"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "འོག་གི་གདམ་�་ཚུ་གི་གྲས་ལས་སེལ་འ�ུ་འབད་གནང་�"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "མ�ོང་མེད་ཤོག་གནག་འདྲ་བཤུས་ ལེན་མ�ན་ཚུ་ ངེས་འཛིན་འབད་ཡོད་པའི་ འཕྲིན་དོན་ཚུ་ ག�ངམ་ད་ར�ྱངམ་གཅིག་ ནུས་སྤེལ་འབད�(_o)"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "འཕྲིན་དོན་འདྲ་དང་པ་ལུ་ འདྲེན་རྟགས་བཀལ�"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "འདྲེན་རྟགས་བཀོད་བཀོདཔ�"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "ཆོག་ཡིག་སེམས་�ར་བཞག (_m)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "ལན་གསལ་ག�ང་ལུ་: (_p)"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "ཆོག་ཡིག་སེམས་�ར་བཞག (_p)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr "ཉེ་གནས་ �་བྱང་ཀི་དེབ་ནང་ལུ་ར�ྱངམ་ཅིག་ ག�ང་མི་གི་ དཔར་ འཚོལ་ཞིབ་འབད་ (_E)"
+
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "སེལ་འ�ུ་འབད་...(_e)"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "འཕྲིན་དོན་གྱི་འབྱོར་རྟགས་ཚུ་ས�ྱེལ་:(_e)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "ཚད་ལྡན་ཡིག་གཟུགས་: (_t)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Se_lect..."
-msgstr "སེལ་འ�ུ་འབད་...(_l)"
-
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML fixed width font"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་ག�ན་འ�ེལ་གྱི་ ཡིག་གཟུགས་སེལ་འ�ུ་འབད�"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font for printing"
 msgstr "དཔར་བས�ྲུན་གྱི་དོན་ལས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་ག�ན་�ེལ་གྱི་ ཡིག་གཟུགས་སེལ་འ�ུ་འབད�"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML variable width font"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་འགྱུར་བ་ཅན་གྱི་ ཡིག་གཟུགས་སེལ་འ�ུ་འབད�"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font for printing"
 msgstr "དཔར་བས�ྲུན་གྱི་དོན་ལས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་འགྱུར་བ་ཅན་གྱི་ ཡིག་གཟུགས་སེལ་འ�ུ་འབད�"
 
-#: ../mail/mail-config.glade.h:128
-msgid "Select sound file"
-msgstr "སྒྲ་ས�ད་སེལ་འ�ུ་འབད�"
-
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Sending Mail"
 msgstr "ཡིག་འཕྲིན་བ�ང་དོ�"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "བ�ང་ཚར་བའི་ འཕྲིན་དོན་སྣོད་འཛིན་:(_M)"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "སར་བར་ལུ་ བདེན་བཤད་དགོ་པས� (_v)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "སར་བར་གྱི་དབྱེ་བ་...(_T)"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Sig_ning certificate:"
 msgstr "མིང་རྟགས་བཀོད་ནིའི་ལག་�ྱེར་:(_n)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "མིང་རྟགས་: (_u)"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "མིག་རྟགས་ཚུ�"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "Signatures Table"
 msgstr "མིག་རྟགས་ཚུ་གི་�ིག་�ྲམ�"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Specify _filename:"
-msgstr "ཡིག་སྣོད་ཀྱི་མིང་ གསལ་བཀོད་འབད་: (_f)"
-
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "ཡིག་སྡེབ་ཞིབ་དཔྱད་འབད་དོ�"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "དབྱེ་བ་:(_y)"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "ནཱ་ལུ་ཡོད་མི་ ས�ད་ཡིག་གི་�ོ་ཡིག་ནང་ལུ་ ས�ད་ཡིག་ག་ཅི་གི་ ཡིག་མཛོད་གཞི་བཙུགས་འབད་དེ་ཡོད་མི་ ས�ག་ཡིག་ཚུ་ར�ྱངམ་གཅིག་ �ོནམ་ཨིན�"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13633,6 +13589,10 @@ msgstr ""
 " ལག་ལེན་འ�བ་ནི་ཨིན�"
 
 #: ../mail/mail-config.glade.h:146
+msgid "This option will be overridden if a match for custom junk headers is found."
+msgstr "སྲོལ་སྒྲིག་ མ�ོ་མེད་མགོ་ཡིག་གི་དོན་ལུ་ མ�ུན་སྒྲིག་གཅིག་འ�ོབ་དེ་ཡོད་པ་ཅིན་ གདམ་�་འདི་ མེདཔ་ག�ང་དེ་འོང་� "
+
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13640,16 +13600,17 @@ msgstr ""
 "�ྱོད་ཀྱིས་རྩིས་�ོ་འདི་དང་ གཞི་བསྟུན་འབད་དགོ་མནོ་མི་ མིང་དེ་ཡིག་དཔར་ར�ྱབས�\n"
 "དཔེར་ན་:\"Work\" ཡང་ཅིན་ \"Personal\" ལྟ་བུ་ཨིན�"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 #: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "ལག་ལེན་པའི་མིང་: (_n)"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "འགྱུར་བ་ཅན་གྱི་རྒྱ་ཚད་: (_a)"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13672,20 +13633,20 @@ msgid "_Default junk plugin:"
 msgstr "སྔོན་སྒྲིག་མ�ོ་མེད་པ་ལག་ཨིན: (_D)"
 
 #: ../mail/mail-config.glade.h:157
-msgid "_Do not notify me when new mail arrives"
-msgstr "འཕྲིན་དོན་གསརཔ་ལྷོདཔ་ད་ ང་ལུ་བརྡ་བས�ུལ་མ་འབད� (_D)"
-
-#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "འཛོམས་འདུའི་ཞུ་བ་ལུ་ མིང་རྟགས་མ་བཀོད� (ཨའུཊི་ལུཀ་ཆ་མ�ུན་གྱི་དོན་ལུ) (_D)"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "གདོང་བས�ྱོད་ཀྱི་བཟོ་རྣམ་: (_F)"
 
+#: ../mail/mail-config.glade.h:160
+msgid "_Keep Signature above the original message on replying"
+msgstr "ལན་གསལ་འབད་བའི་ས�བས་ མིང་རྟགས་དེ  འཕྲིན་དོན་ངོ་མ་གི་ ལྟག་ལུ་བཞག་ (_K)"
+
 #: ../mail/mail-config.glade.h:161
-msgid "_Load images in mail from contacts"
-msgstr "འབྲེལ་ས་ཚུ་ནང་ལས་ ཡིག་འཕྲིན་ལུ་ གཟུགས་བརྙན་མངོན་གསལ་འབད�(_L)"
+msgid "_Load images in messages from contacts"
+msgstr "འབྲེལ་ས་ཚུ་ལས་ འཕྲིན་དོན་ཚུ་ནང་ གཟུགས་བརྙན་ མངོན་གསལ་འབད་ (_L)"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
@@ -13719,32 +13680,40 @@ msgstr "ལན་གསལ་གྱི་དབྱེ་བ་: (_R)"
 msgid "_Script:"
 msgstr "ཡིག་ཚུགས་: (_S)"
 
+#: ../mail/mail-config.glade.h:171
+msgid "_Select..."
+msgstr "སེལ་འ�ུ་འབད་...(_S)"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Show image animations"
 msgstr "གཟུགས་བརྙན་གྱི་བསྒུལ་པར་སྟོན�(_S)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
+msgid "_Show the photograph of sender in the message preview"
+msgstr "འཕྲིན་དོན་སྔོན་ལྟ་ནང་ལུ་ ག�ང་མི་གི་དཔར་སྟོན་ (_S)"
+
+#: ../mail/mail-config.glade.h:176
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ག�ང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ཀྱི་མགོ་ཡིག་ཚུ་ས�ུམས�(_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 msgid "_Use Secure Connection:"
 msgstr "མ�འ་བཙན་ཅན་གྱི་མ�ུད་ལམ་ ལག་ལེན་འ�བ་: (_U)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "གློག་རིམ་གཞན་ཟུམ་གྱི་ ཡིག་གཟུགས་ཚུ་ ལག་ལེན་འ�བ� (_U)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "addresses"
 msgstr "�་བྱང་�"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "color"
 msgstr "ཚོས་གཞི�"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "description"
 msgstr "འགྲེལ་བཤད�"
 
@@ -13781,7 +13750,6 @@ msgid "Case _sensitive"
 msgstr "ཡི་གུ་ཆུ་ཆུང་གི་ཉེན་�� (_s)"
 
 #: ../mail/mail-dialogs.glade.h:9
-#: ../mail/message-tags.glade.h:1
 msgid "Co_mpleted"
 msgstr "མཇུག་བསྡུ་ཡོད� (_m)"
 
@@ -13794,8 +13762,7 @@ msgid "Find in Message"
 msgstr "འཕྲིན་དོན་ནང་འཚོལ�"
 
 #: ../mail/mail-dialogs.glade.h:13
-#: ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/message-tag-followup.c:298
 msgid "Flag to Follow Up"
 msgstr "ཤུལ་དཔྱད་དགོ་པའི་ཟུར་རྟགས�"
 
@@ -13824,7 +13791,6 @@ msgid "Specific folders"
 msgstr "དམིགས་བསལ་གྱི་སྣོད་འཛིན་ཚུ�"
 
 #: ../mail/mail-dialogs.glade.h:21
-#: ../mail/message-tags.glade.h:3
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13837,12 +13803,10 @@ msgid "_Accept License"
 msgstr "ཆོག་�མ་དང་ལེན་འབད� (_A)"
 
 #: ../mail/mail-dialogs.glade.h:24
-#: ../mail/message-tags.glade.h:5
 msgid "_Due By:"
 msgstr "རན་དུས་: (_D)"
 
 #: ../mail/mail-dialogs.glade.h:25
-#: ../mail/message-tags.glade.h:6
 msgid "_Flag:"
 msgstr "ཟུར་རྟགས་: (_F)"
 
@@ -13850,7 +13814,7 @@ msgstr "ཟུར་རྟགས་: (_F)"
 msgid "_Tick this to accept the license agreement"
 msgstr "ཆོག་�མ་གན་འཛིན་དེ་ དང་ལེན་འབད་ནིའི་དོན་ལུ་ འདི་ལུ་བདེན་རྟགས་བཀལ� (_T)"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:831
 #, c-format
 msgid "Pinging %s"
 msgstr "%s པིང་འབད་དོ"
@@ -13859,30 +13823,34 @@ msgstr "%s པིང་འབད་དོ"
 msgid "Filtering Selected Messages"
 msgstr "སེལ་འ�ུ་འབད་ཡོད་པའི་ འཕྲིན་དོན་ཚུ་ བཙགས་དོ་"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "ཡིག་འཕྲིན་ལེན་དོ�"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ཕྱིར་ག�ང་གི་ཚགས་མ་%s ཚུ་ ལག་ལེན་འ�བ་མ་ཚུགས�"
 
-#: ../mail/mail-ops.c:578
-#: ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr "%s: %sལུ་ མཇུག་བསྣོན་འབད་མ་ཚུགས� དེ་གི་ཚབ་ལུ་ ཉེ་གནས་ལུ་བ�ང་ཡོད་པའི་སྣོད་འཛིན་ལུ་ མཇུག་བསྣོན་འབད་དོ� "
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ཉེ་གནས་ལུ་ ‘བ�ང་ཡོད་པའི་’ སྣོད་འཛིན་%sལུ་ མཇུག་བསྣོན་འབད་མ་ཚུགས�"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "འཕྲིན་དོན་ག�ང་དོ་(_S)"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "འཕྲིན་དོན་%d ལས་ %dབ�ང་དོ�"
@@ -13893,15 +13861,16 @@ msgid "Failed to send %d of %d messages"
 msgstr "འཕྲིན་དོན་%dལས་%dབ�ང་མ་ཚུགས�"
 
 #: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:703
+#: ../mail/mail-send-recv.c:704
 msgid "Canceled."
 msgstr "ཆ་མེད་བ�ང་ཡོད�"
 
 #: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:706
 msgid "Complete."
 msgstr "ཡོངས་སྒྲུབ�"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
 msgid "Saving message to folder"
 msgstr "འཕྲིན་དོན་སྣོད་འཛིན་ལུ་ སྲུང་བཞག་འབད་དོ�"
 
@@ -13915,78 +13884,78 @@ msgstr "འཕྲིན་དོན་ཚུ་ %s ལུ་ སྤོ་བཤà
 msgid "Copying messages to %s"
 msgstr "འཕྲིན་དོན་ཚུ་%sལུ་ འདྲ་བཤུས་ར�ྱབ་དོ�"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "གདོང་བས�ྱོད་འབད་ཡོད་པའི་འཕྲིན་དོན་ཚུ�"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
 msgstr "སྣོད་འཛིན་%s�་ཕྱེ་དོ�"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1270
 #, c-format
 msgid "Opening store %s"
 msgstr "མཛོད་�ང་%s�་ཕྱེ་དོ�"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Removing folder %s"
 msgstr "སྣོད་འཛིན་%s སྤོ་བཤུད་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1430
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "སྣོད་འཛིན་%sགསོག་འཇོག་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1493
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "རྩིས་�ོ་'%s'རྩ་མེད་བ�ང་སྟེ་ གསོག་འཇོག་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1494
 #, c-format
 msgid "Storing account '%s'"
 msgstr "རྩིས་�ོ་'%s'གསོག་འཇོག་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1548
 msgid "Refreshing folder"
 msgstr "སྣོད་འཛིན་ཡང་སེལ་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1614
-#: ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1635
 msgid "Expunging folder"
 msgstr "སྣོད་འཛིན་རྩ་མེད་བ�ང་དོ�"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1632
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s'ནང་ལུ་ ཕྱགས་ཧོད་སྟོངམ་བ�ོན་དོ�"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1633
 msgid "Local Folders"
 msgstr "ཉེ་གནས་ཀྱི་སྣོད་འཛིན་ཚུ�"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving message %s"
 msgstr "འཕྲིན་དོན་%s སླར་འདྲེན་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1821
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "འཕྲིན་དོན་%dསླར་འདྲེན་འབད་དོ�"
 msgstr[1] "འཕྲིན་དོན་%d སླར་འདྲེན་འབད་དོ�"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1906
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "འཕྲིན་དོན་ %d སྲུང་བཞག་འབད་དོ�"
 msgstr[1] "་འཕྲིན་དོན་ཚུ་ %d སྲུང་བཞག་འབད་དོ�"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1976
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13995,12 +13964,12 @@ msgstr ""
 "འཕྲིན་དོན་ཚུ་ %s ནང་ སྲུང་བཞག་འབད་ནི་ལུ་འཛོལ་བ�\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2048
 msgid "Saving attachment"
 msgstr "མཉམ་སྦྲགས་སྲུང་བཞག་འབད་དོ�"
 
-#: ../mail/mail-ops.c:2098
-#: ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2060
+#: ../mail/mail-ops.c:2066
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14009,70 +13978,76 @@ msgstr ""
 "ཨའུཊི་པུཊི་ཡིག་སྣོད་ %s བཟོ་མ་ཚུགས�\n"
 "\" %s\""
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2076
 #, c-format
 msgid "Could not write data: %s"
 msgstr "གནད་སྡུད་%sའབྲི་མ་ཚུགས�"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2222
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sནང་ལས་ མ�ུད་ལམ་བ�ོག་བ�ང་དོ�"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2222
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%sལུ་ སླར་མ�ུད་འབད་དོ�"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2318
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "རྩིས་�ོ་  '%s' གློག་ལམ་མེད་པའི་དོན་ལུ་ གྲ་སྒྲིག་འབད་དོ་ "
+
+#: ../mail/mail-ops.c:2404
 msgid "Checking Service"
 msgstr "ཞབས་�ོག་ཞིབ་དཔྱད་འབད་དོ�"
 
-#: ../mail/mail-send-recv.c:161
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "ཆ་མེད་ག�ང་དོ་..."
 
-#: ../mail/mail-send-recv.c:403
+#: ../mail/mail-send-recv.c:393
 msgid "Send & Receive Mail"
 msgstr "འཕྲིན་དོན་ག�ང་ནི་དང་ལེན་ནི�"
 
-#: ../mail/mail-send-recv.c:410
+#: ../mail/mail-send-recv.c:400
 msgid "Cancel _All"
 msgstr "ཆ་མཉམ་ ཆ་མེད་ག�ང་� (_A)"
 
-#: ../mail/mail-send-recv.c:516
+#: ../mail/mail-send-recv.c:510
 msgid "Updating..."
 msgstr "དུས་མ�ུན་བཟོ་དོ་..."
 
-#: ../mail/mail-send-recv.c:516
+#: ../mail/mail-send-recv.c:510
 #: ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "བསྒུད་སྡོད་དོ་..."
 
-#: ../mail/mail-send-recv.c:791
+#: ../mail/mail-send-recv.c:810
+#, c-format
 msgid "Checking for new mail"
 msgstr "ཡིག་འཕྲིན་གསརཔ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་དོ�"
 
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཚིག་བཙུགས�"
 
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "ཆོག་ཚིག་བཙུགས�"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་བཙུགས�"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "ཆོག་ཡིག་བཙུགས�"
 
-#: ../mail/mail-session.c:245
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "ལག་ལེན་པ་གིས་ བཀོལ་སྤྱོད་ཆ་མེད་བ�ང་ནུག"
 
@@ -14085,7 +14060,6 @@ msgid "Enter a name for this signature."
 msgstr "མིང་རྟགས་འདི་གི་དོན་ལུ་ མིང་ཅིག་བཙུགས�"
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "མིང་:"
 
@@ -14113,26 +14087,26 @@ msgstr "གདོང་བས�ྱོད་འབད་ཡོད་པའི་
 msgid "Invalid folder: `%s'"
 msgstr "ནུས་མེད་སྣོད་འཛིན་ `%s'�"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་: %s གཞི་སྒྲིག་འབད་དོ�"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s'གི་དོན་ལས་ འཚོལ་ཞིབ་སྣོད་འཛིན་ཚུ་ དུས་མ�ུན་བཟོ་དོ�"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s'གི་དོན་ལས་ འཚོལ་ཞིབ་སྣོད་འཛིན་ཚུ་ དུས་མ�ུན་བཟོ་དོ�"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1059
 msgid "Edit Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ ཞུན་དག་ར�ྱབས�"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1148
 msgid "New Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་གསརཔ�"
 
@@ -14307,66 +14281,82 @@ msgid "Delete account?"
 msgstr "རྩིས་�ོ་བ�ོན་ག�ང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:45
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr "&quot;{0}&quot;འཚོལ་ཞིབ་སྣོད་འཛིན་ ནང་ འཕྲིན་དོན་ཚུ་བ�ོན་ག�ང་ནི་ཨིན་ན;?"
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder?"
+msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ནང་ འཕྲིན་དོན་ཚུ་ བ�ོན་ག�ང་ནི་ཨིན་ན?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Discard changes?"
 msgstr "བསྒྱུར་བཅོས་ཚུ་བ�ོན་བཀོག་ནི་ཨིན་ན?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
+msgid "Do not d_elete"
+msgstr "བ�ོན་མ་ག�ང་(_E)"
+
+#: ../mail/mail.error.xml.h:49
 msgid "Do not delete"
 msgstr "བ�ོན་མ་ག�ང་�"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Do not disable"
 msgstr "ལྕོགས་མིན་མ་བཟོ�"
 
-#: ../mail/mail.error.xml.h:48
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "�ྱོད་ཀྱིས་བཀོལ་སྤྱོད་ཚུ་ ཡན་ལག་སྣོད་འཛིན་ཚུ་ནང་འབད་ནི་ཨིན་ན?"
+#: ../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:49
+#: ../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 "འཕྲིན་དོན་ཆ་མཉམ་རང་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "བསྒྱུར་བཅོས་ཚུ་ བསྲུང་ནི་ཨིན་ན?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "ཆོག་ཡིག་བཙུགས�"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "ཚགས་མའི་ངེས་ཚིག་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "བཀོལ་སྤྱོད་ལག་ལེན་འ�བ་པའི་ས�བས་ལུ་འཛོལ་བ�"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "{0}གི་ས�བས་ལུ་འཛོལ་བ�"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "ཡིག་སྣོད་འདུག་ དེ་འབད�་ ཚབ་སྲུང་འབད་མི་བ�ུབ་པས�"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "ཡིག་སྣོད་འདུག་ དེ་འབད�་ད་ དུས་རྒྱུན་གྱི་ ཡིག་སྣོད་ཅིག་མེན་པས�"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "�ྱོད་ཀྱིས་ འཕྲོ་མ�ུད་པ་ཅིན་ འཕྲིན་དོན་འདི་ཚུ་ སླར་གསོ་་འབད་མི་ཚུགས�"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h: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:59
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "�ྱོད་ཀྱིས་འཕྲོ་མ�ུད་པ་ཅིན་ པོརོ་སི་རྩིས་�ོ་ཚུ་ རྟག་བརྟན་སྦེ་བ�ོན་ག�ང་འོང་�"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14374,128 +14364,134 @@ msgstr ""
 "�ྱོད་ཀྱིས་འཕྲོ་མ�ུད་དེ་འབད་བ་ཅིན་ རྩིས་�ོའི་བརྡ་དོན་དང་\n"
 "པོ་རོག་སི་བརྡ་དོན་ཆ་མཉམ་རང་ རྟག་བརྟན་སྦེ་ བ�ོན་ག�ང་འོང་�"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "�ྱོད་ཀྱིས་འཕྲོ་མ�ུད་དེ་འབད་བ་ཅིན་ རྩིས་�ོའི་བརྡ་དོན་དེ་ རྟག་བརྟན་སྦེ་ བ�ོན་ག�ང་འོང་�"
 
-#: ../mail/mail.error.xml.h:63
+#: ../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:64
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "སྣང་མེད་བཞག"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "ནུས་མེད་བདེན་བཤད�"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "ཡིག་འཕྲིན་ཚགས་མ་ཚུ་ རང་བཞིན་གྱིས་ དུས་མ�ུན་བཟོ་ཡི�"
 
-#: ../mail/mail.error.xml.h:68
+#: ../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 "�ྱོད་ཀྱིས་བ�ང་བའི་བསྒང་ཡོད་མི་ འབྲེལ་སའི་�ོ་ཡིག་དེ་ ལེན་མ�ན་གྱི་�ོ་ཡིག་ སྦ་བཞག་ནི་ལུ་ རིམ་སྒྲིག་འབད་ནུག གློག་འཕྲིན་རིམ་ལུགས་ ལེ་ཤ་ཅིག་གིས་རང་ མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ ལེན་མ�ན་ཡོད་མི་འཕྲིན་དོན་ཚུ་ར�ྱངམ་ལུ་ ག�ང་ཡུལ་གྱི་ མགོ་ཡིག་ཅིག་ �་ས�ོང་བར�ྱབ་ཨིན� མགོ་ཡིག་འདི་ �་ས�ོང་ར�ྱབས་བ་ཅིན་ �ྱོད་ཀྱི་ལེན་མ�ན་ ཆ་མཉམ་རང་ �ྱོད་ཀྱི་འཕྲིན་དོན་གང་རུང་ནང་ �ོ་བཀོད་འབད�་ཨིན� འདི་སྤང་ནིའི་དོན་ལུ་ �ྱོད་ཀྱིས་ ཉུང་ཤོས་རང་ ག�ང་ལུ: ཡང་ཅིན་ སི་སི་: ལེན་མ�ན་གཅིག་ �་ས�ོང་བར�ྱབ་དགོ   "
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "འཕྲིན་དོན་ཆ་མཉམ་རང་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ�"
 
-#: ../mail/mail.error.xml.h:70
-msgid "Mark all messages in subfolders as read?"
-msgstr "ཡན་ལག་སྣོད་འཛིན་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ལུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན?"
-
-#: ../mail/mail.error.xml.h:71
-msgid "Mark as _Read"
-msgstr "ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ� (_R)"
+#: ../mail/mail.error.xml.h:74
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "སྣོད་འཛིན་འདི་དང་ ཡན་ལག་སྣོད་འཛིན་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ལུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན?"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "བརླག་སྟོར་ཞུགས་མི་སྣོད་འཛིན�"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "No sources selected."
 msgstr "འབྱུང་�ུངས་ག་ནི་ཡང་ སེལ་འ�ུ་མ་འབད་བས�"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
+msgid "Only on _Current Folder"
+msgstr "ད་ལྟོའི་སྣོད་འཛིན་ནང་ར�ྱངམ་ཅིག་ (_C)"
+
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr "འཕྲིན་དོན་མང་རབས་ཅིག་ དེ་འཕྲལ་ལས་ �་ཕྱེ་བ་ཅིན་ ཡུན་རིངམ་འགོར་འོང་�"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr "�ྱོད་རའི་རྩིས་�ོའི་གཞི་སྒྲིག་ལུ་ ཞིབ་དཔྱད་འབད་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བས�ྱེད་གནང་�"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid "Please enable the account or send using another account."
 msgstr "རྩིས་�ོ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ རྩིས་�ོ་གཞན་ཅིག་ ལག་ལེན་འ�བ་སྟེ་ག�ང་�"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 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:79
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please make sure the following recipients are willing and able to receive HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
 "འོག་གི་ལེན་མ�ན་ཚུ་གིས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ གློག་འཕྲིན་ལེན་ནིའི་གྲ་སྒྲིག་དང་ ལྕོགས་གྲུབ་ཡོདཔ་བཟོ་གནང་�\n"
-"{0}\n"
-"གང་རུང་སྦེ་ག�ང་�"
+"{0}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "མིང་རྟགས་འདི་ངོས་འཛིན་འབད་ནི་ལུ་ མ�ུན་མོང་མ་ཡིན་པའི་མིང་ཅིག་བ�གས�"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "བསྒུག་སྡོད་གནང་�"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "ཡིག་འཕྲིན་སྣོད་འཛིན་རྙིངམ་ &quot;{0}&quot;གཞིས་སྤོ་འབད་ནི་ལུ་དཀའ་ངལ�"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server"
 msgstr "སར་བར་ལུ་ འདྲི་དཔྱད་འབད་དོ�"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "རྒྱབ་ས�ྱོར་ཡོད་པའི་ བདེན་བཤད་�བས་རིག་གི་ �ོ་ཡིག་ཅིག་གི་དོན་ལས་ སར་བར་ལུ་ འདྲི་དཔྱད་འབད་དོ�"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid "Read receipt requested."
 msgstr "འབྱོར་རྟགས་ཞུ་བ་ལྷག "
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "སྣོད་འཛིན་&quot;{0}&quot;དང་ དེ་གི་ཡན་ལག་སྣོད་འཛིན་ ཆ་མཉམ་རང་ �ད་རི་འབའ་རི་ བ�ོན་ག�ང་ནི་ཨིན་ན?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ཚུ་ རང་བཞིན་གྱིས་ དུས་མ�ུན་བཟོ་ཡོད�"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "འབྱོར་རྟགས་ས�ྱེལ�"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "མིང་རྟགས་ཧེ་མ་ལས་འདུག"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "མཉམ་འབྱུང་འབད་"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr "གློག་ལམ་མེདཔ་ད་ ལག་ལེན་འ�བ་ནིའི་དོན་ལུ་ སྣོད་འཛིན་ཚུ་ ཉེ་གནས་ལུ་ མཉམ་འབྱུང་འབད་ག? "
+
+#: ../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:93
+#: ../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 "�ྱོད་ཀྱིས་བ�ང་བའི་བསྒང་ཡོད་མི་ འབྲེལ་སའི་�ོ་ཡིག་དེ་ ལེན་མ�ན་གྱི་�ོ་ཡིག་ སྦ་བཞག་ནི་ལུ་ རིམ་སྒྲིག་འབད་ནུག གློག་འཕྲིན་རིམ་ལུགས་ ལེ་ཤ་ཅིག་གིས་རང་ མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ ལེན་མ�ན་ཡོད་མི་འཕྲིན་དོན་ཚུ་ར�ྱངམ་ལུ་ ག�ང་ཡུལ་གྱི་ མགོ་ཡིག་ཅིག་ �་ས�ོང་བར�ྱབ་ཨིན� མགོ་ཡིག་འདི་ �་ས�ོང་བར�ྱབས་པ་ཅིན་ �ྱོད་ཀྱི་ལེན་མ�ན་ ཆ་མཉམ་རང་ �ྱོད་ཀྱི་འཕྲིན་དོན་ནང་ �ོ་བཀོད་འབད�་ཨིན� འདི་སྤང་ནིའི་དོན་ལུ་ �ྱོད་ཀྱིས་ ཉུང་ཤོས་རང་ ག�ང་ལུ: ཡང་ཅིན་ སི་སི་: ལེན་མ�ན་གཅིག་ �་ས�ོང་བར�ྱབ་དགོ"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14509,7 +14505,7 @@ msgstr ""
 "&quot;{1}&quot;ལག་ལེན་འ�བ་སྟེ་\n"
 "དུས་མ�ུན་བཟོ་ཡི�"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14523,77 +14519,85 @@ msgstr ""
 "ལག་ལེན་འ�བ་སྟེ་\n"
 "དུས་མ�ུན་བཟོ་ཡི�"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "ཡིག་ཚུགས་ཡིག་སྣོད་དེ་ ཕྱིར་བ�ོན་ཞིནམ་ལས་ ལག་ལེན་འ�བ་བ�ུབ་བཟོ་དགོ"
 
-#: ../mail/mail.error.xml.h:107
+#: ../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:109
+#: ../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:110
+#: ../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:111
+#: ../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:112
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "མིང་རྟགས་འདི་ བསྒྱུར་བཅོས་འབད་ནུག་ དེ་འབད�་ད་ མ་བསྲུངས་པས�"
 
-#: ../mail/mail.error.xml.h:113
+#: ../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:114
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "སྡེ་རིམ་སར་བར་ལུ་མ�ུད་མ་ཚུགས�"
 
-#: ../mail/mail.error.xml.h:115
+#: ../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:116
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "ཆོག་�མ་ཡིག་སྣོད་ ལྷག་མ་ཚུགས�"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "སྔོན་སྒྲིག་ལག་ལེན་འ�བ� (_D)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "སྔོན་སྒྲིག་ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ ལག་ལེན་འ�བ�"
 
-#: ../mail/mail.error.xml.h:120
+#: ../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 ""
+"ཉེན་བརྡ: འཚོལ་ཞིབ་སྣོད་འཛིན་ནང་ལས་ འཕྲིན་དོན་ཚུ་ བ�ོན་ག�ང་མི་དེ་གིས་ �ྱོད་རའི་ཉེ་གནས་ ཡང་ན་ �ག་རིང་གི་སྣོད་འཛིན་ཚུ་ནང་ལས་ འཕྲིན་དོན་ངོ་མ་དེ་ བ�ོན་ག�ང་འོང་� \n"
+"�ྱོད་ཀྱིས་འདི་ �ད་རི་འབའ་རི་ འབད་ནི་ཨིན་ན?"
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "�ྱོད་ཀྱིས་ གོས་མ�ོའི་ཡོད་པའི་ བརྡ་དོན་ཆ་མཉམ་ཚངམ་སྦེ་ མ་བཀང་པས�"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "�ྱོད་ཀྱིས་འཕྲིན་དོན་ཚུ་ བ�ང་བཤོལ་འབད་ཡི� གང་རུང་སྦེ་ སྤང་ནི་ཨིན་ན?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "�ྱོད་ཀྱིས མིང་ཅོག་གཅིགཔ་འབད་མི་ རྩིས་�ོ་གཉིས་ གསར་ས�ྲུན་འབད་ནི་མི་འོང་�"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "�ྱོད་ཀྱིས་འཚོལ་ཞིབ་སྣོད་འཛིན་འདི་ལུ་ མིང་བ�གས་དགོ�"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "�ྱོད་ཀྱིས་སྣོད་འཛིན་ཅིག་ གསལ་བཀོད་འབད་དགོ"
 
-#: ../mail/mail.error.xml.h:125
+#: ../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."
@@ -14602,105 +14606,104 @@ msgstr ""
 "དེ་ཡང་ སྣོད་འཛིན་སོ་སོ་སྦེ་ སེལ་འ�ུ་འབད་�ེ་འབད་རུང་ ཉེ་གནས་ཀྱི་སྣོད་འཛིན་ ཆ་མཉམ་སེལ་འ�ུ་འབད་རུང་\n"
 "�ག་རིང་གི་སྣོད་འཛིན་ ཆ་མཉམ་སེལ་འ�ུ་འབད་རུང་ ཡང་ཅིན་ དེ་གཉིས་ཆ་རང་ སེལ་འ�ུ་འབད་བའི་�ོག་ལས་འབད་དགོ"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "�ྱོད་ཀྱིས་སར་བར་&quot;{0}&quot;དེ་ &quot;{0}&quot;བཟུམ་སྦེ་ ནང་བས�ྱོད་འབད་མ་ཚུགས�"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "མཇུག་བསྣོན་འབད� (_A)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "བསྒྱུར་བཅོས་ཚུ་ བ�ོན་བཀོག་ད� (_D)"
 
-#: ../mail/mail.error.xml.h:130
-msgid "_Do not Mark as Read"
-msgstr "ལྷག་ཡོདཔ་སྦེ་ རྟགས་མ་བཀལ� (_D)"
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr "མཉམ་འབྱུང་མ་འབད་ (_D)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "རྩ་མེད་ག�ང་� (_E)"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "འཕྲིན་དོན་ཚུ་�་ཕྱེ� (_O)"
 
-#: ../mail/message-list.c:1022
+#: ../mail/mail.error.xml.h:143
+msgid "on Current Folder and _Subfolders"
+msgstr "ད་ལྟོའི་ སྣོད་འཛིན་དང་ ཡན་ལག་སྣོད་འཛིན་ཚུ་གུ་ (_S)"
+
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "མ་མ�ོངམ�"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "མ�ོང་མ�ོངམ�"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "ལན་སླབ་ཡོདཔ�"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "མ་མ�ོང་པའི་སྣ་མང་འཕྲིན་དོན�"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "སྣ་མང་འཕྲིན་དོན�"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "དམའ་ཤོས�"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "དམའ་མི�"
 
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "མ�ོ་མི�"
 
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "མ�ོ་ཤོས�"
 
-#: ../mail/message-list.c:1469
-#: ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1614
+#: ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476
-#: ../plugins/itip-formatter/itip-view.c:201
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1621
+#: ../plugins/itip-formatter/itip-view.c:206
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "ད་རིས་%l:%M %p"
 
-#: ../mail/message-list.c:1485
-#: ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1630
+#: ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "�་རྩང་%l:%M %p"
 
-#: ../mail/message-list.c:1497
-#: ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1642
+#: ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1505
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1650
+#: ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1507
-#: ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1652
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2262
-#: ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "འཕྲིན་དོན་ཚུ�"
-
-#: ../mail/message-list.c:3708
+#: ../mail/message-list.c:3850
 msgid "Generating message list"
 msgstr "འཕྲིད་དོན་�ོ་ཡིག་ བཟོ་བས�ྲུན་འབད་དོ�"
 
@@ -14720,15 +14723,15 @@ msgstr "ཟུར་རྟགས་བཀལ་ཡོདཔ�"
 msgid "Follow Up Flag"
 msgstr "ཟུར་རྟགས་ཤུལ་དཔྱད་འབད�"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "�ོབ་ཡོདཔ�"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "བ�ང་ཡོད་པའི་འཕྲིན་དོན་ཚུ�"
 
-#: ../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 "ཚད�"
@@ -14758,17 +14761,17 @@ msgstr "གདོང་བས�ྱོད�"
 msgid "No Response Necessary"
 msgstr "ངོས་ལན་དགོཔ་མེད�"
 
-#: ../mail/message-tag-followup.c:82
+#: ../mail/message-tag-followup.c:83
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ལན་གསལ�"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 #: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "ཆ་མཉམ་ལུ་ ལན་གསལ་ག�ང་�"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
 msgid "Review"
 msgstr "བས�ྱར་ཞིབ�"
 
@@ -14804,6 +14807,51 @@ msgstr "ཉེ་གནས་ཀྱི་�་བྱང་ཀི་དེབ�
 msgid "Provides core functionality for local address books."
 msgstr "ཉེ་གནས་ཀྱི་ཟླ་�ོ་ཚུ་གི་དོན་ལུ་ ནང་སྙིང་ལས་འགན་ཚུ་བྱིནམ་ཨིན�"
 
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "Enable attachment reminder plugin"
+msgstr "མཉམ་སྦྲགས་ དྲན་བས�ུལ་ པ་ལག་ཨིན་ ལྕོགས་ཅན་བཟོ་ "
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid "Enable attachment reminder plugin."
+msgstr "མཉམ་སྦྲགས་དྲན་བས�ུལ་ པལག་ཨིན་ ལྕོགས་ཅན་བཟོ�"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
+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:4
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "འཕྲིན་དོན་ མ་གཟུགས་གཅིག་ནང་བལྟ་ནིའི་དོན་ལུ་ མཉམ་སྦྲགས་ དྲན་བས�ུལ་ པ་ལག་ཨིན་ ཟུར་བརྡའི་�ོ་བཀོད� "
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+msgid "Keywords"
+msgstr "གཙོ་ཚིག་ཚུ་ "
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+msgid "Remind _missing attachments"
+msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ མཉམ་སྦྲགས་ཚུ་ དྲན་བས�ུལ་འབད་ (M)"
+
+#: ../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 "མཉམ་སྦྲགས་ དྲན་བས�ུལ་ "
+
+#: ../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 "འཕྲིན་དོན་ལུ་ མཉམ་སྦྲགས་ མིན་ནུག་ "
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Continue Editing"
+msgstr "ཞུན་དག་ འཕྲོ་མ�ུད་དེ་ འབད་(_C)"
+
 #: ../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 "ཨིན་ལའིན་གྱི་ རྣར་ཉན་མཉམ་སྦྲགས་ཚུ་ བཀྲམ་སྟོན་འབད་དེ་ ཨི་བོ་ལུ་ཤཱན་ནང་ལས་ �ད་ཀར་དུ་ག�ང་བཅུག་ནིའི་ རྩ་སྒྲིག་བྱེད་མ�ན་གྱི་ པ་ལག་ཨིན་ཅིག"
@@ -14813,16 +14861,16 @@ msgid "Audio inline plugin"
 msgstr "རྣར་ཉན་ཨིན་ལའིན་ པ་ལག་ཨིན�"
 
 #: ../plugins/backup-restore/backup-restore.c:96
-msgid "Select name of the Evolution archive"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་མཛོད་ཀྱི་མིང་ སེལ་འ�ུ་འབད་"
+msgid "Select name of the Evolution backup file"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ རྒྱབ་�ག་ཡིག་སྣོད་ཀྱི་མིང་ སེལ་འ�ུ་འབད་"
 
 #: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "རྒྱབ་�ག་གི་ཤུལ་ལས་ ཨི་བོ་ལུ་ཤཱན་ལོག་འགོ་བཙུགས� (_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:139
-msgid "Select name of the Evolution archive to restore"
-msgstr "སོར་ཆུད་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ཡིག་མཛོད་སེལ་འ�ུ་འབད་"
+msgid "Select name of the Evolution backup file to restore"
+msgstr "སོར་ཆུད་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་རྒྱབ་�ག་ཡིག་སྣོད་ཀྱི་མིང་ སེལ་འ�ུ་འབད་ "
 
 #: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
@@ -14834,15 +14882,15 @@ msgstr "རྒྱབ་�ག་ལས་སོར་ཆུད་འབད་"
 
 #: ../plugins/backup-restore/backup-restore.c:238
 msgid ""
-"You can restore Evolution from your archive. It can restore all the Mails/Calendars/Tasks/Memos/Addressbook. \n"
+"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 ""
-"ཨི་བོ་ལུ་ཤཱན་འདི་�ྱོད་རའི་ཡིག་མཛོད་ལས་�ྱོད་ཀྱིས་སོར་ཆུད་འབད་ཚུགས�  དེ་གིས་ ཡིག་འཕྲིན་ཚུ་/ཟླ་�ོ་ཚུ་/ལས་ཀ་ཚུ་/བརྗེད་�ོ་ཚུ་/�་བྱང་ཀི་དེབ་ཚུ་ཆ་མཉམ་རང་སོར་ཆུད་འབད་ཚུགས� \n"
-"དེ་གིས་གཞན་ཡང་ �ྱོད་རའི་རང་དོན་སྒྲིག་སྟངས་ཚུ་ ཡིག་འཕྲིན་ཚགས་མ་ཚུ་ལ་སོགས་པ་ཆ་མཉམ་རང་སོར་ཆུད་འབད་ཚུགས�"
+"ཨི་བོ་ལུ་ཤཱན་འདི་�ྱོད་རའི་རྒྱབ་�ག་ནང་ལས་ སོར་ཆུད་འབད་ཚུགས�  དེ་གིས་ ཡིག་འཕྲིན་/ཟླ་�ོ་/ལས་ཀ་/བརྗེད་�ོ་�་བྱང་ཀི་དེབ་ཚུ་ཆ་མཉམ་རང་སོར་ཆུད་འབད་ཚུགས� \n"
+"དེ་མ་ཚད་  �ྱོད་རའི་རང་དོན་སྒྲིག་སྟངས་ཚུ་དང་ ཡིག་འཕྲིན་ཚགས་མ་ལ་སོགས་པ་ག་ར་ སོར་ཆུད་འབད་ཚུག� "
 
 #: ../plugins/backup-restore/backup-restore.c:244
-msgid "_Restore Evolution from the backup archive"
-msgstr "རྒྱབ་�ག་གི་ཤུལ་ལས་ ཨི་བོ་ལུ་ཤཱན་ལོག་འགོ་བཙུགས་ (_R)"
+msgid "_Restore Evolution from the backup file"
+msgstr "རྒྱབ་�ག་ཡིང་སྣོད་ནང་ལས་ ཨི་བོ་ལུ་ཤཱན་ སོར་ཆུད་འབད་  (_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:251
 msgid "Please select an Evolution Archive to restore:"
@@ -14852,80 +14900,80 @@ msgstr "སོར་ཆུད་འབད་ནིའི་དོན་ལུ་
 msgid "Choose a file to restore"
 msgstr "སོར་ཆུད་འབད་ནི་ལུ་ཡིག་སྣོད་ཅིག་ གདམ་�་ར�ྱབས་"
 
-#: ../plugins/backup-restore/backup.c:50
-#: ../plugins/backup-restore/backup.c:90
+#: ../plugins/backup-restore/backup.c:40
+msgid "Backup Evolution directory"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ སྣོད་�ོ་ལུ་ རྒྱབ་�ག་འབད�"
+
+#: ../plugins/backup-restore/backup.c:42
+msgid "Restore Evolution directory"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ སྣོད་�ོ་སོར་ཆུད་འབད�"
+
+#: ../plugins/backup-restore/backup.c:44
+msgid "Check Evolution Backup"
+msgstr "ཨི་བོ་ལུ་ཤཱན་རྒྱབ་�ག་ ཞིབ་དཔྱད་འབད་ "
+
+#: ../plugins/backup-restore/backup.c:46
+msgid "Restart Evolution"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་བཙུགས�"
+
+#: ../plugins/backup-restore/backup.c:48
+msgid "With Graphical User Interface"
+msgstr "ཚད་རིས་ཀྱི་ ལག་ལེན་པའི་ངོས་འདྲ་བ་དང་གཅིག་�ར་ "
+
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
 msgid "Shutting down Evolution"
 msgstr "ཨི་བོ་ལུ་ཤཱན་�་བསྡམ་དོ་"
 
-#: ../plugins/backup-restore/backup.c:55
+#: ../plugins/backup-restore/backup.c:74
 msgid "Backing Evolution accounts and settings"
 msgstr "ཨི་བོ་ལུ་ཤཱན་རྩིས་�ོ་དང་སྒྲིག་སྟངས་ཚུ་ལུ་ རྒྱབ་�ག་"
 
-#: ../plugins/backup-restore/backup.c:60
+#: ../plugins/backup-restore/backup.c:78
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གནས་སྡུད་(ཡིག་འཕྲིན་ཚུ་, འབྲེལ་ས་, ཟླ་�ོ་ཚུ་, ལས་ཀ་ཚུ་, བརྗེད་�ོ་ཚུ་)རྒྱབ་�ག་འབད་དོ�"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:88
 msgid "Backup complete"
 msgstr "མཇུག་བསྡུ་ནི་འདི་རྒྱབ་�ག་"
 
-#: ../plugins/backup-restore/backup.c:75
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
 msgid "Restarting Evolution"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་བཙུགས་དོ་"
 
-#: ../plugins/backup-restore/backup.c:94
+#: ../plugins/backup-restore/backup.c:114
 msgid "Backup current Evolution data"
 msgstr "ད་ལྟོའི་ཨི་བོ་ལུ་ཤཱན་གནས་སྡུད་རྒྱབ་�ག་འབད་"
 
-#: ../plugins/backup-restore/backup.c:99
-msgid "Extracting files from the archive"
-msgstr "ཡིག་མཛོད་ལས་ཡིག་སྣོད་ཚུ་ཕྱིར་འདོན་འབད་"
+#: ../plugins/backup-restore/backup.c:119
+msgid "Extracting files from backup"
+msgstr "རྒྱབ་�ག་ནང་ལས་ ཡིག་སྣོད་ཚུ་ ཕྱིར་འདོན་འབད་དོ་ "
 
-#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:125
 msgid "Loading Evolution settings"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་སྒྲིག་སྟངས་ཚུ་མངོན་གསལ་འབད་དོ་"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:129
 msgid "Removing temporary backup files"
 msgstr "གནས་ས�བས་ཀྱི་རྒྱབ་�ག་ཡིག་སྣོད་ཚུ་རྩ་བས�ྲད་ག�ང་དོ་"
 
-#: ../plugins/backup-restore/backup.c:214
-msgid "Backup Evolution directory"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ སྣོད་�ོ་ལུ་ རྒྱབ་�ག་འབད�"
-
-#: ../plugins/backup-restore/backup.c:216
-msgid "Restore Evolution directory"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ སྣོད་�ོ་སོར་ཆུད་འབད�"
-
-#: ../plugins/backup-restore/backup.c:218
-msgid "Check Evolution archive"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་མཛོད་ཞིབ་དཔྱད་འབད�"
-
-#: ../plugins/backup-restore/backup.c:220
-msgid "Restart Evolution"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་བཙུགས�"
-
-#: ../plugins/backup-restore/backup.c:222
-msgid "With GUI"
-msgstr "ཇི་ཡུ་ཨའི་དང་ཅིག་�ར་"
-
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:249
 #, c-format
-msgid "Backing up to %s"
-msgstr "%sལུ་རྒྱབ་�ག་འབད་དོ་"
+msgid "Backing up to the folder %s"
+msgstr "%sལུ་ རྒྱབ་�ག་འབད་དོ་"
 
-#: ../plugins/backup-restore/backup.c:252
+#: ../plugins/backup-restore/backup.c:254
 #, c-format
-msgid "Restoring from %s"
-msgstr "%s ལས་སོར་ཆུད་འབད་དོ་"
+msgid "Restoring from the folder %s"
+msgstr "སྣོད་འཛིན་ %s ལས་སོར་ཆུད་འབད་དོ་"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:268
+#: ../plugins/backup-restore/backup.c:270
 msgid "Evolution Backup"
 msgstr "ཨི་བོ་ལུ་ཤཱན་རྒྱབ་�ག་"
 
-#: ../plugins/backup-restore/backup.c:268
+#: ../plugins/backup-restore/backup.c:270
 msgid "Evolution Restore"
 msgstr "ཨི་བོ་ལུ་ཤཱན་སོར་ཆུད་འབད་"
 
@@ -14943,20 +14991,20 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "�ྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་འདི་ ངེས་པར་དུ་ བ�ོན་ག�ང་ནི་ཨིན་ན?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected archive?"
-msgstr "�ྱོད་ཀྱིས་སེལ་འ�ུ་འབད་དེ་ཡོད་པའི་ཡིག་མཛོད་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
+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 "Invalid Evolution archive"
-msgstr "ནུས་ཅན་མེད་པའི་ཨི་བོ་ལུ་ཤཱན་ ཡིག་མཛོད་"
+msgid "Invalid Evolution backup file"
+msgstr "ནུས་མེད་ཨི་བོ་ལུ་ཤཱན་ རྒྱབ་�ག་ ཡིག་སྣོད་ "
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Please select a valid archive file to restore."
-msgstr "སོར་ཆུད་འབད་ནིའི་དོན་ལུ་ ནུས་ཅན་ཡོད་པའི་ཡིག་མཛོད་ སེལ་འ�ུ་འབད་གནང་�"
+msgid "Please select a valid backup file to restore."
+msgstr "སོར་ཆུད་འབད་ནིའི་དོན་ལུ་ རྒྱབ་�ག་ཡིག་སྣོད་ ནུས་ཅན་ཅིག་སེལ་འ�ུ་འབད་གནང་� "
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 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."
@@ -14974,36 +15022,36 @@ msgstr "སྒྲིག་སྟངས་ཚུ་སོར་ཆུད་འབ
 msgid "_Backup Settings..."
 msgstr "སྒྲིག་སྟངས་ཚུ་ལུ་ རྒྱབ་�ག་འབད... (_B)"
 
-#: ../plugins/bbdb/bbdb.c:447
-#: ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:541
+#: ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "རང་བཞིན་གྱི་འབྲེལ་ས་ཚུ�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
-msgid "_Automatically create entries in the addressbook when responding to mail"
-msgstr "ཡིག་འཕྲིན་ལུ་ ངོས་ལན་འབད�་ད་ �་བྱང་ཀི་དེབ་ནང་ རང་བཞིན་གྱིས་ �ོ་བཀོད་བཟོ�་ཨིན�(_A)"
+#: ../plugins/bbdb/bbdb.c:565
+msgid "_Automatically create entries in the addressbook when responding to messages"
+msgstr "ཡིག་འཕྲིན་ཚུ་ལུ་ ངོས་ལན་འབད�་ད་ �་བྱང་ཀི་དེབ་ནང་ རང་བཞིན་གྱིས་ �ོ་བཀོད་གསར་བས�ྲུན་འབད་ (_A)"
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
 msgstr "རང་བཞིན་གྱི་འབྲེལ་སའི་དོན་ལུ་ �་བྱང་ཀི་དེབ་ སེལ་འ�ུ་འབད�"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:586
 msgid "Instant Messaging Contacts"
 msgstr "འཕྲལ་མྱུར་འཕྲིན་ག�ོང་གི་འབྲེལ་ས�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
-msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "གེམ་བ་ཌི་�ོ་ཡིག་ནང་ལས་ འབྲེལ་སའི་བརྡ་དོན་དང་གཟུགས་བརྙན་ཚུ་ འཕྲལ་འཕྲལ་སྦེ་མཉམ་འབྱུང་འབད�་ཨིན�"
+#: ../plugins/bbdb/bbdb.c:601
+msgid "Periodically synchronize contact information and images from Pidgin buddy list"
+msgstr "པིཌ་གིན་ བ་ཌི་�ོ་ཡིག་ནང་ལས་ འབྲེལ་སའི་བརྡ་དོན་དང་ གཟུགས་བརྙན་ཚུ་ འཕྲལ་འཕྲལ་སྦེ་ མཉམ་འབྱུང་འབད་ "
 
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
-msgstr "གེམ་གྱི་ཆ་རོགས་�ོ་ཡིག་གི་དོན་ལུ་ �་བྱང་ཀི་དེབ་སེལ་འ�ུ་འབད�"
+#: ../plugins/bbdb/bbdb.c:607
+msgid "Select Address book for Pidgin buddy list"
+msgstr "པིཌ་གིན་ བ་ཌི་ �ོ་ཡིག་གི་དོན་ལུ་ �་བྱང་ཀི་དེབ སེལ་འ�ུ་འབད་ "
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:618
 msgid "Synchronize with _buddy list now"
 msgstr "ད་ལྟོ་རང་ བཱ་ཌིའི་�ོ་ཡིག་དང་ མཉམ་འབྱུང་འབད�(_b)"
 
@@ -15015,24 +15063,42 @@ msgstr "�ྱོད་ཀྱིས་ཡིག་འཕྲིན་ཚུ་ལ
 msgid "BBDB"
 msgstr "བི་བི་ཌི་བི�"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:292
-msgid "Convert mail text to _Unicode"
-msgstr "ཡིག་འཕྲིན་ཚིག་ཡིག་འདི་ ཡུ་ནི་ཀོཌི་ལུ་གཞི་བསྒྱུར་འབད་ (_U)"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+msgid "Convert message text to _Unicode"
+msgstr "ཡིག་འཕྲིན་ཚིག་ཡིག་འདི་ ཡུ་ནི་ཀོཌི་ལུ་གཞི་བསྒྱུར་འབད་ "
 
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:1
-msgid "Convert mail text to Unicode"
-msgstr "ཡིག་འཕྲིན་ཚིག་ཡིག་འདི་ཡུ་ནི་ཀོཌི་ལུ་གཞི་བསྒྱུར་འབད་"
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "ཡུ་ནི་ཀོཌི་ལུ་ ཡིག་འཕྲིན་ འཕྲིན་དོན་ཚུ་ གཞི་བསྒྱུར་འབད�་ཨིན་ "
 
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:2
+#: ../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 "བོ་གོ་ཚགས་མའི་ གདམ་�་ཚུ་ "
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "བོ་གི་ཚགས་མ་ མ�ོ་མེད་ པ་ལག་ཨིན་ "
+
+#: ../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
 msgid "CalDAV"
 msgstr "ཀཱལ་ཌེབ�"
 
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:135
+msgid "_URL:"
+msgstr "ཡུ་ཨར་ཨེལ: (_U)"
+
 #: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:351
 msgid "Use _SSL"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ལག་ལེན་འ�བ�(_S)"
 
@@ -15052,10 +15118,20 @@ msgstr "ཉེ་གནས་ཀྱི་ཟླ་�ོ་ཚུ�"
 msgid "Provides core functionality for local calendars."
 msgstr "རང་ཡུལ་གྱི་ཟླ་�ོ་ཚུ་གི་དོན་ལུ་ ནང་སྙིང་ལས་འགན་ཚུ་བྱིནམ་ཨིན�"
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:375
+msgid "_Refresh:"
+msgstr "ཡང་སེལ་འ�ུ་འབད: (_R)"
+
+#: ../plugins/calendar-http/calendar-http.c:341
 msgid "_Secure connection"
 msgstr "མ�ུད་ལམ་མ�འ་བཙན་བཟོ� (_S)"
 
+#: ../plugins/calendar-http/calendar-http.c:406
+msgid "Userna_me:"
+msgstr "ལག་ལེན་པའི་མིང: (_M)"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "ཨེཆ་ཊི་ཊི་པི་ཟླ་�ོ་ཚུ�"
@@ -15097,15 +15173,15 @@ msgstr "གནམ་གཤིས་:འབྲུག་ཆར�"
 msgid "Select a location"
 msgstr "གནས་�ོངས་ཅིག་ སེལ་འ�ུ་འབད�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "ཆ་ཕྲན་ཚུ་:(_U)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "མེ་ཊིཀ� (སེལ་ཤིའསི་ སི་ཨེམ་ ལ་སོགས་པ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ཨིམ་པི་རིཡཱལ� (ཕེ་རིན་ཧེཊི་ ཨིན་ཅེསི་ ལ་སོགས་པ)"
 
@@ -15125,11 +15201,11 @@ msgstr "པོཔ་ཨཔ་དཀར་ཆག་གི་ པ་ལག་ཨà½
 msgid "Copy tool"
 msgstr "ལག་ཆས་འདྲ་བཤུས་ར�ྱབས�"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ སྔོན་སྒྲིག་སྦྲག་སྣོད་དེ་ཨིན་ན་མེན་ ཞིབ་དཔྱད་འབད�"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../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 "ཨི་བོ་ལུ་ཤཱན་འགོ་བཙུགས་ས�བས་ ཨ་རྟག་རང་ སྔོན་སྒྲིག་སྦྲག་སྣོད་དེ་ཨིན་ན་མེན་ ཞིབ་དཔྱད་འབད�"
 
@@ -15145,8 +15221,13 @@ msgstr "སྔོན་སྒྲིག་ཡིག་འཕྲིན་་སྤ
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "�ྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་དེ་ �ྱོད་རའི་སྔོན་སྒྲིག་གློག་འཕྲིན་ཞབས་�ོག་སྤྱོད་མི་སྦེ་ བཟོ་ནི་ཨིན་ན�"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:690
+msgid "Evolution"
+msgstr "ཨི་བོ་ལུ་ཤཱན�"
+
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as _default folder"
 msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་སྦེ་རྟགས་བཀལ�(_d)"
 
@@ -15250,30 +15331,35 @@ msgstr "སྣོད་འཛིན་ཚུ་གི་ཚད�"
 msgid "Exchange Settings"
 msgstr "ཨེགསི་ཅེནཇི་ གཞི་སྒྲིག་ཚུ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:676
 msgid "_OWA URL:"
 msgstr "ཨོ་ཌབ་ལུ་ཨེ་ ཡུ་ཨར་ཨེལ་: (_O)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:702
 msgid "A_uthenticate"
 msgstr "བདེན་བཤད་འབད� (_u"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "བདེན་བཤད་ཀྱི་དབྱེ་བ�"
+#: ../plugins/exchange-operations/exchange-account-setup.c:723
+msgid "_Mailbox:"
+msgstr "ཡིག་སྒྲོམ: (_M)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:924
+msgid "_Authentication Type"
+msgstr "བདེན་བཤད་ཀྱི་དབྱེ་བ་ (_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:938
 msgid "Ch_eck for Supported Types"
 msgstr "རྒྱབ་ས�ྱོར་ཅན་གྱི་ དབྱེ་བ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད� (_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s ཀེ་བི་"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
+#: ../plugins/exchange-operations/exchange-account-setup.c:1052
 #: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "༠་ ཀེ་བི་"
 
@@ -15318,68 +15404,109 @@ msgstr "à½�ྱོད་ཀྱི་ཆོག་ཡིག་དེ་ དུསà¼
 msgid "Your password will expire in the next %d days"
 msgstr "�ྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ད་ལས་ཕར་ཉིན་གྲངས་%dནང་ དུས་ཡོལ་�ལ་འོང་�"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:143
+#: ../plugins/exchange-operations/exchange-delegates-user.c:164
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
 msgid "Custom"
 msgstr "སྲོལ་སྒྲིག"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "ཞུན་དགཔ� (ལྷག་ གསར་བས�ྲུན་འབད་ ཞུན་དག་ར�ྱབས)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "རྩོམ་པ་པོ� (ལྷག་ གསར་བས�ྲུན་འབད)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "བས�ྱར་ཞིབ་འབད་མི� (ལྷག་ནི་ཙམ)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:252
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "གནང་བ་ཚུ་བགོ་སྤེལ་འབད�"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:201
+#: ../plugins/exchange-operations/exchange-delegates-user.c:263
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 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:353
+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:358
+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:376
+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:383
+msgid "However you are not permitted to see my private items."
+msgstr "ཨིན་རུང་ �ྱོད་ཀྱིས་ ངེའི་ སྒེར་དོན་གྱི་རྣམ་གྲངས་ཚུ་ བལྟ་མི་ཆོག� "
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr "�ྱོད་  %s གི་དོན་ལུ་ བོག་སྤེལ་སྦེ་ བས�ོ་བཞག་འབད་ཡོདཔ་ "
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "བགོ་སྤེལ་འབད་ཡུལ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "བགོ་སྤེལ་%sརྩ་བས�ྲད་ག�ང་ནི་ཨིན་ན?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 msgid "Could not access Active Directory"
 msgstr "ཤུགས་ལྡན་སྣོད་�ོ་ལུ་ འཛུལ་སྤྱོད་འབད་མ་ཚུགས�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr "ཤུགས་ལྡན་སྣོད་�ོ་ནང་ རང་ཉིད་འཚོལ་མ་�ོབ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "ཤུགས་ལྡན་སྣོད་�ོ་ནང་ འ�ུས་མི་%sའཚོལ་མ་�ོབ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "འ�ུས་མི་%s རྩ་བས�ྲད་བ�ང་མ་ཚུགས�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 msgid "Could not update list of delegates."
 msgstr "འ�ུས་མིའི་�ོ་ཡིག་དུས་མ�ུན་བཟོ་མ་ཚུགས�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "འ�ུས་མི་%s �་ས�ོང་ར�ྱབས་མ་ཚུགས�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 msgid "Error reading delegates list."
 msgstr "འ�ུས་མིའི་�ོ་ཡིག་ལྷག་ནི་ལུ་འཛོལ་བ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "རྩོམ་པ་པོ� (ལྷག་ གསར་བས�ྲུན་འབད)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
@@ -15394,18 +15521,10 @@ msgstr "འབྲེལ་ས་ཚུ་:(_n)"
 msgid "Delegates"
 msgstr "འ�ུས་མི་ཚུ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "ཞུན་དགཔ� (ལྷག་ གསར་བས�ྲུན་འབད་ ཞུན་དག་ར�ྱབས)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "དོན་ལུ་གནང་བ་ཚུ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "བས�ྱར་ཞིབ་འབད་མི� (ལྷག་ནི་ཙམ)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15423,8 +15542,12 @@ msgstr "འà½�ུས་མི་གིས་ སྒེར་གྱི་རྣà½
 msgid "_Inbox:"
 msgstr "ནང་སྒྲོམ་:(_I)"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "གནང་བ་ཚུ་ བཅུད་བསྡུ་ (_S)"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "ལས་ཀ་ཚུ་:(_T)"
 
@@ -15433,15 +15556,15 @@ msgstr "ལས་ཀ་ཚུ་:(_T)"
 msgid "Permissions..."
 msgstr "གནང་བ་ཚུ་..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
 msgid "Folder Name"
 msgstr "སྣོད་འཛིན་གྱི་མིང་�"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
 msgid "Folder Size"
 msgstr "སྣོད་འཛིན་གྱི་ཚད�"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ལག་ལེན་པ་གཞན་གྱི་སྣོད་འཛིན་ལུ་ མ�ོ་མངགས་འབད�"
@@ -15451,27 +15574,69 @@ msgid "Exchange Folder Tree"
 msgstr "ཨེགསི་ཅེནཇི་ སྣོད་འཛིན་གྱི་རྩ་འབྲེལ�"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "སྣོད་འཛིན་ཚུ་ལུ་ མ�ོ་མངགས་བཤོལ་..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "སྣོད་འཛིན་\"%s\"ནང་ལས་ �ད་རི་འབའ་རི་ མངགས་བཤོལ་འབད་ནི་ཨིན་ན?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%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 ""
+"<b>ད་ལྟོ་�ྱོད་ཀྱི་ གནས་ཚད་དེ་ \"Out of the Office\" ཨིན་མས�</b>\n"
+"\n"
+"�ྱོད་ཀྱི་ གནས་ཚད་དེ་ \"In the Office\" ལུ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>ཡིག་ཚང་གི་འཕྲིན་དོན་ཕྱི་�ར་:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>གནས་ཚད་:</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 ""
+"<small་>འོག་ལུ་གསལ་བཀོད་འབད་མི་ འཕྲིན་དོན་དེ་ �ྱོད་རང་ཡིག་ཚང་གི་ཕྱི་�ར་ཨིན་པའི་ས�བས་ \n"
+"�ྱོད་ལུ་ཡིག་འཕྲིན་ས�ྱེལ་མི་ ཆ་མཉམ་ལུ་ རང་བཞིན་གྱིས་བས�ྱལ་འོང་</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "ད་ལྟོ་ང་ ཡིག་ཚང་ནང་ཨིན�"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "ད་ལྟོ་ང་ ཡིག་ཚང་གི་ཕྱི་�ར་ཨིན�"
+
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "མེན� གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད�"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "ཡིག་ཚང་ལས་རོགས་ཀྱི་ཕྱི་�ར�"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "བ�ུབ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད�"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "ཆོག་ཡིག་དུས་ཡོལ་གྱི་ཉེན་བརྡ་..."
@@ -15599,9 +15764,21 @@ msgid "Request a _read receipt for this message"
 msgstr "འཕྲིན་དོན་འདི་གི་དོན་ལས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ཞུ་ (_r)"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "བགོ་སྤེལ་སྦེ་ ག�ང་ "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "དྲན་ཚོར: (_S)"
 
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "ལག་ལེན་པ་ (_U)"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr "ཨེབ་རྟ- ལག་ལེན་པ་(_B)"
+
 #: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "ལག་ལེན་པ་སེལ་འ�ུ་འབད�"
@@ -15750,7 +15927,7 @@ msgid "Folder offline"
 msgstr "སྣོད་འཛིན་ཨོཕ་ལ་ཡིན�"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1272
+#: ../shell/e-shell.c:1288
 msgid "Generic error"
 msgstr "ཇེ་ནི་རིཀ་གི་འཛོལ་བ�"
 
@@ -15795,34 +15972,38 @@ msgid "Password successfully changed."
 msgstr "ཆོག་ཡིག་མ�ར་འ�ྱོལ་སྦེ་སོར་ནུག�"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+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
 msgid "Please make sure the Global Catalog Server name is correct."
 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 restart Evolution for changes to take effect"
 msgstr "བསྒྱུར་བཅོས་ཚུ་ལུ་ ནུས་པ་འ�ོབ་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ལོག་འགོ་བཙུགས་གནང་�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please select a user."
 msgstr "ལག་ལེན་པ་ཅིག་ སེལ་འ�ུ་འབད་གནང་�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr "ཆོག་ཡིག་དེ་ལུ་ནུས་པ་ཆུང་དྲགསཔ་ལས་ སར་བར་གྱིས་�ས་ལེན་འབད་མ་བ�ུབ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 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 removed 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 server is not compatible with Exchange Connector."
 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 server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15830,7 +16011,7 @@ msgstr ""
 "སར་བར་གྱིས་ ཨེགསི་ཅེནཇི་ ༥.༥ གཡོག་བཀོལ་དོ� ཨེགསི་ཅེནཇི་མ�ུད་བྱེད་ཀྱིས་ \n"
 " མའི་ཀོརོ་སོཕཊི་ཨེགསི་ཅེནཇི་ ༢༠༠༠ དང་ ༢༠༠༣ ར�ྱངམ་གཅིག་ལུ་ རྒྱབ་ས�ྱོར་ཡོད�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15844,75 +16025,79 @@ msgstr ""
 "\n"
 "ཡང་ན་ �ྱོད་ཀྱིས་�ྱོད་རའི་ཆོག་ཡིག་ ཕྱི་འགྱུར་སྦེ་ ཡིག་དཔར་བར�ྱབས་གདའཔ་འོང་�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr "ལོག་སྟེ་རང་ ཆོག་ཡིག་སོ་སོ་ཅིག་གི་�ོག་ལས་ འབད་རྩོལ་བས�ྱེད�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to add user to access control list:"
 msgstr "ཚད་འཛིན་�ོ་ཡིག་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ ལག་ལེན་པ་�་ས�ོང་བར�ྱབ་མི་ཚུགས་པས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to edit delegates."
 msgstr "འ�ུས་མི་ཚུ་ ཞུན་དག་བར�ྱབ་མི་ཚུགས་པས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unknown error looking up {0}"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ་ {0} ལུ་བལྟ་དོ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error."
 msgstr "མ་ཤེས་པའི་འཛོལ་བ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown type"
 msgstr "མ་ཤེས་པའི་དབྱེ་བ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unsupported operation"
 msgstr "རྒྱབ་ས�ྱོར་མེད་པའི་བཀོལ་སྤྱོད�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ �ྱོད་རའི་�ོབ་ས�ལ་ཡོད་མི་དེ་རྫོགས་རན་དོ�"
 
-#: ../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 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
 msgid "You cannot make yourself your own delegate"
 msgstr "�ྱོད་ཀྱིས་�ྱོད་རང་ �ྱོད་རའི་འ�ུས་མི་སྦེ་ བཟོ་མི་ཚུགས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "�ྱོད་ཀྱིས་སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ �ྱོད་རའི་�ོབ་ས�ལ་ལས་ ལྷག་སོང་ནུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr "�ྱོད་ཀྱིས་ཨེགསི་ཅེནཇི་རྩིས་�ོ་ ཕུད་རྡོག་གཅིག་ར�ྱངམ་རིམ་སྒྲིག་འབད�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
 msgstr "�ྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{0}ཨིན་པས� ཡིག་འཕྲིན་ལ་ལོ་ཅིག་ བ�ོན་ག�ང་ཞིནམ་ལས་ བར་སྟོང་དུམ་གྲ་ཅིག་བ�ོན་�བས་འབད�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
 msgstr "�ྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{0}ཨིན་པས� ད་�ྱོད་ཀྱིས་ ཡིག་འཕྲིན་ག�ང་ནི་དང་ ལེན་ནི་ཚུ་ འབད་མི་ཚུགས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
 msgstr "�ྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{0}ཨིན་པས� �ྱོད་ཀྱིས་ཡིག་འཕྲིན་ལ་ལོ་ཅིག་ བ�ོན་ག�ང་སྟེ་ བར་སྟོང་དུམ་གྲ་ཅིག་མ་བཟོ་ཚུན་ཚོད་ ཡིག་འཕྲིན་ག�ང་མི་ཚུགས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr "�ྱོད་ཀྱི་ཆོག་ཡིག་དེ་ དུས་ཡོལ་�ལ་སོང་ནུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr "{0}འཛུལ་སྤྱོད་ཚད་འཛིན་�ོ་ཡིག་ལུ་ �་ས�ོང་བར�ྱབ་མི་ཚུགས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} is already a delegate"
 msgstr "{0}ཧེ་མ་ལས་རང་འ�ུས་མི་ཅིག་ཨིན་ཕས�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already in the list"
 msgstr "{0}ཧེ་མ་ལས་རང་ �ོ་ཡིག་ནང་འདུག"
 
@@ -15924,7 +16109,44 @@ msgstr "ལག་ལེན་པ་གཞན་གྱི་ལས་ཀ་ལུ
 msgid "Check folder permissions"
 msgstr "སྣོད་འཛིན་གྱི་གནང་བ་ཚུ་ ཞིབ་དཔྱད་འབད�"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../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 "ཕྱི་�འི་ ཞུན་དགཔ་ "
+
+#: ../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 "ཕྱིའི་ཞུན་དག་པ་ལག་ལེན་འ�བ་�ོག་ལས་ འཕྲིན་དོན་གསར་བས�ྲུན་འབད་ "
+
+#: ../plugins/face/face.c:57
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "(༤༨*༤༨) པུ་ཨེན་ཇི་ གི་ ཚད་ < ༧༠༠བཱའིཊིསི་ "
+
+#: ../plugins/face/face.c:67
+msgid "PNG files"
+msgstr "པི་ཨེན་ཇི་ ཡིག་སྣོད་ཚུ་ "
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+msgid "_Face"
+msgstr "བཀོད་རྣམ་ (_F)"
+
+#: ../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 "ཕྱི་�་ག�ང་མི་འཕྲིན་དོན་ཚུ་ལུ་ བཀོད་རྣམ་ མགོ་ཡིག་ མཉམ་བསྒྲགས་འབད� འགོ་དང་པ་ ལག་ལེན་པ་དེ་གིས་ ༤༨*༤༨ གཟུགས་བརྙན་ རིམ་སྒྲིག་འབད་དགོ�  དེ་ གཞི་རྟེན་ ༦༤ ཨིན་ཀོཌེཌི་ཨིནམ་དང་  ~/.evolution བཀོད་རྣམ་ནང་ གསོག་འཇོག་འབད་དེ་ ཡོདཔ་ཨིན� འདི་ ད་རུང་ ག�ང་ཡོད་པའི་ འཕྲིན་དོན་ཚུ་ནང་ ལག་ལེན་འ�བ་ནི་ཨིན� "
+
+#: ../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\""
 msgstr "སྣོད་འཛིན་\"%s\"ནང་ལས་ མངགས་བཤོལ་འབད་དོ�"
@@ -15941,7 +16163,20 @@ msgstr "སྣོད་འཛིན་ཚུ་ལུ་ མà½�ོ་མངགà½
 msgid "_Unsubscribe"
 msgstr "མ�ོ་མངགས་བཤོལ� (_U)"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+msgid "Google"
+msgstr "གུ་གཱལ་ "
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "A plugin to setup google calendar."
+msgstr "གུ་གཱལ་ ཟླ་�ོག་ གཞི་སྒྲིག་འབད་ནིའི་ པ་ལག་ཨིན� "
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "གུ་གཱལ་ �ོན་�ུངས་ཚུ�"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "ངེས་�ོ�"
 
@@ -15953,7 +16188,7 @@ msgstr "སྡེ་རིམ་ཟླ་à½�ོ་དང་ འབྲེལ་à½
 msgid "Groupwise Account Setup"
 msgstr "སྡེ་རིམ་རྩིས་�ོའི་གཞི་སྒྲིག"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -15978,23 +16213,24 @@ msgstr ""
 "རུབ་སྤྱོད་འབད་དེ་ཡོད་པའི་སྣོད་�ོ་འདི་ གཞི་བཙུགས་འབད་ནི་ལུ་'Forward' ལུ་ཨེབ་ག�ང་འབད\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་སྣོད་འཛིན་འདི་གཞི་བཙུགས་འབད་"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "རུབ་སྤྱོད་འབད་མི་ སྣོད་འཛིན་གཞི་བཙུགས་"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
 msgstr "མ�ོ་མེད་གཞི་སྒྲིག་ཚུ�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>མ�ོ་མེད་ཡིག་འཕྲིན་གྱི་གཞི་སྒྲིག་ཚུ་</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "མོ�་མེད་ཡིག་འཕྲིན་གྱི་གཞི་སྒྲིག་ཚུ�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
 msgstr "མ�ོ་མེད་ཡིག་འཕྲིན་གྱི་གཞི་སྒྲིག་ཚུ་..."
 
@@ -16006,10 +16242,6 @@ msgstr "<b>མ�ོ་མེད་�ོ་ཡིག་:</b>"
 msgid "Email:"
 msgstr "གློག་འཕྲིན་:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "མོ�་མེད་ཡིག་འཕྲིན་གྱི་གཞི་སྒྲིག་ཚུ�"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -16058,27 +16290,27 @@ msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད�"
 msgid "<b>Users:</b>"
 msgstr "<b>ལག་ལེན་པ་ཚུ་ :</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "བརྡ་བས�ུལ་་འཕྲིན་དོན་ སྲོལ་སྒྲིག་འབད་  (_C)"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Con_tacts..."
+msgstr "འབྲེལ་ས་ཚུ�...(_t)"
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "འཕྲིན་དོན�"
 
-#: ../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 "བཅའ་མར་ག�ོགས་མི་ཚུ་གིས་ འོག་གི་བརྡ་དོན་འ�ོབ་འོང་�\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "འབྲེས་ས་ཚུ་...(_C)"
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "བརྡ་དོན་འཕྲིན་དོན་ སྲོལ་སྒྲིག་འབད� (_C)"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "རུབ་སྤྱོད་མ་འབད�� (_N)"
@@ -16128,14 +16360,14 @@ msgid "Subscribe to my _notifications"
 msgstr "ངེད་ཀྱི་བརྡ་བས�ུལ་ཚུ་ལུ་ མ�ོ་མངགས་འབད�(_n)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "ལྷག(_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "བྲིས�(_W)"
 
+#. 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 "ལྷག་|_ལྷག་ནིའི་གནང་བ་ "
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "པོ་རོག་སི�"
@@ -16159,93 +16391,93 @@ 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:516
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "པོ་རོ་སི་ ནང་བས�ྱོད་...(_P)"
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "པོརོ་སི་ཨེབ་ལྡེ་དེ་ རྩིས་�ོ་དེ་ ལྕོགས་ཅན་ཨིན་པ་ཅིན་ར�ྱངམ་གཅིག་འ�ོབ་ཚུགས�"
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:708
 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/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Users"
 msgstr "ལག་ལེན་པ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr "ལག་ལེན་པ་ཚུ་ བཙུགས་ཞིནམ་ལས་ གནང་བ་ཚུ་ གཞི་སྒྲིག་འབད�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr "རུབ་སྤྱོད་སྣོད་འཛིན་...(_S)"
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "རུབ་སྤྱོད་འབད་དོ�"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:766
 msgid "Add   "
 msgstr "�་ས�ོང་ར�ྱབས་"
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:772
 msgid "Modify"
 msgstr "ལེགས་བཅོས་འབད་"
 
-#: ../plugins/groupwise-features/status-track.c:103
+#: ../plugins/groupwise-features/status-track.c:105
 msgid "Message Status"
 msgstr "འཕྲིན་དོན་གནས་ཚད་"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:117
-msgid "<b>Subject</b> :"
-msgstr "<b>དོན་ཚན་</b> :"
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "དོན་ཚན:"
 
-#: ../plugins/groupwise-features/status-track.c:129
-msgid "<b>From</b> :"
-msgstr "<b>ལས་</b>:"
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "ལས་:"
 
-#: ../plugins/groupwise-features/status-track.c:142
-msgid "<b>Creation date</b> :"
-msgstr "<b>གསར་བས�ྲུན་འབད་བའི་ཚེས་གྲངས་</b>:"
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr "གསར་བས�ྲུན་འབད་བའི་ཚེས་གྲངས:"
 
-#: ../plugins/groupwise-features/status-track.c:178
+#: ../plugins/groupwise-features/status-track.c:187
 msgid "Recipient: "
 msgstr "ལེན་མ�ན:"
 
-#: ../plugins/groupwise-features/status-track.c:185
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Delivered: "
 msgstr "འགྲེམ་སྤེལ་འབད་ཡོདཔ:"
 
-#: ../plugins/groupwise-features/status-track.c:191
+#: ../plugins/groupwise-features/status-track.c:200
 msgid "Opened: "
 msgstr "�་ཕྱེ་ཡོདཔ:"
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:205
 msgid "Accepted: "
 msgstr "དང་ལེན་འབད་ཡོདཔ:"
 
-#: ../plugins/groupwise-features/status-track.c:201
+#: ../plugins/groupwise-features/status-track.c:210
 msgid "Deleted: "
 msgstr "བ�ོན་བ�ང་ཡོདཔ:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Declined: "
 msgstr "ཉམས་ཡོདཔ༌:"
 
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:220
 msgid "Completed: "
 msgstr "མཇུག་བསྡུ་ཡོདཔ:"
 
-#: ../plugins/groupwise-features/status-track.c:216
-msgid "Un-delivered: "
-msgstr "འགྲེམ་སྤེལ་མ་འབད་:"
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr "འགྲེམ་སྤེལ་མ་འབད�:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "འཕྲིན་དོན་གནས་ཚད་རྗེས་འཚོལ་འབད་..."
 
@@ -16257,15 +16489,11 @@ msgstr "ཧུ་ལ་ཟླ་�ོའི་འབྱུང་�ུངས་
 msgid "Hula Account Setup"
 msgstr "ཧུ་ལ་རྩིས་�ོའི་གཞི་སྒྲིག"
 
-#: ../plugins/imap-features/imap-headers.c:133
-msgid "Custom Header"
-msgstr "སྲོལ་སྒྲིག་མགོ་ཡིག་"
-
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:322
 msgid "Custom Headers"
 msgstr "སྲོལ་སྒྲིག་མགོ་ཡིག་ཚུ་"
 
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:335
 msgid "IMAP Headers"
 msgstr "ཨའི་ཨེམ་ཨེ་པི་མགོ་ཡིག་ཚུ�"
 
@@ -16274,8 +16502,8 @@ msgid "<b>Custom Headers</b>"
 msgstr "<b>སྲོལ་སྒྲིག་མགོ་ཡིག་ཚུ་</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
-msgstr "<b>ཨའི་ཨེམ་ཨེ་པི་མགོ་ཡིག་ཚུ་</b>"
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>ཨའི་ཨེམ་ཨེ་པི་མགོ་ཡིག་ཚུ</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
@@ -16317,28 +16545,28 @@ msgstr "ཨའི་ཨེམ་ཨེ་པི་་རྩིས་�ོའི
 msgid "IMAP Features"
 msgstr "ཨའི་ཨེམ་ཨེ་པི་�ྱད་རྣམ་ཚུ་"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Calendar"
 msgstr "ཟླ་བའི་ཟླ་�ོ་ནང་འདྲེན་འབད�(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:87
 msgid "_Import to Tasks"
 msgstr "ལས་ཀ་ལུ་ནང་འདྲེད་འབད�(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:205
 msgid "Import ICS"
 msgstr "ཨའི་ཨེསི་སི་ ནང་འདྲེནའབད�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Task List"
 msgstr "ལས་ཀའི་�ོ་ཡིག་སེལ་འ�ུ་འབད�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:232
 msgid "Select Calendar"
 msgstr "ཟླ་�ོ་སེལ་འ�ུ་འབད�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:263
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "ནང་འདྲེན� (_I)"
 
@@ -16351,24 +16579,30 @@ msgstr "ཟླ་�ོ་ལུ་ནང་འདྲེན་འབད་"
 msgid "Imports ICS attachments to calendar."
 msgstr "ཨའི་སི་ཨེསི་མཉམ་སྦྲགས་ཚུ་ ཟླ་�ོ་ལུ་ནང་འདྲེན་འབད�"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
-"\n"
-"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 ""
-"<span weight=\"bold\" size=\"larger\">ཨའི་པོཌི་འ�ུས་ཤོར་བྱུང་མི་གི་དོན་ལུ་འཚོལ་ཞིབ་འབད་</span>\n"
-"\n"
-"ཨི་བོ་ལུ་ཤཱན་དེ་གིས་མཉམ་བྱུང་འབད་ནིའི་དོན་ལུ་ཨའི་པོཌི་ཅིག་�ོབ་མ་ཚུགས�  ཡང་ན་ཨའི་པོཌི་འདི་རིམ་ལུགས་ལུ་མ་མ�ུདཔ་ཨིན་ན་ཡང་ན་  ནུས་ཤུགས་མེདཔ་ཨིན་ན�"
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "སྲ་ཆས་ སྙིང་བཅུད་བ�ོན་ནིའི་ བང་རིམ་ མངོན་གསལ་ མ་འབད་བས་ "
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr " \"hald\" ཞབས་�ོག་དེ་ དགོས་མ�ོ་ཡོད་རུང་ ད་ལྟོ་གཡོག་བཀོལ་དེ་ མེད�  ཞབས་�ོག་དེ་ ལྕོགས་ཅན་བཟོ་དེ་ ལས་རིམ་འདི་ལོག་གཡོག་བཀོལ་  ཡང་ན་ �ྱོད་རའི་ རིམ་ལུགས་བདག་ས�ྱོང་དང་གཅིག་�ར་འབྲེལ་བ་འ�བ� "
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr "ཨའི་པོཌ་ འ�ུས་ཤོར་འབྱུང་ཡོད་པའི་དོན་ལུ་ འཚོལ་ཞིབ་འབད་ "
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+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
 msgid "iCalendar format (.ics)"
 msgstr "ཨའི་ཟླ་�ོའི་རྩ་སྒྲིག(.ཨའི་ཨི་ཨེསི)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "སེལ་འ�ུ་འབད་མི་ ལས་ཀ་/ཟླ་�ོ་/�་བྱང་ཀི་དེབ་ཚུ་ ཨེ་པཱལ་ཨའི་པོཌི་དང་གཅིག་�ར་མཉམ་འབྱུང་འབད�"
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgstr "སེལ་འ�ུ་འབད་མི་ ལས་ཀ་/བརྗེད་�ོ་/ཟླ་�ོ་/�་བྱང་ཀི་དེབ་ཚུ་ ཨེ་པཱལ་ཨའི་པོཌི་དང་གཅིག་�ར་མཉམ་འབྱུང་འབད�"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16378,571 +16612,628 @@ msgstr "ཨའི་པོཌི་ལུ་ མཉམ་འབྱུང་འà½
 msgid "iPod Synchronization"
 msgstr "ཨའི་པོཌི་མཉམ་འབྱུང་�"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "ཨའུཊི་པུཊི་སྣོད་�ོ་མིན་འདུག!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid "The output directory was not found on iPod! Please ensure that iPod has been correctly set up and try again."
-msgstr "ཨའི་པོཌི་གུ་ ཨའུཊི་པུཊི་གི་སྣོད་�ོ་དེ་འཚོལ་མ་�ོབ� ཨའི་པོཌི་ཚུལ་མ�ུན་སྦེ་ གཞི་སྒྲིག་འབད་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བས�ྱེད་གནང་�"
-
-#: ../plugins/ipod-sync/sync.c:174
-#: ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་མ་ཚུགས!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་ནི་ལུ་འ�ུས་ཤོར�"
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "�་བྱང་ཀི་དེབ་�་ཕྱེ་མ་ཚུགས�"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "ཨི་བོ་ལུ་ཤཱན་�་བྱང་ཀི་དེབ་དེ་ གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ �་ཕྱེ་མ་ཚུགས�"
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "ཟླ་�ོ་/ཊུ་ཌུ་�་ཕྱེ་མི་ཚུགས�"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ ཨི་བོ་ལུ་ཤཱན་ ཟླ་�ོ་/ཊུ་ཌུ་�ོ་ཡིག་ �་ཕྱེ་མ་ཚུགས�"
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ཟླ་�ོ་'%s'དེ་ མངོན་གསལ་འབད་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:589
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ཟླ་�ོ་'%s' ནང་གི་ངོ་ཕྲད་ཅིག་ འཛོམས་འདུ་འདི་དང་མི་མ�ུན་པས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:615
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "ངོ་ཕྲད་དེ་ ཟླ་�ོ་'%s'ནང་�ོབ་ཅི�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:691
 msgid "Unable to find any calendars"
 msgstr "ཟླ་གཅིག་ཡང་འ�ོབ་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:698
 msgid "Unable to find this meeting in any calendar"
 msgstr "འཛོམས་འདུ་འདི་ ཟླ་�ོ་ག་ཅི་ནང་ཡང་ འཚོལ་མ་�ོབ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:702
 msgid "Unable to find this task in any task list"
 msgstr "ལས་ཀ་འདི་ ལས་ཀའི་�ོ་ཡིག་ ག་ཅི་ནང་ཡང་ འཚོལ་མ་�ོབ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "གསར་དེབ་གི་�ོ་བཀོད་དེ་ གསར་དེབ་ག་ཅི་ནང་ཡང་ འཚོལ་མ་�ོབ�"
+#: ../plugins/itip-formatter/itip-formatter.c:706
+msgid "Unable to find this memo in any memo list"
+msgstr "བརྗེད་�ོ་ �ོ་ཡིག་ཅིག་ནང་ལུ་ཡང་ བརྗེད་�ོ་འདི་ �ོབ་མ་ཚུགས་ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Searching for an existing version of this appointment"
 msgstr "ངོ་འཕྲད་འདི་གི་ གནས་བཞིན་པའི་�ོན་རིམ་ཅིག་གི་དོན་ལུ་ འཚོལ་ཞིབ་འབད་དོ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:801
+#: ../plugins/itip-formatter/itip-formatter.c:943
 msgid "Unable to parse item"
 msgstr "རྣམ་གྲངས་ མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ཟླ་�ོ་'%s'.  %sལུ་ རྣམ་གྲངས་བ�ང་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:871
+#: ../plugins/itip-formatter/itip-formatter.c:1013
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ཟླ་�ོ་'%s' ལུ་ དང་ལེན་འབད་ཡོདཔ་སྦེ་བ�ང་ཡོད�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ཟླ་�ོ་'%s' ལུ་ ངེས་མེད་སྦེ་ བ�ང་ཡོད�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1022
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ཟླ་�ོ་'%s' ལུ་ ངོས་ལེན་མེདཔ་སྦེ་བ�ང་ཡོད�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1027
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ཟླ་�ོ་'%s' ལུ་ ཆ་མེད་བ�ང་ཚར�་སྦེ་བ�ང་ཡོད�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1121
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "འགོ་འདྲེན་པ་གིས་ འ�ུས་མི་%sརྩ་བས�ྲད་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 msgid "Sent a cancelation notice to the delegate"
 msgstr "འ�ུས་མི་དེ་ལུ་ ཆ་མེད་བརྡ་བས�ུལ་ཅིག་བ�ང་ཡོད�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "འ�ུས་མི་དེ་ལུ་ ཆ་མེད་བརྡ་བས�ུལ་ག�ང་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1216
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "གནས་ཚད་དེ་ ནུས་མེད་ཨིནམ་ལས་ ངོ་འཛོམས་པ་ དུས་མ�ུན་བཟོ་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1243
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ངོ་འཛོམས་པ་%s དུས་མ�ུན་བཟོ་མ་ཚུགས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1247
 msgid "Attendee status updated"
 msgstr "ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མ�ུན་བཟོ་ཡོད�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1273
+msgid "Meeting information sent"
+msgstr "འཛོམས་འདུའི་བརྡ་དོན་ བ�ང་ཡོདཔ་ "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1276
+msgid "Task information sent"
+msgstr "ལས་ཀའི་བརྡ་དོན་བ�ང་ཡོདཔ་ "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+msgid "Memo information sent"
+msgstr "བརྗེད་�ོའི་བརྡ་དོན་བ�ང་ཡོདཔ་ "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1288
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "འཛོམས་བསྡུའི་ བརྡ་དོན་ག�ང་མ་ཚུགས་  འཛོམས་བསྡུ་དེ་ མིན་ནུག་ "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1291
+msgid "Unable to send task information, the task does not exist"
+msgstr "ལས་ཀའི་བརྡ་དོན་ ག�ང་མ་ཚུགས་   ལས་ཀ་མིན་ནུག་ "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1294
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "བརྗེད་�ོ་ བརྡ་དོན་ག�ང་མ་ཚུགས་  བརྗེད་�ོ་དེ་ མིན་ནུག་ "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1374
 msgid "The calendar attached is not valid"
 msgstr "མཉམ་སྦྲགས་འབད་མི་ ཟླ་�ོ་དེ་ ནུས་ཅན་མེན་པས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "འཕྲིན་དོན་ནང་ལུ་ ཟླ་�ོ་ཅིག་ཡོདཔ་སྦེ་ བཤདཔ་ཨིན་རུང་ ཟླ་�ོ་དེ་ ནུས་ཅན་གྱི་ཨའི་ཟླ་�ོ་ཅིག་མེན་པས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1415
+#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1515
 msgid "The item in the calendar is not valid"
 msgstr "ཟླ་�ོ་ནང་གི་ རྣམ་གྲངས་དེ་ ནུས་ཅན་མེན་པས�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1516
 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:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "The calendar attached contains multiple items"
 msgstr "མཉམ་སྦྲགས་ཀྱི་ ཟླ་�ོ་དེ་ནང་ སྣ་མང་རྣམ་གྲངས་འདུག"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "རྣམ་གྲངས་འདི་ཚུ་ ལས་སྦྱོར་འབད་ནིའི་དོན་ལུ་ ཡིག་སྣོད་དེ་ སྲུང་བཞག་འབད་དེ་ ཟླ་�ོ་དེ་ ནང་འདྲེན་འབད་དགོ"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2144
+msgid "This meeting recurs"
+msgstr "ངོ་འཕྲད་འདི་ སླར་འབྱུངམ་ཨིན་"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2147
+msgid "This task recurs"
+msgstr "ལས་ཀ་་འདི་ སླར་འབྱུངམ་ཨིན་"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2150
+msgid "This memo recurs"
+msgstr "བརྗེད་�ོ་འདི་ སླར་འབྱུངམ་ཨིན"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2379
 msgid "_Delete message after acting"
 msgstr "བྱ་བ་བྱས་ཤུལ་ འཕྲིན་དོན་བ�ོན་ག�ང་�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2389
+#: ../plugins/itip-formatter/itip-formatter.c:2421
 msgid "Conflict Search"
 msgstr "མི་མ�ུན་པའི་འཚོལ་ཞིབ�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2404
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "འཛོམས་འདུ་མི་མ�ུན་པའི་དོན་ལས་ འཚོལ་ཞིབ་འབད་ནི་ལུ་ ཟླ་�ོ་ཚུ་ སེལ་འ�ུ་འབད�"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:187
+#: ../plugins/itip-formatter/itip-view.c:192
 #: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../widgets/misc/e-cell-date-edit.c:241
 msgid "Today"
 msgstr "ད་རིས�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M"
 msgstr "ད་རིས་%H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %H:%M:%S"
 msgstr "ད་རིས་ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Today %l:%M:%S %p"
 msgstr "ད་རིས་ %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:215
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow"
 msgstr "ནངས་པར�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M"
 msgstr "ནངས་པར་ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %H:%M:%S"
 msgstr "ནངས་པར་ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M %p"
 msgstr "ནངས་པར་ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:238
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ནངས་པར་ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:252
+#: ../plugins/itip-formatter/itip-view.c:257
 #, 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:257
+#: ../plugins/itip-formatter/itip-view.c:262
 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:261
+#: ../plugins/itip-formatter/itip-view.c:266
 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:266
+#: ../plugins/itip-formatter/itip-view.c:271
 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:270
+#: ../plugins/itip-formatter/itip-view.c:275
 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:279
+#: ../plugins/itip-formatter/itip-view.c:284
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:285
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:304
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr " %A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr "<b>%s</b>གི་ཚབ་སྦེ་ ལན་བཀོད་འབད་"
+
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr "<b>%s</b>གི་ཚབ་ལུ་སྦེ་ འ�ོབ་ཡོདཔ་ "
+
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འཛོམས་འདུ་བརྡ་དོན་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུ་བརྡ་དོན་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུ་དེ་ �ྱོད་ལུ་བགོ་སྤེལ་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ �ྱོད་ འོག་གི་འཛོམས་འདུ་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབད�་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> གིས་ �ྱོད་ འོག་གི་འཛོམས་འདུ་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབད�་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ ད་ལྟོའི་འཛོམས་འདུ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> གིས་ ད་ལྟོའི་འཛོམས་འདུ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> གིས་ %s བརྒྱུད་དེ་ འོག་གི་འཛོམས་འདུའི་དོན་ལས་ ་ བརྡ་དོན་གསརཔ་ ལེན་ནིའི་ རེ་འདོད་བས�ྱེདཔ་མས�"
+
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུའི་དོན་ལས་ མ�འ་མཇུག་གི་ བརྡ་དོན་ལེན་ནིའི་ རེ་འདོད་བས�ྱེདཔ་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> གིས་%s བརྒྱུད་དེ་  འོག་གི་འཛོམས་འདུའི་ ངོས་ལན་ཚུ་ ལོག་བ�ང་ནུག:"
+
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུའི་ ངོས་ལན་ལོག་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་�ོག་ འོག་གི་འཛོམས་འདུ་ ཆ་མེད་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུ་ ཆ་མེད་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:401
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> གིས་%s བརྒྱུད་དེ་  འོག་གི་འཛོམས་འདུའི་ བསྒྱུར་བཅོས་ཚུ་གི་ གྲོས་འཆར་བཀོད་ཡོདཔ� "
+
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུའི་ བསྒྱུར་བཅོས་ཚུ་གི་ གྲོས་འཆར་བཀོད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འཛོམས་འདུའི་ བསྒྱུར་བཅོས་ཚུ་ལུ་ �་བཟེད་མ་བ�ུབ�"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུའི་ བསྒྱུར་བཅོས་ཚུ་ལུ་ �་བཟེད་མ་བ�ུབ�"
 
-#: ../plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་ལས་ཀ་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> གིས་ འོག་གི་ལས་ཀ་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> གིས་ འོག་གི་ལས་ཀ་ལུ་%s གི་ འགན་ལས་སྤྲོད་དགོ་པའི་ ཞུ་བ་འབད�་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:425
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> གིས་%s བརྒྱུད་དེ་ �ྱོད་ལུ་ལས་ཀ་ཅིག་ འགན་སྤྲོད་འབད་ཡི�"
 
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> གིས་ �ྱོད་ལུ་ལས་ཀ་ཅིག་ འགན་སྤྲོད་འབད་ཡི�"
 
-#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> གིས་%s བརྒྱུད་དེ་ ད་ལྟོའི་ལས་ཀ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> གིས་ ད་ལྟོའི་ལས་ཀ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> གིས་%s བརྒྱུད་དེ་  འོག་གི་འགན་སྤྲོད་འབད་མི་ ལས་ཀའི་དོན་ལུ་ བརྡ་དོན་གསརཔ་ ལེན་ནིའི་རེ་འདོད་བས�ྱེདཔ་མས�"
+
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད་འབད་མི་ ལས་ཀའི་དོན་ལུ་ མ�འ་མཇུག་གི་བརྡ་དོན་ ལེན་ནིའི་རེ་འདོད་བས�ྱེདཔ་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:477
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b>གིས་ %s བརྒྱུད་དེ་ འོག་གི་ ལས་ཀ་འགན་སྤྲོད་ཡོད་པའི་ ལན་ཚུ་བ�ང་ནུག:"
+
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད་འབད་མི་ ལས་ཀའི་ངོས་ལན་ ལོག་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་�ོག་ འོག་ལུ་འགན་སྤྲོད་འབད་མི་ལས་ཀ་དེ་ ཆ་མེད་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> གིས་ འོག་ལུ་འགན་སྤྲོད་འབད་མི་ལས་ཀ་དེ་ ཆ་མེད་བ�ང་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:489
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> གིས་ %sབརྒྱུད་དེ་ འོག་གི་ལས་ཀའི་ འགན་ལས་ཀྱི་བསྒྱུར་བཅོས་ཚུ་གི་ གྲོས་འཆར་བཀོད་ནུག"
+
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> གིས་ འོག་གི་ལས་ཀའི་ འགན་ལས་ཀྱི་བསྒྱུར་བཅོས་ཚུ་གི་ གྲོས་འཆར་བཀོད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འགན་སྤྲོད་འབད་མི་ ལས་ཀ་དེ་ལུ་ �་བཟེད་མ་བ�ུབ�"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད་འབད་མི་ ལས་ཀ་དེ་ལུ་ �་བཟེད་མ་བ�ུབ�"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་བརྗེད་�ོ་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> གིས་ འོག་གི་བརྗེད་�ོ་ དཔེ་བས�ྲུན་འབད་ནུག"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ ད་ལྟོའི་བརྗེད་�ོ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་ཨིན་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> གིས་ ད་ལྟོའི་བརྗེད་�ོ་ཅིག་ལུ་ �་ས�ོང་བར�ྱབ་ནིའི་ རེ་འདོད་བས�ྱེདཔ་ཨིན་མས�"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་རུབ་སྤྱོད་འབད་མི་ བརྗེད་�ོ་དེ་ ཆ་མེད་བ�ང་ནུག�"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> གིས་ འོག་ལུ་རུབ་སྤྱོད་འབད་ཡོད་པའི་ བརྗེད་�ོ་དེ་ ཆ་མེད་བ�ང་ནུག�"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:762
+#: ../plugins/itip-formatter/itip-view.c:821
 msgid "_Open Calendar"
 msgstr "ཟླ་�ོ་�་ཕྱེ�(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:768
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:778
-#: ../plugins/itip-formatter/itip-view.c:795
-#: ../plugins/itip-formatter/itip-view.c:800
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Decline"
 msgstr "དང་ལེན་མ་འབད�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:781
-#: ../plugins/itip-formatter/itip-view.c:797
-#: ../plugins/itip-formatter/itip-view.c:802
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Accept"
 msgstr "དང་ལེན་འབད�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Decline all"
 msgstr "ཆ་མཉམ་དང་ལེན་མ་འབད� (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Tentative all"
 msgstr "ཆ་མཉམ་ངེས་མེད�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:773
-#: ../plugins/itip-formatter/itip-view.c:779
-#: ../plugins/itip-formatter/itip-view.c:796
-#: ../plugins/itip-formatter/itip-view.c:801
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Tentative"
 msgstr "ངེས་མེད�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Accept all"
 msgstr "ཆ་མཉམ་དང་ལེན་འབད�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Send Information"
 msgstr "བརྡ་དོནག�ང་�(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update Attendee Status"
 msgstr "ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མ�ུན་བཟོ�(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update"
 msgstr "དུས་མ�ུན་བཟོ�(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "འགོ་བཙུགས་དུས་ཚོད་:�"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:960
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "མཇུག་བསྡུ་བའི་དུས་ཚོད་:�"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:976
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "བསམ་བཀོད�"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
-msgid "Send u_pdates to attendees"
-msgstr "ངོ་འཛོམས་པ་ཚུ་ལུ་ དུས་མ�ུན་ག�ང་�(_u)"
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
+msgstr "ག�ང་མི་ལུ་ ལན་གསལ་ག�ང་ (_R)"
+
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr "ངོ་འཛོམས་པ་ཚུ་ལུ་ དུས་མ�ུན་ག�ང་ (_U)"
+
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
+msgstr "དུས་ས�བས་ཆ་མཉམ་ལུ་འཇུག་སྤྱོད་འབད (_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1049
-msgid "A_pply to all instances"
-msgstr "དུས་ས�བས་ཆ་མཉམ་ལུ་འཇུག་སྤྱོད་འབད�(_p)"
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr "དུས་ཚོད་ རང་དབང་སྦེ་ སྟོན་ (_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1718
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "ལས་ཀ་ཚུ་:(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:1720
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "བརྗེད་�ོ་ཚུ་:"
 
@@ -16978,31 +17269,149 @@ msgstr "རྩིས་à½�ོ་ཚུ་ ལྕོགས་མིན་བཟà½
 msgid "Disable Account"
 msgstr "རྩིས་�ོ་ལྕོགས་མིན་བཟོ�"
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "བརྡ་ས�ད་སྟོན་ ཡང་ན་ སྒྲ་ས�ད་ཡིག་སྣོན་ ག�ང་� "
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr "བརྡ་བས�ུལ་ས་�ོངས་ནང་ལུ་ ངོས་དཔར་ འགུལ་སྤར་འབད� "
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "ཌི-བཱསི་ འཕྲིན་དོན་ཚུ་ ལྕོགས་ཅན་བཟོ� "
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr "བརྡ་བས�ུལ་མངའ་�ོངས་ནང་ལུ་ ངོས་དཔར་ ལྕོགས་ཅན་བཟོ� "
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "ཡིག་འཕྲིན་གསརཔ་ �ོབ་པའི་་ས�བས་ལུ་ ཌི་-བརྡ་རྟགས་འགྲུལ་ལམ་ཅིག་ བཟོ་བ�ོན་འབད�་ཨིན�"
+
+#: ../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 "ནང་སྒྲོམ་གྱི་དོན་ལུ་ར�ྱངམ་ཅིག་ འཕྲིན་དོན་གསརཔ་ཚུ་ བརྡ་བས�ུལ་འབད� "
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "འཕྲིན་དོན་གསརཔ་�ོབ་་ད་ སྒྲ་ས�ད་ཡིག་སྣོད་ག�ང་� (_v)"
+
+#: ../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
+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 "ག�ང་ནི་ཨིན་པའི་ སྒྲ་ས�ད་ཡིག་སྣོད་ཀྱི་མིང་� "
+
+#: ../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 "ངོས་དཔར་ འགུལ་དཔར་འདབ་དགོ་ག་མི་དགོ� "
+
+#: ../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:254
+msgid "Generate a _D-Bus message"
+msgstr "ཌི་-བཱསི་ འཕྲིན་དོན་ཅིག་ བཟོ་བ�ོན་འབད་ (_D)"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
 #, c-format
-msgid "System error: %s"
-msgstr "རིམ་ལུགས་འཛོལ་བ་: %s�"
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+"�ྱོད་ཀྱི་ %d འཕྲིན་དོན་གསརཔ་ཅིག་ \n"
+"%s ནང་�ོབ་ནུག� "
+msgstr[1] ""
+"�ྱོད་ཀྱི་ %d འཕྲིན་དོན་གསརཔ་ཅིག་ \n"
+"%s ནང་�ོབ་ནུག� "
 
-#: ../plugins/mail-remote/client.c:32
+#: ../plugins/mail-notification/mail-notification.c:368
 #, c-format
-msgid "Camel error: %s"
-msgstr "ཀེ་མཱལ་འཛོལ་བ་: %s�"
+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:380
+#: ../plugins/mail-notification/mail-notification.c:385
+msgid "New email"
+msgstr "གློག་འཕྲིན་ གསརཔ་ "
+
+#: ../plugins/mail-notification/mail-notification.c:440
+msgid "Show icon in _notification area"
+msgstr "བརྡ་བས�ུལ་ས་�ོངས་ནང་ ངོས་དཔར་སྟོན་ (_N)"
+
+#: ../plugins/mail-notification/mail-notification.c:443
+msgid "B_link icon in notification area"
+msgstr "བརྡ་བས�ུལ་ ས་�ོངས་ནང་ལུ་ ངོས་དཔར་ འགུལ་དཔར་འབད་ (_L)"
+
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
+msgstr "པོཔ་ཨཔ་_འཕྲིན་དོན་ ངོས་དཔར་དང་བཅས་  (_M)"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "རྩིས་�ོ་གིས་ གློག་འཕྲིན་ག�ང་མི་ཚུགས�"
+#: ../plugins/mail-notification/mail-notification.c:626
+msgid "_Play sound when new messages arrive"
+msgstr "འཕྲིན་དོན་གསརཔ་ཚུ་ ལྷོདཔ་ད་ སྒྲ་ས�ད་་ག�ང་ (_P)"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "མཛོད་�ང་འ�ོབ་མི་ཚུགས་པས�"
+#: ../plugins/mail-notification/mail-notification.c:632
+msgid "_Beep"
+msgstr "བརྡ་ས�ད་ར�ྱབས་ (_B)"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "�ག་རིང་ལས་ ཡིག་འཕྲིན་གནད་སྡུད་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ ཀོར་བའི་ངོས་འདྲ་བ་ཅིག་ བསྟར་སྤྱོད་འབད་མི་ པ་ལག་ཨིན་ཅིག"
+#: ../plugins/mail-notification/mail-notification.c:633
+msgid "Play _sound file"
+msgstr "སྒྲ་ས�ད་ཀྱི་ཡིག་སྣོད་ ག�ང་ (_S)"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "�ག་རིང་ཡིག་འཕྲིན�"
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "ཡིག་སྣོད་ཀྱི་མིང་ གསལ་བཀོད་འབད་: (_f)"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "སྒྲ་ས�ད་སེལ་འ�ུ་འབད�"
+
+#: ../plugins/mail-notification/mail-notification.c:646
+msgid "Pl_ay"
+msgstr "ག�ང་ (_A)"
+
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr "ནང་སྒྲོམ་གྱི་དོན་ལུ་ར�ྱངམ་ཅིག་ འཕྲིན་དོན་གསརཔ་ བརྡ་བས�ུལ་འབད་ (_I)"
+
+#: ../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 "ཡིག་འཕྲིན་གསར་པའི་བརྡ་བས�ུལ་"
 
 #: ../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."
@@ -17016,6 +17425,15 @@ msgstr "འཛོམས་འདུ་ལུ་ གཞི་བསྒྱིརà¼
 msgid "Mail to meeting"
 msgstr "འདི་འཛོམས་འདུ་ལུ་ ཡིག་འཕྲིན་ག�ང་�"
 
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "ཟླ་�ོ་�་ཕྱེ་མི་ཚུགས་པས� %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+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 "ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན་ཅིག་གི་ ནང་དོན་ཚུ་ནང་ལས་ ལས་ཀ་གསར་བས�ྲུན་འབད་བཅུག་མི་ པ་ལག་ཨིན་ཅིག"
@@ -17202,12 +17620,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "སེལ་འ�ུ་འབད་མི་ཟླ་�ོ་ཚུ་ ཨོཕ་ལའིན་ནང་ བལྟ་ནིའི་དོན་ལུ་ རྟགས་བཀལ�་ཨིན�"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "�ོབ་ཚུགས་མི་འདི་ ཨོཕ་ལའིན་མ་བཟོ�(_D)"
+msgid "_Do not make available for offline use"
+msgstr "�ོབ་ཚུགས་མི་དེ་ གློག་ལམ་མེད་ད་ ལག་ལནེ་འ�བ་ནི་མ་བཟོ་ (_D)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཟླ་�ོ་ལུ་རྟགས་བཀལ�(_M)"
+msgid "_Make available for offline use"
+msgstr "གློག་ལམ་མེདཔ་ད་ ལག་ལེན་གྱི་དོན་ལུ་�ོབ་ཚུགསཔ་ བཟོ་ _M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -17217,25 +17635,13 @@ msgstr "མོ་ནོ་པ་ལག་ཨིནསི་ཚུ་ བསྟà½
 msgid "Mono Loader"
 msgstr "མོ་ནོ་མངོན་གསལ་འབད་མི�"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "ཡིག་འཕྲིན་གསརཔ་ འབྱོར་བའི་ས�བས་ལུ་ ཌི་-བརྡ་རྟགས་འགྲུལ་ལམ་ཅིག་ བཟོ་བ�ོན་འབད�་ཨིན�"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "ཡིག་འཕྲིན་གསར་པའི་བརྡ་བས�ུལ�"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བས�ུལ་འབད�"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "པ་ལག་ཨིནསི་ ག་དང་ག་ཚུ་ ལྕོགས་ཅན་ཨིན་ན་ ལྕོགས་མིན་ཨིན་ན་ འཛིན་ས�ྱོང་འ�བ་མི་ པ་ལག་ཨིན་ཅིག"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:225
 msgid "Plugin Manager"
 msgstr "པལག་ཨིན་ འཛིན་ས�ྱོང་པ�"
 
@@ -17247,22 +17653,33 @@ msgstr "པལག་ཨིནསི་ ལྕོགས་ཅན་དང་ ལà
 msgid "_Plugins"
 msgstr "པ་ལག་ཨིནསི�(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:57
 msgid "Author(s)"
 msgstr "རྩོམ་པ་པོ� ༼ཚུ༽"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "འགྲེལ་བཤད�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "དྲན་འཛིན: ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་ བསྒྱུར་བཅོས་ལ་ལོ་ཅིག་ལུ་ ནུས་པ་མི་འོང་�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:260
+msgid "Overview"
+msgstr "སྤྱི་མ�ོང་ "
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+msgid "Configuration"
+msgstr "་རིམ་སྒྲིག"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr "པ་ལག་ཨིན་དེའི་དོན་ལུ་ རིམ་སྒྲིག་གདམ་�་མིན་ནུག� "
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
 msgid "Plugin"
 msgstr "པལག་ཨིན�"
 
@@ -17285,25 +17702,29 @@ msgstr "ཚིག་ཡིག་ར�ྱང་པོའི་�བས་ལམ
 msgid "Prefer plain-text"
 msgstr "ཚིག་ར�ྱང་ལུ་དགའ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:179
 msgid "Show HTML if present"
 msgstr "ཡོད་པ་ཅིན་ ཨེཆ་ཊི་ཨེམ་ཨེལ་སྟོན�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:180
 msgid "Prefer PLAIN"
 msgstr "ར�ྱང་པོ་དགའ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:181
 msgid "Only ever show PLAIN"
 msgstr "ཨ་རྟག་ར་ ར�ྱང་པོ་ར�ྱངམ་གཅིག་སྟོན�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ �བས་ལམ�"
+#: ../plugins/prefer-plain/prefer-plain.c:224
+msgid "HTML _Mode"
+msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ �བས་ལམ་ "
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "རྩོམ་མ�ན་ནང་ལས་ ཡིག་འཕྲིན་དཔར་བས�ྲུན་འབད་ནིའི་ གདམ་�་ཅིག་བྱིནམ་ཨིན�"
+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 "འཕྲིན་དོན་དཔར་བས�ྲུན་འབད�"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27
@@ -17342,7 +17763,13 @@ msgstr "གནས་�ོངས་ཚུ�"
 msgid "_Publish Calendar Information"
 msgstr "ཨའི་ཟླ་�ོའི་བརྡ་དོན་དཔེ་བས�ྲུན་འབད�(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s'གི་དོན་ལས་ ཆོག་ཡིག་བཙུགས�"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
 msgid "Are you sure you want to remove this URL?"
 msgstr "�ྱོད་ཀྱིས་ ཡུ་ཨར་ཨེལ་འདི་ རྩ་བས�ྲད་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན�"
 
@@ -17364,6 +17791,10 @@ msgstr ""
 "བདུན་རིམ�\n"
 "ལག་�ོག (བྱ་བའི་དཀར་ཆག་བརྒྱུད་དེ)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "ལྕོགས་ཅན་བཟོ� (_n)"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "འདྲེན་ལམ་: (_o)"
@@ -17402,10 +17833,22 @@ msgstr "ཞབས་�ོག་གི་དབྱེ་བ་:(_t)"
 msgid "_File:"
 msgstr "ཡིག་སྣོད་: (_F)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "ཆོག་ཡིག: (_P)"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "དེ་སྦེ་དཔེ་བས�ྲུན་འབད་:(_P)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "ཆོག་ཡིག་སེམས་�ར་བཞག (_R)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "ལག་ལེན་པའི་མིང་: (_U)"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17414,15 +17857,15 @@ msgstr ""
 "ཨའི་ཟླ་�ོ་\n"
 "དལ�/�ོམ་མེད�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "སི་པ་མ་ས་སིན་(ནང་སྦྲགས)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:841
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
 msgid "This will make Spamassasin more reliable, but slower"
 msgstr "འདི་གིས་ཚགས་མ་དེ་ བརྟན་�ོག་�ོ་བཟོ�་ཨིན་ དེ་འབད�་ད་ ལྷོད་ཆ་ཞུགསཔ་ཨིན�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:847
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
 msgid "I_nclude remote tests"
 msgstr "�ག་རིང་གི་བརྟག་ཞིབ་ཚུ་ གྲངས་སུ་བཙུགས� (_n)"
 
@@ -17434,6 +17877,10 @@ msgstr "སི་པ་མ་ས་སིན་ ལག་ལེན་འà½�བà¼
 msgid "SpamAssassin junk plugin"
 msgstr "སི་པ་མ་ས་སིན་ མ�ོ་མེད་པ་ལག་ཨིན་"
 
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "སི་པ་མ་ས་སིན་ གདམ་ག་ཚུ་ "
+
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "དུས་སྟབས་གཅིག་ལུ་ མཉམ་སྦྲགས་ཚུ་ཆ་མཉམ་ ཡང་ན་ འཕྲིན་དོན་གྱི་ཆ་ཤས་ཚུ་ སྲུང་བཞག་འབད་ནིའི་ པ་ལག་ཨིན་ཅིག"
@@ -17462,7 +17909,7 @@ msgstr "མ་ཡིམ་གྱི་དབྱེ་བ�"
 
 #: ../plugins/save-attachments/save-attachments.c:363
 #: ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "སྲུངས�"
 
@@ -17470,79 +17917,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:171
+#: ../plugins/save-calendar/csv-format.c:167
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "UID"
 msgstr "ཡུ་ཨའི་ཌི�"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Description List"
 msgstr "འགྲེལ་བཤད་�ོ་ཡིག"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Categories List"
 msgstr "དབྱེ་རིམ་�ོ་ཡིག�"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Comment List"
 msgstr "བསམ་བཀོད་�ོ་ཡིག"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Created"
 msgstr "གསར་བས�ྲུན་འབད་ཡོདཔ�"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Contact List"
 msgstr "འབྲེལ་སའི་�ོ་ཡིག"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Start"
 msgstr "འགོ་བཙུགས�"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "End"
 msgstr "མཇུག་བསྡུ�"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "percent Done"
 msgstr "བརྒྱ་ཆ་ཚར་བ�"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "URL"
 msgstr "ཡུ་ཨར་ཨེལ�"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Attendees List"
 msgstr "ངོ་འཛོམས་པ་ཚུ་གི་�ོ་ཡིག�"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Modified"
 msgstr "ལེགས་བཅོས་འབད་ཡོད�"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Advanced options for the CSV format"
 msgstr "སི་ཨེསི་�ི་ རྩ་སྒྲིག་གི་དོན་ལུ་ མ�ོ་རིམ་ཅན་གྱི་གདམ་��"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Prepend a header"
 msgstr "མགོ་ཡིག་ཅིག་ པིརི་པེནཌི་འབད�"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:561
 msgid "Value delimiter:"
 msgstr "བེ་ལུ་གི་ དབྱེ་རྟགས�"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:567
 msgid "Record delimiter:"
 msgstr "དྲན་�ོའི་དབྱེ་རྟགས�"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "Encapsulate values with:"
 msgstr "བེ་ལུསི་ཚུ་ འདི་དང་གཅིག་�ར་ བསྡུས་དོན་བཀོད�"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:595
 msgid "Comma separated value format (.csv)"
 msgstr "�ེམ་རྟགས་ཀྱིས་ སོ་སོ་འཕྱལ་མི་ བེ་ལུ་གི་རྩ་སྒྲིག(.སི་ཨེསི་�ི་)"
 
@@ -17563,16 +18010,15 @@ msgstr "ཌིཀསི་ལུ་སྲུངས�(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:154
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "ཨར་ཌི་ཨེཕ་ རྩ་སྒྲིག(.ཨར་ཌི་ཨེཕ)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:164
 msgid "Select destination file"
 msgstr "འགྲོ་ཡུལ་གྱི་ཡིག་སྣོད་ སེལ་འ�ུ་འབད�"
 
@@ -17589,6 +18035,10 @@ msgid "Show _only this Calendar"
 msgstr "ཟླ་�ོ་འདི་ར�ྱངམ་གཅིག་སྟོན�(_o)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "བརྗེད་�ོ་་གི་ �ོ་ཡིག་འདི་ར�ྱངམ་གཅིག་ སྟོན་  (_O)"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "ལས་ཀའི་�ོ་ཡིག་འདི་ར�ྱངམ་གཅིག་སྟོན�(_o)"
 
@@ -17628,16 +18078,22 @@ msgid "Please select the information that you would like to import:"
 msgstr "�ྱོད་ཀྱིས་ ནང་འདྲེན་འབད་དགོ་མནོ་མི་ བརྡ་དོན་དེ་ སེལ་འ�ུ་འབད་གནང་�"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "%s ནང་ལས:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../shell/e-shell-importer.c:511
+#, c-format
 msgid "Importing data."
 msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་དོ�"
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr "བསྒུག་སྡོད་གནང་�"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "འཕྲིན་དོན་ཚུ་ལུ་ �ེ་རེཌི་འབད�་ད་ དོན་ཚན་ལུ་ གློ་བུར་རྒྱབ་�ག་འབད་དགོ་པ་ཅིན་ བརྡ་སྟོནམ་ཨིན�་"
@@ -17652,8 +18108,16 @@ msgstr "དོན་ཚན་à½�ོག་ལས་ འཕྲིན་དོནà¼
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
-msgstr "�ེ་རེཌི་འབད་མི་ འཕྲིན་དོན་ཚུ་ལུ་ རྣམ་གྲངས་གྱི་སྒོ་ལས་ གློ་བུར་རྒྱབ་�ག་འབད�(_j)"
+msgid "F_all back to threading messages by subject"
+msgstr "�ེ་རེཌི་འབད་མི་ འཕྲིན་དོན་ཚུ་ལུ་ རྣམ་གྲངས་གྱི་སྒོ་ལས་ གློ་བུར་རྒྱབ་�ག་འབད་ (_A)"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr "ཊི་ཨེན་ཨི་ཨེཕ་ མཉམ་སྒྲགས་ཚུ་ ཌི་ཀོཌ་ འབད་ནིའི་དོན་ལུ་ �འི་ཊི་ཨེན་ཨི་ཨེཕ་ ལག་ལེན་འ�བ་མི་ པ་ལག་ཨིན་ འཇམ་སམ� "
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr "ཊི་ཨེན་ཨི་ཨེཔ་ མཉམ་སྦྲགས་ ཌི་ཀོ་ཌར་ "
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -17663,128 +18127,144 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ཤལ�"
 msgid "Evolution Shell Config factory"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ཤལ་ རིམ་སྒྲིག་འཕྲུལ་�ང་�"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "ཨི་བོ་ལུ་ཤཱན་བརྟག་ཞིབ�"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "ཨི་བོ་ལུ་ཤཱན་བརྟག་ཞིབ་ཀྱི་ཆ་ཤས�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A string description of the current printer settings"
-msgstr "ད་ལྟོའི་དཔར་འཕྲུལ་སྒྲིག་སྟངས་ཀྱི་ཡིག་རྒྱུན་འགྲེལ་བཤད་ཅིག"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "A string description of the current printer settings."
+msgstr "ད་ལྟོའི་ད པར་འཕྲུལ་སྒྲིག་སྟངས་ཀྱི་ ཡིག་རྒྱུན་འགྲེལ་བཤད་ཅིག� "
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "རིམ་སྒྲིག་གི་�ོན་རིམ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash detection should be run or not."
+msgstr "བརྡབ་འ�ྲུག་ ས�ྱོན་འཛིན་ གཡོག་བཀོལ་ནི་ཨིན་ན་མེན་ན་ གྲོས་�ག་བཅདཔ་ཨིན� "
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "ཟུར་�འི་ཕྲ་རིང་གི་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད� (_e)"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "སྒོ་སྒྲིག་གི་མ�ོ་ཚད་ སྔོན་སྒྲིག་འབད�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "སྔོན་སྒྲིག་སྒོ་སྒྲིག་གནས་ལུགས�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "སྒོ་སྒྲིག་གི་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "འགོ་བཙུགས་ས�བས་ སྔོན་སྒྲིག་འབད་སྟོན་ནིའི་ ཆ་ཤས་ཀྱི་ ཨའི་ཌི་ ཡང་ན་ མིང་གཞན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "མ�འ་མཇུག་གི་ དུས་མ�ུན་བཟོ་བའི་ རིམ་སྒྲིག་�ོན་རིམ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་ ཌིཀསི་ལུ་ མཉམ་འབྱུང་འབད་ནིའི་ སྣོད་འཛིན་གྱི་དོན་ལུ་ འགྲུལ་ལམ་གྱི་�ོ་ཡིག"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Sidebar is visible"
 msgstr "ཟུར་�འི་་ཕྲ་རིང་མ�ོང་ཚུགས་པས�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Skip development warning dialog"
 msgstr "གོང་འཕེལ་ཉེན་བརྡའི་ ཌའི་ལོག་གོམ་སྟེ་འགྱོ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
-#: ../shell/main.c:452
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "Skip recovery warning dialog"
+msgstr "ཉེན་བརྡའི་ ཌའི་ལོག་ སླར་གསོ་འབད་ནི་ གོམ་འགྱོ་ "
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/main.c:576
 msgid "Start in offline mode"
 msgstr "ཨོཕ་ལ་ཡིན་ �བས་ལམ་ནང་ འགོ་བཙུགས�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Statusbar is visible"
 msgstr "གནས་ཚད་ཕྲ་རིང་མ�ོང་ཚུགས་པས�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "སྦོམ་/ཆུང་ཀུ་ རིམ་སྒྲིག་གནས་རིམ་དང་བཅས་པའི་ ཨི་བོ་ལུ་ཤཱན་རིམ་སྒྲིག་�ོན་རིམ�(དེཔར་ན་ \"2.6.0\")�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
 msgstr "སྒོ་སྒྲིག་གཙོ་བའི་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་མ�ོ་ཚད་ པིག་སེལསི་ནང་�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "The default width for the main window, in pixels."
 msgstr "སྒོ་སྒྲིག་གཙོ་བའི་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་རྒྱ་ཚད་ པིག་སེལསི་ནང་�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "The default width for the sidebar, in pixels."
 msgstr "ཟུར་�འི་ཕྲ་རིང་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་རྒྱ་ཚད་ པིག་སེལསི་ནང་�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "སྦོམ་/ཆུང་ཀུ་ རིམ་སྒྲིག་གནས་རིམ་དང་བཅས་པའི་ མ�འ་མཇུག་རྒྱ་ས�ྱེད་འབད་ཡོད་པའི་ ཨི་བོ་ལུ་ཤཱན་རིམ་སྒྲིག་�ོན་རིམ�(དེཔར་ན་ \"2.6.0\")�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
 msgstr "སྒོ་སྒྲིག་ཨེབ་རྟའི་བཟོ་རྣམ� \"text\", \"icons\", \"both\", \"toolbar\" འོང་སྲིད� གལ་སྲིད་\"toolbar\" གཞི་སྒྲིག་འབད་བ་ཅིན་ ཨེབ་རྟའི་བཟོ་རྣམ་དེ་ ཇི་ནོམ་ལག་ཆས་ཕྲ་རིང་ གཞི་སྒྲིག་གིས་ག�ན་འབེབས་བཟོ�་ཨིན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
 msgstr "ལག་ཆས་ཕྲ་རིང་ མ�ོང་ཚུགས་པས�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ཨི་བོ་ལུ་ཤཱན་དེ་ ཨཱོན་ལ་ཡིན་ �བས་ལམ་གྱི་ཚབ་ལུ་ ཨོཕ་ལ་ཡིན་་ �བས་ལམ་ནང་ འགོ་བཙུགས་ནི་ཨིན་ན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Whether crash detection should be done or not"
+msgstr "བརྡབ་འ�ྲུག་ས�ྱོན་འཛིན་ འབད་ནི་ཨིན་ན་མེན་ན་ "
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether or not the window should be maximized."
 msgstr "སྒོ་སྒྲིག་འཕར་དགོཔ་ཨིན་ན་མེན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "ཟུར་�འི་ཕྲ་རིང་དེ་མ�ོང་དགོཔ་ཨིན་ན་མེན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the status bar should be visible."
 msgstr "གནས་ཚད་ཕྲ་རིང་དེ་མ�ོང་དགོཔ་ཨིན་ན་མེན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Whether the toolbar should be visible."
 msgstr "ལག་ཆས་ཕྲ་རིང་དེ་ མ�ོང་དགོཔ་ཨིན་ན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ གོང་འཕེལ་�ོན་རིམ་ནང་གི་ ཉེན་བརྡའི་ཌའི་ལོག་དེ་ གོམ་སྟེ་འགྱོ་ཡི་ག"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr "ཨི་བོ་ལུ་ཤཱན་སླར་གསོ་ འབད་ནི་ནང་གི་ ཉེན་བརྡའི་ཌའི་ལོག་དེ་ གོམ་འགྱོ་ཡི་ག་མ་འགྱོ་ "
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the window buttons should be visible."
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ མ�ོང་དགོཔ་ཨིན་ན�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Window button style"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟའི་བཟོ་རྣམ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Window buttons are visible"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ མ�ོང་ཚུགས�"
 
@@ -17800,11 +18280,6 @@ msgstr "ཤུགས་ལྡན་མ�ུད་ལམ་ཚུ�"
 msgid "Click OK to close these connections and go offline"
 msgstr "མ�ུད་ལམ་འདི་ཚུ་ �་བསྡམས་�ེ་ ཨོཕ་ལ་ཡིན་ལུ་ འགྱོ་ནིའི་དོན་ལས་ ཨོ་ཀེ་ལུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(མགོ་མིང་མ་བ�གསཔ�)"
-
 #: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "གཡོག་བཀོལ་ནིའི་དོན་ལུ་ ནང་འདྲེན་པའི་དབྱེ་བ་ གདམ་�་ར�ྱབས�"
@@ -17835,27 +18310,27 @@ msgstr ""
 " �ྱོད་ཀྱིས་ ལོག་སྟེ་འབད་རྩོལ་བས�ྱེད་པ་ཅིན་\n"
 " \"Back\" ཨེབ་རྟ་ལུ་ ཨེབ་ག�ང་འབད�\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:288
 msgid "F_ilename:"
 msgstr "ཡིག་སྣོད་མིང་: (_i)"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:293
 msgid "Select a file"
 msgstr "ཡིག་སྣོད་ཅིག་ སེལ་འ�ུ་འབད�"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "ཡིག་སྣོད་ཀྱི་དབྱེ་བ་:(_t)"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "ལས་རིམ་རྙིངམ་ཚུ་ནང་ལས་ གནས་སྡུད་ནང་ གཞི་སྒྲིག་ཚུ་ ནང་འདྲེན་འབད� (_o)"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "ཡིག་སྣོད་ཕུད་རྡོག་གཅིག་ ནང་འདྲེན་འབད� (_s)"
 
-#: ../shell/e-shell-settings-dialog.c:319
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "ཨི་བོ་ལུ་ཤཱན་དགའ་གདམ་ཚུ�"
 
@@ -17879,48 +18354,60 @@ msgstr "སྣོད་འཛིན་གྱི་མིང་ནང་ ཡིà½
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' དང་'..'ཚུ་ སྔོན་སྲུང་སྣོད་འཛིན་གྱི་མིང་ཨིན་པས�"
 
-#: ../shell/e-shell-window-commands.c:76
+#. 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:50
+#: ../shell/e-shell-window.c:342
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - ཨི་བོ་ལུ་ཤཱན�"
+
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "ཇི་ནོམ་ པའི་ལོཊི་ ལག་ཆས་དེ་ རིམ་ལུགས་འདི་ནང་ གཞི་བཙུགས་འབད་འབད�་སྦེ་ མི་འ�ོན་པས�"
 
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "%sལག་ལེན་འ�བ་ནི་ལུ་འཛོལ་བ�"
 
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "བཱག་བ་ཌི་ གཞི་བཙུགས་མ་འབད་བས�"
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "བཱག་བ་ཌི་ གཡོག་བཀོལ་མ་ཚུགས�"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:575
+#: ../shell/e-shell-window-commands.c:744
 msgid "translator-credits"
 msgstr "ཨའི་ཌི་ཨར་སི་གི་མ་དངུལ་རྒྱབ་ས�ྱོར་�ོག་ལས་ བརྡ་དོན་འཕྲུལ་རིག་ལས་�ུངས་ནང་ ས�ད་བསྒྱུར་འབད་ཡི� �་གསལ་གྱི་དོན་ལུ་ འབྲེལ་བ་འ�བ་ས་: <pema_geyleg@druknet.bt>/<pgeyleg@dit.gov.bt>"
 
-#: ../shell/e-shell-window-commands.c:586
+#: ../shell/e-shell-window-commands.c:755
 msgid "Evolution Website"
 msgstr "ཨི་བོ་ལུ་ཤཱན་�ེབ་ས་�ོངས་"
 
-#: ../shell/e-shell-window-commands.c:793
+#: ../shell/e-shell-window-commands.c:773
+msgid "Error opening the FAQ webpage."
+msgstr "ཨེཕ་ ཨེ་ ཀིའུ་ �ེབ་ཤོག་ལེབ་�་ཕྱེ་བའི་ས�བས་ལུ་འཛོལ་བ� "
+
+#: ../shell/e-shell-window-commands.c:970
 msgid "_Work Online"
 msgstr "ཨཱོན་ལ་ཡིན་གུ་ ལཱ་འབད� (_W)"
 
-#: ../shell/e-shell-window-commands.c:806
-#: ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:983
+#: ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད� (_W)"
 
-#: ../shell/e-shell-window-commands.c:819
+#: ../shell/e-shell-window-commands.c:996
 msgid "Work Offline"
 msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད�"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:382
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨཱོན་ལ་ཡིན་གུ་ཡོད� ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ཨེབ་ག�ང་འབད�"
 
@@ -17932,35 +18419,35 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་à½
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ཡོད� ཨཱོན་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་གུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../shell/e-shell-window.c:796
+#: ../shell/e-shell-window.c:805
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ལུ་སོར་བསྒྱུར་འབད�"
 
-#: ../shell/e-shell.c:636
-msgid "Uknown system error."
-msgstr "མ་ཤེས་པའི་ རིམ་ལུགས་འཛོལ་བ�"
+#: ../shell/e-shell.c:640
+msgid "Unknown system error."
+msgstr "མ་ཤེས་པའི་ རིམ་ལུགས་ འཛོལ་བ�"
 
-#: ../shell/e-shell.c:832
-#: ../shell/e-shell.c:833
+#: ../shell/e-shell.c:838
+#: ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ཀེ་བི�"
 
-#: ../shell/e-shell.c:1264
-#: ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1280
+#: ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "བ�ུབ་པས�"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1282
 msgid "Invalid arguments"
 msgstr "ནུས་མེད་ཀྱི་ སྒྲུབ་རྟགས་ཚུ�"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1284
 msgid "Cannot register on OAF"
 msgstr "ཨོ་ཨེ་ཨེཕ་གུ་ �ོ་བཀོད་འབད་མི་ཚུགས�"
 
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1286
 msgid "Configuration Database not found"
 msgstr "རིམ་སྒྲིག་གི་ གནད་སྡུད་གཞི་རྟེན་ འཚོལ་མ་�ོབ�"
 
@@ -17970,15 +18457,15 @@ msgstr "རིམ་སྒྲིག་གི་ གནད་སྡུད་གà½
 msgid "New"
 msgstr "གསརཔ�"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:107
 msgid "New Test"
 msgstr "བརྟག་ཞིབ་གསརཔ�"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:108
 msgid "_Test"
 msgstr " བརྟག་ཞིབ� (_T)"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "བརྟག་ཞིབ་ཀྱི་རྣམ་གྲངས་ གསར་བས�ྲུན་འབད"
 
@@ -18021,7 +18508,7 @@ msgstr ""
 "ནང་འདྲེན་འབད་ནི་ལུ་ ལམ་སྟོན་འབད་འོང་�"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:233
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18055,7 +18542,7 @@ msgstr ""
 "ང་བཅས་ཀྱི་ དཀའ་སྤྱད་ལཱ་གི་གྲུབ་འབྲས་འདི་ལུ་ �ྱོད་སྤྲོ་བ་བྱུང་པའི་ རེ་བ་ཡོདཔ་མ་ཚད་\n"
 " དགའ་སྤྲོ་བའི་�ོག་ལས་ �ྱོད་ཀྱི་ཕན་འདེབས་ལུ་ བསྒུག་སྟེ་སྡོད་ཡོད�\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:257
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18063,39 +18550,66 @@ msgstr ""
 "བཀྲིན་ཆེ�\n"
 "ཨི་བོ་ལུ་ཤཱན་ རུ་ཚན�\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:264
 msgid "Do not tell me again"
 msgstr "ང་ལུ་ལོག་མ་སླབ�"
 
-#: ../shell/main.c:450
+#: ../shell/main.c:314
+msgid "Evolution Crash Detection"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ བརྡབ་འ�ྲུག་ ས�ྱོན་འཛིན་ "
+
+#: ../shell/main.c:316
+msgid "Ig_nore"
+msgstr "སྣང་མེད་བཞག་(_N)"
+
+#: ../shell/main.c:331
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+"ཨི་བོ་ལུ་ཤཱན་དེ་ ཧེ་མ་གཡོག་བཀོལ་བའི་ས�བས་ལུ་ དཔྱད་རིག་རྣམ་�ོག་མེད་པ་ ཕྱིར་�ོན་འབད་ནུག་ \n"
+"ཉེན་བཀག་ �བས་ལམ་གྱི་དོན་ལུ་ སྔོན་ལྟ་ པེན་ཚུ་ག་ར་ སྦ་དེ་འོང� \n"
+"�ྱོད་ཀྱིས་ སྔོན་ལྟ་པེན་ཚུ་ མ�ོང་སྣང་ཀར་ཆག་ནང་ལས་ སོར་ཆུད་འབད་ཚུགས� \n"
+
+#: ../shell/main.c:342
+msgid "_Do not show this message again"
+msgstr "འཕྲིན་དོན་འདི་ ལོག་སྟེ་མ་སྟོན་ (_D)"
+
+#: ../shell/main.c:574
 msgid "Start Evolution activating the specified component"
 msgstr "གསལ་བཀོད་འབད་མི་ ཆ་ཤས་དེ་ཤུགས་ལྡན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་འགོ་བཙུགས�"
 
-#: ../shell/main.c:454
+#: ../shell/main.c:578
 msgid "Start in online mode"
 msgstr "ཨཱོན་ལ་ཡིན་ �བས་ལམ་ནང་ འགོ་བཙུགས�"
 
-#: ../shell/main.c:457
+#: ../shell/main.c:581
 msgid "Forcibly shut down all Evolution components"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཆ་ཤས་ཆ་མཉམ་རང་ བང་ཅན་སྦེ་ སྒོ་བསྡམས�"
 
-#: ../shell/main.c:461
+#: ../shell/main.c:585
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ༡.༤ ནང་ལས་ བང་ཅན་སྦེ་ ལོག་སྟེ་གཞིས་སྤོ་འབད�"
 
-#: ../shell/main.c:464
+#: ../shell/main.c:588
 msgid "Send the debugging output of all components to a file."
 msgstr "ཆ་ཤས་ཆ་མཉམ་གྱི་ ཨའུཊི་པུཊི་ ས�ྱོན་སེལ་འ�ུ་འབད་དེ་ ཡིག་སྣོད་ཅིག་ནང་ག�ང་�"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:590
 msgid "Disable loading of any plugins."
 msgstr "པལག་ཨིན་གང་རུང་ མངོན་གསལ་འབད་ནི་ ལྕོགས་མིན་བཟོ�"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:592
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "ཡིག་འཕྲིན་དང་ འབྲེལ་ས་   ལས་ཀ་ཚུ་གི་ པེན་སྔོན་ལྟ་ ལྕོགས་མིན་བཟོ� "
+
+#: ../shell/main.c:677
 msgid "- The Evolution PIM and Email Client"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ གློག་འཕྲིན་གྱི་ཞབས་�ོག་སྤྱོད་མི�"
 
-#: ../shell/main.c:506
+#: ../shell/main.c:705
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18235,50 +18749,60 @@ msgstr "ནཱ་ལུ་ བརྡ་སྟོན་à½�ེ་ཡོད་ནà¼
 msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "ནཱ་ལུ་ བརྡ་སྟོན་�ེ་ཡོད་ན་མ་ག�ོགས་ �ྱོད་ཀྱིས་ ལག་�ྱེར་འདི་སྤྲོད་མི་ ལག་�ྱེར་དབང་འཛིན་ལུ་ བློ་ག�ད་མ་འབད་བ་ཅིན་ ལག་�ྱེར་འདི་གི་ བདེན་བཤད་ལུ་ཡང་ བློ་ག�ད་མ་འབད་དགོ"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../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 "ནང་འདྲེན་འབད་ནི་ལུ་ ལག་�ྱེར་ཅིག་སེལ་འ�ུ་འབད་..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr "པི་ཀེ་སི་ཨེསི་ ༡༢ ཡིག་སྣོད་ག་ར་ "
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "ཡིག་སྣོད་ ཆ་མཉམ་ "
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "ལག་�ྱེར་གྱི་མིང་�"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "དགོས་དོན�"
 
-#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/certificate-manager.c:289
 #: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "གོ་རིམ་ཨང་�"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "དུས་ཡོལ་འགྱོ�་ཨིན�"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr "གློག་འཕྲིན་ ལག་�ྱེར་གྱི་ ཡིག་སྣོད་ག་ར་ "
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "གློག་འཕྲིན་�་བྱང་�"
 
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr " སི་ཨེ་ ལག་�ྱེར་གྱི་ ཡིག་སྣོད་ག་ར་ "
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ལག་�ྱེར་མ�ོང་བྱེད་: %s"
 
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s'གི་དོན་ལས་ ཆོག་ཡིག་བཙུགས�"
-
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -18491,7 +19015,7 @@ msgid "_Edit CA Trust"
 msgstr "སི་ཨེ་བློ་ག�ད་ ཞུན་དག་ར�ྱབས� (_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:679
 msgid "Certificate already exists"
 msgstr "ལག་�ྱེར་ ཧེ་མ་ལས་འདུག"
 
@@ -18675,30 +19199,6 @@ msgstr "ཡིག་སྣོད་པི་ཀེ་སི་ཨེསི་ à¼
 msgid "Imported Certificate"
 msgstr "ནང་འདྲེན་འབད་བའི་ལག་�ྱེར�"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "�་ས�ོང་བར�ྱབ་ནིའི་མཉམ་སྦྲགས�"
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "མཉམ་སྦྲགས་ཀྱི་ ནང་དོན་དབྱེ་བ�"
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "ཡིག་འཕྲིན་ནང་ བཀྲམ་སྟོན་འབད་ནིའི་ ཡིག་སྣོད་ཀྱི་མིང་�"
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "མཉམ་སྦྲགས་ཀྱི་ འགྲེལ་བཤད�"
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "སྔོན་སྒྲིག་གིས་ ཨིན་ལ་ཡིན་ནང་སྟོན་ནིའི་ མཉམ་སྦྲགས་ཚུ་ལུ་ རྟགས་བཀལ�"
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "འཕྲིན་དོན་གྱི་དོན་ལུ་ སྔོན་སྒྲིག་དོན་ཚན�"
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -18828,6 +19328,10 @@ msgstr "སེལ་འ�ུ་འབད་མི་སྣོད་འཛིན
 msgid "S_ave Address Book As VCard"
 msgstr "�་བྱང་ཀི་དེབ་དེ་ �ི་ཤོག་བྱང་སྦེ་སྲུངས�(_a)"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "�ི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུངས�..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "སེལ་འ�ུ་འབད་མི་ འབྲེལ་ས་ཚུ་ �ི་ཤོག་བྱང་བཟུམ་ཅིག་སྦེ་ སྲུང་བཞག་འབད�"
@@ -18837,7 +19341,7 @@ msgid "Save the contacts of the selected folder as VCard"
 msgstr "སེལ་འ�ུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ �ི་ཤོག་བྱང་སྦེ་སྲུངས�"
 
 #: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "ཆ་མཉམ་སེལ་འ�ུ་འབད�"
 
@@ -18915,7 +19419,7 @@ msgid "_Move Folder Contacts To"
 msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྤོ་བཤུད་འབད་ས་...(_M)"
 
 #: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_New"
 msgstr "གསརཔ� (_N)"
 
@@ -19128,20 +19632,20 @@ msgid "I_nsert"
 msgstr "བཙུགས� (_n)"
 
 #: ../ui/evolution-editor.xml.h:15
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "མཉམ་སྦྲགས་...(_A)"
 
 #: ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:50
 #: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "�་བསྡམས�་(_C)"
 
 #: ../ui/evolution-editor.xml.h:19
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11
 #: ../ui/evolution.xml.h:42
@@ -19149,7 +19653,8 @@ msgid "_File"
 msgstr "ཡིག་སྣོད� (_F)"
 
 #: ../ui/evolution-editor.xml.h:20
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "གྲོགས་རམ� (_H)"
 
@@ -19212,100 +19717,104 @@ msgid "R_ole Field"
 msgstr "ལས་འགན་ས་སྒོ� (_o)"
 
 #: ../ui/evolution-event-editor.xml.h:16
+msgid "Send _Options"
+msgstr "གདམ་�་ཚུ་ག�ང་(_O)"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "ཆུ་ཚོད་�ོམ་མེད་སྦེ་སྟོན� (_b)"
 
-#: ../ui/evolution-event-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:18
 #: ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "ཆུ་ཚོད་ཀྱི་གླིང་སྡེ� (_Z) "
 
-#: ../ui/evolution-event-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:19
 #: ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "ངོ་འཛོམས་པའི་དབྱེ་བའི་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:20
 #: ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ངོས་ལན་གྱི་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:21
 #: ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "ལས་འགན་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:22
 #: ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "གནས་ཚད་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:23
 #: ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "ཆུ་ཚོད་གླིང་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 #: ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "དབྱེ་རིམ་ཚུ་ བཀྲམ་སྟོན་འབད་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "ཉིནམ་གང་གི་བྱུང་ལས་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "ཆུ་ཚོད་�ོམ་མེད་སྦེ་ སྟོན་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "འཇིགས་བརྡ་ཚུ�(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27
+#: ../ui/evolution-event-editor.xml.h:28
 #: ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "དབྱེ་རིམ� (_C)"
 
-#: ../ui/evolution-event-editor.xml.h:28
+#: ../ui/evolution-event-editor.xml.h:29
 #: ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "དབྱེ་བཟོ� (_C)"
 
-#: ../ui/evolution-event-editor.xml.h:29
+#: ../ui/evolution-event-editor.xml.h:30
 #: ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "གསང་བའི�(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "དལ�/�ོམ་མེད་: (_F)"
 
-#: ../ui/evolution-event-editor.xml.h:31
+#: ../ui/evolution-event-editor.xml.h:32
 #: ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "སྒེར་དོན�(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:32
+#: ../ui/evolution-event-editor.xml.h:33
 #: ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "ངོས་ལན�(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "སླར་འབྱུང་�(_R)"
 
-#: ../ui/evolution-event-editor.xml.h:34
+#: ../ui/evolution-event-editor.xml.h:35
 #: ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "གནས་ཚད་ས་སྒོ�: (_S)"
 
-#: ../ui/evolution-event-editor.xml.h:35
+#: ../ui/evolution-event-editor.xml.h:36
 #: ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "དབྱེ་བའི་ས་སྒོ� (_T)"
@@ -19331,80 +19840,96 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "ཡིག་འཕྲིན་གསརཔ་ འཚག་ནིའི་དོན་ལུ་ ལམ་ལུགས་གསར་བས�ྲུན་འབད་ ཡང་ཅིན་ ཞུན་དག་ར�ྱབས�"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr "གློག་ལམ་མེདཔ་ད་གི་དོན་ལུ་ རྟགས་བཀལ་ཡོད་པའི་ རྩིས་�ོ/སྣོད་འཛིན་ཚུ་གི་ འཕྲིན་དོན་ཚུ་ ཕབ་ལེན་འབད་ "
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "ཕྱགས་ཧོད་སྟོངམ་བ�ོན� (_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:9
 #: ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "སྣོད་འཛིན� (_o)"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "སེལ་འ�ུ་འབད་མི་སྣོད་འཛིན་་ཚུ་ སྣོད་འཛིན་གཞན་མི་ནང་ སྤོ་བཤུད་འབད�"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "སྣོད་འཛིན་ཆ་མཉམ་ནང་ལས་ བ�ོན་ག�ང་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་ག�ང་�"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "སྣོད་འཛིན་ཚུ་ འཚོལ་ཞིབ་འབད�(_o)"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "འཕྲིན་དོན་སྔོན་ལྟ་སྟོན�(_P)"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "འཕྲིན་དོན་སྔོན་ལྟ་ འཕྲིན་དོན་�ོ་ཡིག་གི་འོག་ལུ་སྟོན�"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../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:16
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "འཕྲིན་དོན་སྔོན་ལྟའི་ སྒོ་སྒྲིག་སྟོན�"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "�ག་རིང་སར་བར་གུ་ སྣོད་འཛིན་ཚུ་ མ�ོ་མངགས་འབད་བའམ་ མངགས་བཤོལ་འབད�"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "ལོག་ འཕྲིན་དོན་ཚུ་གི་དོན་ལུ་ ར�ྱེན་སེལ་ མ་སྒྲོམ་ཚུ་ སྟོན་ "
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "སྔོན་སྲོལ་མ�ོང་སྣང་�(_C)"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "སྣོད་འཛིན་ཚུ་ འདྲ་བཤུས་ར�ྱབས་ས་...(_C)"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "ར�ྱེན་སེལ་དྲན་དེབ་ཚུ་  (_D)"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "གློག་ལམ་མེདཔ་ད་བདེ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ འཕྲིན་དོན་ཚུ་ ཕབ་ལེན་འབད་ (_D)"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ�(_F)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "སྣོད་འཛིན་སྤོ་བཤུད་འབད་ས་...(_M)"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "གསརཔ་...(_N)"
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "སྔོན་ལྟ�(_P)"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "མ�ོ་མངགས་དངུལ�(_S)"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "ཀེར་ཕྲང་མ�ོང་སྣང་�(_V)"
 
@@ -19466,62 +19991,82 @@ msgid "Mar_k All Messages as Read"
 msgstr "འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ རྟགས་བཀལ� (_k)"
 
 #: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "སྣོད་འཛིན་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ལུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "འཛིན་པང་ནང་ལས་ འཕྲིན་དོན་སྦྱར�"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "སྣོད་འཛིན་འདི་ནང་ལས་ བ�ོན་ག�ང་མི་ འཕྲིན་དོན་ཚུ་ཆ་མཉམ་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་ག�ང་�"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "སྣོད་འཛིན་འདི་ རྟག་བརྟན་སྦེ་ རྩ་བས�ྲད་ག�ང་�"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr "ཡང་སེལ་འབད་ (_F)"
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "སྣོད་འཛིན་ ཡང་སེལ་འབད་"
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "འཕྲིན་དོན་  ཡན་ལག་ �ེ་རེཌི་ སེལ་འ�ུ་འབད་ (_U)"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "འཕྲིན་དོན་གྱི་�ེརེཌི་ སེལ་འ�ུ་འབད� (_T)"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "འཕྲིན་དོན་ཆ་མཉམ་ སེལ་འ�ུ་འབད�(_A)"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "ད་ལྟོ་སེལ་འ�ུ་འབད་འ�ུ་མ་འབད་མི་ འཕྲིན་དོན་ཉག་ར�ྱང་ ཆ་མཉམ་རང་སེལ་འ�ུ་འབད�"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../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:24
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr "ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོད་པའི་འཕྲིན་དོན་ལུ་ ལན་གསལ་ག་ར་ སེལ་འ�ུ་འབད་ "
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "མ�ོང་ཚུགས་པའི་ འཕྲིན་དོན་ཆ་མཉམ་ སེལ་འ�ུ་འབད�"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "སྦ་སྟེ་བཞག་མི་ འཕྲིན་དོན་ཚུ་སྟོན�(_n)"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "གནས་ས�བས་ཅིག་གི་དོན་ལུ་ སྦ་སྟེ་ཡོད་མི་ འཕྲིན་དོན་ཚུ་སྟོན�"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "ལྷག་ཚར་མི་ འཕྲིན་དོན་ཆ་མཉམ་ གནས་ས�བས་ཅིག་གི་དོན་ལུ་སྦ་བཞག"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "སེལ་འ�ུ་འབད་མི་ འཕྲིན་དོན་ཚུ་ གནས་ས�བས་ཅིག་གི་དོན་ལུ་སྦ་བཞག"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "�ེ་རེཌི་འབད་མི་ འཕྲིན་དོན་�ོ་ཡིག"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "�ེ་རེཌི་�ོག་ལས་ སྡེ་ཚན་བཟོ�(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:32
+#: ../ui/evolution-mail-list.xml.h:37
 #: ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
@@ -19825,8 +20370,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "ཡིག་ག�ོང་�ོ་ཡིག་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་...(_L)"
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "ལེན་མ�ན་ཚུ་ལས་ ་སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་..."
+msgid "Search Folder from Recipien_ts..."
+msgstr "ལེན་མ�ན་ཚུ་ལས་ ་སྣོད་འཛིན་འཚོལ་ཞིབ་འབད་...(_T)"
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -19849,6 +20394,7 @@ msgid "Select all the text in a message"
 msgstr "འཕྲིན་དོན་ཅིག་ནང་གི་ ཚིག་ཡིག་ཆ་མཉམ་ སེལ་འ�ུ་འབད�"
 
 #: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "�ྱོད་རའི་ད་ལྟོའི་དཔར་འཕྲུལ་གྱི་དོན་ལས་ ཤོག་ལེབ་གཞི་སྒྲིག་འབད�"
 
@@ -19952,23 +20498,28 @@ msgstr "ཧེ་མའི་འཕྲིན་དོན� (_P)"
 msgid "_Quoted"
 msgstr "འདྲེན་རྟགས་ནང་བཀོད་ཡོདཔ�(_Q)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "ལྷག(_R)"
+
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Save Message..."
 msgstr "འཕྲིན་དོན་སྲུངས་...(_S)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete Message"
 msgstr "འཕྲིན་དོན་བ�ོན་བཤོལ� (_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Unread"
 msgstr "མ་ལྷགཔ�(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom"
 msgstr "རྒྱས་ཟུམ�(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
 msgid "_Zoom In"
 msgstr "ཕྱིར་རྒྱས�(_Z)"
 
@@ -19978,7 +20529,7 @@ msgid "Close this window"
 msgstr "སྒོ་སྒྲིག་འདི་ �་བསྡམས�"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "ལག་ཆས་ཕྲ་རིང་གཙོ་བོ�"
 
@@ -20070,144 +20621,164 @@ msgid "PGP Sign"
 msgstr "པི་ཇི་པི་ མིང་རྟགས་བཀོད�"
 
 #: ../ui/evolution-message-composer.xml.h:17
+msgid "PGP _Encrypt"
+msgstr "པི་ཇི་པི་ གསང་བ་བཟོ ་(_E)"
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "PGP _Sign"
+msgstr "པི་ཇི་པི་ མིང་རྟགས་ (_S)"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཀྱི་ཞུ་བ་འབད�(_e)"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "S/MIME En_crypt"
+msgstr "ཨེསི་/མ་ཡིམ་ གསང་བ་བཟོ་ (_C)"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "ཨེསི་/མ་ཡིམ་ གསང་བ་བཟོ�"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "S/MIME Sig_n"
+msgstr "ཨེསི་/མ་ཡིམ་ མིང་རྟགས་བཀོད (_S)"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "ཨེསི་/མ་ཡིམ་ མིང་རྟགས་བཀོད�"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "S_end"
+msgstr "ག�ང་ (_S)"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "དེ་སྦེ་ སྲུངས�"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "ཟིན་བྲིས་སྲུངས� "
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "དེ་སྦེ་ སྲུངས་...(_A)"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "ཟིན་བྲིས་ སྲུངས� (_D)"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "ཟིན་བྲིས་བཟུམ་སྦེ་སྲུངས� "
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "སྣོད་འཛིན་ནང་སྲུངས་..."
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "ད་ལྟོའི་ཡིག་སྣོད་སྲུངས�"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "ད་ལྟོའི་ཡིག་སྣོད་དེ་ མིང་གཞན་ཅིག་གི་�ོག་ལས་སྲུངས�"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "འཕྲིན་དོན་དེ་ གསལ་བཀོད་འབད་མི་ སྣོད་འཛིན་ཅིག་ནང་སྲུངས�"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "བ�ང་�"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "ཡིག་འཕྲིན་འདི་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྩ་སྒྲིག་ནང་ག�ང་�"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "ཡིག་འཕྲིན་འདི་ག�ང་�"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་མ�ོ་སར་གཞི་སྒྲིག་འབད�"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "འཕྲིན་དོན་འདི་ �ྱོད་རའི་པི་ཇི་པི་ ལྡེ་མིག་གིས་ མིང་རྟགས་བཀོད�"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "འཕྲིན་དོན་འདི་ �ྱོད་རའི་ ཨེསི་/མ་ཡིམ་ལག་�ྱེར་གྱིས་ མིང་རྟགས་བཀོད�"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "སི་སི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "བྱུང་ཡུལ་སེལ་བྱེདདེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "གནས་བས�ྱོད་ཡུལ་གྱི་ ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ལན་གསལ་ག�ང་ཡུལ་གྱི་ ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "ག�ང་ཡུལ་གྱི་་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབད�་ཨིན�"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "མ�ོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ས་སྒོ� (_B)"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "སི་སི་ས་སྒོ� (_C)"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "ཆ་མཉམ་བ�ོན་ག�ང་� (_D)"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "བྱུན་ཡུལ་ས་སྒོ� (_F)"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "�་ཕྱེ་...(_O)"
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "ས་སྒོ་ལུ་གནས་བས�ྱོད་འབད� (_P)"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "འཕྲིན་དོན་གཙོ་རིམ་བཟོ�(_P)"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "ས་སྒོ་ལུ་-ལན་གསལ་ག�ང་� (_R)"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "སྲུང་ས�ྱོབ� (_S)"
 
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "གདམ་�་ཚུ་ག�ང་�(_S)"
 
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "ས་སྒོ་ལུ� (_T)"
 
@@ -20363,81 +20934,89 @@ msgid "Display window buttons with text only"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ ཚིག་ཡིག་ར�ྱངམ་དང་སྦྲགས་�ེ་ བཀྲམ་སྟོན་འབད�"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨེཕ་ཨེ་ཀིའུ� (_F)"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "ལས་རིམ་དེ་ ཕྱིར་འ�ོན་འབད�"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "སེམས་�ར་བཞག་མི་ ཆོག་ཡིག་ཚུ་ སེམས་�ར་མ་བཞག་པ་ཅིན་ དེ་གི་དོན་ལུ་ �ྱོད་ལུ་ལོག་སྟེ་རང་ ནུས་སྤེལ་འབད་འོང་�"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་སྦ་བཞག"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "ནང་འདྲེན་འབད་...(_m)"
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
-msgstr "ངོས་དཔར་དང་ཚིག་ཡིག (_a)"
-
 #: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr "ངོས་དཔར་དང་ཚིག་ཡིག་ (_A)"
+
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "ལས་རིམ་གཞན་ཚུ་ནང་ལས་ གནད་སྡུད་ནང་འདྲེན་འབད�"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "སྒྲིག་བཀོད� (_o)"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "སྒོ་སྒྲིག་གསརཔ� (_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "འཕྲལ་འཕྲལ་རང་ འདྲི་ཡོད་པའི་དྲི་བའི་ �ེབ་ཤོག་ལེབ་ �་ཕྱེ་ "
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "ཤོག་ལེབ་གཞི་སྒྲིག... (_U)"
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "དགའ་གདམ་ཚུ� (_n)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "ག�ོང་/ལེན�"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "ག�ོང་/ལེན�(_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "གྲལ་རིམ་ནང་ཡོད་མི་ རྣམ་གྲངས་ཚུ་ ག�ང་ཞིནམ་ལས་ རྣམ་གྲངས་གསརཔ་ཚུ་ སླར་འདྲེན་འབད�"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "པའི་ལོཊི་གི་རིམ་སྒྲིག་ གཞི་སྒྲིག་འབད�"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "ཟུར་�འི་ཕྲ་རིང་སྟོན�(_B)"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "གནས་ཚད་ཕྲ་རིང་སྟོན�(_S)"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "ལག་ཆས་ཕྲ་རིང་སྟོན� (_T)"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ས�ོར་ལས་ བརྡ་དོན་ཚུ་སྟོན�"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "ར�ྱེན་གྱི་སྙན་ཞུ་བཙུགས�"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "ར�ྱེན་གྱི་སྙན་ཞུ་བཙུགས� (_B)"
@@ -20451,8 +21030,8 @@ msgid "Toggle whether we are working offline."
 msgstr "ང་བཅས་ ཨོཕ་ལ་ཡིན་ནང་ ལཱ་འབད�་ཨིནམ་མེནམ་ སོར་སྟོན་འབད�་ཨིན�"
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
-msgstr "ལག་ཆས་ ཕྲ་རིང་གི་ བཟོ་རྣམ� (_b)"
+msgid "Tool_bar Style"
+msgstr "ལག་ཆས་ ཕྲ་རིང་གི་ བཟོ་རྣམ་(_b)"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -20474,35 +21053,39 @@ msgstr "སྒོ་སྒྲིག་�་བསྡམས�(_C)"
 msgid "_Forget Passwords"
 msgstr "ཆོག་ཡིག་ཚུ་སེམས་�ར་མ་བཞག (_F)"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "ཨེབ་རྟ་ཚུ་ སྦ་བཞག (_H)"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "འཕྲལ་འཕྲལ་རང་ འདྲི་ཡོད་པའི་དྲི་བ་ཚུ་ (_F)"
 
 #: ../ui/evolution.xml.h:46
-msgid "_Icons only"
-msgstr "ངོས་དཔར་ར�ྱངམ་གཅིག (_I)"
+msgid "_Hide Buttons"
+msgstr "ཨེབ་རྟ་ཚུ་ སྦ་བཞག་ (_H)"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
+msgstr "ངོས་དཔར་ར�ྱངམ་ཅིག (_I)"
+
+#: ../ui/evolution.xml.h:49
 msgid "_Quick Reference"
 msgstr "འཕྲལ་མྱུར་གཞི་བསྟུན� (_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quit"
 msgstr "སྤངས�(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Switcher Appearance"
 msgstr "སོར་སྒྱུར་འབད་མིའི་འབྱུང་སྣང་�(_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Synchronization Options..."
 msgstr "མཉམ་འབྱུང་གི་གདམ་�་ཚུ་...(_S)"
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
-msgstr "ཚིག་ཡིག་ར�ྱངམ� (_T"
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
+msgstr "ཚིག་ཡིག་ར�ྱངམ་ཅིག་ (_T)"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:55
 msgid "_Window"
 msgstr "སྒོ་སྒྲིག (_W)"
 
@@ -20515,8 +21098,9 @@ msgid "_Address Cards"
 msgstr "�་བྱང་ཤོག་བྱང་� (_A)"
 
 #: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "བརྒྱུད་འཕྲིན་�ོ་ཡིག (_P)"
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "�ོ་ཡིག་གི་མ�ོང་སྣང་� (_L)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20526,10 +21110,6 @@ msgstr "བདུན་ཕྲག་གི་མ�ོང་སྣང་� (_e)"
 msgid "_Day View"
 msgstr "གཟའི་མ�ོང་སྣང་� (_D)"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "�ོ་ཡིག་གི་མ�ོང་སྣང་� (_L)"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "ཟླ་བའི་མ�ོང་སྣང་� (_M)"
@@ -20582,12 +21162,12 @@ msgstr "རན་པའི་ཚེས་གྲངས་དང་བཅས� (_
 msgid "With _Status"
 msgstr "གནས་ཚད་དང་བཅས� (_S)"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
-#: ../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:241
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
 msgid "UTC"
 msgstr "ཡུ་ཊི་སི�"
 
@@ -20613,19 +21193,19 @@ msgid ""
 "Use the right mouse button to zoom out."
 msgstr "ས་�ྲའི་ས་�ོངས་ཅིག་ནང་ནང་ཟུམ་སྦེ་ དུས་ཚོད་གླིང་སྡེ་ཅིག་ སེལ་འ�ུ་འབད་ནིའི་དོན་ལུ་ མའུསི་གི་ ཨེབ་རྟ་གཡོནམ་ ལག་ལེན་འ�བ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "བསྡུ་ལེན�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%sགི་དོན་ལུ་ མ�ོང་སྣང་ངེས་འཛིན་འབད�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "མ�ོང་སྣང་ངེས་འཛིན་འབད�"
 
@@ -20634,22 +21214,18 @@ msgstr "མ�ོང་སྣང་ངེས་འཛིན་འབད�"
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" གི་དོན་ལུ་ མ�ོང་སྣང་ངེས་འཛིན་འབད�"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "ཞུན་དག་...(_E)"
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1922
+#: ../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:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
 msgid "Instance"
 msgstr "དུས་ས�བས�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
 msgid "Save Current View"
 msgstr "ད་ལྟོའི་མ�ོང་སྣང་སྲུངས�"
 
@@ -20662,17 +21238,17 @@ msgid "_Replace existing view"
 msgstr "གནས་བཞིན་པའི་མ�ོང་སྣང་གི་ཚབ་བཙུགས�(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "སྲོལ་སྒྲིག་མ�ོང་སྣང་�"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "སྲོལ་སྒྲིག་མ�ོང་སྣང་སྲུངས�"
 
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "མ�ོང་སྣང་ངེས་འཛིན་འབད་..."
 
@@ -20680,15 +21256,32 @@ msgstr "མ�ོང་སྣང་ངེས་འཛིན་འབད་..."
 msgid "C_urrent View"
 msgstr "ད་ལྟོའི་མ�ོང་སྣང་�(_u)"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "མ�ོང་སྣང་: %s སེལ་འ�ུ་འབད་ "
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "ད་ལྟོའི་མ�ོང་་སྣང་འདི་ སྲོལ་སྒྲིག་འབད་འབད་བའི་ མ�ོང་སྣང་ཅིག་ཨིན་ "
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "སྲོལ་སྒྲིག་མ�ོང་སྣང་སྲུངས་..."
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "ད་ལྟོའི་སྲོལ་སྒྲིག་ མ�ོང་སྣང་ སྲུང་བཞག་འབད་ "
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "མ�ོང་སྣང་ཚུ་ གསར་བས�ྲུན་ ཡང་ན་ ཞུན་དག་འབད་ "
+
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "འཕྲུལ་�ང་�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "མ�ོང་སྣང་གསརཔ་ངེས་འཛིན་འབད�"
 
@@ -20704,19 +21297,43 @@ msgstr "མ�ོང་སྣང་གི་དབྱེ་བ�"
 msgid "Type of view:"
 msgstr "མ�ོང་སྣང་གི་དབྱེ་བ་:"
 
+#: ../widgets/misc/e-attachment-bar.c:1028
+msgid "Attachment Bar"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་�"
+
+#: ../widgets/misc/e-attachment.c:317
+#: ../widgets/misc/e-attachment.c:332
+#: ../widgets/misc/e-attachment.c:533
+#: ../widgets/misc/e-attachment.c:550
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "ཡིག་སྣོད་%s: %sམཉམ་སྦྲགས་འབད་མ་ཚུགས�"
+
+#: ../widgets/misc/e-attachment.c:325
+#: ../widgets/misc/e-attachment.c:542
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "ཡིག་སྣོད་%s: མཉམ་སྦྲགས་འབད་མི་ཚུགས་པས� དུས་རྒྱུན་གྱི་ཡིག་སྣོད་ཅིག་མེན་པས�"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "མཉམ་སྦྲགས་ཀྱི་རྒྱུ་དངོས་ཚུ�"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "ཡིག་སྣོད་མིང་:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "མ་ཡིམ་གྱི་དབྱེ་བ:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "མཉམ་སྦྲགས་རང་བཞིན་གྱིས་ བཀྲམ་སྟོན་འབད་ནིའི་ བསམ་འཆར་བཀོད�"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "ཨེམ་ཊི་ཌབ་ལུ་ཊི་ཨེཕ་ཨེསི་ཨེསི�"
-
 #. 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:1077
+#: ../widgets/misc/e-calendar-item.c:1726
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20724,86 +21341,78 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "ཟླ་བའི་ཟླ་�ོ�"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458
-#: ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../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
 msgid "Fill color"
 msgstr "ཚོས་གཞི་བཀང་�"
 
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472
-#: ../widgets/text/e-entry.c:1242
-#: ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250
-#: ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589
-#: ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../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
 msgid "GDK fill color"
 msgstr "ཇི་ཌི་ཀེ་གིས་བཀང་བའི་ཚོས་གཞི�"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257
-#: ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../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
 msgid "Fill stipple"
 msgstr "ཚག་�ིག་བཀང་�"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "ཨེགསི་༡"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "ཨེགསི་༢�"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "�འི་༡"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "�འི་༢�"
 
-#: ../widgets/misc/e-canvas-vbox.c:102
-#: ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/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:3071
 msgid "Minimum width"
 msgstr "རྒྱ་ཚད་ཉུང་མ�འ�"
 
-#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../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:3072
 msgid "Minimum Width"
 msgstr "ཉུང་མ�འི་རྒྱ་ཚད�"
 
-#: ../widgets/misc/e-canvas-vbox.c:114
-#: ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "བར་སྟོང་བཞག་�ངས�"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:233
 msgid "Now"
 msgstr "ད་ལྟོ�"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:797
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ཆུ་ཚོད་དེ་ རྩ་སྒྲིག%sནང་འོང་དགོ"
@@ -20812,137 +21421,133 @@ msgstr "ཆུ་ཚོད་དེ་ རྩ་སྒྲིག%sནང་འོ
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "བརྒྱ་ཆའི་བེ་ལུ་དེ་ ༠ དང་ ༡༠༠ གཉིས་བརྩིས་�ེ་ དེ་གཉིས་ཀྱི་བར་ན་འོང་དགོ"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr "ཨ་ར་བིཀ་ "
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "བཱལ་ཊིཀ�"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "དབུས་ ཡུ་རོ་པི་ཡཱན�"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "ཅའི་ནིསི�"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "སི་རི་ལིཀ�"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "གིརིཀ�"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "ཧེབ་བིརིའུ་�"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "ཇ་པ་ནིསི�"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "ཀོ་རི་ཡཱན�"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "�ཱའི�"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "ཊར་ཀིཤ�"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "ཡུ་ནི་ཀོཌི�"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "�ེསི་ཊརན་ ཡུ་རོ་པི་ཡཱན�"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "�ེསི་ཊརན་ ཡུ་རོ་པི་ཡཱན་ གསརཔ�"
 
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
-msgid "Traditional"
-msgstr "སྔོན་སྲོལ་གྱི�"
-
 #: ../widgets/misc/e-charset-picker.c:97
 #: ../widgets/misc/e-charset-picker.c:98
 #: ../widgets/misc/e-charset-picker.c:99
+msgid "Traditional"
+msgstr "སྔོན་སྲོལ་གྱི�"
+
 #: ../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
 msgid "Simplified"
 msgstr "འཇམ་སམ་བཟོ་བཟོ��"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "ཡུཀ་རའི་ནི་ཡཱན�"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "�ི་ཤུ་ཡེལ�"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "མ་ཤེས་པའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་%s�"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "ཡིག་འབྲུའི་ ཨིན་ཀོ་ཌིང་�"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "ལག་ལེན་གྱི་དོན་ལུ་ ཡིག་འབྲུའི་གཞི་སྒྲིག་བཙུགས�"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "གཞན་...�"
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "ཡིག་འབྲུའི་ཨིན་ཀོ་ཌིང་�(_a)"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Date and Time"
 msgstr "ཚེས་གྲངས་དང་ཆུ་ཚོད�"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
 msgid "Text entry to input date"
 msgstr "ཨིན་པུཊི་ ཚེས་གྲངས་ནང་ ཚིག་ཡིག་གི་�ོ་བཀོད�"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
 msgid "Click this button to show a calendar"
 msgstr "ཟླ་�ོ་ཅིག་ སྟོན་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ ཨེབ་ག�ང་འབད�"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
 msgid "Combo box to select time"
 msgstr "ཆུ་ཚོད་སེལ་འ�ུ་འབད་ནིའི་བརྟག་སྒྲོམ�"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "ཆུ་ཚོད�"
-
-#: ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-dateedit.c:486
 msgid "No_w"
 msgstr "ད་ལྟོ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:492
 msgid "_Today"
 msgstr "ད་རིས�(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1630
+#: ../widgets/misc/e-dateedit.c:1657
 msgid "Invalid Date Value"
 msgstr "ནུས་མེད་ཚེས་གྲངས་གནས་གོང་"
 
-#: ../widgets/misc/e-dateedit.c:1656
+#: ../widgets/misc/e-dateedit.c:1686
 msgid "Invalid Time Value"
 msgstr "ནུས་མེད་ཆུ་ཚོད་གནས་གོང་"
 
@@ -20979,12 +21584,12 @@ msgid "A widget to display in place of the usual expander label"
 msgstr "སྤྱིར་བ�ང་རྒྱ་ས�ྱེད་པའི་ �་ཡིག་ཚབ་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་ �ི་གེཊི་ཅིག"
 
 #: ../widgets/misc/e-expander.c:223
-#: ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3356
 msgid "Expander Size"
 msgstr "རྒྱ་ས�ྱེད་པའི་ཚད�"
 
 #: ../widgets/misc/e-expander.c:224
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-tree.c:3357
 msgid "Size of the expander arrow"
 msgstr "རྒྱ་ས�ྱེད་པའི་ མདའ་རྟགས་ཀྱི་ཚད�"
 
@@ -20997,66 +21602,66 @@ msgid "Spacing around expander arrow"
 msgstr "རྒྱ་ས�ྱེད་པའི མདའ་རྟགས་མ�འ་ས�ོར་ལུ་ བར་སྟོང་བཞག་�ངས�"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129
-#: ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:292
-#: ../widgets/misc/e-filter-bar.c:728
+#: ../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
 msgid "Advanced Search"
 msgstr "མ�ོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ�"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "འཚོལ་ཞིབ་སྲུངས�"
 
-#: ../widgets/misc/e-filter-bar.c:252
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "འཚོལ་ཞིབ་ཚུ� (_S)"
 
-#: ../widgets/misc/e-filter-bar.c:254
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "འཚོལ་ཞིབ་ཚུ� "
 
-#: ../widgets/misc/e-filter-bar.h:100
-#: ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "འཚོལ་ཞིབ་སྲུངས་...(_S)"
 
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "སྲུང་བཞག་འབད་མི་ འཚོལ་ཞིབ་ཚུ་ ཞུན་དག་ར�ྱབས་...(_E)"
 
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "མ�ོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ་...(_A)"
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "རྩིས་�ོ་ཆ་མཉམ�"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "ད་ལྟོའི་རྩིས་�ོ�"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "ད་ལྟོའི་སྣོད་འཛིན�"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "ད་ལྟོའི་འཕྲིན་དོན�"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
 msgid "Choose Image"
 msgstr "གཟུགས་བརྙན་ གདམ་�་ར�ྱབས�"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:626
 msgid "World Map"
 msgstr "འཛམ་གླིང་ས་�ྲ�"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:628
 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
 msgstr "དུས་ཚོད་གླིང་སྡེ་ སེལ་འ�ུ་འབད་འ�ུའི་དོན་ལུ་ མའུསི་ལུ་བརྟེན་པའི་ ཕན་ཚུན་འབྲེལ་བའི་ ས་�ྲའི་�ི་གེཊི�"
 
@@ -21072,82 +21677,92 @@ msgstr "སྒེར་གྱི་དྲན་à½�ོ་ཚུ་ མཉམ་à½
 msgid "Sync Categories:"
 msgstr "དབྱེ་རིམ་ཚུ་ མཉམ་འབྱུང་འབད་:"
 
-#: ../widgets/misc/e-reflow.c:1451
-#: ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448
+#: ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "འཕྲིན་དོན་སྟོངམ་བ�ོན�"
 
-#: ../widgets/misc/e-reflow.c:1458
-#: ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455
+#: ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "སླར་འབབ་ཀྱི་དཔེ�"
 
-#: ../widgets/misc/e-reflow.c:1465
-#: ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462
+#: ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "ཀེར་�ིག་གི་རྒྱ་ཚད�"
 
-#: ../widgets/misc/e-search-bar.c:598
+#: ../widgets/misc/e-search-bar.c:349
+#: ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Search"
+msgstr "འཚོལ་ཞིབ་འབད་ "
+
+#: ../widgets/misc/e-search-bar.c:349
+#: ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Click here to change the search type"
+msgstr "འཚོལ་ཞིབ་ཀྱི་དབྱེ་བ་ སོར་ནིའི་དོན་ལུ་ ནཱ་ལུ་ ཨེབ་ག�ང་འབད་ "
+
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
 msgstr "འཚོལ་ཞིབ་འབད� (_S)"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Find Now"
 msgstr "ད་ལྟོ་རང་འཚོལ� (_F)"
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Clear"
 msgstr "བསལ� (_C)"
 
-#: ../widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:872
 msgid "Item ID"
 msgstr "རྣམ་གྲངས་གྱི་ཨའི་ཌི"
 
-#: ../widgets/misc/e-search-bar.c:863
-#: ../widgets/text/e-entry.c:1221
-#: ../widgets/text/e-entry.c:1222
-#: ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:879
+#: ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:997
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "སྟོན་:(_w)"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1014
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "འཚོལ་ཞིབ་:(_c)"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1042
 msgid " i_n "
 msgstr "ནང་ན�(_n)"
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "འོད་རྟགས་གྲལ་�ིག"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "འོད་རྟགས་ཀེར་�ིག"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "དབྱེ་སེལ་འབད་མི�"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "སེལ་འ�ུའི་�བས་ལམ�"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "འོད་རྟགས་�བས་ལམ�"
 
@@ -21284,14 +21899,14 @@ msgid "_When opened:"
 msgstr "ནམ་�་ཕྱེ་ཡོདཔ� (_W)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:297
 #, 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:214
+#: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ཡོངས་བསྒྲུབས�)"
@@ -21316,180 +21931,170 @@ msgstr "འ�ོབ་ཚུགས་པའི་དབྱེ་རིམ་: (
 msgid "categories"
 msgstr "དབྱེ་རིམ་ཚུ�"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "�ོ་ཡིག་པོཔ་ཨཔ་འབད�"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:398
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "སེལ་འ�ུ་འབད་མི་ཀེར་�ིག"
 
-#: ../widgets/table/e-cell-pixbuf.c:405
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "ཆེད་དམིགས་འབད་བའི་ཀེར་�ིག"
 
-#: ../widgets/table/e-cell-pixbuf.c:412
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "སེལ་འ�ུ་མ་འབད་མི་ཀེར་�ིག"
 
-#: ../widgets/table/e-cell-text.c:1803
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "ཀེར་�ིག་སྦུག་འབྲེག་འབད�"
 
-#: ../widgets/table/e-cell-text.c:1810
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "ཀེར་�ིག་ལུ་འོག་�ིག་འ�ེན�"
 
-#: ../widgets/table/e-cell-text.c:1817
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "ཀེར་�ིག་རྒྱགས་པ་བཟོ�"
 
-#: ../widgets/table/e-cell-text.c:1824
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "ཀེར་�ིག་ཚོས་གཞང་ག�ང་�"
 
-#: ../widgets/table/e-cell-text.c:1838
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "བི་ཇི་ཚོས་གཞི་འབད་མི་ཀེར་�ིག"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- རྩ་བས�ྲད་ག�ང་�(_R)"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "གནས་ལུགས�"
+
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(ཡར་འཛེགས)"
+
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(མར་འབབ)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "དབྱེ་སེལ་མ་འབད��"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "སྡེ་ཚན་མིན་འདུག"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "ས་སྒོ་ཚུ་སྟོན�"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "འ�ོབ་ཚུགས་པའི་ས་སྒོ་ཚུ�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "འ�ོབ་ཚུགས་པའི་ས་སྒོ་:(_v)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "ཡར་འཛེགས�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "ཆ་མཉམ་བསལ�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1575
+msgid "Clear _All"
+msgstr "ཆ་མཉམ་བསལ་  (_A)"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "མར་འབབ�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "གི་�ོག་ལས་ རྣམ་གྲངས་ཚུ་སྡེ་ཚན་བཟོ�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "མར་སྤོ�(_D)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "ཡར་སྤོ�(_U)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན�(_o)"
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "ས་སྒོ་མ�ོང་སྣང་ནང་སྟོན་(_F)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:562
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "ས་སྒོ་ཚུ་སྟོན�"
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "ས་སྒོ་མ�ོང་སྣང་ནང་སྟོན་(_N)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr "ས་སྒོ་མ�ོང་སྣང་ནང་སྟོན�"
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "ས་སྒོ་མ�ོང་སྣང་ནང་སྟོན་(_V)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "དབྱེ་སེལ�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "རྣམ་གྲངས་�ོག་ལས་དབྱེ་སེལ་འབད��"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "དེ་ལས་"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "�་ས�ོང་ར�ྱབས་->�(_A)"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "ས་སྒོ་ཚུ་སྟོན་ཡོད�(_F)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "དབྱེ་སེལ་...(_S)"
-
-#: ../widgets/table/e-table-config.c:149
-msgid "State"
-msgstr "གནས་ལུགས�"
-
-#: ../widgets/table/e-table-config.c:306
-#: ../widgets/table/e-table-config.c:348
-msgid "(Ascending)"
-msgstr "(ཡར་འཛེགས)"
-
-#: ../widgets/table/e-table-config.c:306
-#: ../widgets/table/e-table-config.c:348
-msgid "(Descending)"
-msgstr "(མར་འབབ)"
-
-#: ../widgets/table/e-table-config.c:313
-msgid "Not sorted"
-msgstr "དབྱེ་སེལ་མ་འབད��"
-
-#: ../widgets/table/e-table-config.c:354
-msgid "No grouping"
-msgstr "སྡེ་ཚན་མིན་འདུག"
-
-#: ../widgets/table/e-table-config.c:583
-msgid "Available Fields"
-msgstr "འ�ོབ་ཚུགས་པའི་ས་སྒོ་ཚུ�"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "�ོག་ལས་སྡེ་ཚན་བཟོ་...(_G)"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "ས་སྒོ་མ�ོང་སྣང་ནང་སྟོན་(_S)"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན་:(_S)"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1872
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "དབྱེ་སེལ་...(_S)"
+
+#: ../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
 msgid "DnD code"
 msgstr "ཌི་ཨེན་ཌི་་ཀོཌི�"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../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
 msgid "Full Header"
 msgstr "མགོ་ཡིག་ཆ་ཚང་�"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "ཀེར་�ིག་ཅིག་་�་ས�ོང་ར�ྱབས་..."
 
@@ -21517,94 +22122,94 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (རྣམ་གྲངས་%d)"
 msgstr[1] "%s (རྣམ་གྲངས་%d)"
 
+#: ../widgets/table/e-table-group-container.c:896
 #: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975
-#: ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3030
 msgid "Alternating Row Colors"
 msgstr "གྲལ་�ིག་གི་ཚོས་གཞི་སྤེལ་མ�"
 
+#: ../widgets/table/e-table-group-container.c:903
 #: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982
-#: ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3269
-#: ../widgets/table/e-tree.c:3270
+#: ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-tree.c:3309
+#: ../widgets/table/e-tree.c:3310
 msgid "Horizontal Draw Grid"
 msgstr "�ད་སྙོམས་ཀྱི་ཌཱ་གིརིཌི�"
 
+#: ../widgets/table/e-table-group-container.c:910
 #: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989
-#: ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3275
-#: ../widgets/table/e-tree.c:3276
+#: ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-tree.c:3315
+#: ../widgets/table/e-tree.c:3316
 msgid "Vertical Draw Grid"
 msgstr "ཀེར་ཕྲང་གི་ཌཱ་གིརིཌི�"
 
+#: ../widgets/table/e-table-group-container.c:917
 #: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996
-#: ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3281
-#: ../widgets/table/e-tree.c:3282
+#: ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-tree.c:3321
+#: ../widgets/table/e-tree.c:3322
 msgid "Draw focus"
 msgstr "ཆེད་དམིགས་བྲིས�"
 
+#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003
-#: ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3058
 msgid "Cursor mode"
 msgstr "འོད་རྟགས་�བས་ལམ�"
 
+#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968
-#: ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3023
 msgid "Selection model"
 msgstr "སེལ་འ�ུའི་དཔེ�"
 
+#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3312
-#: ../widgets/table/e-tree.c:3263
-#: ../widgets/table/e-tree.c:3264
+#: ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table-item.c:3065
+#: ../widgets/table/e-table.c:3307
+#: ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
 msgid "Length Threshold"
 msgstr "རིང་ཚད་ཀྱི་�ེ་རེཤ་ཧཱོལ�"
 
+#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3319
-#: ../widgets/table/e-tree.c:3295
-#: ../widgets/table/e-tree.c:3296
+#: ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table-item.c:3099
+#: ../widgets/table/e-table.c:3314
+#: ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
 msgid "Uniform row height"
 msgstr "གཅིག་མཚུངས་ཀྱི་གྲལ་�ག་མ�ོ་ཚད�"
 
+#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "སྤར་མ་བ�ུབ�"
 
@@ -21613,276 +22218,617 @@ msgid "Customize Current View"
 msgstr "ད་ལྟོའི་མ�ོང་སྣང་སྲོལ་སྒྲིག་འབད�"
 
 #: ../widgets/table/e-table-header-item.c:1473
-msgid "Sort Ascending"
-msgstr "ཡར་འཛེགས་དབྱེ་སེལ་འབད�"
+msgid "Sort _Ascending"
+msgstr "ཡར་འཛེགས་དབྱེ་སེལ་འབད་ (_A)"
 
 #: ../widgets/table/e-table-header-item.c:1474
-msgid "Sort Descending"
-msgstr "མར་འབབ་དབྱེ་སེལ་འབད�"
+msgid "Sort _Descending"
+msgstr "མར་འབབ་དབྱེ་སེལ་འབད་ (_D)"
 
 #: ../widgets/table/e-table-header-item.c:1475
-msgid "Unsort"
-msgstr "དབྱེ་སེལ་བཤོལ�"
+msgid "_Unsort"
+msgstr "དབྱེ་སེལ་བཤོལ་(_U)"
 
 #: ../widgets/table/e-table-header-item.c:1477
-msgid "Group By This Field"
-msgstr "ས་སྒོ་འདི་གི་�ོག་ལས་སྡེ་ཚན་བཟོ�"
+msgid "Group By This _Field"
+msgstr "ས་སྒོ་འདི་གི་�ོག་ལས་སྡེ་ཚན་བཟོ་(_F)"
 
 #: ../widgets/table/e-table-header-item.c:1478
-msgid "Group By Box"
-msgstr "སྒྲོམ་གྱི་�ོག་ལས་སྡེ་ཚན་བཟོ�"
+msgid "Group By _Box"
+msgstr "སྒྲོམ་གྱི་�ོག་ལས་སྡེ་ཚན་བཟོ་(_B)"
 
 #: ../widgets/table/e-table-header-item.c:1480
-msgid "Remove This Column"
-msgstr "ཀེར་�ིག་འདི་རྩ་བས�ྲད་ག�ང་�"
+msgid "Remove This _Column"
+msgstr "ཀེར་�ིག་འདི་རྩ་བས�ྲད་ག�ང་(_C)"
 
 #: ../widgets/table/e-table-header-item.c:1481
-msgid "Add a Column..."
-msgstr "ཀེར་�ིག་ཅིག་�་ས�ོང་ར�ྱབས་..."
+msgid "Add a C_olumn..."
+msgstr "ཀེར་�ིག་ཅིག་�་ས�ོང་ར�ྱབས་...(_O)"
 
 #: ../widgets/table/e-table-header-item.c:1483
-msgid "Alignment"
-msgstr "ཕྲང་སྒྲིག"
+msgid "A_lignment"
+msgstr "ཕྲང་སྒྲིག་(_L)"
 
 #: ../widgets/table/e-table-header-item.c:1484
-msgid "Best Fit"
-msgstr "ལེགས་སྒྲིག"
+msgid "B_est Fit"
+msgstr "ལེགས་སྒྲིག (_E)"
 
 #: ../widgets/table/e-table-header-item.c:1485
-msgid "Format Columns..."
-msgstr "ཀེར་�ིག་ཚུ་རྩ་སྒྲིག་འབད་..."
+msgid "Format Column_s..."
+msgstr "རྩ་སྒྲིག་ ཀེར་�ིག་ཚུ་... (_S)"
 
 #: ../widgets/table/e-table-header-item.c:1487
-msgid "Customize Current View..."
-msgstr "ད་ལྟོའི་མ�ོང་སྣང་སྲོལ་སྒྲིག་འབད་..."
+msgid "Custo_mize Current View..."
+msgstr "ད་ལྟོའི་མ�ོང་སྣང་སྲོལ་སྒྲིག་འབད་...(_M)"
 
-#: ../widgets/table/e-table-header-item.c:1536
-msgid "Sort By"
-msgstr "དབྱེ་སེལ་འབད་�ངས�"
+#: ../widgets/table/e-table-header-item.c:1543
+msgid "_Sort By"
+msgstr "   གིས་ དབྱེ་སེལ་འབད་(_S)"
 
-#: ../widgets/table/e-table-header-item.c:1879
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1561
+msgid "_Custom"
+msgstr "སྲོལ་སྒྲིག་ (_C)"
+
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "ཡིག་གཟུགས་གྲེལ་བཤད�"
 
-#: ../widgets/table/e-table-header-item.c:1900
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "དབྱེ་སེལ་གྱི་བརྡ་དོན�"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "རྩ་འབྲེལ�"
 
-#: ../widgets/table/e-table-item.c:2954
-#: ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3009
 msgid "Table header"
 msgstr "�ིག་�ྲམ་མགོ་ཡིག"
 
-#: ../widgets/table/e-table-item.c:2961
-#: ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Table model"
 msgstr "�ིག་�ྲམ་གྱི་དཔེ�"
 
-#: ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3092
 msgid "Cursor row"
 msgstr "འོད་རྟགས་གྲལ་�ིག"
 
-#: ../widgets/table/e-table.c:3326
-#: ../widgets/table/e-tree.c:3302
-#: ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-table.c:3321
+#: ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
 msgid "Always search"
 msgstr "ཨ་རྟག་ར་འཚོལ་ཞིབ་འབད�"
 
-#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "�་ས�ོང་བར�ྱབ་ནི་ལུ་ ཨེབ་ག�ང་ལག་ལེན་འ�བ�"
 
-#: ../widgets/table/e-tree.c:3288
-#: ../widgets/table/e-tree.c:3289
+#: ../widgets/table/e-tree.c:3328
+#: ../widgets/table/e-tree.c:3329
 msgid "ETree table adapter"
 msgstr "ཨི་ཊི་�ིག་�ྲམ་མ�ུན་བྱེད�"
 
-#: ../widgets/table/e-tree.c:3309
+#: ../widgets/table/e-tree.c:3349
 msgid "Retro Look"
 msgstr "རྒྱབ་ལོག་བལྟ�"
 
-#: ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-tree.c:3350
 msgid "Draw lines and +/- expanders."
 msgstr "�ིག་དང་+/-འཕར་བྱེད་ཚུ་བྲིས�"
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "མི་ནི་ཀཱཌི་བརྟག་ཞིབ�"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "དྲ་བཤུས་བདག་ཆ་་ (C) ༢༠༠༠ ཧེ་ལིགསི་ཀོཌི་ ཨའི་ཨེན་སི�"
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "འདི་གིས་ཤོག་བྱང་ཆུང་བའི་ འབྲི་གཞི་དེ་ལུ་ བརྟག་ཞིབ་འབད་དགོ"
+#: ../widgets/text/e-text.c:2735
+msgid "Input Methods"
+msgstr "ཨིན་པུཊི་�བས་ལམ་ཚུ�"
 
-#: ../widgets/text/e-entry.c:1214
-#: ../widgets/text/e-entry.c:1215
-#: ../widgets/text/e-text.c:3496
-#: ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "བྱུང་ལས་ཀྱི་ ལས་སྦྱོར་འཕྲུལ་ཆས�"
 
-#: ../widgets/text/e-entry.c:1228
-#: ../widgets/text/e-entry.c:1229
-#: ../widgets/text/e-text.c:3532
-#: ../widgets/text/e-text.c:3533
-msgid "Justification"
-msgstr "ལྟེམས་བཅོས�"
-
-#: ../widgets/text/e-entry.c:1270
-#: ../widgets/text/e-entry.c:1271
-#: ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
-msgid "Use ellipsis"
-msgstr "ཚིག་ཆད་ལག་ལེན་འ�བ�"
-
-#: ../widgets/text/e-entry.c:1277
-#: ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640
-msgid "Ellipsis"
-msgstr "ཚིག་ཆད�"
-
-#: ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
-msgid "Line wrap"
-msgstr "གྱལ་རིམ་ལོག་མཚམས�"
-
-#: ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
-msgid "Break characters"
-msgstr "ཡིག་འབྲུ་ཚུ་བར་མཚམས་བཟོ�"
-
-#: ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
-msgid "Max lines"
-msgstr "གྱལ་རིམ་མང་མ�འ�"
-
-#: ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "གྱལ་རིམ་གསརཔ་བཟོ་བཅུག"
-
-#: ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3682
-#: ../widgets/text/e-text.c:3683
-msgid "Draw borders"
-msgstr "མ�འ་མཚམས་ཚུ་བྲིས�"
-
-#: ../widgets/text/e-entry.c:1319
-#: ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3696
-#: ../widgets/text/e-text.c:3697
-msgid "Draw background"
-msgstr "རྒྱབ་གཞི་བྲིས� "
-
-#: ../widgets/text/e-entry.c:1326
-#: ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3703
-#: ../widgets/text/e-text.c:3704
-msgid "Draw button"
-msgstr "ཨེབ་རྟ་བྲིས�"
-
-#: ../widgets/text/e-entry.c:1333
-#: ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3710
-#: ../widgets/text/e-text.c:3711
-msgid "Cursor position"
-msgstr "འོད་རྟགས་གནས་ས�"
-
-#: ../widgets/text/e-entry.c:1340
-#: ../widgets/text/e-entry.c:1341
-msgid "Emulate label resize"
-msgstr "�་ཡིག་གི་ཚད་བས�ྱར་བཟོ་ ནུས་ས�ྱེད་འབད�"
-
-#: ../widgets/text/e-text.c:2739
-msgid "Input Methods"
-msgstr "ཨིན་པུཊི་�བས་ལམ་ཚུ�"
-
-#: ../widgets/text/e-text.c:3510
-#: ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "རྒྱགས་པ�"
 
-#: ../widgets/text/e-text.c:3517
-#: ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "སིཊའིཀ་ཨའུཊི�"
 
-#: ../widgets/text/e-text.c:3524
-#: ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "ཨེན་ཀོར�"
 
-#: ../widgets/text/e-text.c:3539
-#: ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3595
+msgid "Justification"
+msgstr "ལྟེམས་བཅོས�"
+
+#: ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "འཛིན་ལྕགས་ཀྱི་རྒྱ་ཚད�"
 
-#: ../widgets/text/e-text.c:3546
-#: ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "འཛིན་ལྕགས་ཀྱི་རྒྱ་ཚད�"
 
-#: ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "འཛིན་ལྕགས�"
 
-#: ../widgets/text/e-text.c:3560
-#: ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "འཛིན་ལྕགས་གྲུ་བཞི་ནར་མོ་བཀང་�"
 
-#: ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "ཨེགསི་པར་ལེན�"
 
-#: ../widgets/text/e-text.c:3574
-#: ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "�འི་པར་ལེན�"
 
-#: ../widgets/text/e-text.c:3610
-#: ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "ཚིག་ཡིག་གི་རྒྱ་ཚད�"
 
-#: ../widgets/text/e-text.c:3617
-#: ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "ཚིག་ཡིག་གི་མ�ོ་ཚད�"
 
-#: ../widgets/text/e-text.c:3717
-#: ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3695
+msgid "Use ellipsis"
+msgstr "ཚིག་ཆད་ལག་ལེན་འ�བ�"
+
+#: ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3702
+msgid "Ellipsis"
+msgstr "ཚིག་ཆད�"
+
+#: ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3709
+msgid "Line wrap"
+msgstr "གྱལ་རིམ་ལོག་མཚམས�"
+
+#: ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3716
+msgid "Break characters"
+msgstr "ཡིག་འབྲུ་ཚུ་བར་མཚམས་བཟོ�"
+
+#: ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3723
+msgid "Max lines"
+msgstr "གྱལ་རིམ་མང་མ�འ�"
+
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
+msgid "Draw borders"
+msgstr "མ�འ་མཚམས་ཚུ་བྲིས�"
+
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
+msgid "Allow newlines"
+msgstr "གྱལ་རིམ་གསརཔ་བཟོ་བཅུག"
+
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
+msgid "Draw background"
+msgstr "རྒྱབ་གཞི་བྲིས� "
+
+#: ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3766
+msgid "Draw button"
+msgstr "ཨེབ་རྟ་བྲིས�"
+
+#: ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3773
+msgid "Cursor position"
+msgstr "འོད་རྟགས་གནས་ས�"
+
+#: ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "ཨའི་ཨེམ་ས�བས་དོན�"
 
-#: ../widgets/text/e-text.c:3724
-#: ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 
+#~ msgid "A Folder with this name already exists"
+#~ msgstr "མིང་འདི་ཡོད་མི་ སྣོད་འཛིན་ཅིག་ཧེ་མ་ལས་རང་འདུག"
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>བཀྲམ་སྟོན་</b>"
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>སར་བར་གྱི་བརྡ་དོན�</b>"
+#~ msgid "_Address: "
+#~ msgstr "�་བྱང་:(_A)"
+#~ msgid "_Categories..."
+#~ msgstr "དབྱེ་རིམ་ཚུ་...(_C)"
+#~ msgid "\n"
+#~ msgstr "\n"
+#~ msgid "Add an email to the List"
+#~ msgstr "�ོ་ཡིག་ལུ་ གློག་འཕྲིན་ཅིག་ �་ས�ོང་ར�ྱབས�"
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "�་བྱང་ཀི་དེབ་ནང་ལས་ གློག་འཕྲིན་�་བྱང་ཚུ་བཙུགས�"
+#~ msgid "Members"
+#~ msgstr "འ�ུས་མི་ཚུ�"
+#~ msgid "Remove an email address from the List"
+#~ msgstr "�ོ་ཡིག་ནང་ལས་ གློག་འཕྲིན་�་བྱང་ཅིག་ རྩ་བས�ྲད་ག�ང་�"
+#~ msgid "_Select"
+#~ msgstr "སེལ་འ�ུ་འབད� (_S)"
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "བསྒྱུར་བཅོས་འབད་མི་ གློག་འཕྲིན་ནམ་ འབྲེལ་ས་འདི་གི་མིང་ ཧེ་མ་ལས་རང་ སྣོད་འཛིན་འདི་ནང་འདུག\n"
+#~ " ཨིན་རུང་ �ྱོད་ཀྱིས་�་ས�ོང་བར�ྱབ་ནི་ཨིན་ན?"
+#~ msgid "Print cards"
+#~ msgstr "ཤོག་བྱང་དཔར་བས�ྲུན་འབད�"
+#~ msgid "Organization"
+#~ msgstr "ལས་སྡེ�"
+#~ msgid "GTK Tree View"
+#~ msgstr "ཇི་ཊི་ཀེ་ རྩ་འབྲེལ་མ�ོང་སྣང་�"
+#~ msgid "Print envelope"
+#~ msgstr "ཡིག་ཤུབས་དཔར་བས�ྲུན་འབད�"
+#~ msgid "Print contacts"
+#~ msgstr "འབྲེལ་ས་ཚུ་དཔར་བས�ྲུན་འབད�"
+#~ msgid "Print contact"
+#~ msgstr "འབྲེལ་ས་དཔར་བས�ྲུན་འབད�"
+#~ msgid "Error loading default addressbook."
+#~ msgstr "སྔོན་སྒྲིག་�་བྱང་ཀི་དེབ་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ�"
+#~ msgid "Input File"
+#~ msgstr "ཨིན་པུཊི་ཡིག་སྣོད�"
+#~ msgid ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "གསར་དེབ་�ོ་བཀོད་འདི་ཚུ་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
+#~ msgid ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgstr "གསར་དེབ་�ོ་བཀོད་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བ�ོན་ག�ང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས�"
+#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgstr "�ྱོད་ཀྱིས་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "�ྱོད་ཀྱིས་ [༠]འབད་མི་ གསར་དེབ་�ོ་བཀོད་འདི་ཚུ་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་་ཨིན་ན?"
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "�ྱོད་ཀྱིས་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་ག�ང་ནི་ ངེས་�ིག་ཨིན་ན?"
+#~ msgid ""
+#~ "If you do not send a cancelation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgstr ""
+#~ "�ྱོད་ཀྱིས་ཆ་མེད་བརྡ་བས�ུལ་མ་བ�ང་པ་ཅིན་ བཅའ་མར་ག�ོགས་མི་གཞན་ཚུ་གིས་ ཇོར་ནཱལ་དེ་ བ�ོན་བ�ང་"
+#~ "ཡོདཔ་མི་ཤེས�"
+#~ msgid "Add Calendar"
+#~ msgstr "ཟླ་�ོ་�་ས�ོང་ར�ྱབས�"
+#~ msgid "Add Task List"
+#~ msgstr "ལས་ཀའི་�ོ་ཡིག་�་ས�ོང་ར�ྱབས�"
+#~ msgid "_Add Calendar"
+#~ msgstr "ཟླ་�ོ་�་ས�ོང་ར�ྱབས� (_A)"
+#~ msgid "_Add Task List"
+#~ msgstr "ལས་ཀའི་�ོ་ཡིག་�་ས�ོང་ར�ྱབས� (_A)"
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "གསར་དེབ་ཀྱི་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་ད་ནུག"
+#~ msgid "This journal entry has been changed."
+#~ msgstr "གསར་དེབ་�ོ་བཀོད་འདི་ བསྒྱུར་བཅོས་འབད་ནུག"
+#~ msgid "Journal entry - %s"
+#~ msgstr "གསར་དེབ་�ོ་བཀོད་- %s"
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "ཀོར་བའི་འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr "གནང་བ་བྱིན་མ་བ�ུབ་ལས་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "འཛོལ་བ་ཅིག་ལུ་བརྟེན་�ེ་ གསར་དེབ་�ོ་བཀོད་འདི་ བ�ོན་བ�ང་མ་ཚུགས�"
+#~ msgid "<b>Calendar options</b>"
+#~ msgstr "<b>ཟླ་�ོའི་གདམ་�་ཚུ་</b>"
+#~ msgid "Add New Calendar"
+#~ msgstr "ཟླ་�ོ་གསརཔ་�་ས�ོང་ར�ྱབས�"
+#~ msgid "Calendar Group"
+#~ msgstr "ཟླ་�ོའི་སྡེ་ཚན�"
+#~ msgid "Calendar Location"
+#~ msgstr "ཟླ་�ོའི་གནས་�ོངས�"
+#~ msgid "Calendar Name"
+#~ msgstr "ཟླ་�ོའི་མིང་�"
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>ལས་ཀའི་�ོ་ཡིག་གདམ་�་</b>"
+#~ msgid "Add New Task List"
+#~ msgstr "ལས་ཀའི་�ོ་ཡིག་གསརཔ་ �་ས�ོང་ར�ྱབས�"
+#~ msgid "Task List Group"
+#~ msgstr "ལས་ཀའི་�ོ་ཡིག་སྡེ་ཚན�"
+#~ msgid "Task List Name"
+#~ msgstr "ལས་ཀའི་�ོ་ཡིག་མིང་�"
+#~ msgid ""
+#~ "You are modifying a recurring journal entry. What would you like to "
+#~ "modify?"
+#~ msgstr "�ྱོད་ཀྱིས་སླར་འབྱུང་གསར་དེབ་�ོ་བཀོད་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+#~ msgid "Or_ganiser:"
+#~ msgstr "འགོ་འདྲེན་པ་: (_g)"
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>ཟླ་�ོ་ཚུ་ དལ�་/�ོམ་མེད་</b>(_a)"
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>དཔེ་བས�ྲུན་གྱི་འབྱུང་�ེངས་</b>"
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>དཔེ་བས�ྲུན་གྱི་གནས་�ོངས་</b> (_L)"
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "<b>དཔེ་བས�ྲུན་སྒྲིག་སྟངས་ དལ�་/�ོམ་མེད་</b>"
+#~ msgid "_Daily"
+#~ msgstr "ཉིན་བསྟར� (_D)"
+#~ msgid "_Manual"
+#~ msgstr "ལག་�ོག (_M)"
+#~ msgid "_Weekly"
+#~ msgstr "བདུན་རིམ་བཞིན� (_W)"
+#~ msgid "Task sort"
+#~ msgstr "ལས་ཀའི་དབྱེ་སེལ�"
+#~ msgid "Memo sort"
+#~ msgstr "བརྗེད་�ོ་དབྱེ་སེལ�"
+#~ msgid "Enter the password for %s"
+#~ msgstr "%sགི་དོན་ལས་ ཆོག་ཡིག་བཙུགས�"
+#~ msgid "Journal information"
+#~ msgstr "གསར་དེབ་ཀྱི་བརྡ་དོན�"
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "སེལ་འ�ུ་འབད་མི་གཟའ� (%a %b %d %Y)"
+#~ msgid "%a %b %d"
+#~ msgstr "%a %b %d"
+#~ msgid "%a %d %Y"
+#~ msgstr "%a %d %Y"
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a %b %d %Y"
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "སེལ་འ�ུ་འབད་མི་བདུན་ཕྲག(%s - %s)"
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "སེལ་འ�ུ་འབད་མི་ཟླ��(%b %Y)"
+#~ msgid "Selected year (%Y)"
+#~ msgstr "སེལ་འ�ུ་འབད་མི་ལོ�(%Y)"
+#~ msgid "Print Item"
+#~ msgstr "དཔར་བས�ྲུན་རྣམ་གྲངས�"
+#~ msgid "SMTWTFS"
+#~ msgstr "ཨེསི་ཨེམ་ཊི་ཌབ་ལུ་ཊི་ཨེཕ་ཨེསི�"
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+#~ msgid "%.0fM"
+#~ msgstr "%0fM"
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+#~ msgid "Post To:"
+#~ msgstr "གནས་བས�ྱོད་ཡུལ:"
+#~ msgid "The Evolution PIM and Email Client"
+#~ msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ ཡིག་འཕྲིན་ཞབས་�ོ་སྤྱོད་མི�"
+#~ msgid "No, Do not Change Status"
+#~ msgstr "མེན� གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད�"
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>གློག་འཕྲིན་�ོབ་དོ�</b>"
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>གློག་འཕྲིན་ག�ང་དོ�</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 ""
+#~ "ཤོག་ལེབ་འདི་གིས་ �ྱོད་ཀྱིས་བ�ང་མི་འཕྲིན་དོན་དེ་ལྷག་པའི་ས�བས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་བརྒྱུད་དེ་ �ྱོད་ལུ་"
+#~ "བརྡ་དོན་འབད་ནིའི་ གདམ་�་བར�ྱབ་ཚུགས་ནི་དང་ གཞན་མི་གཅིག་གིས་ �ྱོད་ལས་འབྱོར་རྟགས་དགོ་པའི་ཞུ་བ་"
+#~ "འབད�་ད་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན་ གསལ་བཀོད་འབད་ཚུགས�"
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "ང་ལུ་ ལྷག་ཡོད་པའི་ འབྱོར་རྟགས་ཅིག་ ག�ང་དགོ་ག་མི་དགོ་དྲིས�"
+#~ msgid "Never send back a read receipt"
+#~ msgstr "ནམ་ཡང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ལོག་མ་ག�ང་�"
+#~ msgid "Read Receipts"
+#~ msgstr "འབྱོར་རྟགས་ཚུ་ལྷག"
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "ང་གིས་བས�ྱལ་མི་ འཕྲིན་དོན་ཆ་མཉམ་གྱི་དོན་ལས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ས�ྱེལ་གནང་�"
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "འཕྲིད་དོན་དེ་ འཕྲིན་ས�ྱེལ་�ོ་ཡིག་ཅིག་ནང་ བ�ངམ་མ་ག�ོགས ང་རང་ལུ་དངོས་སུ་མེན་པ་ཅིན�"
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr ""
+#~ "�ྱོད་ཀྱིས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་དགོ་པའི་ ཞུ་བ་དང་སྦྲགས་�ེ་ འཕྲིད་དོན་ཅིག་�ོབ་པའི་ས�བས ཨི་བོ་ལུ་ཤཱན་"
+#~ "གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན?"
+#~ msgid "The orientation of the tray."
+#~ msgstr "སྣོད་ཀྱི་ཕྱོགས�"
+#~ msgid "_Search name:"
+#~ msgstr "མིང་འཚོལ་ཞིབ་འབད་: (_S)"
+#~ msgid "Disable"
+#~ msgstr "ལྕོགས་མིན་བཟོ�"
+#~ msgid "Enable"
+#~ msgstr "ལྕོགས་ཅན་བཟོ�"
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>དེ་ལས་</b>"
+#~ msgid "<b>Retrieving Message...</b>"
+#~ msgstr "<b>འཕྲིན་དོན་སླར་འདྲེན་འབད་དོ...</b>"
+#~ msgid "Valid signature, cannot verify sender"
+#~ msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་པས� དེ་འབད�་ད་ ག�ང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས�"
+#~ msgid "Automatic smiley recognition"
+#~ msgstr "རང་བཞིན་གྱི་ སི་མའི་ལི་ ངོས་འཛིན�"
+#~ msgid "New Mail Notify sound file"
+#~ msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བས�ུལ་གྱི་སྒྲ་ས�ད་ཡིག་སྣོད�"
+#~ msgid "New Mail Notify type"
+#~ msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བས�ུལ་གྱི་དབྱེ་བ�"
+#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgstr ""
+#~ "ལག་ལེན་པ་གིས་ ལག་ལེན་འ�བ་འདོད་ཡོད་མི་ ཡིག་འཕྲིན་བརྡ་བས�ུལ་གསར་པའི་དབྱེ་བ་དེ་ གསལ་བཀོད་འབད�"
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "གཙོ་རིམ་གྱི་ཚགས་མ�\"%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 ""
+#~ "�ྱོད་ཀྱི་ནེཊི་སིཀེཔ་ གློག་འཕྲིན་ཚགས་མ་ལ་ལོ་ཅིག་ ཨི་བོ་ལུ་ཤཱན་ནང་\n"
+#~ " ལག་ལེན་འ�བ་ནི་མེད་པའི་ གློག་འཕྲིན་གཙོ་རིམ་ལུ་ གཞི་བཞག་ནུག\n"
+#~ "དེ་གི་ཚབ་ལུ་ ཨི་བོ་ལུ་ཤཱན་ གློག་འཕྲིན་ལུ་ འགན་སྤྲོད་འབད་དེ་\n"
+#~ " དེ་དང་འ�ྲིལ་�ེ་ བཙགས་ཚུགས་པའི་ ས�ུགས་གྲངས་-༣ ལས་ ༣ གྱི་བར་ན་\n"
+#~ " བྱིནམ་ཨིན�\n"
+#~ "\n"
+#~ "དེ་གི་དོན་ལུ་ \"Priority Filter\"ཟེར་མི་ ཚགས་མའི་ཆ་ཚན་ཅིག་\n"
+#~ " �་ས�ོང་བར�ྱབས་མི་དེ་གིས་ ནེཊི་སིཀེཔ་གི་ གློག་འཕྲིན་གཙོ་རིམ་ཚུ་ ཨི་བོ་ལུ་ཤཱན་གྱི་ ས�ུགས་གྲངས་ལུ་\n"
+#~ " གྱུར་བ�ང་དོ་ཡོདཔ་ལས་ གནོད་ས�ྱོན་བྱུང་མི་ ཚགས་མ་ཚུ་གིས་ གཙོ་རིམ་གྱི་ཚབ་ལུ་\n"
+#~ " ས�ུགས་གྲངས་ཚུ་ ལག་ལེན་འ�བ་ཨིན� ལཱ་ཚུ་ཆ་མཉམ་ རེ་བ་ལྟར་དུ་ འབད་ནིའི་དོན་ལུ་\n"
+#~ " ནང་འདྲེན་པའི་ ཚགས་མ་ཚུ་ལུ་ ཞིབ་དཔྱད་འབད�"
+#~ 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 ""
+#~ "�ྱོད་ཀྱི་ ནེཊི་སིཀེཔ་ གློག་འཕྲིན་གྱི་ཚགས་མ་ ལ་ལོ་ཅིག་གིས་\n"
+#~ " ཨི་བོ་ལུ་ཤཱན་ནང་ རྒྱབ་ས�ྱོར་མེད་པའི་�ྱད་རྣམ་ \"Ignore Thread\" ཡང་ཅིན་ \"Watch Thread"
+#~ "\"\n"
+#~ " ལག་ལེན་འ�བ་ཨིན�\n"
+#~ " ཚགས་མ་འདི་ཚུ་ བཀོག་བཞག་འོང་�"
+#~ 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 ""
+#~ "�ྱོད་ཀྱི་ ནེཊི་སིཀེཔ་ གློག་འཕྲིན་ཚགས་མ་ལ་ལོ་ཅིག་གིས་ \n"
+#~ "ཨི་བོ་ལུ་ཤཱན་ནང་ རྒྱབ་ས�ྱོར་མེད་པའི་ ཡིག་རྒྱུན་ཅིག་གི་དོན་ལུ་ \n"
+#~ "གློག་འཕྲིན་གྱི་མ་གཟུགས་ འདྲ་མཉམ་ཡོད་མེད་ \n"
+#~ "བརྟག་ཞིབ་འབད�་ཨིན� ཚགས་མ་དེ་ཚུ་ ལེགས་བཅོས་འབད་དེ་ ཡིག་རྒྱུན་དེ་ \n"
+#~ "འཕྲིན་དོན་མ་གཟུགས་ནང་ཡོད་མེད་ བརྟག་ཞིབ་འབད�་ཨིན�"
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "ཨི་བོ་ལུ་ཤཱན་ ནེཊི་སིཀེཔ་ གནད་སྡུད་རྙིངམ་ ནང་འདྲེན་འབད་དོ�"
+#~ msgid "Importing Netscape data"
+#~ msgstr "ནེཊི་སིཀེཔ་ གནད་སྡུད་ནང་འདྲེན་འབད་དོ�"
+#~ msgid "Settings"
+#~ msgstr "གཞི་སྒྲིག་ཚུ�"
+#~ msgid "Mail Filters"
+#~ msgstr "ཡིག་འཕྲིན་གྱི་ཚགས་མ་ཚུ�"
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ནེཊི་སིཀེཔ་ ཡིག་འཕྲིན་གྱི་ ཡིག་སྣོད་ཚུ་�ོབ་ནུག\n"
+#~ "�ྱོད་ཀྱིས་ དེ་ཚུ་ཨི་བོ་ལུ་ཤཱན་ནང་ ནང་འདྲེན་འབད་ནི་ཨིན་ན?"
+#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
+#~ msgstr "<span weight=\"bold\">�་ཡིག་དང་ཚོས་གཞི་</span>"
+#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
+#~ msgstr "<span weight=\"bold\">ཡིག་འཕྲིན་གྱི་བརྡ་དོན་གསརཔ་</span>"
+#~ msgid "Beep w_hen new mail arrives"
+#~ msgstr "འཕྲིན་དོན་གསརཔ་ འབྱོར་བའི་ས�བས་ བརྡ་ས�ད་ར�ྱབས� (_h)"
+#~ msgid "HTML Mail"
+#~ msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཕྲིན་དོན�"
+#~ msgid "Se_lect..."
+#~ msgstr "སེལ་འ�ུ་འབད་...(_l)"
+#~ msgid "_Do not notify me when new mail arrives"
+#~ msgstr "འཕྲིན་དོན་གསརཔ་ལྷོདཔ་ད་ ང་ལུ་བརྡ་བས�ུལ་མ་འབད� (_D)"
+#~ msgid "Mark as _Read"
+#~ msgstr "ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ� (_R)"
+#~ msgid "_Do not Mark as Read"
+#~ msgstr "ལྷག་ཡོདཔ་སྦེ་ རྟགས་མ་བཀལ� (_D)"
+#~ msgid "Check Evolution archive"
+#~ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་མཛོད་ཞིབ་དཔྱད་འབད�"
+#~ msgid "With GUI"
+#~ msgstr "ཇི་ཡུ་ཨའི་དང་ཅིག་�ར་"
+#~ msgid "<b>Junk Mail Settings</b>"
+#~ msgstr "<b>མ�ོ་མེད་ཡིག་འཕྲིན་གྱི་གཞི་སྒྲིག་ཚུ་</b>"
+#~ msgid "_Contacts..."
+#~ msgstr "འབྲེས་ས་ཚུ་...(_C)"
+#~ msgid "<b>Subject</b> :"
+#~ msgstr "<b>དོན་ཚན་</b> :"
+#~ msgid "<b>From</b> :"
+#~ msgstr "<b>ལས་</b>:"
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr ""
+#~ "ཨའི་པོཌི་གུ་ ཨའུཊི་པུཊི་གི་སྣོད་�ོ་དེ་འཚོལ་མ་�ོབ� ཨའི་པོཌི་ཚུལ་མ�ུན་སྦེ་ གཞི་སྒྲིག་འབད་ཞིནམ་ལས་ ལོག་སྟེ་"
+#~ "འབད་རྩོལ་བས�ྱེད་གནང་�"
+#~ msgid "Could not export data!"
+#~ msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་མ་ཚུགས!"
+#~ msgid "Exporting data failed."
+#~ msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་ནི་ལུ་འ�ུས་ཤོར�"
+#~ msgid "Could not open addressbook!"
+#~ msgstr "�་བྱང་ཀི་དེབ་�་ཕྱེ་མ་ཚུགས�"
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "ཨི་བོ་ལུ་ཤཱན་�་བྱང་ཀི་དེབ་དེ་ གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ �་ཕྱེ་མ་ཚུགས�"
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "ཟླ་�ོ་/ཊུ་ཌུ་�་ཕྱེ་མི་ཚུགས�"
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ ཨི་བོ་ལུ་ཤཱན་ ཟླ་�ོ་/ཊུ་ཌུ་�ོ་ཡིག་ �་ཕྱེ་མ་ཚུགས�"
+#~ msgid "Unable to find this journal entry in any journal"
+#~ msgstr "གསར་དེབ་གི་�ོ་བཀོད་དེ་ གསར་དེབ་ག་ཅི་ནང་ཡང་ འཚོལ་མ་�ོབ�"
+#~ msgid "System error: %s"
+#~ msgstr "རིམ་ལུགས་འཛོལ་བ་: %s�"
+#~ msgid "Camel error: %s"
+#~ msgstr "ཀེ་མཱལ་འཛོལ་བ་: %s�"
+#~ msgid "Account cannot send e-mail"
+#~ msgstr "རྩིས་�ོ་གིས་ གློག་འཕྲིན་ག�ང་མི་ཚུགས�"
+#~ msgid "No store available"
+#~ msgstr "མཛོད་�ང་འ�ོབ་མི་ཚུགས་པས�"
+#~ msgid ""
+#~ "A plugin which implements a CORBA interface for accessing mail data "
+#~ "remotely."
+#~ msgstr ""
+#~ "�ག་རིང་ལས་ ཡིག་འཕྲིན་གནད་སྡུད་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ ཀོར་བའི་ངོས་འདྲ་བ་ཅིག་ བསྟར་སྤྱོད་"
+#~ "འབད་མི་ པ་ལག་ཨིན་ཅིག"
+#~ msgid "Mail Remote"
+#~ msgstr "�ག་རིང་ཡིག་འཕྲིན�"
+#~ msgid "New mail notify"
+#~ msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བས�ུལ་འབད�"
+#~ msgid "(Untitled)"
+#~ msgstr "(མགོ་མིང་མ་བ�གསཔ�)"
+#~ msgid "An attachment to add."
+#~ msgstr "�་ས�ོང་བར�ྱབ་ནིའི་མཉམ་སྦྲགས�"
+#~ msgid "Content type of the attachment."
+#~ msgstr "མཉམ་སྦྲགས་ཀྱི་ ནང་དོན་དབྱེ་བ�"
+#~ msgid "The filename to display in the mail."
+#~ msgstr "ཡིག་འཕྲིན་ནང་ བཀྲམ་སྟོན་འབད་ནིའི་ ཡིག་སྣོད་ཀྱི་མིང་�"
+#~ msgid "Description of the attachment."
+#~ msgstr "མཉམ་སྦྲགས་ཀྱི་ འགྲེལ་བཤད�"
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "སྔོན་སྒྲིག་གིས་ ཨིན་ལ་ཡིན་ནང་སྟོན་ནིའི་ མཉམ་སྦྲགས་ཚུ་ལུ་ རྟགས་བཀལ�"
+#~ msgid "_Phone List"
+#~ msgstr "བརྒྱུད་འཕྲིན་�ོ་ཡིག (_P)"
+#~ msgid "_Edit..."
+#~ msgstr "ཞུན་དག་...(_E)"
+#~ msgid "MTWTFSS"
+#~ msgstr "ཨེམ་ཊི་ཌབ་ལུ་ཊི་ཨེཕ་ཨེསི་ཨེསི�"
+#~ msgid "..."
+#~ msgstr "..."
+#~ msgid "<- _Remove"
+#~ msgstr "<- རྩ་བས�ྲད་ག�ང་�(_R)"
+#~ msgid "Sh_ow these fields in order:"
+#~ msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན�(_o)"
+#~ msgid "_Add ->"
+#~ msgstr "�་ས�ོང་ར�ྱབས་->�(_A)"
+#~ msgid "Minicard Test"
+#~ msgstr "མི་ནི་ཀཱཌི་བརྟག་ཞིབ�"
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "དྲ་བཤུས་བདག་ཆ་་ (C) ༢༠༠༠ ཧེ་ལིགསི་ཀོཌི་ ཨའི་ཨེན་སི�"
+#~ msgid "This should test the minicard canvas item"
+#~ msgstr "འདི་གིས་ཤོག་བྱང་ཆུང་བའི་ འབྲི་གཞི་དེ་ལུ་ བརྟག་ཞིབ་འབད་དགོ"
+#~ msgid "Emulate label resize"
+#~ msgstr "�་ཡིག་གི་ཚད་བས�ྱར་བཟོ་ ནུས་ས�ྱེད་འབད�"
 #~ msgid "E-mail"
 #~ msgstr "གློག་འཕྲིན�"
 #~ msgid "Print Preview"
@@ -21919,8 +22865,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ "ཚབ་སྲུང་འབད་ནི་ཨིན་ན?"
 #~ msgid "Filtering Folder"
 #~ msgstr "སྣོད་འཛིན་འཚག་དོ�"
-#~ msgid "ok_button"
-#~ msgstr "བ�ུབ་པའི་ཨེབ་རྟ�(_b)"
 #~ msgid " New "
 #~ msgstr "གསརཔ�"
 #~ msgid "*"
@@ -21947,8 +22891,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "ཟླ་�ོ་: (_n)"
 #~ msgid "Dele_gatees"
 #~ msgstr "བགོ་སྤེལ་བྱ་ཡུལ་ཚུ�(_g)"
-#~ msgid "From:"
-#~ msgstr "ལས་:"
 #~ msgid "%P %%"
 #~ msgstr "%P %%"
 #~ msgid "date-end"
@@ -22090,8 +23032,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "<b>གཞི་རྟེན་ཚུ་</b>"
 #~ msgid "<b>Date and Time</b>"
 #~ msgstr "<b>ཚེས་གྲངས་དང་ཆུ་ཚོད་</b>"
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>ག�ང་ནིའི་གདམ་�་</b>"
 #~ msgid "A_ll day event"
 #~ msgstr "ཉིནམ་གང་གི་བྱུང་ལས� (_A)"
 #~ msgid "Classi_fication:"
@@ -22100,10 +23040,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "ངོ་འཕྲད་འདི་ལུ་ སྲོལ་སྒྲིག་འབད་ཡོད་པའི་ འཇིགས་བརྡ་འདུག"
 #~ msgid "<b>Dele_gatees</b>"
 #~ msgstr " <b>བགོ་སྤེལ་གྱི་ཡུལ་ཚུ་</b> "
-#~ msgid "_Delegate To..."
-#~ msgstr "བགོ་སྤེལ་འབད་ས�...(_D)"
-#~ msgid "Con_tacts..."
-#~ msgstr "འབྲེལ་ས་ཚུ�...(_t)"
 #~ msgid "Assignment"
 #~ msgstr "འགན་ལས�"
 #~ msgid "Task Table"
@@ -22142,8 +23078,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "%H:%M:%S"
 #~ msgid "%I %p"
 #~ msgstr "%I %p"
-#~ msgid "_Rule name:"
-#~ msgstr "ལམ་ལུགས་ཀྱི་མིང་: (_R)"
 #~ msgid "If"
 #~ msgstr "ཅིན�"
 #~ msgid "Execute actions"
@@ -22198,16 +23132,10 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "ཨའི་ཌི་"
 #~ msgid "Path"
 #~ msgstr "འགྲུལ་ལམ�"
-#~ msgid "learns junk messages using spamd."
-#~ msgstr "སི་པམ་ཌི་ལག་ལེན་འ�བ་སྟེ་ མ�ོ་མེད་འཕྲིན་དོན་ཚུ་ལྷབ་ཨིན�"
 #~ msgid "Uid"
 #~ msgstr "ཡུ་ཨའི་ཌི�"
 #~ msgid "Url"
 #~ msgstr "ཡུ་ཨར་ཨེལ�"
-#~ msgid "Evolution Settings"
-#~ msgstr "ཨི་བོ་ལུ་ཤཱན་ གཞི་སྒྲིག་ཚུ�"
-#~ msgid "C"
-#~ msgstr "སི�"
 #~ msgid "CN"
 #~ msgstr "སི་ཨེན�"
 #~ msgid "OU"
@@ -22258,8 +23186,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr ""
 #~ "�ྱོད་ཀྱིས་ འབྲེལ་སའདི་\n"
 #~ " ངེས་པར་དུ་ བ�ོན་ག�ང་ནི་ཨིན་ན? "
-#~ msgid "Save Appointment"
-#~ msgstr "ངོ་འཕྲད་སྲུངས�"
 #~ msgid ""
 #~ " Some features may not work correctly with your current server version"
 #~ msgstr ""
@@ -22329,8 +23255,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "པ་ཡིན�"
 #~ msgid "_Host:"
 #~ msgstr "ཧོསཊི་: (_H)"
-#~ msgid "_Load images if sender is in address book"
-#~ msgstr "ག�ོང་མ�ན་དེ་ �་བྱང་ཀི་དེབ་ནང་ཡོད་པ་ཅིན་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་འབད� (_L)"
 #~ msgid ""
 #~ "\n"
 #~ " Please read carefully the license agreement displayed\n"
@@ -22492,8 +23416,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་ས�ྱོང་འ�བ�"
 #~ msgstr "མཉམ་སྦྲགས་ཚུ་སྟོན� (_a"
 #~ msgid "E_xit"
 #~ msgstr "ཕྱིར་�ོན�"
-#~ msgid "Evolution _FAQ"
-#~ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨེཕ་ཨེ་ཀིའུ� (_F)"
 #~ msgid "Window B_uttons"
 #~ msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ� (_u)"
 #~ msgid "_Advanced..."
diff --git a/po/en_GB.po b/po/en_GB.po
index e48855593b..48ad6ba859 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,12 +2,12 @@
 # Robert Brady <rwb197@zepler.org>, 2000.
 # Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
 #
-#: ../shell/main.c:695
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution gnome-2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 13:54+0100\n"
+"POT-Creation-Date: 2008-09-07 02:59+0100\n"
 "PO-Revision-Date: 2008-02-17 10:08-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: \n"
@@ -18,21 +18,21 @@ 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"
-msgstr "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution address book"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "New Contact"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "New Contact List"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -55,63 +55,63 @@ msgstr "Contact: "
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "It has alarms."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: ../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 "Calendar Event: Summary is %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 "Calendar Event: It has no summary."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Go to Date"
 
-#: ../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 "a table to view and select the current time range"
 
 #. 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."
@@ -120,14 +120,14 @@ msgstr[1] "It has %d events."
 
 #. 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 "It has no events."
 
 #. 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 "Work Week View: %s. %s"
@@ -135,21 +135,21 @@ msgstr "Work Week View: %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 "Day View: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -159,30 +159,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:750
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../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: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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -191,59 +191,59 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../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: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:766
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "search bar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "evolution calendar search bar"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Jump button"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Click here, you can find more events."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "popup"
 
 #. 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 "pop up a child"
 
@@ -255,12 +255,12 @@ msgstr "edit"
 msgid "begin editing this cell"
 msgstr "begin editing this cell"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "toggle"
 
 #. 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 "toggle the cell"
 
@@ -280,47 +280,47 @@ msgstr "collapse"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "collapses the row in the ETree containing this cell"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Table Cell"
 
-#: ../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 "click to add"
 
-#: ../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 "click"
 
-#: ../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 "sort"
 
-#: ../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 "Calendar: from %s to %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Combo Button"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Activate Default"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Popup Menu"
 
@@ -335,11 +335,11 @@ msgstr "activate"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -371,8 +371,8 @@ msgid ""
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
-"Check to make sure your password is spelt correctly and that you are using "
-"a supported login method. Remember that many passwords are case-sensitive; "
+"Check to make sure your password is spelt correctly and that you are using a "
+"supported login method. Remember that many passwords are case-sensitive; "
 "your caps lock might be on."
 
 #: ../addressbook/addressbook.error.xml.h:9
@@ -380,25 +380,25 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Could not get schema information for LDAP server."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Could not remove address book."
 
 #: ../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 ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and GroupWise Personal Contacts folders."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Delete address book '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Error loading address book."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -411,7 +411,7 @@ msgstr "Failed to authenticate with LDAP server."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
@@ -432,7 +432,7 @@ msgid "Some features may not work properly with your current server"
 msgstr "Some features may not work properly with your current server"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "The Evolution address book has quit unexpectedly."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -453,31 +453,31 @@ msgstr ""
 "supported search bases."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "This address book will be removed permanently."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "This address book could not be opened."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 "This address book server does not have any suggested search bases."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelt or your network connection could be down."
+"This address book server might be unreachable, the server name may be "
+"misspelt, or your network connection could be down."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "This address book will be removed permanently."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "This server does not support LDAPv3 schema information."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Unable to open address book"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -494,7 +494,7 @@ msgstr "Would you like to save your changes?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "You are attempting to move a contact from one address book to another but it "
@@ -511,11 +511,8 @@ msgstr ""
 "a supported version"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr ""
-"You do not have enough permissions to delete a contact from this Address "
-"Book."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "You do not have permission to delete contacts in this address book."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -531,7 +528,7 @@ msgid ""
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: ../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
@@ -554,9 +551,9 @@ msgstr "_Resize"
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
-#. 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."
+#. 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:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -565,17 +562,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "Could not load address book"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
@@ -597,10 +594,10 @@ msgstr "Configure autocomplete here"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -625,8 +622,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution Address Book component"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME Certificate Management Control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -640,12 +637,13 @@ msgstr "Manage your S/MIME certificates here"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../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
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -658,121 +656,110 @@ msgstr "On This Computer"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../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-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Contact _List"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Address _Book"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Failed upgrading Address Book settings or folders."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Copy _book content locally for offline operation"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:292 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:559
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Searching"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "Migrating `%s':"
+msgid "Migrating '%s':"
+msgstr "Migrating '%s':"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -824,70 +811,76 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Save As vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1709 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../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 "_Delete"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Properties..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Properties"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Contact Source Selector"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Enter password for %s (user %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Enter password"
 
@@ -981,7 +974,7 @@ msgid "Add Address Book"
 msgstr "Add Address Book"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Always"
 
@@ -989,73 +982,78 @@ msgstr "Always"
 msgid "Anonymously"
 msgstr "Anonymously"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "B_rowse this book until limit reached"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Basic"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-mail address"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution will use this e-mail address to authenticate you with the server."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Never"
 
 #. 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:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "No encryption"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "One"
 
 #. 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:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Search Filter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Search _base:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Search _filter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Search filter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1064,7 +1062,7 @@ msgstr ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1072,7 +1070,7 @@ msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1080,7 +1078,7 @@ msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1090,23 +1088,23 @@ msgstr ""
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
 #. 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:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1116,7 +1114,7 @@ msgstr ""
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1128,7 +1126,7 @@ msgstr ""
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1136,7 +1134,7 @@ msgstr ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1144,7 +1142,7 @@ msgstr ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1154,7 +1152,7 @@ msgstr ""
 "setting this to \"E-mail Address\" requires anonymous access to your LDAP "
 "server."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1162,7 +1160,7 @@ msgstr ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1172,75 +1170,76 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Using e-mail address"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Add Address Book"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Find Possible Search Bases"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Login method:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Search scope:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Timeout:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cards"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutes"
 
@@ -1281,7 +1280,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1293,16 +1292,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../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
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -1315,7 +1314,7 @@ msgid "Image"
 msgstr "Image"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1328,7 +1327,7 @@ msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1342,11 +1341,11 @@ msgstr "Telephone"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Work"
 
@@ -1368,8 +1367,8 @@ msgid "_Birthday:"
 msgstr "_Birthday:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendar:"
@@ -1458,1120 +1457,1121 @@ msgstr "_Where:"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "Address"
 
-#: ../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:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:194
-#: ../widgets/menus/gal-define-views-model.c:179
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "United States"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "American 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 "Antarctica"
 
-#: ../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 And Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../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 "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../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 "Belarus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgium"
 
-#: ../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 "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../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 "Bosnia And Herzegowina"
 
-#: ../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 "Brazil"
 
-#: ../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 "British Indian Ocean Territory"
 
-#: ../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 "Bulgaria"
 
-#: ../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 "Cambodia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canada"
 
-#: ../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 "Cayman Islands"
 
-#: ../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 "Central African Republic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Chad"
 
-#: ../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 "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Christmas Island"
 
-#: ../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 "Cocos (Keeling) Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comoros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../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 "Congo, The Democratic Republic Of The"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cook Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../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:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../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 "Czech Republic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Denmark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../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 "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Equatorial 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 "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falkland Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Faroe Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "France"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "French Polynesia"
 
-#: ../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 "French Southern Territories"
 
-#: ../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 "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Germany"
 
-#: ../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 "Greece"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Greenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../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
+#: ../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:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../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 "Heard And McDonald Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../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: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 "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hungary"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Iceland"
 
-#: ../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 "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Ireland"
 
-#: ../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 "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japan"
 
-#: ../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 "Jordan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea, Democratic People's Republic Of"
 
-#: ../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 "Korea, Republic Of"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: ../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 "Latvia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: ../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 "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../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 "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../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 "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldives"
 
-#: ../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 "Marshall Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../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 "Mexico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../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 "Moldova, Republic Of"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../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 "Morocco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../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 "Namibia"
 
-#: ../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 "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../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 "Nigeria"
 
-#: ../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 "Norfolk Island"
 
-#: ../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 "Northern Mariana Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norway"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../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 "Palestinian Territory"
 
-#: ../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 New Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../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 "Philippines"
 
-#: ../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 "Poland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../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:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../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 "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Russian Federation"
 
-#: ../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 "Saint Kitts And 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 "Saint 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 "Saint Vincent And The Grenadines"
 
-#: ../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 And 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 "Saudi Arabia"
 
-#: ../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 "Serbia And Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../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 "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../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 "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "South Africa"
 
-#: ../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 "South Georgia And The South Sandwich Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Spain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../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:339
+#: ../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:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre And Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../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 And Jan Mayen Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Syria"
 
-#: ../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 "Tajikistan"
 
-#: ../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 "Tanzania, United Republic Of"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../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 And Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turkey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../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 "Turks And Caicos Islands"
 
-#: ../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 "Ukraine"
 
-#: ../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 "United Arab Emirates"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: ../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 "Uruguay"
 
-#: ../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 "Viet Nam"
 
-#: ../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 "Virgin Islands, British"
 
-#: ../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 "Virgin Islands, U.S."
 
-#: ../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 "Western Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Yemen"
 
-#: ../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
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Name"
 
-#: ../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 "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "Service"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Location"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Username"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Home"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Other"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Source Book"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Target Book"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Required Fields"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Changed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2579,47 +2579,47 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2628,7 +2628,7 @@ msgstr ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2636,7 +2636,7 @@ msgstr ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2645,7 +2645,7 @@ msgstr ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2753,7 +2753,7 @@ msgstr "_IM Service:"
 #: ../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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Location:"
@@ -2763,7 +2763,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Members</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 "Contact List Editor"
 
@@ -2783,25 +2783,25 @@ msgstr "_List name:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an e-mail address or drag a contact into the list below:"
 
-#: ../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 "Contact List Members"
 
-#: ../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 "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:216
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Book"
 
-#: ../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 "Is New List"
 
@@ -2842,40 +2842,40 @@ msgstr ""
 "The name or e-mail address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Merge Contact"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Merge Contact"
+
+#: ../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:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 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:81 ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Any field contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Name begins with"
+msgid "Name contains"
+msgstr "Name contains"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2889,10 +2889,10 @@ msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Query"
 
@@ -2900,122 +2900,119 @@ msgstr "Query"
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../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:3335
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Name begins with"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../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 "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:816
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Save as vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Open"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_New Contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "New Contact _List..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Save as vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Send _Message to Contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Send _Message to List"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Send _Message to Contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Print"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Cop_y to Address Book..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ve to Address Book..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1694 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2045
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "P_aste"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1520
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "Any Category"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Other error"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3047,7 +3044,7 @@ msgstr "Car Phone"
 
 #: ../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:143
+#: ../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
@@ -3148,9 +3145,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../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 "Role"
 
@@ -3186,38 +3183,38 @@ msgid "Web Site"
 msgstr "Website"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
+#: ../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
 msgid "Width"
 msgstr "Width"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:164
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
+#: ../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
 msgid "Height"
 msgstr "Height"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Has Focus"
 
@@ -3237,11 +3234,21 @@ msgstr "Text Model"
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Column Width"
 
-#: ../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"
+"Searching for the Contacts..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3255,7 +3262,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3269,7 +3276,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +3286,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3289,41 +3296,41 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Work E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Home E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Other E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Selected"
 
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Has Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Send New Message To..."
 
@@ -3366,25 +3373,23 @@ msgid "Video Chat"
 msgstr "Video Chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2377
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../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
+#: ../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-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 "Calendar"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
@@ -3406,12 +3411,14 @@ msgid "Web Log"
 msgstr "Web Log"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2362
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Birthday"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2363
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -3457,7 +3464,7 @@ msgstr "No Self Contact defined"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permission denied"
 
@@ -3479,11 +3486,11 @@ msgstr "Protocol not supported"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Cancelled"
 
@@ -3519,39 +3526,49 @@ msgstr "No such source"
 msgid "Not available in offline mode"
 msgstr "Not available in offline mode"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Other error"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Invalid server version"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Unsupported authentication method"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 ""
 "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"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "We were unable to open this address book.  Please check that the path %s "
 "exists and that you have permission to access it."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3561,77 +3578,81 @@ msgstr ""
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Detailed error:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "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."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "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."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr "The backend for this address book was unable to parse this query."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr "The backend for this address book refused to perform this query."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3646,16 +3667,16 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3664,70 +3685,70 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Overwrite"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacts"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "Multiple vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Contact information"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Querying Address Book..."
 
@@ -3748,50 +3769,50 @@ msgid "Show Compact vCard"
 msgstr "Show Compact vCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Save in address book"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Card View"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importing..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 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:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
@@ -3844,12 +3865,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Header"
 
@@ -3951,8 +3972,8 @@ msgstr "Shading"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Size:"
@@ -3970,7 +3991,7 @@ msgid "Top:"
 msgstr "Top:"
 
 #: ../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 "Type:"
 
@@ -3982,35 +4003,35 @@ msgstr "Width:"
 msgid "_Font..."
 msgstr "_Font..."
 
-#: ../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 "Contact Print Style Editor Test"
 
-#: ../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 "Copyright (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 "This should test the contact print style editor widget"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Contact Print Test"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
-#: ../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 "Can not open file"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Couldn't get list of address books"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4026,7 +4047,7 @@ msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "List local address book folders"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4078,20 +4099,20 @@ msgstr "Unhandled error"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{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}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4180,19 +4201,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Are you sure you want to delete this appointment?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
@@ -4348,7 +4369,7 @@ msgid "The calendar is not marked for offline usage."
 msgstr "The calendar is not marked for offline usage."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+msgid "The memo list is not marked for offline usage."
 msgstr "The memo list is not marked for offline usage"
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4442,12 +4463,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Your tasks will not be available until Evolution is restarted."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Save"
 
@@ -4456,8 +4476,8 @@ msgid "_Save Changes"
 msgstr "_Save Changes"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../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 "_Send"
 
@@ -4469,55 +4489,56 @@ msgstr "_Send Notice"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1519
-#: ../calendar/conduits/calendar/calendar-conduit.c:1520
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Could not start evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1627
-#: ../calendar/conduits/calendar/calendar-conduit.c:1630
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Could not read pilot's Memo application block"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Could not write pilot's Memo application block"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Default Priority:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Could not write pilot's ToDo application block"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendars"
 
@@ -4558,25 +4579,25 @@ msgid "Memo_s"
 msgstr "Memo_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1703 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1575 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../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: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 "Tasks"
@@ -4594,25 +4615,26 @@ msgstr "_Tasks"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
+#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hours"
 msgstr[1] "hours"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Start time"
 
@@ -4623,9 +4645,9 @@ msgstr "Appointments"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Location:"
@@ -4635,14 +4657,15 @@ msgid "Snooze _time:"
 msgstr "Snooze _time:"
 
 #: ../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:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../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 "_Edit"
 
@@ -4654,32 +4677,32 @@ msgstr "_Snooze"
 msgid "location of appointment"
 msgstr "location of appointment"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "No summary available."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "No description available."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "No location information available."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "You have %d alarms"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4691,7 +4714,7 @@ msgstr ""
 "configured to send an e-mail.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4708,15 +4731,15 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4724,13 +4747,13 @@ msgstr ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "invalid time"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4738,8 +4761,8 @@ msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4749,8 +4772,8 @@ msgstr[1] "%d minutes"
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4992,12 +5015,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Show status field in the event/task/meeting editor"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Show the \"Preview\" pane"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Show the \"Preview\" pane."
 
@@ -5047,7 +5070,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Time the last alarm ran, in time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Timezone"
 
@@ -5181,66 +5204,66 @@ msgstr "Workday start minute"
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Category is"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Location contains"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Print"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5250,15 +5273,16 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
+#: ../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 "days"
@@ -5268,131 +5292,311 @@ msgstr "days"
 #. 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:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
+#: ../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 "On The Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
 #. 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 "Weather"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2101
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Properties"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Failed upgrading calendars."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Unable to open the calendar '%s' for creating events and meetings"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Calendar Source Selector"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "New appointment"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "_Appointment"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "New meeting"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "M_eeting"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "All Day A_ppointment"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "New calendar"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "Cale_ndar"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Day View"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Work Week View"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Week View"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Month View"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Any Field"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Attachments"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Attendee"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Business"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Category"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classification"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competition"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidential"
+
+#: ../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 "Description"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../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:22
+msgid "Do Not Exist"
+msgstr "Do Not Exist"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Exist"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favourites"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Gifts"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Goals/Objectives"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Holiday"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Holiday Cards"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Hot Contacts"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideas"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "International"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Key Customer"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Next 7 days"
+
+#: ../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 "Organiser"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Phone Calls"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Private"
+
+#: ../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
+msgid "Public"
+msgstr "Public"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Recurrence"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategies"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Summary"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Summary Contains"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Suppliers"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Time &amp; Expenses"
+
+#: ../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 "Waiting"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contains"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "does not contain"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "is"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "is not"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
@@ -5405,11 +5609,11 @@ msgstr "Method not supported when opening the calendar"
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Edit Alarm"
 
@@ -5442,17 +5646,17 @@ msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Play a sound"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Run a program"
 
@@ -5465,7 +5669,7 @@ msgid "Send To:"
 msgstr "Send To:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Send an e-mail"
 
@@ -5520,7 +5724,7 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -5531,16 +5735,15 @@ msgstr "A_dd"
 #: ../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 "Alarms"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
@@ -5609,8 +5812,8 @@ msgid "Display"
 msgstr "Display"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Friday"
 
@@ -5625,8 +5828,8 @@ msgstr ""
 "Days"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Monday"
 
@@ -5649,7 +5852,7 @@ msgstr ""
 "Sunday"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Pick a colour"
 
@@ -5659,8 +5862,8 @@ msgid "S_un"
 msgstr "S_un"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Saturday"
 
@@ -5677,8 +5880,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -5696,13 +5899,13 @@ msgid "Template:"
 msgstr "Template:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Thursday"
 
 #: ../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 "Time _zone:"
 
@@ -5711,14 +5914,14 @@ msgid "Time format:"
 msgstr "Time format:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tuesday"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -5796,310 +5999,453 @@ msgstr "_Wed"
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_y calendar contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Cop_y task list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Cop_y memo list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Colou_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Memo List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "New Memo List"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "This task has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "This memo has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  You have made changes. Forget those changes and close the editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  You have made no changes, close the editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "This event has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "This task has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "This memo has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  You have made changes. Forget those changes and update the editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:518
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " to "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Due "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Move"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Edit Appointment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Meeting - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appointment - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Assigned Task - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Task - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Memo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "No Summary"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Click here to close the current window"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Copy selected text to the clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Cut selected text to the clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Click here to view help available"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Paste text from the clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Click here to save the current window"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Select all text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Classification"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_File"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Help"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Insert"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Options"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "_View"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Attachment..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Click here to attach a file"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Toggles whether to display categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Time _Zone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Toggles whether the time zone is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Pu_blic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Classify as public"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Private"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Classify as private"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Confidential"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Classify as confidential"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "R_ole Field"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Toggles whether the Role field is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Toggles whether the RSVP field is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Status Field"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Toggles whether the Status field is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Type Field"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Toggles whether the Attendee Type is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "Recent _Documents"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Attach"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Attachment"
 msgstr[1] "<b>%d</b> Attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "_Remove"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Add attachment..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Show Attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Press space key to toggle attachment bar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Edit Appointment"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Meeting - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appointment - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Assigned Task - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Task - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Memo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "No summary"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Could not open source"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Could not open destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Delete this item from all other recipient's mailboxes?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "The event could not be deleted due to a corba error"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "The task could not be deleted due to a corba error"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "The memo could not be deleted due to a corba error"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "The item could not be deleted due to a corba error"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "The event could not be deleted because permission was denied"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "The task could not be deleted because permission was denied"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "The memo could not be deleted because permission was denied"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "The item could not be deleted because permission was denied"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "The event could not be deleted due to an error"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "The task could not be deleted due to an error"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "The memo could not be deleted due to an error"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "The item could not be deleted due to an error"
 
@@ -6108,7 +6454,7 @@ msgid "Contacts..."
 msgstr "Contacts..."
 
 #: ../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 "Delegate To:"
 
@@ -6116,135 +6462,181 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarms"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "Click here to set or unset alarms for this event"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Recurrence"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Make this a recurring event"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Send Options"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Insert advanced send options"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "All _Day Event"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Toggles whether to have All Day Event"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Show Time as _Busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Toggles whether to show time as busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Free/Busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Query free / busy information for the attendees"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Appoint_ment"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Recurrence"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "This event has alarms"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "The organiser selected no longer has an account."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Add "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Customise"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1424
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:308 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
-#: ../widgets/misc/e-signature-combo-box.c:69
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "None"
 
@@ -6269,23 +6661,25 @@ msgid "Custom Alarm:"
 msgstr "Custom Alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escription:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Event Description"
 
-#: ../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 "Su_mmary:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarm"
 
+#: ../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 "_Description:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Time:"
@@ -6316,28 +6710,24 @@ msgstr "C_hange Organiser"
 msgid "Co_ntacts..."
 msgstr "Co_ntacts..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organiser"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "To"
 
@@ -6350,63 +6740,59 @@ msgstr "Sta_rt date:"
 msgid "T_o:"
 msgstr "T_o:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Description:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Group:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "You are modifying a recurring event. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "You are delegating a recurring event. What would you like to delegate?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "You are modifying a recurring task. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "You are modifying a recurring memo. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "on"
 
@@ -6414,7 +6800,7 @@ msgstr "on"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "first"
 
@@ -6423,7 +6809,7 @@ msgstr "first"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "second"
 
@@ -6431,7 +6817,7 @@ msgstr "second"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "third"
 
@@ -6439,7 +6825,7 @@ msgstr "third"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "fourth"
 
@@ -6447,13 +6833,13 @@ msgstr "fourth"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "last"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -6461,7 +6847,7 @@ msgstr "Other Date"
 #. * 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -6469,7 +6855,7 @@ msgstr "1st to 10th"
 #. * 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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -6477,45 +6863,45 @@ msgstr "11th to 20th"
 #. * 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
 #. 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "day"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -6566,12 +6952,12 @@ msgstr "week(s)"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: ../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 "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Web Page"
 
@@ -6586,51 +6972,55 @@ msgstr "<span weight=\"bold\">Status</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:252
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Completed"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "High"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "In Progress"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "Low"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -6643,7 +7033,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Undefined"
 
@@ -6660,25 +7050,37 @@ msgstr "_Priority:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Status Details"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "Click to change or view the status details of the task"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "_Send Options"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Task"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Task Details"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
@@ -6692,19 +7094,15 @@ msgid "Categor_ies..."
 msgstr "Categor_ies..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scription:"
+msgid "D_ue date:"
+msgstr "D_ue date:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Time zone:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Due date:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6712,142 +7110,126 @@ msgstr[0] "%d day"
 msgstr[1] "%d days"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
 #. 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:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s before the start of the appointment"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s after the start of the appointment"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s at the start of the appointment"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s before the end of the appointment"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s after the end of the appointment"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s at the end of the appointment"
 
 #. 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:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %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:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../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:857
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../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 "Start Date:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../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 "Description:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../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 "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Public"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Private"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidential"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "End Date"
@@ -6857,21 +7239,14 @@ msgstr "End Date"
 msgid "Start Date"
 msgstr "Start Date"
 
-#: ../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:365
-msgid "Summary"
-msgstr "Summary"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Free"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Busy"
 
@@ -6885,67 +7260,67 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../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
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Select folder to save selected attachments..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../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:1367
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Save As..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
@@ -6953,131 +7328,157 @@ msgstr "Set as _Background"
 msgid "_Save Selected"
 msgstr "_Save Selected"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:848
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* No Summary *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organiser: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organiser: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Start: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Due: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:681 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:811 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1237 ../calendar/gui/e-memo-table.c:821
+#: ../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:277
 msgid "Save as..."
 msgstr "Save as..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1673 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "P_rint..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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_ut"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1676
-#: ../calendar/gui/e-calendar-view.c:1695 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Forward as iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Mark Selected Tasks as Incomplete"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
@@ -7100,7 +7501,8 @@ msgid "Due date"
 msgstr "Due date"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Priority"
 
@@ -7108,127 +7510,108 @@ msgstr "Priority"
 msgid "Start date"
 msgstr "Start date"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Moving items"
 
-#: ../calendar/gui/e-calendar-view.c:1358
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Copying items"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "New _Meeting"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Current View"
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Select T_oday"
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Pri_nt..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting..."
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../calendar/gui/e-calendar-view.c:1705 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Reply to _All"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../calendar/gui/e-calendar-view.c:1711 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2234
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organiser: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2238
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organiser: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2254 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %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"
@@ -7241,7 +7624,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:592
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
@@ -7252,44 +7635,34 @@ msgstr "%02i minute divisions"
 #. 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:1528
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../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
 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:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every %d days"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7297,9 +7670,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every %d weeks"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7307,51 +7678,35 @@ msgstr[0] "Every week on "
 msgstr[1] "Every %d weeks on "
 
 #. 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 " and "
 
-#. 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 "The %s day of "
 
-#. 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 "The %s %s of "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every %d months"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every %d years"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7359,47 +7714,47 @@ msgstr[0] "a total of %d time"
 msgstr[1] " a total of %d times"
 
 #. 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 ", ending on "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Starts"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Ends"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Due"
 
-#: ../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 "iCalendar Information"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "An unknown person"
 
 #. 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."
@@ -7407,28 +7762,28 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../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:2034
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../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:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../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:2040
 msgid "Declined"
 msgstr "Declined"
 
-#: ../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"
@@ -7436,261 +7791,261 @@ msgstr ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 
-#: ../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 ""
 "The task has been cancelled, however it could not be found in your task lists"
 
-#: ../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> has published meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: ../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> requests the presence of %s at a meeting."
 
-#: ../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> requests your presence at a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> wishes to be added to an existing meeting."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: ../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> wishes to receive the latest meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: ../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> has replied to a meeting request."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Meeting Cancellation"
 
-#: ../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> has sent an unintelligible message."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: ../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> has published task information."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Task Information"
 
-#: ../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> requests %s to perform a task."
 
-#: ../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> requests you perform a task."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> wishes to be added to an existing task."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Task Update"
 
-#: ../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> wishes to receive the latest task information."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: ../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> has replied to a task assignment."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Task Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: ../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> has published free/busy information."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: ../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> requests your free/busy information."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: ../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> has replied to a free/busy request."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: ../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 "The message does not appear to be properly formed"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: ../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 "The attachment does not contain a valid calendar message"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Update"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Accept"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Decline"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
@@ -7719,112 +8074,112 @@ msgstr "Loading calendar..."
 msgid "Server Message:"
 msgstr "Server Message:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Resources"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Group"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Resource"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Room"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Chair"
 
-#: ../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-store.c:744 ../calendar/gui/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../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 "Needs Action"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../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
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../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
 msgid "Delegated"
 msgstr "Delegated"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../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:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "In Process"
 
 #. 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:2138
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7832,85 +8187,81 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2169
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:415
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "A_ttendees..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:452
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:469
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:577
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Attendee"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Click here to add an attendee"
@@ -7943,8 +8294,8 @@ msgstr "_Delete Selected Memos"
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2865
+#: ../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"
@@ -7953,84 +8304,80 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
 
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Expunging"
 
-#: ../calendar/gui/e-timezone-entry.c:134
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Select Timezone"
 
 #. 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:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:831
-msgid "Updating query"
-msgstr "Updating query"
-
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Custom View"
 
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Save Custom View"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Define Views..."
 
-#: ../calendar/gui/gnome-cal.c:2689
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: ../calendar/gui/gnome-cal.c:2717
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Loading memos at %s"
 
-#: ../calendar/gui/gnome-cal.c:2824
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: ../calendar/gui/gnome-cal.c:3780
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Purging"
 
@@ -8090,57 +8437,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Select Today"
 
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../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 "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Calendar information"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Updated"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Refresh"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
@@ -8179,47 +8526,39 @@ msgstr "There is no calendar available for creating memos"
 msgid "Memo Source Selector"
 msgstr "Memo Source Selector"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "New memo"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "New shared memo"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Shared memo"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Create a shared new memo"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "New memo list"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Memo li_st"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Next 7 Days"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8231,7 +8570,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8244,27 +8583,27 @@ msgstr ""
 "Please be patient while Evolution migrates your folders..."
 
 #. 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 "Unable to migrate old settings from evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
 
-#: ../calendar/gui/migration.c:1232
-#: ../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
+#: ../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"
 
@@ -8421,57 +8760,52 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Upcoming Appointments"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_New Task List"
@@ -8500,39 +8834,31 @@ msgstr "There is no calendar available for creating tasks"
 msgid "Task Source Selector"
 msgstr "Task Source Selector"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "New task"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "New assigned task"
 
 #: ../calendar/gui/tasks-component.c:1335
-msgid "Assigne_d Task"
-msgstr "Assigne_d Task"
-
-#: ../calendar/gui/tasks-component.c:1336
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "New task list"
 
 #: ../calendar/gui/tasks-component.c:1343
-msgid "Tas_k list"
-msgstr "Tas_k list"
-
-#: ../calendar/gui/tasks-component.c:1344
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8544,1579 +8870,1619 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Completed"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "In progress"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "is greater than"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "is less than"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar files (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
 #.
+#. *
+#. * 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 "Africa/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Africa/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Africa/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Africa/Algiers"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Africa/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Africa/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/Cairo"
 
-#: ../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 "Africa/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Africa/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Africa/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Africa/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Africa/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "America/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "America/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Centre"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarctica/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/South_Pole"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantic/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantic/Canary"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantic/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantic/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantic/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantic/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantic/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantic/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantic/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantic/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europe/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europe/Athens"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europe/Brussels"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucharest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europe/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europe/Moscow"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europe/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europe/Vienna"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europe/Warsaw"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indian/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indian/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indian/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indian/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indian/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indian/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacific/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
@@ -10128,11 +10494,11 @@ msgstr "Could not open autosave file"
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Insert Attachment"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "A_ttach"
 
@@ -10140,188 +10506,184 @@ msgstr "A_ttach"
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Attachment..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Print..."
 
-#: ../composer/e-composer-actions.c:485 ../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 "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Save _As..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Save _Draft"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Send Options"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Insert Send options"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "New _Message"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Open New Message window"
+
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Security"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the BCC field is displayed"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the CC field is displayed"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "_From Field"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Toggles whether the From chooser is displayed"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "_Post-To Field"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Toggles whether the Post-To field is displayed"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "_Subject Field"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Toggles whether the Subject field is displayed"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "_To Field"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Toggles whether the To field is displayed"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Attach"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
@@ -10370,37 +10732,33 @@ msgstr "S_ubject:"
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "Recent _Documents"
-
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10408,23 +10766,23 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Hide _Attachment Bar"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10571,23 +10929,27 @@ msgstr "You cannot attach the file `{0}' to this message."
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continue Editing"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Do not Recover"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:318
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Recover"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Save Message"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Save Draft"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution Mail and Calendar"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -10603,31 +10965,39 @@ msgstr "address card"
 msgid "calendar information"
 msgstr "calendar information"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution Information"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution Query"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:458
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Internal error, unknown error '%s' requested"
 
-#: ../e-util/e-plugin.c:308 ../mail/em-account-prefs.c:489
-#: ../mail/em-composer-prefs.c:979
-#: ../plugins/plugin-manager/plugin-manager.c:331
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Component"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "Name of the component being logged"
+
+#: ../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
 msgid "Enabled"
 msgstr "Enabled"
@@ -10636,15 +11006,15 @@ msgstr "Enabled"
 msgid "Whether the plugin is enabled"
 msgstr "Whether the plugin is enabled"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "An error occurred while printing"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "The printing system reported the following details about the error:"
 
-#: ../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 ""
@@ -10678,47 +11048,51 @@ msgstr "Overwrite file?"
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Could not display help for Evolution."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Work"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Personal"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_To Do"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Later"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "Label _Name:"
 
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Edit Label"
 
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Add Label"
 
-#: ../e-util/e-util-labels.c:359
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Label name cannot be empty."
 
-#: ../e-util/e-util-labels.c:364
+#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10851,65 +11225,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#: ../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
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Find items that meet the following criteria"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "A_dd Filter Criteria"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "If all criteria are met"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "If any criteria are met"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Find items:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "All related"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Replies"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_nclude threads"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Outgoing"
 
@@ -11009,7 +11383,7 @@ msgstr "in the future"
 msgid "months"
 msgstr "months"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "seconds"
 
@@ -11021,9 +11395,10 @@ msgstr "the current time"
 msgid "the time you specify"
 msgstr "the time you specify"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "weeks"
 
@@ -11039,7 +11414,7 @@ msgstr "Add Rule"
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Rule name"
 
@@ -11093,16 +11468,16 @@ msgstr "Evolution Mail preferences control"
 msgid "Evolution Network configuration control"
 msgstr "Evolution Network configuration control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
-#: ../mail/mail-component.c:749
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Mail"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
@@ -11119,12 +11494,12 @@ msgstr "Network Preferences"
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Licence Agreement"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11137,109 +11512,109 @@ msgstr ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../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
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
-#: ../mail/em-account-editor.c:1825 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identity"
 
-#: ../mail/em-account-editor.c:1874 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/em-account-editor.c:2064
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2238 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/em-account-editor.c:2297 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Defaults"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2363 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Security"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:2401 ../mail/em-account-editor.c:2492
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Checking for New Messages"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Default]"
 
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Account name"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:300 ../mail/em-composer-prefs.c:435
-#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
+#: ../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 "Unnamed"
 
-#: ../mail/em-composer-prefs.c:983
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../mail/em-composer-prefs.c:1032
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: ../mail/em-composer-prefs.c:1074
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. 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:1801
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11247,11 +11622,11 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
@@ -11268,10 +11643,6 @@ msgstr "Assign Colour"
 msgid "Assign Score"
 msgstr "Assign Score"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Attachments"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11288,10 +11659,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Completed On"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contains"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
@@ -11305,7 +11672,7 @@ msgid "Date sent"
 msgstr "Date sent"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11316,10 +11683,6 @@ msgstr "Delete"
 msgid "Deleted"
 msgstr "Deleted"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "does not contain"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "does not end with"
@@ -11340,10 +11703,6 @@ msgstr "does not sound like"
 msgid "does not start with"
 msgstr "does not start with"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Do Not Exist"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Draft"
@@ -11352,10 +11711,6 @@ msgstr "Draft"
 msgid "ends with"
 msgstr "ends with"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Exist"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "exists"
@@ -11368,14 +11723,10 @@ msgstr "Expression"
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Important"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "is"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "is after"
@@ -11388,18 +11739,6 @@ msgstr "is before"
 msgid "is Flagged"
 msgstr "is Flagged"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "is greater than"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "is less than"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "is not"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "is not Flagged"
@@ -11421,7 +11760,7 @@ msgstr "Junk"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Label"
 
@@ -11463,7 +11802,7 @@ msgstr "Play Sound"
 
 #. 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:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Read"
 
@@ -11535,9 +11874,9 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11548,11 +11887,11 @@ msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
@@ -11596,16 +11935,16 @@ msgstr "Important Messages"
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "All Account Search"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:185
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
@@ -11613,35 +11952,51 @@ msgstr[1] "Unread messages:"
 
 #. 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:189
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../mail/em-folder-properties.c:205 ../mail/em-folder-properties.c:207
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota usage (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
 msgstr "Quota usage"
 
-#: ../mail/em-folder-properties.c:397
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Search Folders"
 
@@ -11650,353 +12005,323 @@ msgstr "Search Folders"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Drafts"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Sent"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Loading..."
 
-#. 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 "%s (%u)"
-
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/em-folder-tree.c:996 ../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 "_Copy to Folder"
 
-#: ../mail/em-folder-tree.c:997 ../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 "_Move to Folder"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_View"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Move..."
 
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Re_fresh"
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../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:83
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Create folder"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
-#: ../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 "_Forward"
 
 #. 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:1342 ../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 "_Edit as New Message..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Move to Folder..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Mark as Un_important"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Label"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_None"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Search Folder based on _Subject"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Search Folder based on Se_nder"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Search Folder based on _Recipients"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Search Folder based on Mailing _List"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filter based on Sub_ject"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filter based on Sen_der"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filter based on Re_cipients"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filter based on _Mailing List"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. 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 "Default"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Retrieving Message..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "C_all To..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Create _Search Folder"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_From this Address"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_To this Address"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Next"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "M_atch case"
 
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12004,11 +12329,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12016,11 +12341,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../mail/em-format-html-display.c:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12028,11 +12353,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12040,11 +12365,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../mail/em-format-html-display.c:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12052,11 +12377,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12064,11 +12389,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12078,11 +12403,11 @@ msgstr ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: ../mail/em-format-html-display.c:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12090,11 +12415,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../mail/em-format-html-display.c:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12104,92 +12429,92 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../mail/em-format-html-display.c:1086 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Fit to Width"
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Show _Original Size"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Save attachment as"
 
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Select folder to save all attachments"
 
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Save Selected..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d at_tachment"
 msgstr[1] "%d at_tachments"
 
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "S_ave"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "No Attachment"
 
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "View _Unformatted"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Hide _Unformatted"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "O_pen With"
 
-#: ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2473
 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 ""
-"Evolution cannot render this e-mail as it is too large to handle. You can "
+"Evolution cannot render this e-mail as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 
 #: ../mail/em-format-html-print.c:156
@@ -12197,275 +12522,287 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Unknown external-body part."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Formatting Message..."
 
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../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:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../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:1772
+#: ../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:1903
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "From"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../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:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../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
 msgid "Date"
 msgstr "Date"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../mail/em-format.c:1156
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Could not parse PGP/MIME message"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Could not parse PGP/MIME message: Unknown error"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Could not parse PGP message"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Could not parse PGP message: Unknown error"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Every time"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Once per month"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Add Custom Junk Header"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Header Name:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Header Value Contains:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Contains Value"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Colour"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Tag"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin is available and the binary is installed."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s plugin is not available. Please check whether the package is installed."
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "No Junk plugin available"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Later"
 
-#: ../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 ""
-"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..."
-
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Unable to create new folder `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Unable to copy folder `%s' to `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Unable to scan for existing mailboxes at `%s': %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 ""
+"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..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Unable to open old POP keep-on-server data `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Unable to create POP3 keep-on-server data directory `%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 "Unable to copy POP3 keep-on-server data `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Failed to create local mail storage `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../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 ""
+"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..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Unable to create local mail folders at `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12473,43 +12810,44 @@ msgstr ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:869
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Add to Address Book"
 
-#: ../mail/em-subscribe-editor.c:596
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: ../mail/em-subscribe-editor.c:629
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:125
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
@@ -12535,11 +12873,11 @@ msgstr "Add address"
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Search Folder source"
 
@@ -12612,10 +12950,18 @@ msgstr ""
 "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 ""
+"Controls how frequently local changes are synchronised with the remote mail "
+"server. The interval must be at least 30 seconds."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../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\"."
@@ -12623,87 +12969,87 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are strings "
 "in the format \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Default height of the message window."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Default height of the subscribe dialogue."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Default width of the message window."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Default width of the subscribe dialogue."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
-"Determines whether to look up addresses for junk filtering in the local "
-"address book only"
-
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "Determines whether to look up in address book for sender e-mail"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 
 #: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Determines whether to lookup in address book for sender e-mail"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"Determines whether to look up the sender e-mail in the 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."
+"Determines whether to lookup the sender e-mail 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."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -12713,7 +13059,7 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -12721,59 +13067,59 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr "Disable or enable ellipsizing of folder names in folder tree"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Enable search folders"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Enable search folders on startup."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -12785,7 +13131,7 @@ msgstr ""
 "bar by just typing the folder name and the selection jumps automatically to "
 "that folder."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12793,27 +13139,27 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Enable to render message text part of limited size."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
@@ -12821,7 +13167,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12829,7 +13175,7 @@ msgstr ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -12839,7 +13185,7 @@ msgstr ""
 "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."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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."
@@ -12847,7 +13193,7 @@ msgstr ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -12861,7 +13207,7 @@ msgstr ""
 "\" window cannot be maximised. This key exists only as an implementation "
 "detail."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12869,11 +13215,11 @@ msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Enable or disable the prompt while marking multiple messages."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -12881,7 +13227,7 @@ msgstr ""
 "It disables/enables the repeated prompts to ask if offline synchronisation "
 "is required before going into offline mode."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -12891,31 +13237,31 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Last time empty junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Last time empty wastebasket was run"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "List of accepted licences"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -12923,15 +13269,15 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -12939,127 +13285,127 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose licence has been accepted."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
-"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."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Prompt to check if the user wants to go offline immediately"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -13067,71 +13413,75 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognise emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-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 "Search for the sender photo in local address books"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Sender e-mail address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Server synchronisation interval"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13139,67 +13489,67 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Spell checking colour"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialogue default height"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialogue default width"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Text message part limit"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "The last time empty junk was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "The last time empty wastebasket was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13207,7 +13557,7 @@ msgstr ""
 "This decides the maximum size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13217,15 +13567,15 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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 ""
-"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."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13237,21 +13587,21 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "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."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
@@ -13259,7 +13609,7 @@ msgstr ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13267,7 +13617,7 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13277,115 +13627,115 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Underline colour for misspelt words when using inline spelling."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Use side-by-side or wide layout"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "View/Bcc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "View/Cc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "View/Cc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "View/From menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "View/From menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "View/PostTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "View/PostTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "View/ReplyTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr "Whether disable ellipsizing feature of folder names in folder tree."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../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."
@@ -13393,43 +13743,43 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
@@ -13437,7 +13787,7 @@ msgstr "Importer Berkeley Mailbox format folders"
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
@@ -13447,178 +13797,176 @@ msgstr "Importing `%s'"
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %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 "Mail from %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Templates"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: ../mail/mail-component.c:906
-msgid "_Mail Message"
-msgstr "_Mail Message"
-
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: ../mail/mail-component.c:914
-msgid "Mail _Folder"
-msgstr "Mail _Folder"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../mail/mail-component.c:1062
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Error"
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Errors"
 
-#: ../mail/mail-component.c:1536
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Warnings and Errors"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Debug"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Error, Warnings and Debug messages"
 
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Debug Logs"
 
-#: ../mail/mail-component.c:1678
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Show _errors in the status bar for"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1694
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "second(s)."
 
-#: ../mail/mail-component.c:1700
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Log Messages:"
 
-#: ../mail/mail-component.c:1741
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Log Level"
 
-#: ../mail/mail-component.c:1750 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Time"
 
-#: ../mail/mail-component.c:1760 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../mail/mail-component.c:1769 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Close this window"
@@ -13869,11 +14217,11 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitally sign o_utgoing messages (by default)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Do not format messages when text si_ze exceeds"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
 #: ../mail/mail-config.glade.h:73
@@ -14007,18 +14355,22 @@ msgstr ""
 "first time"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Option is ignored if a match for custom junk headers is found."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -14026,7 +14378,7 @@ msgstr ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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."
@@ -14034,7 +14386,7 @@ msgstr ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "
@@ -14044,111 +14396,115 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in e-mail you send."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Please select among the following options"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Quoted"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "S_OCKS Host:"
 
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_elect..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "S_end message receipts:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Signatures Table"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Start _typing at the bottom on replying"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ype: "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14156,7 +14512,7 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14166,13 +14522,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"This option will be over-ridden if a match for custom junk headers is found."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14180,24 +14530,26 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../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 "User_name:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14207,124 +14559,124 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
 msgstr "_Automatic proxy configuration URL:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Default junk plugin:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Keep Signature above the original message on replying"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Load images in messages from contacts"
 
-#: ../mail/mail-config.glade.h:170
-msgid "_Lookup in local addressbook only"
-msgstr "_Lookup in local address book only"
-
 #: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "_Look up in local address book only"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Prompt when sending HTML messages to contacts that do not want them"
-
 #: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Prompt on sending HTML mail to contacts that do not want them"
+
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Select..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Show image animations"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Shrink To / Cc / Bcc headers to "
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "addresses"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "description"
 
@@ -14364,43 +14716,43 @@ msgstr "Case _sensitive"
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "F_ind:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Find in Message"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "None Selected"
 
-#: ../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
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../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."
@@ -14408,23 +14760,23 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -14471,104 +14823,104 @@ msgstr "Sending message %d of %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Cancelled."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Complete."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Retrieving quota information for folder %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: ../mail/mail-ops.c:1701
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/mail-ops.c:1702
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: ../mail/mail-ops.c:1783
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: ../mail/mail-ops.c:1890
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../mail/mail-ops.c:1975
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../mail/mail-ops.c:2053
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14577,11 +14929,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2125
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14590,75 +14942,75 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: ../mail/mail-ops.c:2408
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../mail/mail-ops.c:2494
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Cancelling..."
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Updating..."
 
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Enter Passphrase for %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Enter Passphrase"
 
-#: ../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 "Enter Password for %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
@@ -14666,11 +15018,6 @@ msgstr "User cancelled operation."
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_File"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Edit Signature"
@@ -14718,11 +15065,11 @@ msgstr "Updating Search Folders for '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Updating Search Folders for '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
@@ -15343,18 +15690,22 @@ msgstr "_Expunge"
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Answered"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Forwarded"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
@@ -15379,38 +15730,39 @@ msgstr "Higher"
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1594 ../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:1601 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Today %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../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 "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../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"
 
-#: ../mail/message-list.c:3818
+#. 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
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4081
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15418,7 +15770,7 @@ msgstr ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 
-#: ../mail/message-list.c:4083
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -15451,39 +15803,39 @@ msgstr "Sent Messages"
 msgid "Size"
 msgstr "Size"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Call"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../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 "For Your Information"
 
-#: ../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 "Forward"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/message-tag-followup.c:84 ../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 "Reply to All"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Review"
 
@@ -15508,6 +15860,10 @@ msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Subject or Recipients contains"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Subject or Sender contains"
 
@@ -15535,7 +15891,8 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:469
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Keywords"
 
@@ -15564,7 +15921,7 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Message has no attachments"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Edit Message"
 
@@ -15580,27 +15937,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Audio inline plugin"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Select name of the Evolution backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Select name of the Evolution backup file to restore"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Restart Evolution after restore"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Restore from backup"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -15610,95 +15967,119 @@ msgstr ""
 "Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restore Evolution from the backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Please select an Evolution Archive to restore:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Choose a file to restore"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Backup Evolution directory"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Check Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing Evolution accounts and settings"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Backup complete"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Backup current Evolution data"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Extracting files from backup"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Removing temporary backup files"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "Ensuring local sources"
+
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backing up to the folder %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Backing up Evolution Data"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Please wait while Evolution backs up your data."
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Restoring Evolution Data"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Please wait while Evolution restores your data."
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "This may take a while depending on the amount of data in your account."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "A plugin for backing up and restore Evolution data and settings."
@@ -15743,9 +16124,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Please select a valid backup file to restore."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr ""
-"The selected folder does not have enough permissions to create the file"
+msgid "The selected folder is not writable."
+msgstr "The selected folder is not writable."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15773,47 +16153,41 @@ msgstr "R_estore Settings..."
 msgid "_Backup Settings..."
 msgstr "_Backup Settings..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr ""
-"_Automatically create entries in the address book when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "_Auto-create address book entries when replying to messages"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr ""
-"Periodically synchronise contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
 #: ../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 ""
@@ -15874,17 +16248,18 @@ msgstr "Bogofilter junk plugin"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filters junk messages using Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "Use _SSL"
 
@@ -15904,17 +16279,18 @@ msgstr "Local Calendars"
 msgid "Provides core functionality for local calendars."
 msgstr "Provides core functionality for local calendars."
 
-#: ../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:375
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "Re_fresh:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Secure connection"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Userna_me:"
 
@@ -16014,23 +16390,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Do you want to make Evolution your default e-mail client?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:691
+#: ../shell/main.c:585
 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 "Mark as _default address book"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Mark as _default calendar"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Mark as _default task list"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Mark as _default memo list"
 
@@ -16040,21 +16416,35 @@ msgstr "Default Sources"
 
 #: ../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 ""
-"Provides functionallity for marking a calendar or address book as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
 
-#: ../plugins/email-custom-header/email-custom-header.c:541
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Custom Header Options"
-msgstr "Custom Header Options"
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Key"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Values"
+
+#. 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 ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
@@ -16068,8 +16458,8 @@ msgid "Custom Header"
 msgstr "Custom Header"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
-msgstr "List of Custom Header"
+msgid "List of Custom Headers"
+msgstr "List of Custom Headers"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16098,12 +16488,12 @@ msgid "_User:"
 msgstr "_User:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Secure Password"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16111,11 +16501,11 @@ msgstr ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Plaintext Password"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16123,11 +16513,11 @@ msgstr ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Out Of Office"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -16135,83 +16525,87 @@ msgstr ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "I am out of the office"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "I am in the office"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Change the password for Exchange account"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Change Password"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Manage the delegate settings for Exchange account"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegation Assistant"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Miscelleneous"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "View the size of all Exchange folders"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Folders Size"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange Settings"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Mailbox:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Authentication Type"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16223,7 +16617,7 @@ 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"
@@ -16231,7 +16625,7 @@ msgstr ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 
-#: ../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 "The two passwords do not match. Please re-enter the passwords."
 
@@ -16251,38 +16645,38 @@ msgstr "New Password:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Your current password has expired. Please change your password now."
 
-#: ../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 "Your password will expire in the next %d days"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Custom"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (read, create, edit)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Author (read, create)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Reviewer (read-only)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegate Permissions"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissions for %s"
@@ -16290,7 +16684,7 @@ msgstr "Permissions for %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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -16300,66 +16694,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "You have been given the following permissions on my folders:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "You are also permitted to see my private items."
 
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "However you are not permitted to see my private items."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "You have been designated as a delegate for %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegate To"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Remove the delegate %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Could not access Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Could not find self in Active Directory"
 
-#: ../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 "Could not find delegate %s in Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Could not remove delegate %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Could not update list of delegates."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Could not add delegate %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Error reading delegates list."
 
@@ -16407,25 +16801,25 @@ msgstr "_Summarise permissions"
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permissions..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Folder Name"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Folder Size"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "User"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../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 "Subscribe to Other User's Folder"
@@ -16434,20 +16828,20 @@ msgstr "Subscribe to Other User's Folder"
 msgid "Exchange Folder Tree"
 msgstr "Exchange Folder Tree"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "Unsubscribe Folder..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Really unsubscribe from folder \"%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Unsubscribe from \"%s\""
@@ -16512,18 +16906,18 @@ msgstr "Your password will expire in 7 days..."
 msgid "_Change Password"
 msgstr "_Change Password"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Permission denied.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Add User:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../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
 msgid "Add User"
 msgstr "Add User"
 
@@ -16641,15 +17035,11 @@ msgstr "_Sensitivity: "
 msgid "_User"
 msgstr "_User"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Select User"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Address Book..."
 
@@ -16663,10 +17053,10 @@ msgstr "Subscribe to Other User's Calendar"
 
 #: ../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 ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account-specific operations "
 "and features."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16756,10 +17146,14 @@ msgid "Could not update out-of-office state"
 msgstr "Could not update out-of-office state"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Evolution requires a restart to load the subscribed user's mailbox"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange Account is offline."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16787,32 +17181,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Failed to update delegates:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Folder does not exist"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Folder offline"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Generic error"
 
-#: ../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 "Global Catalogue Server is not reachable"
 
-#: ../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."
@@ -16820,72 +17214,72 @@ msgstr ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialogue."
 
-#: ../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 "Mailbox for {0} is not on this server."
 
-#: ../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 "Make sure the URL is correct and try again."
 
-#: ../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 "Make sure the server name is spelt correctly and try again."
 
-#: ../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 "Make sure the username and password are correct and try again."
 
-#: ../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 "No Global Catalogue server configured for this account."
 
-#: ../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 "No mailbox for user {0} on {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "No such user {0}"
 
-#: ../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 "Password successfully changed."
 
-#: ../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 ""
 "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 
-#: ../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 "Please make sure the name of the Global Catalogue Server is correct."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Please restart Evolution for changes to take effect"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Please select a user."
 
-#: ../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 "Server rejected password because it is too weak."
 
-#: ../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 "The Exchange account will be disabled when you quit Evolution"
 
-#: ../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 "The Exchange account will be removed when you quit Evolution"
 
-#: ../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 "The Exchange server is not compatible with Exchange Connector."
 
-#: ../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."
@@ -16893,7 +17287,7 @@ msgstr ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 
-#: ../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"
@@ -16907,39 +17301,40 @@ msgstr ""
 "\n"
 "Or you might have just typed your password wrong."
 
-#: ../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 "Try again with a different password."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Unable to add user to access control list:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Unable to edit delegates."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Unknown error looking up {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Unknown type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Unsupported operation"
 
-#: ../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 "You are nearing your quota available for storing mail on this server."
 
-#: ../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."
@@ -16947,19 +17342,19 @@ msgstr ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 
-#: ../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 "You cannot make yourself your own delegate"
 
-#: ../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 "You have exceeded your quota for storing mail on this server."
 
-#: ../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 "You may only configure a single Exchange account."
 
-#: ../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."
@@ -16967,7 +17362,7 @@ msgstr ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 
-#: ../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."
@@ -16975,7 +17370,7 @@ msgstr ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 
-#: ../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."
@@ -16983,19 +17378,19 @@ msgstr ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 
-#: ../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 "Your password has expired."
 
-#: ../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 "{0} cannot be added to an access control list"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} is already a delegate"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} is already in the list"
 
@@ -17053,18 +17448,18 @@ msgstr ""
 "setting a different editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Compose in External Editor"
+msgid "Compose in _External Editor"
+msgstr "Compose in _External Editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Compose messages using an external editor"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17072,15 +17467,15 @@ msgstr ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Select a (48*48) png of size < 700bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG files"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Face"
 
@@ -17115,26 +17510,60 @@ msgstr "Unsubscribe Folders"
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Please enter user name first."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Enter password for user %s to access list of subscribed calendars."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Cannot read data from Google server.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "Cal_endar:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Retrieve _list"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
-msgstr "A plugin to setup google calendar."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "A plugin to set up Google Calendar and Contacts."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google sources"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Checklist"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "A plugin to setup groupwise calendar and contacts sources."
+msgstr "A plugin to setup Groupwise calendar and contacts sources."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
@@ -17173,16 +17602,16 @@ msgstr "Install the shared folder"
 msgid "Shared Folder Installation"
 msgstr "Shared Folder Installation"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Junk Settings"
 
-#: ../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 "Junk Mail Settings"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Junk Mail Settings..."
 
@@ -17208,10 +17637,22 @@ msgid "_Junk List"
 msgstr "_Junk List"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Message Retract"
+
+#: ../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 ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Message retracted successfully"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Retract Mail"
 
@@ -17219,12 +17660,6 @@ msgstr "Retract Mail"
 msgid "Add Send Options to groupwise messages"
 msgstr "Add Send Options to groupwise messages"
 
-#: ../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"
-msgstr "Send Options"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "A plugin for the features in Groupwise accounts."
@@ -17274,29 +17709,33 @@ msgstr "Account Already Exists"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your e-mail "
+"address and try again."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "This is a recurring meeting"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "What would you like to {0}?"
+msgid "Would you like to accept it?"
+msgstr "Would you like to accept it?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Would you like to decline it?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "You cannot share folder with specified user &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../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 "You have to specify a user name whom you want to add to the list"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Accept Tentatively"
 
@@ -17313,7 +17752,7 @@ msgid "Con_tacts..."
 msgstr "Con_tacts..."
 
 #: ../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 "Message"
 
@@ -17394,9 +17833,9 @@ msgstr "<b>Account Name</b>"
 msgid "Proxy Login"
 msgstr "Proxy Login"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17405,44 +17844,44 @@ msgstr "%sEnter password for %s (user %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:509
 msgid "_Proxy Login..."
 msgstr "_Proxy Login..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "The Proxy tab will be available only when the account is online."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Users"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "New _Shared Folder..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
 msgstr "Custom Notification"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Add   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modify"
 
@@ -17507,11 +17946,11 @@ msgstr "A plugin to setup hula calendar sources."
 msgid "Hula Account Setup"
 msgstr "Hula Account Setup"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Custom Headers"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP Headers"
 
@@ -17585,8 +18024,8 @@ msgstr "Select Task List"
 msgid "Select Calendar"
 msgstr "Select Calendar"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Import"
 
@@ -17623,13 +18062,14 @@ msgstr ""
 "Evolution could not find an iPod to synchronise with. Either the iPod is not "
 "connected to the system or it is not powered on."
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar format (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Synchronise the selected task/memo/calendar/address book with an Apple iPod"
 
@@ -17641,128 +18081,128 @@ msgstr "Synchronise to iPod"
 msgid "iPod Synchronization"
 msgstr "iPod Synchronisation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Failed to load the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Unable to send memo information, the memo does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17770,15 +18210,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17786,11 +18226,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17798,227 +18238,227 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:300
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Please respond on behalf of <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Received on behalf of <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> through %s has published the following meeting information:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> has published the following meeting information:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> has delegated the following meeting to you:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> requests your presence at the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> through %s wishes to add to an existing meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wishes to add to an existing meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18027,89 +18467,89 @@ msgstr ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> through %s has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> through %s has cancelled the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> has cancelled the following meeting."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> through %s has proposed the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> has proposed the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> through %s has declined the following meeting changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> has declined the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> through %s has published the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> has published the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> requests the assignment of %s to the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> through %s has assigned you a task:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> has assigned you a task:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> through %s wishes to add to an existing task:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wishes to add to an existing task:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18118,7 +18558,7 @@ msgstr ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18127,131 +18567,131 @@ msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> has sent back the following assigned task response:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> through %s has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> through %s has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> through %s has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> through %s wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> through %s has cancelled the following shared memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> has cancelled the following shared memo:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Open Calendar"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Decline"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Accept"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Accept all"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Send Information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Update"
 
@@ -18355,9 +18795,11 @@ msgstr "Generates a D-Bus message when new mail messages arrive."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18403,8 +18845,16 @@ msgstr "Whether to notify new messages in Inbox folder only."
 msgid "Generate a _D-Bus message"
 msgstr "Generate a _D-Bus message"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolution's Mail Notification"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "Mail Notification Properties"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18419,55 +18869,55 @@ msgstr[1] ""
 "You have received %d new messages\n"
 "in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "You have received %d new message."
 msgstr[1] "You have received %d new messages."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "New e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Show icon in _notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "B_link icon in notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Popup _message together with the icon"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Play sound when new messages arrive"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Play _sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Specify _filename:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Pl_ay"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
@@ -18499,12 +18949,12 @@ msgstr "Con_vert to Meeting"
 msgid "Mail to meeting"
 msgstr "Mail to meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18617,12 +19067,12 @@ msgstr "Send e-mail message to mailing list?"
 #: ../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 ""
 "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}"
 
@@ -18700,23 +19150,23 @@ msgstr "_Subscribe to List"
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Mark all messages in this folder and subfolders as read?"
-
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Do you want the operation to be performed also in the subfolders?"
+msgid "Also mark messages in subfolders?"
+msgstr "Also mark messages in subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Mark All Messages as Read"
+#: ../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 ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Current Folder and _Subfolders"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Current _Folder Only"
 
@@ -18762,7 +19212,7 @@ msgstr "A plugin for managing which plugins are enabled or disabled."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
@@ -18774,33 +19224,24 @@ msgstr "Enable and disable plugins"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Description"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Configuration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Overview"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "There is no configuration option for this plugin."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -18825,19 +19266,19 @@ msgstr "Plain Text Mode"
 msgid "Prefer plain-text"
 msgstr "Prefer plain-text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:158
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:159
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Prefer PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:160
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Only ever show PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
@@ -18953,6 +19394,30 @@ msgstr ""
 "iCal\n"
 "Free/Busy"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python Plugin Loader tests"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python Test Plugin"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Test Plugin for Python EPlugin loader."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "A plugin which loads other plugins written using Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Python Loader"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (built-in)"
@@ -19023,7 +19488,7 @@ msgstr "A plugin for saving all attachments or parts of a message at once."
 
 #. 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:314
 msgid "Save attachments"
 msgstr "Save attachments"
 
@@ -19035,16 +19500,15 @@ msgstr "Save Attachments..."
 msgid "Save all attachments"
 msgstr "Save all attachments"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Select save base name"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME Type"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Save"
 
@@ -19052,79 +19516,79 @@ msgstr "Save"
 #. * 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:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Description List"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Created"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "End"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modified"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Advanced options for the CSV format"
 
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Prepend a header"
 
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Value delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Record delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsulate values with:"
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value format (.csv)"
 
@@ -19146,15 +19610,15 @@ msgstr "_Save to 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:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Select destination file"
 
@@ -19179,22 +19643,22 @@ msgid "Show _only this Task List"
 msgstr "Show _only this Task List"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "A plugin that handles the Startup wizard."
+msgid "Guides you through your initial account setup."
+msgstr "Guides you through your initial account setup."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Startup wizard"
+msgid "Setup Assistant"
+msgstr "Setup Assistant"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19206,29 +19670,29 @@ msgstr ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importing files"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importing data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -19245,18 +19709,64 @@ msgid "Thread messages by subject"
 msgstr "Thread messages by subject"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "F_all back to threading messages by subject"
 
+#: ../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 ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "No title"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Save as _Template"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Save as Template"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Drafts-based template plugin"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr "A simple plugin which uses ytnef to decode TNEF attachments."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
 msgstr "TNEF Attachment decoder"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "A plugin to set up WebDAV contacts."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV contacts"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution Shell"
@@ -19274,116 +19784,110 @@ msgid "Evolution Test component"
 msgstr "Evolution Test component"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "A string description of the current printer settings."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr "Authenticate proxy server connections"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "Automatic proxy configuration URL"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Decides whether the crash detection should be run or not."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Default window height"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Default window state"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Default window width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP proxy password"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP proxy username"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 or alias of the component to be shown by default at start-up."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"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 ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and the locally-stored password in .gnome2_private/."
+"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."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Last upgraded configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "List of paths for the folders to be synchronised to disk for offline usage"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Non-proxy hosts"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Password to pass as authentication when doing HTTP proxying."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Proxy configuration mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Secure HTTP proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Secure HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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 "
@@ -19395,27 +19899,23 @@ msgstr ""
 "configuration\" and \"use proxy configuration provided in the autoconfig URL"
 "\" respectively."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Skip recovery warning dialogue"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:577
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19423,19 +19923,19 @@ msgstr ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "The default height for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "The default width for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../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\")."
@@ -19443,19 +19943,19 @@ msgstr ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "The machine name to proxy HTTP through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "The machine name to proxy secure HTTP through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "The machine name to proxy socks through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -19463,7 +19963,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -19471,7 +19971,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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."
@@ -19479,7 +19979,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -19489,7 +19989,7 @@ msgstr ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../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 "
@@ -19501,66 +20001,58 @@ msgstr ""
 "(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)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL that provides proxy configuration values."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Use HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Username to pass as authentication when doing HTTP proxying."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Whether Evolution will start up in offline mode instead of online mode."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Whether crash detection should be done or not"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Whether or not the window should be maximised."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Whether the status bar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Whether the warning dialogue in development versions of Evolution is skipped."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Whether the warning dialogue in recovery of Evolution is skipped."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Window button style"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
@@ -19576,29 +20068,23 @@ msgstr "Active Connections"
 msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 "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."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -19610,23 +20096,23 @@ msgstr ""
 "settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
@@ -19634,29 +20120,9 @@ msgstr "Import a _single file"
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "No folder name specified."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Folder name cannot contain the Return character."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Folder name cannot contain the character \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Folder name cannot contain the character \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' and '..' are reserved folder names."
-
 #. 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:50 ../shell/e-shell-window.c:343
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19681,71 +20147,79 @@ msgstr "Bug buddy could not be run."
 #. 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:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72@yahoo.com>\n"
 "David Lodge <dave@cirt.net>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Error opening the FAQ webpage."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in the process of going offline."
 
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Unknown system error."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:316
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
@@ -19755,15 +20229,11 @@ msgstr "Configuration Database not found"
 msgid "New"
 msgstr "New"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "New 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 "Create a new test item"
 
@@ -19806,7 +20276,7 @@ msgstr ""
 "importing external files into Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19841,7 +20311,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19849,66 +20319,43 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
-#: ../shell/main.c:315
-msgid "Evolution Crash Detection"
-msgstr "Evolution Crash Detection"
-
-#: ../shell/main.c:317
-msgid "Ig_nore"
-msgstr "Ig_nore"
-
-#: ../shell/main.c:332
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-
-#: ../shell/main.c:343
-msgid "_Do not show this message again"
-msgstr "_Do not show this message again"
-
-#: ../shell/main.c:575
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcibly shut down all Evolution components"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:591
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:593
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:678
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:706
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20059,7 +20506,7 @@ msgstr ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20070,7 +20517,7 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: ../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 "
@@ -20080,7 +20527,7 @@ msgstr ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 
-#: ../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 "
@@ -20138,27 +20585,27 @@ msgstr "E-Mail Address"
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Enter the password for `%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 "Enter new password for certificate database"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Enter new password"
 
 #. 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"
@@ -20167,7 +20614,7 @@ msgstr ""
 "Issued to:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20176,7 +20623,7 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Select certificate"
 
@@ -20363,7 +20810,7 @@ msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
@@ -20530,15 +20977,15 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
@@ -20593,7 +21040,7 @@ msgid "Copy to Folder..."
 msgstr "Copy to Folder..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Create a new address book folder"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -20678,7 +21125,7 @@ msgstr "Save the contacts of the selected folder as VCard"
 msgid "Select All"
 msgstr "Select All"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Select _All"
 
@@ -20747,7 +21194,7 @@ msgstr "_Move Contact to..."
 msgid "_Move Folder Contacts To"
 msgstr "_Move Folder Contacts To"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_New"
 
@@ -20808,7 +21255,7 @@ msgid "Month"
 msgstr "Month"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Next"
 
@@ -20817,7 +21264,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previews the calendar to be printed"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Previous"
 
@@ -20885,192 +21332,6 @@ msgstr "Work Week"
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Click here to attach a file"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Click here to close the current window"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Click here to save the current window"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Click here to view help available"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Close"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copy selected text to the clipboard"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Cut selected text to the clipboard"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "I_nsert"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Paste text from the clipboard"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Select all text"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Help"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Options"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "All Day Event"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "All _Day Event"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Classify as Confidential"
-
-#: ../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 "Classify as Private"
-
-#: ../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 "Classify as public"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Click here to set or unset alarms for this event"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Insert advanced send options"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Make this a recurring event"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_blic"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Query free / busy information for the attendees"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_ole Field"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Send _Options"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Show time as _busy"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Time _Zone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Toggles whether the Attendee Type field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Toggles whether the RSVP field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Toggles whether the Role field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Toggles whether the Status field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Toggles whether the time zone is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Toggles whether to display categories"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Toggles whether to have All Day Event"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Toggles whether to show time as busy"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarms"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categories"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Classification"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidential"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Free/Busy"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Private"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Recurrence"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Status Field"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Type Field"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
@@ -21318,7 +21579,7 @@ msgstr "Threaded Message list"
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Message"
@@ -21653,126 +21914,126 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Show a blinking cursor in the body of displayed messages"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Show messages in the normal style"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Find in Message..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Important"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Quoted"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Read"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Save Message..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Close"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Main toolbar"
@@ -21809,22 +22070,6 @@ msgstr "View the selected memo"
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Click change / view the status details of the task"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Status Details"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Time Zone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Status Details"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copy selected tasks"
@@ -22018,50 +22263,54 @@ msgid "View/Hide the Status Bar"
 msgstr "View/Hide the Status Bar"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Work _Offline"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_About"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Forget Passwords"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Frequently Asked Questions"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Hide Buttons"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Synchronisation Options..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Window"
 
@@ -22138,11 +22387,11 @@ msgid "With _Status"
 msgstr "With _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -22172,19 +22421,19 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
-#: ../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 "Collection"
 
-#: ../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 "Define Views for %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 "Define Views"
 
@@ -22200,11 +22449,11 @@ msgstr "Define Views for \"%s\""
 msgid "Table"
 msgstr "Table"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -22218,7 +22467,7 @@ msgstr "_Replace existing view"
 
 #. 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 "Custom View"
 
@@ -22227,40 +22476,40 @@ msgid "Save Custom View"
 msgstr "Save Custom View"
 
 #: ../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 "Define Views..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Select View: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Save Custom View..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Factory"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Define New View"
 
@@ -22276,43 +22525,17 @@ msgstr "Type of View"
 msgid "Type of view:"
 msgstr "Type of view:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Attachment Bar"
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-msgid "Recent Docu_ments"
-msgstr "Recent Docu_ments"
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Cannot attach file %s: %s"
 
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Cannot attach file %s: not a regular file"
@@ -22334,11 +22557,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1278
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
@@ -22383,30 +22606,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "Minimum width"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "Minimum Width"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Spacing"
 
-#: ../widgets/misc/e-cell-date-edit.c:292
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Now"
 
-#: ../widgets/misc/e-cell-date-edit.c:849
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -22415,150 +22638,150 @@ msgstr "The time must be in the format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltic"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Central European"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinese"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Greek"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korean"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../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 "Western European"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Western European, New"
 
-#: ../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 "Traditional"
 
-#: ../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 "Simplified"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../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 "Unknown character set: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Other..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:409
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Today"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Expanded"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Whether or not the expander is expanded"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Text of the expander's label"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Use underline"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22566,82 +22789,82 @@ msgstr ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Space to put between the label and the child"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Label widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "A widget to display in place of the usual expander label"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Expander Size"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indicator Spacing"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Spacing around expander arrow"
 
 #. 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 "Advanced Search"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Save Search"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Searches"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Searches"
 
-#: ../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 "_Save Search..."
 
-#: ../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 "_Edit Saved Searches..."
 
-#: ../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 "_Advanced Search..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Current Message"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Choose Image"
 
@@ -22657,15 +22880,23 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "Online"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "The button state is online"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sync with:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sync Private Records:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Sync Categories:"
 
@@ -22681,74 +22912,74 @@ msgstr "Reflow model"
 msgid "Column width"
 msgstr "Column width"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Search"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Search"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Item ID"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1018
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "Sho_w: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "Sear_ch: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1047
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " i_n "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Cursor Row"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Cursor Column"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Sorter"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Selection Mode"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Cursor Mode"
 
@@ -22776,10 +23007,6 @@ msgstr "<b>Status Tracking</b>"
 msgid "A_uto-delete sent item"
 msgstr "A_uto-delete sent item"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classification"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Creat_e a sent item to track information"
@@ -22886,19 +23113,19 @@ msgid "_When opened:"
 msgstr "_When opened:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Click here to go to URL"
 
@@ -23095,95 +23322,95 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
-#: ../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 item)"
 msgstr[1] "%s : %s (%d items)"
 
-#: ../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 item)"
 msgstr[1] "%s (%d items)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alternating Row Colours"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Horizontal Draw Grid"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Vertical Draw Grid"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Draw focus"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Cursor mode"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Selection model"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Length Threshold"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Uniform row height"
 
-#: ../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 "Frozen"
 
@@ -23249,7 +23476,7 @@ msgid "Font Description"
 msgstr "Font Description"
 
 #: ../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 "Sort Info"
 
@@ -23259,36 +23486,36 @@ msgstr "Sort Info"
 msgid "Tree"
 msgstr "Tree"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Table header"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Table model"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Cursor row"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Always search"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Use click to add"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree table adapter"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retro Look"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Draw lines and +/- expanders."
 
@@ -23396,6 +23623,188 @@ msgstr "IM Context"
 msgid "Handle Popup"
 msgstr "Handle Popup"
 
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Recent Docu_ments"
+
+#~ msgid "_Contact"
+#~ msgstr "_Contact"
+
+#~ msgid "Contact _List"
+#~ msgstr "Contact _List"
+
+#~ msgid "Address _Book"
+#~ msgstr "Address _Book"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Properties..."
+
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+
+#~ msgid "_Appointment"
+#~ msgstr "_Appointment"
+
+#~ msgid "M_eeting"
+#~ msgstr "M_eeting"
+
+#~ msgid "All Day A_ppointment"
+#~ msgstr "All Day A_ppointment"
+
+#~ msgid "Cale_ndar"
+#~ msgstr "Cale_ndar"
+
+#~ msgid "D_escription:"
+#~ msgstr "D_escription:"
+
+#~ msgid "De_scription:"
+#~ msgstr "De_scription:"
+
+#~ msgid "Updating query"
+#~ msgstr "Updating query"
+
+#~ msgid "Mem_o"
+#~ msgstr "Mem_o"
+
+#~ msgid "_Shared memo"
+#~ msgstr "_Shared memo"
+
+#~ msgid "Memo li_st"
+#~ msgstr "Memo li_st"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Upcoming Appointments"
+
+#~ msgid "Assigne_d Task"
+#~ msgstr "Assigne_d Task"
+
+#~ msgid "Tas_k list"
+#~ msgstr "Tas_k list"
+
+#~ msgid "_Save Message"
+#~ msgstr "_Save Message"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "_Mail Message"
+#~ msgstr "_Mail Message"
+
+#~ msgid "Mail _Folder"
+#~ msgstr "Mail _Folder"
+
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr ""
+#~ "The selected folder does not have enough permissions to create the file"
+
+#~ msgid "Custom Header Options"
+#~ msgstr "Custom Header Options"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "Mark all messages in this folder and subfolders as read?"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Do you want the operation to be performed also in the subfolders?"
+
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "Mark All Messages as Read"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "There is no configuration option for this plugin."
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "A plugin that handles the Startup wizard."
+
+#~ msgid "Startup wizard"
+#~ msgstr "Startup wizard"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "A string description of the current printer settings."
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Decides whether the crash detection should be run or not."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Skip recovery warning dialogue"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Whether crash detection should be done or not"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "Whether the warning dialogue in recovery of Evolution is skipped."
+
+#~ msgid "No folder name specified."
+#~ msgstr "No folder name specified."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Folder name cannot contain the Return character."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Folder name cannot contain the character \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Folder name cannot contain the character \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' and '..' are reserved folder names."
+
+#~ msgid "_Test"
+#~ msgstr "_Test"
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolution Crash Detection"
+
+#~ msgid "Ig_nore"
+#~ msgstr "Ig_nore"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Do not show this message again"
+
+#~ msgid "All Day Event"
+#~ msgstr "All Day Event"
+
+#~ msgid "Send _Options"
+#~ msgstr "Send _Options"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Show messages in the normal style"
+
+#~ msgid "Status Details"
+#~ msgstr "Status Details"
+
+#~ msgid "Time Zone"
+#~ msgstr "Time Zone"
+
+#~ msgid "%u byte"
+#~ msgid_plural "%u bytes"
+#~ msgstr[0] "%u byte"
+#~ msgstr[1] "%u bytes"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Permission Denied."
 
@@ -23454,9 +23863,6 @@ msgstr "Handle Popup"
 #~ msgid "Remind _missing attachments"
 #~ msgstr "Remind _missing attachments"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "_Continue Editing"
-
 #~ msgid "_Refresh:"
 #~ msgstr "_Refresh:"
 
@@ -23505,9 +23911,6 @@ msgstr "Handle Popup"
 #~ msgid "Save As"
 #~ msgstr "Save As"
 
-#~ msgid "Save Draft"
-#~ msgstr "Save Draft"
-
 #~ msgid "Save in folder..."
 #~ msgstr "Save in folder..."
 
@@ -23538,9 +23941,6 @@ msgstr "Handle Popup"
 #~ msgid "Save the current file and close the window"
 #~ msgstr "Save the current file and close the window"
 
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Add folder to your list of subscribed folders"
-
 #~ msgid "Refresh List"
 #~ msgstr "Refresh List"
 
@@ -23983,9 +24383,6 @@ msgstr "Handle Popup"
 #~ msgid "Emulate label resize"
 #~ msgstr "Emulate label resize"
 
-#~ msgid "_Phone List"
-#~ msgstr "_Phone List"
-
 #~ msgid "Organization"
 #~ msgstr "Organisation"
 
diff --git a/po/es.po b/po/es.po
index dc8ce2f33c..7158ec7864 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,7 +2,6 @@
 # Copyright © 2000-2002, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:683
 # Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
 # Héctor García �lvarez <hector@scouts-es.org>, 2000-2002.
 # Ismael Olea <ismael@olea.org>, 2001, (revisiones) 2003.
@@ -11,16 +10,17 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008.
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:18+0000\n"
-"PO-Revision-Date: 2008-08-17 23:36+0200\n"
+"POT-Creation-Date: 2008-08-31 11:09+0000\n"
+"PO-Revision-Date: 2008-08-31 17:18+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"
-"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"
@@ -28,16 +28,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "libreta de direcciones de Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
@@ -113,7 +113,7 @@ msgstr "Ir a hoy"
 msgid "Go to Date"
 msgstr "Ir a una fecha"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-day-view-main-item.c:301
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "una tabla para ver y seleccionar el rango de tiempo actual"
@@ -157,7 +157,7 @@ msgstr "vista de calendario para una semana laboral"
 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:188
+#: ../a11y/calendar/ea-gnome-calendar.c:186
 #: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
@@ -168,26 +168,26 @@ msgstr "%A, %e de %b de %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
+#: ../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
 msgid "%a %d %b"
 msgstr "%a, %e de %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:762
 #: ../calendar/gui/calendar-component.c:767
 #: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %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:781
 #: ../calendar/gui/calendar-component.c:788
 #: ../calendar/gui/calendar-component.c:794
@@ -200,32 +200,32 @@ msgstr "%e de %B de %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
+#: ../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
 msgid "%d %b"
 msgstr "%e de %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barra de búsqueda"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "barra de búsqueda del calendario de Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Botón de salto"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Pulse aquí para buscar más acontecimientos."
 
@@ -303,7 +303,7 @@ msgstr "pulse para añadir"
 msgid "click"
 msgstr "pulsar"
 
-#: ../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 "ordenar"
 
@@ -321,23 +321,23 @@ msgstr "Calendario: desde %s a %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario de Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Botón combo"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Activar predeterminados"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Menú emergente"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Conmutar barra de adjuntos"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "activar"
 
@@ -391,7 +391,7 @@ msgid "Could not get schema information for LDAP server."
 msgstr "No es posible obtener el esquema de información del servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "No es posible eliminar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -410,7 +410,7 @@ msgid "Delete address book '{0}'?"
 msgstr "¿Quiere borrar la libreta de direcciones «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Error al cargar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -446,11 +446,12 @@ msgstr ""
 "actual"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imagen que ha seleccionado es grande. ¿Quiere redimensionarla y "
 "almacenarla?"
@@ -466,34 +467,34 @@ msgstr ""
 "administrador de sistema las bases de búsqueda soportadas."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Esta libreta de direcciones se eliminará para siempre."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Esta libreta de direcciones no se pudo abrir."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 ""
 "Este servidor de libretas de direcciones no tiene ninguna de las bases de "
 "búsqueda sugeridas."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Este servidor de libretas de direcciones quizá no se pueda alcanzar o el "
 "nombre del servidor podría estar mal escrito o su conexión de red quizá esté "
 "caída."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Esta libreta de direcciones se eliminará para siempre."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor no soporta el esquema de información LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Es imposible abrir la libreta de direcciones"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -510,7 +511,7 @@ msgstr "¿Desea guardar los cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Está moviendo un contacto desde una libreta a otra, pero no puede ser "
@@ -528,7 +529,8 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
-msgstr "No tiene permisos para borrar este contacto en esta Libreta de direcciones."
+msgstr ""
+"No tiene permisos para borrar este contacto en esta Libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -537,7 +539,8 @@ msgid ""
 msgstr "Ha modificado este contacto. ¿Desea guardar estos cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Los contactos para {0} no estarán disponibles hasta que Evolution se "
 "reinicie."
@@ -565,7 +568,7 @@ msgstr "_Redimensionar"
 msgid "_Use as it is"
 msgstr "_Usar tal cual es"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#. 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}"
@@ -582,7 +585,7 @@ msgstr "Dirección de sincr. predeterminada:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "No es posible cargar la libreta de direcciones"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -684,39 +687,39 @@ msgstr "Privado"
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Crea una libreta de direcciones nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
@@ -739,7 +742,7 @@ msgstr "Copiar la li_breta localmente para trabajar desconectado"
 #: ../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:280 ../mail/mail-config.glade.h:89
+#: ../mail/em-folder-properties.c:282 ../mail/mail-config.glade.h:89
 #: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -766,7 +769,7 @@ msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:982
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Búsqueda"
 
@@ -908,7 +911,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:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1034,8 +1037,10 @@ msgid "Email address"
 msgstr "Dirección de correo-e"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1271,7 +1276,7 @@ msgstr "tarjetas"
 #: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
 #: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutos"
@@ -2814,7 +2819,8 @@ msgstr "_Nombre de la lista:"
 
 #: ../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 dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
@@ -3577,9 +3583,9 @@ msgstr "Método de autenticación no soportado"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 ""
 "No es posible abrir esta libreta de direcciones. Esto significa que esta "
 "libreta no está marcada para su uso desconectado o no la ha descargado para "
@@ -3589,7 +3595,7 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, 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 ""
 "No es posible abrir esta libreta de direcciones. Compruebe que la ruta %s "
@@ -3597,8 +3603,8 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
 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 ""
 "No es posible abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
@@ -3615,8 +3621,8 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:132
 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 ""
 "No es posible abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
@@ -3630,7 +3636,7 @@ 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 ""
 "Se encontraron más tarjetas que las que el servidor está \n"
 "configurado para devolver o Evolution está configurado\n"
@@ -3641,9 +3647,9 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:167
 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 ""
 "El tiempo especificado para efectuar esta consulta excedió el límite del\n"
 "servidor o el límite que ha configurado en la libreta de direcciones.\n"
@@ -3652,12 +3658,14 @@ msgstr ""
 " de direcciones."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El backend de esta libreta de direcciones no pudo analizar esta consulta."
+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:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
+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:179
 msgid "This query did not complete successfully."
@@ -3806,7 +3814,7 @@ msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Guardar en la libreta de direcciones"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
@@ -4068,7 +4076,7 @@ msgid "Can not open file"
 msgstr "No es posible abrir el archivo"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "No se pudo obtener una lista de libretas de direcciones"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4084,7 +4092,7 @@ msgid "OUTPUTFILE"
 msgstr "ARCHIVO-DE-SALIDA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Listar las carpetas de libretas de direcciones locales"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4112,7 +4120,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, use la opción --help para "
 "ver el uso."
@@ -4183,25 +4192,30 @@ msgstr "Toda la información de estas citas se borrará y no se podrá recuperar
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Toda la información de estas tareas se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información de estas tareas se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "Toda la información de esta cita se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toda la información acerca de esta reunión se borrará y no se podrá "
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "Toda la información acerca de esta nota se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información acerca de esta nota se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Toda la información acerca de esta tarea se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información acerca de esta tarea se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4306,7 +4320,8 @@ msgstr ""
 "permitirá aceptar esta tarea."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Se enviarán invitaciones por correo-e a todos los participantes y se les "
 "permitirá responder."
@@ -4439,7 +4454,8 @@ msgstr "¿Quiere enviar una notificación de cancelación para esta nota?"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "¿Quiere enviar a todos los participantes una notificación de cancelación?"
+msgstr ""
+"¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
@@ -4451,11 +4467,13 @@ msgstr "¿Quiere enviar esta tarea a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "¿Quiere enviar información de la reunión actualizada a los participantes?"
+msgstr ""
+"¿Quiere enviar información de la reunión actualizada a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
-msgstr "¿Quiere enviar información actualizada de las tareas a los participantes?"
+msgstr ""
+"¿Quiere enviar información actualizada de las tareas a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:68
 msgid ""
@@ -4534,7 +4552,8 @@ msgstr "No se ha podido iniciar el servidor evolution-data-server"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1629
 #: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
-msgstr "No es posible leer información de la aplicación de calendario del Pilot"
+msgstr ""
+"No es posible leer información de la aplicación de calendario del Pilot"
 
 #: ../calendar/conduits/memo/memo-conduit.c:914
 #: ../calendar/conduits/memo/memo-conduit.c:917
@@ -4610,8 +4629,8 @@ 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:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Notas"
 
@@ -4656,7 +4675,7 @@ msgstr[1] "minutos"
 #: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
 #: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
@@ -4727,7 +4746,7 @@ msgstr "Tiene %d alertas"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1683
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Advertencia"
 
@@ -4823,14 +4842,16 @@ msgstr "Color de fondo para las tareas que vencen hoy, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
+msgstr ""
+"Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Los calendarios ejecutarán alertas 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)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color para dibujar la línea de Marcus Bains en la barra de Tiempo (vacía por "
 "omisión)."
@@ -4849,7 +4870,8 @@ msgstr "Confirmar compactació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ías en los cuales debe indicarse el inicio y fin de las horas de trabajo."
+msgstr ""
+"Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
@@ -5028,7 +5050,8 @@ msgstr "Directorio donde guardar los sonidos de las alertas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
@@ -5052,7 +5075,8 @@ msgstr "Mostrar el visor de la alerta en una bandeja de notificación"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 #: ../mail/evolution-mail.schemas.in.h:124
@@ -5066,11 +5090,13 @@ msgstr "Mostrar el panel de vista previa."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
+msgstr ""
+"Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
@@ -5135,7 +5161,8 @@ msgstr ""
 "\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
@@ -5146,11 +5173,13 @@ msgstr "Comienzo de la semana"
 
 #: ../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 en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
+msgstr ""
+"El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -5175,7 +5204,8 @@ msgstr ""
 "vistas semanales 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."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
@@ -5186,7 +5216,8 @@ msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
-msgstr "Indica si debe establecer un recordatorio predeterminado para las citas."
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para las citas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
@@ -5213,7 +5244,8 @@ msgstr ""
 "tareas/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."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
@@ -5232,11 +5264,13 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas."
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
-msgstr "Indica si se deben usar la hora del horario de verano al mostrar eventos."
+msgstr ""
+"Indica si se deben usar la hora del horario de verano al mostrar eventos."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
@@ -5339,7 +5373,7 @@ msgstr "Purgar acontecimientos anteriores a"
 #: ../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:717
+#: ../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"
@@ -5383,7 +5417,8 @@ msgstr "Falló al actualizar calendarios."
 #: ../calendar/gui/calendar-component.c:1248
 #, 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"
+msgstr ""
+"No es posible abrir el calendario «%s» para crear acontecimientos y reuniones"
 
 #: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
@@ -5393,55 +5428,55 @@ msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
 msgid "Calendar Source Selector"
 msgstr "Selector de origen del calendario"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1597
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1605
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1613
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1619
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1621
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -5687,7 +5722,7 @@ msgstr "Método no soportado al abrir el calendario"
 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:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -5845,7 +5880,8 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u y %d se reemplazarán por el usuario y el dominio de la dirección de "
 "correo-e.</i>"
@@ -6057,7 +6093,8 @@ msgstr "_Sáb"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
-msgstr "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
+msgstr ""
+"_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
@@ -6079,7 +6116,8 @@ msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr "_Copiar el contenido del calendario localmente para trabajar desconectado"
+msgstr ""
+"_Copiar el contenido del calendario localmente para trabajar desconectado"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
@@ -6175,7 +6213,7 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
@@ -6722,7 +6760,7 @@ msgstr "Personalizar"
 #: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ninguno"
 
@@ -6812,7 +6850,7 @@ msgstr "No es posible abrir las notas en «%s»."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Para"
@@ -6835,7 +6873,8 @@ msgstr "_Grupo:"
 #: ../calendar/gui/dialogs/recur-comp.c:50
 #, 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?"
+msgstr ""
+"Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
@@ -7878,7 +7917,8 @@ msgstr ""
 "calendarios"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
@@ -8074,11 +8114,13 @@ msgstr "El objeto es inválido y no puede ser actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
+msgstr ""
+"Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
 
 #: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "El estado del participante no pudo actualizarse debido a un estado inválido\n"
+msgstr ""
+"El estado del participante no pudo actualizarse debido a un estado inválido\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
@@ -8108,7 +8150,7 @@ msgid "Update"
 msgstr "Actualizar"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -8117,7 +8159,7 @@ msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Rehusar"
 
@@ -8383,7 +8425,7 @@ msgid "Click to add a memo"
 msgstr "Pulse aquí para añadir una nota"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2960
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8460,12 +8502,12 @@ msgstr "Cargando tareas de %s"
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2919
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:3873
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Compactando"
 
@@ -8616,46 +8658,46 @@ msgstr "No hay un calendario disponible para crear notas"
 msgid "Memo Source Selector"
 msgstr "Selector de origen de notas"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nota nueva"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nota nueva compartida"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crea una nota compartida nueva"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Lista de notas"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
@@ -8691,7 +8733,8 @@ msgstr ""
 #: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr ""
+"No es posible migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:804
@@ -8911,11 +8954,6 @@ msgstr "Categorías: %s"
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Eventos próximos"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
@@ -8946,42 +8984,42 @@ msgstr "No hay un calendario disponible para crear tareas"
 msgid "Task Source Selector"
 msgstr "Selector de origen de tareas"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1326
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1334
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1342
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de ta_reas"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
@@ -9065,1532 +9103,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente del calendario de 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 "�frica/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�frica/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�frica/Addis Abeba"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�frica/Argel"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�frica/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�frica/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�frica/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�frica/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�frica/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "�frica/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�frica/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�frica/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�frica/Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�frica/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�frica/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�frica/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�frica/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "�frica/Dar-es-Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�frica/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "�frica/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "�frica/El Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�frica/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�frica/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�frica/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�frica/Johannesburgo"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�frica/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�frica/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�frica/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�frica/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�frica/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�frica/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�frica/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�frica/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "�frica/Lumbasa"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�frica/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�frica/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�frica/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�frica/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�frica/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "�frica/Mogadiscio"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�frica/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�frica/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�frica/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�frica/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�frica/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�frica/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�frica/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "�frica/Sao Tomé"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�frica/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�frica/Trípoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�frica/Túnez"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�frica/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "América/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "América/Asunción"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "América/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "América/Bélice"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "América/Boa Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "América/Cambridge Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "América/Cancún"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "América/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "América/Caimán"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "América/Córdoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "América/Costa Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "América/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "América/Curaçao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "América/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "América/Dawson Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "América/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "América/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "América/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "América/El Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "América/Glace Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "América/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "América/Goose Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "América/Grand Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "América/Granada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "América/Guadalupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "América/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "América/La Habana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianápolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "América/Indianápolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "América/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "América/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "América/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "América/La Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "América/Los �ngeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "América/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "América/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "América/Martinica"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "América/Mazatlán"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "América/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "América/Mérida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "América/Ciudad de México"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "América/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "América/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../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:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "América/Dakota del Norte/Centro"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "América/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "América/Puerto de España"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "América/Porto Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "América/Puerto Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "América/Rainy River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "América/Río Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "América/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "América/Santo Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "América/Sao Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "América/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "América/St. Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "América/St. Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "América/St. Lucía"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "América/St. Tomás"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "América/San Vincente"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "América/Swift Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "América/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "América/Thunder Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "América/Tórtola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "América/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antártida/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antártida/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártida/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antártida/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antártida/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antártida/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antártida/Polo Sur"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antártida/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antártida/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "�rtico/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Ammán"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrein"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damasco"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Estambul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalén"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandú"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadán"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangún"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigón"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarcanda"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seúl"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Teherán"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlántico/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlántico/Bermudas"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlántico/Canarias"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlántico/Cabo Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlántico/Feroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlántico/Jan Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlántico/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlántico/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlántico/South Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlántico/St. Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlántico/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaida"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlín"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Bruselas"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhague"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublín"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Estanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrado"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Mónaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moscú"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/París"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofía"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Ciudad del Vaticano"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsovia"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zúrich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "�ndico/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "�ndico/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "�ndico/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "�ndico/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "�ndico/Comores"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "�ndico/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "�ndico/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "�ndico/Maldivas"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "�ndico/Mauricio"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "�ndico/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "�ndico/Reunión"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacífico/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacífico/Pascua"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacífico/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacífico/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacífico/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galápagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulú"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacífico/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacífico/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacífico/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Tahití"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
@@ -10840,19 +10897,19 @@ msgstr "_Asunto:"
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Pulse aquí para la libreta de direcciones"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Destino de publicación"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
 
@@ -10860,12 +10917,13 @@ msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
 #: ../composer/e-msg-composer.c:872
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
@@ -10918,11 +10976,13 @@ msgstr "Todas las cuentas han sido eliminadas."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere descartar el mensaje titulado «{0}» que está redactando?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado «{0}» que está redactando?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+msgstr ""
+"Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
@@ -10996,7 +11056,8 @@ msgstr "Opciones de envío no 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 archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
+msgstr ""
+"El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -11045,7 +11106,7 @@ msgstr "_Continuar editando"
 msgid "_Do not Recover"
 msgstr "_No recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Recuperar"
 
@@ -11095,11 +11156,11 @@ msgstr "Consulta de Evolution"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error interno, solicitado un error desconocido «%s»"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Componente"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "El nombre del componente que registrar"
 
@@ -11114,16 +11175,18 @@ msgstr "Activado"
 msgid "Whether the plugin is enabled"
 msgstr "Indica si el complemento está activado"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Ocurrió un error al imprimir"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
-msgstr "El sistema de impresión informó de los siguientes detalles sobre el error:"
+msgstr ""
+"El sistema de impresión informó de los siguientes detalles sobre el error:"
 
-#: ../e-util/e-print.c:171
-msgid "The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:173
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr ""
 "El sistema de impresión no proporcionó ningún detalle adicional acerca del "
 "error."
@@ -11506,7 +11569,7 @@ msgstr "la fecha que 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:718
+#: ../plugins/google-account-setup/google-source.c:665
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "semanas"
@@ -11532,7 +11595,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -11579,8 +11643,8 @@ 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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
@@ -11621,13 +11685,13 @@ 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:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:512
 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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
@@ -11712,7 +11776,7 @@ msgstr "Añadir un script de firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
@@ -11911,7 +11975,7 @@ 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:62
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Leído"
 
@@ -11983,9 +12047,9 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:311
+#: ../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
 msgid "Subject"
@@ -12004,51 +12068,51 @@ msgstr "Luego"
 msgid "Add Ac_tion"
 msgstr "Añadir a_cción"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear una carpeta de búsqueda desde la búsqueda…"
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Mensajes no leídos"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../mail/em-folder-browser.c:1170
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../mail/em-folder-browser.c:1223
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Búsqueda en todas las cuentas"
 
@@ -12067,20 +12131,26 @@ msgid_plural "Total messages:"
 msgstr[0] "Mensajes en total:"
 msgstr[1] "Mensajes en total:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:195
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Uso de cuota (%s):"
+
+#: ../mail/em-folder-properties.c:197
+#, c-format
 msgid "Quota usage"
 msgstr "Uso de cuota"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../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:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:388
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
@@ -12181,7 +12251,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:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
@@ -12231,20 +12301,20 @@ msgid "C_opy"
 msgstr "C_opiar"
 
 #: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
 #: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Crear carpeta"
 
 #: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
@@ -12374,9 +12444,9 @@ msgstr "Filtro según la lista de _correo"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "Predeterminado"
 
@@ -12693,19 +12763,19 @@ msgid "Formatting Message..."
 msgstr "Formateando el mensaje…"
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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:209
+#: ../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 "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Transporte"
@@ -12728,13 +12798,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Este mensaje lo envió <b>%s</b> en nombre de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:307
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Responder a"
@@ -12843,8 +12913,10 @@ 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
 #, 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."
+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
 msgid "No Junk plugin available"
@@ -12995,7 +13067,7 @@ msgstr "Añadir dirección"
 msgid "Messages from %s"
 msgstr "Correos de %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Carpetas de _búsqueda"
 
@@ -13025,7 +13097,8 @@ msgstr "Siempre solicitar confirmación de lectura"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Tiempo en segundos que deberá mostrarse el error en la barra de estado."
+msgstr ""
+"Tiempo en segundos que deberá mostrarse el error en la barra de estado."
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
@@ -13145,23 +13218,23 @@ msgstr "Anchura predeterminada del diálogo de suscripción."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
@@ -13171,7 +13244,8 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
+msgstr ""
+"Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
 #: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
@@ -13405,7 +13479,8 @@ msgstr "Lista de cabeceras personalizadas y si están activadas."
 
 #: ../mail/evolution-mail.schemas.in.h:76
 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."
+msgstr ""
+"Lista de los códigos de diccionario usados para la corrección ortográfica."
 
 #: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
@@ -13514,12 +13589,14 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
 #: ../mail/evolution-mail.schemas.in.h:100
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
 #: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
+msgstr ""
+"Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
 
 #: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
@@ -13574,7 +13651,7 @@ msgid "Save directory"
 msgstr "Directorio donde guardar"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
+msgid "Search for the sender photo in local address books"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
 #: ../mail/evolution-mail.schemas.in.h:115
@@ -13599,15 +13676,15 @@ msgstr "Mostrar animaciones"
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
-msgstr "Muestra las imágenes animadas como animaciones."
+msgstr "Mostrar las imágenes animadas como animaciones."
 
 #: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Muestra los mensajes borrados (tachados) en la lista de mensajes."
+msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes."
 
 #: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
-msgstr "Muestra los mensajes borrados en la lista de mensajes"
+msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
 #: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
@@ -13618,12 +13695,12 @@ msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
-"Muestra el correo-e del remitente en una columna separada en la lista de "
+"Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "Muestra la foto del remitente en el panel de lectura de mensajes."
+msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
 #: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
@@ -13724,7 +13801,7 @@ msgstr ""
 #: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "Esta opción está relacionada con la clave lookup_addressbook y se usa para "
@@ -13931,7 +14008,7 @@ msgstr "Importador de carpetas en formato buzón de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
@@ -13983,144 +14060,144 @@ msgstr "Añadir regla de filtrado"
 msgid "Templates"
 msgstr "Plantillas"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, 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:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:917
+#: ../mail/mail-component.c:924
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Carpeta de correo nueva"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:932
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falló al actualizar la configuración de correo o carpetas."
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Error"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Errores"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Avisos y errores"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuración"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1739
 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:1745
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Mensajes de sucesos:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Cierra esta ventana"
@@ -14375,7 +14452,7 @@ msgid "Do not format messages when text si_ze exceeds"
 msgstr "No formatear mensajes si el ta_maño del texto excede"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_No marcar los mensajes como basura si el remitente está en mi libreta de "
 "direcciones"
@@ -14498,7 +14575,8 @@ msgid "No _Proxy for:"
 msgstr "Sin _proxy para:"
 
 #: ../mail/mail-config.glade.h:107
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Nota: El guión bajo en el nombre de la etiqueta se usa como un identificador "
 "mnemónico en el menú."
@@ -14587,7 +14665,7 @@ msgid "S_OCKS Host:"
 msgstr "Equipo S_OCKS:"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
 msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
 
 #: ../mail/mail-config.glade.h:128
@@ -14697,7 +14775,7 @@ msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../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:"
@@ -14739,7 +14817,8 @@ msgstr "Conexión _directa a Internet"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
@@ -14754,7 +14833,7 @@ msgid "_Load images in messages from contacts"
 msgstr "_Cargar imágenes en los correo de mis contactos"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "_Buscar sólo en la libreta de direcciones local"
 
 #: ../mail/mail-config.glade.h:172
@@ -14883,7 +14962,7 @@ msgstr "_Buscar:"
 msgid "Find in Message"
 msgstr "Buscar en el mensaje"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
@@ -14990,96 +15069,96 @@ msgstr "Cancelado."
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Guardando mensaje en la carpeta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, 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:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo almacén %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, 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:1978
+#: ../mail/mail-ops.c:1980
 #, 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:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15088,11 +15167,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15101,27 +15180,27 @@ msgstr ""
 "No es posible crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No es posible escribir datos: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
@@ -15264,7 +15343,8 @@ msgstr ""
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
+msgstr ""
+"Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -15283,8 +15363,10 @@ msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
 
 #: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
@@ -15464,7 +15546,8 @@ msgstr "No desactivar"
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
+msgstr ""
+"¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15733,8 +15816,10 @@ msgstr ""
 "está activada"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -15957,39 +16042,39 @@ msgstr "Mensajes enviados"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Llamar"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "No reenviar"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Seguimiento"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:64 ../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 "Responder a todos"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revisar"
 
@@ -16091,27 +16176,28 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Complemento de sonido en línea"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar Evolution después del respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
-msgstr "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
+msgstr ""
+"Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution después de la restauración"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16121,120 +16207,121 @@ msgstr ""
 "todos los correos, calendarios, tareas, notas, libreta de direcciones.\n"
 "También restaura su configuración personal, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione un archivador de Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Respaldar el directorio de Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Restaurar el directorio de Evolution"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Comprobar respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Reiniciar Evolution"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Con interfaz gráfica de usuario"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Cerrando Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Respaldar las cuentas y la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Respaldar los datos de Evolution (correos, contactos, calendario, tareas, "
 "notas)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Respaldo completado"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Reiniciando Evolution"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Respaldar los datos actuales de Evolution"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Extrayendo archivos del respaldo"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Carga la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Eliminando archivos temporales de respaldo"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "Asegurando fuentes locales"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../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:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde la carpeta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Restaurador de Evolution"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Respaldando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Espere mientras Evolution respalda sus datos."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Restaurando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Espere mientras Evolution restaura sus datos."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
-msgstr "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
+msgstr ""
+"Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -16252,7 +16339,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "¿Seguro que quiere cerrar Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "¿Seguro que quiere restaurar Evolution desde el archivo de respaldo "
 "seleccionado?"
@@ -16318,7 +16406,7 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:567
-msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones al responder "
 "correos"
@@ -16340,7 +16428,8 @@ msgstr ""
 
 #: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
+msgstr ""
+"Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:620
@@ -16349,7 +16438,7 @@ msgstr "Sincronizar con la lista de _contactos de MI ahora"
 
 #: ../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 ""
@@ -16375,7 +16464,8 @@ msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo..."
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Espere a que el proceso hijo de Bogofilter se interrumpa, terminando..."
+msgstr ""
+"Espere a que el proceso hijo de Bogofilter se interrumpa, terminando..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
@@ -16420,7 +16510,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
 #: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Usar _SSL"
@@ -16443,7 +16533,7 @@ msgstr "Proporciona funcionalidad básica para calendarios locales."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
 #: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
@@ -16534,14 +16624,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
 "predeterminado."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
+msgstr ""
+"Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -16552,7 +16644,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16578,7 +16670,7 @@ msgstr "Fuentes predeterminadas"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
 msgstr ""
 "Proporciona funcionalidad para marcar un calendario o una libreta de "
@@ -16782,7 +16874,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16790,7 +16882,7 @@ msgstr ""
 "La contraseña actual no coincide con la contraseña existente para su cuenta. "
 "Introduzca la contraseña correcta"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Las dos contraseñas no coinciden. Vuelva a introducir las contraseñas."
 
@@ -16966,7 +17058,7 @@ msgstr "_Resumir permisos"
 msgid "_Tasks:"
 msgstr "_Tareas:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permisos…"
@@ -16980,11 +17072,11 @@ msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Subscribirse a la carpeta de otro usuario"
@@ -17199,10 +17291,6 @@ msgstr "_Sensibilidad: "
 msgid "_User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccionar usuario"
@@ -17233,7 +17321,8 @@ msgstr "Operaciones de Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr "No es posible cambiar la contraseña debido a problemas de configuración."
+msgstr ""
+"No es posible cambiar la contraseña debido a problemas de configuración."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
@@ -17367,7 +17456,7 @@ msgid "Folder offline"
 msgstr "Carpeta desconectada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -17399,7 +17488,8 @@ 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 "Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
+msgstr ""
+"Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
@@ -17419,11 +17509,13 @@ msgstr "Contraseña cambiada con éxito."
 
 #: ../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 "Introduzca la Id del delegado o deseleccione la opción Enviar como delegado."
+msgstr ""
+"Introduzca la Id del delegado o deseleccione la opción Enviar como delegado."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "Asegúrese de que el nombre del Servidor de Catálogo Global es correcto."
+msgstr ""
+"Asegúrese de que el nombre del Servidor de Catálogo Global es correcto."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
@@ -17488,7 +17580,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Error desconocido al buscar {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -17502,13 +17594,15 @@ msgstr "Operación no soportada"
 
 #: ../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 "Está cerca de su cuota disponible para almacenar correo en este servidor."
+msgstr ""
+"Está cerca de su cuota disponible para almacenar correo en este servidor."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
-msgstr "Le está permitido mandar un mensaje en nombre de a un solo delegado cada vez."
+msgstr ""
+"Le está permitido mandar un mensaje en nombre de a un solo delegado cada vez."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
@@ -17621,11 +17715,11 @@ msgstr "Redactar en un editor _externo"
 msgid "Compose messages using an external editor"
 msgstr "Redactar mensajes usando un editor externo"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando que ejecutar para lanzar el editor: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17633,15 +17727,15 @@ msgstr ""
 "Para Emacs use \"xemacs\"\n"
 "Para VI use \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Seleccione un png (48*48) de tamaño < 700bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Archivos PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Cara"
 
@@ -17687,18 +17781,18 @@ msgstr "Des_uscribir"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Introduzca el nombre de usuario primero."
 
-#: ../plugins/google-account-setup/google-source.c:497
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduzca la contraseña para que el usuario %s acceda a la lista de "
 "calendarios suscritos."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17707,11 +17801,11 @@ msgstr ""
 "No se pueden leer los datos del servidor de Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr "Obtener _lista"
 
@@ -17722,7 +17816,8 @@ 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."
-msgstr "Un complemento para configurar el calendario y los contactos de Google."
+msgstr ""
+"Un complemento para configurar el calendario y los contactos de Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17904,13 +17999,15 @@ 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;"
-msgstr "No puede compartir la carpeta con el usuario especificado &quot;{0}&quot;"
+msgstr ""
+"No puede compartir la carpeta con el 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"
-msgstr "Tiene que especificar el nombre de usuario que quiere añadir a la lista"
+msgstr ""
+"Tiene que especificar el nombre de usuario que quiere añadir a la lista"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Aceptar provisionalmente"
 
@@ -18025,26 +18122,28 @@ msgstr "Sesión _proxy…"
 
 #: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
 
 #: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Introduzca los usuarios y establezca permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Carpeta compartida _nueva…"
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -18200,7 +18299,7 @@ msgid "Select Calendar"
 msgstr "Seleccione el calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importar"
 
@@ -18244,8 +18343,10 @@ msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Sincronizar la tarea/nota/calendario/libreta de direcciones con Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr ""
+"Sincronizar la tarea/nota/calendario/libreta de direcciones con Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -18617,7 +18718,8 @@ msgstr "<b>%s</b> ha delegado la reunión siguiente en usted:"
 #: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
+msgstr ""
+"<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
@@ -18645,13 +18747,15 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> desea recibir la última información de la reunión siguiente:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión a través de %s:"
+msgstr ""
+"<b>%s</b> ha devuelto la siguiente respuesta a la reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
@@ -18671,7 +18775,8 @@ msgstr "<b>%s</b> ha cancelado 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> ha propuesto los cambios siguientes para la reunión a través de %s."
+msgstr ""
+"<b>%s</b> ha propuesto los cambios siguientes para la reunión a través de %s."
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
@@ -18681,7 +18786,8 @@ msgstr "<b>%s</b> ha propuesto los cambios siguientes para 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 "<b>%s</b> ha rehusado los siguientes cambios para la reunión a través de %s:"
+msgstr ""
+"<b>%s</b> ha rehusado los siguientes cambios para la reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
@@ -18743,7 +18849,8 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> ha devuelto la siguiente respuesta a la tarea asignada a través de "
 "%s:"
@@ -18756,7 +18863,8 @@ msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
 #: ../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> ha cancelado la siguiente asignación de tarea a través de %s:"
+msgstr ""
+"<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
@@ -18765,7 +18873,8 @@ msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas a "
 "través de %s:"
@@ -18773,7 +18882,8 @@ 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> ha propuesto los siguientes cambios en la asignación de tareas:"
+msgstr ""
+"<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
@@ -18911,7 +19021,7 @@ msgstr "Notas:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
-msgstr "Muestra las partes de texto/calendario en los mensajes."
+msgstr "Mostrar las partes de texto/calendario en los mensajes."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18928,7 +19038,8 @@ msgid "This meeting has been delegated"
 msgstr "Esta reunión se ha delegado"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -19001,7 +19112,8 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
+msgstr ""
+"Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
@@ -19127,12 +19239,12 @@ msgstr "Convertir en _reunión"
 msgid "Mail to meeting"
 msgstr "Correo a reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19183,7 +19295,8 @@ msgid "Mailing _List"
 msgstr "_Lista de correo"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Proporciona acciones para comandos comunes de listas de correo (suscribirse, "
 "desuscribirse…)."
@@ -19305,11 +19418,13 @@ msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
+msgstr ""
+"Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+msgstr ""
+"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -19331,11 +19446,11 @@ msgstr "_Suscribirse a la lista"
 msgid "_Unsubscribe from List"
 msgstr "_Desuscribirse de la lista"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "¿Marcar también los mensajes en las subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../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?"
@@ -19343,11 +19458,11 @@ msgstr ""
 "¿Quiere marcar los mensajes como leídos sólo en la carpeta actual o en la "
 "capeta actual y todas sus subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Carpeta actual y _subcarpetas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Ca_rpeta actual solamente"
 
@@ -19629,7 +19744,8 @@ msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo..."
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando..."
+msgstr ""
+"Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
@@ -19860,24 +19976,24 @@ msgid "Importing files"
 msgstr "Importando archivos"
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:143
+#: ../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
-#: ../shell/e-shell-importer.c:396
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:230
-#: ../shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
 #: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:521
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Por favor espere"
 
@@ -19896,7 +20012,7 @@ msgid "Thread messages by subject"
 msgstr "Agrupar mensajes según el asunto"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Agrupar los mensajes por _asunto"
 
@@ -19983,50 +20099,48 @@ msgid "Configuration version"
 msgstr "Versión de la configuración"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Decide si se debe ejecutar la detección de cuelgue o no."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Anchura predeterminada de la barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Altura predeterminada de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Estado predeterminado de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Anchura predeterminada de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Nombre del equipo proxy HTtP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Contraseña del proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Puerto del proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Usuario del proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 alias del componente que se mostrará al iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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/"
@@ -20038,45 +20152,46 @@ msgstr ""
 "network_config/authentication_user\" y la contraseña de gnome-keyring o bien "
 "del archivo de contrasñeas ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Última versión de la configuración actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de rutas a las carpetas que se sincronizarán al disco para usar "
 "desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Equipos que no sean proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Contraseña para pasar como autenticación al hacer HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Modo de configuración del proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Nombre del equipo proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Puerto del proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Nombre del equipo proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Puerto del proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -20088,27 +20203,23 @@ msgstr ""
 "\"usar configuración manual del proxy\" y \"usar la configuración "
 "proporcionada en la URL de autoconfiguración del proxy\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "La barra lateral es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Saltar el diálogo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Saltar el diálogo de advertencia de recuperación"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "La barra de estado es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20116,19 +20227,19 @@ msgstr ""
 "La versión de configuración de Evolution, con nivel de configuración mayor/"
 "menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada de la ventana principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "La anchura predeterminada de la ventana principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "La anchura predeterminada para la barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20136,19 +20247,19 @@ msgstr ""
 "La última versión de configuración de Evolution actualizada, con nivel de "
 "configuración mayor/menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "El nombre de la máquina por la que se hace proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "El nombre de la máquina por la que se hace proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "El nombre de la máquina por la que se hace proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -20156,7 +20267,7 @@ msgstr ""
 "El puerto de la máquina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -20164,7 +20275,7 @@ msgstr ""
 "El puerto de la máquina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -20172,7 +20283,7 @@ msgstr ""
 "El puerto de la máquina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20182,7 +20293,7 @@ msgstr ""
 "\", \"toolbar\". Si se selecciona \"toolbar\", el estilo de los botones se "
 "determina por la configuración de la barra de herramientas de GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20195,69 +20306,60 @@ msgstr ""
 "foo.com), direcciones IP de anfitriones (tanto IPv4 como IPv6) y direcciones "
 "de red con una máscara (algo como 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL que proporciona las variables de configuración del proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Usuario que pasar como autenticación al usar el proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica si Evolution se iniciará en modo desconectado en vez de en modo "
 "conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Indica si se debe realizar la detección de cuelgue o no"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Indica si la ventana debe o no maximizarse."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Indica si la barra lateral debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Indica si la barra de estado debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica si se omite el diálogo de advertencia en las versiones de desarrollo "
 "de Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Indica si se omite el diálogo de advertencia en las recuperaciones de "
-"Evolution."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Indica si la los botones de la ventana deben ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Estilo de los botones de ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
@@ -20280,21 +20382,16 @@ msgstr "Elija el tipo de importador a ejecutar:"
 #: ../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.\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 ""
-"Elija el archivo que quiere importar a Evolution y seleccione de la lista el "
-"tipo de archivo que es.\n"
-"\n"
-"Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
+"Elija el archivo que quiere importar en Evolution y seleccione de la lista "
+"el tipo de archivo que es."
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: ../shell/e-shell-importer.c:146
+#: ../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"
@@ -20306,23 +20403,23 @@ msgstr ""
 "configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse\n"
 "el botón «Atrás».\n"
 
-#: ../shell/e-shell-importer.c:284
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../shell/e-shell-importer.c:289
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../shell/e-shell-importer.c:298
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../shell/e-shell-importer.c:334
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: ../shell/e-shell-importer.c:337
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
@@ -20332,14 +20429,15 @@ msgstr "Preferencias de 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, 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 "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: ../shell/e-shell-window-commands.c:83
 #, c-format
@@ -20388,7 +20486,7 @@ msgstr "_Trabajar desconectado"
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20396,11 +20494,11 @@ msgstr ""
 "Evolution está conectado.\n"
 "Pulse este botón para trabajar desconectado."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20408,52 +20506,52 @@ msgstr ""
 "Evolution está desconectado.\n"
 "Pulse este botón para trabajar conectado."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Error del sistema desconocido."
 
-#: ../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 KiB"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "No es posible registrar en OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Nuevo"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Prueba nueva"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
 msgctxt "New"
 msgid "_Test"
 msgstr "_Prueba"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Crea una elemento de prueba nuevo"
 
@@ -20496,7 +20594,7 @@ msgstr ""
 "importación de archivos externos dentro de Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20532,7 +20630,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribución.\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20540,66 +20638,43 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Detección de cuelgues de Evolution"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norar"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Parece que Evolution se cerró de forma inesperada la última vez que se\n"
-"ejecutó. Como medida de precación se ocultarán todos los paneles de vista\n"
-"previa. Puede restablecer los paneles de vista previa desde el menú Ver.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "_No mostrar otra vez este mensaje."
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigración desde Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depuración de todos los componentes a un archivo."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20843,7 +20918,7 @@ msgid "Enter new password"
 msgstr "Introduzca la contraseña nueva"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20852,7 +20927,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20861,7 +20936,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Seleccione el certificado"
 
@@ -21030,7 +21105,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
@@ -21263,23 +21339,23 @@ msgstr "Copiar"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copia los contactos seleccionados a otra carpeta…"
+msgstr "Copiar los contactos seleccionados a otra carpeta…"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Copia los contactos de la carpeta seleccionada en otra carpeta"
+msgstr "Copiar el contenido de la carpeta seleccionada en otra carpeta"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "Copia la selección"
+msgstr "Copiar la selección"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr "Copia a la carpeta…"
+msgstr "Copiar a la carpeta…"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
-msgstr "Crea una libreta de direcciones nueva"
+msgid "Create a new address book folder"
+msgstr "Crear una libreta de direcciones nueva"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
@@ -21288,7 +21364,7 @@ msgstr "Cortar"
 
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr "Corta la selección"
+msgstr "Cortar la selección"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
@@ -21296,11 +21372,11 @@ msgstr "_Borrar la libreta de direcciones"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
-msgstr "Borra los contactos seleccionados"
+msgstr "Borrar los contactos seleccionados"
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
-msgstr "Borra las carpeta seleccionada"
+msgstr "Borrar las carpeta seleccionada"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
@@ -21312,11 +21388,11 @@ msgstr "Mo_ver todos los contactos a…"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Mueve los contactos seleccionados a otra carpeta…"
+msgstr "Mover los contactos seleccionados a otra carpeta…"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "Mueve los contactos de la carpeta seleccionada a otra carpeta"
+msgstr "Mover los contactos de la carpeta seleccionada a otra carpeta"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -21333,15 +21409,15 @@ msgstr "Pega el contenido del porta papeles"
 
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
-msgstr "Previsualiza los contactos a imprimir"
+msgstr "Previsualizar los contactos que imprimir"
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
-msgstr "Imprime los contactos seleccionados"
+msgstr "Imprimir los contactos seleccionados"
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
-msgstr "Renombra la carpeta seleccionada"
+msgstr "Renombrar la carpeta seleccionada"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
@@ -21385,7 +21461,7 @@ msgstr "Envía los contactos seleccionados a otra persona."
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
-msgstr "Muestra una ventana de vista previa de contactos"
+msgstr "Mostrar una ventana de vista previa de contactos"
 
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
@@ -21478,11 +21554,11 @@ msgstr "Ir a"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
-msgstr "Retrocede"
+msgstr "Retroceder"
 
 #: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
-msgstr "Avanza"
+msgstr "Avanzar"
 
 #: ../ui/evolution-calendar.xml.h:14
 msgid "List"
@@ -21536,23 +21612,23 @@ msgstr "Selecciona hoy"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
-msgstr "Muestra como una lista"
+msgstr "Mostrar como una lista"
 
 #: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
-msgstr "Muestra un día"
+msgstr "Mostrar un día"
 
 #: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
-msgstr "Muestra un mes"
+msgstr "Mostrar un mes"
 
 #: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
-msgstr "Muestra una semana"
+msgstr "Mostrar una semana"
 
 #: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
-msgstr "Muestra la semana laboral"
+msgstr "Mostrar la semana laboral"
 
 #: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
@@ -21609,7 +21685,8 @@ msgstr "Mueve la carpeta seleccionada a otra carpeta"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -21621,15 +21698,15 @@ msgstr "Mostrar vista _previa del mensaje"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
-msgstr "Muestra la vista previa del mensaje bajo la lista de mensajes"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "Muestra la vista previa de mensajes al lado de la lista de mensajes"
+msgstr "Mostrar la vista previa de mensajes al lado de la lista de mensajes"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
-msgstr "Muestra una ventana de vista previa de mensajes"
+msgstr "Mostrar una ventana de vista previa de mensajes"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
@@ -21732,8 +21809,10 @@ msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leídos"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
@@ -21799,7 +21878,7 @@ msgstr "_Mostrar mensajes ocultos"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
-msgstr "Muestra los mensajes que han estado ocultos temporalmente"
+msgstr "Mostrar los mensajes que han estado ocultos temporalmente"
 
 #: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
@@ -21918,31 +21997,31 @@ msgstr "Reduce el tamaño del texto"
 
 #: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
-msgstr "Muestra el mensaje siguiente importante"
+msgstr "Mostrar el mensaje siguiente importante"
 
 #: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
-msgstr "Muestra el mensaje siguiente"
+msgstr "Mostrar el mensaje siguiente"
 
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
-msgstr "Muestra la siguiente conversación"
+msgstr "Mostrar la siguiente conversación"
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
-msgstr "Muestra el siguiente mensaje no leído"
+msgstr "Mostrar el siguiente mensaje no leído"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
-msgstr "Muestra el anterior mensaje importante"
+msgstr "Mostrar el anterior mensaje importante"
 
 #: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
-msgstr "Muestra el mensaje anterior"
+msgstr "Mostrar el mensaje anterior"
 
 #: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
-msgstr "Muestra el anterior mensaje no leído"
+msgstr "Mostrar el anterior mensaje no leído"
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
@@ -22150,15 +22229,15 @@ msgstr "Establecer la configuración de la página para la impresora actual"
 
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Muestra un cursor parpadeante en el cuerpo de los mensajes mostrados"
+msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
 
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages with all email headers"
-msgstr "Muestra los mensajes con todas las cabeceras de correo-e"
+msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
-msgstr "Muestra mensaje de correo-e en bruto"
+msgstr "Mostrar mensaje de correo-e en bruto"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
@@ -22347,7 +22426,7 @@ msgstr "Imprime la lista de tareas"
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "Muestra una ventana de vista previa de tarea"
+msgstr "Mostrar una ventana de vista previa de tarea"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
@@ -22473,7 +22552,7 @@ msgstr "Mostrar barra de _herramientas"
 
 #: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
-msgstr "Muestra información acerca de Evolution"
+msgstr "Mostrar información acerca de Evolution"
 
 #: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
@@ -22770,13 +22849,13 @@ msgstr "Tipo de vista:"
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No es posible adjuntar el archivo %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "No es posible adjuntar el archivo %s: no es un archivo normal"
@@ -23868,3 +23947,41 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Eventos próximos"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Decide si se debe ejecutar la detección de cuelgue o no."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Saltar el diálogo de advertencia de recuperación"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Indica si se debe realizar la detección de cuelgue o no"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Indica si se omite el diálogo de advertencia en las recuperaciones de "
+#~ "Evolution."
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Detección de cuelgues de Evolution"
+
+#~ msgid "Ig_nore"
+#~ msgstr "Ig_norar"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Parece que Evolution se cerró de forma inesperada la última vez que se\n"
+#~ "ejecutó. Como medida de precación se ocultarán todos los paneles de "
+#~ "vista\n"
+#~ "previa. Puede restablecer los paneles de vista previa desde el menú Ver.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_No mostrar otra vez este mensaje."
diff --git a/po/et.po b/po/et.po
index c535820a51..2ba57e5d8a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,13 +11,13 @@
 # Kaarel Jõgi <kaarel@gg.ee>, 2002.
 # Priit Laes <amd@store20.com>, 2003-2007.
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:18+0000\n"
-"PO-Revision-Date: 2008-08-16 19:22+0300\n"
+"POT-Creation-Date: 2008-08-29 04:43+0000\n"
+"PO-Revision-Date: 2008-08-31 13:35+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -28,16 +28,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "evolutioni aadressiraamat"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Uus kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
@@ -113,7 +113,7 @@ msgstr "Mine tänasele päevale"
 msgid "Go to Date"
 msgstr "Mine kuupäevale"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-day-view-main-item.c:301
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "tabel praeguse ajavahemiku kuvamiseks ja valimiseks"
@@ -157,7 +157,7 @@ msgstr "kalendrivaade töönädala jaoks"
 msgid "calendar view for one or more days"
 msgstr "kalendrivaade ühe või enama päeva jaoks"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../a11y/calendar/ea-gnome-calendar.c:186
 #: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y"
@@ -168,26 +168,26 @@ 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
+#: ../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
 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:762
 #: ../calendar/gui/calendar-component.c:767
 #: ../calendar/gui/calendar-component.c:769
 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:781
 #: ../calendar/gui/calendar-component.c:788
 #: ../calendar/gui/calendar-component.c:794
@@ -200,32 +200,32 @@ 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
+#: ../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
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Gnome kalender"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "otsinguriba"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "evolutioni kalendri otsinguriba"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr ""
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Täiendavate sündmuste lisamiseks klõpsa siia"
 
@@ -303,7 +303,7 @@ msgstr "lisamiseks klõpsa"
 msgid "click"
 msgstr "klõpsa"
 
-#: ../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 "sordi"
 
@@ -321,23 +321,23 @@ msgstr "Kalender: vahemikus %s kuni %s"
 msgid "evolution calendar item"
 msgstr "evolutioni kalendrikirje"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Liitnupp"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Aktiveeri vaikimisi"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Hüpikmenüü"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Manuseriba sisse- ja väljalülitamine"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "aktiveerimine"
 
@@ -390,7 +390,8 @@ msgid "Could not get schema information for LDAP server."
 msgstr "LDAP-serveri skeemiinfot pole võimalik hankida."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+#, fuzzy
+msgid "Could not remove address book."
 msgstr "Aadressiraamatut pole võimalik eemaldada."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -411,7 +412,8 @@ msgid "Delete address book '{0}'?"
 msgstr "Kustutada aadressiraamatu '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+#, fuzzy
+msgid "Error loading address book."
 msgstr "Viga aadressiraamatu laadimisel."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -445,7 +447,8 @@ msgid "Some features may not work properly with your current server"
 msgstr "Mõned võimalused võivad sinu praeguse serveriga ebakorrektselt töötada"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+#, fuzzy
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -465,31 +468,35 @@ msgstr ""
 "oma süsteemihaldurilt, milliseid otsingupõhjasid sa peaksid kasutama."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "See aadressisaamat eemaldatakse lõplikult."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+#, fuzzy
+msgid "This address book could not be opened."
 msgstr "Seda aadressisaamatud pole võimalik avada."
 
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+#, fuzzy
+msgid "This address book server does not have any suggested search bases."
 msgstr "See aadressiraamatuserver ei oma ühtegi soovituslikku otsingupõhja."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../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 ""
 "See aadressiraamatu server võib olla kättesaamatu, serveri nimi võib olla "
 "valesti sisestatud või pole võrguühendus hetkel toimiv."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "See aadressisaamat eemaldatakse lõplikult."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "See server ei toeta LDAPv3 skeemiandmeid."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+#, fuzzy
+msgid "Unable to open address book"
 msgstr "Aadressiraamatut pole võimalik avada"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -505,8 +512,9 @@ msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatusi salvestada?"
 
 #: ../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 ""
 "Sa proovid kontakti ühest aadressiraamatust teise ümber tõsta, kuid "
@@ -565,7 +573,7 @@ msgstr "_Vähenda"
 msgid "_Use as it is"
 msgstr "_Kasuta nii nagu on"
 
-#. 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."
+#. 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}"
@@ -582,7 +590,7 @@ msgstr "Vaikimisi sünkroniseerimisaadress:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Aadressiraamatut pole võimalik laadida"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -685,39 +693,39 @@ msgstr "Isiklik"
 msgid "On LDAP Servers"
 msgstr "LDAP-serveris"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgctxt "New"
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Uue kontakti loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Uue kontaktide nimekirja loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Uue aadressiraamatu loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Tõrge aadressiraamatu seadistuste või kataloogide uuendamisel."
 
@@ -767,7 +775,7 @@ msgid "Details"
 msgstr "Ãœksikasjad"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:982
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Otsing"
 
@@ -789,7 +797,7 @@ msgstr "Siirdamine..."
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, fuzzy, c-format
 msgid "Migrating '%s':"
-msgstr "Siirdamine `%s':"
+msgstr "Siirdamine '%s':"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -908,7 +916,7 @@ msgstr "Sisesta %s parool (kasutaja %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1264,7 +1272,7 @@ msgstr "kaarti"
 #: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
 #: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutit"
@@ -3569,10 +3577,11 @@ msgid "Unsupported authentication method"
 msgstr "Toetamata autentimismeetod"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 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 ""
 "Seda aadressiraamatut pole võimalik avada. See võib tähendada, et see raamat "
 "pole märgitud kasutamiseks võrguvabas olekus või pole selle raamatu sisu "
@@ -3580,18 +3589,19 @@ msgstr ""
 "aadressiraamat võrgurežiimis, et selle sisu oleks võimalik alla laadida."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:111
-#, c-format
+#, 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 ""
 "Aadressiraamatut pole võimalik avada.  Palun kontrolli, kas rada %s on "
 "olemas ja kas sul on sellele vajalikud pääsuõigused."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
+#, 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 ""
 "Aadressiraamatu avamine nurjus. Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav LDAP-server ei ole kättesaadav."
@@ -3607,44 +3617,49 @@ msgstr ""
 "Evolutioni paki."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:132
+#, 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 ""
 "Aadressiraamatu avamine nurjus.  Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav server ei ole kättesaadav."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:138
-#, fuzzy
 msgid "Detailed error:"
-msgstr "Käsitlemata viga"
+msgstr "Vea üksikasjad:"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:161
+#, 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 ""
+"Selle päringu sooritamiseks kulunud aeg ületas selle aadressiraamatu\n"
+"jaoks määratud piirangu. Palun täpsusta oma otsingut või suurenda selle\n"
+"aadressiraamatu kataloogiserveri eelistustest ajapiirangut."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:167
+#, 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 ""
 "Selle päringu sooritamiseks kulunud aeg ületas selle aadressiraamatu\n"
 "jaoks määratud piirangu. Palun täpsusta oma otsingut või suurenda selle\n"
 "aadressiraamatu kataloogiserveri eelistustest ajapiirangut."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Selle aadressiraamatu taustaprogrammil pole võimalik seda päringut parsida."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
+msgid "The backend for this address book refused to perform this query."
 msgstr "Selle aadressiraamatu taustaprogramm keeldus päringut parsimast."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:179
@@ -3794,7 +3809,8 @@ msgid "Show Compact vCard"
 msgstr "Kompaktse vKaardi näitamine"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+#, fuzzy
+msgid "Save in address book"
 msgstr "Salvesta aadressiraamatusse"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
@@ -4056,7 +4072,8 @@ msgid "Can not open file"
 msgstr "Faili pole võimalik avada"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+#, fuzzy
+msgid "Couldn't get list of address books"
 msgstr "Aadressiraamatute loendit pole võimalik hankida"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4072,7 +4089,8 @@ msgid "OUTPUTFILE"
 msgstr "VÄLJUNDFAIL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+#, fuzzy
+msgid "List local address book folders"
 msgstr "Kohalike aadressiraamatute kaustade kuvamine"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4126,16 +4144,18 @@ 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 ""
+"Kalendriallikas '{0}' on kirjutuskaitsega ja seda pole võimalik muuta. "
+"Palun vali kalendrivaate külribalt kalender, mis võimaldab muudatusi sisse "
+"viia."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-#, fuzzy
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"Kalendriallikas '{0}' on kirjutuskaitsega. Kalendrivaates tuleks valida "
-"kalender, mis võimaldab muudatusi sisse viia."
+"Kalendriallikas '{0}' on kirjutuskaitsega ja seda pole võimalik muuta. "
+"Palun vali kalender, mis võimaldab muudatusi sisse viia."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4404,9 +4424,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalender pole märgitud võrguvabas olekus kasutamiseks."
 
 #: ../calendar/calendar.error.xml.h:54
-#, fuzzy
 msgid "The memo list is not marked for offline usage."
-msgstr "Märkmeloend pole märgitud võrguvabas olekus kasutamiseks"
+msgstr "Märkmeloend pole märgitud võrguvabas olekus kasutamiseks."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4615,8 +4634,8 @@ msgstr "_Märkmed"
 #: ../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:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Märkmed"
 
@@ -4661,7 +4680,7 @@ msgstr[1] "minutit"
 #: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
 #: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
@@ -4732,7 +4751,7 @@ msgstr "Sul on %d alarmi"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1683
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -5311,7 +5330,7 @@ msgstr "Puhastada sündmustest, mis on vanemad kui"
 #: ../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:717
+#: ../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"
@@ -5365,55 +5384,55 @@ msgstr "Sündmuste ja koosolekute loomiseks pole kalendrit saadaval"
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1597
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Uue sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1605
 msgctxt "New"
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Uue koosolekukutse loomine"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1613
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Uue kogu päeva hõlmava sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1619
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1621
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Uue kalendri loomine"
 
@@ -5660,7 +5679,7 @@ msgstr "Kalendri avamisel pole see meetod toetatud"
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -6150,7 +6169,7 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
@@ -6699,7 +6718,7 @@ msgstr "Kohandatud"
 #: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Puudub"
 
@@ -6789,7 +6808,7 @@ msgstr "Märkmeid pole võimalik '%s'-s avada."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Kellele"
@@ -8083,7 +8102,7 @@ msgid "Update"
 msgstr "Uuenda"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Nõustun"
 
@@ -8092,7 +8111,7 @@ msgid "Tentatively accept"
 msgstr "Nõustun, kuid pole hetkel kindel"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Lükkan tagasi"
 
@@ -8358,7 +8377,7 @@ msgid "Click to add a memo"
 msgstr "Märkme lisamiseks klõpsa siia"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2960
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8435,12 +8454,12 @@ msgstr "Ãœlesannete laadimine asukohast %s"
 msgid "Loading memos at %s"
 msgstr "Märkmete laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2919
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3873
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -8590,46 +8609,46 @@ msgstr "Märkmete loomiseks pole ühtegi kalendrit saadaval"
 msgid "Memo Source Selector"
 msgstr "Märkmete allika valija"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Uus märge"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mär_ge"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Uue märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Uus jagatud märge"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Jagatud märge"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Uue jagatud märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Uus märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Uue märkmeloendi loomine"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Märkmete printimine"
 
@@ -8887,11 +8906,6 @@ msgstr "Kategooriad: %s"
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Saabuvad sündmused"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "Uus ü_lesandeloend"
@@ -8922,42 +8936,42 @@ msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 msgid "Task Source Selector"
 msgstr "Ãœlesannete allika valija"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1326
 msgctxt "New"
 msgid "_Task"
 msgstr "_Ãœlesanne"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Uue ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1334
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Uue omistatud ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1342
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Ü_lesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
@@ -9040,1532 +9054,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Evolutioni intelligentne kalendriimportija"
 
 #.
+#. *
+#. * 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 "Aafrika/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Aafrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Aafrika/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Aafrika/Alžeeria"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Aafrika/Asmara"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Aafrika/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Aafrika/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Aafrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Aafrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Aafrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Aafrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Aafrika/Bugumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Aafrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Aafrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Aafrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Aafrika/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Aafrika/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Aafrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Aafrika/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Aafrika/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Aafrika/El_Aauin"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Aafrika/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Aafrika/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Aafrika/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Aafrika/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Aafrika/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Aafrika/Khartum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Aafrika/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Aafrika/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Aafrika/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Aafrika/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Aafrika/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Aafrika/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Aafrika/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Aafrika/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Aafrika/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Aafrika/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Aafrika/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Aafrika/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Aafrika/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Aafrika/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Aafrika/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Aafrika/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Aafrika/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Aafrika/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Aafrika/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Aafrika/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Aafrika/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Aafrika/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Aafrika/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Aafrika/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Aafrika/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Ameerika/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Ameerika/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Ameerika/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Ameerika/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Ameerika/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Ameerika/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Ameerika/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Ameerika/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Ameerika/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Ameerika/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Ameerika/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Ameerika/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Ameerika/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Ameerika/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Ameerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Ameerika/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Ameerika/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Ameerika/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Ameerika/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Ameerika/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Ameerika/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Ameerika/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Ameerika/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Ameerika/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Ameerika/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Ameerika/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Ameerika/Damnarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Ameerika/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Ameerika/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Ameerika/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Ameerika/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Ameeria/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Ameerika/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Ameerika/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Ameerika/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Ameerika/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Ameerika/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Ameerika/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Ameerika/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Ameerika/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Ameeria/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Ameerika/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Ameerika/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Ameerika/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Ameerika/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Ameerika/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Ameerika/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Ameerika/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Ameerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Ameerika/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Ameerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Ameerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Ameerika/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Ameerika/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Ameerika/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Ameerika/Jamaika"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Ameerika/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Ameerika/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Ameerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Ameerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Ameerika/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Ameerika/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Ameerika/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Ameerika/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Ameerika/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Ameerika/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Ameerika/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Ameerika/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Ameerika/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Ameerika/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Ameerika/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Ameerika/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Ameerika/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Ameerika/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Ameerika/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Ameerika/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Ameerika/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Ameerika/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Ameerika/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Ameerika/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Ameerika/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Ameerika/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Ameerika/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Ameerika/Põhja_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Ameerika/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Ameerika/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Ameerika/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Ameerika/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Ameerika/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Ameerika/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Ameerika/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Ameerika/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Ameerika/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Ameerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Ameerika/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Ameerika/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Ameerika/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Ameerika/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Ameerika/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Ameerika/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Ameerika/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Ameerika/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Ameerika/Shiprocks"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Ameerika/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Ameerika/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Ameerika/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Ameerika/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Ameerika/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Ameerika/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Ameerika/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Ameerika/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Ameerika/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Ameerika/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Ameerika/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Ameerika/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Ameerika/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Ameerika/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Ameerika/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Ameerika/Yelloknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDurville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktika/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Aasia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Aasia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Aasia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Aasia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Aasia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Aasia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Aasia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Aasia/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Aasia/Bahrein"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Aasia/Bakuu"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Aasia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Aasia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Aasia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Aasia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Aasia/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Aasia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Aasia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Aasia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Aasia/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Aasia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Aasia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Aasia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Aasia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Aasia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Aasia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Aasia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Aasia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Aasia/Irkuts"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Aasia/Istanbu"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Aasia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Aasia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Aasia/Jeruusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Aasia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Aasia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Aasia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Aasia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Aasia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Aasia/Krasnojarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Aasia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Aasia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Aasia/Kuveit"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Aasia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Aasia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Aasia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Aasia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Aasia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Aasia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Aasia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Aasia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Aasia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Aasia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Aasia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Aasia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Aasia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Aasia/Katar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Aasia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Aasia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Aasia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Aasia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Aasia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Aasia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Aasia/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Aasia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Aasia/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Aasia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Aasia/Taškent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Aasia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Aasia/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Aasia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Aasia/Tokio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Aasia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Aasia/Ulaanbaator"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Aasia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Aasia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Aasia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Aasia/Jakuts"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Aasia/Jekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Aasia/Jerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlandi_ookean/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlandi_ookean/Canary"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlandi_ookean/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlandi_ookean/Fääri_saared"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlandi_ookean/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlandi_ookean/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlandi_ookean/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlandi_ookean/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlandi_ookean/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlandi_ookean/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Austraalia/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Austraalia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Austraalia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Austraalia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Austraalia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Austraalia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Austraalia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Austraalia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Austraalia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Austraalia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Euroopa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Euroopa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Euroopa/Ateena"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Euroopa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Euroopa/Belgrad"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Euroopa/Berliin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Euroopa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Euroopa/Brüssel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Euroopa/Bukarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Euroopa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Euroopa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Euroopa/Kopenhaagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Euroopa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Euroopa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Euroopa/Helsingi"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Euroopa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Euroopa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Euroopa/Kiiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Euroopa/Lisbon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Euroopa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Euroopa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Euroopa/Luksemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Euroopa/Madriid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Euroopa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Euroopa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Euroopa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Euroopa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Euroopa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Euroopa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Euroopa/Pariis"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Euroopa/Praha"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Euroopa/Riia"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Euroopa/Rooma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Euroopa/Samaara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Euroopa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Euroopa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Euroopa/Simferoopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Euroopa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Euroopa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Euroopa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Euroopa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Euroopa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Euroopa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Euroopa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Euroopa/Vatikan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Euroopa/Viin"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Euroopa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Euroopa/Varssavi"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Euroopa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozie"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Euroopa/Zürich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "India_ookean/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "India_ookean/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "India_ookean/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "India_ookean/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "India_ookean/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "India_ookean/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "India_ookean/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "India_ookean/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "India_ookean/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "India_ookean/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "India_ookean/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Vaikne_ookean/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Vaikne_ookean/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Vaikne_ookean/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Vaikne_ookean/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Vaikne_ookean/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Vaikne_ookean/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Vaikne_ookean/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Vaikne_ookean/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Vaikne_ookean/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Vaikne_ookean/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Vaikne_ookean/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Vaikne_ookean/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Vaikne_ookean/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Vaikne_ookean/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Vaikne_ookean/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Vaikne_ookean/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Vaikne_ookean/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Vaikne_ookean/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Vaikne_ookean/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Vaikne_ookean/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Vaikne_ookean/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Vaikne_ookean/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Vaikne_ookean/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Vaikne_ookean/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Vaikne_ookean/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Vaikne_ookean/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Vaikne_ookean/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Vaikne_ookean/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Vaikne_ookean/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Vaikne_ookean/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Vaikne_ookean/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Vaikne_ookean/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Vaikne_ookean/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Vaikne_ookean/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Vaikne_ookean/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Vaikne_ookean/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Vaikne_ookean/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Vaikne_ookean/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
@@ -10815,19 +10848,19 @@ msgstr "T_eema:"
 msgid "Si_gnature:"
 msgstr "Si_gnatuur:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Vali kaust, kuhu sõnum postitada."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
@@ -10835,7 +10868,7 @@ msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 msgid "Recent _Documents"
 msgstr "_Hiljutised dokumendid"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Näita _manuseriba"
 
@@ -11021,7 +11054,7 @@ msgstr "_Jätka redigeerimist"
 msgid "_Do not Recover"
 msgstr "Ära _taasta"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Taasta"
 
@@ -11071,11 +11104,11 @@ msgstr "Evolutioni küsimus"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisemine viga, küsiti tundmatut viga '%s'"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Komponent"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "Logitava komponendi nimi"
 
@@ -11090,15 +11123,15 @@ msgstr "Lubatud"
 msgid "Whether the plugin is enabled"
 msgstr "Kas plugin on lubatud või mitte"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Printimise ajal tekkis viga"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Printimissüsteem edastas vea kohta järgnevad üksikasjad:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Printimissüsteem ei täpsustanud vea üksikasju."
@@ -11478,7 +11511,7 @@ msgstr "sinu poolt määratud aeg"
 
 #: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "nädalat"
@@ -11551,8 +11584,8 @@ msgstr "Evolutioni võrguseadistuste juhtimine"
 
 #: ../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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -11593,13 +11626,13 @@ msgstr ""
 "mida kuvatakse allpool ja nendega nõustumise korral\n"
 "märgi märkeruut\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
 #: ../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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
@@ -11684,7 +11717,7 @@ msgstr "Allkirjaskripti lisamine"
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
@@ -11883,7 +11916,7 @@ msgstr "Mängi heli"
 
 #. 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:62
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Loetud"
 
@@ -11955,9 +11988,9 @@ msgstr "algab stringiga"
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:311
+#: ../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
 msgid "Subject"
@@ -11976,51 +12009,51 @@ msgstr "Siis"
 msgid "Add Ac_tion"
 msgstr "Lisa _tegevus"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Loo o_tsingu põhjal otsingukaust..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Kõik sõnumid"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Silt puudub"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Loetud sõnumid"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Värsked sõnumid"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Viimase 5 päeva sõnumid"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Manustega sõnumid"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Tähtsad sõnumid"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Mitte rämpspost"
 
-#: ../mail/em-folder-browser.c:1170
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Kontootsing"
 
-#: ../mail/em-folder-browser.c:1223
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Otsing kõigi kontode hulgast"
 
@@ -12046,7 +12079,7 @@ msgstr "Kvoodikasutus"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
@@ -12153,7 +12186,7 @@ msgstr "_Kopeeri kausta"
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
@@ -12203,20 +12236,20 @@ msgid "C_opy"
 msgstr "K_opeeri"
 
 #: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
 #: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Kausta loomine"
 
 #: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
@@ -12346,9 +12379,9 @@ msgstr "Filter p_ostiloendi järgi"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "UTF-8"
 
@@ -12663,19 +12696,19 @@ msgid "Formatting Message..."
 msgstr "Sõnumi vormindamine..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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 "Koopia"
 
 #: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../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 "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Postiprogramm"
@@ -12698,13 +12731,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Selle sõnumi on <b>%2$s</b> nimel saatnud <b>%1$s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:307
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Saatja"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
@@ -12766,19 +12799,19 @@ msgstr "PGP-sõnumit pole võimalik analüüsida: Tundmatu viga"
 
 #: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
-msgstr "Iga kord"
+msgstr "iga kord"
 
 #: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
-msgstr "Kord päevas"
+msgstr "kord päevas"
 
 #: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
-msgstr "Kord nädalas"
+msgstr "kord nädalas"
 
 #: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
-msgstr "Kord kuus"
+msgstr "kord kuus"
 
 #: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
@@ -12966,7 +12999,7 @@ msgstr "Aadressi lisamine"
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "_Otsingukaustad"
 
@@ -13114,19 +13147,19 @@ msgstr "Tellimisdialoogi vaikimisi laius."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 
@@ -13534,7 +13567,8 @@ msgid "Save directory"
 msgstr "Salvestamise kataloog"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
+#, fuzzy
+msgid "Search for the sender photo in local address books"
 msgstr "Saatja foto otsimine kohalikest aadressiraamatutest"
 
 #: ../mail/evolution-mail.schemas.in.h:115
@@ -13674,7 +13708,7 @@ msgstr ""
 #: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
@@ -13924,144 +13958,144 @@ msgstr "Lisa filtreerimisreegel"
 msgid "Templates"
 msgstr "Mallid"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valitud, "
 msgstr[1] "%d valitud, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d kustutatut"
 msgstr[1] "%d kustutatut"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d rämpssõnum"
 msgstr[1] "%d rämpssõnumit"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d mustand"
 msgstr[1] "%d mustandit"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d saadetud"
 msgstr[1] "%d saadetud"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d saatmata"
 msgstr[1] "%d saatmata"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lugemata, "
 msgstr[1] "%d lugemata, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d kokku"
 msgstr[1] "%d kokku"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: ../mail/mail-component.c:917
+#: ../mail/mail-component.c:924
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:932
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "Viga"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "Vead"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "Hoiatused ja vead"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "Silumine"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "Vea-, hoiatus- ja silumisteated"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "Silumislogid"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1736
 msgid "Show _errors in the status bar for"
 msgstr "Ol_ekuribal näidatakse vigu"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1745
+#: ../mail/mail-component.c:1752
 msgid "second(s)."
 msgstr "sekund(it)."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "Logiteated:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "Logimise tase"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Aeg"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Sõnumid"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Akna sulgemine"
@@ -14313,10 +14347,11 @@ msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
 #: ../mail/mail-config.glade.h:71
 msgid "Do not format messages when text si_ze exceeds"
-msgstr "Sõnumite tekstiosa ei vo_rmindata kui selle suurus ületab"
+msgstr "Sõnumite tekstiosa ei vo_rmindata, kui selle suurus ületab"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+#, fuzzy
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Minu _aadressiraamatus olevate saatjate sõnumeid ei märgita rämpsuks"
 
 #: ../mail/mail-config.glade.h:73
@@ -14527,7 +14562,7 @@ msgid "S_OCKS Host:"
 msgstr "S_OCKS-i host:"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
 msgstr "Saatja f_otot otsitakse ainult kohalikust aadressiraamatust"
 
 #: ../mail/mail-config.glade.h:128
@@ -14636,7 +14671,7 @@ msgid "Use Authe_ntication"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../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:"
@@ -14693,8 +14728,8 @@ msgid "_Load images in messages from contacts"
 msgstr "Pildid _laaditakse kontaktide poolt saadetud sõnumites"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
-msgstr ""
+msgid "_Lookup in local address book only"
+msgstr "_Otsitakse ainult kohalikest aadressiraamatutest"
 
 #: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
@@ -14717,11 +14752,9 @@ msgid "_Path:"
 msgstr "_Rada:"
 
 #: ../mail/mail-config.glade.h:178
-#, fuzzy
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
-"HTML-sõnumi saatmisel seda mittesoovivatele kontakti(de)le _küsitakse "
-"kinnitust"
+"HTML-sõnumi saatmisel seda mittesoovivatele kontaktidele _küsitakse kinnitust"
 
 #: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14766,7 +14799,7 @@ msgstr "Kasuta süsteemi _vaikeväärtuseid"
 
 #: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
-msgstr "_Kasutatakse teiste rakendustega sama kirjatüüpi"
+msgstr "_Kirjatüüp on sama, mis teistes rakendustes"
 
 #: ../mail/mail-config.glade.h:192
 msgid "addresses"
@@ -14824,7 +14857,7 @@ msgstr "Ot_sing:"
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Märgistamine järeltoiminguks"
 
@@ -14931,96 +14964,96 @@ msgstr "Tühistatud."
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite ümbertõstmine kausta %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Kausta %s kohta kvoodiandmete vastuvõtmine"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Hoidla %s avamine"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto '%s' sõnumite puhastamine ja salvestamine"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Kataloogi puhastamine"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtmine"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d sõnumi vastuvõtmine"
 msgstr[1] "%d sõnumi vastuvõtmine"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d sõnumi salvestamine"
 msgstr[1] "%d sõnumi salvestamine"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15029,11 +15062,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15042,27 +15075,27 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ãœhendun lahti: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' ettevalmistamine võrguvabaks režiimiks"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
@@ -15888,39 +15921,39 @@ msgstr "Saadetud sõnumid"
 msgid "Size"
 msgstr "Suurus"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Helista"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Jälgi"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Võta teadmiseks"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Tagasiside pole tarvilik"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Vasta"
 
-#: ../mail/message-tag-followup.c:64 ../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 "Vasta kõigile"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Vaata üle"
 
@@ -16023,27 +16056,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Evolutioni varukoopiale faili nime valimine"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Pärast varundamist taaskäivitatakse Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Taastamiseks Evolutioni varukoopiafaili nime valimine"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Pärast taastamist taaskäivitatakse Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Taastamine varukoopiast"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16053,118 +16086,118 @@ msgstr ""
 "posti, kalenderid, ülesandeid, märkmeid ja aadressiraamatut.\n"
 "Samuti saab taastada ka isiklikud sätted, postifiltrid jne."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Taasta Evolution varukoopiafailist"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Palun vali taastamiseks Evolutioni arhiiv:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Taastatava faili valimine"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Evolutioni kataloogi varundamine"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Evolutioni kataloogi taastamine"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Evolutioni varukoopia kontrollimine"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Evolutioni taaskäivitamine"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Koos graafilise kasutajaliidesega"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Evolutioni seiskamine"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolutioni kontode ja seadistuste varundamine"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Evolutioni andmete (e-post, kontaktid, kalender, ülesanded, märkmed) "
 "varundamine"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Varundamine on valmis"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolutioni taaskäivitamine"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Praeguse Evolutioni kataloogi varundamine"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Varukoopiast failide väljavõtmine"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Evolutioni sätete laadimine"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Ajutiste varufailide eemaldamine"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varundamine kataloogi %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Taastamine kataloogist %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolutioni varundamine"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolutioni taastamine"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Evolutioni andmete varundamine"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Palun oota kuni Evolution Sinu andmeid varundab."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Evolutioni andmete taastamine"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Palun oota kuni Evolution Sinu andmeid taastab."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Sõltuvalt andmete hulgast, võib see veidi aega võtta."
 
@@ -16201,7 +16234,7 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
-msgstr ""
+msgstr "Puuduvad õigused"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
@@ -16249,7 +16282,7 @@ msgstr "Automaatsed kontaktid"
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:567
 #, fuzzy
-msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "Sõnumile vastamisel luuakse automaatselt aa_dressiraamatu kirje"
 
 #: ../plugins/bbdb/bbdb.c:573
@@ -16278,8 +16311,9 @@ msgid "Synchronize with _buddy list now"
 msgstr "Sünkroniseeri sõ_branimekiri kohe"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#, fuzzy
 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 ""
@@ -16351,7 +16385,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
 #: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Kasutatakse _SSL-i"
@@ -16374,7 +16408,7 @@ msgstr "Kohalike kalendrite põhitalitluse tagamine."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
 #: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "_Värskenda:"
@@ -16485,7 +16519,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Kas sa soovid Evolutioni määrata vaikimisi e-posti kliendiks?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16510,8 +16544,9 @@ msgid "Default Sources"
 msgstr "Vaikimisi allikad"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
 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 ""
 "Kalendri või aadressiraamatu vaikimisi kalendriks või aadressiraamatuks "
@@ -16708,7 +16743,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16716,7 +16751,7 @@ msgstr ""
 "Käesolev parool ei vasta sinu konto olemasolevale paroolile. Palun sisesta "
 "õige parool"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Kaks parooli ei ole vastavuses. Palin sisesta paroolid uuesti."
 
@@ -16892,7 +16927,7 @@ msgstr ""
 msgid "_Tasks:"
 msgstr "_Ãœlesanded:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Pääsuõigused..."
@@ -16906,11 +16941,11 @@ msgid "Folder Size"
 msgstr "Kausta suurus"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Kasutaja"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Teise kasutaja kausta tellimine"
@@ -17122,10 +17157,6 @@ msgstr "_Tundlikkus:"
 msgid "_User"
 msgstr "_Kasutaja"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Kasutaja valimine"
@@ -17288,7 +17319,7 @@ msgid "Folder offline"
 msgstr "Kataloog pole võgus"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Ãœldine viga"
 
@@ -17407,7 +17438,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Tundmatu viga {0} lahendamisel"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
@@ -17521,19 +17552,23 @@ msgstr "Ajutist faili pole võimalik luua"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "Redaktor pole käivitatav"
 
 #: ../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 ""
+"Evolutionil pole võimalik sõnumi salvestamiseks ajutist faili luua. Proovi "
+"hiljem uuesti."
 
 #: ../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 ""
+"Sinu pluginaeelistustes määratud redaktorit pole võimalik käivitada. Proovi "
+"mõnda muud redaktorit."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17543,11 +17578,11 @@ msgstr "Koostamine _välise redaktor abil"
 msgid "Compose messages using an external editor"
 msgstr "Sõnumite koostamine välise redaktor abil"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Redaktori käivitamiseks kasutatav käsk: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17555,15 +17590,15 @@ msgstr ""
 "Emacs'i jaoks kasuta \"xemacs\"\n"
 "VI jaoks kasuta \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Vali PNG-pilt mõõtmetega 48x48 ja suurusega mitte rohkem kui 700 baiti"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG-failid"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Näopilt"
 
@@ -17607,27 +17642,30 @@ msgstr "_Lõpeta tellimus"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Palun sisesta esmalt kasutajanimi."
 
-#: ../plugins/google-account-setup/google-source.c:497
-#, fuzzy, c-format
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Lisab kausta sinu tellitud kaustade nimekirja"
+msgstr ""
+"Sisesta kasutajale %s parool, millega ta tellitud kalendritele ligi pääseb."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
+"Google serverist pole võimalik andmeid lugeda.\n"
+"%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "Kalen_der:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr ""
 
@@ -17806,14 +17844,12 @@ msgid "This is a recurring meeting"
 msgstr "See on korduv kohtumine"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
 msgid "Would you like to accept it?"
-msgstr "Kas soovid tehtud muudatusi salvestada?"
+msgstr "Kas nõustud sellega?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-#, fuzzy
 msgid "Would you like to decline it?"
-msgstr "Kas soovid tehtud muudatusi salvestada?"
+msgstr "Kas lükkad selle tagasi?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
@@ -17823,7 +17859,7 @@ msgstr "Sul pole võimalik kausta määratud kasutajaga &quot;{0}&quot; jagada"
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr ""
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Nõustu katseliselt"
 
@@ -17948,20 +17984,20 @@ msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on lubatud."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Sisesta kasutajad ja määra õigused"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Uus _jagatud kataloog..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Jagamine"
 
@@ -18160,7 +18196,9 @@ msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+#, fuzzy
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Valitud ülesande/märkme/kalendri/aadressiraamatu sünkroniseerimine Apple "
 "iPod'iga"
@@ -19037,12 +19075,12 @@ msgstr "_Teisenda koosolekuks"
 msgid "Mail to meeting"
 msgstr "Sõnumi teisendamine koosolekuks"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalendrit pole võimalik avada. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19227,12 +19265,11 @@ msgstr "_Telli postiloend"
 msgid "_Unsubscribe from List"
 msgstr "_Loobu postiloendi tellimusest"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
-msgstr "Sõnumite ümbertõstmine %s kausta"
+msgstr "Kas märkida ka alamkaustade sõnumid?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../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 "
@@ -19241,11 +19278,11 @@ msgstr ""
 "Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
 "loetuksmärkimine"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "_Käesolevas kaustas ja alamkaustades"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Ainult _käesolevas kaustas"
 
@@ -19789,7 +19826,7 @@ msgid "Thread messages by subject"
 msgstr "Jutulõngade koostamine teema järgi"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Varuvaria_ndina koostatakse jutulõng teema alusel"
 
@@ -19877,51 +19914,47 @@ msgid "Configuration version"
 msgstr "Seadistuste versioon"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Kas krahhituvastus peab töötama või mitte."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Külgpaani vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Akna vaikimisi kõrgus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Akna vaikimisi olek"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Akna vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP-proksi hostinimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP-proksi parool"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP-proksi port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP-proksi kasutajanimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Käivitamisel vaikimisi näidatava komponendi ID või alias."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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/"
@@ -19929,44 +19962,44 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Viimati uuendatud seadistuste versioon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Autonoomses olekus kettale sünkroniseeritavate kaustade radade loend"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../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:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS-proksi hostinimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS-proksi port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Turvalise HTTP proksi hostinimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Turvalise HTTP proksi hosti port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -19974,27 +20007,23 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Külgpaan on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Arendushoiatuse dialoogi jäetakse vahele"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Taastamishoiatuse dialoogi vahelejätmine"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Alustamine võrguvabas olekus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Olekuriba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20002,19 +20031,19 @@ msgstr ""
 "Evolutioni viimati uuendatud seadistuste versioon kujul major/minor/"
 "configuration (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Peaakna vaikimisi kõrgus pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Peaakna vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Külgpaani vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20023,37 +20052,37 @@ msgstr ""
 "configuration, kus major on peamine versioon, minor alamversioon ja "
 "configuration seadistuste versioon (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../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:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../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 "
@@ -20063,7 +20092,7 @@ msgstr ""
 "ikoonide, \"both\" nii tekstinuppude kui ikoonide jaoks ja \"toolbar\" "
 "juhuks, kui nuppude laad tuletatakse GNOME tööriistariba sätetest."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20071,66 +20100,58 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "Proksi seadistustele viitav URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "HTTP-proksi kasutamine"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-proksi autentimisel kasutatav kasutajanimi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Millal Evolution alustab võrgurežiimi asemel võrguvabas režiimis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Kas krahhituvastus tuleb läbi viia või mitte"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Millal aken peaks maksimeeritud olema ja millal mitte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Millal külgpaan peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Millal olekuriba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Kas Evolutioni arendusversioonis tuleb hoiatusdialoogist üle hüpata või "
 "mitte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Kas Evolutioni taastamise hoiatusdialoog tuleb vahele jätta või mitte."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Millal aknanupud peaksid nähtavad olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Aknanupu stiil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Aknanupud on nähtavad"
 
@@ -20209,7 +20230,7 @@ msgstr "Evolutioni eelistused"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20263,7 +20284,7 @@ msgstr "Siirdu aut_onoomsesse olekusse"
 msgid "Work Offline"
 msgstr "Siirdumine võrguvabasse olekusse"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20271,11 +20292,11 @@ msgstr ""
 "Evolution on hetkel võrku ühendatud.\n"
 "Võrguvabasse olekusse siirdumiseks klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub võrguvabasse olekusse."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20283,52 +20304,52 @@ msgstr ""
 "Evolution on hetkel võrguvabas olekus.\n"
 "Võrku ühendumiseks klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine vaatele \"%s\""
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Tundmatu süsteemne viga."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Olgu"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF'i pole võimalik registreerida"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Uus"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Uus test"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
 msgctxt "New"
 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 "Uue testikirje loomine"
 
@@ -20371,7 +20392,7 @@ msgstr ""
 "importid aväliseid faile Evolutioni keskkonda."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20408,7 +20429,7 @@ msgstr ""
 "Me loodame, et võid meie töö ja vaevaga valminud programmist\n"
 "rõõmu tunda ja me ootame programmi kohta tagasisidet!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20416,66 +20437,43 @@ msgstr ""
 "Täname,\n"
 "Evolutioni meeskond\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Enam uuesti mitte näidata"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Evolutioni krahhituvastus"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "_Eira"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution paistab olevat viimase töötamise lõpetanud ootamatult.\n"
-"Ettevaatusabinõuna on nüüd kõik eelvaatepaanid peidus. Sul on neid\n"
-"võimalik Vaate menüü abil nähtavale tuua.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "Seda _teadet enam uuesti mitte näidata."
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Evolutioni käivitamine koos määratud komponendi aktiveerimisega"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Alustamine võrgurežiimis"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Kõigi Evolutioni komponentide töö lõpetamisele sundimine"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uuesti Evolutioni versioonist 1.4 migreerumisele sundimine"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Kõikide komponentide silumisinfo saatmine faili"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Sõnumite, kontaktide ja ülesannete eelvaatepaani keelamine"
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolutioni e-posti ja isikliku teabehalduse klient"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20717,7 +20715,7 @@ msgid "Enter new password"
 msgstr "Sisesta uus parool"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20726,7 +20724,7 @@ msgstr ""
 "Kellele väljastatud:\n"
 "             Omanik: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20735,7 +20733,7 @@ msgstr ""
 "Väljastaja:\n"
 "    Omanik: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Sertifikaadi valimine"
 
@@ -21155,7 +21153,7 @@ msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Uue aadressiraamatute kausta loomine"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -22649,13 +22647,13 @@ msgstr "Vaate liik:"
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Faili pole võimalik manusesse lisada: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
@@ -23743,6 +23741,43 @@ msgstr "Välksõnumikontekst"
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Saabuvad sündmused"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Kas krahhituvastus peab töötama või mitte."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Taastamishoiatuse dialoogi vahelejätmine"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Kas krahhituvastus tuleb läbi viia või mitte"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Kas Evolutioni taastamise hoiatusdialoog tuleb vahele jätta või mitte."
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolutioni krahhituvastus"
+
+#~ msgid "Ig_nore"
+#~ msgstr "_Eira"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution paistab olevat viimase töötamise lõpetanud ootamatult.\n"
+#~ "Ettevaatusabinõuna on nüüd kõik eelvaatepaanid peidus. Sul on neid\n"
+#~ "võimalik Vaate menüü abil nähtavale tuua.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "Seda _teadet enam uuesti mitte näidata."
+
 #~ msgid "Migrating `%s':"
 #~ msgstr "Siirdamine `%s':"
 
diff --git a/po/eu.po b/po/eu.po
index b88a979d2e..5b9820494e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,40 +1,41 @@
 # translation of eu.po to Basque
 # Copyright (C) 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
+#: ../shell/main.c:589
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2005, 2006, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-29 16:22+0100\n"
-"PO-Revision-Date: 2008-02-19 18:20+0100\n"
+"POT-Creation-Date: 2008-09-09 12:28+0200\n"
+"PO-Revision-Date: 2008-09-09 12:29+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "evolution-en helbide-liburua"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -42,7 +43,6 @@ msgstr[0] "uneko %s helbide-liburuaren karpetak txartel %d du"
 msgstr[1] "uneko %s helbide-liburuaren karpetak %d txartel ditu"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Ireki"
 
@@ -58,63 +58,63 @@ msgstr "Kontaktua: "
 msgid "evolution minicard"
 msgstr "evolution-en txarteltxoa"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Alarmak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Errepikapenak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Bilera bat da."
 
-#: ../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 "Egutegi-gertaera: laburpena %s da."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "Egutegi-gertaera: ez du laburpenik."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Egutegi-gertaeren ikuspegia"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Hartu fokua"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Hitzordu berria"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Egun osoko gertaera berria"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Joan gaurko egunera"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Joan data jakin batera"
 
-#: ../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 "taula uneko orduaren barrutia ikusteko eta hautatzeko"
 
 #. 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."
@@ -123,14 +123,14 @@ msgstr[1] "%d gertaera ditu."
 
 #. 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 "Ez du gertaerarik."
 
 #. 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 "Lan-asteko ikuspegia: %s. %s"
@@ -138,21 +138,21 @@ msgstr "Lan-asteko ikuspegia: %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 "Eguneko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "Lan-asteko egutegi-ikuspegia"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "Egun baten edo gehiagoren egutegi-ikuspegia"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %Y %b %d"
 
@@ -162,32 +162,30 @@ msgstr "%A, %Y %b %d"
 #. %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:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../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:760
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: ../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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: ../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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%Y %b %d"
 
@@ -196,61 +194,59 @@ msgstr "%Y %b %d"
 #. 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:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../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:786
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1582
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%b %d"
 
-#: ../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:766
 msgid "Gnome Calendar"
 msgstr "Gnome egutegia"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "Bilaketa-barra"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "Evolution-en egutegiko bilaketa-barra"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Joan botoia"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Egin klik gertaera gehiago bilatzeko."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Hileko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Asteko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "Hileko egutegi-ikuspegia"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "Aste baten edo gehiagoren egutegi-ikuspegia"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "laster-leihoa"
 
 #. 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 "ireki laster-leiho umea"
 
@@ -262,12 +258,12 @@ msgstr "editatu"
 msgid "begin editing this cell"
 msgstr "hasi gelaxka hau editatzen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "txandakatu"
 
 #. 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 "txandakatu gelaxka"
 
@@ -287,47 +283,47 @@ msgstr "tolestu"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "tolestu errenkada gelaxka hau duen ETree-an"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Taulako gelaxka"
 
-#: ../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 "egin klik gehitzeko"
 
-#: ../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 "egin klik"
 
-#: ../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 "ordenatu"
 
-#: ../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 "%Y %B %d"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Egutegia: %s - %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "Evolution-en egutegi-elementua"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Konbinazio-botoia"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Aktibatu lehenetsia"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Bistaratu menua"
 
@@ -342,11 +338,11 @@ msgstr "aktibatu"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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}' irakurtzeko soilik den helbide-liburuaren iturburua da. Aldatu "
-"egutegiaren ikuspegira eta hitzorduak onartzen dituen egutegia nabarmendu."
+"'{0}' irakurtzeko soilik den helbide-liburua da eta ezin da eraldatu. "
+"Hautatu beste helbide-liburu bat albo-barratik Kontaktuen ikuspegian."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -387,14 +383,14 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Ezin izan da eskema-informazioa jaso LDAP zerbitzariarentzat."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Ezin izan da helbide-liburua kendu."
 
 #: ../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 ""
 "Unean Evolution-etik GroupWise sistemako helbide-liburura soilik duzu "
 "sarbidea. Erabili GroupWise-ren beste posta-bezero bat behin, zure GroupWise-"
@@ -405,7 +401,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Hautatu '{0}' helbide-liburua?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Errorea helbide-liburua kargatzean."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -418,7 +414,7 @@ msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Huts egin du kontaktua ezabatzean"
 
@@ -431,30 +427,24 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Baimena ukatuta."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Zerbitzariaren bertsioa"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Zenbait funtzionalitate ez dute funztionatuko uneko zerbitzariaren "
 "bertsioarekin"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution-en helbide-liburua ustekabean itxi da."
 
-#: ../addressbook/addressbook.error.xml.h:23
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Hautatutako irudia handiegia da. Tamainaz aldatzea eta gordetzea nahi duzu?"
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Hautatutako irudia handiegia da. Tamainaz aldatzea eta gordetzea nahi duzu?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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 "
@@ -464,58 +454,58 @@ msgstr ""
 "hau onartzen ez duen bertsioa) edo gaizki konfiguratuta egon daiteke. "
 "Galdetu administratzaileari onartutako bilaketen oinarriei buruz."
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "Helbide-liburua betiko ezabatu egingo da."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "Ezin izan da helbide-liburua ireki."
 
-#: ../addressbook/addressbook.error.xml.h:27
-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 ""
 "Onartzen ez diren bilaketa-oinarriekin erantzun du helbide-liburuen "
 "zerbitzariak"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Helbide-liburuen zerbitzaria ezin da eskuratu edo zerbitzariaren izena oker "
 "idatzita dago edo sareko konexioa hautsi egin da."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Helbide-liburua betiko ezabatu egingo da."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "Ezin da helbide-liburua ireki"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Ezin da bilaketa landu."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Ezin da {0} gorde."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Kontaktu bat helbide-liburu batetik bestera eramaten saiatzen ari zarela "
 "dirudi, baina ezin da iturburutik ezabatu. Kopia bat gordetzea nahi duzu "
 "horren ordez?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -525,6 +515,10 @@ msgstr ""
 "erabiltzean arazoak egon daitezke. Egokiena zerbitzaria onartutako bertsio "
 "batera eguneratzea izango litzateke."
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Ez duzu nahikoa baimen kontaktuak helbide-liburu honetatik ezabatzeko."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -532,12 +526,10 @@ msgid ""
 msgstr "Kontaktuan aldaketak egin dituzu. Aldaketa hauek gordetzea nahi duzu?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"{0}(r)en kontaktuak ez dira eskuragarri egongo Evolution berriro abiatu arte."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "{0}(r)en kontaktuak ez dira eskuragarri egongo Evolution berriro abiatu arte."
 
-#: ../addressbook/addressbook.error.xml.h: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
@@ -560,9 +552,9 @@ msgstr "_Aldatu tamaina"
 msgid "_Use as it is"
 msgstr "_Erabili bere horretan"
 
-#. 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:44
-#: ../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}"
 
@@ -571,17 +563,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "Ezin izan da helbide-liburua kargatu"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
@@ -603,10 +595,10 @@ msgstr "Konfiguratu osatze automatikoa hemen"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -615,8 +607,8 @@ msgid "Evolution Address Book"
 msgstr "Evolution-en helbide-liburua"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Evolution-en helbide-liburuko laster-leihoa"
+msgid "Evolution Address Book address popup"
+msgstr "Evolution-en helbide-liburuko helbideen laster-leihoa"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -631,7 +623,7 @@ msgid "Evolution Address Book component"
 msgstr "Evolution-en helbide-liburuaren osagaia"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -646,12 +638,13 @@ msgstr "Kudeatu zure S/MIME ziurtagiriak hemen"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../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
 msgid "On This Computer"
 msgstr "Ordenagailu honetan"
 
@@ -664,121 +657,109 @@ msgstr "Ordenagailu honetan"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "Pertsonala"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP zerbitzarian"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Kontaktua"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "K_ontaktuen zerrenda"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "_Helbide-liburua"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Sortu helbide-liburu berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
-msgstr ""
-"Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
+msgstr "Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Oinarria"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Mota:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopiatu _liburuaren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Orokorra"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Zerbitzariaren datuak"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "Xehetasunak"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Deskargatzen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migratzen..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "'%s' migratzen:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -831,70 +812,76 @@ msgstr ""
 "aldatu egin dira.\n"
 "Itxaron Evolution-ek Pilot sinkronizazioaren datuak migratu bitartean..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Karpeta-izenak ezin du '/' karaktererik eduki."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "Helbide-liburu _berria"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Gorde vCard gisa..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../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 "E_zabatu"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Propietateak..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Propietateak"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Kontaktu-iturburuaren hautatzailea"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarian anonimoki sartzea"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../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 "Huts egin du autentifikatzean.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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 "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
 
@@ -932,13 +919,11 @@ msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa"
+msgstr "Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
+msgstr "Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
@@ -974,38 +959,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Autentifikazioa</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Bistaratzea</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Deskargatzea</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Bilaketa</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Zerbitzariaren datuak</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Mota:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Gehitu helbide-liburua"
 
-#: ../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:761
 msgid "Always"
 msgstr "Beti"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonimoki"
 
+#. 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 "_Arakatu liburu hau muga gainditu arte"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Oinarrizkoa"
@@ -1019,8 +1001,7 @@ msgid "Email address"
 msgstr "Helbide elektronikoa"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
@@ -1034,14 +1015,14 @@ msgid "Lo_gin:"
 msgstr "_Saio-hasiera:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Inoiz ere ez"
 
 #. 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
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Enkriptaziorik gabe"
 
@@ -1053,7 +1034,7 @@ msgstr "Bat"
 #. 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
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL enkriptazioa"
 
@@ -1121,7 +1102,7 @@ msgstr "Onartutako Bilaketa Oinarriak"
 #. 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
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS enkriptazioa"
 
@@ -1222,8 +1203,8 @@ msgid "_Login method:"
 msgstr "_Saioa hasteko metodoa:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1238,7 +1219,7 @@ msgid "_Search scope:"
 msgstr "Bilaketa-_esparrua: "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
@@ -1259,9 +1240,10 @@ msgstr "txartel"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutu"
 
@@ -1302,7 +1284,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Lanekoa</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1314,16 +1296,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegoriak..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontaktua"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -1336,7 +1318,7 @@ msgid "Image"
 msgstr "Irudia"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN mezularia"
 
@@ -1349,7 +1331,7 @@ msgid "Nic_kname:"
 msgstr "_Goitizena:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1363,11 +1345,11 @@ msgstr "Telefonoa"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Lanekoa"
 
@@ -1389,8 +1371,8 @@ msgid "_Birthday:"
 msgstr "U_rtebetetzea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Egutegia:"
@@ -1479,1119 +1461,1121 @@ msgstr "_Non:"
 msgid "_Zip/Postal Code:"
 msgstr "Pos_ta-kodea:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "Helbidea"
 
-#: ../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:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Editagarria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Estatu Batuak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Aljeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Samoa amerikarra"
 
-#: ../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 "Antartika"
 
-#: ../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 eta Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../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 "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../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 "Bielorrusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgika"
 
-#: ../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 "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../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 "Bosnia 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 uhartea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../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 "Indiako Ozeanoko Britainiar Lurraldea"
 
-#: ../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 "Bulgaria"
 
-#: ../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 "Kanbodia"
 
-#: ../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 "Cabo 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 "Kaiman uharteak"
 
-#: ../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 "Afrika Erdiko Errepublika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Txad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Txile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Txina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Christmas uhartea"
 
-#: ../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 "Cocos Keeling uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolonbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komoroak"
 
-#: ../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 "Kongoko Errepublika Demokratikoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cook uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../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:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Boli Kosta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Kroazia"
 
-#: ../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 "Zipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Txekiar Errepublika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikar Errepublika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ekuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../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:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Ekuatore Ginea"
 
-#: ../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 "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Malvina uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Faroe uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Frantzia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Guyana frantsesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polinesia frantsesa"
 
-#: ../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 "Hegoaldeko lurralde frantsesak"
 
-#: ../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 "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../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 "Grezia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../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 "Ginea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "Ginea Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../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 "Heard eta McDonald uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Vatikano Hiriko Estatua"
 
-#: ../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 "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../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 "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../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 "Irlanda"
 
-#: ../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 "Man uhartea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../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 "Jordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Koreako Herri Errepublika Demokratikoa"
 
-#: ../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 "Koreako Errepublika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: ../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 "Letonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Libano"
 
-#: ../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 "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxenburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Mazedonia"
 
-#: ../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 "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldivak"
 
-#: ../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 "Marshall uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Maurizio"
 
-#: ../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 "Mikronesia"
 
-#: ../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 "Moldaviako Errepublika"
 
-#: ../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 "Mongolia"
 
-#: ../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 "Mozanbike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Birmania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../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 "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Herbehereak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antilla herbeheretarrak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Kaledonia Berria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Zeelanda Berria"
 
-#: ../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 "Nigeria"
 
-#: ../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 "Norfolk uhartea"
 
-#: ../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 "Iparraldeko Mariana uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../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 "Palestinako lurraldea"
 
-#: ../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 Ginea Berria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../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 "Filipinak"
 
-#: ../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 "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../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:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../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 "Errumania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Errusiar Federakundea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../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 "Saint Kitts eta 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 "Santa Luzia"
 
-#: ../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 "Saint Vincent eta Grenadinak"
 
-#: ../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 eta 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 "Saudi Arabia"
 
-#: ../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 "Serbia eta Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelleak"
 
-#: ../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 Leona"
 
-#: ../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 "Eslovakia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Salomon uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Hegoafrika"
 
-#: ../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 "Hegoaldeko Georgia eta Hegoaldeko Sandwich uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Espainia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../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:339
+#: ../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:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre eta Mikelune"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../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 eta Jan Mayen uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swazilandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suitza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Siria"
 
-#: ../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 "Tadjikistan"
 
-#: ../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 "Tanzaniako Errepublika Batua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thailandia"
 
-#: ../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 eta Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../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 "Turk eta Caico uharteak"
 
-#: ../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 "Ukraina"
 
-#: ../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 "Arabiar Emirerri Batuak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
-#: ../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 "Estatu Batuetako kanpoaldeko uharte txikiak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../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 "Birjina uharteak (britainiarrak)"
 
-#: ../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 "Birjina uharteak (amerikarrak)"
 
-#: ../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 eta Futuna uharteak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Mendebaldeko Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Yemen"
 
-#: ../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 "Zimbawe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Izena"
 
-#: ../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 "AOL berehalako mezularia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo mezularia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu mezularia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "Zerbitzua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Kokalekua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Erabiltzaile-izena"
 
-#: ../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:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Etxekoa"
 
-#: ../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:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "Iturburu-liburua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Helburu-liburua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Kontaktu berria da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Beharrezko eremuak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Aldatuta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktu-editorea - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Hautatu irudi bat kontaktu honentzat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "Irudirik _ez"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2599,47 +2583,47 @@ msgstr ""
 "Kontaktu-data ez da baliozkoa:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' baliogabeko formatua du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' baliogabeko formatua du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' hutsik dago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "kontaktua ez da balizkoa."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Editatu osoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Izen-abizenak"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "_Helb. el"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Hautatu helbide-liburua"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2648,7 +2632,7 @@ msgstr ""
 "Ziur zaude kontaktu-zerrenda (%s) \n"
 "ezabatu nahi duzula?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2656,7 +2640,7 @@ msgstr ""
 "Ziur zaude kontaktu-zerrenda hauek\n"
 "ezabatu nahi dituzula?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2665,7 +2649,7 @@ msgstr ""
 "Ziur zaude kontaktua (%s)\n"
 "ezabatu nahi duzula?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2773,7 +2757,7 @@ msgstr "_Berehalako mezularitzako zerbitzua:"
 #: ../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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Kokalekua:"
@@ -2783,7 +2767,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Kideak</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 "Kontaktu-zerrendaren editorea"
 
@@ -2801,30 +2785,30 @@ msgstr "_Zerrenda-izena:"
 
 #: ../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 ""
-"_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
+msgstr "_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Kontaktu-zerrendako kideak"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "_Kideak"
+
+#: ../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:390
-#: ../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/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Liburua"
 
-#: ../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 "Zerrenda berria da"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Kideak"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Aldatutako kontaktua:"
@@ -2862,40 +2846,40 @@ msgstr ""
 "Kontaktu honen izena edo helbide elektronikoa lehendik ere badago \n"
 "karpeta honetan. Hala ere gehitu nahi duzu?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Batu kontaktua"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Batu"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Batu kontaktua"
+
+#: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Helb. el."
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka:"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "Helb. el. honela hasten da:"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Izena honela hasten da:"
+msgid "Name contains"
+msgstr "_Izenak hau dauka:"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2909,10 +2893,10 @@ msgstr[0] "Kontaktu 1"
 msgstr[1] "%d kontaktu"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Kontsulta"
 
@@ -2920,123 +2904,119 @@ msgstr "Kontsulta"
 msgid "Error getting book view"
 msgstr "Errorea liburu-ikuspegia lortzean"
 
-#: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../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:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modeloa"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Izena honela hasten da:"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "Mota"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Gorde vCard gisa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ireki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "Kontaktu _berria..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Kontaktuen _zerrenda berria..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Gorde vCard gisa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Birbidali kontaktua"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Birbidali kontaktuak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Bidali _mezua kontaktuari"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Bidali _mezua zerrendari"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Bidali _mezua kontaktuei"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Kop_iatu helbide-liburuan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "E_raman helbide-liburura..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "E_baki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../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
 #: ../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 "Ko_piatu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Itsatsi"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "Beste errore bat"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3068,7 +3048,7 @@ msgstr "Autoko telefonoa"
 
 #: ../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
@@ -3169,9 +3149,9 @@ msgid "Radio"
 msgstr "Irrati-telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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 "Funtzioa"
 
@@ -3207,38 +3187,38 @@ msgid "Web Site"
 msgstr "Web gunea"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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
 msgid "Width"
 msgstr "Zabalera"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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
 msgid "Height"
 msgstr "Altuera"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Fokua du"
 
@@ -3258,11 +3238,21 @@ msgstr "Testu-eredua"
 msgid "Max field name length"
 msgstr "Eremu-izenaren geh. luzera"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Zutabe-zabalera"
 
-#: ../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"
+"Kontaktuak bilatzen..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3266,7 @@ msgstr ""
 "\n"
 "edo egin klik bikoitza hemen kontaktu berria sortzeko."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3290,7 +3280,7 @@ msgstr ""
 "\n"
 "Egin klik bikoitza hemen kontaktu berria sortzeko."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3300,7 +3290,7 @@ msgstr ""
 "\n"
 "Bilatu kontaktua."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3310,40 +3300,41 @@ msgstr ""
 "\n"
 "Ez dago ikuspegi honetan erakusteko elementurik."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Moldagailua"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Laneko helb. el."
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Etxeko helb. el."
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Beste helb. el."
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Hautatuta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Kurtsorea du"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Ire_ki esteka arakatzailean"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Kopiatu estekaren helbidea"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Bidali mezu berria honi..."
 
@@ -3365,7 +3356,7 @@ msgid "map"
 msgstr "mapa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Zerrendako kideak"
 
@@ -3386,25 +3377,23 @@ msgid "Video Chat"
 msgstr "Bideo-berriketa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../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-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 "Egutegia"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Libre/okupatuta"
 
@@ -3426,153 +3415,165 @@ msgid "Web Log"
 msgstr "Web egunkaria"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Urteurrena"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Lanpostua"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Etxeko orria"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog-a"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Behar bezala egin da"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Modulua lanpetuta"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Helbide-liburu hori ez dago"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Ez da auto-kontakturik definitu"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Ez da kontaktua aurkitu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Kontaktuaren ID hori badago lehendik"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Bertan behera utzita"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Ezin izan da bertan behera utzi"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS ez dago erabilgarri"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Ez dago halako iturbururik"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Ez dago eskuragarri lineaz kanpo moduan"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Beste errore bat"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Zerbitzariaren bertsioa baliogabea"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Onartu gabeko autentifikazio metodoa"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 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 ""
 "Ezin izan da helbide-liburua ireki. Baliteke helbide-liburua lineaz kanpo "
 "lan egiteko markatuta ez egotea, edo lineaz kanpo erabiltzeko oraindik "
 "deskargatuta ez izatea. Kargatu behin helbide-liburua linean konektatuta "
 "zaudenean bere edukia deskargatzeko."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, 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 ""
 "Ezin izan da helbide-liburu hori ireki.  Egiaztatu %s bide-izena ondo "
 "dagoela eta sarbidea baduzula."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 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 ""
 "Ezin izan da helbide-liburu hori ireki. Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo LDAP zerbitzaria ezin dela atzitu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
@@ -3581,20 +3582,24 @@ msgstr ""
 "Evolution-en bertsio honek ez dauka konpilatuta LDAP euskarria. LDAP erabili "
 "nahi baduzu LDAP gaituta duen Evolution-en paketea instalatu behar duzu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 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 ""
 "Ezin izan da helbide-liburu hori ireki. Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo zerbitzaria ezin dela atzitu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error:"
+msgstr "Errorearen xehetasunak:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 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 ""
 "Kontsulta honetan txartel gehiago datoz bat, konfigurazioaren\n"
 "arabera zerbitzariak itzul ditzakeenak edo Evolution-ek bistara\n"
@@ -3602,57 +3607,57 @@ msgstr ""
 "gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
 "hobespenetan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 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 ""
 "Kontsulta egiteko denborak zerbitzariaren muga edo helbide-liburuan\n"
 "konfiguratuta duzuna gainditu du.  Zehaztu gehiago bilaketa,\n"
 "edo gehitu denbora-muga, helbide-liburu honen\n"
 "direktorio-zerbitzariaren hobespenetan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Helbide-liburuaren moduluak ezin izan du kontsulta analizatu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
 msgstr "Helbide-liburuaren moduluak kontsulta ezetsi du."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Kontsulta ez da behar bezala egin."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Errorea kontaktua gehitzean"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Errorea kontaktua aldatzean"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Errorea kontaktua kentzean"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3667,16 +3672,16 @@ msgstr[1] ""
 "%d kontaktu irekitzen badituzu, %d leiho irekiko dira.\n"
 "Ziur zaude kontaktu horiek guztiak bistaratu nahi dituzula?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Ez bistaratu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Bistaratu _kontaktu guztiak"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3685,70 +3690,70 @@ msgstr ""
 "%s badago lehendik ere.\n"
 "Gainidatzi nahi duzu?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontaktua"
 msgstr[1] "kontaktuak"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Hautatu helbide-liburua"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "zerrenda"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Eraman kontaktua hona"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Kopiatu kontaktua hemen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Eraman kontaktuak hona"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Kopiatu kontaktuak hemen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
 msgid "Multiple vCards"
 msgstr "Hainbat vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
 msgid "vCard for %s"
 msgstr "%s-(r)en vCard-a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktuaren informazioa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s kontaktuaren informazioa"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
@@ -3769,50 +3774,50 @@ msgid "Show Compact vCard"
 msgstr "Erakutsi vCard trinkoa"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Gorde helbide-liburuan"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Txartelen ikuspegia"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Inportatzen..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook-eko CSV edo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook-eko CSV edo Tab inportatzailea"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla-ko CSV edo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla-ko CSV edo Tab inportatzailea"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution-eko CSV edo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution-eko CSV edo Tab inportatzailea"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP datuak trukatzeko formatua (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution-en LDIF inportatzailea"
 
@@ -3865,12 +3870,12 @@ msgid "Format"
 msgstr "Formatua"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Goiburua"
 
@@ -3972,8 +3977,8 @@ msgstr "Itzaldura"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Tamaina:"
@@ -3991,7 +3996,7 @@ msgid "Top:"
 msgstr "Goian:"
 
 #: ../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 "Mota:"
 
@@ -4003,36 +4008,35 @@ msgstr "Zabalera:"
 msgid "_Font..."
 msgstr "_Letra-tipoa..."
 
-#: ../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 "Kontaktuak inprimatzeko estiloen editorearen proba"
 
-#: ../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 "Copyright (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 ""
-"Kontaktuak inprimatzeko estilo-editorearen trepeta probatu beharko luke honek"
+msgstr "Kontaktuak inprimatzeko estilo-editorearen trepeta probatu beharko luke honek"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Kontaktuak inprimatzeko proba"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Kontaktuak inprimatzeko kodea probatu beharko luke honek"
 
-#: ../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 "Ezin da fitxategia ireki"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Ezin izan da helbide-liburuen zerrenda lortu"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4048,7 +4052,7 @@ msgid "OUTPUTFILE"
 msgstr "IRTEERA-FITXATEGIA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Zerrendatu helbide-liburuen karpeta lokalak"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4067,16 +4071,14 @@ msgstr "Esportatu modu asinkronoan"
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
-msgstr ""
-"Irteera-fitxategiko txartel-kopurua modu asinkronoan, tamaina lehenetsia 100."
+msgstr "Irteera-fitxategiko txartel-kopurua modu asinkronoan, tamaina lehenetsia 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "KOPURUA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Komando-lerroko argumentuen errorea, idatzi --help erabilera ikusteko."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:116
@@ -4098,13 +4100,22 @@ msgstr "Kudeatu gabeko errorea"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{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}' irakurtzeko soilik den egutegia da eta ezin da eraldatu. Hautatu beste "
+"egutegi bat albo-barratik Egutegiaren ikuspegian."
+
+#. 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}' irakurtzeko soilik den egutegiaren iturburua da. Aldatu egutegiaren "
-"ikuspegira eta hitzorduak onartzen dituen egutegia nabarmendu."
+"'{0}' irakurtzeko soilik den egutegia da eta ezin da eraldatu. Hautatu "
+"hitzorduak onartzen dituen beste egutegi bat."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../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."
@@ -4112,7 +4123,7 @@ msgstr ""
 "Hitzorduari laburpen esanguratsu bat jartzen badiozu, hitzordua zeri "
 "buruzkoa den jakingo dute hartzaileek."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -4120,19 +4131,19 @@ msgstr ""
 "Zereginari laburpen esanguratsu bat jartzen badiozu, zeregina zeri buruzkoa "
 "den jakingo dute hartzaileek."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Zirkular hauen informazio guztiak ezabatu egingo dira eta ezin izango dira "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Zirkular honen informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4140,129 +4151,131 @@ msgstr ""
 "Hitzorduen informazio guztiak ezabatu egingo dira eta ezin izango dira "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Zereginen informazio guztiak ezabatu egingo dira eta ezin izango dira "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:11
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Hitzorduaren informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Bilera honen informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Zirkular honen informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Zereginaren informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Ziur zaude '{0}' zeregina ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Ziur zaude '{0}' izeneko hitzordua ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Ziur zaude '{0}' zirkularra ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Ziur zaude {0} hitzordu hauek ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Ziur zaude {0} zirkular hauek ezabatu nahi dituzula?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Ziur zaude {0} zereginak ezabatu nahi dituzula?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Ziur zaude hitzordua ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ziur zaude bilera hau ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Ziur zaude zirkular hau ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ziur zaude zeregina ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Ziur zaude zirkularra laburpenik gabe bidaltzea nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Ziur zaude hitzordua laburpenik gabe bidaltzea nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Ziur zaude zeregina laburpenik gabe bidaltzea nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "Ezin da gertaera berria sortu"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Ezin da gertaera gorde"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Ezabatu '{0}' egutegia?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Ezabatu '{0}' zirkularren zerrenda?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Ezabatu '{0}' zereginen zerrenda?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "E_z bidali"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Deskargatzen ari da. Ziur zaude hitzordua ezabatu nahi duzula?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Deskargatzen ari da. Zeregina gorde nahi duzu?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Ezin izan da editorea kargatu."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4270,26 +4283,25 @@ msgstr ""
 "Gonbiteak posta elektronikoz bidaliko zaizkie parte-hartzaile guztiei "
 "zeregina onartzeko aukera eskainiz."
 
-#: ../calendar/calendar.error.xml.h:35
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+#: ../calendar/calendar.error.xml.h:38
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Gonbiteak posta elektronikoz bidaliko zaizkie parte-hartzaile guztiei eta "
 "erantzutea baimenduko die."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Errorea egutegia kargatzean"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Errorea zirkularren zerrenda kargatzean"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Errorea zereginen zerrenda kargatzean"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4297,7 +4309,7 @@ msgstr ""
 "Ez baduzu bertan behera uzteko jakinarazpenik bidaltzen beste partaide batek "
 "ez du jakingo bilera bertan behera utzi dela."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../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."
@@ -4305,7 +4317,7 @@ msgstr ""
 "Ez baduzu bertan behera uzteari buruzko jakinarazpena bidaltzen beste "
 "partaideek ez dute jakingo zirkularra ezabatua izan dela."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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."
@@ -4313,7 +4325,7 @@ msgstr ""
 "Ez baduzu bertan behera uzteari buruzko jakinarazpena bidaltzen beste "
 "partaideek ez dute jakingo zeregina ezabatua izan dela."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4321,7 +4333,7 @@ msgstr ""
 "Eguneratutako informazioa bidaltzeak beste partaideek beraien egutegia "
 "eguneratuta mantentzea eskaintzen die."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4329,7 +4341,7 @@ msgstr ""
 "Eguneratutako informazioa bidaltzeak beste partaideek beraien zereginen "
 "zerrenda eguneratuta mantentzea eskaintzen die."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4337,7 +4349,7 @@ msgstr ""
 "Eranskin batzu deskargatzen ari dira. Hitzordua gordetzean eranskin hauek "
 "galtzea eragin dezake."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4345,88 +4357,87 @@ msgstr ""
 "Eranskin batzu deskargatzen ari dira. Zeregina gordetzean eranskin hauek "
 "galtzea eragin dezake."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Zenbait funtzionalitate ez dute funtzionatuko uneko zerbitzariaren "
 "bertsioarekin."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-en egutegia ustekabean itxi da."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-en zirkularra ustekabean itxi da."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-en zeregina ustekabean itxi da."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "Egutegia ez dago markatuta lineaz kanpo erabiltzeko."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
 msgstr "Zirkularren zerrenda ez dago markatuta lineaz kanpo erabiltzeko."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "Zeregina ez dago markatuta lineaz kanpo erabiltzeko."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Egutegi hau betiko ezabatu egingo da."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Zirkularren zerrenda hau betiko ezabatu egingo da."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Zereginen zerrenda hau betiko ezabatu egingo da."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Hiztorduko aldaketak gorde nahi dituzu?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Oharraren aldaketak gorde nahi dituzu?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Zereginaren aldaketak gorde nahi dituzu?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr ""
 "Ziur zaude zirkular hau bertan behera uztearen jakinarazpena bidaltzea nahi "
 "duzula?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Partaide guztiei bertan behera uztearen jakinarazpena bidaltzea nahi duzu?"
+msgstr "Partaide guztiei bertan behera uztearen jakinarazpena bidaltzea nahi duzu?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Bileraren gonbitea partaideei bidali nahi diezu?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Zeregina beste partaideei bildali nahi diezu?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Bileraren informazio eguneratua partaideei bidali nahi diezu?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "Zereginaren informazio eguneratua partaideei bidali nahi diezu?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4436,107 +4447,107 @@ msgstr ""
 "erabiltzean arazoak egon daitezke. Egokiena zerbitzaria onartutako bertsio "
 "batera eguneratzea izango litzateke."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Hitzorduan aldaketak egin dituzu, baina ez dituzu gorde."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Zereginean aldaketak egin dituzu, baina ez dituzu gorde."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Oharrean aldaketak egin dituzu, baina ez dituzu gorde."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Egutegiak ez dira erabilgarri egongo Evolution berriro abiatu arte."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Zirkularrak ez dira erabilgarri egongo Evolution berriro abiatu arte."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Zereginak ez dira erabilgarri egongo Evolution berriro abiatu arte."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Ez gorde"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Gorde aldaketak"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "_Bidali"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_Bidali jakinarazpena"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Zatitu egun anitzeko gertaerak:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Ezin izan da evolution-data-server abiarazi"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Egutegia aplikazio-blokea irakurri"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Ezin izan da pilot-aren Zirkularra aplikazio-blokea irakurri"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Ezin izan da pilot-aren Zirkularra aplikazio-blokean idatzi"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokea irakurri"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokean idatzi"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Egutegia eta zereginak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Egutegiak"
 
@@ -4577,25 +4588,25 @@ msgid "Memo_s"
 msgstr "_Zirkularrak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "Zirkularrak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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: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 "Zereginak"
@@ -4613,25 +4624,26 @@ msgstr "_Zereginak"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minutu"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ordu"
 msgstr[1] "ordu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Hasierako ordua"
 
@@ -4642,9 +4654,9 @@ msgstr "Hitzorduak"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Kokalekua:"
@@ -4654,17 +4666,15 @@ msgid "Snooze _time:"
 msgstr "Alarma-_errepikatzearen denbora:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "E_ditatu"
 
@@ -4676,32 +4686,32 @@ msgstr "_Utzi geroko"
 msgid "location of appointment"
 msgstr "hitzorduaren helbidea"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Ez dago laburpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Ez dago kokaleku-informazio erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarma dituzu"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4713,7 +4723,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta dago.\n"
 "Oroigarri normala bistaratuko da."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4730,15 +4740,15 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4746,13 +4756,13 @@ msgstr ""
 "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika, agian "
 "exekutatzen ari da jadanik..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "baliogabeko ordua"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4760,8 +4770,8 @@ msgstr[0] "ordu %d"
 msgstr[1] "%d ordu"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4771,8 +4781,8 @@ msgstr[1] "%d minutu"
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4800,10 +4810,8 @@ msgid "Calendars to run alarms for"
 msgstr "Alarmak exekutatzeko egutegiak - "
 
 #: ../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 ""
-"Kolorea Marcus Bains-en linea ordu-barran marrazteko (hutsik lehenespenez)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Kolorea Marcus Bains-en linea ordu-barran marrazteko (hutsik lehenespenez)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -5016,12 +5024,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Erakutsi Egoera eremua gertaeren/bileren/zereginen editorea"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Erakutsi \"Aurrebista\" panela"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Erakutsi \"Aurrebista\" panela."
 
@@ -5072,7 +5080,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Azken alarma exekutatu zen ordua, 'time_t'-en "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Ordu-zona"
 
@@ -5093,8 +5101,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oroigarri lehenetsiaren unitateak (\"minutu\", \"ordu\" edo \"egun\")."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unitateak zereginak noiz ezkutatu zehazteko (\"minutu\", \"ordu\" edo \"egun"
 "\")."
@@ -5117,8 +5124,7 @@ msgstr "Hitzordua edo zeregina ezabatzean berrespena eskatuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Hitzorduak eta zereginak betiko ezabatzean berrespena eskatuko den edo ez."
+msgstr "Hitzorduak eta zereginak betiko ezabatzean berrespena eskatuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
@@ -5135,8 +5141,7 @@ msgstr ""
 "ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Marcus Bains-en linea (uneko orduan) egutegian marraztuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5149,8 +5154,7 @@ msgstr "Hitzorduen oroigarri lehenetsi bat ezarriko den edo ez"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"RSPV eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "RSPV eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5158,19 +5162,15 @@ msgstr "Kategoriak eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Araua eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "Araua eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Egoera eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "Egoera eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -5178,8 +5178,7 @@ msgstr "Ordu-zona eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Mota eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "Mota eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
@@ -5213,66 +5212,66 @@ msgstr "Lanegunaren hasierako minutua"
 msgid "daylight savings time"
 msgstr "udako ordua"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Kategoria da"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Kokalekuak hau dauka"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Sailkatu gabeak"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Hurrengo 7 egunetako zereginak"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Zeregin aktiboak"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Atzeratutako zereginak"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Burutako zereginak"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Zereginak eranskinekin"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Hitzordu aktiboak"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Hurrengo 7 egunetako hitzorduak"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Inprimatu"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5285,16 +5284,17 @@ msgstr ""
 "\n"
 "Benetan ezabatu nahi dituzu?"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Ezabatu hau baino zaharragoak diren gertaerak"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "egun"
 
@@ -5303,131 +5303,311 @@ msgstr "egun"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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 "Web-ean"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Urtebetetzeak eta urteurrenak"
 
 #. 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 "Eguraldia"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "Egutegi _berria"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "K_opiatu..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Propietateak"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Huts egin du egutegiak bertsio-berritzean."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ezin izan da '%s' egutegia ireki gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ez dago egutegirik erabilgarri gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Egutegi-iturburuaren hautatzailea"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "_Hitzordua"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "_Bilera"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "Egun _osoko hitzordua"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Egutegi berria"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "_Egutegia"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Egutegi berria sortzen du"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Eguneko ikuspegia"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Lan-asteko ikuspegia"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Asteko ikuspegia"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Hileko ikuspegia"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Edozein eremu"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Eranskinak"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Partaidea"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Lanekoa"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Kategoria"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Sailkapena"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Lehia"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Konfidentziala"
+
+#: ../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 "Azalpena"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Azalpenak hau dauka"
 
-#: ../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:22
+msgid "Do Not Exist"
+msgstr "Ez"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Bai"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Gogokoak"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Opariak"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Xedeak/Helburuak"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Jaieguna"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Jaiegunetan zoriontzeko txartelak"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Kontaktu garrantzitsuenak"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Burutazioak"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Nazioartekoa"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Gako pertsonalizatua"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Hainbat"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Hurrengo 7 egun"
+
+#: ../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 "Antolatzailea"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Telefono-deiak"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Pribatua"
+
+#: ../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:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Publikoa"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Errepikapena"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Egoera"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Estrategiak"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Laburpena"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Laburpenak hau dauka"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Hornitzaileak"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Denbora eta gastuak"
+
+#: ../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 "Zain"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "hau daukana"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "hau ez daukana"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "da"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "ez da"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegia irekitzean"
@@ -5440,11 +5620,11 @@ msgstr "Metodo hori ez da onartzen egutegia irekitzean"
 msgid "Permission denied to open the calendar"
 msgstr "Egutegia irekitzeko baimena ukatu egin da"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Editatu alarma"
 
@@ -5477,17 +5657,17 @@ msgid "Mes_sage:"
 msgstr "M_ezua:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Jo soinua"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Bistaratu pantailan abisu bat"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Exekutatu programa"
 
@@ -5500,7 +5680,7 @@ msgid "Send To:"
 msgstr "Bidali honi:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Bidali mezua"
 
@@ -5555,7 +5735,7 @@ msgstr "minutu"
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Ekintza/Abiarazlea"
 
@@ -5566,16 +5746,15 @@ msgstr "_Gehitu"
 #: ../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 "Alarmak"
 
-#: ../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
 msgid "_Suggest automatic display of attachment"
 msgstr "_Proposatu eranskina automatikoki bistaratzea"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategia(k)"
 
@@ -5599,8 +5778,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u eta %d aldagaiak helbide elektronikoko erabiltzaileagatik eta "
 "domeinugatik ordeztuko dira.</i>"
@@ -5645,8 +5823,8 @@ msgid "Display"
 msgstr "Bistaratu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -5661,8 +5839,8 @@ msgstr ""
 "Egunak"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -5685,7 +5863,7 @@ msgstr ""
 "Igandea"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
@@ -5695,8 +5873,8 @@ msgid "S_un"
 msgstr "_ig."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -5713,8 +5891,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -5732,13 +5910,13 @@ msgid "Template:"
 msgstr "Txantiloia"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Osteguna"
 
 #: ../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 "_Ordu-zona:"
 
@@ -5747,14 +5925,14 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Asteartea"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Asteazkena"
 
@@ -5832,304 +6010,453 @@ msgstr "a_z."
 msgid "before every appointment"
 msgstr "lehenago"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
-"Kopiatu _egutegiaren edukia lokalean lineaz kanpoko eragiketak lantzeko"
+msgstr "Kopiatu _egutegiaren edukia lokalean lineaz kanpoko eragiketak lantzeko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopiatu _zereginen edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopiatu z_irkularren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
 msgstr "_Kolorea:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Zereginen zerrenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Zirkularren zerrenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Egutegiaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Egutegi berria"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Zeregin-zerrendaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "Zeregin-zerrenda berria"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "Zirkularren zerrendaren propietateak"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Zirkularren zerrenda berria"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Zeregina ezabatu da."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Zirkularra ezabatu da."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketa horiek ahaztu eta editorea itxi?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea itxi?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Gertaera hau aldatu egin da."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Zeregin hau aldatu egin da."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Zirkular hau aldatu egin da."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Balidazio-errorea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Erantsitako mezua - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Erantsitako mezu bat"
 msgstr[1] "Erantsitako %d mezu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Lekuz aldatu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Bertan behera _utzi arrastatzea"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "eranskina"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Editatu hitzordua"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Bilera - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Hitzordua - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Esleitutako zeregina - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Zeregina - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Zirkularra - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Laburpenik ez"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Egin klik uneko leihoa ixteko"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Kopiatu hautatutako testua arbelean"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Ebaki hautatutako testua arbelera"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Egin klik laguntza eskuragarria ikusteko"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Itsatsi testua arbeletik"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Egin klik uneko leihoa gordetzeko"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Hautatu testu osoa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Sailkapena"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Fitxategia"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Laguntza"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Txertatu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "Au_kerak"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "_Ikusi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Eranskina..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Egin klik fitxategia eransteko"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Kategoriak"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Kategoriak erakusten edo ezkutatzen ditu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Ordu-_zona"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Ordu-zona eremua erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "_Publikoa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Klasifikatu publiko gisa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Pribatua"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Klasifikatu pribatu gisa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Konfidentziala"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Klasifikatu konfidentzial gisa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "A_raua eremua"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Araua eremua erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "RSVP eremua erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Egoera eremua"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Egoera eremua erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Mota eremua"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Partaide-mota eremua erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "Azken _dokumentuak"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Erantsi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "Eranskin <b>%d</b>"
 msgstr[1] "<b>%d</b> eranskin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Ezkutatu eranskin-_barra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Erakutsi eranskin-_barra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../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
 #: ../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 "_Kendu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Gehitu eranskina..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Erakutsi eranskinak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Sakatu Zuriunea tekla eranskin-barra txandakatzeko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Editatu hitzordua"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Bilera - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Hitzordua - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Esleitutako zeregina - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Zeregina - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Zirkularra - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Laburpenik ez"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
+msgstr "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa erabili!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Ezin izan da iturburua ireki"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Ezin izan da helburua ireki"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Helburua irakurtzekoa soilik da"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ezabatu elementu hau beste postontzi guztietatik?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Gertaera ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zeregina ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Zirkularra ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Elementua ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Gertaera ezin izan da ezabatu, baimena ukatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zeregina ezin izan da ezabatu, baimena ukatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Zirkularra ezin izan da ezabatu, baimena ukatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Elementua ezin izan da ezabatu, baimena ukatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Gertaera ezin izan da ezabatu, errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Zeregina ezin izan da ezabatu, errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Zirkularra ezin izan da ezabatu, errore bat gertatu delako"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Elementua ezin izan da ezabatu, errore bat gertatu delako"
 
@@ -6138,7 +6465,7 @@ msgid "Contacts..."
 msgstr "Kontaktuak..."
 
 #: ../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 "Delegatu:"
 
@@ -6146,135 +6473,181 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarmak"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "Egin klik gertaera honen alarmak jartzeko edo kentzeko"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Errepikapena"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Egin hau gertaera errepikakorra"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Bidaltzeko aukerak"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Txertatu bidaltzeko aukera aurreratuak"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "_Egun osoko gertaera"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Egun osoko gertaera erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Erakutsi ordua _lanpetuta gisa"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Ordua lanpetuta gisa erakusten edo ezkutatzen du"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Libre/okupatuta"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Kontsultatu libre/okupatutako informazioa partaideentzako"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Hitzordua"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Errepikapena"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Gertaerak alarmak ditu."
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "_Antolatzailea:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegatuak"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "_Partaideak"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Hasiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Amaiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Hautatutako antolatzaileak ez du konturik orain."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Gehitu "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ezin da '%s' egutegia ireki."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "<b>%s</b>(r)en izenean zabiltz"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Hitzordua baino egun %d lehenago"
 msgstr[1] "Hitzordua baino %d egun lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Hitzordua baino ordu %d lehenago"
 msgstr[1] "Hitzordua baino %d ordu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "Hitzordua baino minutu %d lehenago"
 msgstr[1] "Hitzordua baino %d minutu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Pertsonalizatu"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -6299,23 +6672,25 @@ msgid "Custom Alarm:"
 msgstr "Alarma pertsonalizatua:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Azalpena:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Gertaeraren azalpena:"
 
-#: ../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 "Labu_rpena:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarmak"
 
+#: ../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 "_Azalpena:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Ordua:"
@@ -6346,28 +6721,24 @@ msgstr "_Aldatu antolatzailea"
 msgid "Co_ntacts..."
 msgstr "_Kontaktuak..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Antolatzailea"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Antolatzailea:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Zirkularra"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ezin dira zirkularrak ireki: '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "Nori"
 
@@ -6380,63 +6751,59 @@ msgstr "Ha_siera-data:"
 msgid "T_o:"
 msgstr "Nor_i:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Azalpena:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Taldea:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Gertaera errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Gertaera errepikatu bat delegatzen ari zara. Zer delegatzea nahi duzu?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Zeregin errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Zirkular errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Instantzia hau bakarrik"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Instantzia hau eta aurrekoak"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Instantzia hau eta ondorengoak"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Instantzia guztiak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Errepikatze-data ez da baliozkoa"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "-"
 
@@ -6444,7 +6811,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "lehen"
 
@@ -6453,7 +6820,7 @@ msgstr "lehen"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "bigarren"
 
@@ -6461,7 +6828,7 @@ msgstr "bigarren"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "hirugarren"
 
@@ -6469,7 +6836,7 @@ msgstr "hirugarren"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "laugarren"
 
@@ -6477,13 +6844,13 @@ msgstr "laugarren"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "azken"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Beste data bat"
 
@@ -6491,7 +6858,7 @@ msgstr "Beste data bat"
 #. * 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1etik 10era"
 
@@ -6499,7 +6866,7 @@ msgstr "1etik 10era"
 #. * 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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11tik 20ra"
 
@@ -6507,45 +6874,45 @@ msgstr "11tik 20ra"
 #. * 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21etik 31ra"
 
 #. 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "eguna"
 
 #. 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "-"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "aldiz"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Gehitu salbuespena"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Ezin izan da hautapenik eskuratu aldatzeko."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Aldatu salbuespena"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Ezin izan da hautapena eskuratu ezabatzeko."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Data/Ordua"
 
@@ -6596,12 +6963,12 @@ msgstr "aste"
 msgid "year(s)"
 msgstr "urte"
 
-#: ../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 "Osatze-data gaizki dago"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Web orria"
 
@@ -6616,51 +6983,55 @@ msgstr "<span weight=\"bold\">Egoera</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:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Eginda"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Handia"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Egiten ari da"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "Txikia"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Ez da hasi"
 
@@ -6673,7 +7044,7 @@ msgid "Stat_us:"
 msgstr "E_goera:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -6682,7 +7053,7 @@ msgid "_Date completed:"
 msgstr "_Osatze-data:"
 
 #: ../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 "_Lehentasuna:"
 
@@ -6690,25 +7061,37 @@ msgstr "_Lehentasuna:"
 msgid "_Web Page:"
 msgstr "_Web orria:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Egoeraren xehetasunak"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "Egin klik zereginaren egoeraren xehetasunak aldatzeko/ikusteko"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "_Bidaltzeko aukerak"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Zereginaren xehetasunak"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "_Antolatzailea:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin dira hemengo zereginak ireki: '%s'."
@@ -6722,19 +7105,15 @@ msgid "Categor_ies..."
 msgstr "Ka_tegoriak..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "A_zalpena:"
+msgid "D_ue date:"
+msgstr "_Mugaeguna:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Ordu-zona:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Mugaeguna:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6742,142 +7121,126 @@ msgstr[0] "egun %d"
 msgstr[1] "%d egun"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "aste %d"
 msgstr[1] "%d aste"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
 
 #. 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:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s hitzordua hasi aurretik"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s hitzordua hasi ondoren"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s hitzorduaren hasieran"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s hitzordua amaitu aurretik"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s hitzordua amaitu ondoren"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s hitzorduaren amaieran"
 
 #. 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:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Egin klik %s irekitzeko"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "Izengabea"
 
-#: ../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
+#: ../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 "Hasiera-data:"
 
-#: ../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-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 "Azalpena:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "Web orria:"
 
-#: ../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 "Laburpena:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Mugaeguna:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Lehentasuna:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Publikoa"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Pribatua"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Konfidentziala"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Amaiera-eguna"
@@ -6887,21 +7250,14 @@ msgstr "Amaiera-eguna"
 msgid "Start Date"
 msgstr "Hasiera-data"
 
-#: ../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 "Laburpena"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Okupatuta"
 
@@ -6915,199 +7271,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025 ../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 "Bai"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "Ez"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../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-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
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Hautatu karpeta hautatutako eranskina gordetzeko..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "irudi_izengabea.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Ezarri _atzeko plano gisa"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Gorde hautatutakoa"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Laburpenik ez *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "_Antolatzailea: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Antolatzailea: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Hasiera: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Falta: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "%0"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "%10"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "%20"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "%30"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "%40"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "%50"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "%60"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "%70"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "%80"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "%90"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "%100"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../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:277
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "_Zeregin berria"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Ireki _web orria"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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 "E_baki"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../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 "_Itsatsi"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Birbidali iCalendar gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatuta' gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Markatu 'Osatu gabea'"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatu gabea' gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -7130,7 +7512,8 @@ msgid "Due date"
 msgstr "Mugaeguna"
 
 #: ../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:372
 msgid "Priority"
 msgstr "Lehentasuna"
 
@@ -7138,127 +7521,108 @@ msgstr "Lehentasuna"
 msgid "Start date"
 msgstr "Hasiera-data"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Egoera"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "elementuak lekuz aldatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "elementuak kopiatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "_Bilera berria"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Uneko ikuspegia"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Hautatu _gaur"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Hautatu data..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "_Kopiatu egutegian..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman egutegira..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delegatu bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Erantzun g_uztiei"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "_Antolatzailea: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Antolatzailea: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Kokalekua: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ordua: %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 %Y/%m/%d %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 %Y/%m/%d %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"
@@ -7271,7 +7635,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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutu-zatiketa"
@@ -7282,46 +7646,34 @@ msgstr "%02i minutu-zatiketa"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1549
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:789 ../calendar/gui/e-week-view.c:524
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bai. (Errepikapen konplexua)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Egunero"
 msgstr[1] "%d egunez behin"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7329,9 +7681,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Astero"
 msgstr[1] "%d astez behin"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7339,51 +7689,35 @@ msgstr[0] "Astero, eguna: "
 msgstr[1] "%d astez behin, eguna: "
 
 #. 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 " eta "
 
-#. 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. eguna - "
 
-#. 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 - "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hilero"
 msgstr[1] "%d hilez behin"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Urtero"
 msgstr[1] "%d urtez behin"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7391,337 +7725,334 @@ msgstr[0] " guztira %d aldiz"
 msgstr[1] " guztira %d aldiz"
 
 #. 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 ", data honetan amaituta: "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Hasi"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Amaitu"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Muga"
 
-#: ../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 "iCalendar informazioa"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "Pertsona ezezaguna"
 
 #. 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> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
+msgstr "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: ../calendar/gui/e-itip-control.c: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:728
+#: ../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:2034
 msgid "Accepted"
 msgstr "Onartua"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
 #: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
+#: ../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:2040
 msgid "Declined"
 msgstr "Ukatua"
 
-#: ../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 ""
-"Bilera bertan behera utzi da, hala ere ezin izan da zure egutegietan aurkitu"
+msgstr "Bilera bertan behera utzi da, hala ere ezin izan da zure egutegietan aurkitu"
 
-#: ../calendar/gui/e-itip-control.c:1268
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1285
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Zeregina bertan behera utzi da, hala ere ezin izan da zure zereginen "
 "zerrendetan aurkitu"
 
-#: ../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>(e)k bilera-informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: ../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>(e)k bilerarako deia egiten dio %s(r)i."
 
-#: ../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>(e)k bilerarako deia egiten dizu."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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>(e)k bilera batean sartu nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: ../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>(e)k bilera-informazio berria jaso nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Bilera eguneratzeko eskaera"
 
-#: ../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>(e)k bilera-eskaerari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Bilera bertan behera uztea"
 
-#: ../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>(e)k mezu ulertezina bidali du."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: ../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>(e)k zeregin-informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: ../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>(e)k zeregin bat egiteko eskatzen dio %s(r)i."
 
-#: ../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>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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>(e)k zeregin batean sartu nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: ../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>(e)k zereginaren informazio berria jaso nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Zeregina eguneratzeko eskaera"
 
-#: ../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>(e)k zeregin-esleipenari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Zeregina bertan behera uztea"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: ../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>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: ../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>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: ../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>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: ../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 "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: ../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 "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektua ez da baliozkoa eta ezin da eguneratu\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Erantzun hau ez da uneko partaide batena. Partaide gisa gehitu?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Ukatu"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
@@ -7750,112 +8081,112 @@ msgstr "Egutegia kargatzen ari da..."
 msgid "Server Message:"
 msgstr "Zerbitzariaren mezua:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Aukerako partaideak"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Baliabideak"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Partaideak"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Indibiduala"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Taldea"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Baliabidea"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Gela"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Mahaiburua"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
-#: ../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 "Ekintza behar du"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: ../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:737
+#: ../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
 msgid "Delegated"
 msgstr "Delegatua"
 
 #. 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 "Partaidea                         "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../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 "Egiten ari da"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y.eko %Bren %da"
 
@@ -7863,85 +8194,81 @@ msgstr "%A, %Y.eko %Bren %da"
 #. 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a, %Y/%m/%d"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "_Partaideak..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_Aukerak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Hasiera:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Amaiera:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Partaidea"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Egin klik partaidea gehitzeko"
@@ -7974,8 +8301,8 @@ msgstr "_Ezabatu hautatutako zirkularrak"
 msgid "Click to add a memo"
 msgstr "Egin klik zirkularra gehitzeko"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7984,85 +8311,80 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Zirkularrak kargatzen"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s - zirkularrak irekitzen"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Zereginak kargatzen"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Betiko ezabatzen"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Hautatu ordu-zona"
 
 #. 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:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%B %d"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "Kontsulta eguneratzen"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Ikuspegi _pertsonalizatua"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Gorde ikuspegi pertsonalizatua"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Definitu ikuspegiak..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s - hitzorduak kargatzen"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Zirkularrak kargatzen %s(e)n"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s irekitzen"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Purgatzen"
 
@@ -8122,57 +8444,57 @@ msgstr "iraila"
 msgid "_Select Today"
 msgstr "_Hautatu Gaur"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "Antolatzailea ezarri behar da."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Zirkularraren informazioa"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Kontraproposamena"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Libre/okupatuta informazioa (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaide izan behar duzu."
 
@@ -8201,8 +8523,7 @@ msgstr "Huts egin du zirkularrak bertsio-berritzean."
 #: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Ezin izan da '%s' zirkularren zerrenda ireki gertaerak eta bilerak sortzeko"
+msgstr "Ezin izan da '%s' zirkularren zerrenda ireki gertaerak eta bilerak sortzeko"
 
 #: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
@@ -8212,47 +8533,39 @@ msgstr "Ez dago egutegirik erabilgarri zirkularrak sortzeko"
 msgid "Memo Source Selector"
 msgstr "Zirkular-iturburuen hautatzailea"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "_Zirkularra"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Sortu zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Partekatutako zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Partekatutako zirkularra"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Sortu partekatutako zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Zirkularren zerrenda berria"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Z_irkularren zerrenda"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Sortu zirkularren zerrenda berria"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Inprimatu zirkularrak"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Hurrengo 7 egunak"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8263,7 +8576,7 @@ msgstr ""
 "bertsiotik.\n"
 "Itxaron Evolution-ek zure karpetak migratzen dituen bitartean..."
 
-#: ../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"
@@ -8275,27 +8588,27 @@ msgstr ""
 "Itxaron Evolution-ek zure karpetak migratzen dituen bitartean..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Ezin dira ezarpen zaharrak migratu evolution/config.xmldb fitxategitik"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ezin da '%s' egutegia migratu"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ezin dira '%s' zereginak migratu"
 
 #: ../calendar/gui/migration.c:1227
-#: ../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
+#: ../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 "Oharrak"
 
@@ -8452,57 +8765,52 @@ msgstr "Or"
 msgid "Sa"
 msgstr "Lr"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Zeregina"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Laburpena: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Partaideak: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Lehentasuna: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Kontaktuak: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Datozten hitzorduak"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "Zeregin-zerrenda _berria"
@@ -8521,8 +8829,7 @@ msgstr "Huts egin du zereginak bertsio-berritzean."
 #: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Ezin izan da '%s' zereginen zerrenda ireki gertaerak eta bilerak sortzeko"
+msgstr "Ezin izan da '%s' zereginen zerrenda ireki gertaerak eta bilerak sortzeko"
 
 #: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
@@ -8532,39 +8839,31 @@ msgstr "Ez dago egutegirik erabilgarri zereginak sortzeko"
 msgid "Task Source Selector"
 msgstr "Zeregin-iturburu hautatzailea"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Esleitutako zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1330
-msgid "Assigne_d Task"
-msgstr "E_sleitutako zeregina"
-
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Sortu esleitutako zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Zereginen zerrenda berria"
 
-#: ../calendar/gui/tasks-component.c:1338
-msgid "Tas_k list"
-msgstr "_Zereginen zerrenda"
-
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Sortu zereginen zerrenda berria"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8576,1632 +8875,1829 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Inprimatu zereginak"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "Osatuta %"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Bertan behera utzita"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Egiten ari da"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Hitzorduak eta bilerak"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Egutegia irekitzea"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar fitxategiak (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-en iCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Oroitu!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar fitxategiak (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-en vCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Egutegi-gertaerak"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-en egutegiaren inportatzaile adimenduna"
 
 #.
+#. *
+#. * 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/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Akkra"
 
-#: ../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/Algiers"
 
-#: ../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/Bangi"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/Konakry"
 
-#: ../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/Djibuti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Afrika/Duala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/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/Khartum"
 
-#: ../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/Muqdisho"
 
-#: ../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/Niamei"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nuakchot"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Uagadugu"
 
-#: ../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/Tonbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../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/Costa_Rica"
 
-#: ../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/Guadalupe"
 
-#: ../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/Guyana"
 
-#: ../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/Habana"
 
-#: ../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/Jamaika"
 
-#: ../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/Martinika"
 
-#: ../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/Mexiko_Hiria"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amerika/Mikelune"
 
-#: ../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/Ipar Dakota/Erdialdea"
 
-#: ../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/Puerto_Rico"
 
-#: ../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 "Antartika/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antartika/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antartika/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antartika/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antartika/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antartika/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antartika/Hego_Poloa"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antartika/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antartika/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Artikoa/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadir"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Kalkuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Kolonbo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damasko"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Kobdo"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamtxatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karatxi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoiarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Maskat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nikosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangun"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riad"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Xangai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Teheran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulan Bator"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumtsi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientian"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Jakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Erevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantikoa/Azoreak"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantikoa/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantikoa/Kanariak"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantikoa/Cabo Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantikoa/Faroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantikoa/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantikoa/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantikoa/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantikoa/Hegoaldeko Georgiak"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantikoa/Santa_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantikoa/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Brusela"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Kishinev"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhage"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxenburgo"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madril"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monako"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Mosku"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nikosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Erroma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanoa"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsovia"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporojie"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indikoa/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indikoa/Txagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indikoa/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indikoa/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indikoa/Komoreak"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indikoa/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indikoa/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indikoa/Maldivak"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indikoa/Maurizio"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indikoa/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indikoa/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pazifikoa/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pazifikoa/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pazifikoa/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pazifikoa/Pazko uhartea"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pazifikoa/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pazifikoa/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pazifikoa/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pazifikoa/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pazifikoa/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pazifikoa/Galapagoak"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pazifikoa/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pazifikoa/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pazifikoa/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pazifikoa/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pazifikoa/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pazifikoa/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pazifikoa/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pazifikoa/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pazifikoa/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pazifikoa/Markesak"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pazifikoa/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pazifikoa/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pazifikoa/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pazifikoa/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pazifikoa/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pazifikoa/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pazifikoa/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pazifikoa/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pazifikoa/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pazifikoa/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pazifikoa/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pazifikoa/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pazifikoa/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pazifikoa/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pazifikoa/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pazifikoa/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pazifikoa/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pazifikoa/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Egin klik hemen helbide-liburura joateko"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Ezin izan da automatikoki gordetako fitxategia ireki"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Bidalketa-helburua"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Ezin da mezua eskuratu editoretik"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Txertatu eranskina"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "_Erantsi"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_nadura:"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Mezu izengabea"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "Nor_k:"
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "Erantsi fitxategi bat"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Erantzun honi:"
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "It_xi"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "Nor_i:"
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "Itxi uneko fitxategia"
+
+#: ../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 "I_nprimatu..."
+
+#: ../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 "Inprimatzeko _aurrebista"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "Gorde uneko fitxategia"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "Gorde hone_la..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "Gorde uneko fitxategia beste izen batekin"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "Gorde _zirriborroa"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "Gorde zirriborro gisa"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "_Bidali"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "Bidali mezu hau"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "Txertatu bidaltzeko aukerak"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "_Mezu berria"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Ireki mezu berriaren leihoa"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "_Karaktere-kodeketa"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "Se_gurtasuna"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "PGP _enkriptatzea"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "Enkriptatu mezu hau PGPrekin"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "PGP _sinadura"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "Sinatu mezu hau zure PGP gakoarekin"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "_Eman lehentasuna mezuari"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "Ezarri mezuaren lehentasuna altuenera"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "E_skatu irakurragiriak"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr "Lortu bidaltze-jakinarazpena mezu bat irakurtzean"
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr "S/MIME e_nkriptatzea"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "S/MIME s_inadura"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Sinatu mezu hau zure S/MIME sinadura-ziurtagiriarekin"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "_Bcc eremua"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "BCC eremua erakutsi edo ezkutatzen du"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "_Cc eremua"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "CC eremua erakutsi edo ezkutatzen du"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "'Nork' e_remua"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "'Nork' eremua erakutsi edo ezkutatzen du"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "'Bidali _hona' eremua"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "''Bidali hona' eremua erakutsi edo ezkutatzen du"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "'Erant_zun honi' eremua"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "_Gaia eremua"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Gaia eremua erakusten edo ezkutatzen du"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "'N_ori' eremua"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "'Nori' eremua erakutsi edo ezkutatzen du"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Cc:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../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"
@@ -10209,30 +10705,65 @@ msgstr ""
 "Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
 "helbideak."
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "Nor_k:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Erantzun honi:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "Nor_i:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Bidali hona:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "_Gaia:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "_Erantsi"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_nadura:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Txertatu eranskina"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "Egin klik hemen helbide-liburura joateko"
 
-#: ../composer/e-msg-composer.c:819
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Bidalketa-helburua"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "Erakutsi _eranskin-barra"
+
+#: ../composer/e-msg-composer.c:872
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ezin da sinatu irteerako mezua: ez dago sinadura-ziurtagiririk kontu "
 "honentzat"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10240,42 +10771,23 @@ msgstr ""
 "Ezin da enkriptatu irteerako mezua: sinadura-ziurtagiririk ez dago ezarrita "
 "kontu honentzat"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Eranskina"
+msgstr[1] "Eranskinak"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Ezkutatu _eranskin-barra"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "Erakutsi _eranskin-barra"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Ezin izan da fitxategia ireki"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Ezin da mezua eskuratu editoretik"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Mezu izengabea"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Ireki fitxategia"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10303,11 +10815,9 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"&quot;{0}&quot; dela eta beste posta-aukera batzuk hautatu beharko dituzu"
+msgstr "&quot;{0}&quot; dela eta beste posta-aukera batzuk hautatu beharko dituzu"
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Arrazoia: &quot;{1}&quot;."
 
@@ -10379,8 +10889,7 @@ msgstr "Bidali erabilgarri ez dauden aukerak."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"'{0}' fitxategia ez da fitxategi arrunta eta ezin da mezu batean bidali."
+msgstr "'{0}' fitxategia ez da fitxategi arrunta eta ezin da mezu batean bidali."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -10422,23 +10931,27 @@ msgstr "Ezin duzu erantsi '{0}' fitxategia mezuari"
 msgid "You need to configure an account before you can compose mail."
 msgstr "Kontu bat konfiguratu behar duzu mezuak idatzi ahal izateko."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Jarraitu editatzea"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "E_z berreskuratu"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Berreskuratu"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Gorde mezua"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Gorde zirriborroa"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-en posta eta egutegia"
 
-#: ../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:738
 msgid "Groupware Suite"
 msgstr "Talde-lanerako suitea"
 
@@ -10454,58 +10967,78 @@ msgstr "helbide-txartela"
 msgid "calendar information"
 msgstr "egutegi-informazioa"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution errorea"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution-en abisua"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution-en informazioa"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution-en kontsulta"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Barne-errorea, '%s' errore ezezaguna eskatu da"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Osagaia"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "Erregistratuko den osagaiaren izena"
+
+#: ../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
+msgid "Enabled"
+msgstr "Gaituta"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Plugina gaituta dagoen ala ez"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Errorea gertatu da inprimatzean"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
-msgstr ""
-"Inprimatzeko sistemak erroreari buruzko honako xehetasunak bidali ditu:"
+msgstr "Inprimatzeko sistemak erroreari buruzko honako xehetasunak bidali ditu:"
 
-#: ../e-util/e-print.c:151
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr ""
-"Inprimatzeko sistemak ez du erroreari buruzko bestelako xehetasunik eman."
+#: ../e-util/e-print.c:173
+msgid "The printing system did not report any additional details about the error."
+msgstr "Inprimatzeko sistemak ez du erroreari buruzko bestelako xehetasunik eman."
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Arrazoia: \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Ezin da  &quot;{0}&quot; fitxategia ireki."
+msgid "Cannot open file \"{0}\"."
+msgstr "Ezin da \"{0}\" fitxategia ireki."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Ezin da &quot;{0}&quot; fitxategia gorde."
+msgid "Cannot save file \"{0}\"."
+msgstr "Ezin da \"{0}\" fitxategia gorde."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Gainidatzi nahi duzu?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; fitxategia badago lehendik."
+msgid "File exists \"{0}\"."
+msgstr "\"{0}\" fitxategia badago lehendik."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10515,49 +11048,66 @@ msgstr "Fitxategia gainidatzi?"
 msgid "_Overwrite"
 msgstr "_Gainidatzi"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Ezin izan da Evolution-en laguntza bistaratu."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Garrantzitsua"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Lanekoa"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Pertsonala"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Egitekoa"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Geroago"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "Etiketa-_izena:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Editatu etiketa"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Gehitu etiketa"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Etiketaren izena ezin da hutsa izan."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "Etiketa honen etiketa badago lehendik ere. Aldatu etiketa honen izena."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"Etiketa honen etiketa badago lehendik ere zerbitzarian. Aldatu zure "
+"etiketaren izena."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-en errorea: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Beste errore guztiak terminalean soilik erakutsi dira."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10675,65 +11225,65 @@ msgstr "%Y-%b-%d"
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Aukeratu fitxategi bat"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "_Arau-izena:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Bilatu honako irizpidea betetzen duten elementuak"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Gehitu iragazteko araua"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "irizpide guztiak betetzen badira"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "irizpideren bat betetzen bada"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Bilatu elementuak:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Erlazionatutako guztiak"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Erantzunak"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Erantzunak eta gurasoak"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Erantzunik edo gurasorik ez"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "Hariak _barne"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Sarrerakoa"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Irteerakoa"
 
@@ -10757,7 +11307,7 @@ msgstr "Data falta da."
 msgid "Missing file name."
 msgstr "Fitxategi-izena falta da."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Izena falta da."
 
@@ -10833,7 +11383,7 @@ msgstr "etorkizunean"
 msgid "months"
 msgstr "hilabete"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "segundo igarotakoan"
 
@@ -10845,9 +11395,10 @@ msgstr "uneko ordua"
 msgid "the time you specify"
 msgstr "zuk zehaztutako ordua"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "aste"
 
@@ -10863,7 +11414,7 @@ msgstr "Gehitu araua"
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Arau-izena"
 
@@ -10872,73 +11423,83 @@ msgid "Composer Preferences"
 msgstr "Mezuak prestatzeko hobespenak"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
 "besteak beste."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
+msgstr "Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Konfiguratu hemen zure posta-kontuak"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Konfiguratu sareko konexioaren ezarpenak hemen."
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolution-en posta"
 
-#: ../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 "Evolution-en postako kontuak konfiguratzeko kontrola"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution-en postaren osagaiak"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolution-en mezu-prestatzailea"
 
-#: ../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 "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Evolution-en postaren hobespenen kontrola"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Evolution-en sarea konfiguratzeko kontrola"
+
+#: ../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:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Posta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Posta-kontuak"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "Posta-hobespenak"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Sareko hobespenak"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Posta"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Lizentzia-kontratua"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10951,115 +11512,109 @@ msgstr ""
 "lizentzia-kontratua,\n"
 "eta, onartzeko, hautatu kontrol-laukia.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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
 msgid "Autogenerated"
 msgstr "Automatikoki sortua"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Galdetu mezu bakoitzean"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identitatea"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Begiratu _mezu berririk dagoen"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minuturo"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Lehenespenak"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Segurtasuna"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Jasotzeko aukerak"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[lehenetsia]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Gaituta"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Kontuaren izena"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "Izengabea"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Hizkuntza(k)"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Gehitu sinaduraren script-a"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Birbidalitako mezua --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
 #. 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:1750
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11067,11 +11622,11 @@ msgstr ""
 "Jatorrizko mezua: ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} ${24Hour}:"
 "${Minute} ${TimeZone}, egilea: ${Sender}"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- Jatorrizko mezua --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Iragazteko arauak"
 
@@ -11088,10 +11643,6 @@ msgstr "Esleitu kolorea"
 msgid "Assign Score"
 msgstr "Esleitu puntuazioa"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Eranskinak"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11108,10 +11659,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Eginda: "
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "hau daukana"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetara"
@@ -11125,7 +11672,7 @@ msgid "Date sent"
 msgstr "Bidaltze-data"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11136,10 +11683,6 @@ msgstr "Ezabatu"
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "hau ez daukana"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ez da honela amaitzen"
@@ -11160,10 +11703,6 @@ msgstr "ez da honen antzekoa"
 msgid "does not start with"
 msgstr "ez da honela hasten"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Ez"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Zirriborroa"
@@ -11172,10 +11711,6 @@ msgstr "Zirriborroa"
 msgid "ends with"
 msgstr "honela amaitzen da"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Bai"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "badago"
@@ -11188,14 +11723,10 @@ msgstr "Adierazpena"
 msgid "Follow Up"
 msgstr "Jarraipena"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Garrantzitsua"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "da"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "honen ondorengoa da"
@@ -11208,18 +11739,6 @@ msgstr "honen aurrekoa da"
 msgid "is Flagged"
 msgstr "Banderaduna da"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "hau baino handiagoa da"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "hau baino txikiagoa da"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ez da"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ez da Banderaduna"
@@ -11232,7 +11751,7 @@ msgstr "ez da ezarri"
 msgid "is set"
 msgstr "ezarri da"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Baztergarriak"
@@ -11241,7 +11760,7 @@ msgstr "Baztergarriak"
 msgid "Junk Test"
 msgstr "Mezu baztergarrien proba"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etiketa"
 
@@ -11283,7 +11802,7 @@ msgstr "Jo soinua"
 
 #. 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:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Irakurrita"
 
@@ -11355,10 +11874,9 @@ msgstr "honela hasten da"
 msgid "Stop Processing"
 msgstr "Utzi prozesatzeari"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11369,64 +11887,64 @@ msgid "Unset Status"
 msgstr "Egoera ezarri gabe"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Gero"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Gehitu _ekintza"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Sortu bilaketa-karpeta bilaketatik..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Mezu guztiak"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Irakurri gabeko mezuak"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Etiketarik ez"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Irakurri mezuak"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Azken mezuak"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Azken 5 egunetako mezuak"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Mezuak eranskinekin"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Mezu garrantzitsuak"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Baztergarriak ez diren mezuak"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Kontuaren bilaketa"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Kontu guztien bilaketa"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Irakurri gabeko mezua:"
@@ -11434,31 +11952,51 @@ msgstr[1] "Irakurri gabeko mezuak:"
 
 #. 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
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Guztira mezua:"
 msgstr[1] "Guztira mezuak:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Kuotaren erabilera (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr "Kuotaren erabilera"
+
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Karpetaren propietateak"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_Sortu"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Bilatu karpeta"
 
@@ -11467,362 +12005,323 @@ msgstr "Bilatu karpeta"
 msgid "UNMATCHED"
 msgstr "SAILKATU GABEAK"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Zirriborroa"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Irteerako ontzia"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Bidalitakoak"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#. 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:372
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Posta-karpetaren zuhaitza"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta lekuz aldatzen"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta kopiatzen"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s karpetara eramaten"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s karpetan kopiatzen"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin da mezurik ekarri maila goreneko biltegira"
 
-#: ../mail/em-folder-tree.c:1011 ../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 "_Kopiatu karpetan"
 
-#: ../mail/em-folder-tree.c:1012 ../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 "_Eraman karpetara"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ikusi"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Ireki leiho _berrian"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_Freskatu"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "_Garbitu irteerako ontzia"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "'%s' hemen kopiatzen:  %s"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../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:83
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "K_opiatu"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "'%s' karpeta sortzen"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Sortu karpeta"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Mezuak ezabatzeak huts egin du"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Ez duzu nahikoa baimen mezu hau ezabatzeko."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../mail/em-folder-view.c:1337 ../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 "_Birbidali"
 
 #. 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:1341 ../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 "_Editatu mezu berri gisa..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "I_nprimatu..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Markatu _ez-garrantzitsu gisa"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Markatu _baztergarri gisa"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Markatu _ez baztergarri gisa"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Markatu jarraitasunerako..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Etiketa"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Bat ere ez"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "Etiketa _berria"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Bilatu karpeta _gaiaren arabera"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Bilatu karpeta _bidaltzailearen arabera"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Bilatu karpeta _hartzailearen arabera"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Bilatu karpeta po_sta-zerrendaren arabera"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "Lehenetsia"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Ezin da mezua eskuratu"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Mezua eskuratzea..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Deitu honi..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Sortu _bilaketa-karpeta"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Helbidetik"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Helbidera"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik %s bidaltzeko"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Egin klik %s(r)i deitzeko"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Egin klik helbideak ezkutatzeko/bistaratzeko"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Bat datozenak: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Bilatu:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Aurrekoa"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Hurrengoa"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Maiuskula/minuskula"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Sinatu gabe"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11830,11 +12329,11 @@ msgstr ""
 "Mezu hau ez dago sinatuta. Ez dago inolako bermerik, mezu hau benetakoa dela "
 "bermatzen duenik."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Baliozko sinadura"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11842,21 +12341,21 @@ msgstr ""
 "Mezu hau sinatuta dago, eta baliozkoa da; hau da, oso litekeena da mezua "
 "benetakoa izatea."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Sinadura baliogabea"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Mezu honen sinadura ezin da egiaztatu; beharbada bidean aldatuko zen."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Baliozko sinadura du, baina ezin da bidaltzailea egiaztatu"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11864,31 +12363,31 @@ msgstr ""
 "Mezu honek baliozko sinadura du, baina mezuaren bidaltzailea ezin da "
 "egiaztatu."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Sinadura badago, hala ere gako publikoa behar du"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "Mezu honek sinadura du, baina ez dator bat gako publikoarekin."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Enkriptatu gabe"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "Mezu hau ez dago enkriptatuta. Edukia bidean ikus daiteke, Interneten."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Enkriptatuta, ahula"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11898,11 +12397,11 @@ msgstr ""
 "izan arren, litekeena da kanpoko norbaitek mezu honen edukia ikustea, "
 "horretarako denbora hartzen badu."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Enkriptatuta"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11910,11 +12409,11 @@ msgstr ""
 "Mezu hau enkriptatuta dago. Oso zaila da kanpoko norbaitek mezuaren edukia "
 "ikustea."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Enkriptatuta, zorrotza"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11924,94 +12423,89 @@ msgstr ""
 "zaila izango da kanpoko norbaitek mezu honen edukia ikustea, arrazoizko "
 "denbora batean."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ikusi ziurtagiria"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Ziurtagiri hau ez da ikusteko modukoa"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Osatua: %Y %B %d, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Atzeratua:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr " - %Y %B %d, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Ikusi barnean"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "E_zkutatu"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Doitu zabalera"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Erakutsi jatorrizko ta_maina"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Eranskina"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Gorde eranskina honela"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Hautatu karpeta eranskin guztiak gordetzeko..."
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Gorde hautatutakoa..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "_Eranskin %d"
 msgstr[1] "%d _eranskin"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "_Gorde"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Gorde _denak"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Eranskinik ez"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Ikusi formaturik _gabe"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Ezkutatu formaturik _gabekoak"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "Ireki _honekin"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2473
 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 ""
 "Evolutionek ezin du mezu hau erakutsi luzeegia delako kudeatzeko. Formaturik "
@@ -12022,276 +12516,285 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "'%s' eskuratzen"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Kanpoko gorputz-zatia ezezaguna."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Kanpoko gorputz-zatia gaizki osatuta dago."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s) urruneko datuetarako erakuslea"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Mezua formateatzea"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Mezua formateatzea..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../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:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Data"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Berri-taldeak"
-
 #. 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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Mezu hau <b>%s</b>(e)k bidali du <b>%s</b>(r)en izenean"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "Nork"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
+#: ../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
+msgid "Date"
+msgstr "Data"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Berri-taldeak"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ezin izan da S/MIME mezua analizatu: errore ezezaguna"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Enkriptatze-mota ez onartua multipart/enkriptatuarentzat"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Ezin izan da PGP/MIME mezua analizatu"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ezin izan da PGP/MIME mezua analizatu: errore ezezaguna"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Sinadura-formatu ez onartua"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Errorea sinadura egiaztatzean"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Errore ezezaguna sinadura egiaztatzean"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Ezin izan da PGP mezua analizatu"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Ezin izan da PGP mezua analizatu: errore ezezaguna"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Beti"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Egunean behin"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Astean behin"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Hilean behin"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Gehitu baztergarrien goiburu pertsonalizatua"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Goiburuaren izena:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Goiburuaren balioak hau dauka:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Balioa du"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Kolorea"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Etiketa"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin-a erabilgarri dago eta bitarra instalatu da."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s plugin-a ez dago erabilgarri. Egiaztatu paketea instalatuta dagoen."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Ez dago Baztergarrien plugin erabilgarririk"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Egitekoa"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Geroago"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Aldatu egin da Evolution-eko postontzi-karpeten hierarkia Evolution 1.x "
-"bertsioaz geroztik.\n"
-"\n"
-"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta berria sortu: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Ezin da kopiatu '%s' karpeta --> '%s': %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "'%s' ezin da aztertu postontzirik dagoen ikusteko: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Aldatu egin da Evolution-eko postontzi-karpeten hierarkia Evolution 1.x "
+"bertsioaz geroztik.\n"
+"\n"
+"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Ezin dira ireki '%s' POP zerbitzarian gordetako datu zaharrak: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Ezin da ireki '%s' POP3 zerbitzarian gordetzeko datuen direktorioa: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Ezin dira kopiatu '%s' POP3 zerbitzarian gordetako datuak: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Huts egin du '%s' posta-biltegi lokala sortzean: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"Evolution-eko postontzi-karpeten laburpenaren formatua sqlite-ra aldatu da "
+"Evolution 2.24 bertsioatik aurrera.\n"
+"\n"
+"Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Huts egin du posta lokalaren karpetak sortzean '%s'(e)n: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12299,125 +12802,138 @@ msgstr ""
 "Ezin dira irakurri aurreko Evolution-en instalazioko ezarpenak; evolution/"
 "config.xmldb' ez dago, edo hondatuta dago bestela."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../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 "Erantzun zerre_ndari"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Gehitu helbide-liburuan"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Biltegi honek ez du onartzen harpidetzarik, edo, bestela, desgaituta daude."
+msgstr "Biltegi honek ez du onartzen harpidetzarik, edo, bestela, desgaituta daude."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Harpidetuta"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Karpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Ez erakutsi mezu hau berriro."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Posta-iragazkiak"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "mezua"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Gorde mezua..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Gehitu helbidea"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Bilatu _karpetak"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Bilatu karpetaren iturburua"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"Mezuak bidali eta jaso\" leihoaren altuera"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"Mezuak bidali eta jaso\" leihoaren maximizatutako egoera"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"Mezuak bidali eta jaso\" leihoaren zabalera"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "Baimendu evolution tamaina mugatutako testu-zatia erakusteko"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "E_skatu beti irakurragiriak"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
-"Denbora-kopurua (segundotan) errorea egoera-barran bistaratuta egoteko."
+msgstr "Denbora-kopurua (segundotan) errorea egoera-barran bistaratuta egoteko."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Aurpegieren ezagutza automatikoa"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Esteka-ezagutze automatikoa"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Begiratu sarrerako mezuak baztergarriak diren"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Aipuak nabarmentzeko kolorea"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Aipuak nabarmentzeko kolorea."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Mezuak prestatzeko leihoaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Mezuak prestatzeko leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Mezu-prestatzailearen kargatzeko/eransteko direktorioa"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Konprimituta bistaratu Nori/CC/BCC eremuko helbideak"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12425,69 +12941,97 @@ msgstr ""
 "Konprimituta bistaratu Nori/CC/BCC eremuko helbideak 'helbide-kopurua'n "
 "zehaztutako kopuruaren arabera."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 ""
+"Aldaketa lokala urruneko posta zerbitzariarekin sinkronizatzeko maiztasuna "
+"kontrolatzen du. Tartea gutxienez 30 segundokoa izan behar du."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr "Erabiliko diren goiburu pertsonalizatuak mezu baztergarriak aztertzeko."
+
+#: ../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 ""
+"Erabiliko diren goiburu pertsonalizatuak mezu baztergarriak aztertzeko. "
+"Zerrendako elementuak \"headername=balioa\" formatukoak dira."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Mezuak idazteko karaktere-joko lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Mezuak idazteko karaktere-joko lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Birbidaltzeko estilo lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Mezuak prestatzeko leihoaren altuera lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Mezuen leihoaren altuera lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Erantzuteko estilo lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Balio lehenetsia hariaren egoera zabaltzeko"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Mezuak prestatzeko leihoaren zabalera lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Mezuen leihoaren zabalera lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Harpidetzeko leihoaren zabalera lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Lokaleko helbide-liburuko helbide elektronikoan bilatu behar den mezu "
+"baztergarriak iragazteko ala ez zehazten du"
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Bidaltzailearen helbide elek. helbide-liburuan bilatu behar den ala ez "
 "zehazten du"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Bidaltzailearen helbide elek. helbide-liburuan bilatu behar den ala ez "
@@ -12496,13 +13040,13 @@ msgstr ""
 "helbide-liburua (LDAP bezalakoa) osaketa automatikoa lantzeko markatuta "
 "badago."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Mezu baztergarriak klasifikatzeko goiburu pertsonalizatuak erabiliko diren "
 "ala ez zehazten du"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../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 "
@@ -12512,7 +13056,7 @@ msgstr ""
 "ala ez zehazten du. Aukera hau gaituta egonez gero, eta goiburuak aipatuta "
 "badaude, baztergarriak aztertzeko abiadura hobetuko da."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../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."
@@ -12521,55 +13065,59 @@ msgstr ""
 "\" (Gaia) lerroetako letra-tipo berdinak erabili behar diren ala ez zehazten "
 "du."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorioa mezu-prestatzaileari fitxategiak kargatzeko/eransteko."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Direktorioa mezuaren fitxategi-osagaiak gordetzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "Desgaitu edo gaitu karpeten izenen elipsia karpeten zuhaitzean"
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marraztu errore ortografikoen adierazleak hitzetan idatzi ahala."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Hustu baztergarrien karpetak irtetzean"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Hustu zakarrontziko karpetak irtetzean"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Hustu baztergarrien karpeta guztiak Evolution-etik irtetzean."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Hustu zakarrontziko karpeta guztiak Evolution-etik irtetzean."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Gaitu kurtsore modua, mezuak irakurtzean kurtsorea ikusteko."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Gaitu edo desgaitu 'zuriune magikoa'"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Gaitu edo desgaitu 'bilatu idaztean' funtzioa"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Gaitu bilaketako karpetak"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Gaitu bilaketako karpetak hasieran."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12581,7 +13129,7 @@ msgstr ""
 "karpetaren izena idaztean eta hautapenak automatikoki karpeta horretara "
 "joateko."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12589,27 +13137,27 @@ msgstr ""
 "Hau gaituz Zuriunea tekla erabiliko da mezuaren aurrebistan, mezuen "
 "zerrendan eta karpetetan korritzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Gaitu tamaina mugatutako mezuaren zatia erakustea."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Gaitu/desgatiu kurtsore modua"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren altuera"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren altuera."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Karpetaren aurrebista ezkutatu eta hautapena ezabatzen du"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12617,7 +13165,7 @@ msgstr ""
 "Erabiltzaileak 10 mezu edo gehiago irekitzen saiatzen bada aldi berean, "
 "galdetu erabiltzaileari benetan hori egitea nahi duen."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12625,7 +13173,7 @@ msgstr ""
 "\"Aurrebista\" panela aktibatuta egonez gero erakutsi bata bestearen alboan, "
 "bertikalki ordez."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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 "
@@ -12635,11 +13183,41 @@ msgstr ""
 "GNOMEren mime-moten datu-baseko bonobo osagaien ikustaile batera mapatutako "
 "zerrendako edozein mime-mota erabil daiteke edukia bistaratzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 ""
+"\"Mezuak bidali eta jaso\" leihoaren haiserako altuera. Balioa eguneratu "
+"egiten da erabiltzaileak leihoa bertikalki tamainaz aldatzean."
+
+#: ../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 ""
+"\"Mezuak bidali eta jaso\" leihoaren hasierako maximizatze-egoera. Balioa "
+"eguneratu egiten da erabiltzaileak leihoa maximizatzen/desmaximizatzen "
+"duenean. Jakin ezazu balio hau ez dela Evolution-en erabiltzen, \"Mezuak "
+"bidali eta jaso\" leihoa ezin delako maximizatu. Gako hau inplementazioaren "
+"xehetasun gisa soilik existitzen da."
+
+#: ../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 ""
+"\"Mezuak bidali eta jaso\" leihoaren haiserako zabalera. Balioa eguneratu "
+"egiten da erabiltzaileak leihoa horizontalki tamainaz aldatzean."
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Gonbitea gaitzen/desgaitzen du hainbat mezu markatzen den bitartean."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../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."
@@ -12647,7 +13225,7 @@ msgstr ""
 "Eskaera errepikakorra gaitzen/desgaitzen du lineaz kanpoko sinkronizazioa "
 "behar den galdetzeko lineaz kanpoko moduan sartu aurretik."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../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 "
@@ -12657,31 +13235,31 @@ msgstr ""
 "ezabatzean behin betirako ezabatzen direla (ez direla bilaketako emaitzetik "
 "soilik kentzen) buruzko abisua emateko."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Baztergarria hustu zen azken aldia"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Zakarrontzia hustu zen azken aldia"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Maila, hortik gora mezua erregistratzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Etiketen zerrenda, eta bakoitzari asoziatutako koloreak"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Onartutako lizentzien zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Kontuen zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12689,11 +13267,15 @@ msgstr ""
 "Evolution-en posta-osagaiak ezagutzen dituen kontuen zerrenda. Zerrendak /"
 "apps/evolution/mail/accounts-eko azpiderektorioen izenen kateak ditu."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Goiburu pertsonalizatuen zerrenda, gaituta dauden edo ez zehaztuta."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Hiztegien hizkuntzen kodeen zerrenda zuzentzaile ortografikoan erabiltzeko."
+
+#: ../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."
@@ -12702,131 +13284,125 @@ msgstr ""
 "kolorea duten kateak ditu, eta koloreak HTML kodeketa hamaseitarra "
 "erabiltzen du."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Bonobo osagaien ikustaileentzat egiaztatu beharreko mime-moten zerrenda"
+msgstr "Bonobo osagaien ikustaileentzat egiaztatu beharreko mime-moten zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lizentzia onartu zaien protokolo-izenen zerrenda."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Kargatu HTML mezuen irudiak http bidez"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../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 ""
-"Kargatu HTML mezuen irudiak http(s) bidez. Balio posibleak: 0 - Inoiz ez "
-"kargatu irudiak saretik kanpo 1 - Kargatu irudiak kontaktuen mezuetan 2 - "
-"Beti kargatu irudiak saretik."
+"Kargatu HTML mezuen irudiak http(s) bidez. Balio posibleak: \"0 \"- Inoiz ez "
+"kargatu irudiak saretik kanpo \"1\" - Kargatu irudiak kontaktuen mezuetan \"2"
+"\" - Beti kargatu irudiak saretik."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Iragazki-ekintzen egunkaria"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Erregistratu iragazki-ekintzak zehaztutako egunkari-fitxategian."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\"."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Mezuen leihoaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Mezuen leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Mezuak bistaratzeko estiloa (\"normala\", \"goiburu osoak\", \"iturburua\")"
+msgstr "Mezuak bistaratzeko estiloa (\"normala\", \"goiburu osoak\", \"iturburua\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Irtetzean baztergarria husteko gutxieneko egun-kopurua"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Irtetzean zakarrontzia husteko gutxieneko egun-kopurua"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Irtetzean baztergarria husteko gutxieneko denbora (egunetan)."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Irtetzean zakarrontzia husteko gutxieneko denbora (egunetan)."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Helbide-kopurua Nori/CC/BCC eremuetan erakusteko"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Abisatu gaia hutsik badago"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Abisatu erabiltzaileari, karpeta bat betiko ezabatu aurretik."
 
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr ""
-"Galdetu erabiltzaileak lineaz kanpo berehala egotea nahi duen egiaztatzeko"
+msgstr "Galdetu erabiltzaileak lineaz kanpo berehala egotea nahi duen egiaztatzeko"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Abisatu mezuak bilaketako karpetatik ezabatzean"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Abisatu erabiltzaileak betiko borratzean"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
+msgstr "Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
@@ -12834,71 +13410,75 @@ msgstr ""
 "Abisatu HTML mezuak bidali aurretik beharbada HTML mezurik jaso nahi ez "
 "duten erabiltzaileei."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Abisatu Nori edo Cc hartzailerik gabeko mezu bat bidali aurretik."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Abisatu HTMLrik nahi ez duenari HTML mezua bidali aurretik"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Gonbitea hainbat mezu markatzean"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Ezagutu aurpegierak testuan, eta ordeztu irudiekin."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Ezagutu testuko estekak, eta ordeztu."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Exekutatu mezu baztergarrien proba sarrerako mezuetan."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Gorde direktorioa"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-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 "Bilatu bidaltzailearen argazkia lokaleko helbide-liburuan"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Bidali HTML mezuak lehenespenez"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Bidali HTML mezuak lehenespenez."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Bidaltzailearen helb.elek. zutabea mezuen zerrendan"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Zerbitzariaren sinkronizazio tartea"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Erakutsi animazioak"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Erakutsi irudi-animazioak animazio gisa."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Erakutsi ezabatutako mezuak (marratuta) mezuen zerrendan."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi ezabatutako mezuak mezuen zerrendan"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Erakutsi bidaltzailearen argazkia"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12906,73 +13486,67 @@ msgstr ""
 "Erakutsi bidaltzailearen helbide elektronikoa bereiztutako zutabean mezuen "
 "zerrendan."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Erakutsi bidaltzailearen argazkia mezuak irakurtzeko panelean."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Goiburuak zehazten ditu mezu baztergarriak aztertzeko."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Goiburuak zehazten ditu mezu baztergarriak aztertzeko. Formatua "
-"headername=balioa da gconf-en."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Ortografia-egiaztapena barnean"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "Ortografia-egiaztapenaren kolorea"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "Ortografia-egiaztapenaren hizkuntzak"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Harpidetzen elkarrizketa-koadroaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminaleko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Mezuaren testu-zatiaren muga"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Baztergarrientzako plugin lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr ""
-"Baztergarria hustu zen azken aldia, garaiaren hasieratik iragandako egunetan."
+msgstr "Baztergarria hustu zen azken aldia, garaiaren hasieratik iragandako egunetan."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Zakarrontzia hustu zen azken aldia, garaiaren hasieratik iragandako egunetan."
+msgstr "Zakarrontzia hustu zen azken aldia, garaiaren hasieratik iragandako egunetan."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den terminaleko letra-tipoa."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den zabalera aldakorreko letra-tipoa."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Honako balio erabilgarriak daude: 0 - erroreak. 1 - abisuak. 2 - mezuen "
-"arazketa."
+"Honako balio erabilgarriak daude: \"0\" - erroreak. \"1\" - abisuak. \"2\" - "
+"mezuen arazketa."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -12980,7 +13554,7 @@ msgstr ""
 "Testu-zatiaren gehiengo tamaina zehazten du Evolution-ek formatu emateko. "
 "Lehenetsia 4MB (4096 KB) da, KB unitatean zehaztuz."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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 "
@@ -12990,16 +13564,16 @@ msgstr ""
 "egon. Zerrendatutako plugin lehenetsia desgaitzen bada, ez ditu beste plugin "
 "erabilgarririk erabiliko."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../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 ""
-"Gako hau behin bakarrik irakurtzen da, eta faltsua balioarekin berrezartzen "
-"da irakurri ostean. Mezua desautatzen du zerrendatik eta karpetako "
-"aurrebista ezabatzen du."
+"Gako hau behin bakarrik irakurtzen da, eta \"false\" (faltsua) balioarekin "
+"berrezartzen da irakurri ostean. Mezua desautatzen du zerrendatik eta "
+"karpetako aurrebista ezabatzen du."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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;"
@@ -13011,11 +13585,21 @@ msgstr ""
 "egitura - &lt;header enabled&gt; - gaituta ezartzen da, goiburua mezuen "
 "ikuspegian bistaratuko bada."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 ""
+"Aukera honek lookup_addressbook gakoarekin zerikusia du, eta baztergarrien "
+"iragazkitik kontaktu ezagunak kanpo gelditzeko lokaleko helbide-liburuan "
+"bilaketa landuko den ala ez zehazteko erabiltzen da."
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Aukera honek mezuak jasotzeko abiadura hobetzen lagun dezake."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../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."
@@ -13023,7 +13607,7 @@ msgstr ""
 "Honek helbide-kopurua ezartzen du mezuaren zerrendako ikuspegi lehenetsian "
 "erakusteko, eta harutzago '...' erakutsiko da."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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."
@@ -13031,7 +13615,7 @@ msgstr ""
 "Ezarpen honek hariak zabaltzeko edo biltzeko egoeran lehenetsi gisa egon "
 "behar duten zehazten du. Evolution berrabiaraztea eskatzen du."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
@@ -13041,107 +13625,119 @@ msgstr ""
 "oinarrituko den zehazten du, mezuaren dataren araberaren ordez. Evolution "
 "berrabiaraztea eskatzen du"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Sartu harian mezuen zerrenda."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Sartu harian mezuen zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Sartu harian mezuen zerrenda, Gaiaren arabera"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Mezua Ikusitako gisa markatzeko denbora-muga"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Mezua Ikusitako gisa markatzeko denbora-muga."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Kontu lehenetsiaren UID katea."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+"Azpimarraren kolorea akastun hitzetan (lineako zuzentzaile ortografikoa "
+"erabiltzean)."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Erabili SpamAssassin daemon-a eta bezeroa"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Erabili SpamaAssassin daemon-a eta bezeroa (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Erabili letra-tipo pertsonalizatuak"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Erabili letra-tipo pertsonalizatuak mezuak bistaratzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Spam-proba lokalak bakarrik erabili."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Spam-proba lokalak bakarrik erabili (DNSkorik ez)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Erabili diseinu handia edo 'alboz albokoa'"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Zabalera aldakorreko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Ikusi/Bcc menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Ikusi/Bcc menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Ikusi/Cc menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Ikusi/Cc menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Ikusi/Nork menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Ikusi/Nork menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Irakurragiriaren eskaera mezu bakoitzari gehitu lehenetsi gisa edo ez."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+"Karpeten izenen elipsia (karpeten zuhaitzean) desgaituko den ala ez "
+"adierazten du."
+
+#: ../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."
@@ -13149,43 +13745,43 @@ msgstr ""
 "Gaikako harian sartzera itzuli nahi duzun edo ez, mezuek ez daukatenean "
 "'Erantzun honi' edo 'Erreferentzia' goibururik."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Hari bateko azken mezuen arabera hariek ordenatu behar diren ala ez."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren zabalera"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren zabalera."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm datuak inportatzen"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution-en Elm inportatzailea"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Inportatu posta Elm-etik."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Helburuko karpeta:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Hautatu inportazioetarako karpeta"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley postontzia (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postontzien formatuen karpeten inportatzailea"
 
@@ -13193,7 +13789,7 @@ msgstr "Berkeley postontzien formatuen karpeten inportatzailea"
 msgid "Importing mailbox"
 msgstr "Postontzia inportatzen"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' inportatzen"
@@ -13203,175 +13799,180 @@ msgstr "'%s' inportatzen"
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Pine datuak inportatzen"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution-en Pine inportatzailea"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Inportatu posta Pine-tik."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Mezu-hartzailea: %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 "Mezu-bidaltzailea: %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Gaia: %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta-zerrenda"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazteko araua"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Txantiloiak"
+
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d hautatuta, "
 msgstr[1] "%d hautatuta, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ezabatuta"
 msgstr[1] "%d ezabatuta"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "baztergarri %d"
 msgstr[1] "%d baztergarri"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "zirriborro %d"
 msgstr[1] "%d zirriborro"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d bidalita"
 msgstr[1] "%d bidalita"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d bidali gabe"
 msgstr[1] "%d bidali gabe"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d irakurri gabe, "
 msgstr[1] "%d irakurri gabe, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d guztira"
 msgstr[1] "%d guztira"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: ../mail/mail-component.c:897
-msgid "_Mail Message"
-msgstr "_Mezua"
-
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Mezu berrien karpeta"
 
-#: ../mail/mail-component.c:905
-msgid "Mail _Folder"
-msgstr "Posta _Karpeta"
-
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Sortu posta-karpeta berria"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Huts egin du Postaren ezarpenak edo karpetak bertsio-berritzean."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Errorea"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Erroreak"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Abisuak eta erroreak"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Araztu"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Erroreak, abisuak eta arazketa-mezuak"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Arazketen egunkaria"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Erakutsi _erroreak egoera-barran"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+msgid "second(s)."
 msgstr "segundotan."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Egunkariko mezuak:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Egunkari-maila"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Ordua"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mezuak"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Itxi leiho hau"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Begiratu zein mota onartzen diren "
@@ -13385,7 +13986,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ez da onartzen evolution-en bertsio honetan</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Bidaltzailearen argazkia</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13466,73 +14067,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Inprimatzeko letra-tipoak</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Proxy-aren ezarpenak</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Beharrezko informazioa</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME segurua (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Segurtasuna</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Bidalitako mezuak eta zirriborroak</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Zerbitzariaren konfigurazioa</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">_Autentifikazio-mota</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Gehitu _sinadura berria..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "_Gehitu script-a"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Enkriptatu _beti bere buruari posta enkriptatua bidaltzean"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Be_ti bidali Cc kopia honi:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Beti bi_dali Bcc kopia honi:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Enkriptatzean beti _fidagarritzat jo nire gako-sortako gakoak"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "Eskatu beti _irakurragiriak"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Erantsi jatorrizko mezua"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "Automatikoki txertatu _aurpegieren irudiak"
@@ -13550,13 +14151,13 @@ msgid "C_haracter set:"
 msgstr "_Karaktere-jokoa:"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "_Begiratu baztergarrien aurkako goiburu pertsonalizatuak"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Begiratu zein mota onartzen diren "
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "_Begiratu baztergarrien aurkako goiburu pertsonalizatuak"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Begiratu _sarreran mezurik baztertzeko dagoen"
@@ -13618,17 +14219,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Sinatu digitalki irteerako mezuak (lehenespenez)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr ""
-"_Ez markatu mezuak baztergarri gisa bidaltzailea nire helbide-liburuan badago"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Ez eman formatu mezuari testu-_tamaina hau gainditzean: "
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "Ez eman formatu edukiak testu-_tamaina hau gainditzean: "
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "_Ez markatu mezuak baztergarri gisa bidaltzailea nire helbide-liburuan badago"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "Ez aipatu jatorrizko mezua"
+msgid "Do not quote"
+msgstr "Ez jarri komatxorik"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13691,57 +14291,64 @@ msgid "HTML Messages"
 msgstr "HTML mezuak"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "_HTTP proxy-a:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Goiburua"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "_Aipamenak nabarmentzeko erabili"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Barnean"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "Jatorrizko mezuaren barnean (Outlook estiloa)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "Linean (Outlook estiloa)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketak"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Hizkuntzen taula"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "Posta-goiburuen taula"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Mezu-prestatzailea"
 
-#: ../mail/mail-config.glade.h:105
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "Proxy-rik ez honentzako:"
+
+#: ../mail/mail-config.glade.h:107
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Oharra: etiketaren izenean agertzen den azpimarra identifikatzaile "
 "mnemotekniko gisa erabiltzen da menuan."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13749,15 +14356,25 @@ msgstr ""
 "Oharra: ez dizu pasahitzik eskatuko, harik eta lehen aldiz konektatzen zaren "
 "arte"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Aukera honi ezikusi egingo zaio baztergarrien goiburu pertsonalizatu batekin "
+"bat datorrela aurkituz gero."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "_Pasahitza:"
+
+#: ../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."
@@ -13765,7 +14382,7 @@ msgstr ""
 "Idatzi kontu honen izen deskribatzailea azpiko tartean.\n"
 "Izen hau bistaratzeko soilik erabiliko da."
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13773,7 +14390,7 @@ msgstr ""
 "Idatzi posta bidaltzeko erabiliko duzun bidearen datuak. Ziur ez bazaude, "
 "galdetu sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13783,114 +14400,121 @@ msgstr ""
 "eremuak ez dira nahitaez bete beharrekoak. Datu horiek zuk bidaltzen dituzun "
 "mezuetan agertzea nahi baduzu bakarrik bete behar dituzu."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "Ataka:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Aipatu jatorrizko mezua"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Gogoratu pasahitza"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Erant_zun honi:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Gogoratu p_asahitza"
 
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "_SOCKS ostalaria:"
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "_Bilatu bidaltzailearen argazkia lokaleko helbide-liburuetan soilik"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "_Hautatu..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "B_idali mezuaren irakurragiria:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Letra-tipo estandarra:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa inprimatzeko"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa inprimatzeko"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Bi_dalitako mezuen karpeta:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Sinatze-ziur_tagiria:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Si_nadura:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Sinadurak"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Sinaduren taula"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Ortografia-egiaztapena"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Hasi _idazten behean erantzutean"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Mota:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
+msgstr "Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13900,14 +14524,7 @@ msgstr ""
 "erabiliko da. Idazten duzun izena bistaratzeko\n"
 "bakarrik erabiliko da. "
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Aukera gainidatzi egingo da baztergarrien goiburu pertsonalizatu batekin bat "
-"datorrela aurkituz gero."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13915,16 +14532,26 @@ msgstr ""
 "Idatzi kontu honentzat erabili nahi duzun izena.\n"
 "Adibidez: \"Lanekoa\" edo \"Nirea\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "_Erabiltzaile-izena:"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Erabili _autentifikazioa"
+
+#: ../mail/mail-config.glade.h:156 ../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 "_Erabiltzaile-izena:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Zabalera aldakorra:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13934,100 +14561,124 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Aurrera\"n. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Gehitu sinadura"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Beti kargatu irudiak Internetetik"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "Proxy-aren konfigurazio automatikoaren URLa:"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Baztergarrien plugin _lehenetsia:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "Interneterako _zuzeneko konexioa"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Birbidaltzeko estiloa:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Mantendu sinadura jatorrizko mezuaren gainean erantzutean"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Kargatu irudiak mezuan kontaktuetatik"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "_Begiratu lokaleko helbide-liburuetan soilik"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Lehenetsi kontu hau"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "Proxy-aren _eskuzko konfigurazioa:"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Inoiz ez kargatu irudirik Internetetik"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "Abisatu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "Galdetu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu _mezuak gairik gabe bidali aurretik"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Erantzuteko estiloa:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script-a:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "HTTP seguruaren proxy-a:"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Hautatu..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Erakutsi animazioak"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Erakutsi bidaltzailearen argazkia mezuaren aurrebistan"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Txikitu Nori / Cc / Bcc goiburukoak hona"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "E_rabili konexio segurua:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "_Erabili sistemako lehenetsiak"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Erabili beste aplikazioetako letra-tipo berak"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "helbideak"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "kolorea"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "azalpena"
 
@@ -14067,43 +14718,43 @@ msgstr "_Maiuskula/Minuskula"
 msgid "Co_mpleted"
 msgstr "_Eginda"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Bilatu:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Bilatu mezuan"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Markatu jarraipena egiteko"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Karpeta-harpidetzak"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lizentzia-kontratua"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ez da bat ere hautatu"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Zerbitzaria:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Segurtasun-informazioa"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Zehaztutako karpetak"
 
-#: ../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."
@@ -14111,23 +14762,23 @@ msgstr ""
 "Jarraitzeko hautatutako mezuak beheko zerrendan agertzen dira.\n"
 "Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Onartu lizentzia"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Noizko:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Bandera:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Markatu hau lizentzia-kontratua onartzeko"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "%s(e)n ping egiten"
@@ -14174,99 +14825,104 @@ msgstr "%d/%d mezua bidaltzen"
 msgid "Failed to send %d of %d messages"
 msgstr "Huts egin du mezuak bidaltzean: %d / %d "
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Bertan behera utzita."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Osatuta."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s karpetaren kuotaren informazioa eskuratzen"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' kontua betiko ezabatzen eta biltegiratzen"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' kontua biltegiratzen"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Karpeta betiko ezabatzen"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua eskuratzen"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mezu %d eskuratzen"
 msgstr[1] "%d mezu eskuratzen"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Mezu %d gordetzen"
 msgstr[1] "%d mezu gordetzen"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14275,11 +14931,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14288,89 +14944,89 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' kontua prestatzen lineaz kanpo erabiltzeko"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Bertan behera uzten..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "_Utzi dena"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Mezu berriak ote dauden begiratzen"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Idatzi %s(r)en pasaesaldia"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Idatzi pasaesaldia"
 
-#: ../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 "Idatzi %s(r)en pasahitza"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Editatu sinadura"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Gorde eta itxi"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Idatzi sinadura honentzako izen bat."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Editatu sinadura"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Izena:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "_Sinaduraren izena:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14411,49 +15067,47 @@ msgstr "Bilaketa-karpeta eguneratzen - '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Bilaketa-karpetak eguneratzen - '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Editatu bilaketa-karpeta"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Bilaketa berrien karpeta"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "&quot;{0}&quot; izeneko karpeta bat badago. Erabili beste izen bat."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "\"{0}\" izeneko karpeta bat badago. Erabili beste izen bat."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "&quot;{1}&quot; izeneko karpeta bat badago. Erabili beste izen bat."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"{1}\" izeneko karpeta bat badago. Erabili beste izen bat."
 
 #: ../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."
 msgstr ""
-"Hutsik ez dagoen &quot;{1}&quot; karpeta badago lehendik.\n"
+"Hutsik ez dagoen \"{1}\" karpeta badago lehendik.\n"
 "\n"
 "Karpeta honi ez ikusi egitea aukera dezakezu, gainidaztea, bere edukia "
 "eranstea edo irtetzea aukera dezakezu."
 
 #: ../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 ""
-"&quot;{1}&quot;(e)k irakurragiria eskatu duen jakinarazpena. Bidali "
-"irakurragiriaren jakinarazpena {0}(r)i?"
+"\"{1}\"(e)k irakurragiria eskatu duen jakinarazpena. Bidali irakurragiriaren "
+"jakinarazpena {0}(r)i?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "&quot;{0}&quot; izeneko karpeta bat badago. Erabili beste izen bat."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "\"{0}\" izeneko sinadura bat badago. Erabili beste izen bat."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14472,8 +15126,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ziur zaude kontu hau eta dagokion proxy guztiak ezabatu nahi duzula?"
 
 #: ../mail/mail.error.xml.h:12
@@ -14491,10 +15144,10 @@ msgstr ""
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"Ziur zaude &quot;{0}&quot; karpetan dauden ezabatutako mezuak betiko kendu "
-"nahi dituzula?"
+"Ziur zaude \"{0}\" karpetako ezabatutako mezu guztiak betiko kendu nahi "
+"dituzula?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14509,101 +15162,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ziur zaude mezua gairik gabe bidali nahi duzula?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "Arrazoia: &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "Arrazoia: \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "Arrazoia: &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "Arrazoia: \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Sinadura hutsa"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Ezin da &quot;{0}&quot; karpeta birtuala gehitu"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Ezin da \"{0}\" bilaketako karpeta gehitu"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ezin da &quot;{0}&quot; karpeta &quot;{1}&quot;(e)n kopiatu."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Ezin da \"{0}\" karpeta \"{1}\"(e)n kopiatu."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Ezin da &quot;{0}&quot; karpeta sortu."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ezin da \"{0}\" karpeta sortu."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Ezin da sortu aldi baterako gordetzeko direktorioa."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Ezin izan da direktorioan gorde. Arrazoia: &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Ezin da gordetzeko direktorioa sortu. Arrazoia: \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Ezin da &quot;{0}&quot; karpeta ezabatu."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Ezin da \"{0}\" karpeta ezabatu."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Ezin da sistemako &quot;{0}&quot; karpeta ezabatu."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ezin da sistemako \"{0}\" karpeta ezabatu."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr ""
-"Ezin da bilaketako &quot;{0}&quot; karpeta editatu, karpeta hori ez "
-"dagoelako."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Ezin da bilaketako \"{0}\" karpeta editatu, karpeta hori ez dagoelako."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ezin da &quot;{0}&quot; karpeta &quot;{1}&quot;(e)ra eraman."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ezin da \"{0}\" karpeta \"{1}\"(e)ra eraman."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Ezin da ireki &quot;{1}&quot; iturburua."
+msgid "Cannot open source \"{1}\""
+msgstr "Ezin da ireki \"{1}\" iturburua."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Ezin da ireki &quot;{2}&quot; iturburua."
+msgid "Cannot open source \"{2}\"."
+msgstr "Ezin da ireki \"{2}\" iturburua."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Ezin da ireki &quot;{2}&quot; helburua."
+msgid "Cannot open target \"{2}\"."
+msgstr "Ezin da ireki \"{2}\" helburua."
 
 #: ../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 ""
-"Ezin da &quot;{0}&quot; lizentzia-fitxategia irakurri instalazioko arazoa "
-"dela medio. Ezingo duzu hornitzaile hau erabili bere lizentzia onartu arte."
+"Ezin da \"{0}\" lizentzia-fitxategia irakurri instalazioko arazoa dela "
+"medio. Ezingo duzu hornitzaile hau erabili bere lizentzia onartu arte."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ezin da izena aldatu: &quot;{0}&quot; --> &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Ezin da izena aldatu: \"{0}\" --> \"{1}\"."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Ezin da sistemako &quot;{0}&quot; karpeta izenez edo lekuz aldatu."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ezin da sistemako \"{0}\" karpeta izenez edo lekuz aldatu."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Ezin dira gorde kontuko aldaketak."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Ezin izan da &quot;{0}&quot; direktorioan gorde."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Ezin izan da \"{0}\" direktorioan gorde."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Ezin izan da &quot;{0}&quot; fitxategian gorde."
+msgid "Cannot save to file \"{0}\"."
+msgstr "Ezin izan da \"{0}\" fitxategian gorde."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Ezin da sinaduraren &quot;{0}&quot; script-a ezarri."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Ezin da sinaduraren \"{0}\" script-a ezarri."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "Huts egin du mezu baztergarririk dagoen begiratzean"
+
+#: ../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."
@@ -14612,46 +15266,42 @@ msgstr ""
 "maiuskulaz eta minuskulaz ezberdinak izaten direla. Agian maiuskulak "
 "aktibatuta dituzu."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Ezabatu &quot;{0}&quot;?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Kontua ezabatu nahi duzu?"
+msgid "Delete \"{0}\"?"
+msgstr "Ezabatu \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Ezabatu mezuak &quot;{0}&quot; bilaketako karpetatik?"
+msgid "Delete account?"
+msgstr "Kontua ezabatu nahi duzu?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Ezabatu mezuak \"{0}\" bilaketako karpetatik?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Ezabatu mezuak bilaketako karpetatik?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Desegin aldaketak?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "E_z ezabatu"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ez ezabatu"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Ez desgaitu"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Eragiketa hau azpidirektorioetan ere egitea nahi duzu?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14757,34 +15407,26 @@ msgid "Mark all messages as read"
 msgstr "Markatu mezu guztiak irakurritako gisa"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Markatu karpetako eta azpikarpetako mezu guztiak irakurritako gisa?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Karpeta falta da."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Ez da iturbururik hautatu"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "_Uneko karpeta soilik"
-
-#: ../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 "Mezu gehiegi batera irekitzeak denbora asko hartuko du."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Egiaztatu kontuaren ezarpenak eta saiatu berriro."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Gaitu kontua edo bidali beste kontu bat erabiliz."
 
-#: ../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."
@@ -14792,7 +15434,7 @@ msgstr ""
 "Idatzi baliozko helbide elektroniko bat Nori: eremuan. Helbide elektronikoak "
 "bilatzeko, sarrera-koadroaren ondoko Nori: botoian klik egin dezakezu."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14802,37 +15444,45 @@ msgstr ""
 "nahi dituztela:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Eman izen bakarra sinadura hau identifikatzeko."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Itxaron."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "Arazoak &quot;{0}&quot; postontzi zaharretik migratzean."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Arazoak \"{0}\" postontzi zaharretik migratzean."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Zerbitzaria kontsultatzen"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Zerbitzaria kontsultatzen onartutako autentifikazio-mekanismoak zerrenda "
 "eskuratzeko."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Erantzutea eskatu da."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
-"Ziur zaude &quot;{0}&quot; karpeta (eta bere azpikarpeta guztiak) ezabatu "
-"nahi duzula?"
+"Ziur zaude \"{0}\" karpeta (eta bere azpikarpeta guztiak) ezabatu nahi "
+"duzula?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "Huts egin du mezu baztergarria dela berri ematean"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr "Huts egin du mezua ez dela baztergarria berri ematean"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14883,13 +15533,13 @@ 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 ""
 "Bilaketako karpeta hauek:\n"
 "{0}\n"
 "ezabatutako karpeta hau erabiltzen zuten:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "eta eguneratu egin dira."
 
 #: ../mail/mail.error.xml.h:106
@@ -14897,13 +15547,13 @@ 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 ""
 "Iragazki-arau hauek:\n"
 "{0}\n"
 "ezabatutako karpeta hau erabiltzen zuten:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "eta eguneratu egin dira."
 
 #: ../mail/mail.error.xml.h:111
@@ -14928,8 +15578,7 @@ msgstr ""
 "gaituta."
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Mezu hau ezin da bidali, ez diozulako hartzailerik zehaztu"
 
 #: ../mail/mail.error.xml.h:116
@@ -15015,9 +15664,8 @@ msgstr ""
 "hautatu, edo urruneko karpeta guztiak, edo biak."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Huts egin du &quot;{0}&quot;zerbitzarian &quot;{0}&quot; gisa saioa hastean."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Huts egin du \"{0}\" zerbitzarian \"{0}\" gisa saioa hastean."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15039,22 +15687,22 @@ msgstr "_Ezabatu betiko"
 msgid "_Open Messages"
 msgstr "_Ireki mezuak"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "uneko karpetan eta _azpikarpetetan"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Ikusita"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Erantzunda"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Birbidalita"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
@@ -15079,37 +15727,50 @@ msgstr "Handia"
 msgid "Highest"
 msgstr "Handiena"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Gaur %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../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 "Atzo %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Ez dago mezurik bilaketako irizpideekin bat datorrenik. Garbitu  (Bilatu -> "
+"Garbitu menua erabiliz) edo aldatu bilaketa."
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "Ez dago mezurik karpeta honetan."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Noizko:"
@@ -15139,39 +15800,39 @@ msgstr "Bidalitako mezuak"
 msgid "Size"
 msgstr "Tamaina"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Deitu"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ez birbidali"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Egin jarraipena"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Informazio gisa"
 
-#: ../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 "Birbidali"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Erantzun"
 
-#: ../mail/message-tag-followup.c:84 ../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 "Erantzun denei"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Berrikusi"
 
@@ -15196,6 +15857,10 @@ msgid "Subject contains"
 msgstr "gaiak hau dauka"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Gaiak edo Bidaltzaileak hau dauka"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Gaiak edo Bidaltzaileak hau dauka"
 
@@ -15208,14 +15873,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Helbide-liburu lokaleko funtzionalitate-motorra eskaintzen du."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Gaitu eranskinen ohartarazlearen plugin-a"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Gaitu eranskinen ohartarazlearen plugin-a."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15223,7 +15880,7 @@ msgstr ""
 "Aztarnen zerrenda eranskinen ohartarazlearen plugin-ak mezuaren gorputzean "
 "begiratzeko"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15231,14 +15888,11 @@ msgstr ""
 "Aztarnen zerrenda eranskinen ohartarazlearen plugin-ak mezuaren gorputzean "
 "begiratzeko."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Gako-hitzak"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Ohartarazi _falta diren eranskinak"
-
 #: ../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"
@@ -15264,9 +15918,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Mezuak ez du eranskinik"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Jarraitu editatzea"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "_Editatu mezua"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15280,27 +15934,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Lineako audio plugin-a"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Hautatu Evolution-en babeskopiaren izena"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Berrabiatu Evolution-en babeskopia egin ondoren"
 
-#: ../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 "Hautatu Evolution-en babeskopiaren izena leheneratzeko"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Berrabiatu Evolution leheneratu ondoren"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Leheneratu babeskopiatik"
 
-#: ../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"
@@ -15311,97 +15965,121 @@ msgstr ""
 "Ezarpen pertsonalak, mezu iragazki eta bestelako guztiak berreskura ditzake "
 "ere."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Leheneratu Evolution babeskopiako fitxategitik"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Hautatu Evolution-en artxiboa leheneratzeko:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Aukeratu fitxategia leheneratzeko"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Egin Evolution direktorioaren babeskopia"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Leheneratu Evolution-en direktorioa"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Egiaztatu Evolution-en babeskopia"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Berrabiatu Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Interfaze grafikoarekin"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Evolution ixten"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Egin Evolution-en datuen eta ezarpenen babeskopia"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Egin Evolution-en datuen (Posta, Kontaktuak, Egutegia, Zereginak, "
 "Zirkularrak) babeskopia"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Babeskopia osatuta"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolution berrabiatzen"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Egin uneko Evolution-en datuen babeskopia"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Fitxategiak babeskopiatik erauzten"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Evolution-en ezarpenak kargatzen"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Aldi baterako babeseko fitxategiak ezabatzen"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "Iturburu lokalak ziurtatzen"
+
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Babeskopia %s karpetan gordetzen"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s karpetatik leheneratzen"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution-en babeskopia"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution leheneratzea"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Evolution-en datuen babeskopia egiten"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Itxaron Evolution-ek zure datuen babeskopia egiten duen bitartean."
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Evolution-eko datuak berreskuratzen"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Itxaron Evolution-ek zure datuak berreskuratzen dituen bitartean."
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "Honek nahikoa iraun dezake zure kontuko datu kopuruaren arabera."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15418,8 +16096,7 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Ziur zaude Evolution ixtea nahi duzula?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "Ziur zaude Evolution hautatutako babeskopiako fitxategitik leheneratzea nahi "
 "duzula?"
@@ -15437,14 +16114,22 @@ msgstr ""
 "berrabiaratzea nahi baduzu, gaitu txandakatzeko botoia."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Ez dituzu nahikoa baimen"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Baliogabeko Evolution-en basbeskopia"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Hautatu Evolution-en baliozko babeskopia leheneratzeko."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "Hautatutako karpetan ezin da idatzi."
+
+#: ../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 "
@@ -15471,46 +16156,43 @@ msgstr "_Leheneratu ezarpenak..."
 msgid "_Backup Settings..."
 msgstr "Egin ezarpenen _babeskopia..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Kontaktu automatikoak"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "_Automatikoki sortutako sarrerak helbide-liburuan mezuei erantzutean"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Hautatu kontaktu automatikoen helbide-liburua"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Berehalako mezularitzako kontaktuak"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sinkronizatu aldizka kontaktuen datuak eta irudiak Pidgin-eko lagunen "
 "zerrendatik"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Hautatu Pidgin-eko lagunen zerrendaren helbide-liburua"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Sinkronizatu _lagunen zerrendarekin"
 
 #: ../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 ""
@@ -15522,7 +16204,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:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Errorea gertatu da '%s' sortzean: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Bogofilter-ren ume prozesuak ez du erantzuten. Hiltzen..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "Itxaron Bogofilter-en ume prozetzeko itxoiten, amaitzen...ten arte"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Huts egin du Bogofilter-ekin kanalizatzean. Errorearen kodea: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Bihurtu mezuaren testua _Unicode"
 
@@ -15543,20 +16246,25 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter-en aukerak"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Baztergarriak iragazteko Bogofilter plugina"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Mezu baztergarriak iragazten ditu Bogofilter erabiliz."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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 "_URLa:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../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 "Erabili _SSL"
 
@@ -15576,17 +16284,18 @@ msgstr "Egutegi lokalak"
 msgid "Provides core functionality for local calendars."
 msgstr "Egutegi lokaleko funtzionalitate-motorra eskaintzen du."
 
-#: ../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:375
-msgid "_Refresh:"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
 msgstr "_Freskatu:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Konexio _segurua"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Erabiltzaile-izena:"
 
@@ -15655,8 +16364,7 @@ msgstr "Eguraldi-egutegiak"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
-"Probako plugin-a lastermenua agertarazten duena gauzak arbelean kopiatzeko."
+msgstr "Probako plugin-a lastermenua agertarazten duena gauzak arbelean kopiatzeko."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -15667,8 +16375,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Begiratu Evolution posta-bezero lehenetsia den"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Evolution abiatzen den bakoitzean begiratu lehenespeneko posta-bezeroa den "
 "edo ez."
@@ -15686,14 +16393,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Evolution posta-bezero lehenetsia izatea nahi duzu?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Markatu karpeta _lehenetsi gisa"
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr "Markatu helbide-liburu _lehenetsi gisa"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr "Markatu egutegi _lehenetsi gisa"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr "Markatu zereginen zerrenda _lehenetsi gisa"
+
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr "Markatu zirkularren zerrenda _lehenetsi gisa"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15701,12 +16419,63 @@ msgstr "Iturburu lehenetsiak"
 
 #: ../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 ""
 "Egutegia edo helbide-liburua lehenetsi gisa egiteko funtzionalitatea "
 "eskaintzen du."
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "_Goiburu pertsonalizatuak"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Gakoa"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Balioak"
+
+#. 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 ""
+"Goiburu pertsonalizatuaren gako-balioa zehazteko formatua:\n"
+"goiburu pertsonalizatuaren gako-balioen izena \";\" karakterearekin "
+"bereiztua."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Helb. el.-aren goiburu pertsonalizatua"
+
+#. 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 "Gehitu goiburu pertsonalizatua irteerako mezuetan."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Goiburu pertsonalizatua"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Goiburu pertsonalizatuen zerrenda"
+
+#: ../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 ""
+"Gakoak irteerako mezuari gehitu dezaiokezun goiburu pertsonalizatuen "
+"zerrenda zehazten du. Goiburua eta dagokion balioa zehazteko formatua "
+"honakoa da: goiburu pertsonalizatuaren izena, ondoren \"=\" karakterea eta "
+"gero \";\" karakterearekin bereiztutako balioak."
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Ireki beste erabiltzaileen karpeta"
@@ -15724,12 +16493,12 @@ msgid "_User:"
 msgstr "_Erabiltzailea:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Pasahitz segurua"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15737,11 +16506,11 @@ msgstr ""
 "Aukera honek Exchange zerbitzariarekin konektatuko zaitu  NTLM pasahitz "
 "seguruaren autentifikazioaren bidez."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Testu arrunteko pasahitza"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -15749,11 +16518,11 @@ msgstr ""
 "Aukera honek Exchange zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15761,83 +16530,87 @@ msgstr ""
 "Behean idatzitako mezua automatikoki bidaliko zaie bulegoan ez zaudenean \n"
 "mezu bat bidaltzen dizuten guztiei."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Orain bulegotik kanpo nago"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Orain bulegoan nago"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Aldatu Exchange kontuaren pasahitza"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Aldatu pasahitza"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Kudeatu Exchange kontuaren delegatze-ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegatzeko laguntzailea"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Hainbat"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Ikusi Exchange-ko karpeta guztien tamaina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Karpeten tamaina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-ren ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URLa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utentifikatu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Postontzia:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Autentifikazio mota:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr " _Begiratu zein mota onartzen diren"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15849,7 +16622,7 @@ 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"
@@ -15857,7 +16630,7 @@ msgstr ""
 "Uneko pasahitza ez dator bat zure kontuaren pasahitzarekin. Idatzi pasahitz "
 "zuzena"
 
-#: ../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 "Bi pasahitzak ez datoz bat. Idatzi berriro pasahitzak."
 
@@ -15877,38 +16650,38 @@ msgstr "Pasahitz berria:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Uneko pasahitza iraungitu egin da. Aldatu pasahitza orain."
 
-#: ../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 "Pasahitza %d egunetara iraungituko da."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Pertsonalizatu"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Argitaratzailea (irakurri, sortu, editatu)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Egilea (irakurri, sortu)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Gainbegiratzailea (irakurtzeko soilik)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegatu baimenak"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s(r)en baimenak"
@@ -15916,7 +16689,7 @@ msgstr "%s(r)en baimenak"
 #. 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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15927,66 +16700,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Nire karpeten gainean honako baimenak dituzu:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Gainera nire elementu pribatuak ikusteko baimena duzu."
 
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Hala ere ez duzu baimenik nire elementu pribatuak ikusteko."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "%s(r)en delegatu gisa izendatu zaituzte"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegatu:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Kendu %s delegatua?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Ezin izan da Active Direktoriora sartu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Ezin izan da Active Direktorio bera aurkitu"
 
-#: ../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 "Ezin izan da %s delegatua Active Direktorioan aurkitu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Ezin izan da %s delegatua kendu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Ezin izan da delegatuen zerrenda eguneratu."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Ezin izan da %s delegatua gehitu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Errorea delegatuen zerrenda irakurtzean."
 
@@ -16034,20 +16807,25 @@ msgstr "_Laburtu baimenak"
 msgid "_Tasks:"
 msgstr "_Zereginak:"
 
-#: ../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
 msgid "Permissions..."
 msgstr "Baimenak..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Karpetaren izena"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Karpetaren tamaina"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+msgid "User"
+msgstr "Erabiltzailea"
+
+#: ../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 "Harpidetu beste erabiltzaileen karpetan"
@@ -16056,20 +16834,20 @@ msgstr "Harpidetu beste erabiltzaileen karpetan"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-ren karpeta-zuhaitza"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "Kendu karpetaren harpidetza..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" karpetaren harpidetza kentzea nahi duzu?"
 
-#: ../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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
@@ -16134,15 +16912,18 @@ msgstr "Zure pasahitza 7 egunetan iraungituko da..."
 msgid "_Change Password"
 msgstr "_Aldatu pasahitza"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Baimena ukatuta)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Erabiltzaile denak:"
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Gehitu erabiltzailea"
 
@@ -16260,15 +17041,11 @@ msgstr "_Sentikortasuna:"
 msgid "_User"
 msgstr "_Erabiltzailea"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "erabiltzaile-botoia"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Hautatu erabiltzailea"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Helbide-liburua..."
 
@@ -16282,11 +17059,11 @@ msgstr "Harpidetu beste erabiltzaileen egutegira"
 
 #: ../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 ""
 "Exchange kontuaren eragiketa eta funzionalitate espezifikoen bilduma "
-"kudeatzeko plugin-a"
+"kudeatzeko plugina."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16375,10 +17152,16 @@ msgid "Could not update out-of-office state"
 msgstr "Ezin izan da 'bulegotik kanpo' egoera eguneratu"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution berrabiarazi egin behar da harpidetutako erabiltzailearen "
+"postontziak kargatzeko"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange kontua lineaz kanpo dago."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16405,32 +17188,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Huts egin du delegatuak eguneratzean"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Karpeta badago lehendik"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Karpeta ez dago"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Karpeta lineaz kanpo"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Errore generikoa"
 
-#: ../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 "Ezin da Katalogo Globalaren zerbitzariraino iritsi"
 
-#: ../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."
@@ -16438,72 +17221,71 @@ msgstr ""
 "OWA beste helbide batean exekutatzen ari bada, zehaztu kontuaren "
 "konfigurazioko elkarrizketa-koadroan."
 
-#: ../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 "{0}(r)en postontzia ez dago zerbitzari honetan."
 
-#: ../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 "Ziurtatu URLa zuzenda dela eta saiatu berriro."
 
-#: ../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 "Ziurtatu zerbitzari-izena ongi idatzita dagoela eta saiatu berriro."
 
-#: ../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 ""
-"Ziurtatu erabiltzaile-izena eta pasahitza zuzenak direla eta saiatu berriro."
+msgstr "Ziurtatu erabiltzaile-izena eta pasahitza zuzenak direla eta saiatu berriro."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Ez da Katalogo Globalaren zerbitzaririk konfiguratu kontuan."
 
-#: ../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 "Ezin dago {0}(r)en postontzirik {1}(e)n."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Ez dago {0} bezalako erabiltzailerik"
 
-#: ../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 "Pasahitza ongi aldatu da."
 
-#: ../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 "Sartu delegatuaren IDa edo desautatu 'Bidali delegatu gisa' aukera."
 
-#: ../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 "Ziurtatu Katalogo Globalaren zerbitzariaren izena ongi dagoela."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Berrabiatu Evolution aldaketek eragina izateko"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Hautatu erabiltzaile bat."
 
-#: ../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 "Zerbitzariak pasahitza ezetsi du ahulegia delako."
 
-#: ../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 "Exchange kontua desgaitu egingo da Evolution-etik irtetzean"
 
-#: ../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 "Exchange kontua kendu egingo da Evolution-etik irtetzean"
 
-#: ../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 "Exchange zerbitzaria ez da Exchange Konektatzailearekin bateragarria."
 
-#: ../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."
@@ -16512,7 +17294,7 @@ msgstr ""
 "Exchange Konektatzaileak Microsoft Exchange 2000 \n"
 "eta 2003 soilik onartzen ditu."
 
-#: ../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"
@@ -16525,39 +17307,40 @@ msgstr ""
 "\n"
 "Edo pasahitza gaizki idatziko zenuen."
 
-#: ../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 "Saiatu berriro beste pasahitz batekin."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Ezin da erabiltzailea sarbide-kontrol zerrendan gehitu:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Ezin dira ordezkariak editatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Errore ezezaguna {0} bilatzean"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Errore ezezaguna."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Mota ezezaguna"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Onartu gabeko eragiketa"
 
-#: ../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 "Zerbitzariko kuotaren mugara (posta gordetzeko) iristen ari zara."
 
-#: ../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."
@@ -16565,31 +17348,31 @@ msgstr ""
 "Delegatu baten izenean mezu bat bakarrik bidaltzeko baimena duzu aldi "
 "bakoitzeko."
 
-#: ../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 "Ezin duzu zure burua ordezkari gisa jarri"
 
-#: ../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 "Zerbitzariko zure (posta gordetzeko) kuota gainditu duzu."
 
-#: ../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 "Exchange kontu bakuna konfigura dezakezu soilik"
 
-#: ../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 "Erabilitakoa: {0}KB. Saiatu lekua egiten zenbait posta ezabatuz."
 
-#: ../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 "Erabilitakoa: {0}KB. Orain ezin izango duzu posta jaso edo bidali."
 
-#: ../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."
@@ -16597,19 +17380,19 @@ msgstr ""
 "Erabilitakoa: {0}KB. Ezin izango duzu posta jaso edo bidali lekua egin arte "
 "(zenbait posta ezabatuz)."
 
-#: ../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 "Pasahitza iraungitu da."
 
-#: ../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 "{0} ezin da gehitu sarbide-kontrol zerrendan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} jadanik delegatua da"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} jadanik zerrendan dago"
 
@@ -16621,6 +17404,14 @@ msgstr "Harpidetu beste erabiltzaileen zereginetara"
 msgid "Check folder permissions"
 msgstr "Begiratu karpetaren baimenak"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Kanpoko editore lehenetsia"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "Komando lehenetsia editore gisa erabiltzeko."
+
 #: ../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 "
@@ -16634,23 +17425,59 @@ msgstr ""
 msgid "External Editor"
 msgstr "Kanpoko editorea"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Ezin da sortu aldi baterako fitxategia"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Editorea ezin da abiarazi"
+
+#: ../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 ""
+"Evolution-ek ezin du aldi baterako fitxategia sortu zure posta gordetzeko. "
+"Saiatu beranduago."
+
+#: ../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 ""
+"Pluginen hobespenetan zehaztutako kanpoko editorea ezin da abiarazi. Saiatu "
+"beste editore batekin."
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Prestatu kanpoko editorean"
+msgid "Compose in _External Editor"
+msgstr "Prestatu _kanpoko editorean"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Idatzi mezuak kanpoko editore bat erabiliz"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr "Exekutatuko den komandoa (editorea abiarazteko):"
+
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Emacs-entzako erabili \"xemacs\"\n"
+"VI-rentzako erabili \"gvim\""
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Hautatu 700 byte tamaina baino txikiagoko (48*48) png bat"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG fitxategiak"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Aurpegia"
 
@@ -16688,27 +17515,62 @@ msgstr "Kendu karpeten harpidetza"
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Aurrenik sartu erabiltzaile-izena."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Sartu %s erabiltzailearen pasahitza harpidetutako egutegien zerrendak "
+"atzitzeko."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Ezin da daturik irakurri Google-ren zerbitzaritik.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "_Egutegia:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Eskuratu _zerrenda"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Zerbitzaria</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Goolgle-ren egutegia konfiguratzeko plugin-a."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Goolgle-ren egutegia eta kontaktuak konfiguratzeko plugina."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-ren iturburuak"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Egiaztapen-zerrenda"
 
 #: ../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-ko egutegien eta kontaktuen iturburua konfiguratzeko plugin-a."
+msgstr "Groupwise-ko egutegien eta kontaktuen iturburua konfiguratzeko plugin-a."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
@@ -16747,16 +17609,16 @@ msgstr "Instalatu karpeta partekatua"
 msgid "Shared Folder Installation"
 msgstr "Karpeta partekatuaren instalazioa"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Baztergarrien ezarpenak"
 
-#: ../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 "Posta baztergarrien ezarpenak"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Posta baztergarrien ezarpenak..."
 
@@ -16782,10 +17644,22 @@ msgid "_Junk List"
 msgstr "_Baztergarrien zerrenda"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Mezua zuzendu"
+
+#: ../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 ""
+"Mezua zuzentzeak hartzailearen postontzitik kenduko dela adierazten du. Ziur "
+"zaude hori egitea nahi duzula?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Mezua ongi zuzendu da"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Zuzendu mezua"
 
@@ -16793,12 +17667,6 @@ msgstr "Zuzendu mezua"
 msgid "Add Send Options to groupwise messages"
 msgstr "Gehitu Bidaltzeko aukerak Groupwise-ko mezuei"
 
-#: ../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"
-msgstr "Bidaltzeko aukerak"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Groupwise-ko kontuetako funtzioen plugin-a"
@@ -16807,7 +17675,74 @@ msgstr "Groupwise-ko kontuetako funtzioen plugin-a"
 msgid "Groupwise Features"
 msgstr "Groupwise-en funtzioak"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "Huts egin du mezua zuzentzean"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Zerbitzariak ez du baimentzen hautatutako mezua zuzentzea."
+
+#: ../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 "Erabiltzaile baliogabea"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Ezin zaio proxy-aren sarbidetza eman &quot;{0}&quot; erabiltzaileari"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "Zehaztu erabiltzailea"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "Jadanik eman dizkiozu proxy-aren baimenak erabiltzaile honi."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr "Baliozko erabiltzaile-izena zehaztu behar duzu proxy-aren baimenak emateko."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; izeneko kontua badago. Egiaztatu zure karpeten zuhaitza."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "Kontua badago lehendik ere"
+
+#: ../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 ""
+"Proxy-ko saio-hasierak &quot;{0}&quot; gisa ez du arrakastarik izan. "
+"Egiaztatu zure helb. elektronikoa eta saiatu berriro."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "Hau gertaera errepikakorra da"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "Nahi duzu hau onartzea?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Nahi duzu hau ukatzea?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Ezin duzu karpeta partekatu zehaztutako &quot;{0}&quot; erabiltzailearekin"
+
+#: ../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 "Erabiltzaile-izen bat zehaztu behar duzu zerrendari gehitzeko"
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Onartu behin-behinekoa"
 
@@ -16824,7 +17759,7 @@ msgid "Con_tacts..."
 msgstr "_Kontaktuak..."
 
 #: ../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 "Mezua"
 
@@ -16905,9 +17840,9 @@ msgstr "<b>Kontuaren izena</b>"
 msgid "Proxy Login"
 msgstr "Proxy-aren saio-hasiera"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16916,40 +17851,44 @@ msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
 #. 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:509
 msgid "_Proxy Login..."
 msgstr "_Proxy-aren saio-hasiera..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy fitxa eskuragarri egongo da kontua konektatutakoan soilik."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxy fitxa kontua gaitutakoan soilik egongo da eskuragarri."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Sartu erabiltzaileak eta ezarri baimenak"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Partekatutako _karpeta berria..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Jakinarazpen pertsonalizatua"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Gehitu   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Aldatu"
 
@@ -17014,11 +17953,11 @@ msgstr "Hula egutegi-iturburua konfiguratzeko plugin-a"
 msgid "Hula Account Setup"
 msgstr "Hula kontuaren konfigurazioa"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Goiburu pertsonalizatuak"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP goiburuak"
 
@@ -17072,28 +18011,28 @@ msgstr "IMAP-eko kontuetako funtzioen plugin-a"
 msgid "IMAP Features"
 msgstr "IMAP funtzioak"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Inportatu egutegira"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Inportatu zereginetara"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Inportatu ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Hautatu zeregin-zerrenda"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Hautatu egutegia"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Inportatu"
 
@@ -17131,13 +18070,13 @@ msgstr ""
 "Huts egin du iPod-a bilatzean. Evolution-ek ezin izan du iPod bat aurkitu "
 "berarekin sinkronizatzeko. iPod-a konektatu gabe edo itzalita egon daiteke."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar formatua (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Sinkronizatu hautatutako zeregina/zirkularra/egutegia/helbide-liburua Apple "
 "iPod-arekin"
@@ -17150,142 +18089,142 @@ msgstr "Sinkronizatu iPod-arekin"
 msgid "iPod Synchronization"
 msgstr "iPod sinkronizatzea"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Huts egin du '%s' egutegia kargatzean."
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' egutegiko hitzordu bat bilera honekin gatazka du."
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hitzordua '%s' egutegian aurkitu da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Ezin da egutegirik aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ezin da bilera hau egutegietan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Ezin da zeregin hau zereginen zerrendetan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Ezin da zirkular hau zirkularren zerrendetan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Hitzorduaren existitzen den bertsioa bilatzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Ezin da elementua analizatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ezin da bidali elementua '%s' egutegira. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Bidali '%s' egutegira onartuta bezala"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Bidali '%s' egutegira saialdi gisa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Bidali '%s' egutegira baztertua bezala"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' egutegira bertan behera utzita bezala bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Antolatzaileak %s delegatua kendu du"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Bertan behera uztearen mezua delegatuari bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ezin izan da bertan behera uztearen oharra delegatuari bidali"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Partaide-egoera ezin da eguneratu egoera baliogabea delako"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ezin da partaideak eguneratu. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Partaide-egoera eguneratu da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Bileraren informazioa bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Zereginaren informazioa bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Zirkularraren informazioa bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ezin da bileraren informazioa bidali. Bilera ez da existitzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ezin da zereginaren informazioa bidali. Zeregina ez da existitzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ezin da zirkularraren informazioa bidali. Zirkularra ez da existitzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Erantsitako egutegia ez da baliozkoa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Mezuak egutegi bat duela dio, baina egutegia ez da baliozko iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Egutegiko elementua ez da baliozkoa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17293,11 +18232,11 @@ msgstr ""
 "Mezuak egutegi bat du, baina egutegiak ez du gertaerarik, zereginik edo "
 "libre/okupatuta informaziorik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Erantsitako egutegiak hainbat elementu ditu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17319,213 +18258,213 @@ msgstr "Zirkular hau errepikatu egiten da"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Ezabatu mezua ekin ondoren"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Gatazka bilaketan"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Hautatu egutegiak bileren arteko gatazkak bilatzeko"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Gaur"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Gaur %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Gaur %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Gaur %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Bihar"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Bihar %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Bihar %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Bihar %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Bihar %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %Y %B %e"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %Y %B %e %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %Y/%B/%e %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr " %A, %Y %B %e, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %Y %B %d, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Erantzun <b>%s</b>(r)en izenean"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Jaso <b>%s</b>(r)en izenean"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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>(e)k %s(e)n bidez bileraren honako informazioa argitaratu du:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>(e)k bileraren honako informazioa argitaratu du:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>(e)k honako bilera zuri delegatu dizu:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b>(e)k %s(e)n bidez honako bilerarako deia egiten dizu:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>(e)k honako bilerarako deia egiten dizu:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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>(e)k %s(e)n bidez dagoen bilera batean sartu nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>(e)k dagoen bilera batean sartu nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17534,89 +18473,87 @@ msgstr ""
 "<b>%s</b>(e)k, %s(r)en bidez, honako bileraren informazio berria jaso nahi "
 "du:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b>(e)k honako bileraren informazio berria jaso nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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>(e)k, %s(r)en bidez, bilerari buruz honakoa erantzun du:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b>(e)k bilerari buruz honakoa erantzun du:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>(e)k %s(e)n bidez honako bilera bertan behera utzi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>(e)k honako bilera bertan behera utzi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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>(e)k, %s(r)en bidez, bileraren honako aldaketak aurkeztu ditu:"
+msgstr "<b>%s</b>(e)k, %s(r)en bidez, bileraren honako aldaketak aurkeztu ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b>(e)k bileraren honako aldaketak aurkeztu ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b>(e)k %s(e)n bidez bileraren honako aldaketak baztertu ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>(e)k bileraren honako aldaketak baztertu ditu."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>(e)k %s(e)n bidez honako zereginak argitaratu ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>(e)k honako zereginak argitaratu ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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>(e)k %s(r)en honako zeregin-esleipena eskatzen du:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>(e)k %s(e)n bidez zeregin batera esleitu zaitu:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>(e)k zeregin bat esleitu dizu:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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>(e)k %s(e)n bidez zeregin batean sartu nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17625,142 +18562,136 @@ msgstr ""
 "<b>%s</b>(e)k, %s(re)n bidez, honako zeregin-esleipenaren informazio berria "
 "jaso nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 ""
-"<b>%s</b>(e)k honako zeregin-esleipenaren informazio berria jaso nahi du:"
+msgstr "<b>%s</b>(e)k honako zeregin-esleipenaren informazio berria jaso nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b>(e)k, %s(re)n bidez, zeregin-esleipenari buruz honakoa erantzun du:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b>(e)k, %s(re)n bidez, zeregin-esleipenari buruz honakoa erantzun du:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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>(e)k zeregin-esleipenari buruz honakoa erantzun du:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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>(e)k %s(e)n bidez honako zeregin-esleipena bertan behera utzi du:"
+msgstr "<b>%s</b>(e)k %s(e)n bidez honako zeregin-esleipena bertan behera utzi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>(e)k honako zeregin-esleipena bertan behera utzi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b>(e)k, %s(re)n bidez, honako zeregin-esleipenaren aldaketak aurkeztu "
 "ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b>(e)k honako zeregin-esleipenaren aldaketak aurkeztu ditu:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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>(e)k %s(e)n bidez honako zeregin-esleipena baztertu du:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>(e)k honako zeregin-esleipena baztertu du:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>(e)k %s(e)n bidez honako zirkularra argitaratu du:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b>(e)k honako zirkularra argitaratu du:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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>(e)k %s(e)n bidez dagoen zirkular bati gehitzea nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b>(e)k dagoen zirkular bati gehitzea nahi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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>(e)k %s(e)n bidez partekatutako zirkular hau bertan behera utzi du:"
+msgstr "<b>%s</b>(e)k %s(e)n bidez partekatutako zirkular hau bertan behera utzi du:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>(e)k partekatutako zirkular hau bertan behera utzi du:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Ireki egutegia"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Ukatu"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Onartu"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Ukatu denak"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Behin-behinekoak denak"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Behin-behinekoa"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Onartu denak"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Bidali informazioa"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Eguneratu partaidearen egoera"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Eguneratu"
 
@@ -17825,10 +18756,8 @@ msgid "This meeting has been delegated"
 msgstr "Bilera hau delegatu egin da"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Erantzun hau ez da uneko partaide batena.  Bidaltzailea partaide gisa gehitu?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Erantzun hau ez da uneko partaide batena.  Bidaltzailea partaide gisa gehitu?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -17864,10 +18793,11 @@ msgstr "D-BUS mezua sortzen du mezu berri bat jasotzean."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"Egia bada 'biip' soinua joko du, bestela soinu-fitxategia erreproduzituko du "
-"mezu berria jasotzean."
+"\"true\" (egia) bada, 'biip' soinua joko du, bestela soinu-fitxategia "
+"erreproduzituko du mezu berria jasotzean."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17919,8 +18849,16 @@ msgstr "Mezu berrien jakinarazpena sarrerako ontzian soilik erakutsi ala ez."
 msgid "Generate a _D-Bus message"
 msgstr "Sortu _D-Bus mezua"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolution-en mezu-jakinarazpena"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "Mezu-jakinarazpenaren propietateak"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17935,55 +18873,55 @@ msgstr[1] ""
 "%d mezu berri jaso dituzu\n"
 "%s(e)n."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Mezu berri %d jaso duzu."
 msgstr[1] "%d mezu berri jaso dituzu."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Mezu berria"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Erakutsi ikonoa jakinarazpen-arean"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "Ikono _keinukaria jakinarazpen-arean"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Bistaratu _mezua ikonoarekin bat."
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Erreproduzitu soinua mezu berriak iristean."
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Soinu-seinalea"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Erreproduzitu _soinu-fitxategia"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Zehaztu _fitxategi-izena:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Hautatu soinu-fitxategia"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "E_rreproduzitu"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Jakinarazi _sarrerako ontziko mezu berriak soilik"
 
@@ -18014,12 +18952,12 @@ msgstr "_Bihurtu bileran"
 msgid "Mail to meeting"
 msgstr "Posta - Bilera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ezin da egutegia ireki. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18068,8 +19006,7 @@ msgid "Mailing _List"
 msgstr "Posta-_zerrenda"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Posta-zerrendako komandoen ekintzak eskaintzen ditu (harpidetu, kendu "
 "harpidetza,...)"
@@ -18131,7 +19068,7 @@ msgstr "Bidali mezua posta-zerrendara?"
 #: ../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 ""
@@ -18212,6 +19149,26 @@ msgstr "_Harpidetu zerrendan"
 msgid "_Unsubscribe from List"
 msgstr "_Kendu harpidetza zerrendatik"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Also mark messages in subfolders?"
+msgstr "Azpikarpetetako mezuak ere markatu?"
+
+#: ../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 ""
+"Uneko karpetako mezuak soilikm irakurritako gisa markatzea nahi duzu, edo "
+"uneko karpetan eta haren azpikarpeta guztietan ere bai?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+msgid "Current Folder and _Subfolders"
+msgstr "Uneko karpetan eta _azpikarpetetan"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "Uneko _karpetan soilik"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Markatu denak irakurrita bezala"
@@ -18254,7 +19211,7 @@ msgstr "Plugin-ak kudeatzeko (gaitzeko edo desgaitzeko) plugin-a"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Plugin-kudeatzailea"
 
@@ -18266,33 +19223,24 @@ msgstr "Gaitu eta desgaitu plugin-ak"
 msgid "_Plugins"
 msgstr "_Plugin-ak"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Egilea(k)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Azalpena"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Konfigurazioa"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Oharra: aldaketa batzuk ez dira aplikatuko berrabiatu arte"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Aurkezpen orokorra"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Konfigurazioa"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Plugin honek ez du konfigurazioko aukerarik."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Plugin-a"
 
@@ -18317,41 +19265,22 @@ msgstr "Testu soileko modua"
 msgid "Prefer plain-text"
 msgstr "Lehenetsi testu soila"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Erakutsi HTML egonez gero"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Hobetsi formaturik gabe"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Formaturik gabe bakarrik erakutsi"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "HTML _modua"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Eman aukera bat mezua prestatzeko leihotik mezua inprimatzeko."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Inprimatu mezua"
-
-#: ../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 "Inprimatzeko _aurrebista"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Mezua inprimatzen du"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution Profilatzailea"
@@ -18376,13 +19305,7 @@ msgstr "Helbideak"
 msgid "_Publish Calendar Information"
 msgstr "_Argitaratu egutegiaren informazioa"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Idatzi '%s' pasahitza"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Ziur zaude URL hau kendu nahi duzula?"
 
@@ -18470,17 +19393,77 @@ msgstr ""
 "iCal\n"
 "Libre/okupatuta"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Kaixo Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python-en pluginak kargatzeko probak"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python-en probako plugina"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python-en EPlugin kargatzailearen probako plugina."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Python-en garatutako plugin bat beste pluginak kargatzeko."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Python kargatzailea"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (inkorporatua)"
 
-#: ../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:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin ez da aurkitu. Kodea: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Huts egin du kanalizazioa sortzean: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Errorea sardetu  ondoren: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "SpamAssassin-en ume prozesuak ez du erantzuten. Hiltzen..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "Spamassassin-en ume prozesua eten arte itxoiten. Amaitzen..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "Huts egin du SpamAssasin-en kanalizazioak. Errorearen kodea: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin ez dago erabilgarri."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr ""
 "SpamAssassin fidagarritasun handiagoa edukitzea eragingo du, baita motelagoa "
 "izatea ere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "_Sartu urruneko probak"
 
@@ -18506,7 +19489,7 @@ msgstr "Eranskin guztiak edo mezuen zatiak aldi berean gordetzeko plugin-a"
 
 #. 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:314
 msgid "Save attachments"
 msgstr "Gorde eranskinak"
 
@@ -18518,16 +19501,15 @@ msgstr "Gorde eranskinak..."
 msgid "Save all attachments"
 msgstr "Gorde eranskin guztiak"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Hautatu oinarrizko izena gordetzeko"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME mota"
 
-#: ../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:347
 msgid "Save"
 msgstr "Gorde"
 
@@ -18535,79 +19517,79 @@ msgstr "Gorde"
 #. * 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:162
 msgid "%F %T"
 msgstr "%Y %B"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UIDa"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Azalpenen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Kategorien zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Iruzkinen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Sortuta"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Kontaktuen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Hasi"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Amaitu"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "Osatutako ehunekoa:"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URLa"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Partaideen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Aldatua"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV formatuaren aukera aurreratuak"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Gehitu goiburua aurrean"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Balioaren mugatzailea:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Erregistroaren mugatzailea:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Kapsulatu balioak:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Komaz bereiztutako balio formatua (.csv)"
 
@@ -18628,15 +19610,15 @@ msgstr "Gorde _diskoan"
 #. * 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:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF formatua (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Hautatu helburuko fitxategia"
 
@@ -18661,22 +19643,22 @@ msgid "Show _only this Task List"
 msgstr "_Erakutsi zeregin-zerrenda hau soilik"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Hasierako morroia kudeatzeko osagaia."
+msgid "Guides you through your initial account setup."
+msgstr "Hasierako kontua konfiguratzeko lagunduko zaitu."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Hasierako morroia"
+msgid "Setup Assistant"
+msgstr "Konfigurazioaren morroia"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18689,29 +19671,29 @@ msgstr ""
 "\n"
 "Jarraitzeko, egin klik \"Aurrera\" botoian. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Inportatu fitxategiak"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Datuak inportatzen."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Itxaron"
 
@@ -18728,19 +19710,64 @@ msgid "Thread messages by subject"
 msgstr "Sartu harian mezuak gaiaren arabera"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "_Itzuli mezuen harira gaiaren arabera"
 
+#: ../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 ""
+"Gakoa/balioa tuplen zerrenda txantiloien pluginarentzako mezuaren gorputzean "
+"ordezteko."
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "Titulurik ez"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Gorde _txantiloi gisa"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Gorde txantiloi gisa"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Zirriborroak (txantiloien pluginean oinarrituta)"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr ""
-"ytnef erabiltzen duen plugin bakuna tnef motako eranskinak dekodetzeko."
+msgstr "ytnef erabiltzen duen plugin bakuna tnef motako eranskinak dekodetzeko."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
 msgstr "TNEF eranskinen dekodetzailea"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV kontaktuak konfiguratzeko plugina."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV kontaktuak"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URLa:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Saihestu IfMatch (apache < 2.2.8 bertsioan behar da)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution-en shell-a"
@@ -18758,16 +19785,16 @@ msgid "Evolution Test component"
 msgstr "Evolution-en probaren osagaia"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Uneko inprimagailuaren ezarpenen azalpenaren katea."
+msgid "Authenticate proxy server connections"
+msgstr "Autentifikatu proxy zerbitzariaren konexioak"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "Konfigurazio-bertsioa"
+msgid "Automatic proxy configuration URL"
+msgstr "URLa proxy-a automatikoki konfigurateko"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Kraskatze-detekzioa exekutatu behar den edo ez erabakitzen du."
+msgid "Configuration version"
+msgstr "Konfigurazio-bertsioa"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18786,40 +19813,106 @@ msgid "Default window width"
 msgstr "Leihoaren zabalera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Proxy-aren ezarpenak gaitzen du HTTP/HTTP Segurua bidez sarbidetzean."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr "HTTP proxy-aren ostalari-izena"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr "HTTP proxy-aren pasahitza"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP proxy-aren ataka"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "HTTP proxy-aren erabiltzaile-izena"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Lehenespenez abioan erakutsi beharreko IDa edo aliasa."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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 ""
+"Egia (true) bada, autentifikatzea eskatuko da proxy zerbitzariarekin "
+"konektatzean. Erabiltzaile-izena \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf gakotik eskuratuko da, eta pasahitza gnome-"
+"keyring edo ~/.gnome2_private/Evolution pasahitzen fitxategitik."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Azken bertsio-berritutako konfigurazio-bertsioa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Lineaz kanpo erabiltzeko, diskora sinkronizatzeko karpeten bideen zerrenda"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Non-proxy hosts"
+msgstr "Ez-proxy ostalariak"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Pasahitza HTTP proxy-an autentifikatzean erabiltzeko."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Proxy configuration mode"
+msgstr "Proxy-aren konfigurazio modua"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "SOCKS proxy host name"
+msgstr "SOCKS proxy-aren ostalari-izena"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr "SOCKS proxy-aren ataka"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr "HTTP Seguruaren proxy-aren ostalari-izena"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr "HTTP Seguruaren proxy-aren ataka"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+"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 ""
-"Lineaz kanpo erabiltzeko, diskora sinkronizatzeko karpeten bideen zerrenda"
+"Hautatu proxy-aren konfigurazio modua. Onartutako balioak 0, 2 eta 3 dira "
+"(\"erabili sistemako ezarpenak\", \"proxy-rik ez\", \"erabili proxy-aren "
+"eskuzko konfigurazioa\" eta \"erabili auto-konfigurazioko urlak emandako "
+"proxy-aren konfigurazioa\" hurrenez hurren)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Albo-panela ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Saltatu garapen-abisuaren elkarrizketa-koadroa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "Saltatu berreskuratzeko abisuaren elkarrizketa-koadroa"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Egoera-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18827,19 +19920,19 @@ msgstr ""
 "Evolution-en konfigurazio-bertsioa, konfigurazio maila altuarekin/baxuarekin "
 "(\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Leiho nagusiaren altuera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Leiho nagusiaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Albo-panelaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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\")."
@@ -18847,7 +19940,43 @@ msgstr ""
 "Azken bertsio-berritutako Evolution-en konfigurazio-bertsioa, konfigurazio "
 "maila altuarekin/baxuarekin (\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr "Ordenagailuaren izena HTTP proxy-a egiteko."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Ordenagailuaren izena HTTP Seguruaren proxy-a egiteko."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr "Ordenagailuaren izena SOCKSen proxy-a egiteko."
+
+#: ../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 ""
+"\"/apps/evolution/shell/network_config/http_host\" fitxategian definitutako "
+"ordenagailuaren ataka proxy-a egiteko."
+
+#: ../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 ""
+"\"/apps/evolution/shell/network_config/secure_host\" fitxategian "
+"definitutako ordenagailuaren ataka proxy-a egiteko."
+
+#: ../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 ""
+"\"/apps/evolution/shell/network_config/socks_host\" fitxategian definitutako "
+"ordenagailuaren ataka proxy-a egiteko."
+
+#: ../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 "
@@ -18857,54 +19986,68 @@ msgstr ""
 "izan daiteke. \"Tresna-barra\" ezartzen bada botoien estiloa GNOMEko tresna-"
 "barraren ezarpenak zehaztuko du."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 ""
+"Gako honek zuzenean konektatuta dauden ostalarien zerrenda du, proxy-ak "
+"erabili ordez (aktibo egonez gero). Balioak ostalari-izenak, domeinuak "
+"(hasierako komodinak erabil daiteke *.pipo.com bezala), IP helbideak (bai "
+"IPv4 bai IPv6) eta sareko helbideak maskarekin (192.168.0.0/24 antzeko "
+"zerbait) izan daiteke."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Tresna-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "URL that provides proxy configuration values."
+msgstr "Proxy-aren konfigurazioko balioak eskaintzen dituen URLa."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr "Erabili HTTP proxy-a"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "Erabiltzaile-izena HTTP proxy-a egitean autentifikatzeko."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution lineaz kanpoko moduan abiarazi behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr "Kraskatze-detekzioa landu behar den ala ez"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Leihoa maximizatu behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Alboko panela ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Egoera-barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Tresna-barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Garapen-abisuaren elkarrizketa-koadroa saltatu behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Evolution berreskuratzean abisuaren elkarrizketa-koadroa saltatu behar den "
-"edo ez"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Leihoko botoiak ikusgai egongo diren edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Leihoko botoi-estiloa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Leihoko botoiak ikusgai daude"
 
@@ -18920,29 +20063,23 @@ msgstr "Konexio aktiboak"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Aukeratu inportatzailearen mota:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 "Aukeratu Evolution-era inportatu nahi duzun fitxategia, eta hautatu "
-"fitxategiaren mota zerrendan.\n"
-"\n"
-"Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
-"bideratzen."
+"fitxategiaren mota zerrendan."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Aukeratu helburua hau inportatzeko"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -18954,23 +20091,23 @@ msgstr ""
 "Ez du inportatzeko moduko ezarpenik aurkitu. Berriro saiatu\n"
 "nahi baduzu, sakatu \"Atzera\" botoia.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "_Fitxategi-izena:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "Fitxategi-_mota:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa _zaharretako datuak eta ezarpenak"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Inportatu fitxategi _bakarra"
 
@@ -18978,120 +20115,106 @@ msgstr "Inportatu fitxategi _bakarra"
 msgid "Evolution Preferences"
 msgstr "Evolution-en hobespenak"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Ez da karpeta-izenik zehaztu"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Karpeta-izenak ezin du Sartu (edo Itzulera) karaktererik eduki."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Karpeta-izenak ezin du \"/\" karaktererik eduki."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Karpeta-izenak ezin du \"#\" karaktererik eduki."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 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 "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy ez dago instalatuta."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution-en web gunea"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Errorea MEG (Maiz Egindako Galderak) gunea irekitzean."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan egiteko."
+"Evolution linean dago.\n"
+"Egin klik botoi honetan lineaz kanpo lan egiteko."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan egiteko."
+"Evolution lineaz kanpo dago.\n"
+"Egin klik botoi honetan linean lan egiteko."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Aldatu hona: %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Sistemako errore ezezaguna."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Ados"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
@@ -19101,22 +20224,17 @@ msgstr "Ez da aurkitu konfigurazioko datu-basea"
 msgid "New"
 msgstr "Berria"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Proba berria"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Probatu"
-
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Sortu probako elementu berria"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko. "
+msgstr "Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -19153,7 +20271,7 @@ msgstr ""
 "inportatzeko prozesuan zehar gidatuko zaitu."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19190,7 +20308,7 @@ msgstr ""
 "Gogor lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19198,67 +20316,43 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution taldea\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Ez esan berriro"
 
-#: ../shell/main.c:309
-msgid "Evolution Crash Detection"
-msgstr "Evolution kraskatze-detekzioa"
-
-#: ../shell/main.c:311
-msgid "Ig_nore"
-msgstr "_Ez ikusi egin"
-
-#: ../shell/main.c:326
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Badirudi Evolution azken aldiz erabili zenean ustegabean kraskatu zela.\n"
-"Babeseko neurrian oinarrituz, aurrebisten panel guztiak ezkutatu egingo "
-"dira.\n"
-"Aurrebisten panelak berreskura ditzakezu Ikusi menuan.\n"
-
-#: ../shell/main.c:337
-msgid "_Do not show this message again"
-msgstr "_Ez erakutsi mezu hau berriro."
-
-#: ../shell/main.c:569
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Abiarazi Evolution zehaztutako osagaia aktibatuz"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Behartu Evolution-en osagai guztiak ixtea"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Behartu Evolution 1.4etik migratzera"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Desgaitu edozein plugin kargatzea."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desgaitu mezuen, kontaktuen eta zereginen aurrebisten panela."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM  eta posta-bezeroa"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19401,7 +20495,7 @@ msgstr ""
 "\n"
 "Jarraitzea aukeratu baduzu, zenbait datu zahar ezingo dituzu erabili.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19412,7 +20506,7 @@ msgstr ""
 "\n"
 "Editatu fidagarritasun-ezarpenak:"
 
-#: ../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 "
@@ -19421,7 +20515,7 @@ msgstr ""
 "Ziurtagiria bidali duenaren ZEaz fidatzen zarenez, besterik esan ezean "
 "ziurtagiriaren autentifikazioaz fidatzen zara."
 
-#: ../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 "
@@ -19478,22 +20572,27 @@ msgstr "Helbide elektronikoa"
 msgid "All CA certificate files"
 msgstr "ZE ziurtagiri-fitxategi guztiak"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Ziurtagiri-ikustailea: %s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Idatzi '%s' pasahitza"
+
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Idatzi ziurtagirien datu-baseko pasahitz berria"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Idatzi pasahitz berria"
 
 #. 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"
@@ -19502,7 +20601,7 @@ msgstr ""
 "Honentzat jaulkia:\n"
 "  Gaia: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19511,7 +20610,7 @@ msgstr ""
 "Jaulkitzailea:\n"
 "  Gaia: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Hautatu ziurtagiria"
 
@@ -19661,8 +20760,7 @@ msgstr "Fidatu ziurtagiri-emaile honetaz posta-erabiltzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr ""
-"Fidatu ziurtagiri-emaile honetaz software-garatzaileak identifikatzeko."
+msgstr "Fidatu ziurtagiri-emaile honetaz software-garatzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
@@ -19681,15 +20779,12 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Identifikatzen zaituzten erakunde horien ziurtagiriak dituzu:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Ziurtagiri-emaileok identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "Ziurtagiri-emaileok identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"Pertsona hauek identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
+msgstr "Pertsona hauek identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -19700,7 +20795,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editatu ziurtagiri-emailearen fidagarritasuna"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Ziurtagiria badago lehendik"
 
@@ -19867,15 +20962,15 @@ msgstr "Subjektuaren ID esklusiboa"
 msgid "Certificate Signature Value"
 msgstr "Ziurtagiriaren sinaduraren balioa"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 fitxategiaren pasahitza"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Idatzi PKCS12 fitxategiaren pasahitza:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Inportatutako ziurtagiria"
 
@@ -19908,8 +21003,7 @@ msgstr "_Kopiatu kontaktu guztiak hemen..."
 msgid "Contact _Preview"
 msgstr "Kontaktuen _aurrebista"
 
-#: ../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 "Kopiatu"
@@ -19931,11 +21025,10 @@ msgid "Copy to Folder..."
 msgstr "Kopiatu karpeta honetan..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Sortu helbide-liburuen karpeta berria"
 
-#: ../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 "Ebaki"
@@ -19976,8 +21069,7 @@ msgstr "Eraman hautatutako karpetako kontaktuak beste karpeta batera"
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: ../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 "Itsatsi"
@@ -20014,13 +21106,11 @@ msgstr "Gorde hautatutako kontaktuak VCard gisa."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Gorde hautatutako karpetako kontaktuak VCard gisa."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Hautatu denak"
 
 #: ../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 "Hautatu _dena"
 
@@ -20089,7 +21179,7 @@ msgstr "E_raman kontaktua hona..."
 msgid "_Move Folder Contacts To"
 msgstr "E_raman kontaktuen karpeta hona"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Berria"
 
@@ -20150,7 +21240,7 @@ msgid "Month"
 msgstr "_Hilabetea"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -20159,7 +21249,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Aurrekoa"
 
@@ -20227,232 +21317,6 @@ msgstr "Lan-astea"
 msgid "_Open Appointment"
 msgstr "_Ireki hitzordua"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopiatu hautatutako testua arbelean"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Kopiatu hautapena arbelean"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Ebaki hautatutako testua arbelera"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Ebaki hautapena arbelean"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Itsatsi arbeletik"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Itsatsi testua arbeletik"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Hautatu testu osoa"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Erantsi"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Egin klik fitxategia eransteko"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Egin klik uneko leihoa ixteko"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Egin klik uneko leihoa gordetzeko"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Egin klik laguntza eskuragarria ikusteko"
-
-#.
-#. <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 "Itxi"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Txertatu"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Eranskina..."
-
-#: ../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 "It_xi"
-
-#: ../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:42
-msgid "_File"
-msgstr "_Fitxategia"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Laguntza"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "Au_kerak"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Egun osoko gertaera"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "_Egun osoko gertaera"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Klasifikatu konfidentzial gisa"
-
-#: ../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 "Klasifikatu pribatu gisa"
-
-#: ../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 "Klasifikatu publiko gisa"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Egin klik gertaera honen alarmak jartzeko edo kentzeko"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Txertatu bidaltzeko aukera aurreratuak"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Egin hau gertaera errepikakorra"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_Publikoa"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Kontsultatu libre/okupatutako informazioa partaideentzako"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "A_raua eremua"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Bidaltzeko _aukerak"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Erakutsi ordua lanpetuta gisa"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Ordu-_zona"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Partaide-mota eremua erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "RSVP eremua erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Araua eremua erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Egoera eremua erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Ordu-zona eremua erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Kategoriak erakusten edo ezkutatzen ditu"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Egun osoko gertaera erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Ordua lanpetuta gisa erakusten edo ezkutatzen du"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmak"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategoriak"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Sailkapena"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Konfidentziala"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Libre/okupatuta"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Pribatua"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Errepikapena"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Egoera eremua"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Mota eremua"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Bertan behera utzi uneko posta-eragiketa"
@@ -20482,7 +21346,6 @@ msgid "Empty _Trash"
 msgstr "Hustu _zakarrontzia"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Kar_peta"
 
@@ -20616,8 +21479,7 @@ msgid "Hide _Read Messages"
 msgstr "Ezkutatu _irakurritako mezuak"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ezkutatu ezabatutako mezuak, marratuta erakutsi beharrean"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -20700,7 +21562,7 @@ msgstr "Harian sartutako mezu-zerrenda"
 msgid "_Group By Threads"
 msgstr "_Elkartu harien arabera"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Mezua"
@@ -21035,129 +21897,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Erakutsi kurtsore keinukaria bistaratutako mezuen gorputzean"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Erakutsi mezuak estilo normalean"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Erakutsi mezuak posta-goiburu guztiekin"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Ez-garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_Txikiagotu"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Kurtsore _modua"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Ezabatu mezua"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Bilatu mezuan..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Joan hona"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Kargatu iru_diak"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Mezuaren iturburua"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Hurrengo mezua"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Tamaina normala"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "E_z-baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "Ireki leiho _berrian"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Aurreko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Irakurri"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Gorde mezua..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Berreskuratu mezua"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Irakurri gabea"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zooma"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Handiagotu"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Itxi leiho hau"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Itxi"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21195,290 +22053,6 @@ msgstr "Ikusi hautatutako zirkularra"
 msgid "_Open Memo"
 msgstr "_Ireki zirkularra"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Erantsi fitxategi bat"
-
-#.
-#. <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 "Itxi uneko fitxategia"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Ezabatu dena sinadura izan ezik"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Enkriptatu mezu hau PGPrekin"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_matua"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Lortu bidaltze-jakinarazpena mezu bat irakurtzean"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Txertatu bidaltzeko aukerak"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Ireki fitxategia"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP enkriptatzea"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP sinadura"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP _enkriptatzea"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP _sinadura"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "E_skatu irakurragiriak"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME e_nkriptatzea"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME enkriptatzea"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME s_inadura"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME sinadura"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "_Bidali"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Gorde honela"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Gorde zirriborroa"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Gorde hone_la..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Gorde _zirriborroa"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Gorde zirriborro gisa"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Gorde karpetan..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Gorde uneko fitxategia"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Gorde uneko fitxategia beste izen batekin"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Gorde mezua adierazitako karpetan"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Bidali"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Bidali mezua HTML formatuan"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Bidali mezu hau"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Ezarri mezuaren lehentasuna altuenera"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Sinatu mezu hau zure PGP gakoarekin"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Sinatu mezu hau zure S/MIME sinadura-ziurtagiriarekin"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "BCC eremua erakutsi edo ezkutatzen du"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "CC eremua erakutsi edo ezkutatzen du"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "'Nork' eremua erakutsi edo ezkutatzen du"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "''Bidali hona' eremua erakutsi edo ezkutatzen du"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "'Nori' eremua erakutsi edo ezkutatzen du"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Bcc eremua"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Cc eremua"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Ezaba_tu dena"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "'Nork' e_remua"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Ireki..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "'Bidali _hona' eremua"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Eman lehentasuna mezuari"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "'Erant_zun honi' eremua"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "Se_gurtasuna"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Bidaltzeko aukerak"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "'N_ori' eremua"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Itxi"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "_HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Gorde eta itxi"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Gorde eta _itxi"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Gorde uneko fitxategia eta itxi leihoa"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Gehitu karpeta harpidetutako karpeten zerrendan"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Freskatu zerrenda"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Freskatu karpeten zerrenda"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Kendu karpeta harpidetutako karpeten zerrendatik"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Harpidetu"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Harpidetza kendu"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Alderantzikatu hautapena"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Egin klik zereginaren egoeraren xehetasunak aldatzeko/ikusteko"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Egoeraren xehetasunak"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Ordu-zona"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Egoeraren xehetasunak"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopiatu hautatutako zereginak"
@@ -21549,8 +22123,7 @@ msgstr "Sortu karpeta hau erakusten duen leiho berri bat"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
+msgstr "Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -21673,50 +22246,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Erakutsi/Ezkutatu egoera-barra"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Lan egin lineaz _kanpo"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Itxi leihoa"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Ahaztu _pasahitzak"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Maiz Egindako Galderak"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Ezkutatu botoiak"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "_Ikonoak soilik"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Erreferentzia azkarra"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Irten"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Konmutadorearen itxura"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Sinkronizazio aukerak..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Testua soilik"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Leihoa"
 
@@ -21793,11 +22370,11 @@ msgid "With _Status"
 msgstr "Eg_oerarekin"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21814,8 +22391,8 @@ msgid "Select a Time Zone"
 msgstr "Hautatu ordu-zona"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Ordu-zonaren konbinazio-koadroa"
+msgid "Timezone drop-down combination box"
+msgstr "Ordu-zonaren goiti-beherako konbinazio-koadroa"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21827,19 +22404,19 @@ msgstr ""
 "ordu-zona.\n"
 "Erabili saguaren eskuineko botoia area txikiagotzeko."
 
-#: ../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 "Bilduma"
 
-#: ../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 "Definitu %s(r)en ikuspegiak..."
 
+#: ../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 "Definitu ikuspegiak"
 
@@ -21849,17 +22426,17 @@ msgid "Define Views for \"%s\""
 msgstr "Definitu \"%s\"(r)en ikuspegiak..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Taula"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instantzia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Gorde uneko ikuspegia"
 
@@ -21873,7 +22450,7 @@ msgstr "_Ordeztu dagoen ikuspegia"
 
 #. 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 "Ikuspegi pertsonalizatua"
 
@@ -21882,41 +22459,41 @@ msgid "Save Custom View"
 msgstr "Gorde ikuspegi pertsonalizatua"
 
 #: ../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 "Definitu ikuspegiak..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "_Uneko ikuspegia"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Hautatu ikuspegia: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Uneko ikuspegia ikuspegi pertsonalizatua da"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Gorde ikuspegi pertsonalizatua..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Gorde uneko ikuspegi pertsonalizatua"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Sortu edo editatu ikuspegiak"
 
 #
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrika"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definitu ikuspegi berria"
 
@@ -21932,17 +22509,17 @@ msgstr "Ikuspegi-mota"
 msgid "Type of view:"
 msgstr "Ikuspegi-mota:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Eranskin-barra"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ezin da %s fitxategia erantsi: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
@@ -21964,33 +22541,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Hileko egutegia"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Betetze-kolorea"
 
 #: ../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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 msgid "GDK fill color"
 msgstr "GDK betetze-kolorea"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Betetze-puntua"
 
@@ -22014,30 +22590,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "Gutxieneko zabalera"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "Gutxieneko zabalera"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Tartea"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Orain"
 
-#: ../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 "Ordua formatu honetan idatzi behar da: %s"
@@ -22046,152 +22622,150 @@ msgstr "Ordua formatu honetan idatzi behar da: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ehunekoaren balioak 0 eta 100 bitartekoa izan behar du (biak barne)."
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabiera"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltikoa"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europako Erdialdekoa"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Txinatarra"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Zirilikoa"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grekoa"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebrearra"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japoniarra"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korearra"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thailandiarra"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turkiarra"
 
-#: ../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 "Europako Mendebaldekoa"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Europako Mendebaldekoa, Berria"
 
-#: ../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 "Tradizionala"
 
-#: ../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 "Sinplifikatua"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrainarra"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Bisuala"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Karaktere ezezagunak: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Karaktere-kodeketa"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Adierazi erabili behar den karaktere-jokoa"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Besterik..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Data eta ordua"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Testu sarrera data txertatzeko"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Egin klik botoian egutegia erakusteko"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "Konbinazio-koadroa ordua hautatzeko"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "Goiti-beherako konbinazio-koadroa ordua hautatzeko"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Orain"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Gaur"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Baliogabeko data balioa"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Baliogabeko ordu balioa"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Zabalduta"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Zabaltzailea zabalduko den edo ez"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Zabaltzailearen etiketako testua"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Erabili azpimarra"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22199,106 +22773,114 @@ msgstr ""
 "Ezartzen bada, testuko azpimarrak adierazten du hurrengo karakterea tekla "
 "bizkortzaile mnemoteknikorako erabili behar dela."
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Etiketaren eta umearen artean jarri beharreko tartea"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Etiketa-trepeta"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Ohiko zabaltzaile-etiketaren ordez bistaratu beharreko trepeta"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Zabaltzailearen tamaina"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Zabaltzailearen geziaren tamaina"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Adierazlearen tartea"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Zabaltzailearen geziaren inguruko tartea"
 
 #. 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:748
+#: ../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 "Bilaketa aurreratua"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Bilaketak"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Bilaketak"
 
-#: ../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 "_Gorde bilaketa..."
 
-#: ../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 "_Editatu gordetako bilaketak..."
 
-#: ../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 "Bilaketa _aurreratua..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Kontu guztiak"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Uneko kontua"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Uneko karpeta"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Uneko mezua"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Aukeratu irudia"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Munduaren 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 ""
-"Saguan oinarritutako mapa interaktiboa ordu-zona hautatzeko. Teklatuarekin "
-"beheko konbinazio-koadroa erabil daiteke."
+"Saguan oinarritutako mapa elkareragilea ordu-zona hautatzeko. Teklatuarekin "
+"beheko goitibeherako konbinazio-koadroa erabil daiteke."
+
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "Linean"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "Botoiaren egoera linean dago"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sinkronizatu honekin:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sinkronizatu erregistro pribatuak:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Sinkronizatu kategoriak:"
 
@@ -22314,75 +22896,75 @@ msgstr "Ordezte-modeloa"
 msgid "Column width"
 msgstr "Zutabe-zabalera"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Egin klik bilaketa mota aldatzeko"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Bilatu orain"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Garbitu"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Elementuaren IDa"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Testua"
 
 #. 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "_Erakutsi: "
 
 #. 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "_Bilatu: "
 
 #. 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " hemen: "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Kurtsore-errenkada"
 
 #
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Kurtsore-zutabea"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Ordenatzailea"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Hautapen mota"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Kurtsore modua"
 
@@ -22410,10 +22992,6 @@ msgstr "<b>Egoeraren jarraipena</b>"
 msgid "A_uto-delete sent item"
 msgstr "Ezabatu automatikoki bidalitako elementua"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Sailkapena"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Sortu bidalitako elementua informazioaren jarraipena egiteko"
@@ -22494,44 +23072,45 @@ msgstr "O_ndoren:"
 msgid "_All information"
 msgstr "_Informazioa guztia"
 
-#: ../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 "_Atzeratu mezuen banaketa"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Banatuta"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Ezarri iraungitze-data"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "A_rte:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "_Komeni denean"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Irekitzean:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Egin klik hemen URLra joateko"
 
@@ -22551,7 +23130,7 @@ msgstr "Dauden _kategoriak:"
 msgid "categories"
 msgstr "kategoriak"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "Zerrenda laster-leihoan"
 
@@ -22571,25 +23150,25 @@ msgstr "Enfokatutako zutabea"
 msgid "Unselected Column"
 msgstr "Desautatutako zutabea"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Zutabe marratua"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Azpimarratu zutabea"
 
 #
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Zutabe lodia"
 
 #
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Zutabe koloreduna"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Atzeko planoaren koloreko zutabea"
 
@@ -22627,7 +23206,7 @@ msgid "A_vailable Fields:"
 msgstr "Dauden eremuak:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Gorantz"
 
@@ -22640,7 +23219,7 @@ msgid "Clear _All"
 msgstr "Garbitu _dena"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Beherantz"
 
@@ -22703,14 +23282,14 @@ msgstr "_Ordenatu..."
 #: ../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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD kodea"
 
 #: ../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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Goiburu osoak"
 
@@ -22730,304 +23309,305 @@ msgstr ""
 "Taulan zutabe bat gehitzeko arrastatu zutabea\n"
 "agertzea nahi duzun kokalekura."
 
-#: ../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 (elementu %d)"
 msgstr[1] "%s : %s (%d elementu)"
 
-#: ../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 (elementu %d)"
 msgstr[1] "%s (%d elementu)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Errenkada-kolore txandakatuak"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Marrazteko sareta horizontala"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Marrazteko sareta bertikala"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Marraztu fokua"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Kurtsore-modua"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Hautapen modeloa"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Luzera-muga"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Errenkada-altuera uniformea"
 
-#: ../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 "Izoztua"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Pertsonalizatu uneko ikuspegia"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Ordenatu g_orantz"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Ordenatu _beherantz"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "Ordenatu _gabe"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Elkartu _eremu honen arabera"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Taldekatu _koadroaren arabera"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Kendu _zutabe hau"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Gehitu z_utabea..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "_Lerrokadura"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Egokiena"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Eman formatu zu_tabeei..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "_Pertsonalizatu uneko ikuspegia..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Ordenatu honen arabera"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Pertsonalizatu"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Letra-tipoaren azalpena"
 
 #
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Ordenatu informazioa"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Zuhaitza"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Taulako goiburua"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Taulako eredua"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Kurtsore-zutabea"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Bilatu beti"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Erabili 'egin klik' gehitzeko"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Etree taulako egokitzailea"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Zahar itxura"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Marraztu marrak eta +/- zabaltzaileak."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Sarrerako metodoak"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Prozesadorearen gertaera"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Lodia"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Marratua"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ainguratu"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Justifikazioa"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Klip-zabalera"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Klip-altuera"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Klip-a"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Bete klip-aren laukizuzena"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X desplazamendua"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y desplazamendua"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Testuaren zabalera"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Testuaren altuera"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Erabili elipsia"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Elipsia"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Lerroa itzulbiratu"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Hautsi karaktereak"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Gehien. lerroak"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Marraztu ertzak"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Onartu lerro berriak"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Marraztu atzeko planoa"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Marraztu botoia"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Kurtsorearen posizioa"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "BM testuingurua"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Kudeatu laster-leihoa"
+
diff --git a/po/fi.po b/po/fi.po
index e3dcae0df4..6d375eb500 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,12 +8,12 @@
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sähköpostiohjelma. Saa ehdottaa nimeä.
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-14 16:46+0300\n"
+"POT-Creation-Date: 2008-08-27 12:12+0300\n"
 "PO-Revision-Date: 2008-08-13 15:30+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -29,12 +29,12 @@ msgid "evolution addressbook"
 msgstr "Evolutionin osoitekirja"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
@@ -679,24 +679,24 @@ msgstr "Henkilökohtainen"
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
@@ -746,7 +746,7 @@ msgid "Details"
 msgstr "Yksityiskohtaiset"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:982
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Etsitään"
 
@@ -860,7 +860,7 @@ msgstr "_Poista"
 
 #: ../addressbook/gui/component/addressbook-view.c:949
 #: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
@@ -888,7 +888,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:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1246,7 +1246,7 @@ msgstr "kortteja"
 #: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
 #: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minuutti"
@@ -1288,7 +1288,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:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1300,16 +1300,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:265
+#: ../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
 msgid "Contact"
 msgstr "Yhteystieto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -1350,7 +1350,7 @@ msgstr "Puhelin"
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1474,7 +1474,7 @@ msgstr "Osoite"
 #: ../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:293
+#: ../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
@@ -2473,7 +2473,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL pikaviestin"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2487,7 +2487,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu -pikaviestin"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2509,77 +2509,77 @@ msgid "Username"
 msgstr "Käyttäjätunnus"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Koti"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Vaaditut kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Muutettu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2587,23 +2587,23 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -2943,7 +2943,7 @@ msgid "Save as vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2999,7 +2999,7 @@ msgid "Cu_t"
 msgstr "_Leikkaa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../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
@@ -3388,7 +3388,6 @@ msgstr "Videokeskustelu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:805
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2451
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -4545,6 +4544,7 @@ msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:805
 #: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalenterit"
@@ -4634,7 +4634,7 @@ msgstr[1] "minuuttia"
 #: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
 #: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
@@ -4664,7 +4664,7 @@ msgid "Snooze _time:"
 msgstr "Torkkumisaika:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4705,7 +4705,7 @@ 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:1587
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "Varoitus"
 
@@ -5289,7 +5289,7 @@ msgstr "Poista vanhemmat tapahtumat kuin"
 #: ../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:717
+#: ../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"
@@ -5344,35 +5344,35 @@ msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 msgid "Calendar Source Selector"
 msgstr "Kalenterilähteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1619
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5618,7 +5618,7 @@ msgstr "Menetelmä ei ollut tuettu avattaessa kalenteria"
 msgid "Permission denied to open the calendar"
 msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -6125,14 +6125,14 @@ msgstr "(erääntyy "
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1771
+#: ../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
 #, c-format
 msgid "Attached message"
@@ -6140,227 +6140,227 @@ msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2058
+#: ../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
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2060
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../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
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "Sulje nykyinen ikkuna napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "_Kopioi valittu teksti leikepöydälle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "Napsauta tästä näyttääksesi ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "Liitä tekstiä leikepöydältä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "Tallenna nykyinen ikkuna napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1346
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "_Näytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 #: ../composer/e-composer-actions.c:472
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "Liitä tiedosta napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent Docu_ments"
 msgstr "Viimeisi_mmät asiakirjat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../calendar/gui/dialogs/comp-editor.c:1785
 #: ../composer/e-composer-actions.c:700
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> liite"
 msgstr[1] "<b>%d</b> liitettä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../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
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -6369,28 +6369,28 @@ msgstr "Näytä _liitepalkki"
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../calendar/gui/dialogs/comp-editor.c:2037
 #: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 #: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Näytä liitteet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Näytä tai piilota liitepalkki välilyönnillä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
@@ -7339,7 +7339,7 @@ msgstr "Aseta _taustaksi"
 msgid "_Save Selected"
 msgstr "Tallenna _valitut"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:837
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
@@ -8302,7 +8302,7 @@ msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2960
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8379,12 +8379,12 @@ msgstr "Ladataan tehtäviä %s"
 msgid "Loading memos at %s"
 msgstr "Ladataan muistilappuja lähteestä %s"
 
-#: ../calendar/gui/gnome-cal.c:2919
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: ../calendar/gui/gnome-cal.c:3873
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -8535,27 +8535,27 @@ msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 msgid "Memo Source Selector"
 msgstr "Muistilappujen lähteen valinta"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
@@ -8816,11 +8816,6 @@ msgstr "Ryhmät: %s"
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Tulevat tapaamiset"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
@@ -8851,27 +8846,27 @@ msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 msgid "Task Source Selector"
 msgstr "Tehtävien lähteen valinta"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
@@ -10750,7 +10745,7 @@ msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 msgid "Recent _Documents"
 msgstr "Viimeisimmät _asiakirjat"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
@@ -10939,7 +10934,7 @@ msgstr "_Jatka muokkausta"
 msgid "_Do not Recover"
 msgstr "Ä_lä palauta"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Palauta"
 
@@ -11049,6 +11044,10 @@ msgstr "Kirjoita tiedoston yli?"
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Evolutionin ohjetta ei voitu näyttää."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "Tärk_eä"
@@ -11395,7 +11394,7 @@ msgstr "määrittelemäsi aika"
 
 #: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "viikkoa"
@@ -11470,8 +11469,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:380
-#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Sähköposti"
@@ -11895,51 +11894,51 @@ msgstr "sitten"
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Viimeisimmät viestit"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../mail/em-folder-browser.c:1170
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../mail/em-folder-browser.c:1223
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Hae kaikilta tileiltä"
 
@@ -11965,7 +11964,7 @@ msgstr "Levytilan käyttö"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
@@ -12244,9 +12243,9 @@ msgstr "Suodata _postituslistan mukaan"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "Oletukset"
 
@@ -12816,7 +12815,7 @@ msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:858
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Lisää osoitekirjaan"
 
@@ -13841,134 +13840,134 @@ msgstr "Lisää suodatussääntö"
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, 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:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "Virhe"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "Virheet"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "Varoitukset ja virheet"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "Vianetsintä"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "Virheet, varoitukset ja vianetsintäviestit"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "Vianetsintäloki"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1736
 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:1745
+#: ../mail/mail-component.c:1752
 msgid "second(s)."
 msgstr "sekunnin ajan."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "Lokiviestit:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "Lokitustaso"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Aika"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
@@ -14543,7 +14542,7 @@ msgid "Use Authe_ntication"
 msgstr "Käytä _tunnistautumista"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../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:"
@@ -16257,7 +16256,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
 #: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Käytä _SSLää"
@@ -16280,7 +16279,7 @@ msgstr "Tarjoaa paikallisten kalenterien perustoiminnot."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
 #: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "Vi_rkistä:"
@@ -16389,7 +16388,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16421,15 +16420,15 @@ msgstr ""
 "Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
 "oletusvalinnaksi."
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr "Arvot"
@@ -16911,7 +16910,7 @@ msgid "Add User:"
 msgstr "Lisää käyttäjä:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/exchange-operations/exchange-send-options.c:408
 #: ../plugins/groupwise-features/proxy.c:934
 #: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
@@ -17199,7 +17198,7 @@ msgid "Folder offline"
 msgstr "Kansio on yhteydettömässä tilassa"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -17319,7 +17318,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Tuntematon virhe etsittäessä {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -17522,16 +17521,16 @@ msgstr "_Peru tilaus"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Syötä ensin käyttäjätunnus."
 
-#: ../plugins/google-account-setup/google-source.c:497
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Syötä salasana käyttäjälle %s tilattujen kalentereiden käyttöä varten."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17540,11 +17539,11 @@ msgstr ""
 "Ei voi lukea tietoja Googlen palvelimelta.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "_Kalenteri:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr "Nouda _luettelo"
 
@@ -19802,53 +19801,49 @@ msgid "Configuration version"
 msgstr "Konfiguraation versio"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Määrittää tulisiko kaatumisen havaitsemista suorittaa."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Sivupaneelin oletusleveys"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Ikkunan oletuskorkeus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Ikkunan oletustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Ikkunan oletusleveys"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Määrittää välipalvelinasetukset avattaessa HTTP- tai HTTPS-yhteyksiä "
 "verkkoon."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP-välipalvelimen salasana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP-välipalvelimen käyttäjätunnus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 tai alias käynnistyksessä oletuksena näytettävälle komponentille."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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/"
@@ -19860,46 +19855,46 @@ msgstr ""
 "authentication_user\" ja salasana haetaan joko gnome-keyring -avainrenkaasta "
 "tai tiedostosta ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Viimeksi päivitetty konfiguraation versio"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
 "yhteydettömään käyttöön"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Välipalvelimen ohittavat palvelimet"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-välipalvelimelle yhteyttä otettaessa käytettävä salasana."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Välipalvelimen asetustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Salatun HTTP-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Salatun HTTP-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -19911,27 +19906,23 @@ msgstr ""
 "\"aseta välipalvelin käsin\" ja \"käytä automaattimäärittelyn URL:issa "
 "annettua määrittelyä\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Ohita varoitus palautuksesta"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Tilarivi on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19939,19 +19930,19 @@ msgstr ""
 "Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
 "(esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Pääikkunan oletuskorkeus pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Pääikkunan oletusleveys pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -19959,19 +19950,19 @@ msgstr ""
 "Viimeisin päivitetty Evolutionin konfiguraatioversio, major/minor/"
 "configuration tasoilla (esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "Verkkonimi, jota käytetään HTTP-välipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Verkkonimi, jota käytetään HTTPS-välipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "Verkkonimi, jota käytetään SOCKS-välipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -19979,7 +19970,7 @@ msgstr ""
 "Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
 "network_config/http_host\" määriteltyä välipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -19987,7 +19978,7 @@ msgstr ""
 "Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
 "network_config/secure_host\" määriteltyä välipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -19995,7 +19986,7 @@ msgstr ""
 "Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
 "network_config/socks_host\" määriteltyä välipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20005,7 +19996,7 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
 "asetusta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20017,65 +20008,57 @@ msgstr ""
 "aluenimiä muodossa *.foo.com, IP-osoitteita (sekä IPv4 että IPv6) tai "
 "verkkopeitteitä (jotain tyyliin 192.168.0.0.24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Työkalupalkki on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "Välipalvelimen asetustietoja tarjoava URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Käytä HTTP-välipalvelinta"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-välipalvelimelle tunnistautumiseen käytetty käyttäjätunnus."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Käynnistetäänkö Evolution yhteydettömässä vai yhteydellisessä tilassa."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Suoritetaanko kaatumisen havaitseminen käynnistettäessä"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Onko ikkuna suurennettu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Näytetäänkö sivupaneeli."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Näytetäänkö tilarivi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Ohitetaanko evolutionin palautumisen varoitusikkuna."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Näytetäänkö ikkunan napit."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
@@ -20152,7 +20135,7 @@ msgstr "Evolutionin asetukset"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - evolution"
@@ -20207,7 +20190,7 @@ msgstr "_Yhteydetön tila"
 msgid "Work Offline"
 msgstr "Valitse yhteydetön tila"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20215,11 +20198,11 @@ msgstr ""
 "Evolution on yhteydellisessä tilassa.\n"
 "Siirry yhteydettömään tilaan napsauttamalla tästä."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirtyy yhteydettömään tilaan."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20227,47 +20210,47 @@ msgstr ""
 "Evolution on yhteydettömässä tilassa.\n"
 "Siirry yhteydelliseen tilaan napsauttamalla tästä."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Tuntematon järjestelmävirhe."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Virheellisiä argumentteja"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF:ia ei voidaan rekisteröidä"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei löytynyt"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Uusi"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Uusi testi"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Luo uusi testijuttu"
 
@@ -20310,7 +20293,7 @@ msgstr ""
 "Evolutionin käyttöön."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20346,7 +20329,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20354,66 +20337,43 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Evolutionin kaatumisen tunnistaminen"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Jätä _huomioimatta"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution näyttää kaatuneen viimeksi käytettäessä odottamatta. Kaikki\n"
-"esikatselupaneelit on piilotettu varotoimenpiteenä. Voit palauttaa\n"
-"esikatselunäkymät \"Näytä\"-valikosta.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "Älä _näytä tätä viestiä uudestaan"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tuo tiedot väkisin uudestaan Evolution 1.4:stä"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään liitännäisiä."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr ", sähköposti- ja ajanhallintaohjelma"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -22930,11 +22890,11 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen allaolevasta pudotusvalikosta."
 
-#: ../widgets/misc/e-online-button.c:112
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
 msgstr "Verkossa"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
 msgstr "Napin tila on verkossa"
 
@@ -23672,21 +23632,3 @@ msgstr "IM-konteksti"
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
-
-#~ msgid "Username:"
-#~ msgstr "Käyttäjätunnus:"
-
-#~ msgid "Update every"
-#~ msgstr "Päivitetään joka"
-
-#~ msgid "Migrating `%s':"
-#~ msgstr "Siirretään  \"%s\""
-
-#~ msgid "D_escription:"
-#~ msgstr "_Kuvaus:"
-
-#~ msgid "De_scription:"
-#~ msgstr "_Kuvaus:"
-
-#~ msgid "Updating query"
-#~ msgstr "Päivitetään kyselyä"
diff --git a/po/fr.po b/po/fr.po
index c2c7f864f9..bc595d10aa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -20,14 +20,15 @@
 # Claude Paroz <claude@2xlibre.net>, 2007-2008.
 # Myriam Malga <mmalga@redhat.com>, 2007.
 # Bruno Brouard <annoa.b@gmail.com>, 2008.
+# Yannick Tailliez <ytdispatch-libre@yahoo.com>, 2008.
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-24 21:44+0200\n"
-"PO-Revision-Date: 2008-07-24 21:42+0200\n"
+"POT-Creation-Date: 2008-09-06 12:09+0200\n"
+"PO-Revision-Date: 2008-09-06 12:10+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,16 +39,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "carnet d'adresses d'Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Nouveau contact"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
@@ -74,63 +75,63 @@ msgstr "Contact : "
 msgid "evolution minicard"
 msgstr "mini-carte d'Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Il possède des alarmes."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Il possède des récurrences."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "C'est une réunion."
 
-#: ../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 "Événement du calendrier : le résumé est %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 "Événement du calendrier : il n'a pas de résumé."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "vue des événements du calendrier"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Capturer le focus"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Nouvel événement toute la journée"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Aller à aujourd'hui"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Aller à la date"
 
-#: ../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 "un tableau pour consulter et sélectionner l'intervalle de temps actuel"
 
 #. 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."
@@ -139,14 +140,14 @@ msgstr[1] "Il possède %d événements."
 
 #. 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 "Il ne possède pas d'événements."
 
 #. 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 "Vue hebdomadaire de travail : %s. %s"
@@ -154,21 +155,21 @@ msgstr "Vue hebdomadaire de travail : %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 "Vue journalière : %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "vue du calendrier pour une semaine de travail"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -178,30 +179,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:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../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
 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:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -210,59 +211,59 @@ 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:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../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
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendrier de GNOME"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barre de recherche"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "barre de recherche du calendrier d'Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Bouton du saut"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Cliquez ici, vous pourrez trouver plus d'événements."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vue mensuelle : %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vue hebdomadaire : %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "vue du calendrier pour un mois"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "vue du calendrier pour une ou plusieurs semaines"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "popup"
 
 #. 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 "affiche un fils"
 
@@ -274,12 +275,12 @@ msgstr "modifier"
 msgid "begin editing this cell"
 msgstr "commence la modification de cette cellule"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "basculer"
 
 #. 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 "bascule la cellule"
 
@@ -299,55 +300,55 @@ msgstr "réduire"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "réduit la rangée du ETree contenant cette cellule"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Cellule de tableau"
 
-#: ../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 "cliquez pour ajouter"
 
-#: ../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 "clic"
 
-#: ../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 "tri"
 
-#: ../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 "Calendrier : du %s au %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "élément du calendrier d'Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Bouton déroulant"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Utiliser le défaut"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Menu contextuel"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Affiche/Masque la barre des pièces jointes"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "activer"
 
@@ -402,7 +403,7 @@ msgstr ""
 "Impossible d'obtenir les informations relatives au schéma du serveur LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Impossible de supprimer le carnet d'adresses."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -421,7 +422,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Supprimer le carnet d'adresses « {0} » ?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Erreur de chargement du carnet d'adresses."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -434,9 +435,9 @@ msgstr "L'authentification sur le serveur LDAP a échoué."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
-msgstr "La suppression du contact a échoué."
+msgstr "La suppression du contact a échoué"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
@@ -457,7 +458,7 @@ msgstr ""
 "correctement avec la version actuelle de votre serveur"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Le carnet d'adresses d'Evolution a quitté de façon inattendue."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -479,25 +480,25 @@ msgstr ""
 "prises en charge."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Ce carnet d'adresses sera définitivement supprimé."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Ce carnet d'adresses ne peut pas être ouvert."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 ""
-"Le serveur de carnet d'adresses n'a aucune des bases de recherche suggérées."
+"Ce serveur de carnet d'adresses n'a aucune des bases de recherche suggérées."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Il se peut que le serveur de carnet d'adresses soit injoignable, que le nom "
-"du serveur contienne une faute ou bien que votre réseau soit coupé."
+"du serveur contienne une faute ou que votre réseau soit coupé."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Ce carnet d'adresses sera définitivement supprimé."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
@@ -506,7 +507,7 @@ msgstr ""
 "LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -523,7 +524,7 @@ msgstr "Voulez-vous enregistrer les modifications ?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Vous essayez de déplacer un contact d'un carnet d'adresses vers un autre "
@@ -544,7 +545,7 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
-"Vous ne disposez pas des droits nécessaires pour supprimer un contact dans "
+"Vous ne disposez pas des droits nécessaires pour supprimer des contacts dans "
 "ce carnet d'adresses."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -562,7 +563,7 @@ msgstr ""
 "Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'aura "
 "pas été redémarré."
 
-#: ../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
@@ -585,7 +586,7 @@ msgstr "_Redimensionner"
 msgid "_Use as it is"
 msgstr "_Utiliser tel quel"
 
-#. 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."
+#. 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}"
@@ -602,7 +603,7 @@ msgstr "Adresse de synchronisation par défaut :"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Impossible de charger le carnet d'adresses"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -628,10 +629,10 @@ msgstr "Configurez la complétion automatique ici"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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-folder.c:582
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -641,7 +642,7 @@ msgstr "Carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address popup"
-msgstr "Fenêtre surgissante d'adresse du carnet d'adresses d'Evolution"
+msgstr "Menu contextuel d'adresse du carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -656,8 +657,8 @@ msgid "Evolution Address Book component"
 msgstr "Composant Carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Composant de gestion des certifications S/Mime d'Evolution"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Composant de gestion des certificats S/MIME d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -671,13 +672,13 @@ msgstr "Gérez vos certificats S/MIME ici"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../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:196 ../mail/em-folder-tree-model.c:200
+#: ../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:1456
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
@@ -690,10 +691,10 @@ msgstr "Sur cet ordinateur"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../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:205
+#: ../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 "Personnel"
@@ -704,96 +705,99 @@ msgstr "Personnel"
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
-msgstr "_Contacts"
+msgstr "_Contact"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Crée un nouveau contact"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Liste de contacts"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Crée une nouvelle liste de contacts"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "Carnet d'_adresses"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Crée un nouveau carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Échec lors de la mise à jour des paramètres ou des dossiers du carnet "
 "d'adresses."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Copier localement le contenu du _carnet pour les opérations hors ligne"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Général"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Détails"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:965
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
@@ -804,9 +808,9 @@ msgid "Migrating..."
 msgstr "Migration..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Migration de « %s » :"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -860,70 +864,76 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Enregistrer comme vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
+#: ../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
+#: ../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 "_Supprimer"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
-msgstr "_Propriétés..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Propriétés"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Sélecteur de source des contacts"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Saisissez le mot de passe pour %s (utilisateur %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
 
@@ -1027,74 +1037,79 @@ msgstr "Toujours"
 msgid "Anonymously"
 msgstr "Anonymement"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "Pa_rcourir ce carnet d'adresses jusqu'à ce que la limite soit atteinte"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Basique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nom distinctif"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Adresse électronique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution utilisera cette adresse électronique pour vous authentifier auprès "
 "du serveur."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Trouver les bases de recherche possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "Co_nnexion :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Jamais"
 
 #. 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:23
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sans chiffrement"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Un"
 
 #. 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:25
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Chiffrement SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtre de recherche"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Ba_se de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtre de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtre de recherche"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1104,7 +1119,7 @@ msgstr ""
 "celui-ci n'est pas modifié, la recherche par défaut sera effectuée sur la "
 "classe objet du type « personne »."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1112,7 +1127,7 @@ msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1120,7 +1135,7 @@ msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1130,23 +1145,23 @@ msgstr ""
 "SSL ni TLS. Cela signifie que votre connexion ne sera pas sécurisée et que "
 "vous serez vulnérable aux failles de sécurité."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sous"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de recherche prises en charge"
 
 #. 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:36
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Chiffrement TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1156,7 +1171,7 @@ msgstr ""
 "recherches devront débuter. Si vous ne renseignez pas ce champ, la recherche "
 "débutera à la racine de l'arborescence du dossier."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1168,7 +1183,7 @@ msgstr ""
 "les entrées sous la base de recherche. Un domaine de recherche « one » "
 "inclura les entrées se trouvant un niveau en dessous de la base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1176,7 +1191,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur LDAP. Par exemple, « ldap."
 "monentreprise.com »."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1184,7 +1199,7 @@ msgstr ""
 "Ceci représente le nombre maximum d'entrées à télécharger. Un nombre trop "
 "élevé ralentira l'accès à votre carnet d'adresses."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1194,7 +1209,7 @@ msgstr ""
 "Notez que spécifier « Adresse électronique » implique l'accès anonyme à votre "
 "serveur LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1202,7 +1217,7 @@ msgstr ""
 "Ceci représente le nom du serveur tel qu'il apparaîtra dans la liste des "
 "dossiers d'Evolution. Il est utilisé pour l'affichage uniquement."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1212,75 +1227,76 @@ msgstr ""
 "connecter. Une liste de ports standard est fournie. Demandez à votre "
 "administrateur système le port à utiliser."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Ajouter carnet d'adresses"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Trouver les bases de recherche possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Méthode d'identification :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Domain_e de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erveur :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Délai :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:401
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutes"
 
@@ -1321,7 +1337,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Bureau</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1333,16 +1349,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tégories..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1382,8 +1398,8 @@ msgstr "Téléphone"
 
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1408,9 +1424,9 @@ msgid "_Birthday:"
 msgstr "Date de _naissance :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "C_alendrier :"
 
@@ -1507,15 +1523,15 @@ msgstr "Adresse"
 #: ../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:293
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../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:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
 #: ../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-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
+#: ../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
 msgid "Editable"
@@ -2491,9 +2507,9 @@ msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
 #: ../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/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
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
@@ -2506,7 +2522,7 @@ msgid "AOL Instant Messenger"
 msgstr "Messagerie instantanée AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2520,7 +2536,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Messagerie Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2541,78 +2557,78 @@ msgstr "Emplacement"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domicile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Autre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Livre source"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Champs requis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Modifié"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Sélectionnez une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2620,23 +2636,23 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s « %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s « %s » est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
@@ -2794,7 +2810,7 @@ msgstr "_Service d'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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Emplacement :"
@@ -2804,7 +2820,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Membres</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 "Éditeur de liste de contacts"
 
@@ -2826,25 +2842,25 @@ msgstr ""
 "_Saisissez une adresse électronique ou déplacez un contact dans la liste ci-"
 "dessous :"
 
-#: ../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 "Membres de la liste de contacts"
 
-#: ../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 "_Membres"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Carnet"
 
-#: ../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 "Est une nouvelle liste"
 
@@ -2885,15 +2901,16 @@ msgstr ""
 "Le nom ou l'adresse électronique de ce contact existe déjà\n"
 "dans ce dossier. Voulez-vous quand même l'ajouter ?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Fusionner le contact"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Fusionner le contact"
+
+#: ../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
@@ -2904,14 +2921,14 @@ msgid "Email"
 msgstr "Adresse électronique"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
@@ -2931,10 +2948,10 @@ msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Requête"
 
@@ -2942,28 +2959,28 @@ msgstr "Requête"
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de l'affichage du carnet"
 
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../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
 msgid "Model"
 msgstr "Modèle"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "Le nom commence par"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2971,96 +2988,90 @@ msgstr "Source"
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Enregistrer comme vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
-#: ../calendar/gui/e-calendar-table.c:1566
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Enregistrer comme vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Faire suivre le contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Faire suivre les contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Envoyer un _message à la liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Envoyer un _message aux contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Copier vers le carnet d'_adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_Déplacer vers le carnet d'adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Couper"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../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 "Co_pier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "C_oller"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "Toutes les catégories"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Autre erreur"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3195,7 +3206,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 "Rôle"
 
@@ -3232,13 +3243,13 @@ msgstr "Site 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
+#: ../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-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-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
@@ -3248,12 +3259,12 @@ msgstr "Largeur"
 
 #: ../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
+#: ../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-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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
@@ -3282,11 +3293,11 @@ msgstr "Modèle de texte"
 msgid "Max field name length"
 msgstr "Longueur max. du nom du champ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Largeur des colonnes"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3296,7 +3307,7 @@ msgstr ""
 "\n"
 "Recherche des contacts..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3310,7 +3321,7 @@ msgstr ""
 "\n"
 "ou double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3324,7 +3335,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3334,7 +3345,7 @@ msgstr ""
 "\n"
 "Rechercher le contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3344,7 +3355,7 @@ msgstr ""
 "\n"
 "Il n'y a aucun élément à afficher dans cette vue."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adaptateur"
 
@@ -3369,16 +3380,16 @@ msgstr "Sélectionné"
 msgid "Has Cursor"
 msgstr "A le curseur"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message à..."
 
@@ -3422,23 +3433,22 @@ msgstr "Vidéo-conférence"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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-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 "Calendrier"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
 
@@ -3460,13 +3470,13 @@ msgid "Web Log"
 msgstr "Journal en ligne"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Date de naissance"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Anniversaire"
@@ -3525,7 +3535,7 @@ msgstr "Contact non trouvé"
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
-msgstr "L'ID du contact existe déjà."
+msgstr "L'ID du contact existe déjà"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
@@ -3539,7 +3549,7 @@ msgstr "Protocole non pris en charge"
 #: ../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:635 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Annulé"
 
@@ -3575,40 +3585,50 @@ msgstr "Aucun message correspondant"
 msgid "Not available in offline mode"
 msgstr "Non disponible en mode hors ligne"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Autre erreur"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Version du serveur non valide"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Méthode d'authentification non prise en charge"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 ""
-"Il est impossible d'ouvrir le carnet d'adresses. Cela signifie que le carnet "
-"n'est pas marqué pour une utilisation hors ligne ou ne peut pas encore être "
+"Il est impossible d'ouvrir ce carnet d'adresses. Cela signifie que ce carnet "
+"n'est pas marqué pour une utilisation hors ligne ou n'est pas encore "
 "téléchargé pour une consultation hors ligne. Veuillez charger ce carnet "
 "d'adresses une fois en mode connecté pour télécharger son contenu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "Impossible d'ouvrir ce carnet d'adresses. Vérifiez que le chemin %s existe "
 "et que vous avez les permissions pour y accéder."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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,20 +3638,24 @@ msgstr ""
 "utiliser LDAP dans Evolution, vous devez installer un paquet d'Evolution "
 "avec support LDAP activé."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
-"ou le serveur LDAP n'est pas accessible."
+"ou le serveur n'est pas accessible."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Détails de l'erreur :"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "Le nombre de cartes correspondant à cette requête dépasse la\n"
 "capacité de renvoi configurée pour le serveur ou la capacité\n"
@@ -3639,12 +3663,12 @@ msgstr ""
 "recherche ou augmenter le nombre maximum de résultats dans\n"
 "les préférences du serveur d'annuaires de ce carnet d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "Le temps nécessaire à l'exécution de la requête à dépassé le temps\n"
 "limite du serveur ou la limite que vous avez configurée pour ce carnet\n"
@@ -3652,49 +3676,49 @@ msgstr ""
 "temps dans les préférences du serveur d'annuaires de ce carnet \n"
 "d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Le moteur de traitement du carnet d'adresses n'a pas pu analyser cette "
 "requête."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Le moteur de traitement du carnet d'adresses a refusé d'effectuer cette "
 "requête."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Cette requête ne s'est pas terminée correctement."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Erreur lors de la modification du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3709,16 +3733,16 @@ msgstr[1] ""
 "L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres.\n"
 "Voulez-vous vraiment afficher ces contacts ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Ne pas afficher"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "Afficher _tous les contacts"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3727,70 +3751,70 @@ msgstr ""
 "%s existe déjà.\n"
 "Voulez-vous l'écraser ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Écraser"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacts"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Sélection du carnet d'adresses"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Déplacer le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Copier le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Déplacer les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "vCards multiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard pour %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Informations sur le contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informations sur le contact %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:297
 msgid "Querying Address Book..."
 msgstr "Interrogation du carnet d'adresses..."
 
@@ -3811,14 +3835,14 @@ msgid "Show Compact vCard"
 msgstr "Afficher partiellement la vCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Affichage de la carte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../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
@@ -3826,27 +3850,27 @@ msgstr "Affichage de la carte"
 msgid "Importing..."
 msgstr "Importation..."
 
-#: ../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 "Importateur Outlook CSV et 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 "Importateur Mozilla CSV et 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 "Importateur Evolution CSV et Tab"
 
@@ -3907,12 +3931,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../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:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "En-tête"
 
@@ -4014,8 +4038,8 @@ msgstr "Ombrage"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1055
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Taille :"
@@ -4033,7 +4057,7 @@ msgid "Top:"
 msgstr "Haut :"
 
 #: ../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 "Type :"
 
@@ -4045,37 +4069,37 @@ msgstr "Largeur :"
 msgid "_Font..."
 msgstr "_Police..."
 
-#: ../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 "Test de l'éditeur de style d'impression de contacts"
 
-#: ../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 "Copyright (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 ""
 "Ceci devrait tester le composant graphique d'éditeur de style pour "
 "l'impression de contacts"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Test d'impression de contact"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Ceci devrait tester le code d'impression des contacts"
 
-#: ../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 "Impossible d'ouvrir le fichier"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Impossible d'obtenir la liste des carnets d'adresses"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4091,7 +4115,7 @@ msgid "OUTPUTFILE"
 msgstr "FICHIERSORTIE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Liste des dossiers locaux de carnet d'adresses"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4258,19 +4282,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Voulez-vous vraiment supprimer ce rendez-vous ?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Voulez-vous vraiment supprimer cette réunion ?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Voulez-vous vraiment supprimer ce mémo ?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Voulez-vous vraiment supprimer cette tâche ?"
@@ -4530,11 +4554,11 @@ msgstr ""
 "redémarré."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Enregistrer"
 
@@ -4543,7 +4567,7 @@ msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../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 "_Envoyer"
@@ -4572,18 +4596,17 @@ msgstr "Impossible de démarrer evolution-data-server"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1629
 #: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"Impossible de lire les données de l'application « Calendrier » du pilot."
+msgstr "Impossible de lire les données de l'application « Calendrier » du pilot"
 
 #: ../calendar/conduits/memo/memo-conduit.c:914
 #: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
-msgstr "Impossible de lire les données de l'application « Mémo » du pilot."
+msgstr "Impossible de lire les données de l'application « Mémo » du pilot"
 
 #: ../calendar/conduits/memo/memo-conduit.c:961
 #: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
-msgstr "Impossible d'écrire les données de l'application « Mémo » du pilot."
+msgstr "Impossible d'écrire les données de l'application « Mémo » du pilot"
 
 #: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
@@ -4592,20 +4615,21 @@ msgstr "Priorité par défaut :"
 #: ../calendar/conduits/todo/todo-conduit.c:1102
 #: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
-msgstr "Impossible de lire les données de l'application « À faire » du pilot."
+msgstr "Impossible de lire les données de l'application « À faire » du pilot"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1147
 #: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
-msgstr "Impossible d'écrire les données de l'application « À faire » du pilot."
+msgstr "Impossible d'écrire les données de l'application « À faire » du pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tâches"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendriers"
 
@@ -4649,24 +4673,24 @@ msgstr "Mémo_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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../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
 msgid "Memos"
 msgstr "Mémos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/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
+#: ../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 "Tâches"
@@ -4684,19 +4708,20 @@ msgstr "_Tâches"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Service de notification d'alarme du calendrier d'Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../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:402
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "heure"
@@ -4713,10 +4738,10 @@ msgstr "Rendez-vous"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Lieu :"
 
@@ -4725,14 +4750,14 @@ msgid "Snooze _time:"
 msgstr "_Durée du report :"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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
 #: ../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:41
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "É_dition"
@@ -4745,32 +4770,32 @@ msgstr "_Reporter"
 msgid "location of appointment"
 msgstr "lieu du rendez-vous"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Aucun résumé disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Aucune information sur le lieu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarmes sont présentes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
-#: ../mail/mail-component.c:1585
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4783,7 +4808,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4800,7 +4825,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger à propos de ce programme."
 
@@ -4816,13 +4841,13 @@ msgstr ""
 "Impossible de créer la fabrique de services de notification d'alarme, peut-"
 "être qu'elle fonctionne déjà..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "Heure non valide"
 
 #. 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:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4830,8 +4855,8 @@ msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/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:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4841,8 +4866,8 @@ msgstr[1] "%d minutes"
 #. 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:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5101,12 +5126,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Afficher le champ état dans l'éditeur d'événement/tâche/réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Afficher le panneau « Aperçu »"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Afficher le panneau « Aperçu »."
 
@@ -5158,7 +5183,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Heure à laquelle la dernière alarme a été lancée, en time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
@@ -5245,25 +5270,25 @@ msgstr ""
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ RSVP dans l'éditeur d'événement/tâche/"
-"réunion."
+"réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ catégories dans l'éditeur d'événement/"
-"tâche/réunion."
+"tâche/réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ rôle dans l'éditeur d'événement/tâche/"
-"réunion."
+"réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ état dans l'éditeur d'événement/tâche/"
-"réunion."
+"réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -5275,13 +5300,13 @@ msgstr ""
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ fuseau horaire dans l'éditeur "
-"d'événement/tâche/réunion."
+"d'événement/tâche/réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ type dans l'éditeur d'événement/tâche/"
-"réunion."
+"réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
@@ -5318,56 +5343,56 @@ msgstr "Minute à laquelle les jours ouvrés commencent"
 msgid "daylight savings time"
 msgstr "ajustement de l'heure d'été"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "La catégorie est"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "L'emplacement contient"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Différent"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Tâches des 7 prochains jours"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Tâches actuelles"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Tâches en retard"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Tâches terminées"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tâches avec des pièces jointes"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
@@ -5395,7 +5420,8 @@ msgstr "Nettoyer les événements plus vieux que"
 #: ../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:403
+#: ../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 "jours"
@@ -5404,59 +5430,51 @@ msgstr "jours"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../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:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Sur le Web"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Météo"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2090
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Propriétés"
-
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Échec de la mise à jour des calendriers."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir le calendrier « %s » pour créer des événements et des "
 "réunions"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Il n'y a pas de calendrier disponible pour créer des événements et des "
 "réunions"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Sélecteur de source de calendrier"
 
@@ -5465,6 +5483,7 @@ msgid "New appointment"
 msgstr "Nouveau rendez-vous"
 
 #: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
@@ -5477,6 +5496,7 @@ msgid "New meeting"
 msgstr "Nouvelle réunion"
 
 #: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Réunion"
 
@@ -5489,6 +5509,7 @@ msgid "New all day appointment"
 msgstr "Nouveau rendez-vous toute la journée"
 
 #: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Rendez-vous toute la _journée"
 
@@ -5501,6 +5522,7 @@ msgid "New calendar"
 msgstr "Nouveau calendrier"
 
 #: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Calendrier"
 
@@ -5508,19 +5530,19 @@ msgstr "_Calendrier"
 msgid "Create a new calendar"
 msgstr "Crée un nouveau calendrier"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Vue journalière"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Vue hebdomadaire de travail"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Vue hebdomadaire"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Vue mensuelle"
 
@@ -5560,15 +5582,15 @@ msgstr "Classification"
 msgid "Competition"
 msgstr "Compétition"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../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/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Confidentiel"
 
 #: ../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 "Description"
@@ -5653,20 +5675,20 @@ msgstr "Organisateur"
 msgid "Phone Calls"
 msgstr "Appels téléphoniques"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../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/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privé"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+#: ../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
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "Récurrence"
 
@@ -5688,7 +5710,7 @@ msgstr "Stratégies"
 #: ../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 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/tasktypes.xml.h:40
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Summary"
 msgstr "Résumé"
@@ -5748,13 +5770,13 @@ msgstr "Méthode non prise en charge pour l'ouverture du calendrier"
 
 #: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
-msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier."
+msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Éditer l'alarme"
 
@@ -5858,7 +5880,6 @@ msgid "hour(s)"
 msgstr "heure(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -5866,7 +5887,7 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "Début du rendez-vous"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Action/Activation"
 
@@ -5880,12 +5901,12 @@ msgstr "A_jouter"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggérer l'affichage automatique de la pièce jointe"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
@@ -5995,7 +6016,7 @@ msgstr ""
 "Dimanche"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
@@ -6048,7 +6069,7 @@ msgid "Thursday"
 msgstr "Jeudi"
 
 #: ../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 "Fuseau _horaire :"
 
@@ -6144,403 +6165,403 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu du calendrier pour les opérations hors ligne"
 
-#: ../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 ""
 "_Copier localement le contenu de la liste des tâches pour les opérations "
 "hors ligne"
 
-#: ../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 ""
 "_Copier localement le contenu de la liste des mémos pour les opérations hors "
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Couleu_r :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Propriétés de la liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Nouvelle liste de tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Propriétés de la liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nouvelle liste de mémos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Cet événement a été supprimé."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Cette tâche a été supprimée."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Ce mémo a été supprimé."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Vous avez effectué des modifications. Voulez-vous les annuler et fermer "
 "l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 "%s  Vous n'avez effectué aucune modification. Voulez-vous fermer l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Cet événement a été modifié."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Cette tâche a été modifiée."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Ce mémo a été modifié."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vous avez effectué des modifications. Voulez-vous les annuler et mettre "
 "à jour l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 "%s  Vous n'avez effectué aucune modification. Voulez-vous mettre à jour "
 "l'éditeur ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erreur de validation : %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " À "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Message joint - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Message joint"
 msgstr[1] "%d messages joints"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Déplacer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Annuler le _déplacement"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../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:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "Réunion - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tâche attribuée - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "Mémo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "Aucun résumé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "Cliquez ici pour fermer la fenêtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "Copie le texte sélectionné dans le presse-papiers"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "Coupe le texte sélectionné vers le presse-papiers"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "Cliquez ici pour voir l'aide disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "Colle le texte depuis le presse-papiers"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "Cliquez ici pour enregistrer la fenêtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "Sélectionne tout le texte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "C_lassification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "I_nsertion"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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:54
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "Cliquez ici pour joindre un fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "_Catégories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "L'état indique si les catégories sont affichées"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "Fu_seau horaire"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "L'état indique si le champ Fuseau horaire est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "Classer comme public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "_Privé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "Classer comme privé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_Confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "Classer comme confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "Champ _Rôle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "L'état indique si le champ Rôle est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "L'état indique si le champ RSVP est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "Champ _État"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "L'état indique si le champ État est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "Champ _Type"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "L'état indique si le champ Type de participant est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent Docu_ments"
 msgstr "Docu_ments récents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Joindre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> pièce jointe"
 msgstr[1] "<b>%d</b> pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Masquer la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Afficher la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "_Enlever"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "A_jouter une pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Afficher les pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Appuyez sur la barre espace pour basculer la barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les modifications effectuées sur cet élément peuvent être annulées en cas de "
 "réception d'une mise à jour"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelle !"
 
@@ -6556,68 +6577,67 @@ msgstr "Impossible d'ouvrir la destination"
 msgid "Destination is read only"
 msgstr "La destination est en lecture seule"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Supprimer cet élément de toutes les autres boîtes à lettres des "
 "destinataires ?"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
-msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA."
+msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
-msgstr "Impossible de supprimer la tâche à cause d'une erreur CORBA."
+msgstr "Impossible de supprimer la tâche à cause d'une erreur CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
-msgstr "Impossible de supprimer le mémo à cause d'une erreur CORBA."
+msgstr "Impossible de supprimer le mémo à cause d'une erreur CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
-msgstr "Impossible de supprimer l'élément à cause d'une erreur CORBA."
+msgstr "Impossible de supprimer l'élément à cause d'une erreur CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
-"Impossible de supprimer l'événement à cause de permissions insuffisantes."
+"Impossible de supprimer l'événement à cause de permissions insuffisantes"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
-msgstr "Impossible de supprimer la tâche à cause de permissions insuffisantes."
+msgstr "Impossible de supprimer la tâche à cause de permissions insuffisantes"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
-msgstr "Impossible de supprimer le mémo à cause de permissions insuffisantes."
+msgstr "Impossible de supprimer le mémo à cause de permissions insuffisantes"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
-msgstr ""
-"Impossible de supprimer l'élément à cause de permissions insuffisantes."
+msgstr "Impossible de supprimer l'élément à cause de permissions insuffisantes"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
-msgstr "Impossible de supprimer l'événement à cause d'une erreur."
+msgstr "Impossible de supprimer l'événement à cause d'une erreur"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
-msgstr "Impossible de supprimer la tâche à cause d'une erreur."
+msgstr "Impossible de supprimer la tâche à cause d'une erreur"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
-msgstr "Impossible de supprimer le mémo à cause d'une erreur."
+msgstr "Impossible de supprimer le mémo à cause d'une erreur"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
-msgstr "Impossible de supprimer l'élément à cause d'une erreur."
+msgstr "Impossible de supprimer l'élément à cause d'une erreur"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Contacts..."
 
 #: ../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 "Déléguer à :"
 
@@ -6625,182 +6645,182 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "Cliquez ici pour définir ou annuler les alarmes de cet événement"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "_Récurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "Transforme en événement récurrent"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Options d'envoi"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Insère les options avancées d'envoi"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "Toute la _journée"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "L'état indique si défini comme « Événement toute la journée »"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "Afficher la période comme _occupée"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "L'état indique si la période est affichée comme occupée"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "_Libre/Occupé"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr ""
 "Interroge les personnes attendues sur leur disponibilité (libre/occupé)"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Cet événement possède des alarmes"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganisateur :"
 
-#: ../calendar/gui/dialogs/event-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Délégués"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Participa_nts"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Événement sans date de début"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Événement sans date de fin"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
-msgstr "La date de début est erronée."
+msgstr "La date de début est erronée"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
-msgstr "La date de fin est erronée."
+msgstr "La date de fin est erronée"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
-msgstr "L'heure de début est erronée."
+msgstr "L'heure de début est erronée"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
-msgstr "L'heure de fin est erronée."
+msgstr "L'heure de fin est erronée"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Ajouter "
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vous intervenez pour le compte de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d jour avant le rendez-vous"
 msgstr[1] "%d jours avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d heure avant le rendez-vous"
 msgstr[1] "%d heures avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute avant le rendez-vous"
 msgstr[1] "%d minutes avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personnaliser"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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:943
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Aucune"
 
@@ -6825,23 +6845,25 @@ msgid "Custom Alarm:"
 msgstr "Alarme personnalisée :"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Description :"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
-msgstr "Description de l'événement :"
+msgstr "Description de l'événement"
 
-#: ../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 "_Résumé :"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarme"
 
+#: ../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 "_Description :"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Heure :"
@@ -6877,7 +6899,7 @@ msgstr "Co_ntacts..."
 msgid "Organizer:"
 msgstr "Organisateur :"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Mémo"
 
@@ -6888,7 +6910,7 @@ msgstr "Impossible d'ouvrir les mémos dans « %s »."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "À"
@@ -6902,10 +6924,6 @@ msgstr "Date de _début :"
 msgid "T_o:"
 msgstr "_À :"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Description :"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -7127,12 +7145,12 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "année(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 "La date d'achèvement est erronée."
+msgstr "La date d'achèvement est erronée"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Page Web"
 
@@ -7151,17 +7169,17 @@ msgstr "<span weight=\"bold\">État</span>"
 #: ../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:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:642 ../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:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Achevée"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Haute"
 
@@ -7171,21 +7189,21 @@ msgstr "Haute"
 #: ../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:633 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "En cours"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Basse"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "Normale"
 
@@ -7194,7 +7212,7 @@ msgstr "Normale"
 #: ../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:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non démarrée"
@@ -7208,7 +7226,7 @@ msgid "Stat_us:"
 msgstr "É_tat :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -7225,25 +7243,24 @@ msgstr "_Priorité :"
 msgid "_Web Page:"
 msgstr "Page _Web :"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Détails de l'é_tat"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Cliquer pour modifier ou afficher les détails de l'état de la tâche"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "Options d'_envoi"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Tâche"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Détails de la tâche"
 
@@ -7270,17 +7287,13 @@ msgid "Categor_ies..."
 msgstr "Ca_tégories..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scription :"
+msgid "D_ue date:"
+msgstr "_Date d'échéance :"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fuseau horaire :"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Date d'échéance :"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7358,13 +7371,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Sans titre"
 
@@ -7402,7 +7415,7 @@ msgstr "Date d'échéance :"
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "État :"
 
@@ -7419,13 +7432,13 @@ msgstr "Date de fin"
 msgid "Start Date"
 msgstr "Date de début"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Occupé"
@@ -7440,7 +7453,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7448,7 +7461,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Oui"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7456,51 +7469,51 @@ msgid "No"
 msgstr "Non"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-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:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../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
+#: ../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 "Inconnu"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Récurrent"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Attribué"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Choisir le dossier où enregistrer les pièces jointes sélectionnées..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "image_sansnom.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
@@ -7508,157 +7521,157 @@ msgstr "Définir comme _arrière-plan"
 msgid "_Save Selected"
 msgstr "_Enregistrer la sélection"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:338
 msgid "* No Summary *"
 msgstr "* Aucun résumé *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:366
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisateur : %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:369
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisateur : %s"
 
-#: ../calendar/gui/e-calendar-table.c:400
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "Start: "
 msgstr "Début : "
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "Due: "
 msgstr "Échéance : "
 
-#: ../calendar/gui/e-calendar-table.c:581
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:582
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:583
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:584
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:587
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: ../calendar/gui/e-calendar-table.c:1155
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: ../calendar/gui/e-calendar-table.c:1340
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../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:277
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-calendar-table.c:1563
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Nouvelle _tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
-#: ../calendar/gui/e-calendar-table.c:1569
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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_uper"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../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 "C_oller"
 
-#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Attribuer une tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marquer les tâches sélectionnées comme incomplètes"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: ../calendar/gui/e-calendar-table.c:1826
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -7690,108 +7703,108 @@ msgstr "Priorité"
 msgid "Start date"
 msgstr "Date de début"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Déplacement d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Copie d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Nouveau re_ndez-vous..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Nouvel évén_ement toute la journée"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nouvelle _réunion"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "Vue a_ctive"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Sélectionner au_jourd'hui"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Sélectionner une date..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le c_alendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "Déléguer une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Répondre à _tous"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _déplaçable"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Heure : %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:115
 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:118
 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:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7804,7 +7817,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:587
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
@@ -7815,20 +7828,20 @@ msgstr "%02i divisions par minute"
 #. 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:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../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
 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:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
@@ -7924,12 +7937,12 @@ msgstr "Erreur 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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
@@ -7946,12 +7959,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Accepté"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
@@ -7959,7 +7972,7 @@ msgstr "Accepté provisoirement"
 #: ../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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Refusé"
 
@@ -8145,7 +8158,7 @@ msgstr "Message Libre/Occupé incorrect"
 
 #: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
-msgstr "Le message ne semble pas être correctement rempli."
+msgstr "Le message ne semble pas être correctement rempli"
 
 #: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
@@ -8153,12 +8166,12 @@ msgstr "Le message ne contient que des requêtes non prises en charge."
 
 #: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
-msgstr "La pièce jointe ne contient pas d'information de calendrier valide."
+msgstr "La pièce jointe ne contient pas d'information de calendrier valide"
 
 #: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr ""
-"La pièce jointe ne contient pas d'information de calendrier visualisable."
+"La pièce jointe ne contient pas d'information de calendrier visualisable"
 
 #: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
@@ -8184,7 +8197,7 @@ msgid "Attendee status updated\n"
 msgstr "État du participant mis à jour\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "L'état du participant ne peut pas être mis à jour car l'élément n'existe plus"
@@ -8206,7 +8219,7 @@ msgid "Update"
 msgstr "Mettre à jour"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Accepter"
 
@@ -8215,7 +8228,7 @@ msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Refuser"
 
@@ -8282,49 +8295,49 @@ msgstr "Participants"
 
 #: ../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:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individuel"
 
 #: ../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:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Groupe"
 
 #: ../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:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../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:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Salle"
 
 #: ../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:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Président"
 
 #: ../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:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Participant attendu"
 
 #: ../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:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: ../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:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Non participant"
 
@@ -8343,7 +8356,7 @@ msgstr "Provisoire"
 #: ../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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Délégué"
 
@@ -8364,7 +8377,7 @@ msgstr "En cours"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
 #: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
@@ -8373,14 +8386,14 @@ msgstr "%A %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel-item.c:476
 #: ../calendar/gui/e-meeting-time-sel.c:2153
 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:480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -8481,7 +8494,7 @@ msgid "Click to add a memo"
 msgstr "Cliquez ici pour ajouter un mémo"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8520,54 +8533,50 @@ msgstr "Achèvement des tâches..."
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Sélectionner un fuseau horaire"
 
 #. 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:1637
+#: ../calendar/gui/e-week-view-main-item.c:347 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "Mise à jour de la requête"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Vue _personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Enregistrer la vue personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Définir les vues..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Chargement des mémos à %s"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Nettoyage"
 
@@ -8634,7 +8643,7 @@ msgstr "Un organisateur doit être défini."
 
 #: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
-msgstr "Au moins un participant est nécessaire."
+msgstr "Au moins un participant est nécessaire"
 
 #: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
@@ -8681,40 +8690,40 @@ msgstr "Information iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Nouvelle liste des mémos"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d mémo"
 msgstr[1] "%d mémos"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d sélectionné"
 msgstr[1] ", %d sélectionnés"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "La mise à jour des mémos a échoué."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste des mémos « %s » pour créer des événements et "
 "des réunions"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Il n'y a pas de calendrier disponible pour créer des mémos"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Sélecteur de source de mémos"
 
@@ -8723,6 +8732,7 @@ msgid "New memo"
 msgstr "Nouveau mémo"
 
 #: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "Mém_o"
 
@@ -8735,6 +8745,7 @@ msgid "New shared memo"
 msgstr "Nouveau mémo partagé"
 
 #: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Mémo _partagé"
 
@@ -8747,6 +8758,7 @@ msgid "New memo list"
 msgstr "Nouvelle liste de mémos"
 
 #: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "L_iste de mémos"
 
@@ -8754,13 +8766,13 @@ msgstr "L_iste de mémos"
 msgid "Create a new memo list"
 msgstr "Crée une nouvelle liste de mémos"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Imprimer les mémos"
 
 #: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days'"
-msgstr "Prochains 7 jours"
+msgid "Next 7 Days"
+msgstr "Sept prochains jours"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
@@ -8807,9 +8819,9 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Impossible de migrer les tâches « %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 "Notes"
 
@@ -8966,84 +8978,79 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tâche"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Participants : "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorité : %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage effectué : %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Catégories : %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contacts : "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Prochains rendez-vous"
-
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tâche"
 msgstr[1] "%d tâches"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "La mise à jour des tâches a échoué."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste de tâches « %s » pour créer des événements et "
 "des réunions"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Il n'y a pas de calendrier disponible pour créer des tâches"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Sélecteur de source de tâche"
 
@@ -9051,6 +9058,11 @@ msgstr "Sélecteur de source de tâche"
 msgid "New task"
 msgstr "Nouvelle tâche"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tâche"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crée une nouvelle tâche"
@@ -9060,6 +9072,7 @@ msgid "New assigned task"
 msgstr "Nouvelle tâche attribuée"
 
 #: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tâche _attribuée"
 
@@ -9072,6 +9085,7 @@ msgid "New task list"
 msgstr "Nouvelle liste de tâches"
 
 #: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "_Liste de tâches"
 
@@ -9091,7 +9105,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ne plus poser la question."
 
@@ -9126,7 +9140,7 @@ msgstr "Rendez-vous et réunions"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Ouverture du calendrier"
 
@@ -9159,1532 +9173,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Assistant d'importation intelligent du calendrier 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:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrique/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrique/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrique/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrique/Alger"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Afrique/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Afrique/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Afrique/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Afrique/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrique/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrique/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrique/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrique/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrique/Caire"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrique/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrique/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrique/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Afrique/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrique/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Afrique/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Afrique/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Afrique/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Afrique/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Afrique/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Afrique/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Afrique/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Afrique/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Afrique/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Afrique/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Afrique/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Afrique/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Afrique/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Afrique/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Afrique/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Afrique/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Afrique/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Afrique/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Afrique/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Afrique/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Afrique/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Afrique/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Afrique/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Afrique/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Afrique/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Afrique/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Afrique/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Afrique/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Afrique/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Afrique/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Afrique/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Afrique/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Afrique/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Afrique/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Amérique/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Amérique/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Amérique/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amérique/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Amérique/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Amérique/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Amérique/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Amérique/Barbade"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Amérique/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Amérique/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Amérique/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Amerique/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Amérique/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Amérique/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Amérique/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Amérique/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Amérique/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Amérique/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Amérique/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Amérique/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Amérique/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Amérique/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Amérique/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Amérique/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Amérique/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Amérique/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Amérique/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Amérique/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Amérique/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Amérique/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Amérique/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Amérique/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Amérique/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Amérique/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Amérique/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Amérique/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Amérique/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Amérique/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Amérique/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Amérique/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Amérique/Grenade"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Amérique/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Amérique/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Amérique/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Amérique/Guyane"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Amérique/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
-msgstr "Amérique/La_Havane"
+msgstr "Amérique/La Havane"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Amérique/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Amérique/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amérique/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amérique/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amérique/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amérique/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Amérique/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Amérique/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Amérique/Jamaïque"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Amérique/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Amérique/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Amérique/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Amérique/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
-msgstr "Amérique/La_Paz"
+msgstr "Amérique/La Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Amérique/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
-msgstr "Amérique/Los_Angeles"
+msgstr "Amérique/Los Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Amérique/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Amérique/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Amérique/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Amérique/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Amérique/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Amérique/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Amérique/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Amérique/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Amérique/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Amérique/Mexico"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amérique/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amérique/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Amérique/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Amérique/Montréal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Amérique/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Amérique/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
-msgstr "Amérique/New_York"
+msgstr "Amérique/New York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Amérique/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Amérique/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Amérique/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Amérique/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Amérique/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Amérique/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Amérique/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Amérique/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Amérique/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
-msgstr "Amérique/Port_of_Spain"
+msgstr "Amérique/Port of Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
-msgstr "Amérique/Porto_Velho"
+msgstr "Amérique/Porto Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
-msgstr "Amérique/Puerto_Rico"
+msgstr "Amérique/Puerto Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
-msgstr "Amérique/Rainy_River"
+msgstr "Amérique/Rainy River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
-msgstr "Amérique/Rankin_Inlet"
+msgstr "Amérique/Rankin Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Amérique/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Amérique/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Amérique/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Amérique/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Amérique/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Amérique/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Amérique/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Amérique/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Amérique/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Amérique/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Amérique/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Amérique/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Amérique/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Amérique/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Amérique/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Amérique/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Amérique/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Amérique/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Amérique/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Amérique/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Amérique/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Amérique/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Amérique/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Amérique/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Amérique/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarctique/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarctique/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctique/DumontDurville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarctique/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarctique/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarctique/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarctique/South_Pole"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarctique/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarctique/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arctique/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asie/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asie/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asie/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asie/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asie/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asie/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asie/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asie/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asie/Barhain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asie/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asie/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asie/Beyrouth"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asie/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asie/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asie/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asie/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asie/Chungqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asie/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asie/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asie/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asie/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asie/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asie/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asie/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asie/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asie/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asie/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asie/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asie/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asie/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asie/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asie/Jérusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asie/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asie/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asie/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asie/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asie/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asie/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asie/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asie/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asie/Koweït"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asie/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asie/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asie/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asie/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asie/Manille"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asie/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asie/Nicosie"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asie/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asie/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asie/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asie/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asie/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asie/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asie/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asie/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asie/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asie/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asie/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asie/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asie/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asie/Séoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asie/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asie/Singapour"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asie/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asie/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asie/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asie/Téhéran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asie/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asie/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asie/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asie/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asie/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asie/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asie/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asie/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asie/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asie/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantique/Açores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantique/Bermudes"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantique/Canaries"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantique/Cap-Vert"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantique/Féroé"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantique/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantique/Madère"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantique/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantique/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantique/Sainte_Hélène"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantique/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australie/Adélaïde"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australie/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australie/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australie/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australie/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australie/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australie/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australie/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australie/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australie/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europe/Andorre"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europe/Athènes"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europe/Bruxelles"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhague"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbonne"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europe/Londres"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europe/Malte"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europe/Moscou"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europe/Saint_Marin"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europe/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europe/Vienne"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europe/Varsovie"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indian/Tananarive"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indian/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indian/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indian/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indian/Comores"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indian/Réunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacifique/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacifique/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacifique/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacifique/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacifique/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacifique/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacifique/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacifique/Fidji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacifique/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacifique/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacifique/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifique/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacifique/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacifique/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacifique/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacifique/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacifique/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacifique/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacifique/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacifique/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacifique/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacifique/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacifique/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacifique/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacifique/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifique/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacifique/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacifique/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacifique/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifique/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacifique/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacifique/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacifique/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacifique/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacifique/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacifique/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacifique/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacifique/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
@@ -10704,186 +10737,186 @@ msgstr "Insertion d'une pièce jointe"
 msgid "A_ttach"
 msgstr "_Joindre"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "Message sans sujet"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: ../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 "_Fermer"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Ferme le fichier actuel"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../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 "_Aperçu avant impression"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Enregistre le fichier actuel"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Enregistre le fichier actuel avec un nom différent"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Enregistrer le _brouillon"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Enregistre comme brouillon"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "E_nvoyer"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Envoie ce message"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Insére les options d'envoi"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
 msgstr "Nouveau _message"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
 msgstr "Ouvre la fenêtre Nouveau message"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "_Codage des caractères"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "Séc_urité"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "_Chiffrer avec PGP"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Chiffre ce message avec PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "_Signer avec PGP"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Signe ce message avec votre clé PGP"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Prioriser le message"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Affecte une priorité élevée au message"
 
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "D_emander un accusé de lecture"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Obtenir un avertissement quand votre message est lu"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "C_hiffrer avec 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 "Chiffre ce message avec votre certificat de chiffrement S/MIME"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "S_igner avec 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 "Signe ce message avec votre certificat de signature S/MIME"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "Champ Cc_i"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Indique si le champ Cci est affiché"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "Champ _Cc"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Indique si le champ Cc est affiché"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "Champ _De"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Indique si le champ De est affiché"
 
 # voir les toggles au dessus !
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "Champ En_voyé à"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Indique si le champ Envoyé à est affiché"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Champ _Répondre à"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Indique si le champ Répondre à est affiché"
 
-#: ../composer/e-composer-actions.c:649
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "Champ _Sujet"
 
-#: ../composer/e-composer-actions.c:651
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Indique si le champ Sujet est affiché"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "Champ _À"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Indique si le champ À est affiché"
 
@@ -10935,19 +10968,19 @@ msgstr "_Sujet :"
 msgid "Si_gnature:"
 msgstr "Si_gnature :"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Destination d'envoi"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Choisissez les dossiers auxquels envoyer ce message."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 
@@ -10955,18 +10988,18 @@ msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 msgid "Recent _Documents"
 msgstr "_Documents récents"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Afficher la barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossible de signer le message sortant : aucun certificat de signature "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10974,23 +11007,23 @@ msgstr ""
 "Impossible de chiffrer le message sortant : aucun certificat de chiffrement "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Pièce jointe"
 msgstr[1] "Pièces jointes"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Masquer la barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Rédaction d'un message"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11144,17 +11177,21 @@ msgstr "Vous ne pouvez pas joindre le fichier « {0} » à ce message."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Vous devez configurer un compte avant de pouvoir rédiger un courriel."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continuer l'édition"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Ne pas récupérer"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Récupérer"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Enregistrer le message"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Enregistrer le _brouillon"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
@@ -11199,17 +11236,17 @@ msgstr "Requête d'Evolution"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erreur interne, erreur inconnue « %s » demandée"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Composant"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "Nom du composant en cours de journalisation"
 
 #: ../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/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Activé"
@@ -11218,17 +11255,17 @@ msgstr "Activé"
 msgid "Whether the plugin is enabled"
 msgstr "Indique si le greffon est activé"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Erreur durant l'impression"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "Le système d'impression a rapporté les informations suivantes sur cette "
 "erreur :"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -11263,6 +11300,10 @@ msgstr "Écraser le fichier ?"
 msgid "_Overwrite"
 msgstr "É_craser"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Impossible d'afficher l'aide d'Evolution."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportant"
@@ -11308,8 +11349,8 @@ msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr ""
-"Ce nom d'étiquette est déjà utilisé sur ce serveur. Veuillez choisir un "
-"autre nom d'étiquette."
+"Une étiquette possédant le même libellé existe déjà sur le serveur. Veuillez "
+"renommer cette étiquette."
 
 #: ../e-util/gconf-bridge.c:1218
 #, c-format
@@ -11445,56 +11486,56 @@ msgstr "Choisissez un fichier"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:851
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nom de la _règle :"
 
-#: ../filter/filter-rule.c:879
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Chercher les éléments qui correspondent aux critères suivants"
 
-#: ../filter/filter-rule.c:913
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "A_jouter un critère au filtre"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Si tous les critères sont remplis"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Si un des critères est rempli"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Trouver les éléments :"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Tous ceux relatifs"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Réponses"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Réponses et parents"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Pas de réponse ou parent"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_nclure les fils de discussion"
 
-#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -11608,7 +11649,8 @@ msgstr "une date que vous spécifiez"
 
 #: ../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:404
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "semaines"
 
@@ -11637,17 +11679,17 @@ msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configurez ici, les préférences de message, incluant les paramètres de "
-"sécurité et l'affichage."
+"sécurité et l'affichage"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Configurez ici la correction orthographique, les signatures, et l'éditeur de "
-"messages."
+"messages"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr "Configurez ici vos comptes de messagerie."
+msgstr "Configurez ici vos comptes de messagerie"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your network connection settings here"
@@ -11679,12 +11721,12 @@ msgstr "Préférences de la messagerie d'Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Evolution Network configuration control"
-msgstr "Configuration réseau d'Evolution"
+msgstr "Composant de configuration réseau d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../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:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:758
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Courriel"
@@ -11725,13 +11767,13 @@ msgstr ""
 "affiché ci-dessous pour « %s »\n"
 "et cochez la case pour l'accepter\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
 #: ../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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Générée automatiquement"
 
@@ -11743,47 +11785,47 @@ msgstr "Demander à chaque message"
 msgid "Identity"
 msgstr "Identité"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Réception du courriel"
 
 # Toutes les n minutes (Stéphane)
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Vérifier les _nouveaux messages toutes les"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sécurité"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Recherche de nouveaux messages"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Éditeur de comptes"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
@@ -11817,18 +11859,18 @@ msgstr "Ajouter un script de signature"
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11836,7 +11878,7 @@ msgstr ""
 "Le ${WeekdayName} ${Day} ${MonthName} ${Year} à ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} a écrit :"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- Message initial --------"
 
@@ -11851,11 +11893,11 @@ msgstr "Ajuster le score"
 
 #: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
-msgstr "Attribuer une couleur"
+msgstr "Attribuer la couleur"
 
 #: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
-msgstr "Attribuer un score"
+msgstr "Attribuer le score"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
@@ -12007,9 +12049,10 @@ msgstr "Le message n'est pas un pourriel"
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
+# Il s'agit d'une "pipeline" au sens unix : "|"
 #: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
-msgstr "Canal d'accès au programme"
+msgstr "Transfert vers le programme"
 
 #: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
@@ -12059,7 +12102,7 @@ msgstr "Expéditeur"
 
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
-msgstr "Définir l'étiquette"
+msgstr "Mettre l'étiquette"
 
 #: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
@@ -12089,9 +12132,9 @@ msgstr "débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:318
+#: ../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
 msgid "Subject"
@@ -12099,69 +12142,69 @@ msgstr "Sujet"
 
 #: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
-msgstr "État non défini"
+msgstr "Retirer l'état"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Alors"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Ajouter une ac_tion"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Créer un dossier de _recherche à partir d'une recherche..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Tous les messages"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Aucune étiquette"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Messages lus"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Messages récents"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Messages des 5 derniers jours"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Messages avec une pièce jointe"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Messages importants"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
 # Vérifier cette traduction dans l'interface
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Rechercher un compte"
 
 # Vérifier cette traduction dans l'interface
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Rechercher tous les comptes"
 
 #. 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] "Messages non lus :"
@@ -12169,17 +12212,32 @@ msgstr[1] "Messages non lus :"
 
 #. 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] "Total des messages :"
 msgstr[1] "Total des messages :"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Utilisation de votre quota (%s) :"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
-msgstr "Consommation de quotas"
+msgstr "Utilisation de votre quota"
 
-#: ../mail/em-folder-properties.c:385
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propriétés du dossier"
@@ -12207,27 +12265,19 @@ msgstr "Dossiers de recherche"
 msgid "UNMATCHED"
 msgstr "CORRESPONDPAS"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Brouillons"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Envoyés"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -12246,309 +12296,315 @@ msgstr "Chargement..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:371
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Arborescence des courriels"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Impossible de déposer le ou les messages dans le stockage de haut niveau"
 
-#: ../mail/em-folder-tree.c:994 ../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 "_Copier vers le dossier"
 
-#: ../mail/em-folder-tree.c:995 ../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 "_Déplacer vers le dossier"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Déplacer..."
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Ac_tualiser"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Vi_der la boîte d'envoi"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copie de « %s » vers « %s »"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
+#: ../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
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opier"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Création du dossier « %s »"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Création d'un dossier"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Précisez l'emplacement de création du dossier :"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Impossible de supprimer le courriel"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 "Vous ne disposez pas des droits nécessaires pour supprimer ce courriel."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../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 "_Faire suivre"
 
 #. 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:1342 ../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 "É_diter comme un nouveau message..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Déplacer vers le dossier..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marquer comme non im_portant"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marquer comme _pourriel"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _pourriel"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marquer pour _donner suite..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "É_tiquette"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Aucun"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nouvelle étiquette"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Créer une règle à partir du _message"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Dossier de recherche sur le _sujet"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Dossier de recherche sur l'e_xpéditeur"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Dossier de recherche sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Dossier de recherche sur la _liste de diffusion"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtre sur le su_jet"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtre sur l'expé_diteur"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#. 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 "Par défaut"
 
-#: ../mail/em-folder-view.c:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Impossible de récupérer le message"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Récupération du message..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "A_ppel à..."
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Créer un nouveau dossier de _recherche"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_De cette adresse"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_À cette adresse"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer pour envoyer un courriel à %s"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Cliquer pour appeler %s"
 
-#: ../mail/em-folder-view.c:3328
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Cliquer pour masquer/afficher les adresses"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Rechercher :"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "Respecter la _casse"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Non signé"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12556,11 +12612,11 @@ msgstr ""
 "Ce message n'est pas signé. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12568,11 +12624,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12580,11 +12636,11 @@ msgstr ""
 "La signature de ce message ne peut pas être vérifiée, il se peut qu'il ait "
 "été altéré lors de la transmission."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signature valide, mais impossible de vérifier l'expéditeur"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12592,22 +12648,22 @@ msgstr ""
 "Ce message est signé avec une signature valide, mais l'expéditeur du message "
 "ne peut pas être vérifié."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La signature existe, mais elle requiert une clé publique"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Ce message est signé avec une signature dont la clé publique est absente."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12615,11 +12671,11 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être lu lors de son passage "
 "sur Internet."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Chiffré, faiblement"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12629,11 +12685,11 @@ msgstr ""
 "sera difficile, mais pas impossible, pour une tierce personne de voir le "
 "contenu de ce message dans une période de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12641,11 +12697,11 @@ msgstr ""
 "Ce message est chiffré. Il sera difficile pour une tierce personne de voir "
 "le contenu de ce message."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Chiffré, fortement"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12655,87 +12711,87 @@ msgstr ""
 "vraiment difficile, pour une tierce personne, de voir le contenu de ce "
 "message dans une période de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Achevé le %d %B %Y à %H:%M"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "le %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "Adapter à la _largeur"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Afficher à la taille d'_origine"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Enregistrer les pièces jointes sous"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Sélectionner le dossier pour enregistrer toutes les pièces jointes"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "Enregi_strer la sélection..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d pièce joi_nte"
 msgstr[1] "%d pièces joi_ntes"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "Enregi_strer"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Aucune pièce jointe"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Afficher _sans mise en forme"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Masquer _non formaté"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "_Ouvrir avec"
 
-#: ../mail/em-format-html-display.c:2467
+#: ../mail/em-format-html-display.c:2473
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12796,19 +12852,19 @@ msgid "Formatting Message..."
 msgstr "Formatage du message..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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:209
+#: ../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 "Cci"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Client de messagerie"
@@ -12831,13 +12887,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Ce message a été envoyé par <b>%s</b> pour le compte de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:314
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Répondre à"
@@ -12857,43 +12913,43 @@ msgstr "Groupes de discussion"
 msgid "%s attachment"
 msgstr "pièce jointe %s"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
 
-#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source."
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non pris en charge pour multipart/encrypted"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossible d'analyser le message PGP/MIME"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message PGP/MIME : erreur inconnue"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Format de signature non pris en charge"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Impossible d'analyser le message PGP"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Impossible d'analyser le message PGP : erreur inconnue"
 
@@ -12919,7 +12975,7 @@ msgstr "Ajouter des en-têtes de pourriels personnalisés"
 
 #: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
-msgstr "_Nom de l'en-tête :"
+msgstr "Nom de l'en-tête :"
 
 #: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
@@ -12965,11 +13021,6 @@ msgstr "À faire"
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migration de « %s » :"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -13049,17 +13100,17 @@ msgstr ""
 "Impossible de lire les paramètres de l'installation d'Evolution précédente, "
 "« evolution/config.xmldb » n'existe pas ou est corrompu."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Ajouter dans le carnet d'adresses"
 
@@ -13084,7 +13135,7 @@ msgstr "Sélectionnez un serveur."
 
 #: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
-msgstr "Aucun serveur n'a été sélectionné."
+msgstr "Aucun serveur n'a été sélectionné"
 
 #. Check buttons
 #: ../mail/em-utils.c:120
@@ -13114,11 +13165,11 @@ msgstr "Ajouter adresse"
 msgid "Messages from %s"
 msgstr "Messages de %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Dossiers de _recherche"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Source du dossier de recherche"
 
@@ -13192,88 +13243,96 @@ msgstr ""
 "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 ""
+"Vérifie à quelle fréquence les modifications locales sont synchronisées avec "
+"le serveur de messagerie distant. Le délai doit être d'au moins 30 secondes."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "En-têtes personnalisés à utiliser pour la détection des pourriels."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../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 ""
 "En-têtes personnalisés à utiliser pour la détection des pourriels. Les "
-"éléments de la liste sont des chaînes au format « nom_entête=valeur »."
+"éléments de la liste sont des chaînes au format « nom-entête=valeur »."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractère par défaut pour la rédaction des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractère par défaut pour la rédaction des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractère par défaut pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractère par défaut pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Style de transfert par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Hauteur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Hauteur par défaut de la fenêtre des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Hauteur par défaut du dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valeur par défaut pour l'état d'expansion des fils de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Largeur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Largeur par défaut de la fenêtre des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Largeur par défaut de la boîte de dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Indique s'il faut vérifier les adresses pour le filtrage des pourriels "
 "seulement dans le carnet d'adresses local"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Indique s'il faut consulter le carnet d'adresses pour l'expéditeur du "
 "courriel"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Indique s'il faut rechercher l'expéditeur du courriel dans le carnet "
@@ -13282,13 +13341,13 @@ msgstr ""
 "l'opération peut être lente si vous utilisez des carnets d'adresses distants "
 "(tel que LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Indique s'il faut utiliser des en-têtes personnalisés pour la détection des "
 "pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -13298,7 +13357,7 @@ msgstr ""
 "pourriels. Si cette option est active et que des en-têtes sont renseignés, "
 "la détection des pourriels sera plus rapide."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -13306,63 +13365,63 @@ msgstr ""
 "Indique s'il faut utiliser les mêmes polices pour les lignes « De » et "
 "« Sujet » dans la colonne « Messages » en affichage verticale."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Répertoire pour charger/joindre des fichiers dans l'éditeur."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Répertoire pour enregistrer les fichiers joints aux courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
 "Activer ou désactiver les points de suspension dans les noms de dossier de "
 "l'arborescence des dossiers"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Afficher les indicateurs de fautes d'orthographe au fil de la saisie."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Vider les dossiers Pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vider tous les dossiers Pourriels en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vider tous les dossiers Corbeille en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Activer ou désactiver la barre d'espace magique"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
-msgstr "Activer ou désactiver la fonctionnalité de recherche interactive."
+msgstr "Activer ou désactiver la fonctionnalité de recherche interactive"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Activer les dossiers de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Active les dossiers de recherche au démarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -13374,7 +13433,7 @@ msgstr ""
 "barre latérale saisissez simplement son nom et la sélection ira "
 "automatiquement sur ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13382,27 +13441,27 @@ msgstr ""
 "Activez ceci pour défiler avec la barre Espace dans l'aperçu des messages, "
 "les listes de messages et les dossiers."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Activer l'affichage partiel du texte selon une limite de taille."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Masque l'aperçu par dossier et supprime la sélection"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
@@ -13410,7 +13469,7 @@ msgstr ""
 "Si un utilisateur essaye d'ouvrir 10 messages ou plus en une seule fois, lui "
 "demander si c'est réellement ce qu'il désire."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13418,7 +13477,7 @@ msgstr ""
 "Si le panneau de prévisualisation est activé, il sera affiché côte à côte "
 "plutôt que verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -13429,7 +13488,7 @@ msgstr ""
 "qui est attribué à un afficheur de composant bonobo, dans la base des types "
 "MIME GNOME, peut être utilisé pour l'affichage du contenu."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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."
@@ -13437,7 +13496,7 @@ msgstr ""
 "Hauteur initiale de la fenêtre « Envoi et réception du courriel ». La valeur "
 "est mise à jour si l'utilisateur redimensionne la fenêtre verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -13451,7 +13510,7 @@ msgstr ""
 "la fenêtre « Envoi et réception du courriel » ne peut pas être maximisée. "
 "Cette clé n'est qu'un détail d'implémentation."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -13459,13 +13518,13 @@ msgstr ""
 "Largeur initiale de la fenêtre « Envoi et réception du courriel ». La valeur "
 "est mise à jour si l'utilisateur redimensionne la fenêtre horizontalement."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Ceci active ou désactive la confirmation lors du marquage de messages "
 "multiples."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -13473,7 +13532,7 @@ msgstr ""
 "Ceci active ou désactive les messages de confirmation répétés qui demandent "
 "si la synchronisation hors ligne est requise avant de basculer dans ce mode."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -13483,31 +13542,31 @@ msgstr ""
 "suppression de messages du dossier de recherche supprime définitivement ces "
 "messages, et ne les supprime pas simplement des résultats de recherche."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Dernière fois où les pourriels ont été vidés"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Dernière fois où la corbeille a été vidée"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau au-delà duquel les messages doivent être journalisés."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Liste des étiquettes et des couleurs qui leur sont associées"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Liste des licences acceptées"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -13516,17 +13575,17 @@ msgstr ""
 "liste contient des chaînes désignant les noms des sous-dossiers relatifs à /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-têtes personnels et de leur activation."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Liste des codes de langue des dictionnaires utilisés pour la vérification "
 "orthographique."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -13535,135 +13594,135 @@ msgstr ""
 "liste contient des chaînes de type nom:couleur où les couleurs utilisent le "
 "codage hexadécimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste des types MIME à vérifier pour les composants bonobo de visualisation"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste des noms de protocoles dont la licence a été acceptée."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Charger les images pour les messages HTML en utilisant http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
 "Charger les images pour les messages HTML en utilisant http(s). Les valeurs "
-"possibles sont : 0 - ne jamais charger les images à partir du net, 1 - "
+"possibles sont : 0 - ne jamais charger les images à partir du réseau, 1 - "
 "charger les images si l'expéditeur est dans le carnet d'adresses et 2 - "
-"toujours charger les images à partir du net."
+"toujours charger les images à partir du réseau."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr ""
 "Enregistre les actions des filtres dans le fichier de journal spécifié."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu après le délai spécifié"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu après le délai spécifié."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Style d'affichage des messages (« normal », « en-têtes complets », « source »)"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Nombre minimum de jours entre les vidages de pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nombre minimum de jours entre les vidages de corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Durée minimum en jours entre les vidages de pourriels en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Durée minimum en jours avant de vider la corbeille en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adresses à afficher pour À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quand il ou elle essaie de nettoyer un dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans sujet."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Demander à l'utilisateur s'il désire passer immédiatement en mode hors ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
-"De_mander lors de la suppression de messages dans un dossier de recherche"
+"Demander lors de la suppression de messages dans un dossier de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Demander lors de l'envoi de 10 messages ou plus à la fois"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -13671,77 +13730,81 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans À ou Cc "
-"définis"
+"définis."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Demander lorsque l'utilisateur essaye d'envoyer des message HTML non désirés"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Demander lors du marquage de messages multiples"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconnaître les frimousses dans le texte et les remplacer par des images."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Lancer le test de pourriel sur les messages entrants."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Répertoire de sauvegarde"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-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 "Chercher la photo de l'expéditeur dans les carnets d'adresses locaux"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Colonne du courriel de l'expéditeur dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Délai de synchronisation avec le serveur"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées comme une animation."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimés (comme barrés) dans la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marqués comme supprimés dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Afficher la photo de l'expéditeur"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13749,68 +13812,68 @@ msgstr ""
 "Afficher le courriel de l'expéditeur dans une colonne à part dans la liste "
 "des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Afficher la photo de l'expéditeur dans le volet de lecture de message."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Couleur du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Langues du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Hauteur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Largeur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Limite de la partie texte du message"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Le greffon par défaut pour le traitement du pourriel"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "La dernière fois que la corbeille a été vidée, en jours depuis le 1/1/1970."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "La police de terminal pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "La police à largeur variable pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 "Cette option peut prendre les valeurs suivantes : 0 pour les erreurs, 1 pour "
 "les avertissements et 2 pour les messages de débogage."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13819,7 +13882,7 @@ msgstr ""
 "sous Evolution. La taille par défaut est 4 096 Kio (4 Mio) et est renseignée "
 "en Kio."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13829,15 +13892,15 @@ msgstr ""
 "soient activés. Si le greffon listé par défaut est désactivé, les autres "
 "greffons disponibles ne prendront pas le relais."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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 ""
 "Cette clé est lue une fois, puis définie à faux après la lecture. Cela "
 "désélectionne le message dans la liste et supprime l'aperçu pour ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13849,10 +13912,10 @@ msgstr ""
 "XML est &lt;header enabled&gt; - activé si l'en-tête est affiché dans la vue "
 "du courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "Cette option est relative à la clé « lookup_addressbook » et est utilisée "
@@ -13860,11 +13923,11 @@ msgstr ""
 "d'adresses local pour exclure du filtrage pourriel les courriels envoyés par "
 "des contacts connus."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Cette option peut aider à accélérer la vitesse de chargement."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
@@ -13872,7 +13935,7 @@ msgstr ""
 "Cela définit le nombre d'adresses à afficher dans la vue de la liste de "
 "messages par défaut, au-delà duquel « ... » est affiché."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13880,7 +13943,7 @@ msgstr ""
 "Ce paramètre indique si les fils de discussion doivent être dans un état "
 "étendu ou compact par défaut. Evolution nécessite un redémarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13890,33 +13953,18 @@ msgstr ""
 "dernier message de chaque fil de discussion, plutôt que par date. Evolution "
 "nécessite un redémarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Liste de messages par fil de discussion."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Liste de messages par fil de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basée sur les sujets"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-"Intervalle de temps en secondes spécifiant la fréquence d'envoi des "
-"modifications du stockage vers le serveur"
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-"Intervalle de temps en secondes spécifiant la fréquence d'envoi des "
-"modifications du stockage vers le serveur. La valeur ne peut être inférieure "
-"à 30 secondes."
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Délai avant de marquer les messages comme vus"
@@ -14031,7 +14079,7 @@ msgstr ""
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indique si les fils de discussion doivent êtres triés suivant le dernier "
-"message de leur fil."
+"message de leur fil"
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
@@ -14073,7 +14121,7 @@ msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 msgid "Importing mailbox"
 msgstr "Importation des boîtes à lettres"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importation de « %s »"
@@ -14095,27 +14143,27 @@ msgstr "Assistant d'importation Pine d'Evolution"
 msgid "Import mail from Pine."
 msgstr "Importation des boîtes à lettres de Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "Courriel à %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "Courriel de %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "Le sujet est %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "Liste de diffusion %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:371
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
@@ -14125,142 +14173,144 @@ msgstr "Ajouter une règle de filtre"
 msgid "Templates"
 msgstr "Modèles"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d sélectionné, "
 msgstr[1] "%d sélectionnés, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d supprimé"
 msgstr[1] "%d supprimés"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d pourriel"
 msgstr[1] "%d pourriels"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d brouillon"
 msgstr[1] "%d brouillons"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d envoyé"
 msgstr[1] "%d envoyés"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non envoyé"
 msgstr[1] "%d non envoyés"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d non lu,"
 msgstr[1] "%d non lus,"
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Rédiger un nouveau courriel"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Crée un nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:1071
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Échec lors de la mise à jour des dossiers ou paramètres de courriel."
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Erreur"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Erreurs"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Avertissements et erreurs"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Débogage"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Messages d'erreur, d'avertissement et de débogage"
 
-#: ../mail/mail-component.c:1713
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Journaux de débogage"
 
-#: ../mail/mail-component.c:1727
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Afficher les _erreurs dans la barre d'état pendant"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1743
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "seconde(s)."
 
-#: ../mail/mail-component.c:1749
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Journal des messages :"
 
-#: ../mail/mail-component.c:1790
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Niveau du journal"
 
-#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Heure"
 
-#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Ferme cette fenêtre"
@@ -14512,13 +14562,11 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer numériquement les messages _sortants (par défaut)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"Ne pas mettre en forme le contenu du texte dans les messages quand la taille "
-"du texte excède"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Ne pas mettre en forme le contenu du message quand leur taille e_xcède"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Ne _pas marquer les messages comme pourriel si l'expéditeur est présent dans "
 "mon carnet d'adresses"
@@ -14655,18 +14703,24 @@ msgstr ""
 "connexion"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"L'option est ignorée si des pourriels par en-têtes personnalisés sont "
+"détectés."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganisation :"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clé PGP/GPG :"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Mot de passe :"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -14674,7 +14728,7 @@ msgstr ""
 "Saisissez un nom descriptif pour ce compte dans l'espace ci-dessous.\n"
 "Ce nom sera seulement utilisé à des fins d'affichage."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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."
@@ -14683,7 +14737,7 @@ msgstr ""
 "doute, adressez-vous à votre administrateur système ou à votre fournisseur "
 "d'accès Internet."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "
@@ -14693,119 +14747,119 @@ msgstr ""
 "« optionnels » ci-dessous n'ont pas besoin d'être remplis, à moins que vous "
 "ne désiriez inclure ces informations dans les messages que vous envoyez."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Sélectionnez une option parmi les suivantes"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Port :"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Demander lors de l'envoi de messages où seuls des destinataires Cci sont "
 "définis"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Cité"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Ré_pondre à :"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "Hôte S_OCKS :"
 
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "R_echercher la photo de l'expéditeur uniquement dans les carnets d'adresses "
 "locaux"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_électionner..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Envoie des accusés de réception des messages :"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Police par _défaut :"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Sélection d'une police HTML à largeur fixe"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Sélection d'une police HTML à largeur fixe pour l'impression"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Sélection d'une police HTML à largeur variable"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Envoi de courriels"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificat de _signature :"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ure :"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "_Commencer la rédaction en bas lors des réponses"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ype : "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14813,7 +14867,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a été installé."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14823,13 +14877,6 @@ msgstr ""
 "signature. Le nom spécifié ne sera utilisé\n"
 "que pour l'affichage. "
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Cette option a une priorité plus faible que la détection de pourriels par en-"
-"têtes personnalisés."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14846,8 +14893,10 @@ msgstr "_Nom d'utilisateur :"
 msgid "Use Authe_ntication"
 msgstr "Utiliser l'_authentification"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:364
+#: ../mail/mail-config.glade.h:156 ../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 "_Nom d'utilisateur :"
 
@@ -14875,7 +14924,7 @@ msgstr "_Toujours charger les images à partir d'Internet"
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
-msgstr "_URL de configuration  automatique du serveur mandataire :"
+msgstr "_URL de configuration automatique du serveur mandataire :"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
@@ -14903,7 +14952,7 @@ msgid "_Load images in messages from contacts"
 msgstr "_Afficher les images dans les messages des contacts"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "Rechercher seulement dans le carnet d'adresses _local"
 
 #: ../mail/mail-config.glade.h:172
@@ -14927,7 +14976,7 @@ msgid "_Path:"
 msgstr "_Chemin :"
 
 #: ../mail/mail-config.glade.h:178
-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 ""
 "_Demander l'autorisation lors de l'envoi de messages HTML à des contacts qui "
 "n'en veulent pas"
@@ -15025,43 +15074,43 @@ msgstr "_Sensible à la casse"
 msgid "Co_mpleted"
 msgstr "_Achevée"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "Re_chercher :"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Rechercher dans le message"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Marquer pour donner suite"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Gérer les abonnements"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Accord de licence"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Aucun sélectionné"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Serveur :"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Informations de sécurité"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Dossiers spécifiques"
 
-#: ../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."
@@ -15069,23 +15118,23 @@ msgstr ""
 "Les messages sélectionnés pour suivi sont listés ci-après.\n"
 "Sélectionnez une action de suivi dans le menu « Marqueur »."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Accepter la licence"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Date d'échéance :"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Marqueur :"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
@@ -15132,104 +15181,104 @@ msgstr "Envoi du message %d sur %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Échec lors de l'envoi de %d sur %d messages"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Annulé."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Terminé."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Messages transférés"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Récupération des informations de quota pour le dossier %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Actualisation du dossier"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Récupération de %d message"
 msgstr[1] "Récupération de %d messages"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Enregistrement de %d message"
 msgstr[1] "Enregistrement de %d messages"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15238,11 +15287,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15251,75 +15300,75 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
-msgstr "Impossible d'écrire les données : %s."
+msgstr "Impossible d'écrire les données : %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Préparation du compte « %s  » pour utilisation hors ligne."
+msgstr "Préparation du compte « %s  » pour utilisation hors ligne"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Envoi et réception du courriel"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courriel"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Saisissez la phrase de passe pour %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Saisissez la phrase de passe"
 
-#: ../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:713
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
@@ -15450,7 +15499,7 @@ msgid ""
 "folders?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les messages effacés dans "
-"tous les dossiers"
+"tous les dossiers ?"
 
 #: ../mail/mail.error.xml.h:14
 msgid ""
@@ -15467,7 +15516,8 @@ msgstr "Voulez-vous vraiment envoyer un message au format HTML ?"
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
-"Voulez-vous vraiment envoyer un message avec des destinataires Cci seulement."
+"Voulez-vous vraiment envoyer un message avec des destinataires Cci "
+"seulement ?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -15895,7 +15945,7 @@ msgid ""
 "not enabled"
 msgstr ""
 "Ce message ne peut pas être envoyé car le compte que vous avez choisi pour "
-"l'envoi n'est pas actif."
+"l'envoi n'est pas actif"
 
 #: ../mail/mail.error.xml.h:115
 msgid ""
@@ -16015,79 +16065,79 @@ msgstr "Ne_ttoyer"
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Répondu"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Transféré"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1595 ../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:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1611 ../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 "Hier %H:%M"
 
-#: ../mail/message-list.c:1623 ../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 %H:%M"
 
-#: ../mail/message-list.c:1631 ../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 %H:%M"
 
-#: ../mail/message-list.c:1633 ../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:3885 ../mail/message-list.c:4321
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
-#: ../mail/message-list.c:4176
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16095,7 +16145,7 @@ msgstr ""
 "Aucun message ne remplit vos critères de recherche. Effacez la recherche "
 "avec le menu Recherche->Effacer ou modifiez les critères."
 
-#: ../mail/message-list.c:4178
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
 msgstr "Il n'y a aucun message dans ce dossier."
 
@@ -16185,8 +16235,12 @@ msgid "Subject contains"
 msgstr "Le sujet contient"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Le sujet ou les destinataires contiennent"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
-msgstr "Le sujet ou l'expéditeur contiennent"
+msgstr "Le sujet ou l'expéditeur contient"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
@@ -16228,7 +16282,7 @@ msgid ""
 "attachment is missing"
 msgstr ""
 "Recherche dans un message des mentions de pièces jointes et avertit si le "
-"message n'en contient pas."
+"message n'en contient pas"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16258,27 +16312,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Greffon audio"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Sélectionnez le nom de l'archive Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Redémarrer Evolution après l'archivage"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Sélectionnez le nom de l'archive d'Evolution à restaurer"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Redémarrer Evolution après la restauration"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Restaurer à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16289,123 +16343,123 @@ msgstr ""
 "Il restaure également tous vos paramètres personnels, filtres de courriel, "
 "etc."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurer Evolution à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Sélectionnez une archive d'Evolution pour la restauration :"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Choisissez un fichier à restaurer"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Répertoire d'archive d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Répertoire de restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Contrôle l'archive Evolution"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Redémarre Evolution"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Avec interface graphique"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Ferme Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Archivage des comptes et des paramètres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Archivage des données d'Evolution (courriels, contacts, calendriers, tâches "
 "et mémos)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Archivage terminé"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Redémarrage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Archiver les données actuelles d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Extraction des fichiers de l'archive"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Chargement des paramètres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Suppression des fichiers d'archive temporaires"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "Contrôle des sources locales"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Archivage vers le dossier %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restauration depuis le dossier %s"
 
 # Titre
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Archivage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Archivage des données d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Veuillez attendre qu'Evolution finisse d'archiver vos données."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Restauration des données d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Veuillez attendre qu'Evolution finisse de restaurer vos données."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
-"Ceci peut prendre du temps, en fonction de la quantité de données de votre "
-"compte."
+"En fonction de la quantité de données sur votre compte, cela peut prendre du "
+"temps."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -16453,10 +16507,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Sélectionnez un fichier d'archive valide pour la restauration."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr ""
-"Le dossier sélectionné ne dispose pas des droits nécessaires pour créer le "
-"fichier"
+msgid "The selected folder is not writable."
+msgstr "Le dossier sélectionné n'est pas modifiable."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16485,54 +16537,51 @@ msgstr "Res_taurer les paramètres..."
 msgid "_Backup Settings..."
 msgstr "_Archiver les paramètres..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contacts automatiques"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Créer _automatiquement des entrées dans le carnet d'adresses lors de la "
 "réponse à un message"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Sélectionnez un carnet d'adresses pour les contacts automatiques"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Contacts de messagerie instantanée"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Synchroniser périodiquement les informations et les images des contacts "
-"depuis la liste de contacts Pidgin"
+"Synchroniser les informations et les images des contacts depuis la liste de "
+"contacts Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Sélectionnez un carnet d'adresses pour la liste de contacts Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Synchroniser maintenant avec la liste de _contacts"
 
 #: ../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 ""
 "Complète automatiquement votre carnet d'adresses avec les noms et courriels "
-"de la personne à qui vous répondez ainsi que l'information de messagerie "
-"instantanée issue de votre liste de contacts."
+"de la personne à qui vous répondez. Complète également les informations de "
+"messagerie instantanée issues de votre liste de contacts."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16588,17 +16637,18 @@ msgstr "Greffon pourriel Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtre les pourriels en utilisant Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../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:357
+#: ../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 "Utiliser _SSL"
 
@@ -16620,7 +16670,8 @@ msgstr "Fournit la fonctionnalité à la base des calendriers locaux."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:381
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "Ac_tualiser :"
 
@@ -16730,23 +16781,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Voulez-vous faire d'Evolution votre client de messagerie par défaut ?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 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 "Marquer comme carnet d'adresses par _défaut"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Marquer comme calendrier par _défaut"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Marquer comme liste de tâches par _défaut"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Marquer comme liste de mémos par _défaut"
 
@@ -16756,21 +16807,21 @@ msgstr "Sources par défaut"
 
 #: ../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 ""
 "Fournit la fonctionnalité permettant de marquer un calendrier ou un carnet "
 "d'adresses comme celui par défaut."
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "_En-tête personnalisé"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
 msgstr "Clé"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr "Valeurs"
@@ -16781,8 +16832,8 @@ msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
-"Le format de définition d'un en-tête personnalisé est :\n"
-"Nom de l'en-tête personnalisé clé valeurs séparées par « ; »."
+"Le format de définition d'une valeur de clé d'en-tête personnalisé est :\n"
+"Nom de l'en-tête personnalisé puis clé et valeurs, séparées par « ; »."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
@@ -16798,7 +16849,7 @@ msgid "Custom Header"
 msgstr "En-tête personnalisé"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Liste d'en-têtes personnalisés"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16809,7 +16860,7 @@ msgid ""
 msgstr ""
 "Cette clé fournit la liste des en-têtes personnalisés que vous pouvez "
 "ajouter à un message sortant. Le format pour spécifier un en-tête et sa "
-"valeur est : nom de l'en-tête personnalisé suivi de « = », les valeurs sont "
+"valeur est : nom de l'en-tête personnalisé suivi de « = » puis les valeurs, "
 "séparées par des « ; »"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -16915,39 +16966,39 @@ msgstr "Taille des dossiers"
 msgid "Exchange Settings"
 msgstr "Paramètres d'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "S'a_uthentifier"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
 msgstr "_Boîte aux lettres :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Type d'_authentification"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Vérifier les types pris en charge"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s Kio"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 Kio"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16960,15 +17011,15 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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 ""
 "Ce mot de passe est différent du mot de passe existant pour votre compte. "
-"Veuillez saisir le bon mot de passe."
+"Veuillez saisir le mot de passe correct"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Les deux mots de passe sont différents. Veuillez les saisir à nouveau."
 
@@ -16990,13 +17041,13 @@ msgstr ""
 "Le mot de passe actuel a expiré. Veuillez modifier votre mot de passe dès à "
 "présent."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:665
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Votre mot de passe expirera dans les %d prochains jours"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -17021,7 +17072,7 @@ msgid "Delegate Permissions"
 msgstr "Permissions du délégué"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissions pour %s"
@@ -17063,43 +17114,43 @@ msgstr "Cependant, vous n'êtes pas autorisé à consulter mes éléments privé
 msgid "You have been designated as a delegate for %s"
 msgstr "Vous avez été désigné comme délégué de %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Déléguer à"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Supprimer le délégué %s ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Impossible d'accéder à 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 "Impossible de se trouver soi-même dans l'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 "Impossible de trouver le délégué %s dans l'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 "Impossible de supprimer le délégué %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Impossible de mettre à jour la liste des délégués."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Impossible d'ajouter le délégué %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Erreur lors de la lecture de la liste des délégués."
 
@@ -17148,25 +17199,25 @@ msgstr "_Résumer les permissions"
 msgid "_Tasks:"
 msgstr "_Tâches :"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permissions..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Nom du dossier"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Taille du dossier"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "S'abonner à un dossier d'un autre utilisateur"
@@ -17175,20 +17226,20 @@ msgstr "S'abonner à un dossier d'un autre utilisateur"
 msgid "Exchange Folder Tree"
 msgstr "Arborescence des dossiers 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 "Se désabonner du dossier..."
 
-#: ../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 "Voulez-vous vraiment vous désabonner du dossier « %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 "Se désabonner du dossier « %s »"
@@ -17253,16 +17304,16 @@ msgstr "Votre mot de passe expirera dans 7 jours..."
 msgid "_Change Password"
 msgstr "_Changer le mot de passe"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Permission refusée)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Ajouter un utilisateur :"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../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
 msgid "Add User"
@@ -17382,10 +17433,6 @@ msgstr "_Sensibilité : "
 msgid "_User"
 msgstr "_Utilisateur"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "bouton utilisateur"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Sélectionner un utilisateur"
@@ -17554,7 +17601,7 @@ msgid "Folder offline"
 msgstr "Dossier hors ligne"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -17618,7 +17665,7 @@ msgstr "Assurez-vous que le nom du Serveur Global Catalog est correct."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
-msgstr "Redémarrez Evolution pour que les modifications prennent effet."
+msgstr "Redémarrez Evolution pour que les modifications prennent effet"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
@@ -17681,6 +17728,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Erreur inconnue lors de la recherche de {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
@@ -17765,7 +17813,7 @@ msgstr "S'abonner aux tâches d'un autre utilisateur"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
-msgstr "Contrôler les droits du dossier"
+msgstr "Contrôle les droits du dossier"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
@@ -17813,34 +17861,34 @@ msgstr ""
 "greffons. Essayez de choisir un autre éditeur."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Édition dans un éditeur externe"
+msgid "Compose in _External Editor"
+msgstr "Édition dans un éditeur _externe"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Édite les messages en utilisant un éditeur externe"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Commande à exécuter pour lancer l'éditeur : "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
-"Pour Emacs, indiquez « xemacs »\n"
-"pour VI, indiquez « gvim »"
+"Pour Emacs, saisissez « xemacs »\n"
+"pour VI, saisissez « gvim »"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Sélectionnez une image PNG (48x48) de taille inférieure à 700 octets"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Fichiers PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Portrait"
 
@@ -17879,35 +17927,56 @@ msgstr "Se désabonner des dossiers"
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
-#: ../plugins/google-account-setup/google-source.c:73
-#: ../plugins/google-account-setup/google-source.c:80
+#: ../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-contacts-source.c:198
-msgid "<b>Server</b>"
-msgstr "<b>Serveur</b>"
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Saisissez d'abord un nom d'utilisateur."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Saisissez le mot de passe de l'utilisateur %s pour accéder à la liste des "
+"calendriers auxquels il est abonné."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Impossible de lire les données du serveur Google.\n"
+"%s"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "C_alendrier :"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:230
-msgid "Update every"
-msgstr "Mettre à jour tous les"
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Récupération de la _liste"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Serveur</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar and contacts."
-msgstr "Un greffon pour configurer un calendrier et des contacts Google."
+msgstr "Un greffon pour configurer les calendriers et les contacts Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Sources Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
@@ -17953,16 +18022,16 @@ msgstr "Installer le dossier partagé"
 msgid "Shared Folder Installation"
 msgstr "Installation du dossier partagé"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Paramètres du pourriel"
 
-#: ../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 "Paramètres de détection des pourriels"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Paramètres de détection des pourriels..."
 
@@ -18063,29 +18132,33 @@ msgstr "Compte déjà existant"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
-"Echec de la connexion proxy en tant que « {0} ». Veuillez vérifier "
-"l'identificateur du courriel et essayez à nouveau."
+"Échec de la connexion proxy en tant que « {0} ». Veuillez vérifier votre "
+"adresse de courriel et essayez à nouveau."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Ceci est une réunion récurrente"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "Que voulez-vous {0} ?"
+msgid "Would you like to accept it?"
+msgstr "Voulez-vous l'accepter ?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Voulez-vous le refuser ?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "Impossible de partager le dossier avec l'utilisateur spécifié « {0} »"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../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 "Vous devez indiquer un nom d'utilisateur à ajouter à la liste"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Accepter provisoirement"
 
@@ -18102,7 +18175,7 @@ msgid "Con_tacts..."
 msgstr "Con_tacts..."
 
 #: ../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 "Message"
 
@@ -18207,20 +18280,20 @@ msgstr ""
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "L'onglet proxy sera accessible seulement lorsque le compte sera actif."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Saisissez les utilisateurs et réglez les permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Nouveau dossier _partagé..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Partage"
 
@@ -18315,7 +18388,7 @@ msgstr "<b>En-têtes IMAP</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
-msgstr "En-têtes de base et de listes de diffusion (défaut)"
+msgstr "En-têtes de base et de _listes de diffusion (défaut)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
 msgid "Fetch A_ll Headers"
@@ -18376,8 +18449,8 @@ msgstr "Sélectionner une liste de tâches"
 msgid "Select Calendar"
 msgstr "Sélectionner un calendrier"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importer"
 
@@ -18421,7 +18494,8 @@ msgid "iCalendar format (.ics)"
 msgstr "Format iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Synchronise la tâche, le mémo, le calendrier ou le carnet d'adresses "
 "sélectionné avec un iPod d'Apple"
@@ -18434,132 +18508,132 @@ msgstr "Synchroniser avec l'iPod"
 msgid "iPod Synchronization"
 msgstr "Synchronisation avec l'iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Impossible de charger le calendrier « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Un rendez-vous dans le calendrier « %s » est en conflit avec cette réunion"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Rendez-vous trouvé dans le calendrier « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Impossible de trouver un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Impossible de trouver cette réunion dans un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Impossible de trouver cette tâche dans une liste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Impossible de trouver ce mémo dans une liste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Recherche d'une version existante de ce rendez-vous"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'élément"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Impossible d'envoyer l'élément au calendrier « %s ». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "« %s » a été envoyée au calendrier comme acceptée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "« %s » a été envoyée au calendrier comme provisoire"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "« %s » a été envoyée calendrier comme refusée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "« %s » a été envoyée au calendrier comme annulée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organisateur a supprimé la délégation %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation à la délégation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Impossible d'envoyer l'avis d'annulation au délégué"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'état du participant n'a pas pu être mis à jour car l'état n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre à jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "État du participant mis à jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Les informations de la réunion ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Les informations de la tâche ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Les informations du mémo ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la réunion, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la tâche, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossible d'envoyer les informations du mémo, celui-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier joint n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18567,15 +18641,15 @@ msgstr ""
 "Le message prétend contenir un calendrier, mais celui-ci n'est pas dans un "
 "format iCalendar."
 
-#: ../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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "L'élément dans le calendrier n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18583,11 +18657,11 @@ msgstr ""
 "Le message contient un calendrier, mais celui-ci ne contient aucun "
 "événement, tâche ou information libre/occupé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier joint contient des éléments multiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18595,233 +18669,233 @@ msgstr ""
 "Pour traiter tous ces éléments, le fichier devra être enregistré et le "
 "calendrier importé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Cette réunion est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Cette tâche est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Ce mémo est récurrent"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message après intervention"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Sélectionnez les calendriers où chercher les conflits de réunions"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Aujourd'hui %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Aujourd'hui %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Aujourd'hui %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Demain"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Demain %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Demain %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Demain %I:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demain %I:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A %I:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B, %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B, %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "Veuillez répondre par délégation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Reçu par délégation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> par l'intermédiaire de %s a publié les informations de la réunion "
 "suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> a publié les informations de la réunion suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> vous a délégué la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s demande votre présence à la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> demande votre présence à la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> par l'intermédiaire de %s souhaite être intégré à une réunion "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18830,7 +18904,7 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
 "informations pour la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18838,90 +18912,90 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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> par l'intermédiaire de %s a envoyé la réponse à une réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> a envoyé la réponse à une réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a annulé la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> a annulé la réunion suivante."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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> par l'intermédiaire de %s a proposé les changements suivants à la "
 "réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> a proposé les changements suivants à la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a refusé les changements suivants à la "
 "réunion :"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> a refusé les changements suivants de la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a publié les tâches suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> a publié la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> demande l'attribution à %s de la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> par l'intermédiaire de %s vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> par l'intermédiaire de %s souhaite être intégré à une tâche "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18930,7 +19004,7 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
 "informations pour l'attribution de tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18939,7 +19013,7 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour l'attribution de "
 "tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18947,23 +19021,23 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a renvoyé une réponse à la tâche "
 "attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> a renvoyé une réponse à la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> par l'intermédiaire de %s a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18971,145 +19045,145 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à "
 "l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> a proposé les changements suivants à l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> par l'intermédiaire de %s a refusé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> a refusé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> par l'intermédiaire de %s souhaite être intégré à mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> souhaite être intégré à un mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> par l'intermédiaire de %s a annulé le mémo partagé suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> a annulé le mémo partagé suivant :"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "_Refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Accepter"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "Mettre à jo_ur l'état du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Mettre à jour"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Heure de début :"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Heure de fin :"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Ré_pondre à l'expéditeur"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Envoyer des _mises à jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_Appliquer à toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Afficher la période comme _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Tâches :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Mémos :"
 
@@ -19174,10 +19248,11 @@ msgstr "Génère un message D-Bus à la réception d'un nouveau courriel."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"Si vrai, un bip sera émis, sinon un fichier son sera joué à la réception de "
-"nouveaux messages."
+"Si « vrai », un bip sera émis, sinon un fichier son sera joué à la réception "
+"de nouveaux messages."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -19229,20 +19304,20 @@ msgstr ""
 "Indique s'il faut avertir seulement de la réception de nouveaux messages "
 "dans la « Boîte de réception »."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "Générer un message _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:361
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "Notification de courriel d'Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:398
 msgid "Mail Notification Properties"
 msgstr "Propriétés des notifications de courriel"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19257,57 +19332,57 @@ msgstr[1] ""
 "Vous avez reçu %d nouveaux messages\n"
 "dans %s."
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Vous avez reçu %d nouveau message."
 msgstr[1] "Vous avez reçu %d nouveaux messages."
 
-#: ../plugins/mail-notification/mail-notification.c:457
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Nouveau courriel"
 
-#: ../plugins/mail-notification/mail-notification.c:519
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Afficher une icône dans la zone de _notification"
 
-#: ../plugins/mail-notification/mail-notification.c:522
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "Icône c_lignotante dans la zone de notification"
 
-#: ../plugins/mail-notification/mail-notification.c:524
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "_Message contextuel avec l'icône"
 
-#: ../plugins/mail-notification/mail-notification.c:705
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Jouer un son à la réception d'un nouveau message"
 
-#: ../plugins/mail-notification/mail-notification.c:711
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:712
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Jouer un fichier _son"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Indiquez le nom du _fichier :"
 
-#: ../plugins/mail-notification/mail-notification.c:724
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Sélection d'un fichier sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "_Jouer"
 
-#: ../plugins/mail-notification/mail-notification.c:782
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
-msgstr "Avertir uniquement des nouveaux messages de la « Boîte de réception »"
+msgstr "Avertir uniquement des nouveaux messages de la _boîte de réception"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
@@ -19336,12 +19411,12 @@ msgstr "Con_vertir en réunion"
 msgid "Mail to meeting"
 msgstr "Courriel en réunion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Impossible d'ouvrir le calendrier. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19367,7 +19442,7 @@ msgstr "Courriel vers tâche"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 msgid "Convert the selected message to a new task"
-msgstr "Convertir le message sélectionné en une nouvelle tâche"
+msgstr "Convertit le message sélectionné en une nouvelle tâche"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19544,25 +19619,23 @@ msgstr "S'_abonner à la liste"
 msgid "_Unsubscribe from List"
 msgstr "Se _désabonner de la liste"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr ""
-"Marquer tous les messages dans ce dossier et ses sous-dossiers comme lus ?"
-
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr ""
-"Voulez-vous que l'opération soit aussi effectuée dans les sous-dossiers ?"
+msgid "Also mark messages in subfolders?"
+msgstr "Marquer aussi les messages dans les sous-dossiers ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Marquer tous les messages comme lus"
+#: ../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 ""
+"Voulez-vous marquer comme lu seulement les messages dans le dossier actuel, "
+"ou aussi ceux dans les sous-dossiers ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Dossier actuel et _sous-dossiers"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Seulement le _dossier actuel"
 
@@ -19608,7 +19681,7 @@ msgstr "Un greffon pour gérer quels greffons sont actifs ou pas."
 
 #. 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 "Gestionnaire de greffons"
 
@@ -19620,24 +19693,24 @@ msgstr "Active et désactive les greffons"
 msgid "_Plugins"
 msgstr "_Greffons"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../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 "Note : certains changements ne prendront effet qu'après un redémarrage"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: ../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 "Greffon"
 
@@ -19664,19 +19737,19 @@ msgstr "Mode texte simple"
 msgid "Prefer plain-text"
 msgstr "Préférer le texte simple"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Afficher au format HTML si présent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Préférer le format PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Afficher toujours au format PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
@@ -19829,7 +19902,7 @@ msgstr "SpamAssassin non trouvé, code : %d"
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
 #, c-format
 msgid "Failed to create pipe: %s"
-msgstr "Impossible de créer le tube : %s"
+msgstr "Impossible de transférer vers le programme : %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
 #, c-format
@@ -20044,22 +20117,22 @@ msgid "Show _only this Task List"
 msgstr "Afficher _uniquement cette liste de tâches"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that manages the Startup wizard."
-msgstr "Un greffon qui gère l'assistant de lancement."
+msgid "Guides you through your initial account setup."
+msgstr "Vous guide à travers la configuration initiale de votre compte."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Assistant de lancement"
+msgid "Setup Assistant"
+msgstr "Assistant de configuration"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Assistant de configuration d'Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -20072,29 +20145,29 @@ msgstr ""
 "\n"
 "Cliquez sur le bouton « Suivant » pour continuer. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importation de fichiers"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Sélectionnez les informations que vous désirez importer :"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importation des données."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -20111,7 +20184,7 @@ msgid "Thread messages by subject"
 msgstr "Tri des messages par sujet"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Revenir au tri des messages par su_jet"
 
@@ -20123,7 +20196,7 @@ msgstr ""
 "Liste de paires mot-clé/valeur pour le greffon Modèles en vue de leur "
 "substitution dans le corps des messages."
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:615
 msgid "No title"
 msgstr "Sans titre"
 
@@ -20148,6 +20221,28 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "Décodeur de pièces jointes TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un greffon pour configurer les contacts WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contacts WebDAV"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL :"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Éviter IfMatch (requis pour Apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Shell d'Evolution"
@@ -20177,105 +20272,103 @@ msgid "Configuration version"
 msgstr "Numéro de version"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Décide si la détection d'arrêt brutal doit être active ou non."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largeur par défaut du panneau latéral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Hauteur par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "État par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Largeur par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Active les paramètres du serveur mandataire lors d'accès HTTP/HTTP sécurisé "
 "à Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Nom d'hôte du serveur mandataire HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Mot de passe du serveur mandataire HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Port du serveur mandataire HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Nom d'utilisateur du serveur mandataire HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 ou alias du composant à afficher par défaut au démarrage."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 "Si vrai, les connexions au serveur mandataire nécessitent une "
-"authentification. L'ensemble nom d'utilisateur/mot de passe est défini par « /"
-"apps/evolution/shell/network_config/authentication_user » et le mot de passe "
-"est enregistré localement dans .gnome2_private/."
+"authentification. Le nom d'utilisateur est récupéré par la clé GConf « /apps/"
+"evolution/shell/network_config/authentication_user » et le mot de passe est "
+"récupéré soit dans le trousseau gnome-keyring, soit dans le fichier de mots "
+"de passe ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Dernier numéro de version d'Evolution mise à jour"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste des chemins des dossiers à synchroniser sur le disque pour "
 "l'utilisation hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Hôtes sans serveur mandataire"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Mot de passe à fournir à l'authentification lors de l'usage du serveur "
 "mandataire HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Mode de configuration du serveur mandataire"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Nom d'hôte du serveur mandataire SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Port du serveur mandataire SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Nom d'hôte du serveur mandataire HTTP sécurisé"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Port du serveur mandataire HTTP sécurisé"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -20288,27 +20381,23 @@ msgstr ""
 "manuelle du serveur mandataire » et « utiliser la configuration du serveur "
 "mandataire fournie par l'URL d'autoconfiguration »."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Le panneau latéral est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de développement"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Ignorer les dialogues d'avertissement de récupération"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Démarrer en mode hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "La barre d'état est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20316,19 +20405,19 @@ msgstr ""
 "Le numéro de version d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Hauteur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Largeur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largeur par défaut du panneau latéral, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20336,19 +20425,19 @@ msgstr ""
 "La dernière version mise à jour d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "Le nom de la machine servant de serveur mandataire HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Le nom de la machine servant de serveur mandataire HTTP sécurisé."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "Le nom de la machine servant de serveur mandataire SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -20356,7 +20445,7 @@ msgstr ""
 "Le port de la machine servant de serveur mandataire HTTP définie par « /apps/"
 "evolution/shell/network_config/http_host »."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -20364,7 +20453,7 @@ msgstr ""
 "Le port de la machine servant de serveur mandataire HTTP sécurisé définie "
 "par « /apps/evolution/shell/network_config/secure_host »."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -20372,7 +20461,7 @@ msgstr ""
 "Le port de la machine servant de serveur mandataire SOCKS définie par « /apps/"
 "evolution/shell/network_config/socks_host »."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20383,7 +20472,7 @@ msgstr ""
 "« toolbar » est choisi, le style des boutons est défini par le paramètre "
 "GNOME de la barre d'outils."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20396,72 +20485,62 @@ msgstr ""
 "comme *.toto.com), des adresses IP d'hôtes (IPv4 ou IPv6) et des adresses de "
 "réseaux avec un masque de réseau (quelque chose du type 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Barre d'outils visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL fournissant les paramètres de configuration du serveur mandataire."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Utiliser un serveur mandataire HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Nom d'utilisateur à fournir à l'authentification lors de l'usage du serveur "
 "mandataire HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indique si Evolution doit démarrer en mode hors ligne plutôt qu'en mode "
 "connecté."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Indique si la détection d'arrêt brutal doit être active"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Indique si la fenêtre doit être maximisée."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Indique si le panneau latéral doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Indique si la barre d'état doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Indique si la barre d'outils doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indique si les fenêtres d'avertissement de la version de développement "
 "d'Evolution sont ignorées."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Indique si les fenêtres d'avertissement de récupération d'Evolution sont "
-"ignorées."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Indique si la fenêtre des boutons doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Style des boutons de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenêtre sont visibles"
 
@@ -20477,29 +20556,23 @@ msgstr "Connexions actives"
 msgid "Click OK to close these connections and go offline"
 msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'assistant d'importation à lancer :"
 
-#: ../shell/e-shell-importer.c:135
+#: ../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.\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 ""
-"Choisissez le fichier à importer dans Evolution, et sélectionnez son type "
-"dans la liste.\n"
-"\n"
-"Si vous ignorez le type, sélectionnez « Automatique » et Evolution essaiera "
-"de l'utiliser."
+"Choisissez le fichier à importer dans Evolution et sélectionnez son type "
+"dans la liste."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Choisissez la destination de cette importation"
 
-#: ../shell/e-shell-importer.c:147
+#: ../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"
@@ -20511,33 +20584,33 @@ msgstr ""
 "Aucun paramètre pouvant être importé n'a été trouvé. Si vous\n"
 "voulez essayer de nouveau, cliquez sur le bouton « Précédent ».\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Nom du f_ichier :"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Sélectionnez un fichier"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Type de fichier :"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'_anciens programmes"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Préférences 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20582,7 +20655,8 @@ msgstr ""
 "Robert-André Mauchin <zebob.m@pengzone.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Claude Paroz <claude@2xlibre.net>\n"
-"Bruno Brouard <annoa.b@gmail.com>"
+"Bruno Brouard <annoa.b@gmail.com>\n"
+"Yannick Tailliez <ytdispatch-libre@yahoo.com>"
 
 #: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
@@ -20596,7 +20670,7 @@ msgstr "Erreur lors de l'ouverture de la page Web de la Foire aux questions."
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
@@ -20604,7 +20678,7 @@ msgstr "Travailler _hors ligne"
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20612,11 +20686,11 @@ msgstr ""
 "Evolution est actuellement en ligne.\n"
 "Cliquez sur ce bouton pour travailler hors ligne."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution est en train de passer hors ligne."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20624,51 +20698,52 @@ msgstr ""
 "Evolution est actuellement hors ligne.\n"
 "Cliquez sur ce bouton pour travailler en ligne."
 
-#: ../shell/e-shell-window.c:780
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
-msgstr "Changer pour %s"
+msgstr "Change pour %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Erreur système inconnue."
 
-#: ../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 Kio"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Valider"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Paramètres non valides"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Impossible d'enregistrer dans OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Nouveau"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nouveau test"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 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 "Crée un nouvel élément de test"
 
@@ -20711,7 +20786,7 @@ msgstr ""
 "d'importation de fichiers externes dans Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20750,7 +20825,7 @@ msgstr ""
 "Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributions !\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20758,67 +20833,43 @@ msgstr ""
 "Merci,\n"
 "L'équipe d'Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Détection d'arrêt brutal d'Evolution"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norer"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution semble avoir quitté de manière inattendue lors de son dernier\n"
-"lancement. Par mesure de précaution, tous les volets d'aperçu seront "
-"masqués.\n"
-"Vous pouvez rétablir les volets d'aperçu depuis le menu Affichage.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "_Ne plus afficher ce message"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Démarre en mode connecté"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Force l'arrêt de tous les composants d'Evolution"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Force la remigration depuis Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoie la sortie de débogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Désactive le chargement des greffons."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Désactive l'aperçu des courriels, contacts et tâches."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Le client de messagerie et l'agenda Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21045,27 +21096,27 @@ msgstr "Adresse électronique"
 msgid "All CA certificate files"
 msgstr "Tous les fichiers de certification CA"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visionneur de certificat : %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Saisissez le mot de passe pour « %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 "Saisissez le nouveau mot de passe pour la base de certification"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Saisissez le nouveau mot de passe"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21074,7 +21125,7 @@ msgstr ""
 "Émis vers :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21083,7 +21134,7 @@ msgstr ""
 "Émis par :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Sélectionnez le certificat"
 
@@ -21509,7 +21560,7 @@ msgid "Copy to Folder..."
 msgstr "Copier vers le dossier..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Crée un nouveau dossier de carnet d'adresses"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -21663,7 +21714,7 @@ msgstr "_Déplacer le contact vers..."
 msgid "_Move Folder Contacts To"
 msgstr "_Déplacer le dossier de contacts vers"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nouveau"
 
@@ -21811,15 +21862,15 @@ msgstr "Copie le dossier sélectionné vers un autre dossier"
 
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
-msgstr "Crée un nouveau dossier pour stocker le courriel"
+msgstr "Crée un nouveau dossier pour stocker les courriels"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
-msgstr "Crée ou édite les définitions de dossiers de recherche"
+msgstr "Crée ou modifie les définitions de dossiers de recherche"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
-msgstr "Crée ou édite les règles pour filtrer le nouveau courriel"
+msgstr "Crée ou modifie les règles pour filtrer les nouveaux courriels"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
@@ -21854,11 +21905,11 @@ msgstr "Afficher l'a_perçu du message"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
-msgstr "Afficher l'aperçu du message sous la liste des messages"
+msgstr "Affiche l'aperçu du message sous la liste des messages"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "Afficher l'aperçu du message à côté de la liste des messages"
+msgstr "Affiche l'aperçu du message à côté de la liste des messages"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
@@ -21866,11 +21917,11 @@ msgstr "Affiche la fenêtre de prévisualisation des messages"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "S'abonne ou se désabonne aux dossiers sur les serveurs distants"
+msgstr "Abonne ou désabonne aux dossiers sur les serveurs distants"
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
-msgstr "Afficher la console de débogage pour les messages journalisés"
+msgstr "Affiche la console de débogage pour les messages journalisés"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
@@ -21979,7 +22030,7 @@ msgstr "Marque tous les messages du dossier comme lus"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
-msgstr "Colle les messages depuis le presse-papiers"
+msgstr "Colle le ou les message(s) depuis le presse-papiers"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
@@ -22012,7 +22063,7 @@ msgstr "Sélectionner _tous les messages"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Sélectionne uniquement les messages qui ne sont pas sélectionnés"
+msgstr "Sélectionne tout sauf les messages qui sont actuellement sélectionnés"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
@@ -22052,7 +22103,7 @@ msgstr "Liste les messages par fil de discussion"
 msgid "_Group By Threads"
 msgstr "_Grouper par fils de discussion"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Message"
@@ -22088,15 +22139,15 @@ msgstr "Rédiger un _nouveau message"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Répondre à tous les destinataires du message sélectionné"
+msgstr "Répond à tous les destinataires du message sélectionné"
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Répondre à la liste de diffusion du message sélectionné"
+msgstr "Répond à la liste de diffusion du message sélectionné"
 
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Répondre à l'expéditeur du message sélectionné"
+msgstr "Répond à l'expéditeur du message sélectionné"
 
 #: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
@@ -22104,7 +22155,7 @@ msgstr "Copie les messages sélectionnés dans un autre dossier"
 
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
-msgstr "Copier les messages sélectionnés vers le presse-papiers"
+msgstr "Copie les messages sélectionnés vers le presse-papiers"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
@@ -22200,11 +22251,11 @@ msgstr "Filtrer sur le _sujet..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Filtrer les messages sélectionnés pour la recherche de pourriels"
+msgstr "Filtre les messages sélectionnés pour la recherche de pourriels"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "Marquer les messages sélectionnés comme À suivre"
+msgstr "Marque les messages sélectionnés comme À suivre"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -22269,7 +22320,7 @@ msgstr "Marque les messages sélectionnés pour suppression"
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
-msgstr "Déplacer les messages sélectionnés vers un autre dossier"
+msgstr "Déplace les messages sélectionnés vers un autre dossier"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -22321,7 +22372,7 @@ msgstr "Poste un message dans un dossier public"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
-msgstr "Répondre à un message dans un dossier public"
+msgstr "Répond à un message dans un dossier public"
 
 #: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
@@ -22388,123 +22439,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Affiche un curseur clignotant dans le corps des messages affichés"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Affiche les messages en style normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Affiche les messages avec tous les en-têtes"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Affiche la source brute du message"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
-msgstr "Récupérer les messages sélectionnés"
+msgstr "Récupère les messages sélectionnés"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Sans i_mportance"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Zoom a_rrière"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Pièce jointe"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Mode de réticule"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Effacer le marqueur"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Supprimer le message"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Rechercher dans le message..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Marquer comme _achevé"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "A_ller à"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Important"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Dans le corps"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Pourriel"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Char_ger les images"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Source du _message"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "Message _suivant"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Taille _normale"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Non pourriel"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Ouvrir dans une nouvelle fenêtre"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Message _précédent"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Cité"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Lu"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Enregistrer le message..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Récupérer le message"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "Non l_u"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Zoom a_vant"
 
@@ -22673,7 +22720,7 @@ msgstr "Nouvelle _fenêtre"
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr "Ouverture de la page Web de la Foire aux questions"
+msgstr "Ouvre la page Web de la Foire aux questions"
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
@@ -22725,7 +22772,7 @@ msgstr "Soumettre un _rapport d'anomalie"
 
 #: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Soumettre un rapport d'anomalie en utilisant Bug Buddy"
+msgstr "Soumet un rapport d'anomalie en utilisant Bug Buddy"
 
 #: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
@@ -22737,57 +22784,61 @@ msgstr "Style de la _barre d'outils"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
-msgstr "Afficher/cacher le panneau latéral"
+msgstr "Affiche/masque le panneau latéral"
 
 #: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
-msgstr "Afficher/cacher la barre d'état"
+msgstr "Affiche/masque la barre d'état"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Travailler _hors ligne"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "À _propos"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Fermer la fenêtre"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "O_ublier les mots de passe"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Foire aux questions"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Masquer les boutons"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "_Icônes uniquement"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Référence rapide"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "A_pparence du sélecteur"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Options de _synchronisation..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Texte uniquement"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Fenêtre"
 
@@ -22899,7 +22950,7 @@ msgstr ""
 "Utilisez le bouton droit de la souris pour réduire."
 
 #: ../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 "Collection"
 
@@ -22944,7 +22995,7 @@ msgstr "_Remplacer la vue existante"
 
 #. 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 "Vue personnalisée"
 
@@ -22953,32 +23004,32 @@ msgid "Save Custom View"
 msgstr "Enregistrer la vue personnalisée"
 
 #: ../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 "Définir les vues..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Vue co_urante"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
-msgstr "Sélectionner la vue : %s"
+msgstr "Sélectionne la vue : %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "La vue actuelle est une vue personnalisée"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Enregistrer la vue personnalisée..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Enregistrer la vue personnalisée actuelle"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Crée ou édite des vues"
 
@@ -23007,13 +23058,13 @@ msgstr "Type de la vue :"
 msgid "Attachment Bar"
 msgstr "Barre des pièces jointes"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
-msgstr "Impossible de joindre le fichier %s : %s."
+msgstr "Impossible de joindre le fichier %s : %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -23036,7 +23087,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1272
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -23086,30 +23137,30 @@ msgstr "Y1"
 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
 msgid "Minimum width"
 msgstr "Largeur minimale"
 
-#: ../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
 msgid "Minimum Width"
 msgstr "Largeur minimale"
 
-#: ../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:204
 msgid "Spacing"
 msgstr "Espacement"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Maintenant"
 
-#: ../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 "La date doit être dans le format : %s"
@@ -23118,98 +23169,98 @@ msgstr "La date doit être dans le format : %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Le pourcentage doit être compris entre 0 et 100 inclus"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balte"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europe centrale"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grec"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../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 "Européen de l'ouest"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Européen de l'ouest, Nouveau"
 
-#: ../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 "Traditionnel"
 
-#: ../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 "Simplifié"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Visuel"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Jeu de caractères inconnu : %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Codage des caractères"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caractères à utiliser"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Autre..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Codage des c_aractères"
 
@@ -23283,11 +23334,11 @@ msgstr ""
 "Un composant graphique à afficher à la place du libellé usuel de l'icône "
 "d'extension"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Taille de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Taille de la flèche de l'icône d'extension"
 
@@ -23300,61 +23351,61 @@ msgid "Spacing around expander arrow"
 msgstr "Espace autour de la flèche de l'icône d'extension"
 
 #. 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 "Recherche avancée"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Recherches"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Recherches"
 
-#: ../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 "Enre_gistrer la recherche..."
 
-#: ../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 "Mo_difier les recherches enregistrées..."
 
-#: ../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 "Recherche _avancée..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Compte actuel"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Dossier actuel"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Message actuel"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Choisissez une image"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: ../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."
@@ -23364,23 +23415,23 @@ msgstr ""
 "clavier doivent sélectionner le fuseau horaire grâce à la zone de liste "
 "déroulante située en bas."
 
-#: ../widgets/misc/e-online-button.c:112
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
 msgstr "En ligne"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
 msgstr "L'état du bouton est en ligne"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Synchroniser avec :"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Synchroniser les enregistrements privés :"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Synchroniser les catégories :"
 
@@ -23397,52 +23448,52 @@ msgstr "Modèle de replacement"
 msgid "Column width"
 msgstr "Largeur des colonnes"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Recherche"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Cliquez ici pour modifier le type de recherche"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID de l'élément"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texte"
 
 #. 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "_Afficher : "
 
 #. 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "_Rechercher : "
 
 #. 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " _dans "
 
@@ -23456,19 +23507,19 @@ msgstr "Rangée de curseurs"
 msgid "Cursor Column"
 msgstr "Colonne de curseurs"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Trieur"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Mode de sélection"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Mode du curseur"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Si s_upprimé :"
 
@@ -23598,19 +23649,19 @@ msgid "_When opened:"
 msgstr "_Quand ouvert :"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% effectué)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Cliquez ici pour aller à l'URL"
 
@@ -23630,7 +23681,7 @@ msgstr "_Catégories disponibles :"
 msgid "categories"
 msgstr "catégories"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "list des popups"
 
@@ -23807,93 +23858,93 @@ msgstr ""
 "Pour ajouter une colonne à votre table, glissez-la\n"
 "à l'emplacement où elle doit apparaître."
 
-#: ../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 élément)"
 msgstr[1] "%s : %s (%d éléments)"
 
-#: ../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 élément)"
 msgstr[1] "%s (%d éléments)"
 
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "Couleurs de rangées alternatives"
 
+#: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Grille de dessin 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:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Grille de dessin 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:3334 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Dessiner le focus"
 
+#: ../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
 msgid "Cursor mode"
 msgstr "Mode du curseur"
 
+#: ../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
 msgid "Selection model"
 msgstr "Modèle de sélection"
 
+#: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Longueur du seuil"
 
+#: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Hauteur de rangée uniforme"
 
+#: ../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"
@@ -23961,7 +24012,7 @@ msgid "Font Description"
 msgstr "Description de la police"
 
 #: ../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 "Info de tri"
 
@@ -23983,8 +24034,8 @@ msgstr "Modèle de tableau"
 msgid "Cursor row"
 msgstr "Rangée de curseurs"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Toujours rechercher"
 
@@ -23992,16 +24043,16 @@ msgstr "Toujours rechercher"
 msgid "Use click to add"
 msgstr "Utiliser le clic pour ajouter"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Adaptateur de table ETree"
 
 # ??? je ne comprends pas
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Rechercher en arrière"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Dessiner les lignes et les icônes d'extension +/-."
 
@@ -24108,30 +24159,3 @@ msgstr "Contexte des méthodes de saisie"
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Poignée du menu contextuel"
-
-#~ msgid "No folder name specified."
-#~ msgstr "Aucun nom de dossier spécifié."
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "Un nom de dossier ne peut pas contenir le caractère Entrée."
-
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "Un nom de dossier ne peut pas contenir le caractère « / »."
-
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "Un nom de dossier ne peut pas contenir le caractère « # »."
-
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "« . » et « .. » sont des noms de dossiers réservés."
-
-#~ msgid "All Day Event"
-#~ msgstr "Toute la journée"
-
-#~ msgid "Send _Options"
-#~ msgstr "_Options d'envoi"
-
-#~ msgid "Status Details"
-#~ msgstr "Détails de l'état"
-
-#~ msgid "Time Zone"
-#~ msgstr "Fuseau horaire"
diff --git a/po/gl.po b/po/gl.po
index 0a4388a7b2..d7317bbacd 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -15,17 +15,25 @@
 # Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
 # Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008
 # Frco. Javier Rial Rodríguez <>, 2008, 2008.
-#: ../shell/main.c:683
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 14:40+0200\n"
-"PO-Revision-Date: 2008-08-15 14:41+0200\n"
-"Last-Translator: Frco. Javier Rial Rodríguez <>\n"
-"Language-Team: Galician <g11n@mancomun.org>\n"
+"POT-Creation-Date: 2008-08-31 16:53+0200\n"
+"PO-Revision-Date: 2008-08-31 16:54+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"
@@ -33,16 +41,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "axenda de enderezos do Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Novo contacto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nova lista de contactos"
 
@@ -118,7 +126,7 @@ msgstr "Ir a hoxe"
 msgid "Go to Date"
 msgstr "Ir á data"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-day-view-main-item.c:301
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "unha táboa para ver e seleccionar o intervalo de tempo actual"
@@ -162,7 +170,7 @@ msgstr "visualización de calendario para unha semana laboral"
 msgid "calendar view for one or more days"
 msgstr "visualización de calendario para un ou máis días"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../a11y/calendar/ea-gnome-calendar.c:186
 #: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
@@ -173,26 +181,26 @@ msgstr "%A, %d de %b de %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
+#: ../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
 msgid "%a %d %b"
 msgstr "%a, %d de %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:762
 #: ../calendar/gui/calendar-component.c:767
 #: ../calendar/gui/calendar-component.c:769
 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:781
 #: ../calendar/gui/calendar-component.c:788
 #: ../calendar/gui/calendar-component.c:794
@@ -205,32 +213,32 @@ msgstr "%d de %b de %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
+#: ../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
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendario do Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barra de busca"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "barra de busca do calendario do Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Botón de salto"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Prema aquí para localizar máis eventos."
 
@@ -308,7 +316,7 @@ msgstr "prema para engadir"
 msgid "click"
 msgstr "prema"
 
-#: ../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 "ordenar"
 
@@ -326,23 +334,23 @@ msgstr "Calendario: desde %s até %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Botón de combinación"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Activar os predeterminados"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Menú emerxente"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Conmutar a barra de anexos"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "activar"
 
@@ -395,7 +403,7 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Non se pode obter o esquema de información para o servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Non se pode eliminar a axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -414,7 +422,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Eliminar a axenda de enderezos '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Erro ao cargar a axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -450,7 +458,7 @@ msgstr ""
 "actual"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "A axenda de enderezos do Evolution saíu inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -469,34 +477,34 @@ msgstr ""
 "soportadas ao seu administrador de sistema."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Esta axenda de enderezos eliminarase permanentemente."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Esta axenda de enderezos non se puido abrir."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 ""
 "Este servidor de axendas de enderezos non ten ningunha das bases de busca "
 "propostas."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Pode que este servidor de axendas de enderezos non se poida alcanzar ou o "
 "nome do servidor estea mal escrito ou talvez a súa conexión de rede estea "
 "caída."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Esta axenda de enderezos eliminarase permanentemente."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor non soporta o esquema de información LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Non é posible abrir a axenda de enderezos"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -513,10 +521,10 @@ msgstr "Quere gardar os cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
-"Está tentando mover un contacto desde unha axenda a outra mais non se pode "
+"Está tentando mover un contacto desde unha axenda a outra, mais non se pode "
 "eliminar da orixe. Quere gardar unha copia en vez de movelo?"
 
 #: ../addressbook/addressbook.error.xml.h:34
@@ -571,7 +579,7 @@ msgstr "_Redimensionar"
 msgid "_Use as it is"
 msgstr "_Usar tal como está"
 
-#. 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."
+#. 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}"
@@ -588,7 +596,7 @@ msgstr "Enderezo de sincronización predeterminado:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Non se puido cargar a axenda de enderezos"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -690,39 +698,39 @@ msgstr "Persoal"
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Ax_enda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Fallo ao actualizar a configuración da axenda de enderezos ou os cartafoles."
@@ -748,7 +756,7 @@ msgstr ""
 #: ../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:280 ../mail/mail-config.glade.h:89
+#: ../mail/em-folder-properties.c:282 ../mail/mail-config.glade.h:89
 #: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -775,7 +783,7 @@ msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:982
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Buscando"
 
@@ -918,7 +926,7 @@ 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:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1281,7 +1289,7 @@ msgstr "cartóns"
 #: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
 #: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutos"
@@ -3588,9 +3596,9 @@ msgstr "Método de autenticación non soportado"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 ""
 "Non foi posible abrir esta axenda de enderezos. Isto significa que esta "
 "axenda ou non está marcada para o uso sen conexión ou non se descargou para "
@@ -3600,7 +3608,7 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, 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 ""
 "Non foi posible abrir esta axenda de enderezos. Verifique que o camiño %s "
@@ -3608,8 +3616,8 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
 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 ""
 "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."
@@ -3625,8 +3633,8 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:132
 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 ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor é inaccesible."
@@ -3640,7 +3648,7 @@ 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 ""
 "A consulta encontrou máis cartóns dos que o servidor está\n"
 "configurado para devolver ou dos que Evolution está configurado\n"
@@ -3651,9 +3659,9 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:167
 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 ""
 "O tempo para executar esta consulta excedeu o límite do\n"
 "servidor ou o límite que configurou na axenda de enderezos.\n"
@@ -3661,12 +3669,12 @@ msgstr ""
 "preferencias do servidor de directorio para esta axenda de enderezos."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
+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
-msgid "The backend for this addressbook refused to perform this query."
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "O backend para esta axenda de enderezos rexeitou efectuar esta consulta."
 
@@ -3817,7 +3825,7 @@ msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Gardar na axenda de enderezos"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
@@ -4080,7 +4088,7 @@ msgid "Can not open file"
 msgstr "Non se puido abrir o ficheiro"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Non se puido obter unha lista de axendas de enderezos"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4096,7 +4104,7 @@ msgid "OUTPUTFILE"
 msgstr "FICHEIRO DE SA�DA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Listar os cartafoles de axendas de enderezos locais"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4635,8 +4643,8 @@ 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/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Notas"
 
@@ -4681,7 +4689,7 @@ msgstr[1] "minutos"
 #: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
 #: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
@@ -4752,7 +4760,7 @@ 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:1587
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Aviso"
 
@@ -5358,7 +5366,7 @@ msgstr "Purgar eventos anteriores a"
 #: ../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:717
+#: ../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"
@@ -5412,55 +5420,55 @@ msgstr "Non hai ningún calendario dispoñible para crear eventos e reunións"
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1597
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1605
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1613
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1619
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1621
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crear un novo calendario"
 
@@ -5706,7 +5714,7 @@ msgstr "Método non soportado ao abrir o calendario"
 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:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -6200,7 +6208,7 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
@@ -6750,7 +6758,7 @@ msgstr "Personalizar"
 #: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ningún"
 
@@ -6840,7 +6848,7 @@ msgstr "Non é posible abrir as notas en '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Para"
@@ -8138,7 +8146,7 @@ msgid "Update"
 msgstr "Actualizar"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -8147,7 +8155,7 @@ msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Rexeitar"
 
@@ -8413,7 +8421,7 @@ msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2960
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8490,12 +8498,12 @@ msgstr "Cargando tarefas de %s"
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2919
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3873
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Depurando"
 
@@ -8645,46 +8653,46 @@ msgstr "Non hai un calendario dispoñible para crear notas"
 msgid "Memo Source Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nova nota"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crear unha nova nota"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crear unha nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Li_sta de notas"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
@@ -8941,11 +8949,6 @@ msgstr "Categorías: %s"
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Citas próximas"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
@@ -8975,42 +8978,42 @@ msgstr "Non hai ningún calendario dispoñible para crear tarefas"
 msgid "Task Source Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1326
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1334
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crear unha nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1342
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de tare_fas"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
@@ -9094,1532 +9097,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do 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 "�frica/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�frica/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�frica/Adís_Abeba"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�frica/Alxer"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�frica/Asmara"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�frica/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�frica/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�frica/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�frica/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "�frica/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�frica/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�frica/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�frica/O Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�frica/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�frica/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�frica/Conacri"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�frica/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "�frica/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�frica/Xibutí"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "�frica/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "�frica/O_Aaiún"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�frica/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�frica/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�frica/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�frica/Johannesburgo"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�frica/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�frica/Khartum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�frica/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�frica/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�frica/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�frica/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�frica/Lomé"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�frica/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "�frica/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�frica/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�frica/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�frica/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�frica/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�frica/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "�frica/Mogadixo"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�frica/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�frica/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�frica/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�frica/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�frica/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�frica/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�frica/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "�frica/São_Tomé"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�frica/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�frica/Trípoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�frica/Tunes"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�frica/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "América/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "América/Asunción"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "América/Belém"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "América/Belice"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "América/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "América/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "América/Cancún"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "América/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "América/Caimán"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "América/Córdoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "América/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "América/Cuiabá"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "América/Curaçao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "América/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "América/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "América/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "América/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "América/Eirunepé"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "América/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "América/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "América/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "América/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "América/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "América/Granada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "América/Guadalupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "América/Güiana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "América/A Habana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianápolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "América/Indianápolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "América/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "América/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "América/Xamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "América/A_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "América/Os_�nxeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "América/Maceió"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "América/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "América/Martinica"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "América/Mazatlán"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "América/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "América/Mérida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "América/Cidade_de México"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "América/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "América/Monterrei"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "América/Nova_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "América/Dakota_ do Norte/do Centro"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "América/Porto Príncipe"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "América/Porto_de_España"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "América/Pôrto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "América/Porto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "América/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "América/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "América/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "América/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "América/São_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "América/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "América/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "América/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "América/Sta_Lucía"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "América/Sto_Tomás"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "América/S_Vincente"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "América/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "América/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "América/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "América/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "América/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antártida/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antártida/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártida/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antártida/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antártida/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antártida/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antártida/Polo_Sur"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antártida/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antártida/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "�rtico/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Adén"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amán"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrein"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Bakú"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongking"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damasco"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Estambul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Xerusalén"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandú"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangún"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkanda"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seúl"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shangai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Teherán"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Toquio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlántico/Os Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlántico/Bermudas"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlántico/Canarias"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlántico/Cabo Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlántico/Feroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlántico/Jan Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlántico/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlántico/Reiquiavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlántico/Xeorxia_do Sur"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlántico/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlántico/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaida"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlín"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelas"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhaguen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublín"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Xibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Estambul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrado"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Liubliana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Mónaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moscova"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/París"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Saraxevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofía"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallin"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsovia"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zúric"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "�ndico/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "�ndico/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "�ndico/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "�ndico/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "�ndico/Comores"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "�ndico/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "�ndico/Mahé"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "�ndico/Maldivas"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "�ndico/Mauricio"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "�ndico/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "�ndico/Reunión"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacífico/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacífico/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacífico/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacífico/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacífico/Fixi"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galápagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulú"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacífico/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacífico/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacífico/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Tahití"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
@@ -10869,19 +10891,19 @@ msgstr "_Asunto:"
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Prema aquí para ir á axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
@@ -10889,7 +10911,7 @@ msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Mostrar a _barra de anexos"
 
@@ -11080,7 +11102,7 @@ msgstr "_Continuar editando"
 msgid "_Do not Recover"
 msgstr "_Non recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Recuperar"
 
@@ -11130,11 +11152,11 @@ msgstr "Consulta do Evolution"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno: requirido un erro descoñecido '%s'"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Compoñente"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "O nome da compoñente que rexistrar"
 
@@ -11149,15 +11171,15 @@ msgstr "Activado"
 msgid "Whether the plugin is enabled"
 msgstr "Se o complemento está activado"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Ocorreu un erro ao imprimir"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impresión informou dos seguintes detalles sobre o erro:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -11539,7 +11561,7 @@ msgstr "a hora especificada"
 
 #: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "semanas"
@@ -11615,8 +11637,8 @@ 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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
@@ -11657,13 +11679,13 @@ 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:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:512
 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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
@@ -11748,7 +11770,7 @@ msgstr "Engadir script de sinatura"
 msgid "Signature(s)"
 msgstr "Sinatura(s)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
@@ -11947,7 +11969,7 @@ 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:62
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Ler"
 
@@ -12019,9 +12041,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:311
+#: ../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
 msgid "Subject"
@@ -12040,51 +12062,51 @@ msgstr "Entón"
 msgid "Add Ac_tion"
 msgstr "Engadir a_cción"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son correos non desexados"
 
-#: ../mail/em-folder-browser.c:1170
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Busca na conta"
 
-#: ../mail/em-folder-browser.c:1223
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
@@ -12103,20 +12125,26 @@ msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:195
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Uso da cota (%s):"
+
+#: ../mail/em-folder-properties.c:197
+#, c-format
 msgid "Quota usage"
 msgstr "Uso da cota"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../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:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:388
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
@@ -12218,7 +12246,7 @@ msgstr "_Copiar ao cartafol"
 msgid "_Move to Folder"
 msgstr "_Mover ao cartafol"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
@@ -12268,20 +12296,20 @@ msgid "C_opy"
 msgstr "C_opiar"
 
 #: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../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
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../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
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especifica onde crear o cartafol:"
 
@@ -12411,9 +12439,9 @@ msgstr "Filtrar por lista de _correo"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "Predeterminado"
 
@@ -12729,19 +12757,19 @@ msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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:209
+#: ../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 "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Aplicación de correo"
@@ -12764,13 +12792,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensaxe foi enviada por <b>%s</b> no nome de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:307
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Responder a"
@@ -13033,7 +13061,7 @@ msgstr "Engadir enderezo"
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "_Cartafoles de busca"
 
@@ -13183,22 +13211,22 @@ msgstr "Largura predeterminada do diálogo de subscrición."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Determina se se deben buscar os enderezos para o correo non desexado "
 "filtrando soamente no libro de enderezos local"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se se debe buscar o enderezo do remitente no libro de enderezos"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Determina se se debe buscar o enderezo do remitente no libro de enderezos. "
@@ -13622,7 +13650,7 @@ msgid "Save directory"
 msgstr "Directorio onde gardar"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
+msgid "Search for the sender photo in local address books"
 msgstr "Buscar a foto do remitente nas axendas locais de enderezos"
 
 #: ../mail/evolution-mail.schemas.in.h:115
@@ -13771,7 +13799,7 @@ msgstr ""
 #: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "Esta opción está relacionada coa chave lookup_addressbook e úsase para "
@@ -13973,7 +14001,7 @@ msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
@@ -14025,144 +14053,144 @@ msgstr "Engadir regra de filtraxe"
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionado, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminado"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, 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:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviado"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviado"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nova mensaxe de correo"
 
-#: ../mail/mail-component.c:917
+#: ../mail/mail-component.c:924
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Novo cartafol de correo"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:932
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Cartafol de correo"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol de correo novo"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallou ao actualizar a configuración do correo ou os cartafoles."
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Erro"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Erros"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Avisos e erros"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Erro, avisos e mensaxes de depuración"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Rexistros de depuración"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1739
 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:1745
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Mensaxes de rexistro:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Pechar esta ventá"
@@ -14418,7 +14446,7 @@ msgid "Do not format messages when text si_ze exceeds"
 msgstr "Non formatar os correos se o ta_maño do texto excede"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Non mar_car os correos como non desexados se o remitente está na miña axenda "
 "de enderezos"
@@ -14631,7 +14659,7 @@ msgid "S_OCKS Host:"
 msgstr "Equipo S_OCKS:"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar fotografías do remitente só nas axendas de enderezos locais"
 
 #: ../mail/mail-config.glade.h:128
@@ -14741,7 +14769,7 @@ msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../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:"
@@ -14798,7 +14826,7 @@ msgid "_Load images in messages from contacts"
 msgstr "_Cargar imaxes no correo dos contactos"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "_Buscar soamente na axenda de enderezos local"
 
 #: ../mail/mail-config.glade.h:172
@@ -14927,7 +14955,7 @@ msgstr "_Buscar:"
 msgid "Find in Message"
 msgstr "Buscar na mensaxe"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
@@ -15034,96 +15062,96 @@ msgstr "Cancelado."
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Obtendo a información de cota para o cartafol %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando cartafol '%s'"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Actualizando o cartafol"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Expurgando o cartafol"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en '%s'"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando a mensaxe %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, 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:1978
+#: ../mail/mail-ops.c:1980
 #, 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:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15132,11 +15160,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15145,27 +15173,27 @@ msgstr ""
 "Non se pode crear o ficheiro de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non se poden escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Conectando novamente a %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta '%s' para o modo sen conexión"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Verificando servizo"
 
@@ -16013,39 +16041,39 @@ msgstr "Mensaxes enviadas"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Non reenviar"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:64 ../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 "Responder a todos"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revisar"
 
@@ -16147,29 +16175,29 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Plugin de son en liña"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do arquivo de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione o nome do arquivo de copia de seguranza do Evolution para "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Restaurar desde unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16180,119 +16208,119 @@ msgstr ""
 "enderezos. \n"
 "Tamén restaura todas as configuracións persoais, filtros de correo etc."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution desde o arquivo de copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione o arquivo do Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Restaurar o directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Comprobar a copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Con interface de usuario gráfica"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 "Facendo unha copia de seguranza das contas e configuracións do Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendario, tarefas, notas)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Terminou a copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Facendo unha copia dos datos actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Extraendo ficheiros da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Cargando a configuración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "Asegurando fontes locais"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza en %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Restauración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Espere mentras Evolution respalda o seus datos."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Restaurando os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Espere mentras Evolution restaura os seus datos."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto pode levar un tempo dependendo da cantidade de datos na súa conta."
@@ -16382,7 +16410,7 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:567
-msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Crear entradas _automaticamente na axenda de enderezos ao responder a "
 "mensaxes"
@@ -16413,7 +16441,7 @@ msgstr "Sincronizar coa lista de _amigos agora"
 
 #: ../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 ""
@@ -16484,7 +16512,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
 #: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Usar _SSL"
@@ -16507,7 +16535,7 @@ msgstr "Proporciona funcionalidade básica para calendarios locais."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
 #: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "Ac_tualizar:"
@@ -16620,7 +16648,7 @@ msgstr ""
 "predeterminado?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16646,7 +16674,7 @@ msgstr "Orixes predeterminadas"
 
 #: ../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 ""
 "Proporciona funcionalidade para marcar calendarios ou axendas de enderezos "
@@ -16850,7 +16878,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16858,7 +16886,7 @@ msgstr ""
 "O contrasinal actual non coincide co contrasinal existente para a súa conta. "
 "Introduza o contrasinal correcto"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Os dous contrasinais non coinciden. Reintroduza os contrasinais."
 
@@ -17034,7 +17062,7 @@ msgstr "_Resumir permisos"
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permisos..."
@@ -17048,11 +17076,11 @@ msgid "Folder Size"
 msgstr "Tamaño do cartafol"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Usuario"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Subscribirse ao cartafol doutro usuario"
@@ -17268,10 +17296,6 @@ msgstr "_Sensibilidade: "
 msgid "_User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccionar usuario"
@@ -17437,7 +17461,7 @@ msgid "Folder offline"
 msgstr "Cartafol sen conexión"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Erro xenérico"
 
@@ -17562,7 +17586,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Erro descoñecido ao buscar {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
@@ -17697,11 +17721,11 @@ msgstr "Compoñer nun editor _externo"
 msgid "Compose messages using an external editor"
 msgstr "Compoñer mensaxes usando un editor externo"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando a executar para lanzar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17709,15 +17733,15 @@ msgstr ""
 "Para Emacs use \"xemacs\"\n"
 "Para VI use \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Elixa unha imaxe (48*48) png de tamaño < 700bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Ficheiros PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Cara"
 
@@ -17763,18 +17787,18 @@ msgstr "E_liminar subscrición"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Introduza primeiro o nome de usuario."
 
-#: ../plugins/google-account-setup/google-source.c:497
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza o contrasinal para que o usuario %s poida acceder á lista de "
 "calendarios subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17783,11 +17807,11 @@ msgstr ""
 "Non se poden ler os datos do servidor de Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr "Recuperando _lista"
 
@@ -17985,7 +18009,7 @@ msgstr "Non pode compartir o cartafol co usuario especificado &quot;{0}&quot;"
 msgid "You have to specify a user name whom 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:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Aceptar provisionalmente"
 
@@ -18107,20 +18131,20 @@ 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/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Novo cartafol _compartido..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -18276,7 +18300,7 @@ msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importar"
 
@@ -18320,7 +18344,8 @@ msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Sincronizar a tarefa/nota/calendario/axenda de enderezos seleccionada co "
 "Apple iPod"
@@ -19211,12 +19236,12 @@ msgstr "Con_verter en reunión"
 msgid "Mail to meeting"
 msgstr "Correo para a reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non se puido abrir o calendario %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19415,11 +19440,11 @@ msgstr "_Subscribirse á lista"
 msgid "_Unsubscribe from List"
 msgstr "E_liminar subscrición da lista"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "Marcar tamén as mensaxes no subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../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?"
@@ -19427,11 +19452,11 @@ msgstr ""
 "Quere marcar as mensaxes como lidas só no cartafol actual, ou no cartafol "
 "actual e tamén en todos os seus subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Cartafol actual e _subcartafoles"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Soamente o _cartafol actual"
 
@@ -19942,24 +19967,24 @@ msgid "Importing files"
 msgstr "Importar ficheiros"
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:143
+#: ../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
-#: ../shell/e-shell-importer.c:396
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:230
-#: ../shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
 #: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:521
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Espere"
 
@@ -19976,7 +20001,7 @@ msgid "Thread messages by subject"
 msgstr "Encadear mensaxes polo asunto"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Volver ao encadeamento de mensaxes polo _asunto"
 
@@ -20063,52 +20088,48 @@ msgid "Configuration version"
 msgstr "Versión de configuración"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Indica se se debe executar ou non o detector de fallos."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largura predeterminada da barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Altura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Estado predeterminado da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Largura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Activar as configuracións do proxy ao acceder HTTP/Secure HTTP en internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Nome do equipo proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Contrasinal do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Porto do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Nome de usuario do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 ou alias do compoñente que se mostrará por defecto ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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/"
@@ -20120,46 +20141,46 @@ msgstr ""
 "network_config/authentication_user\" e o contrasinal gárdase por medio de "
 "gnome-keyring ou o ficheiro de contrasinal ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Última versión da configuración actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de camiños aos cartafoles que se sincronizarán co disco para o uso sen "
 "conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Equipos que non sexan proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Contrasinal para pasar como autenticación ao facer HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Modo de configuración do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Nome do equipo proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Porto do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Nome do equipo proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Porto do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -20171,27 +20192,23 @@ msgstr ""
 "proxy\", \"usar a configuración manual do proxy\" e \"usar a URL para a "
 "configuración automática do proxy:\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "A barra lateral é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Saltar o diálogo de aviso de recuperación"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "A barra de estado é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20199,19 +20216,19 @@ msgstr ""
 "A versión de configuración do Evolution, co nivel de configuración maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "A largura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura predeterminada para a barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20219,19 +20236,19 @@ msgstr ""
 "A última versión actualizada da configuración do Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "O nome da máquina pola que se fai proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "O nome da máquina pola que se fai proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "O nome da máquina pola que se fai proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -20239,7 +20256,7 @@ msgstr ""
 "O porto da máquina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -20247,7 +20264,7 @@ msgstr ""
 "O porto da máquina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -20255,7 +20272,7 @@ msgstr ""
 "O porto da máquina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20265,7 +20282,7 @@ msgstr ""
 "\"toolbar\". Se se selecciona \"toolbar\", o estilo dos botóns determinarase "
 "pola configuración da barra de ferramentas do Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20278,66 +20295,58 @@ msgstr ""
 "(tanto IPv4 como IPv6) e enderezos de rede coa máscara de rede (do estilo "
 "192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL que fornece os valores de configuración do proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Nome de usuario a pasar como autenticación ao usar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution se iniciará en modo sen conexión en vez de en modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Indica se a detección de fallos debe executarse ou non"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Se a ventá debería ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Se a barra de estado debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Se se salta o diálogo de aviso cando Evolution se está recuperando."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botóns da ventá deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Estilo dos botóns de ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Os botóns da ventá son visibles"
 
@@ -20360,22 +20369,16 @@ msgstr "Seleccione o tipo de importador que se 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.\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 ""
 "Seleccione o ficheiro que quere importar ao Evolution e seleccione que tipo "
-"de ficheiro é na lista.\n"
-"\n"
-"Pode seleccionar \"Automático\" se non o sabe e o Evolution tentará "
-"averigualo."
+"de ficheiro é na lista."
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../shell/e-shell-importer.c:146
+#: ../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"
@@ -20387,23 +20390,23 @@ msgstr ""
 "localizou ningunha configuración que se poida importar. Se\n"
 "quere tentalo de novo, prema o botón \"Atrás\".\n"
 
-#: ../shell/e-shell-importer.c:284
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../shell/e-shell-importer.c:289
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../shell/e-shell-importer.c:298
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:334
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../shell/e-shell-importer.c:337
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
@@ -20413,7 +20416,7 @@ msgstr "Preferencias do 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20465,7 +20468,7 @@ msgstr "_Traballar sen conexión"
 msgid "Work Offline"
 msgstr "Traballar sen conexión"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20473,11 +20476,11 @@ msgstr ""
 "O Evolution está conectado neste momento.\n"
 "Prema neste botón para traballar sen conexión."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está en proceso de desconexión."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20485,52 +20488,52 @@ msgstr ""
 "O Evolution está actualmente sen conexión.\n"
 "Prema neste botón para traballar con conexión."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Erro de sistema descoñecido."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Os argumentos non son válidos"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Non se localizou a base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Novo"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nova proba"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
 msgctxt "New"
 msgid "_Test"
 msgstr "_Proba"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Crear un novo elemento de proba"
 
@@ -20574,7 +20577,7 @@ msgstr ""
 "ficheiros externos ao Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20611,7 +20614,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos ansiosamente as súas colaboracións.\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20619,66 +20622,43 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Detector de fallos do Evolution"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norar"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Parece que Evolution pechouse de forma inesperada a última vez que se\n"
-"executou. Como medida de precaución ocultaranse todos os paneis de vista\n"
-"previa. Pode restablecer os paneis de vista previa desde o menú Ver.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "_Non mostrar esta mensaxe outra vez"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar o peche de todos os compoñentes do Evolution"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza a remigración desde o Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera plugin."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar a vista previa do correo, contactos e tarefas."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20923,7 +20903,7 @@ msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20932,7 +20912,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20941,7 +20921,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -21359,7 +21339,7 @@ msgid "Copy to Folder..."
 msgstr "Copiar ao cartafol..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Crear un novo cartafol da axenda de enderezos"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -22857,13 +22837,13 @@ msgstr "Tipo de visualización:"
 msgid "Attachment Bar"
 msgstr "Barra de anexos"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non se pode anexar o ficheiro %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Non se pode anexar o ficheiro %s: non é un ficheiro normal"
@@ -23952,6 +23932,42 @@ msgstr "Contexto MI"
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Citas próximas"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Indica se se debe executar ou non o detector de fallos."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Saltar o diálogo de aviso de recuperación"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Indica se a detección de fallos debe executarse ou non"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "Se se salta o diálogo de aviso cando Evolution se está recuperando."
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Detector de fallos do Evolution"
+
+#~ msgid "Ig_nore"
+#~ msgstr "Ig_norar"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Parece que Evolution pechouse de forma inesperada a última vez que se\n"
+#~ "executou. Como medida de precaución ocultaranse todos os paneis de vista\n"
+#~ "previa. Pode restablecer os paneis de vista previa desde o menú Ver.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Non mostrar esta mensaxe outra vez"
+
 #~ msgid "Updating query"
 #~ msgstr "Actualizando consulta"
 
diff --git a/po/he.po b/po/he.po
index ed2dfed886..c15cc3f3c4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4,13 +4,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Gil Osher <dolfin@rpg.org.il>, 2004.
 #
-#: ../shell/main.c:695
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-16 19:53+0000\n"
-"PO-Revision-Date: 2008-04-12 17:02+0200\n"
+"POT-Creation-Date: 2008-08-30 11:43+0000\n"
+"PO-Revision-Date: 2008-08-28 15:33+0200\n"
 "Last-Translator: Mark Krapivner <mark125@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,21 +21,22 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+#, fuzzy
+msgid "evolution address book"
 msgstr "ספר הכתובות של Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "�יש קשר חדש"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, fuzzy, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -108,7 +109,7 @@ msgstr "לך �ל היו�"
 msgid "Go to Date"
 msgstr "לך �ל ת�ריך"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-day-view-main-item.c:301
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr ""
@@ -152,8 +153,8 @@ msgstr ""
 msgid "calendar view for one or more days"
 msgstr ""
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -163,30 +164,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:750
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../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
 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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -195,33 +196,33 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../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
 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:766
 msgid "Gnome Calendar"
 msgstr "יומן Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr ""
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 #, fuzzy
 msgid "evolution calendar search bar"
 msgstr "Evolution ל� יכולה להתחיל."
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr ""
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "לחץ כ�ן, �פשר למצו� �ירועי� נוספי�."
 
@@ -289,7 +290,7 @@ msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell.c:107
 msgid "Table Cell"
-msgstr ""
+msgstr "ת� בטבלה"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
@@ -301,7 +302,7 @@ msgstr "לחץ כ�ן כדי להוסיף"
 msgid "click"
 msgstr "לחץ"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 #, fuzzy
 msgid "sort"
 msgstr "מבנה"
@@ -321,15 +322,15 @@ msgstr "יומן: מ-%s ועד %s"
 msgid "evolution calendar item"
 msgstr "פריט יומן 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 "הש_תמש בברירת המחדל"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "תפריט קופץ"
 
@@ -345,16 +346,15 @@ msgstr "הפעל"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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?"
-msgstr ""
-"�יש קשר ע� כתובת זו כבר קיי�. ליצור כרטיס חדש ע� �ותה הכתובת בכל ז�ת?"
+msgstr "�יש קשר ע� כתובת זו כבר קיי�. ליצור כרטיס חדש ע� �ותה הכתובת בכל ז�ת?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -384,14 +384,15 @@ msgid "Could not get schema information for LDAP server."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+#, fuzzy
+msgid "Could not remove address book."
 msgstr "ל� ניתן להסיר ספר כתובות."
 
 #: ../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:12
@@ -399,7 +400,8 @@ msgid "Delete address book '{0}'?"
 msgstr "למחוק �ת ספר הכתובות '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+#, fuzzy
+msgid "Error loading address book."
 msgstr "שגי�ה בזמן טעינת ספר הכתובות."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -412,7 +414,7 @@ msgstr ""
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "נכשל במחיקת �יש קשר"
 
@@ -433,14 +435,14 @@ msgid "Some features may not work properly with your current server"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+#, fuzzy
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "ספר הכתובות של Evolution נסגר ב�ופן בלתי צפוי."
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"התמונה שנבחרה גדולה. לכווץ ולשמור �ותה?"
+msgstr "התמונה שנבחרה גדולה. לכווץ ולשמור �ותה?"
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -451,29 +453,30 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:24
 #, fuzzy
-msgid "This address book will be removed permanently."
+msgid "This address book could not be opened."
 msgstr "ספר הכתובות ל� יכל להיפתח."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
-msgstr "ספר הכתובות ל� יכל להיפתח."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+msgid "This address book server does not have any suggested search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "ספר כתובות זה יוסר לצמיתות."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+#, fuzzy
+msgid "Unable to open address book"
 msgstr "ל� ניתן לפתוח �ת ספר הכתובות"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -490,7 +493,7 @@ msgstr "ה�� ברצונך לשמור �ת השינויי� שלך?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 
@@ -502,8 +505,8 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+#, fuzzy
+msgid "You do not have permission to delete contacts in this address book."
 msgstr "�ין לך הרש�ות מספיקות על מנת למחוק �יש קשר מספר כתובות זה."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -534,15 +537,15 @@ msgstr "_�ל תשמור"
 
 #: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
-msgstr ""
+msgstr "_שנה גודל"
 
 #: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr ""
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#. 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:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -551,17 +554,18 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr ""
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+#, fuzzy
+msgid "Could not load address book"
 msgstr "ל� ניתן לטעון ספר כתובות"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -583,10 +587,10 @@ msgstr "הגדר �ת ההשלמה ה�וטומטית כ�ן"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
 msgstr "�נשי קשר"
 
@@ -611,7 +615,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution Address Book component"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolution S/Mime Certificate Management Control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -626,12 +631,13 @@ msgstr "Manage your S/MIME certificates here"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1475
+#: ../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
 msgid "On This Computer"
 msgstr "במחשב זה"
 
@@ -644,80 +650,84 @@ msgstr "במחשב זה"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../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 "�ישי"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "על שרתי LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "�יש _קשר"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "צור �יש קשר חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
-msgstr "_רשימת תפוצה"
+msgstr "_רשימת �נשי קשר"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "צור רשימת תפוצה חדשה"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "ספר _כתובות"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "צור ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "בסיס"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_סוג:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../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:292 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../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:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "כללי"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "ספר כתובות"
 
@@ -730,13 +740,13 @@ msgid "Authentication"
 msgstr "הזדהות"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "פרטי�"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "מחפש"
 
@@ -750,15 +760,15 @@ msgid "Address Book Properties"
 msgstr "מ�פייני ספר הכתובות"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr ""
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
-#, c-format
-msgid "Migrating `%s':"
-msgstr ""
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "מייב� `%s'"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -797,69 +807,75 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "החלף �ת ש� התיקייה \"%s\" ל:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "החלף �ת ש� התיקייה"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "ש� התיקייה ל� יכול להכיל �ת התו '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 #, fuzzy
 msgid "Save As vCard..."
 msgstr "שמור בש�..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../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 "_מחק"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_מ�פייני�"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "הכנס סיסמה ל-%s (משתמש %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
 msgid "Enter password"
@@ -955,7 +971,7 @@ msgid "Add Address Book"
 msgstr "ספר כתובות חדש"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "תמיד"
 
@@ -963,122 +979,127 @@ msgstr "תמיד"
 msgid "Anonymously"
 msgstr "�נונימי"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "בסיסי"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "ש� מבדיל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "כתובת דו�\"ל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "�בולוציה תשתמש בכתובת דו�\"ל זו להזדהות ע� השרת."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "ה_תחבר:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 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:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "לל� הצפנה"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "�חד"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "הצפנת SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "מסנן חיפוש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_בסיס חיפוש:מסנן חיפוש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_מסנן חיפוש:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "מסנן חיפוש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Sub"
 msgstr "נוש�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr ""
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "הצפנת TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1086,107 +1107,108 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "זהו הש� המל� של שרת ה-ldap שלך. לדוגמ�: \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "משתמש בכתובת דו�\"ל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "כ�שר �פשר"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_הוסף ספר כתובות"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "הגבלת הור_דה:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "שיטת ה_תחברות:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_ש�:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_שער:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_טווח חיפוש:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_שרת:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "השתמש ב_תקשורת מ�ובטחת:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "כרטיסי�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "דקות"
 
@@ -1227,7 +1249,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:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1239,16 +1261,16 @@ msgid "Ca_tegories..."
 msgstr "_קטגוריות..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../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:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "�יש קשר"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../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
 msgid "Contact Editor"
 msgstr "עורך �נשי הקשר"
 
@@ -1261,7 +1283,7 @@ msgid "Image"
 msgstr "תמונה"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1274,7 +1296,7 @@ msgid "Nic_kname:"
 msgstr "_כינוי:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1288,11 +1310,11 @@ msgstr "טלפון"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "עבודה"
 
@@ -1314,8 +1336,8 @@ msgid "_Birthday:"
 msgstr "יו� _הולדת:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "לוח _שנה:"
@@ -1404,1166 +1426,1167 @@ msgstr "_�יפה:"
 msgid "_Zip/Postal Code:"
 msgstr "מי_קוד:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "כתובת"
 
-#: ../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:300
+#: ../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:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../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
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "ניתן לעריכה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "�רה\"ב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "�פגניסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "�לבניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "�לג'יר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "סמו�ה ה�מריק�ית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "�נדורה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "�נגולה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "�נגווילה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "�נטרטיקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "�נטיגו�ה וברבודה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "�רגנטינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "�רמניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "�רובה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "�וסטרליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "�וסטריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "�זרבייג'�ן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "בהמה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "בחריין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "בנגלדש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "ברבדוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "בלרוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "בליז"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "בנין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "ברמודה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "בהוטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "בוליביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "בוסניה-הרצגובינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "בוטסו�נה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "�י בובט"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "ברזיל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "הטריטוריה הבריטית ב�וקיינוס ההודי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "סולטנות ברוניי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "בולגריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "בורקינה פ�סו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "בורונדי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "קמבודיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "קמרון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "קנדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "קייפ ורדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "�יי קיימ�ן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "רפובליקת מרכז �פריקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "צ'�ד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "צ'ילה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "סין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "ה�י כריסמס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "�יי קוקוס (קילינג)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "קולומביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "קומורו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "קונגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "הרפובליקה הדמוקרטית של קונגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "�יי קוק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "קוסטה ריקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "חוף השנהב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "קרו�טיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "קובה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "קפריסין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "צ'כיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "דנמרק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "ג'יבוטי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "דומיניקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "הרפובליקה הדומיניקית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "�קוודור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "מצריי�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "�ל סלו�דור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "גינ�ה המשוונית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "�ריתרי�ה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "�סטוניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "�תיופיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "�יי פוקלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "�יי פ�רו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "פיג'י"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "צרפת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "גו�ינה הצרפתית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "פולינסיה הצרפתית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "הטריטוריות הדרומיות הצרפתיות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "גבון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "גמביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "גרוזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "גרמניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "ג�נה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "גיברלטר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "יוון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "גרינלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "גרנדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "גוו�דלופ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "גו��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "גו�טמלה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "גורנזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "גו�ינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "גינ�ה-ביס�ו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "גוי�נה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "ה�יטי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "�יי ה�רד ומקדונלד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "הונדורס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "הונג קונג"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "הונגריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "�יסלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "הודו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "�ינדונזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "�יר�ן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "עיר�ק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "�ירלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "ה�י מ�ן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "ישר�ל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "�יטליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "ג'מייקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "יפן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "ג'רסי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ירדן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "קזחסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "קניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "קיריב�טי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "קורי�ה, רפובליקת ה�נשי� הדמוקרטית של"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "קורי�ה, רפובליקת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "קווית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "קיגיזסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "ל�וס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "לטביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "לבנון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "לסוטו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "ליבריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "לוב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "ליכטנשטיין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "ליט�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "לוקסמבורג"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "מק�ו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "מקדוניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "מדגסק�ר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "מל�ווי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "מלזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "ה�יי� המלדיביי�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "מ�לי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "מלטה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "�יי מרשל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "מרטיניק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "מ�וריטניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "מ�וריציוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "מ�יוט"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "מקסיקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "מיקרונזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "מולדובה, רפובליקת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "מונקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "מונגוליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "מונסר�ט"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "מרוקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "מוזמביק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "מי�נמר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "נמביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "נ�ורו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "נפ�ל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "ה�נטילי� ההולנדיי�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "קלדוניה החדשה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "ניו-זילנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "ניקר�גו�ה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "ניגר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "ניגריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "ניווה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "ה�י נורפוק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "�יי מרי�נה הצפוניי�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "�ומן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "פקיסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "פל�ו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "הטריטוריה הפלשתינית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "פנמה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "פפ�ו גיני�ה החדשה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "פר�גוו�י"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "פרו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "פיליפיני�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "פיטקרן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "פולין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "פורטו ריקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "קט�ר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "ריוניון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "רומניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "רוסיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "רו�נדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "סנט קיטס ונוויס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "סנט לוסיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "סנט וינסנט והגרנדיני�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "סמו�ה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "ס�ן מ�רינו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "ס�ו תומה ופרינסיפה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "ערב הסעודית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "סנגל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "סרביה ומונטגרו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "סיישל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "סיירה ל�ונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "סינגפור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "סלובקיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "סלובניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "�יי סלומון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "סומליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "דרו� �פריקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "�יי ג'ורג'יה הדרומית ו�יי סנדוויץ' הדרומיי�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "סרי לנקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "סנט הלנה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "סודן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "סורינ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "סווזילנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "שווייץ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "סוריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "טיוו�ן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "ט�ג'יקיסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "טנזניה, הרפובליקה המ�וחדת של"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "ת�ילנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "טימור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "טוגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "טוקל�ו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "טונגה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "טרינידד וטוב�גו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "תוניס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "טורקיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "טורקמניסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "�יי טורקס וק�יקוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "טוב�לו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "�וגנדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "�וקר�ינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "�יחוד ה�מירויות הערביות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "�ורוגוו�י"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "�וזבקיסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "ונו�טו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "ונצו�לה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "וי�טנ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "�יי וירג'יניה, בריטניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "�יי וירג'יניה, �רה\"ב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "�יי ו�ליס ופוטונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "סהרה המערבית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "תימן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "זמביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "זימבבווה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "ש�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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:111
 msgid "Service"
 msgstr "שרות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "מיקו�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "ש� משתמש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "בית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "ספר מקור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "ספר מטרה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "ה�� �יש קשר חדש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "שדות ניתני� לכתיבה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "שדות דרושי�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "שונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "עורך �נשי הקשר - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "�נ� בחר תמונה בעבור �יש קשר זה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "לל� _תמונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "�יש קשר שגוי."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_ש� מל�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "דו�\"ל"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_בחר ספר כתובות"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2572,7 +2595,7 @@ msgstr ""
 "�תה בטוח שברצונך\n"
 "למחוק �נשי קשר �לו (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2580,7 +2603,7 @@ msgstr ""
 "�תה בטוח שברצונך\n"
 "למחוק רשימות �נשי קשר �לה?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2589,7 +2612,7 @@ msgstr ""
 "�תה בטוח שברצונך\n"
 "למחוק �ת �יש הקשר (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2717,7 +2740,7 @@ msgstr "בחר..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
-msgstr ""
+msgstr "_הסתר כתובות בזמן שליחת דו�ר לרשימה זו"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
@@ -2739,9 +2762,9 @@ msgstr "חברי�_"
 #: ../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:218
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../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
 msgid "Book"
 msgstr "ספר"
 
@@ -2782,40 +2805,40 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "מזג �יש קשר"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_מזג"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "מזג �יש קשר"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../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:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "דו�\"ל"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:166
-#: ../calendar/gui/cal-search-bar.c:81 ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:165
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "דו�\"ל מתחיל ב"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Name begins with"
-msgstr "הש� מתחיל ב"
+msgid "Name contains"
+msgstr "הש� מכיל"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2830,9 +2853,9 @@ msgstr[1] "%d �נשי קשר"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../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
 msgid "Query"
 msgstr "ש�ילתה"
 
@@ -2843,7 +2866,7 @@ msgstr "שגי�ה בקבלת תצוגת ספר"
 #: ../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:3335
+#: ../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
 msgid "Model"
@@ -2853,107 +2876,110 @@ msgstr "מודל"
 msgid "Error modifying card"
 msgstr "שגי�ה בשינוי כרטיס"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "הש� מתחיל ב"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "מקור"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../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 "סוג"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 #, fuzzy
 msgid "Save as vCard..."
 msgstr "שמור בש�..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_פתח"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "�יש קשר _חדש..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "רשימת _תפוצה חדשה..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 #, fuzzy
 msgid "_Save as vCard..."
 msgstr "שמור בש�..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "העבר _�יש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "העבר �_נשי קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "שלח _הודעה ל�יש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "שלח הודעה ל_רשימה"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "שלח ה_ודעה ל�נשי קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "ה_דפס"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "העתק _לספר הכתובות..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "העבר ל_ספר הכתובות..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "ג_זור"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2065
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../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:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "ה_דבק"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1523
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "כל קטגוריה"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "תקלה �חרת"
@@ -2989,7 +3015,7 @@ msgstr "טלפון ברכב"
 
 #: ../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:143
+#: ../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
@@ -3090,9 +3116,9 @@ msgid "Radio"
 msgstr "רדיו"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../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:713
 msgid "Role"
 msgstr "תפקיד"
 
@@ -3128,38 +3154,38 @@ msgid "Web Site"
 msgstr "�תר ברשת"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../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:3078 ../widgets/table/e-table-item.c:3079
+#: ../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/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "רוחב"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
+#: ../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/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "גובה"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "יש פוקוס"
 
@@ -3179,11 +3205,21 @@ msgstr "מודל טקסט"
 msgid "Max field name length"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "רוחב עמודה"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"מחפש �ת �נשי הקשר..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3197,7 +3233,7 @@ msgstr ""
 "\n"
 "�ו לחץ לחיצה כפולה כ�ן כדי ליצור �יש קשר חדש."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3206,8 +3242,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3217,7 +3252,7 @@ msgstr ""
 "\n"
 "חפש �ת �יש הקשר."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3227,41 +3262,41 @@ msgstr ""
 "\n"
 "�ין פריטי� להר�ות בתצוגה ז�ת."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "מת��"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "דו�\"ל עבודה"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "דו�\"ל בית"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "דו�\"ל �חר"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "נבחר"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "יש סמן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_פתח �ת הקישור בדפדפן"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_העתק �ת מיקו� הקישור"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "ש_לח הודעה ל..."
 
@@ -3304,12 +3339,11 @@ msgid "Video Chat"
 msgstr "שיחת ויד�ו"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2372
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../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
@@ -3321,8 +3355,7 @@ msgstr "יומן"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "פנוי/עסוק"
 
@@ -3344,12 +3377,14 @@ msgid "Web Log"
 msgstr "יומן רשת"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2360
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2361
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "יו� שנה"
 
@@ -3395,7 +3430,7 @@ msgstr "ל� הוגדר �יש קשר עצמי"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "�ין הרש�ות"
 
@@ -3417,11 +3452,11 @@ msgstr "פרוטוקול ל� נתמך"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "בוטל"
 
@@ -3462,94 +3497,105 @@ msgstr "ל� זמין במצב ל� מקוון"
 msgid "Invalid server version"
 msgstr "גירסץ שרת ל� תקינה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "שיטת הזדהות ל� נתמכת"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 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:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, 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 ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 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 ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 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 ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "פרטי שגי�ה:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 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 ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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 ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
+msgstr "המנוע של ספר כתובות זה סרב לבצע �ת ש�ילתה ז�ת."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "המנוע של ספר כתובות זה סרב לבצע �ת ש�ילתה ז�ת."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "הש�ילתה ל� הסתיימה בהצלחה."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "שגי�ה בהוספת רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "שגי�ה בהוספת �יש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "שגי�ה בשינוי רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "שגי�ה בשינוי �יש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "שגי�ה בהסרת רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "שגי�ה בהסרת �יש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3564,17 +3610,16 @@ msgstr[1] ""
 "פתיחת %d �נשי קשר תפתח ג� %d חלונות חדשי�.\n"
 "להציג �ת �נשי הקשר?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
-msgstr ""
-"_�ל תציג"
+msgstr "_�ל תציג"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "הצג �ת _כל �נשי הקשר"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3583,70 +3628,70 @@ msgstr ""
 "�%s כבר קיי�\n"
 "ה�� להחליפו?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "�יש קשר"
 msgstr[1] "�נשי קשר"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "בחר ספר כתובות"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "הזז �יש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "העתק �יש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "הזז �נשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "העתק �נשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, fuzzy, c-format
 msgid "vCard for %s"
 msgstr "תיקייה ל� תקינה: `%s'"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "מידע �יש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "מידע �יש קשר עבור %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr ""
 
@@ -3654,10 +3699,8 @@ msgstr ""
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] ""
-"יש �יש קשר נוסף."
-msgstr[1] ""
-"יש %d �נשי קשר נוספי�."
+msgstr[0] "יש �יש קשר נוסף."
+msgstr[1] "יש %d �נשי קשר נוספי�."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
 #: ../addressbook/gui/widgets/eab-vcard-control.c:279
@@ -3670,51 +3713,52 @@ msgid "Show Compact vCard"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+#, fuzzy
+msgid "Save in address book"
 msgstr "שמור בספר הכתובות"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "מייב�..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "�CSV �ו Tab של Outlook �(‎.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "�CSV �ו Tab של Mozilla �(‎.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�CSV �ו Tab של Evolution �(‎.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 #, fuzzy
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution ל� יכולה להתחיל."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr ""
 
@@ -3768,7 +3812,7 @@ msgid "Format"
 msgstr "מבנה"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../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
@@ -3875,7 +3919,7 @@ msgstr ""
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3894,7 +3938,7 @@ msgid "Top:"
 msgstr "מעלה:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "סוג:"
 
@@ -3934,7 +3978,8 @@ msgid "Can not open file"
 msgstr "ל� ניתן לפתוח קובץ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+#, fuzzy
+msgid "Couldn't get list of address books"
 msgstr "ל� ניתן לקבל �ת רשימת ספרי הכתובות"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -3950,7 +3995,8 @@ msgid "OUTPUTFILE"
 msgstr ""
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+#, fuzzy
+msgid "List local address book folders"
 msgstr "רשימת תיקיות ספרי כתובות מקומיי�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4000,16 +4046,17 @@ msgstr "שגי�ה של� טופלה"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
-msgstr "'{0}' הו� מקור יומן לקרי�ה בלבד. החלף ליומן שיכול לקבל פגישות."
+"'{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
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "'{0}' הו� מקור יומן לקרי�ה בלבד. החלף ליומן שיכול לקבל פגישות."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4088,19 +4135,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "למחוק �ת פגישה ז�ת?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "למחוק �ת משימה ז�ת?"
@@ -4121,9 +4168,8 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "ה�� לשלוח �ת ההודעה לל� נוש�?"
 
 #: ../calendar/calendar.error.xml.h:28
-#, fuzzy
 msgid "Cannot create a new event"
-msgstr "צור �יש קשר חדש"
+msgstr "ל� ניתן ליצור �ירוע חדש"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot save event"
@@ -4244,8 +4290,9 @@ msgid "The calendar is not marked for offline usage."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr ""
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
+msgstr "התחל במצב ל� מקוון"
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4338,12 +4385,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ה_תעל� משינויי�"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_שמור"
 
@@ -4352,8 +4398,8 @@ msgid "_Save Changes"
 msgstr "שמור _שינויי�"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../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 "_שלח"
 
@@ -4365,55 +4411,56 @@ msgstr "_שלח התרעה"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "ל� ניתן להתחיל �ת evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "עדיפות ברירת מחדל:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "יומן ומשימות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "יומני�"
 
@@ -4454,23 +4501,23 @@ 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:1121
-#: ../calendar/gui/gnome-cal.c:1698 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1570 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4490,25 +4537,26 @@ msgstr "_משימות"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "דקה"
 msgstr[1] "דקות"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "שעה"
 msgstr[1] "שעות"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "שעת התחלה"
 
@@ -4519,9 +4567,9 @@ msgstr "פגישות"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "מיקו�:"
@@ -4531,15 +4579,15 @@ msgid "Snooze _time:"
 msgstr ""
 
 #: ../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:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../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 "_עריכה"
 
@@ -4551,32 +4599,32 @@ msgstr ""
 msgid "location of appointment"
 msgstr "מיקו� הפגישה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "�ין סיכו� זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "�ין תי�ור זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "�ין מידע מיקו� זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
-msgstr ""
+msgstr "יש לך %d התרעות"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "�זהרה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4584,7 +4632,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4595,15 +4643,15 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "�ל תש�ל �ותי על תוכנה ז�ת שוב."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "ל� ניתן ל�תחל �ת Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4614,7 +4662,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:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4623,7 +4671,7 @@ msgstr[0] "שעה �חת"
 msgstr[1] "%d שעות"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4634,7 +4682,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:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4877,12 +4925,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Show status field in the event/task/meeting editor"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Show the \"Preview\" pane"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Show the \"Preview\" pane."
 
@@ -4932,7 +4980,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Time the last alarm ran, in time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Timezone"
 
@@ -5066,83 +5114,84 @@ msgstr "Workday start minute"
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "הסיכו� מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "התי�ור מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "הקטגוריה הי�"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "ההערה מכילה"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "המיקו� מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "משימות פעילות"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
 #, fuzzy
 msgid "Overdue Tasks"
 msgstr "Overdue tasks color"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "משימות שהסתיימו "
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "משימות ע� תצריפי�"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "פגישות פעילות"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
 #, fuzzy
 msgid "Next 7 Days' Appointments"
 msgstr "פגישה לכל ה_יו�"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
+#: ../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 "ימי�"
@@ -5152,102 +5201,102 @@ msgstr "ימי�"
 #. 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:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
+#: ../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:404
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "ימי הולדת ו-\tימי שנה"
 
 #. 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 "מזג �ויר"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "יומן _חדש"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "ה_עתק..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2101
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_מ�פייני�"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "נכשל בשדרוג יומני�."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ל� ניתן לפתוח �ת היומן '%s' ליצירת �ירועי� ופגישות"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "�ין יומן זמין ליצירת �ירועי� וישיבות"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+#, fuzzy
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_פגישה"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "צור פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "ישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+#, fuzzy
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_ישיבה"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "צור בקשה לישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "פגישה חדשה לכל היו�"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+#, fuzzy
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "פגישה לכל ה_יו�"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "צור פגישה חדשה לכל היו�"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "יומן חדש"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+#, fuzzy
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_יומן"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "צור יומן חדש"
 
@@ -5268,15 +5317,228 @@ msgid "Month View"
 msgstr "תצוגת חודש"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "תצריפי�"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "פקס עסקי"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "קטגוריה"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "סיווג"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "ת�ריך סיו�"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "חסוי"
+
+#: ../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
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "תי�ור"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "התי�ור מכיל"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "קיי�"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "מועדפי�"
+
+#: ../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
+msgid "Holiday"
+msgstr "×—×’"
+
+#: ../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 "�נשי קשר"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "רעיונות"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "מסורתי"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "הת��"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "כללי"
+
+#: ../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 "_�רגון:"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "שיחות טלפון"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "פרטי"
+
+#: ../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
+msgid "Public"
+msgstr "ציבורי"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "מופע חוזר"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "מצב"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "קטגוריות"
+
+#: ../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:361
+msgid "Summary"
+msgstr "סיכו�"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "הסיכו� מכיל"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "ה_חל מסנני�"
+
+#: ../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
+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
+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
+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
+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
+msgid "is not"
+msgstr ""
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "שגי�ה בפתיחת היומן"
@@ -5289,11 +5551,11 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "שגי�ה ל� ידועה"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "ערוך התרעה"
 
@@ -5326,17 +5588,17 @@ msgid "Mes_sage:"
 msgstr "הו_דעה:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "נגן צליל"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "הפעל תוכנית"
 
@@ -5349,7 +5611,7 @@ msgid "Send To:"
 msgstr "שלח �ל:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "שלח דו�\"ל"
 
@@ -5404,7 +5666,7 @@ msgstr "דקה (דקות)"
 msgid "start of appointment"
 msgstr "תחילת הפגישה"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr ""
 
@@ -5415,16 +5677,15 @@ msgstr "הו_סף"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "התרעות"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "צרף קבצי�"
 
@@ -5493,8 +5754,8 @@ msgid "Display"
 msgstr "תצוגה"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "יו� שישי"
 
@@ -5509,8 +5770,8 @@ msgstr ""
 "ימי�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "יו� שני"
 
@@ -5533,7 +5794,7 @@ msgstr ""
 "ר�שון"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "בחר צבע"
 
@@ -5543,8 +5804,8 @@ msgid "S_un"
 msgstr "_�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "יו� שבת"
 
@@ -5561,8 +5822,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "הצג _מספרי שבועות בנווט הת�ריכי�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "יו� ר�שון"
 
@@ -5580,13 +5841,13 @@ msgid "Template:"
 msgstr "תבנית:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "יו� חמישי"
 
 #: ../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 "�זור _זמן:"
 
@@ -5595,14 +5856,14 @@ msgid "Time format:"
 msgstr "מבנה זמן:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "יו� רביעי"
 
@@ -5680,311 +5941,458 @@ msgstr "_ד"
 msgid "before every appointment"
 msgstr "לפני כל פגישה"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 msgid "Colo_r:"
 msgstr "_צבע:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "רשימת משימות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "רשימת תזכורות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "מ�פייני יומן"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "יומן חדש"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "מ�פייני רשימת משימות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "New Task List"
 msgstr "רשימת משימות חדשה"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "Memo List Properties"
 msgstr "מ�פייני רשימת תזכורות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "רשימת תזכורות חדשה"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "�ירוע זה נמחק."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "משימה זו נמחקה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "תזכורת זו נמחקה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
+msgstr "%s  ביצעת שינויי�. לשכוח �ת השינויי� ולסגור �ת העורך?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr ""
+msgstr "%s  ל� ביצעת שינויי�, לסגור �ת העורך?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "�ירוע זה השתנה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "משימה ז�ת השתנתה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "תזכורת ז�ת השתנתה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
+msgstr "%s  ביצעת שינויי�. לשכוח �ת השינויי� ולעדכן �ת העורך?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "שגי�ת וידו�: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " �ל "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (הסתיי� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "הסתיי� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (עד "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "עד "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "הודעה מצורפת - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "הודעה מצורפת"
 msgstr[1] "%d הודעות מצורפות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2066
+#: ../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
 msgid "_Move"
 msgstr "_העבר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "בטל _גרירה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../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
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "תצריף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "ל� ניתן לעדכן �ובייקט"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "ערוך פגישה"
+
+# c-format
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "ישיבה - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "פגישה - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "משימה - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "תזכורת - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "�ין סיכו�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "הקלק �ישור לסגור �ת החיבור ולעבוד בצורה ל� מקוונת"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "בחר �ת כל הטקסט"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_סיווג"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../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
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "עזר_ה"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_הכנס"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "�_פשרויות"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_תצריף..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "לחץ כ�ן לצרף קובץ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_קטגוריות"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "�זור _זמן"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "_ציבורי"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_פרטי"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "סווג כפרטי"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_חסוי"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "סווג כחסוי"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+#, fuzzy
+msgid "R_ole Field"
+msgstr "שדה"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+#, fuzzy
+msgid "_Status Field"
+msgstr "_מצב:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+#, fuzzy
+msgid "_Type Field"
+msgstr "שדה"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+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"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "צרף"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "תצריף <b>�חד</b>"
 msgstr[1] "<b>%d</b> תצריפי�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "הסתר �ת תיבת ה_תצריפי�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "הצג �ת תיבת ה_תצריפי�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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:1130
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "הוסף _תצריף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "הצג תצריפי�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "ערוך פגישה"
-
-# c-format
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "ישיבה - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "פגישה - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "משימה - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "תזכורת - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "�ין סיכו�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "ל� ניתן להשתמש בגירסה הנוכחית"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "ל� ניתן לפתוח �ת המקור"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "ל� ניתן לפתוח �ת היעד"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "היעד הו� לקרי�ה בלבד"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "ל� ניתן למחוק �ת ה�ירוע עקב שגי�ה"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "ל� ניתן למחוק �ת המשימה עקב שגי�ה"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "ל� ניתן למחוק �ת התזכורת עקב שגי�ה"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "ל� ניתן למחוק �ת הפריט עקב שגי�ה"
 
@@ -5993,7 +6401,7 @@ msgid "Contacts..."
 msgstr "�נשי קשר..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr ""
 
@@ -6001,138 +6409,186 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "ה_תרעות"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "מופע _חוזר"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "�פשרויות שליחה"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "המשתמש ביטל �ת הפעולה."
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "�ירוע חדש לכל היו�"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "כותרת ההודעה"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "פנוי/_עסוק:"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "_פגישה"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "מופע חוזר"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #, fuzzy
 msgid "Or_ganizer:"
 msgstr "_�רגון:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 #, fuzzy
 msgid "_Delegatees"
 msgstr "מחק"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 #, fuzzy
 msgid "Atte_ndees"
 msgstr "<b>מוזמני�</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "�ירוע לל� ת�ריך התחלה"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "�ירוע לל� ת�ריך סיו�"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "ת�ריך ההתחלה שגוי"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "ת�ריך הסיו� שגוי"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "שעת התחלה שגויה"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "שעת סיו� שגויה"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "הוסף_ "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ל� ניתן לפתוח �ת היומן '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "�תה פועל בש� %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "יו� �חד לפני הפגישה"
 msgstr[1] "%d ימי� לפני הפגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "שעה �חת לפני הפגישה"
 msgstr[1] "%d שעות לפני הפגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "דקה �חת לפני הפגישה"
 msgstr[1] "%d שעות לפני הפגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "הת��"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
-#: ../widgets/misc/e-signature-combo-box.c:69
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "לל�"
 
@@ -6158,23 +6614,25 @@ msgid "Custom Alarm:"
 msgstr "צליל התרעה מות�� �ישית"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "תי_�ור:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "תי�ור �ירוע"
 
-#: ../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 "_סיכו�:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "ה_תרעה"
 
+#: ../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 "_תי�ור:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_שעה:"
@@ -6205,29 +6663,24 @@ msgstr ""
 msgid "Co_ntacts..."
 msgstr "�נשי _קשר..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#, fuzzy
-msgid "Organizer"
-msgstr "_�רגון:"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "תזכורת"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ל� ניתן לפתוח תזכורות ב-'%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "�ל"
 
@@ -6240,63 +6693,59 @@ msgstr "ת�ריך _התחלה:"
 msgid "T_o:"
 msgstr "�ל_:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_תי�ור:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_קבוצה:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "מופע זה בלבד"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "מופע זה וקודמיו"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "מופע זה ומופעי� עתידיי�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "כל המופעי�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "פגישה ז�ת מכילה מופעי� חוזרי� של� ניתן לערוך."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr ""
 
@@ -6304,7 +6753,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "ר�שון"
 
@@ -6313,7 +6762,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "שני"
 
@@ -6321,7 +6770,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "שלישי"
 
@@ -6329,7 +6778,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "רביעי"
 
@@ -6337,13 +6786,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "�חרון"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "ת�ריך �חר"
 
@@ -6351,7 +6800,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr ""
 
@@ -6359,7 +6808,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] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr ""
 
@@ -6367,46 +6816,46 @@ 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] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr ""
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "מופעי�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "הוסף חריגה"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 #, fuzzy
 msgid "Could not get a selection to delete."
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "ת�ריך/שעה"
 
@@ -6457,12 +6906,12 @@ msgstr "שבוע(ות)"
 msgid "year(s)"
 msgstr "שנה(י�)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "ת�ריך הסיו� שגוי"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "דף מ�רג"
 
@@ -6477,51 +6926,55 @@ msgstr "<span weight=\"bold\">מצב</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "הסתיי�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "גבוה"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "בתהליך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "נמוך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "רגיל"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ל� התחיל"
 
@@ -6534,7 +6987,7 @@ msgid "Stat_us:"
 msgstr "_מצב:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "ל� מוגדר"
 
@@ -6551,26 +7004,39 @@ msgstr "_עדיפות:"
 msgid "_Web Page:"
 msgstr "_דף מ�רג:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:111
+#, fuzzy
+msgid "_Status Details"
+msgstr "פרטי�"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "Click to change or view the status details of the task"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr " _�פשרויות שליחה"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_משימה"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "פרטי משימה"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Organi_zer:"
 msgstr "_�רגון:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "ת�ריך היעד שגוי"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ל� ניתן לפתוח משימות ב-'%s'."
@@ -6584,19 +7050,15 @@ msgid "Categor_ies..."
 msgstr "_קטגוריות..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "תי�ו_ר:"
+msgid "D_ue date:"
+msgstr "ת�ריך _יעד:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "�זור זמן:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "ת�ריך _יעד:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6604,142 +7066,126 @@ msgstr[0] "יו� �חד"
 msgstr[1] "%d ימי�"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "שבוע �חד"
 msgstr[1] "%d שבועות"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "לחץ כדי לפתוח �ת %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../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:857
 msgid "Untitled"
 msgstr "לל�-ש�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../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 "ת�ריך התחלה:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../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 "תי�ור:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "דף מ�רג:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../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 "סיכו�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "ת�ריך יעד:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "מצב:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "עדיפות:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "ציבורי"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "פרטי"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "חסוי"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "ת�ריך סיו�"
@@ -6749,21 +7195,14 @@ msgstr "ת�ריך סיו�"
 msgid "Start Date"
 msgstr "ת�ריך התחלה"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:365
-msgid "Summary"
-msgstr "סיכו�"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "פנוי"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "עסוק"
 
@@ -6774,67 +7213,67 @@ msgid ""
 "45.436845,125.862501"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "כן"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "ל�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
+#: ../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
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "שמור בש�..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "בחר תיקייה למירת התצריפי�..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "תמונה_לל�_ש�.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../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
+#: ../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:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "קבע כ_רקע"
 
@@ -6843,132 +7282,159 @@ msgstr "קבע כ_רקע"
 msgid "_Save Selected"
 msgstr "נבחר"
 
-#: ../calendar/gui/e-cal-popup.c:439 ../mail/em-popup.c:853
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "פתח ב-%s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "_�רגון:"
+
+#. 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
+#, fuzzy, c-format
+msgid "Organizer: %s"
+msgstr "_�רגון:"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "התחלה:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "עד "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:679 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:809 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "מעדכן �ובייקטי�"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1235 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../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
 msgid "Save as..."
 msgstr "שמירה בש�..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "משימה _חדשה"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "פתח _דף מ�רג"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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:1374
-#: ../calendar/gui/e-calendar-view.c:1674
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ה_דבק"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "סמן כה_סתיי�"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "סמן כ_ל� הסתיי�"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 #, fuzzy
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "העבר �ת ההודעות שנבחרו ל�שפה"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "�לחץ כ�ן כדי להוסיף משימה"
@@ -6991,7 +7457,8 @@ msgid "Due date"
 msgstr "ת�ריך יעד"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "עדיפות"
 
@@ -6999,113 +7466,94 @@ msgstr "עדיפות"
 msgid "Start date"
 msgstr "ת�ריך התחלה"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "מצב"
-
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "מעביר פריטי�"
 
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "מעתיק פריטי�"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "_פגישה חדשה..."
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "_�ירוע של כל היו� חדש"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "ישיבה _חדשה"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_תצוגה נוכחית"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "בחר �ת _היו�"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "בחר _ת�ריך..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "הע_תק ליומן..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "ה_עבר ליומן..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1685
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_מחק..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_קבע ישיבה..."
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "ה_שב"
 
-#: ../calendar/gui/e-calendar-view.c:1703 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1689 ../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:1708
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1709 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "מחק _מופע זה"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "מחק �ת _כל המופעי�"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2232
-#, fuzzy, c-format
-msgid "Organizer: %s <%s>"
-msgstr "_�רגון:"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2236
-#, fuzzy, c-format
-msgid "Organizer: %s"
-msgstr "_�רגון:"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2252 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "_מיקו�: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "שעה: %s %s"
@@ -7131,7 +7579,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:583
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
@@ -7142,44 +7590,34 @@ msgstr ""
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:837 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
+#: ../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
 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:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "כל יו�"
 msgstr[1] "כל %d ימי�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7187,61 +7625,43 @@ msgid_plural "Every %d weeks"
 msgstr[0] "כל שבוע"
 msgstr[1] "כל %d שבועות"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "כל שבוע ב"
+msgstr[1] "כל %d שבועות ב"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr ""
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#. 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 ""
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "כל חודש"
 msgstr[1] "כל %d חודשי�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "כל שנה"
 msgstr[1] "כל %d שני�"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7249,333 +7669,333 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. 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 ""
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "מתחיל"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "מסתיי�"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr ""
 
-#: ../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 ""
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
-msgstr ""
-
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+msgstr "שגי�ת 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 ""
 
 #. 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 ""
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../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:2034
 msgid "Accepted"
-msgstr ""
+msgstr "התקבל"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../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:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../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:2040
 msgid "Declined"
 msgstr "נדחה"
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "מידע ישיבה"
 
-#: ../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> מבקש �ת הנוכחות של %s בישיבה."
 
-#: ../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> מבקש �ת הנוכחות שלך בישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "הצעת ישיבה"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> מבקש להצתרף לישיבה קיימת."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "עדכון לגבי ישיבה"
 
-#: ../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> מבקש לקבל �ת המידע העדכני ביותר לגבי הישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "�<b>%s</b> ביטל ישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "ביטול ישיבה"
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "ביטול משימה"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
-msgstr ""
+msgstr "העדכון הושל�\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "הפריט נשלח!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "בחר פעולה:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "קבל"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "סרב"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ביטול"
@@ -7604,113 +8024,113 @@ msgstr "טוען יומן..."
 msgid "Server Message:"
 msgstr "הודעת שרת:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "משתתפי� דרושי�"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "מש�בי�"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 #, fuzzy
 msgid "Attendees"
 msgstr "<b>מוזמני�</b>"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../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
 msgid "Individual"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "מש�ב"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "חדר"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr ""
 
-#: ../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-store.c:744 ../calendar/gui/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../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 ""
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../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
 msgid "Tentative"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../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
 msgid "Delegated"
 msgstr ""
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr ""
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
-msgstr ""
+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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7718,86 +8138,82 @@ 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:481
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "מחוץ למשרד"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "�ין מידע"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 #, fuzzy
 msgid "A_ttendees..."
 msgstr "<b>מוזמני�</b>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_�פשרויות"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "שעת ה_תחלה:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "שעת _סיו�:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr ""
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr ""
@@ -7830,93 +8246,89 @@ msgstr "_מחק �ת התזכורות שנבחרו"
 msgid "Click to add a memo"
 msgstr "לחץ כ�ן כדי להוסיף תזכורת"
 
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2860
+#: ../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 ""
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "טוען תזכורות"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "פותח תזכורות ב-%s"
 
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "מוחק �ת ה�ובייקטי� שנבחרו..."
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "טוען משימות"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "פותח משימות ב-%s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "מסיי� משימות..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr ""
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:339 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:825
-msgid "Updating query"
-msgstr "מעדכן ש�ילתה"
-
-#: ../calendar/gui/gnome-cal.c:2497
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_תצוגה מות�מת �ישית"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_שמור תצוגה מות�מת �ישית"
 
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2582
 #, fuzzy
 msgid "_Define Views..."
 msgstr "תצוגת שבוע"
 
-#: ../calendar/gui/gnome-cal.c:2684
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "טוען פגישות ב-%s"
 
-#: ../calendar/gui/gnome-cal.c:2703
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "טוען משימות ב-%s"
 
-#: ../calendar/gui/gnome-cal.c:2712
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "טוען תזכורות ב-%s"
 
-#: ../calendar/gui/gnome-cal.c:2819
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "פותח %s"
 
-#: ../calendar/gui/gnome-cal.c:3776
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr ""
 
@@ -7976,57 +8388,57 @@ msgstr "ספטמבר"
 msgid "_Select Today"
 msgstr "בחר �ת _היו�"
 
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../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 ""
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "מידע �ירוע"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "מידע משימה"
 
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "מידע תזכורת"
 
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "מידע יומן"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "עודכן"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "רענן"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "הצעה נגדית"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -8065,47 +8477,57 @@ msgstr ""
 msgid "Memo Source Selector"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "תזכורת חדשה"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+#, fuzzy
+msgctxt "New"
 msgid "Mem_o"
 msgstr "תז_כורת"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "צור תזכורת חדשה"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "תזכורת משותפת חדשה"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+#, fuzzy
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "תזכורת _משותפת"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "צור תזכורת משותפת חדשה"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "רשימת תזכורות חדשה"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+#, fuzzy
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "_רשימת תזכורות"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "צור רשימת תזכורות חדשה"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "הדפס תזכורות"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "7 הימי� הב�י�"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8113,7 +8535,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8122,24 +8544,24 @@ 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
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
-#: ../calendar/gui/migration.c:1232
+#: ../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
@@ -8299,59 +8721,53 @@ msgstr "שישי"
 msgid "Sa"
 msgstr "שבת"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "פגישה"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "משימה"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "סיכו�: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 #, fuzzy
 msgid "Attendees: "
 msgstr "<b>מוזמני�</b>"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "מצב: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "עדיפות: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
-msgstr ""
+msgstr "�חוז הושל�: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "כתובת: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "קטגוריות: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "�נשי קשר: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-#, fuzzy
-msgid "Upcoming Appointments"
-msgstr "פגישה"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "רשימת משימות _חדשה"
@@ -8380,40 +8796,50 @@ msgstr ""
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1326
+#, fuzzy
+msgctxt "New"
+msgid "_Task"
+msgstr "_משימה"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "צור משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
+#, fuzzy
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr ""
+msgstr "משימות פעילות"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1335
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "הוסף משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "רשימת משימות חדשה"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
+#, fuzzy
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "רשימת _משימות"
 
-#: ../calendar/gui/tasks-component.c:1344
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "צור רשימת משימות _חדשה"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8421,1579 +8847,1620 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "�ל תש�ל �ותי שוב."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "הדפס משימות"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% השלמה"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "בוטל"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+#, fuzzy
+msgid "In progress"
+msgstr "בתהליך"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr ""
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "פותח יומן"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "קבצי iCalendar �(ics.)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "תזכורת!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "קבצי vCalendar �(vcf.)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 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)
+#. *
+#.
+#.
 #. * 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 "�פריקה/�בידג'�ן"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�פריקה/�קרה"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�פריקה/�דיס_�בבה"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�פריקה/�לג'יר"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�פריקה/�סמרה"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�פריקה/במקו"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�פריקה/בנגו�י"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�פריקה/בנז'ול"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�פריקה/ביס�ו"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr ""
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�פריקה/ברזוויל"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�פריקה/בוג'ומבורה"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�פריקה/קהיר"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�פריקה/קזבלנקה"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�פריקה/ס�וטה"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�פריקה/קונ�קרי"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�פריקה/דק�ר"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr ""
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�פריקה/ג'יבוטי"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr ""
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr ""
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�פריקה/פריט�ון"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�פריקה/ג�בורון"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�פריקה/ה�ר�רה"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�פריקה/ג'והנסבורג"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�פריקה/קמפלה"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�פריקה/חרטו�"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�פריקה/קיג�לי"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�פריקה/קינש�סה"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�פריקה/ל�גוס"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�פריקה/ליברוויל"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�פריקה/לו�"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�פריקה/לו�נדה"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr ""
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�פריקה/לוס�קה"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�פריקה/מל�בו"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�פריקה/מ�פוטו"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�פריקה/מסרו"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�פריקה/מבבנה"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr ""
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�פריקה/מונרוביה"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�פריקה/ניירובי"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�פריקה/נג'מנה"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�פריקה/ני�מי"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�פריקה/נו�קצ'וט"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�פריקה/וו�ג�דוגו"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�פריקה/פורטו נובו"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr ""
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�פריקה/טימבקטו"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�פריקה/טריפולי"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�פריקה/טוניס"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�פריקה/וינדהוק"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr ""
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr ""
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "�מריקה/�נגווילה"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "�מריקה/�נטיגו�ה"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr ""
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "�מריקה/�רובה"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "�מריקה/�סונסיון"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "�מריקה/ברבדוס"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "�מריקה/בל�"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "�מריקה/בליז"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "�מריקה/בו�ה_ויסטה"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "�מריקה/בוגוטה"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "�מריקה/בויסי"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "�מריקה/בו�נוס_�יירס"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr ""
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "�מריקה/קנקון"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "�מריקה/קר�קס"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr ""
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr ""
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr ""
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "�מריקה/שיקגו"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr ""
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "�מריקה/קורדובה"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "�מריקה/קוסטה_ריקה"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "מריקה/קוי�בה"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr ""
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr ""
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "�מריקה/דוסון"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "�מריקה/דוסון_קריק"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "�מריקה/דנבר"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "�מריקה/דטרויט"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr ""
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "�מריקה/�דמונטון"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr ""
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "�מריקה/�ל_סלבדור"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "�מריקה/פורטהלזה"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr ""
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr ""
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr ""
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr ""
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "�צריקה/גרנדה"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr ""
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "�מריקה/גו�טמלה"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "�מריקה/גו�טמלה"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "�מריקה/גוי�נה"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr ""
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "�מריקה/הוו�נה"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr ""
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "�מריקה/�ינדי�נה/�ינדי�נפוליס"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "�מריקה/�ינדי�נה/נוקס"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "�מריקה/�ינדי�נה/מרנגו"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr ""
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "�מריקה/�ינדי�נפוליס"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr ""
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr ""
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "�מריקה/ג'מייקה"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr ""
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr ""
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "�מריקה/קנט�קי/לו�יסוויל"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "�מריקה/קנט�קי/מונטיסלו"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "�מריקה/לה_פ�ז"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "�מריקה/לימה"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "�מריקה/לוס_�נג'לס"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "�מריקה/לו�יסוויל"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
-msgstr ""
+msgstr "�מריקה/מסיו"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
-msgstr ""
+msgstr "�מריקה/מנ�גו�ה"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "�מריקה/מנ�וס"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
-msgstr ""
+msgstr "�מריקה/מרטיניק"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr ""
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "�מריקה/מנדוזה"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr ""
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
-msgstr ""
+msgstr "�מריקה/מרידה"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "�מריקה/מקסיקו_סיטי"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr ""
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr ""
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
-msgstr ""
+msgstr "�מריקה/מונטווידי�ו"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "�מריקה/מונטר�ול"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
-msgstr ""
+msgstr "�מריקה/מונסר�ט"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr ""
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "�מריקה/ניו_יורק"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr ""
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr ""
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr ""
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "�מריקה/צפון_דקוטה/מרכז"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "�מריקה/פנמה"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr ""
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
-msgstr ""
+msgstr "�מריקה/פרמריבו"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "�מריקה/פיניקס"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr ""
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr ""
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr ""
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "�מריקה/פורטו_ריקו"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr ""
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr ""
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "�מריקה/רסיפה"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
-msgstr ""
+msgstr "�מריקה/רגינה"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "�מריקה/ריו_בר�נקו"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr ""
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "�מריקה/סנטי�גו"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "�מריקה/סנטו_דומינגו"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
-msgstr ""
+msgstr "�מריקה/ס�ו פ�ולו"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr ""
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr ""
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
-msgstr ""
+msgstr "�מריקה/סנט ג'ונס"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
-msgstr ""
+msgstr "�מריקה/סנט קיטס"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
-msgstr ""
+msgstr "�מריקה/סנט לוסיה"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr ""
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr ""
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr ""
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
-msgstr ""
+msgstr "�מריקה/טגוסיגלפה"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr ""
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr ""
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "�מריקה/טיחו�נה"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr ""
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "�מריקה/וונקובר"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr ""
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr ""
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr ""
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr ""
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr ""
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr ""
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr ""
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr ""
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr ""
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr ""
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr ""
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr ""
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr ""
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr ""
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "�סיה/עדן"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "�סיה/�למ�טי"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "�סיה/�מ�ן"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr ""
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr ""
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr ""
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "�סיה/�שג�בט"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "�סיה/בגדד"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "�סיה/בחריין"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "�סיה/ב�קו"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "�סיה/בנקוק"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "�סיה/ביירות"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "�סיה/בישקק"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "�סיה/ברוניי"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "�סיה/כלכות�"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr ""
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "�סיה/צ'ונגצ'ינג"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "�סיה/קולומבו"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "�סיה/דמשק"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "�סיה/ד�קה"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "�סיה/דילי"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "�סיה/דוב�י"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "�סיה/דוש�נבה"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "�סיה/עזה"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr ""
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "�סיה/הונג קונג"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr ""
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "�סיה/�ירקוטסק"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "�סיה/�יסטנבול"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "רסיה/ג'קרטה"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr ""
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "�סיה/ירושלי�"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "�סיה/ק�בול"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "�סיה/קמצ'טקה"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "�סיה/קר�צ'י"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr ""
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "�סיה/קטמנדו"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr ""
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "�סיה/קו�לה_לומפור"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr ""
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "�סיה/כווית"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr ""
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr ""
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr ""
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr ""
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "�סיה/מנילה"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "�סיה/מסקט"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "�סיה/ניקוסיה"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "�סיה/נובוסיבירסק"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "�סיה/�ומסק"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr ""
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "�סיה/פנו�_פן"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "�סיה/פיונגי�נג"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "�סיה/קט�ר"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr ""
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "�סיה/רנגון"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "�סיה/רי�ד"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "�סיה/סייגון"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "�סיה/סחלין"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "�סיה/סמרקנד"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "�סיה/ס�ול"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "�סיה/שנח�י"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "�סיה/סינגפור"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "�סיה/ט�יפיי"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "�סיה/טשקנט"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "�סיה/טביליסי"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "�סיה/טהרן"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "�סיה/ת'ימפו"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "�סיה/טוקיו"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "�סיה/�ולן בטור"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "�סיה/�ורומקי"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "�סיה/ווינטי�ן"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "�סיה/ולדיווסטוק"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "�סיה/ירוו�ן"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
-msgstr ""
+msgstr "ה�וקיינוס ה�טלנטי/ברמודה"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
-msgstr ""
+msgstr "ה�וקיינוס ה�טלנטי/כף ורדה"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
-msgstr ""
+msgstr "ה�וקיינוס ה�טלנטי/�יי פ�רו"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "�וסטרליה/�דלייד"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "�וסטרליה/בריסביין"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr ""
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "�וסטרליה/הוב�רט"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "�וסטרליה/מלבורן"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "�וסטרליה/פרת'"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "�וסטרליה/סידני"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "�ירופה/�מסטרד�"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "�ירופה/�נדורה"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "�ירופה/�תונה"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "�ירופה/בלפ�סט"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "�ירופה/בלגרד"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "�ירופה/ברלין"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "�ירופה/ברטיסל�בה"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "�ירופה/בריסל"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "�ירופה/בוקרשט"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "�ירופה/בודפשט"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "�ירופה/קישינב"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "�ירופה/קופנהגן"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "�ירופה/דבלין"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "�ירופה/גילברטר"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "�ירופה/הלסינקי"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "�ירופה/�יסטנבול"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "�ירופה/ק�לינינגרד"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "�ירופה/קייב"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "�ירופה/ליסבון"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "�ירופה/לובלי�נה"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "�ירופה/לונדון"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "�ירופה/לוקסמבורג"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "�ירופה/מדריד"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "�ירופה/מלטה"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "�ירופה/מינסק"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "�ירופה/מונקו"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "�ירופה/מוסקבה"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "�ירופה/ניקוסיה"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "�ירופה/�וסלו"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "�ירופה/פריז"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "�ירופה/פר�ג"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "�ירופה/ריגה"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "�ירופה/רומ�"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "�ירופה/סמ�רה"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "�ירופה/ס�ן_מ�רינו"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "�ירופה/סרייבו"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "�ירופה/סקופיה"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "�ירופה/סופיה"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "�ירופה/שטוקהול�"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "�ירופה/ט�לין"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "�ירופה/טירנה"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "�ירופה/ו�דוז"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "�ירופה/ותיקן"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "�ירופה/וינה"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "�ירופה/וילנה"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "�ירופה/ורשה"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "�ירופה/זגרב"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "�ירופה/ציריך"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr ""
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr ""
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr ""
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr ""
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr ""
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr ""
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr ""
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr ""
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr ""
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr ""
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
-msgstr ""
+msgstr "ה�וקיינוס השקט/פיג'י"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "ה�וקיינוס השקט/ג�ל�פ�גוס"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "ה�וקיינוס השקט/גו��"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "ה�וקיינוס השקט/הונולולו"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr ""
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr ""
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr ""
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr ""
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr ""
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr ""
 
@@ -10006,212 +10473,201 @@ msgstr "ל� ניתן לפתוח קובץ"
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "הוסף תצריף"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "צ_רף"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "הודעה לל� ש�"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_תצריף..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "צרף קובץ"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-subscribe.xml.h:9
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_סגור"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../composer/e-composer-actions.c:473
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "סגור �ת הקובץ הנוכחי"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
 #: ../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-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ה_דפס..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../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 "_תצוגה לפני הדפסה"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "שמור �ת הקובץ הנוכחי"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "שמור _בש�..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "שמור �ת הקובץ הנוכחי בש� �חר"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "שמור _טיוטה"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "שמור כטיוטה"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "ש_לח"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "שלח �ת ההודעה"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr " _�פשרויות שליחה"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 #, fuzzy
 msgid "Insert Send options"
 msgstr "�פשרויות"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "הו_דעה חדשה"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "ש_לח הודעה ל..."
+
+#: ../composer/e-composer-actions.c:544
 msgid "Character _Encoding"
 msgstr "קידוד _תווי�"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_�בטחה"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "ה_צפנת PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "הצפן הודעה זו ע� PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "_חתימת PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "חתו� על הודעה ז�ת ע� מפתח ה-PGP שלך"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 #, fuzzy
 msgid "_Prioritize Message"
 msgstr "הדפס הודעה"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 #, fuzzy
 msgid "Set the message priority to high"
 msgstr "שמור �ת ההודעה כקובץ מלל"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 #, fuzzy
 msgid "Re_quest Read Receipt"
 msgstr "משתתפי� דרושי�"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "שדה _Bcc"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "שדה _Cc"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:634
-#, fuzzy
+#: ../composer/e-composer-actions.c:649
 msgid "_Subject Field"
-msgstr "שדה _Cc"
+msgstr "שדה _הנוש�"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 msgid "Toggles whether the Subject field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "צרף"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "הכנס �ת הנמעני� של ההודעה"
@@ -10259,19 +10715,19 @@ msgstr "נו_ש�:"
 msgid "Si_gnature:"
 msgstr "ח_תימה:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr ""
 
@@ -10279,38 +10735,38 @@ msgstr ""
 msgid "Recent _Documents"
 msgstr "מסמכי� _�חרוני�"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "_הצג �ת תיבת התצריפי�"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "תצריף"
 msgstr[1] "תצריפי�"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "ה_סתר �ת תיבת התצריפי�"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "חבר הודעה"
 
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10324,7 +10780,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
-msgstr ""
+msgstr "כל החשבונות הוסרו."
 
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
@@ -10353,7 +10809,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr ""
+msgstr "ל� ניתן ליצור הודעה."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
@@ -10437,23 +10893,27 @@ msgstr ""
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "המשך ב_עריכה"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_�ל תשחזר"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:318
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_שחזר"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_שמור הודעה"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "שמור _טיוטה"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "דו�ר ויומן Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr ""
 
@@ -10469,37 +10929,56 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "תקלת Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "�זהרת Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "מידע Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "ש�ילתת Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:458
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr ""
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "רכיב"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../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
+msgid "Enabled"
+msgstr "מופעל"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr ""
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "�ירעה שגי�ה בזמן ההדפסה"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "מערכת ההדפסה דיווחה �ת הפרטי� הב�י� לגבי השגי�ה:"
 
-#: ../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 "מערכת ההדפסה ל� דיווחה פרטי� נוספי� לגבי השגי�ה."
@@ -10521,9 +11000,8 @@ msgid "Do you wish to overwrite it?"
 msgstr "להחליף �ותו?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists \"{0}\"."
-msgstr "הקובץ קיי� &quot;{0}&quot;."
+msgstr "הקובץ קיי� \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10533,48 +11011,52 @@ msgstr "להחליף קובץ?"
 msgid "_Overwrite"
 msgstr "ה_חלף"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr ""
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_חשוב"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "ע_בודה"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_�ישי"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 #, fuzzy
 msgid "_To Do"
 msgstr "_לך �ל"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_מ�וחר יותר"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_ש� תוית:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "ערוך תוית"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "הוסף תוית"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "ש� תווית ל� יכול להיות ריק."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10705,66 +11187,66 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "בחר קובץ"
 
-#: ../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
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "ש� החוק_:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "חפש פריטי� שמת�ימי� לקריטריון הב�"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 #, fuzzy
 msgid "A_dd Filter Criteria"
 msgstr "הוסף חוק סינון"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr ""
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr ""
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_חפש פריטי�:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr ""
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr ""
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr ""
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr ""
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr ""
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "נכנס"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "יוצ�"
 
@@ -10858,7 +11340,7 @@ msgstr "בעתיד"
 msgid "months"
 msgstr "חודשי�"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "שניות"
 
@@ -10870,9 +11352,10 @@ msgstr ""
 msgid "the time you specify"
 msgstr ""
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "שבועות"
 
@@ -10888,7 +11371,7 @@ msgstr "הוסף חוק"
 msgid "Edit Rule"
 msgstr "ערוך חוק"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "ש� החוק"
 
@@ -10942,16 +11425,16 @@ msgstr "Evolution Mail preferences control"
 msgid "Evolution Network configuration control"
 msgstr "Evolution Network configuration control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
-#: ../mail/mail-component.c:749
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "דו�ר"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "חשבונות דו�ר"
 
@@ -10968,12 +11451,12 @@ msgstr "Network Preferences"
 msgid "_Mail"
 msgstr "_דו�ר"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s הסכ� שימוש"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10982,126 +11465,120 @@ 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-account-editor.c:466 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../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
 msgid "Autogenerated"
 msgstr ""
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 #, fuzzy
 msgid "Ask for each message"
 msgstr "הודעה של� נקר�ה:"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "זהות"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "קבלת דו�\"ל"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "בדוק �� קיי� _דו�ר חדש כל"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "ד_קות"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "שליחת דו�\"ל"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "ברירת מחדל"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "�בטחה"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "�פשרויות קבלה"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "בודק עבור הודעות חדשות"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "עורך חשבונות"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "עוזר החשבונות של Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[ברירת מחדל]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:979
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:689
-msgid "Enabled"
-msgstr "מופעל"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "ש� החשבון"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../mail/em-composer-prefs.c:300 ../mail/em-composer-prefs.c:435
-#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
+#: ../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 "לל� ש�"
 
-#: ../mail/em-composer-prefs.c:983
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "שפה/ות"
 
-#: ../mail/em-composer-prefs.c:1032
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "הוסף תסריט חתימה"
 
-#: ../mail/em-composer-prefs.c:1074
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "חתימה/ות"
 
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- הודעה מועברת --------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "שולח בלתי ידוע"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1801
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----הודעה מקורית-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "חוקי _מסנן"
 
@@ -11118,10 +11595,6 @@ msgstr ""
 msgid "Assign Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "תצריפי�"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "�BCC"
@@ -11138,10 +11611,6 @@ msgstr "�CC"
 msgid "Completed On"
 msgstr "הסתיי� ב-"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "מכיל"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "העתק לתיקייה"
@@ -11155,7 +11624,7 @@ msgid "Date sent"
 msgstr "ת�ריך שליחה"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11166,10 +11635,6 @@ msgstr "מחק"
 msgid "Deleted"
 msgstr "נמחק"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ל� מכיל"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ל� מסתיי� ב"
@@ -11190,10 +11655,6 @@ msgstr "ל� נשמע כמו"
 msgid "does not start with"
 msgstr "ל� מתחיל ב"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "ל� קיי�"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "טיוטה"
@@ -11202,10 +11663,6 @@ msgstr "טיוטה"
 msgid "ends with"
 msgstr "מסתיי� ב"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "קיי�"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "קיימי�"
@@ -11218,14 +11675,10 @@ msgstr "ביטוי"
 msgid "Follow Up"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "חשוב"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr ""
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr ""
@@ -11238,18 +11691,6 @@ msgstr ""
 msgid "is Flagged"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr ""
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr ""
@@ -11273,7 +11714,7 @@ msgstr "דו�ר זבל"
 msgid "Junk Test"
 msgstr "מבחן דו�ר זבל"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "תוית"
 
@@ -11316,7 +11757,7 @@ 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "קר�"
 
@@ -11388,9 +11829,9 @@ msgstr "מתחיל ב"
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11401,11 +11842,11 @@ msgid "Unset Status"
 msgstr ""
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr ""
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "הוסף _פעולה"
 
@@ -11450,16 +11891,16 @@ msgstr "הודעות חשובות"
 msgid "Messages Not Junk"
 msgstr "הודעות ש�ינן זבל"
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "חיפוש חשבון"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "חיפוש בכל החשבונות"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:185
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "הודעה של� נקר�ה:"
@@ -11467,36 +11908,46 @@ msgstr[1] "הודעות של� נקר�ו:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "סה\"כ הודעות:"
 msgstr[1] "סה\"כ הודעות:"
 
-#: ../mail/em-folder-properties.c:205 ../mail/em-folder-properties.c:207
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
 #, fuzzy
 msgid "Quota usage"
 msgstr "סה\"כ הודעות:"
 
-#: ../mail/em-folder-properties.c:397
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../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
+msgid "Inbox"
+msgstr "דו�ר נכנס"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "מ�פייני תיקייה"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<לחץ כ�ן כדי לבחור תיקייה>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_צור"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_ש� תיקייה:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "תיקיות חיפוש"
 
@@ -11505,27 +11956,19 @@ msgstr "תיקיות חיפוש"
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "טיוטות"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "דו�ר נכנס"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "דו�ר יוצ�"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "נשלח"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "טוען..."
 
@@ -11544,494 +11987,493 @@ msgstr "טוען..."
 #. * 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 "%s (%u)"
+#: ../mail/em-folder-tree.c:380
+#, fuzzy, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (...)"
 
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 #, fuzzy
 msgid "Mail Folder Tree"
 msgstr "_תיקיית דו�ר"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "מעביר �ת התיקייה %s"
 
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "מעתיק �ת התיקייה %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "מעביר הודעות �ל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "מעתיק הודעות �ל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:996 ../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 "הע_תק �ל תיקייה"
 
-#: ../mail/em-folder-tree.c:997 ../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 "הע_בר �ל תיקייה"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "סורק תיקיות ב-\"%s\""
 
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_תצוגה"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "פתח ב_חלון חדש"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "הע_בר..."
 
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_שנה ש�..."
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_רענן"
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "דו�ר יוצ�"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_רוקן �ת ה�שפה"
 
-#: ../mail/em-folder-utils.c:103
-#, fuzzy, c-format
+#: ../mail/em-folder-utils.c:102
+#, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "מעתיק �ת ההודעות ל%s"
+msgstr "מעתיק �ת `%s' �ל `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_העתק"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:586
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "יוצר �ת התיקייה `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "צור תיקייה"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ציין היכן ליצור �ת התיקייה:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "מחיקת הדו�ר נכשלה"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
-#: ../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 "הע_בר"
 
 #. 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:1342 ../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 "_ערוך כהודעה חדשה..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_בטל מחיקה"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "הע_בר לתיקייה..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "ה_עתק לתיקייה..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "_סמן כנקר�"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "סמן כ_ל� נקר�"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "סמן כ_חשוב"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "סמן כל_� חשוב"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "סמן כ_דו�ר זבל"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "סמן _כל� דו�ר זבל"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_תוית"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "לל_�"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "תווית _חדשה"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "_צור חוק מהודעה"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 #, fuzzy
 msgid "Search Folder based on _Subject"
 msgstr "חפש �נשי קשר..."
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 #, fuzzy
 msgid "Search Folder based on Se_nder"
 msgstr "מקור הנייר:"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 #, fuzzy
 msgid "Search Folder based on _Recipients"
 msgstr "חפש �נשי קשר..."
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 #, fuzzy
 msgid "Search Folder based on Mailing _List"
 msgstr "צור תיקייה וירטו�לית עבור רשימת תפוצה זו"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. 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 "ברירת מחדל"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "ל� ניתן לקבל הודעה"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "מקבל הודעה..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "צור תיקיית _חיפוש"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_מכתובת זו"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "�ל כ_תובת זו"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "לחץ כדי לשלוח דו�ר ל-%s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
 #, fuzzy, c-format
 msgid "Click to call %s"
 msgstr "�לחץ כ�ן כדי להוסיף משימה"
 
-#: ../mail/em-folder-view.c:3327
+#: ../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:494
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_חפש:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "ה_קוד�"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "ה_ב�"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "הת�� _רשיות"
 
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "ל� חתו�"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "הודעה זו ל� חתומה. �ין שו� ביטחון שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "חתימה חוקית"
 
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
 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:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "חתימה בלתי חוקית"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 #, fuzzy
 msgid "Valid signature, but cannot verify sender"
 msgstr "חתימה חוקית, ל� מצליח ל�שר �ת השולח"
 
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
 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:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "ל� מוצפן"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "מוצפן, חלש"
 
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
 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:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "מוצפן"
 
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
 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:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "מוצפן, חזק"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
 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:1086 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_הצג תעודה"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "תעודה ז�ת �ינה ניתנת לצפייה"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "הסתיי� ב-%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "ת�ריך תפוגה:"
 
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "עד %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_תצוגה פנימית"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "ה_חב�"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "הצג גודל _מקורי"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "שמור תצריף בש�"
 
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "בחר תיקייה לשמירת כל התצריפי�"
 
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2038
 #, fuzzy
 msgid "_Save Selected..."
 msgstr "בחר..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "_תצריף �חד"
 msgstr[1] "_%d תצריפי�"
 
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "_שמור"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "שמור ה_כל"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "לל� תצריף"
 
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 #, fuzzy
 msgid "View _Unformatted"
 msgstr "מבנה זמן:"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2340
 #, fuzzy
 msgid "Hide _Unformatted"
 msgstr "מבנה זמן:"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "_פתח בעזרת"
 
-#: ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2468
 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 ""
 
@@ -12040,317 +12482,327 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "עמוד %d מתוך %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "מקבל `%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 #, fuzzy
 msgid "Unknown external-body part."
 msgstr "שגי�ה ל� ידועה."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr ""
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 #, fuzzy
 msgid "Formatting Message..."
 msgstr "חפש _בהודעה..."
 
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../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:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../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:1772
+#: ../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:1903
+#: ../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:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "מ�ת"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "השב �ל"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../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
 msgid "Date"
 msgstr "ת�ריך"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr ""
 
-#: ../mail/em-format.c:1156
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "תצריף %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr ""
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "תצורת חתימה ל� נתמכת"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "ל� ניתן לפענח הודעת PGP"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "ל� ניתן לפענח הודעת PGP: שגי�ה ל� ידועה"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "כל פע�"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "פע� ביו�"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "פע� בשבוע"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "פע� בחודש"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 #, fuzzy
 msgid "Add Custom Junk Header"
 msgstr "כותרת"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 #, fuzzy
 msgid "Header Name:"
 msgstr "_ש� תיקייה:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 #, fuzzy
 msgid "Header Value Contains:"
 msgstr "השולח מכיל"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "מכיל ערך"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "צבע"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 #, fuzzy
 msgid "No Junk plugin available"
 msgstr "�ין תי�ור זמין."
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr ""
 
-#: ../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 ""
-
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "נכשל ביצירת תיקייה חדשה `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: ../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
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: ../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
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2851
+#: ../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
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2870
+#: ../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:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "השב ל_רשימה"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:874
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_הוסף לספר הכתובות"
 
-#: ../mail/em-subscribe-editor.c:596
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:629
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "תיקייה"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "נ� לבחור שרת."
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "ל� נבחר שרת"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "�ל תציג הודעה ז�ת _שוב."
 
@@ -12376,7 +12828,7 @@ msgstr "הוסף כתובת"
 msgid "Messages from %s"
 msgstr "הודעה מ-%s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "תיקיות _חיפוש"
 
@@ -12453,10 +12905,18 @@ msgstr ""
 "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 ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../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\"."
@@ -12464,75 +12924,78 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Default height of the message window."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Default height of the subscribe dialog."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Default width of the message Window."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Default width of the subscribe dialog."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "Determines whether to lookup in addressbook for sender email"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
+#, fuzzy
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
@@ -12540,11 +13003,11 @@ msgstr ""
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -12554,7 +13017,7 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -12562,59 +13025,59 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr "Disable or enable ellipsizing of folder names in folder tree"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Empty Trash folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Trash folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Enable search folders"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Enable search folders on startup."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -12626,7 +13089,7 @@ msgstr ""
 "bar by just typing the folder name and the selection jumps automatically to "
 "that folder."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12634,27 +13097,27 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Enable to render message text part of limited size."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
@@ -12662,7 +13125,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12670,7 +13133,7 @@ msgstr ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -12680,7 +13143,7 @@ msgstr ""
 "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."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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."
@@ -12688,7 +13151,7 @@ msgstr ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -12702,7 +13165,7 @@ msgstr ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12710,11 +13173,11 @@ msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "It disables/enables the prompt while marking multiple messages."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -12722,7 +13185,7 @@ msgstr ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -12732,31 +13195,31 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Last time empty junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Last time empty trash was run"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colors"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "List of accepted licenses"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -12764,15 +13227,15 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -12780,127 +13243,127 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose license has been accepted."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
-"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."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Prompt to check if the user wants to go offline immediately"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -12908,71 +13371,76 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognize emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+#, fuzzy
+msgid "Search for the sender photo in local address books"
 msgstr "Search for the sender photo in local addressbooks"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Sender email-address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Server synchronization interval"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12980,67 +13448,67 @@ msgstr ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Spell checking color"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialog default height"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialog default width"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Text message part limit"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "The last time empty junk was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "The last time empty trash was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13048,7 +13516,7 @@ msgstr ""
 "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."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13058,15 +13526,15 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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 ""
-"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."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13078,21 +13546,22 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
@@ -13100,7 +13569,7 @@ msgstr ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13108,7 +13577,7 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13118,115 +13587,115 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Underline color for misspelled words when using inline spelling."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Use side-by-side or wide layout"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "View/Bcc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "View/Cc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "View/Cc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "View/From menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "View/From menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "View/PostTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "View/PostTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "View/ReplyTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr "Whether disable ellipsizing feature of folder names in folder tree."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../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."
@@ -13234,44 +13703,44 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 #, fuzzy
 msgid "Import mail from Elm."
 msgstr "יב� _קובץ יחיד"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "תיקיית יעד:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "בחר תיקייה לייב� �ליה"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
@@ -13279,7 +13748,7 @@ msgstr ""
 msgid "Importing mailbox"
 msgstr "מייב� תיבת דו�ר"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "מייב� `%s'"
@@ -13289,15 +13758,15 @@ msgstr "מייב� `%s'"
 msgid "Scanning %s"
 msgstr "סורק %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "יב� דו�ר מ-Pine."
 
@@ -13325,142 +13794,152 @@ msgstr "רשימת תפוצה %s"
 msgid "Add Filter Rule"
 msgstr "הוסף חוק סינון"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "תבניות"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "�חד נבחר, "
 msgstr[1] "%d נבחרו, "
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d נמחק"
 msgstr[1] "%d נמחק"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d דו�ר זבל"
 msgstr[1] "%d דו�ר זבל"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "טיוטה %d"
 msgstr[1] "%d טיוטות"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d נשלח"
 msgstr[1] "%d נשלח"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ל� נשלח"
 msgstr[1] "%d ל� נשלח"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ל� נקר�ה, "
 msgstr[1] "%d ל� נקר�ו, "
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d סה\"כ"
 msgstr[1] "%d סה\"כ"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "הוד�ת דו�ר חדשה"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
+#, fuzzy
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_הודעת דו�ר"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "חבר הודעת דו�ר חדשה"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "תיקיית דו�ר חדשה"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:932
+#, fuzzy
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_תיקיית דו�ר"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "צור תיקיית דו�ר חדשה"
 
-#: ../mail/mail-component.c:1062
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "שגי�ה"
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "שגי�ות"
 
-#: ../mail/mail-component.c:1536
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "�זהרות ושגי�ות"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "ניפוי"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "הודעות �זהרה, שגי�ה וניפוי"
 
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "יומני ניפוי"
 
-#: ../mail/mail-component.c:1678
+#: ../mail/mail-component.c:1736
 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:1694
+#: ../mail/mail-component.c:1752
 msgid "second(s)."
 msgstr "שניות."
 
-#: ../mail/mail-component.c:1700
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "הודעות יומן:"
 
-#: ../mail/mail-component.c:1741
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "רמת יומן"
 
-#: ../mail/mail-component.c:1750 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "שעה"
 
-#: ../mail/mail-component.c:1760 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "הודעות"
 
-#: ../mail/mail-component.c:1769 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "סגור חלון זה"
@@ -13716,11 +14195,11 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:73
@@ -13851,24 +14330,28 @@ msgid ""
 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 "_�רגון:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "מזהה מפתח _PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_סיסמה:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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:115
+#: ../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."
@@ -13876,7 +14359,7 @@ msgstr ""
 "�נ� הכנס מידע על דרך שליחת הדו�ר. �� �ינך בטוח, ש�ל �ת מנהל המערכת �ו �ת ספק "
 "ה�ינטרנט."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "
@@ -13885,130 +14368,130 @@ msgstr ""
 "נ� הכנס �ת שמך וכתובת הדו�\"ל שלך. �ין חובה למל� �ת השדות ה \"ל� הכרחיי�\","
 "�ל� �� �תה מעוניין לכלול מידע זה בהודעות ש�תה שולח."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "בחר בבקשה מה�פשרויות הב�ות"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "שער:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_זכור �ת הסיסמה"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "ה_שב �ל:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "זכור _סיסמה"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "מ�רח S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:127
+#, fuzzy
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Search for the sender photo in local addressbooks"
+
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "ב_חר..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 #, fuzzy
 msgid "S_end message receipts:"
 msgstr "ש_לח הודעה ל..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "גופן _רגיל:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "בחר גופן רוחב קבוע עבור HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "בחר גופן רוחב קבוע עבור הדפסת HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "בחר גופן רוחב משתנה עבור HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "בחר גופן רוחב משתנה עבור הדפסת HTML"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "שליחת דו�ר"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "תיקיית הודעת ש_נשלחו:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "ה_שרת דורש הזדהות"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_סוג השרת: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "תעודת _חתימה:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "ח_תימה:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "חתימות"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "טבלת חתימות"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "בדיקת �יות"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_סוג: "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 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:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14016,25 +14499,26 @@ msgstr ""
 "הקלד �ת ש� החשבון.\n"
 "למשל \"עבודה\" �ו \"�ישי\""
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "ש� מ_שתמש:"
 
-#: ../mail/mail-config.glade.h:154
-#, fuzzy
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
-msgstr "הזדהות"
+msgstr "שימוש בה_זדהות"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../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:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_רוחב-משתנה:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14044,127 +14528,127 @@ msgstr ""
 "\n"
 "לחץ \"קדימה\" להתחיל. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "הו_סף חתימה"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "תמיד _טען תמונות מה�ינטרנט"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Automatic proxy configuration URL:"
 msgstr "Automatic smiley recognition"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "חיבור _ישיר ל�ינטרנט"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_סגנון העברה:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:169
-#, fuzzy
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
-msgstr "Load images for HTML messages over http"
+msgstr "טען _תמונות בהודעות מ�נשי קשר"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #, fuzzy
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "ספר הכתובות של �בולוציה"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "ה_פוך חשבון זה לחשבון ברירת המחדל"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "הגדרות מתווך י_דניות:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_סמן הודעות כ�ילו שנ_קר�ו ל�חר"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "�ל תטען תמונות מה�ינטרנט ל_עול�"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_נתיב:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_התרע כ�שר הודעות HTML נשלחות ל�נשי קשר של רוצי� �ותן"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ה_תרע כ�שר הודעות ע� נוש� ריק נשלחות"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_תסריט:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_מתווך HTTP מ�ובטח"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "ב_חר..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "הצג _�נימציות"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "הצג �ת _תמונת השולח בתצוגה המקדימה של ההודעה"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "השתמש ב_תקשורת מ�ובטחת:"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "הש_תמש בברירת מחדל של המערכת"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "השתמש ב�ות� _גופני� כמו יישומי� �חרי�"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "כתובות"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "צבע"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "תי�ור"
 
@@ -14204,62 +14688,62 @@ msgstr "תלוי _רשיות"
 msgid "Co_mpleted"
 msgstr "הס_תיי�"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_חפש:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "חפש בהודעה"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "ש_רת:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "מידע על ה�בטחה"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 #, fuzzy
 msgid "Specific folders"
 msgstr "בחר תיקייה"
 
-#: ../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."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_הסכ� לרישיון"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "ת_�ריך יעד:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
@@ -14308,166 +14792,167 @@ msgstr "שולח הודעה %d מתןך %d"
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "בוטל."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "הסתיי�."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "שומר �ת ההודעה בתיקייה"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "מעביר �ת ההודעות ל%s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "מעתיק �ת ההודעות ל%s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "פותח �ת התיקייה %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, fuzzy, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "עורך �נשי הקשר"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1701
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "מרוקן �ת ה�שפה ב-'%s'"
 
-#: ../mail/mail-ops.c:1702
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "תיקיות מקומיות"
 
-#: ../mail/mail-ops.c:1783
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "מקבל הודעה %s"
 
-#: ../mail/mail-ops.c:1890
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "מקבל הודעה %d"
 msgstr[1] "מקבל %d הודעות"
 
-#: ../mail/mail-ops.c:1975
+# c-format
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "שומר הודעה %d"
+msgid_plural "Saving %d messages"
+msgstr[0] "שומר הודעה �חת"
 msgstr[1] "שומר %d הודעות"
 
-#: ../mail/mail-ops.c:2053
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2125
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "שומר תצריף"
 
-#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "מתנתק מ %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "מתחבר מחדש ל %s"
 
-#: ../mail/mail-ops.c:2408
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/mail-ops.c:2494
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "בודק שירות"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "מבטל..."
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "שלח וקבל דו�ר"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "בטל ה_כל"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "ממתין..."
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "בדיקת דו�ר חדש"
@@ -14499,13 +14984,6 @@ msgstr "המשתמש ביטל �ת הפעולה."
 msgid "_Save and Close"
 msgstr "שמור ו_סגור"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_קובץ"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "ערוך חתימה"
@@ -14553,11 +15031,11 @@ msgstr ""
 msgid "Updating Search Folders for '%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "ערוך תיקיית חיפוש"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "תיקיית חיפוש חדשה"
 
@@ -14611,9 +15089,8 @@ msgid ""
 msgstr "�תה בטוח שברצונך למחוק �יש קשר זה?"
 
 #: ../mail/mail.error.xml.h:12
-#, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "ה�� לשלוח �ת ההודעה בתצורת HTML?"
+msgstr "ה�� �תה בטוח שברצונך לפתוח {0} הודעות בו זמנית?"
 
 #: ../mail/mail.error.xml.h:13
 msgid ""
@@ -14691,14 +15168,12 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "ל� ניתן לפתוח �ת המקור"
+msgstr "ל� ניתן לפתוח �ת המקור \"{1}\""
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "ל� ניתן לפתוח �ת המקור"
+msgstr "ל� ניתן לפתוח �ת המקור \"{2}\"."
 
 #: ../mail/mail.error.xml.h:33
 #, fuzzy
@@ -14728,9 +15203,8 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr "ל� ניתן לפתוח קובץ"
+msgstr "ל� ניתן לשמור לקובץ \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script \"{0}\"."
@@ -14760,9 +15234,8 @@ msgid "Delete account?"
 msgstr "למחוק �ת החשבון?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "העבר �ת ההודעות שנבחרו לתיקייה �חרת"
+msgstr "למחוק הודעות בתיקיית החיפוש \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
@@ -14791,9 +15264,8 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:53
-#, fuzzy
 msgid "Do you want to mark all messages as read?"
-msgstr "סמן �ת כל ההודעות הגלויות כ�ילו נקר�ו"
+msgstr "לסמן �ת כל ההודעות כהודעות שנקר�ו?"
 
 #: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
@@ -15121,17 +15593,21 @@ msgstr ""
 msgid "_Open Messages"
 msgstr "_פתח הודעות"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
-msgstr ""
+msgstr "ל� נצפה"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
-msgstr ""
+msgstr "נצפה"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
-msgstr ""
+msgstr "× ×¢× ×”"
+
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "הועבר"
 
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
@@ -15157,46 +15633,47 @@ msgstr "גבוה יותר"
 msgid "Highest"
 msgstr "הכי גבוה"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "היו� %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../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 "�תמול %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3838
+#. 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
 msgid "Generating message list"
 msgstr "יוצר רשימת הודעות"
 
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4223
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4103
+#: ../mail/message-list.c:4225
 #, fuzzy
-msgid "There is currently no message in this folder."
+msgid "There are no messages in this folder."
 msgstr "Whether to notify new messages in Inbox folder only."
 
 #: ../mail/message-list.etspec.h:3
@@ -15228,39 +15705,39 @@ msgstr "הודעות שנשלחו"
 msgid "Size"
 msgstr "גודל"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "�ל תעביר"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "לידיעתך"
 
-#: ../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 "העבר"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "השב"
 
-#: ../mail/message-tag-followup.c:84 ../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 "השב לכול�"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr ""
 
@@ -15285,6 +15762,11 @@ msgid "Subject contains"
 msgstr "הנוש� מכיל"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "הנוש� �ו השולח מכילי�"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "הנוש� �ו השולח מכילי�"
 
@@ -15297,14 +15779,6 @@ msgid "Provides core functionality for local address books."
 msgstr ""
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Enable attachment reminder plugin"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Enable attachment reminder plugin."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15312,7 +15786,7 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15320,15 +15794,11 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "מילות מפתח"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-#, fuzzy
-msgid "Remind _missing attachments"
-msgstr "שומר תצריף"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 #, fuzzy
@@ -15351,7 +15821,7 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "להודעה �ין תצריפי�"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_ערוך הודעה"
 
@@ -15365,129 +15835,150 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:96
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
-msgstr "�זהרת Evolution"
+msgstr "בחר ש� לקובץ הגיבוי של Evolution"
 
-#: ../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
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
-msgstr "�זהרת Evolution"
+msgstr "בחר קובץ גיבוי של Evolution לשחזור"
 
-#: ../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
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "תקלת 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
 msgid "Choose a file to restore"
-msgstr ""
+msgstr "בחר קובץ לשחזר"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 #, fuzzy
 msgid "Backup Evolution directory"
 msgstr "תקלת Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 #, fuzzy
 msgid "Restore Evolution directory"
 msgstr "תקלת Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 #, fuzzy
 msgid "Check Evolution Backup"
 msgstr "�זהרת Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "הפעל מחדש �ת Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "ע� מנשק משתמש גרפי"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "מכבה �ת Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "גיבוי חשבונות והגדרות Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "הגיבוי הסתיי�"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "מ�תחל �ת Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 #, fuzzy
 msgid "Backup current Evolution data"
 msgstr "תקלת Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "טוען הגדרות Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "מסיר קבצי גיבוי זמניי�"
 
-#: ../plugins/backup-restore/backup.c:249
-#, fuzzy, c-format
+#: ../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 "מעביר �ת התיקייה %s"
+msgstr "מגבה לתיקייה %s"
 
-#: ../plugins/backup-restore/backup.c:254
-#, fuzzy, c-format
+#: ../plugins/backup-restore/backup.c:460
+#, c-format
 msgid "Restoring from the folder %s"
-msgstr "מתנתק מ %s"
+msgstr "משחזר מהתיקייה %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "גיבוי Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "שחזור Evolution"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "מגבה �ת נתוני Evolution"
+
+#: ../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 "משחזר �ת נתוני 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
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15516,16 +16007,25 @@ msgid ""
 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
 #, fuzzy
 msgid "Invalid Evolution backup file"
 msgstr "�זהרת 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 "נ� לבחור שרת."
 
-#: ../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 "העבר �ת ההודעות שנבחרו לתיקייה �חרת"
+
+#: ../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 "
@@ -15546,46 +16046,43 @@ msgstr "שחזר _הגדרות..."
 msgid "_Backup Settings..."
 msgstr "_הגדרות גיבוי..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�נשי קשר �וטומטיי�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 #, fuzzy
 msgid "Instant Messaging Contacts"
 msgstr "<b>הודעות מידיות</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 #, fuzzy
 msgid "Select Address book for Pidgin buddy list"
 msgstr "בחר ספר כתובות"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 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 ""
@@ -15646,17 +16143,18 @@ msgstr "Log filter actions"
 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
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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 "_כתובת:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../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 "השתמש ב-_SSL"
 
@@ -15676,17 +16174,18 @@ msgstr "יומני� מקומיי�"
 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:375
+#: ../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:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "חיבור _מ�ובטח"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "ש� משתמש:"
 
@@ -15785,7 +16284,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "ה� ברצונך להפוך �ת Evolution ללקוח דו�ר ברירת המחדל?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:691
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -15816,10 +16315,60 @@ msgstr "מקורות ברירת המחדל"
 
 #: ../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:558
+#, fuzzy
+msgid "_Custom Header"
+msgstr "כותרות"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+#, fuzzy
+msgid "Key"
+msgstr "קניה"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 "כותרות"
+
+#. 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 "List of Custom Headers"
+
+#: ../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 ""
+"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 \";\""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "פתח תיקייה של משתמש �חר"
@@ -15837,119 +16386,117 @@ msgid "_User:"
 msgstr "_משתמש:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "סיסמה מ�ובטחת"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
-msgstr "הכנס סיסמה"
+msgstr "סיסמת טקסט פשוט"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "מחוץ למשרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "�ני מחוץ למשרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "�ני במשרד"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
-msgstr "הכנס סיסמה עבור %s"
+msgstr "החלף �ת הסיסמה עבור חשבון ה-Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "החלף סיסמה"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 #, fuzzy
 msgid "Delegation Assistant"
 msgstr "�שף ההגדרות של Evolution"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "כללי"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "גודל תיקיות"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-#, fuzzy
 msgid "Exchange Settings"
-msgstr "הגדרות Evolution"
+msgstr "הגדרות Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_כתובת OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
-msgstr "ההזדהות נכשלה"
+msgstr "הז_דהה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_תיבת דו�ר:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
-msgstr "ההזדהות נכשלה"
+msgstr "סוג _הזדהות"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
-msgstr "ב_דוק סוגי הזדהות נתמכי�"
+msgstr "ב_דוק עבור סוגי� נתמכי�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "%s KB"
-msgstr "%ld ק\"ב"
+msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
-msgstr ""
+msgstr "0 KB"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
 #: ../plugins/exchange-operations/exchange-contacts.c:165
@@ -15961,24 +16508,23 @@ 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 ""
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-#, fuzzy
 msgid "Confirm Password:"
-msgstr "הכנס סיסמה"
+msgstr "�ישור סיסמה:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Current Password:"
-msgstr "�שר סיסמה:"
+msgstr "נוכחית סיסמה:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "New Password:"
@@ -15993,33 +16539,33 @@ msgstr ""
 msgid "Your password will expire in the next %d days"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "מות�� �ישית"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "הרש�ות עבור %s"
@@ -16027,7 +16573,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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -16035,14 +16581,14 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 #, fuzzy
 msgid "You are also permitted to see my private items."
 msgstr "צור פריט מבחן חדש"
@@ -16050,53 +16596,53 @@ 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, 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:415
 #, fuzzy
 msgid "Delegate To"
 msgstr "מחק"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, 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:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "ל� ניתן לבטל"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "שגי�ה בזמן טעינת ספר הכתובות."
@@ -16138,33 +16684,32 @@ msgstr "דו�ר _נכנס:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:18
 msgid "_Summarize permissions"
-msgstr ""
+msgstr "_סכ� הרש�ות"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "_משימות:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "הרש�ות..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "ש� תיקייה"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "גודל תיקייה"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "משתמש"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../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 "הרש� לתיקייה של משתמש �חר"
@@ -16173,21 +16718,21 @@ msgstr "הרש� לתיקייה של משתמש �חר"
 msgid "Exchange Folder Tree"
 msgstr ""
 
-#: ../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:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr ""
@@ -16246,19 +16791,19 @@ msgstr ""
 msgid "_Change Password"
 msgstr "ה_חלף סיסמה"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 #, fuzzy
 msgid "(Permission denied.)"
 msgstr "�ין הרש�ות"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "הוסף משתמש:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../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
 msgid "Add User"
 msgstr "הוסף משתמש"
 
@@ -16377,15 +16922,11 @@ msgstr "_רגישות:"
 msgid "_User"
 msgstr "_משתמש:"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "בחר משתמש"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "ספר כתובות..."
 
@@ -16399,7 +16940,7 @@ msgstr ""
 
 #: ../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 ""
 
@@ -16488,10 +17029,14 @@ msgid "Could not update out-of-office state"
 msgstr ""
 
 #: ../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"
@@ -16507,109 +17052,109 @@ 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 "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "התיקייה כבר קיימת"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "התיקייה �ינה קיימת"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "התיקייה �ינה מקוונת"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "שגי�ה כללית"
 
-#: ../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
 msgid "No such user {0}"
 msgstr "�ין משתמש כזה {0}"
 
-#: ../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
 msgid "Please restart Evolution for changes to take effect"
-msgstr ""
+msgstr "נ� ל�תחל �ת Evolution כדי שהשינויי� יכנסו לתוקף"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "נ� לבחור משתמש."
 
-#: ../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"
@@ -16618,89 +17163,92 @@ 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
 msgid "Unable to add user to access control list:"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr ""
 
-#: ../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
 msgid "Unknown error."
 msgstr "שגי�ה ל� ידועה."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "סוג ל� ידוע"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "פעולה ל� ניתמכת."
 
-#: ../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 ""
+msgstr "�תה משתמש ב: {0} KB. נסה לפנות קצת מקו� על ידי מחיקת מספר הודעות."
 
-#: ../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 ""
+msgstr "�תה משתמש ב: {0} KB. ל� תוכל לשלוח �ו לקבל דו�ר עכשיו."
 
-#: ../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 ""
+"�תה משתמש ב: {0} KB. ל� תוכל לשלוח �ו לקבל דו�ר עד של� תפנה מקו� על ידי "
+"מחיקת מספר הודעות."
 
-#: ../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 ""
+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
 msgid "{0} is already a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "{0} כבר ברשימה"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
@@ -16708,7 +17256,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
-msgstr ""
+msgstr "בדוק הרש�ות תיקייה"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
@@ -16742,6 +17290,7 @@ msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
+"�Evolution ל� הצליח ליצור קובץ זמני כדי לשמור �ת הדו�ר שלך. נסה שוב מ�וחר יותר."
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
 msgid ""
@@ -16751,32 +17300,32 @@ msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 #, fuzzy
-msgid "Compose in External Editor"
+msgid "Compose in _External Editor"
 msgstr "Composer Window default width"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr ""
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "קבצי PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_פני�"
 
@@ -16808,13 +17357,48 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: ../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
 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
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "יו_מן:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "מקבל `%s'"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "תוסף להגדרת יומן google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -16893,10 +17477,21 @@ msgid "_Junk List"
 msgstr "מבחן דו�ר זבל"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+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 ""
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr ""
 
@@ -16904,12 +17499,6 @@ msgstr ""
 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"
-msgstr "�פשרויות שליחה"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr ""
@@ -16957,14 +17546,13 @@ msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "עורך חשבונות"
+msgstr "החשבון כבר קיי�"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"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
@@ -16973,19 +17561,24 @@ msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 #, fuzzy
-msgid "What would you like to {0}?"
+msgid "Would you like to accept it?"
 msgstr "ה�� ברצונך לשמור �ת השינויי� שלך?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
+msgid "Would you like to decline it?"
+msgstr "ה�� ברצונך לשמור �ת השינויי� שלך?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "ל� ניתן לפתוח קובץ"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../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 ""
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr ""
 
@@ -17086,9 +17679,9 @@ msgstr "<b>ש� חשבון</b>"
 msgid "Proxy Login"
 msgstr "כניסת מתווך"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17097,45 +17690,44 @@ msgstr "%s הכנס סיסמה ל%s (משתמש %s("
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "כניסת _מתווך..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "משתמשי�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "תיקייה משותפת _חדשה..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "משתף"
 
-#: ../plugins/groupwise-features/share-folder.c:544
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
-msgstr "התרעות דו�ר"
+msgstr "התרעה מות�מת �ישית"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "הוסף   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 #, fuzzy
 msgid "Modify"
 msgstr "מודל"
@@ -17204,19 +17796,17 @@ msgstr ""
 msgid "Hula Account Setup"
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:322
-#, fuzzy
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
-msgstr "כותרות"
+msgstr "כותרות מות�מות �ישית"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "כותרות IMAP"
 
 #: ../plugins/imap-features/imap-headers.glade.h:1
-#, fuzzy
 msgid "<b>Custom Headers</b>"
-msgstr "<b>מוזמני�</b>"
+msgstr "<b>כותרות מות�מות �ישית</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
 msgid "<b>IMAP Headers</b>"
@@ -17227,9 +17817,8 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr ""
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-#, fuzzy
 msgid "Fetch A_ll Headers"
-msgstr "כותרת"
+msgstr "קבל �ת _כל הכותרות"
 
 #: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
@@ -17258,30 +17847,30 @@ msgstr ""
 msgid "IMAP Features"
 msgstr ""
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "י_ב� ליומן"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "_יב� למשימות"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 #, fuzzy
 msgid "Import ICS"
 msgstr "_יב�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 #, fuzzy
 msgid "Select Task List"
 msgstr "משימות"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "בחר לוח שנה"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_יב�"
 
@@ -17314,13 +17903,14 @@ msgid ""
 "connected to the system or it is not powered on."
 msgstr ""
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr ""
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/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
@@ -17331,607 +17921,607 @@ msgstr "סנכרן ל-iPod"
 msgid "iPod Synchronization"
 msgstr "סנכרון iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 #, fuzzy
 msgid "Meeting information sent"
 msgstr "בחר פעולה"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 #, fuzzy
 msgid "Task information sent"
 msgstr "�יש הקשר ל� נמצ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, fuzzy
 msgid "Memo information sent"
 msgstr "�יש הקשר ל� נמצ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 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:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr ""
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "היו�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "היו� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "היו� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "היו� %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "מחר"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "מחר %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "מחר %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "מחר %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "מחר %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../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:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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:385
+#: ../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:389
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../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:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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:473
+#: ../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:477
+#: ../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:479
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../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:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr ""
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "פתח _יומן"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_סרב"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "ק_בל"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_דחה הכל"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 #, fuzzy
 msgid "_Tentative all"
 msgstr "מ_חק הכל"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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
 #, fuzzy
 msgid "_Tentative"
 msgstr "ההזדהות נכשלה"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "קבל ה_כל"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_שלח מידע"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_עדכן"
 
@@ -18035,9 +18625,11 @@ msgstr "Generates a D-Bus message when new mail messages arrive."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18083,8 +18675,18 @@ msgstr "Whether to notify new messages in Inbox folder only."
 msgid "Generate a _D-Bus message"
 msgstr "צור הו_דעת D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "התרעות דו�ר"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18093,62 +18695,62 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] ""
+"יש לך %d הודעות חדשות\n"
+"ב%s."
 msgstr[1] ""
+"יש לך %d הודעות חדשות\n"
+"ב%s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "יש לך הודעה חדשה �חת."
+msgstr[1] "יש לך %d הודעות חדשות."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "דו�\"ל חדש"
 
-#: ../plugins/mail-notification/mail-notification.c:440
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
-msgstr "Show display alarms in notification tray"
+msgstr "הצג �יקון ב�יזור הה_תר�ות"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 #, fuzzy
 msgid "_Play sound when new messages arrive"
 msgstr "השמע _צליל כ�שר מגיע דו�ר חדש"
 
-#: ../plugins/mail-notification/mail-notification.c:632
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
-msgstr "עזר_ה"
+msgstr "_צפצף"
 
-#: ../plugins/mail-notification/mail-notification.c:633
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
-msgstr "בחר קובץ"
+msgstr "_נגן קובץ שמע"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "ציין _ש� קובץ:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
-msgstr "בחר קובץ"
+msgstr "בחר קובץ שמע"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "נ_גן"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
@@ -18157,6 +18759,8 @@ 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 ""
+"יוצר הודעת D-Bus �ו מודיעה למשתמש בעזרת הודעה ב�זור ההתרעות כ�שר יש הודעה "
+"חדשה."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -18178,12 +18782,12 @@ msgstr "ה_פוך בחירה"
 msgid "Mail to meeting"
 msgstr "ישיבה"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, fuzzy, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ל� ניתן לפתוח קובץ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18292,7 +18896,7 @@ msgstr "יוצר רשימת הודעות"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18371,6 +18975,27 @@ msgstr "תי�ור:"
 msgid "_Unsubscribe from List"
 msgstr "תיקייה _חדשה..."
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "מעביר הודעות �ל התיקייה %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 "סמן �ת כל ההודעות הגלויות כ�ילו נקר�ו"
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+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
 #, fuzzy
 msgid "Mark All Read"
@@ -18419,7 +19044,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "מנהל תוספי�"
 
@@ -18431,34 +19056,25 @@ msgstr "הפעל וכה תוספי�"
 msgid "_Plugins"
 msgstr "_תוספי�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "יוצר(י�)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "תי�ור"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "הגדרות"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "הערה: חלק מהשינויי� יכנסו לפעולה רק ל�חר הפעלה מחדש"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 #, fuzzy
 msgid "Overview"
 msgstr "החלף"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "הגדרות"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr ""
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "תוסף"
 
@@ -18480,19 +19096,19 @@ msgstr "מודל טקסט"
 msgid "Prefer plain-text"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:158
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
-msgstr ""
+msgstr "הצג HTML �� קיי�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:159
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "העדף טקסט פשוט"
 
-#: ../plugins/prefer-plain/prefer-plain.c:160
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "מצב _HTML"
 
@@ -18525,7 +19141,7 @@ msgstr "מידע �ישי"
 
 #: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
-msgstr ""
+msgstr "להסיר �ת הכתובת"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -18609,6 +19225,32 @@ msgstr ""
 "�iCal\n"
 "פנוי/עסוק:"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+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
+#, fuzzy
+msgid "Python Loader"
+msgstr "העבר לתיקייה"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr ""
@@ -18651,7 +19293,7 @@ msgstr "�פשרויות שליחה ל� זמינות."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
 msgid "This will make SpamAssassin more reliable, but slower"
-msgstr ""
+msgstr "זה יהפוך �ת SpamAssassin ל�מין יותר, �ך הו� יעבוד ל�ט יותר"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
@@ -18677,7 +19319,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:314
 msgid "Save attachments"
 msgstr "שמור תצריפי�"
 
@@ -18689,17 +19331,16 @@ msgstr "שמור תצריפי�..."
 msgid "Save all attachments"
 msgstr "שמור �ת כל התצריפי�"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 #, fuzzy
 msgid "Select save base name"
 msgstr "בחר �זור זמן"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "סוג MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "שמור"
 
@@ -18707,83 +19348,81 @@ 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:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "רשימת תי�ור"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "רשימת קטגוריות"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "רשימת הערות"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "נוצר"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "רשימת תפוצה"
 
-#: ../plugins/save-calendar/csv-format.c:372
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
-msgstr "מצב"
+msgstr "התחלה"
 
-#: ../plugins/save-calendar/csv-format.c:373
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
-msgstr "מופעל"
+msgstr "סיו�"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "כתובת"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 #, fuzzy
 msgid "Attendees List"
 msgstr "רענן רשימה"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 #, fuzzy
 msgid "Modified"
 msgstr "מודל"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
@@ -18805,15 +19444,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:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "תצורת RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "בחר קובץ יעד"
 
@@ -18840,22 +19479,23 @@ msgid "Show _only this Task List"
 msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+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 "עוזר"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "�שף ההגדרות של Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "ברוכי� הב�י�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18867,29 +19507,29 @@ msgstr ""
 "\n"
 "לחצו \"קדימה\" כדי להמשך. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "מייב� קבצי�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "�נ� בחר �ת המידע שברצומך לייב�:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "מ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "מייב� נתוני�."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "המתן בבקשה"
 
@@ -18908,11 +19548,38 @@ msgid "Thread messages by subject"
 msgstr "הש�ר הודעות על השרת"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 #, fuzzy
 msgid "F_all back to threading messages by subject"
 msgstr "הש�ר הודעות על השרת"
 
+#: ../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 ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "כותרת תפקיד"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "שמור כטיוטה"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -18922,6 +19589,30 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "לל� תצריף"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "תוסף להגדרת יומן google."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+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 "WebDAV"
+
+#: ../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 "Evolution Shell"
@@ -18939,116 +19630,110 @@ msgid "Evolution Test component"
 msgstr "Evolution Test component"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "A string description of the current printer settings."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr "Authenticate proxy server connections"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "Automatic proxy configuration URL"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Decides whether the crash detection should be run or not."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Default window height"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Default window state"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Default window width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP proxy password"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP proxy username"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 or alias of the component to be shown by default at start-up."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"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 ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"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."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Last upgraded configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Non-proxy hosts"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Password to pass as authentication when doing HTTP proxying."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Proxy configuration mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Secure HTTP proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Secure HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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 "
@@ -19060,27 +19745,23 @@ msgstr ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialog"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Skip recovery warning dialog"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:577
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19088,19 +19769,19 @@ msgstr ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "The default height for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "The default width for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../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\")."
@@ -19108,19 +19789,19 @@ msgstr ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "The machine name to proxy HTTP through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "The machine name to proxy secure HTTP through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "The machine name to proxy socks through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -19128,7 +19809,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -19136,7 +19817,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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."
@@ -19144,7 +19825,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -19154,7 +19835,7 @@ msgstr ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../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 "
@@ -19166,66 +19847,58 @@ msgstr ""
 "(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)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL that provides proxy configuration values."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Use HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "User name to pass as authentication when doing HTTP proxying."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Whether Evolution will start up in offline mode instead of online mode."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Whether crash detection should be done or not"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Whether or not the window should be maximized."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Whether the status bar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Whether the warning dialog in recovery of Evolution is skipped."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Window button style"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
@@ -19241,24 +19914,21 @@ msgstr "חיבורי� פעילי�"
 msgid "Click OK to close these connections and go offline"
 msgstr "הקלק �ישור לסגור �ת החיבור ולעבוד בצורה ל� מקוונת"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -19266,56 +19936,37 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "ש_� הקובץ:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "בחר קובץ"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_סוג הקובץ:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "יב� נתוני� והגדרות מ תוכנות _ישנות יותר"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "יב� _קובץ יחיד"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "העדפות Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "ל� צויין ש� תיקייה."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "ש� התיקייה ל� יכול להכיל �ת התו \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "ש� התיקייה ל� יכול להכיל �ת התו \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' ו '..' ה� שמות תיקיות שמורי�."
-
 #. 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:50 ../shell/e-shell-window.c:343
-#, fuzzy, c-format
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#, c-format
 msgid "%s - Evolution"
-msgstr "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."
@@ -19337,73 +19988,82 @@ 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:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "י�יר הרשקוביץ <yairhr@gmail.com>\n"
+"מ�רק קרפיבנר <mark125@gmail.com>\n"
 "\n"
 "פרוייקט תרגו� GNOME לעברית:\n"
 "�http://gnome-il.berlios.de"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "�תר Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "עבודה במצב מ_קוון"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "עבודה במצב _ל� מקוון"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "עבודה במצב ל� מקוון"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution נמצ�ת במצב מקוון. לחץ כ�ן כדי לעבור למצב ל� מקוון."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution נמצ�ת במצב מקוון.\n"
+"לחץ כ�ן כדי לעבור למצב ל� מקוון."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "�בולוציה במהלך העברה למצב ל� מקוון."
 
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution נמצ�ת במצב ל� מקוון. לחץ כ�ן כדי לעבור למצב מקוון."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution נמצ�ת במצב ל� מקוון.\n"
+"לחץ כ�ן כדי לעבור למצב מקוון."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "החלף ל-%s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "שגי�ת מערכת ל� ידועה."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ק\"ב"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "�ישור"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr ""
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "בסיס נתוני ההגדרות ל� נמצ�"
 
@@ -19413,15 +20073,17 @@ msgstr "בסיס נתוני ההגדרות ל� נמצ�"
 msgid "New"
 msgstr "חדש "
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "מבחן חדש"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#, fuzzy
+msgctxt "New"
 msgid "_Test"
 msgstr "_מבחן"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "צור פריט מבחן חדש"
 
@@ -19461,7 +20123,7 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19481,7 +20143,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:258
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19489,64 +20151,43 @@ msgstr ""
 "תודה\n"
 "צוות Evolution\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "�ל תודיע לי שוב"
 
-#: ../shell/main.c:315
-#, fuzzy
-msgid "Evolution Crash Detection"
-msgstr "תקלת Evolution"
-
-#: ../shell/main.c:317
-msgid "Ig_nore"
-msgstr "ה_תעל�"
-
-#: ../shell/main.c:332
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-
-#: ../shell/main.c:343
-msgid "_Do not show this message again"
-msgstr "�ל _תציג הודעה ז�ת שוב"
-
-#: ../shell/main.c:575
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcibly shut down all Evolution components"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:591
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:593
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:678
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and Email Client"
 
-#: ../shell/main.c:706
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19556,11 +20197,8 @@ msgstr ""
 "  Use %s --help for more information.\n"
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr ""
-"�תה בטוח שברצונך\n"
-"למחוק �נשי קשר �לו?"
+msgstr "לשכוח �ת כל הסיסמ�ות השמורות?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
@@ -19568,7 +20206,7 @@ msgstr "המשך"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
-msgstr ""
+msgstr "מחיקת מידע ישן מגרסה {0}?"
 
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
@@ -19586,7 +20224,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
-msgstr ""
+msgstr "ב�מת למחוק מידע ישן?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
@@ -19641,17 +20279,16 @@ msgid ""
 msgstr ""
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_שער:"
+msgstr "_שכח"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
-msgstr ""
+msgstr "_הש�ר נתוני�"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr ""
+msgstr "_הזכר לי מ�וחר יותר"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -19660,8 +20297,11 @@ msgid ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
+"{1}\n"
+"\n"
+"�� תבחר להמשיך, יתכן של� תוכל לגשת לחלק מהמידע הישן שלך.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19669,14 +20309,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 "
@@ -19728,11 +20368,10 @@ msgid "E-Mail Address"
 msgstr "כתובת דו�\"ל"
 
 #: ../smime/gui/certificate-manager.c:613
-#, fuzzy
 msgid "All CA certificate files"
-msgstr "תעודות"
+msgstr "כל קבצי התעודות"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "מציג תעודות: %s"
@@ -19752,21 +20391,21 @@ msgid "Enter new password"
 msgstr "הכנס סיסמה חדשה"
 
 #. 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"
 "  Subject: %s\n"
 msgstr ""
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "cjr ,gusv"
 
@@ -19812,11 +20451,11 @@ msgstr "רשויות"
 
 #: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
-msgstr ""
+msgstr "גיבוי"
 
 #: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
-msgstr ""
+msgstr "גיבוי הכל"
 
 #: ../smime/gui/smime-ui.glade.h:13
 msgid ""
@@ -19858,7 +20497,7 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
-msgstr ""
+msgstr "עריכה"
 
 #: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
@@ -19926,7 +20565,7 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
-msgstr ""
+msgstr "תצוגה"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
@@ -19950,9 +20589,9 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
-msgstr ""
+msgstr "התעודה כבר קיימת"
 
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
@@ -20046,7 +20685,7 @@ msgstr ""
 
 #: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
-msgstr ""
+msgstr "רשות חתימת SSL"
 
 #: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
@@ -20082,15 +20721,15 @@ msgstr ""
 
 #: ../smime/lib/e-cert.c:939
 msgid "Critical"
-msgstr ""
+msgstr "קריטי"
 
 #: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
-msgstr ""
+msgstr "ל� קריטי"
 
 #: ../smime/lib/e-cert.c:965
 msgid "Extensions"
-msgstr ""
+msgstr "הרחבות"
 
 #: ../smime/lib/e-cert.c:1036
 #, c-format
@@ -20127,7 +20766,7 @@ msgstr ""
 
 #: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
-msgstr ""
+msgstr "תעודה מיוב�ת"
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
@@ -20151,14 +20790,13 @@ msgid "Change the properties of the selected folder"
 msgstr "שנה �ת המ�פייני� של התיקייה הנבחרת"
 
 #: ../ui/evolution-addressbook.xml.h:4
-#, fuzzy
 msgid "Co_py All Contacts To..."
-msgstr "העתק �נשי קשר ל"
+msgstr "הע_תק �ת כל �נשי הקשר ל..."
 
 #: ../ui/evolution-addressbook.xml.h:5
 #, fuzzy
 msgid "Contact _Preview"
-msgstr "_רשימת תפוצה"
+msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
@@ -20177,7 +20815,7 @@ msgstr "העבר �ת ההודעות שנבחרו לתיקייה �חרת"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr ""
+msgstr "העתק �ת הבחירה"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
@@ -20185,7 +20823,7 @@ msgstr "העתק לתיקייה..."
 
 #: ../ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "הוסף משימה חדשה"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -20195,7 +20833,7 @@ msgstr "גזור"
 
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr ""
+msgstr "גזור �ת הבחירה"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
@@ -20250,9 +20888,8 @@ msgid "Print selected contacts"
 msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:29
-#, fuzzy
 msgid "Rename the selected folder"
-msgstr "החלף �ת ש� התיקייה \"%s\" ל:"
+msgstr "שנה �ת ש� התיקייה הנבחרת"
 
 #: ../ui/evolution-addressbook.xml.h:30
 #, fuzzy
@@ -20275,8 +20912,7 @@ msgstr ""
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "בחר ה_כל"
 
@@ -20302,15 +20938,15 @@ msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
-msgstr ""
+msgstr "עצו_ר"
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
-msgstr ""
+msgstr "עצור"
 
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
-msgstr ""
+msgstr "עצור טעינה"
 
 #: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
@@ -20347,7 +20983,7 @@ msgstr "ה_עבר �יש קשר ל..."
 msgid "_Move Folder Contacts To"
 msgstr "העב_ר לתיקייה..."
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_חדש"
 
@@ -20394,11 +21030,11 @@ msgstr "לך �ל"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
-msgstr ""
+msgstr "לך �חורה"
 
 #: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
-msgstr ""
+msgstr "לך קדימה"
 
 #: ../ui/evolution-calendar.xml.h:14
 msgid "List"
@@ -20409,7 +21045,7 @@ msgid "Month"
 msgstr "חודש"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "הב�"
 
@@ -20418,7 +21054,7 @@ msgid "Previews the calendar to be printed"
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "הקוד�"
 
@@ -20486,203 +21122,6 @@ msgstr "שבוע עבודה"
 msgid "_Open Appointment"
 msgstr "_פתח פגישה"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "לחץ כ�ן לצרף קובץ"
-
-#: ../ui/evolution-editor.xml.h:3
-#, fuzzy
-msgid "Click here to close the current window"
-msgstr "הקלק �ישור לסגור �ת החיבור ולעבוד בצורה ל� מקוונת"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr ""
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr ""
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "סגור"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr ""
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr ""
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_הוסף:"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr ""
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "בחר �ת כל הטקסט"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "עזר_ה"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "�_פשרויות"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "�ירוע חדש לכל היו�"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "�ירוע חדש לכל היו�"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-#, fuzzy
-msgid "Insert advanced send options"
-msgstr "המשתמש ביטל �ת הפעולה."
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_ציבורי"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-#, fuzzy
-msgid "R_ole Field"
-msgstr "שדה"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "�פשרויות _שליחה"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "�זור _זמן"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "ה_תרעות"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_קטגוריות"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_סיווג"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_חסוי"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "פנוי/_עסוק:"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_פרטי"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "מופע _חוזר"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-#, fuzzy
-msgid "_Status Field"
-msgstr "_מצב:"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-#, fuzzy
-msgid "_Type Field"
-msgstr "שדה"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ביטול פעולת הדו�ר הנוכחית"
@@ -20714,7 +21153,6 @@ msgid "Empty _Trash"
 msgstr "רוקן �ת ה�שפה"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_תיקייה"
 
@@ -20771,9 +21209,8 @@ msgid "_Debug Logs"
 msgstr "עמוד"
 
 #: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
 msgid "_Download Messages for Offline Usage"
-msgstr "התיקייה �ינה מקוונת"
+msgstr "_הורדת הודעות לשימוש ל� מקוון"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -20804,9 +21241,8 @@ msgid "_Vertical View"
 msgstr ""
 
 #: ../ui/evolution-mail-list.xml.h:1
-#, fuzzy
 msgid "Change the name of this folder"
-msgstr "שנה �ת המ�פייני� של תיקייה זו"
+msgstr "שנה �ת ש� תיקייה ז�ת"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
@@ -20845,20 +21281,20 @@ msgstr "סמן �ת כל ההודעות הגלויות כ�ילו נקר�ו"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr ""
+msgstr "הסתר הודעות נ_בחרות"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
-msgstr ""
+msgstr "הסתר הודעות ש_נמחקו"
 
 #: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
-msgstr ""
+msgstr "הסתר הודעות _שנקר�ו"
 
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
+msgstr "הסתר �ת ההודעות שנמחקו במקו� שיוצגו מסומני� ע� קו חוצה"
 
 #: ../ui/evolution-mail-list.xml.h:16
 #, fuzzy
@@ -20866,9 +21302,8 @@ msgid "Mar_k All Messages as Read"
 msgstr "סמן �ת כל ההודעות הגלויות כ�ילו נקר�ו"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Mark all messages in the folder as read"
-msgstr "סמן �ת כל ההודעות הגלויות כ�ילו נקר�ו"
+msgstr "סמן �ת כל ההודעות בתיקייה כהודעות שנקר�ו"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
@@ -20876,12 +21311,11 @@ msgstr ""
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
+msgstr "הסר לצמיתות �ת כל ההודעות שנמחקו מהתיקייה הז�ת"
 
 #: ../ui/evolution-mail-list.xml.h:20
-#, fuzzy
 msgid "Permanently remove this folder"
-msgstr "שנה �ת המ�פייני� של תיקייה זו"
+msgstr "הסר �ת תיקייה ז�ת לצמיתות"
 
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
@@ -20907,7 +21341,7 @@ msgstr "בחר �ת _כל ההודעות"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
+msgstr "בחר �ת כל ההודעות ש�ינן מוצגות כעת בלבד"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
@@ -20928,15 +21362,15 @@ msgstr "הצג הודעות _נסתרות"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
+msgstr "הצג הודעות שהוסתרו זמנית"
 
 #: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
-msgstr ""
+msgstr "הסתר זמנית �ת כל ההודעות שכבר נקר�ו"
 
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
-msgstr ""
+msgstr "הסתר זמנית �ת ההודעות הנבחרות"
 
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
@@ -20947,7 +21381,7 @@ msgstr ""
 msgid "_Group By Threads"
 msgstr "ה_עתק..."
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "הו_דעה"
@@ -21053,11 +21487,11 @@ msgstr "הקטן �ת גודל הטקסט"
 
 #: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
-msgstr ""
+msgstr "הצג �ת ההודעה החשובה הב�ה"
 
 #: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
-msgstr ""
+msgstr "הצג �ת ההודעה הב�ה"
 
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
@@ -21065,19 +21499,19 @@ msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
-msgstr ""
+msgstr "הצג �ת ההודעה של� נקר�ה הב�ה"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
-msgstr ""
+msgstr "הצג �ת ההודעה החשובה הקודמת"
 
 #: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
-msgstr ""
+msgstr "הצג �ת ההודעה הקודמת"
 
 #: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
-msgstr ""
+msgstr "הצג �ת ההודעה של� נקר�ה הקודמת"
 
 #: ../ui/evolution-mail-message.xml.h:33
 #, fuzzy
@@ -21115,7 +21549,7 @@ msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
-msgstr ""
+msgstr "הכרח טעינה של תמונות בדו�ר HTML"
 
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
@@ -21194,9 +21628,8 @@ msgid "Open a window for composing a mail message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:64
-#, fuzzy
 msgid "Open the selected messages in a new window"
-msgstr "פתח �ת ההודעה שנבחרה בחלון חדש"
+msgstr "פתח �ת ההודעות הנבחרות בחלון חדש"
 
 #: ../ui/evolution-mail-message.xml.h:65
 #, fuzzy
@@ -21205,7 +21638,7 @@ msgstr "פתח �ת ההודעה שנבחרה בחלון חדש"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
-msgstr ""
+msgstr "ההודעה של� נקר�ה הק_קודמת"
 
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
@@ -21295,132 +21728,130 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
-msgid "Show messages in the normal style"
-msgstr "מעביר הודעות �ל התיקייה %s"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Undelete the selected messages"
 msgstr "סמן �ת ההודעות שנבחרו כדו�ר זבל"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "ל_� חשוב"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
-msgstr ""
+msgstr "התר_חק"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
-msgstr ""
+msgstr "_מצורף"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Caret Mode"
 msgstr "צור תיקייה"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Clear Flag"
 msgstr "_נקה"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_מחק הודעה"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "חפש _בהודעה..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Flag Completed"
 msgstr "הסתיי�"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_לך �ל"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_חשוב"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Inline"
 msgstr "עבודה במצב מ_קוון"
 
-#: ../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 "טען _תמונות"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "מ_קור ההודעה"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "ההודעה ה_ב�ה"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "גודל רגיל"
 
-#: ../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 "פתח ב_חלון חדש"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "ההודעה ה_קודמת"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_צוטט"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_קר�"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_שמור הודעה..."
 
-#: ../ui/evolution-mail-message.xml.h:130
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
-msgstr "ההודעה ה_ב�ה"
+msgstr "_בטל מחיקת הודעה"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_ל� נקר�"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
-msgstr ""
+msgstr "_מרחק תצוגה"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
-msgstr ""
+msgstr "_התקרב"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "סגור"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21437,9 +21868,8 @@ msgid "Cut selected memo"
 msgstr "גזור �ת ההודעה המסומנת"
 
 #: ../ui/evolution-memos.xml.h:7
-#, fuzzy
 msgid "Delete selected memos"
-msgstr "מוחק �ת ה�ובייקטי� שנבחרו..."
+msgstr "מחק �ת התזכורות הנבחרות"
 
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
@@ -21450,9 +21880,8 @@ msgid "Previews the list of memos to be printed"
 msgstr ""
 
 #: ../ui/evolution-memos.xml.h:13
-#, fuzzy
 msgid "Print the list of memos"
-msgstr "הדפס הודעה"
+msgstr "הדפס �ת רשימת התזכורות"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
@@ -21462,83 +21891,6 @@ msgstr ""
 msgid "_Open Memo"
 msgstr "_פתח תזכורת"
 
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_סגור"
-
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr ""
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "שמור וסגור"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "שמור ו_סגור"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "שמור �ת הקובץ הנוכחי וסגור �ת החלון"
-
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "שלח �ת הדו�ר בתצורת HTML"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "רענן רשימה"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "ה_פוך בחירה"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-
-#: ../ui/evolution-task-editor.xml.h:9
-#, fuzzy
-msgid "Status Details"
-msgstr "פרטי�"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "�זור זמן"
-
-#: ../ui/evolution-task-editor.xml.h:24
-#, fuzzy
-msgid "_Status Details"
-msgstr "פרטי�"
-
 #: ../ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected tasks"
@@ -21737,50 +22089,54 @@ msgid "View/Hide the Status Bar"
 msgstr ""
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "עבוד במצב ל� מקוון"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_�ודות"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_סגור חלון"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_שכח סיסמ�ות"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_ש�לות ותשובות"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "ה_סתר כפתורי�"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "_סמלי� בלבד"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_יצי�ה"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "החלף _מר�ה"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "�פשרויות _סנכרון..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "טקסט _בלבד"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_חלון"
 
@@ -21858,11 +22214,11 @@ msgid "With _Status"
 msgstr ""
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21891,20 +22247,20 @@ msgstr ""
 "לחץ על הכפתור השמ�לי בעכבר כדי להתקרב ל�זור במפה ולבחור �זור זמן.\n"
 "לחץ על הפתור הימני בעכבר כדי להתרחק."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 #, fuzzy
 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 ""
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 #, fuzzy
 msgid "Define Views"
 msgstr "תצוגת שבוע"
@@ -21921,28 +22277,27 @@ msgstr ""
 msgid "Table"
 msgstr "טבלה"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr ""
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "שמור תצוגה נוכחית"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-#, fuzzy
 msgid "_Create new view"
-msgstr "צור פריט מבחן חדש"
+msgstr "צור תצוגה חדשה"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
-msgstr ""
+msgstr "ה_חלף תצוגה קיימת"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:582
 #: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
-msgstr ""
+msgstr "תצוגה מות�מת �ישית"
 
 #: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
@@ -21980,11 +22335,11 @@ msgstr "שמור תצוגה נוכחית"
 msgid "Create or edit views"
 msgstr "צור פריט מבחן חדש"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr ""
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr ""
 
@@ -22001,43 +22356,17 @@ msgstr "תצוגת יו�"
 msgid "Type of view:"
 msgstr "סוג תצוגה:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, fuzzy, c-format
-msgid "%.1f KB"
-msgstr "%ld ק\"ב"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr ""
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-msgid "Recent Docu_ments"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ל� ניתן לצרף �ת הקובץ %s: %s"
 
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -22059,11 +22388,11 @@ msgid "Suggest automatic display of attachment"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 #, fuzzy
 msgid "Month Calendar"
 msgstr "לוח שנה"
@@ -22112,29 +22441,29 @@ 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:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "רוחב מינימלי"
 
 #: ../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:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "רוחב מינימלי"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "עכשיו"
 
-#: ../widgets/misc/e-cell-date-edit.c:797
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -22161,7 +22490,7 @@ msgstr "סינית"
 
 #: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
-msgstr ""
+msgstr "קירילי"
 
 #: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
@@ -22238,86 +22567,86 @@ msgstr "�חר..."
 msgid "Ch_aracter Encoding"
 msgstr "קידוד _תווי�"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "ת�ריך ושעה"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:409
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "ע_כשיו"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "ה_יו�"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "ת�ריך בלתי חוקית"
 
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 #, fuzzy
 msgid "Invalid Time Value"
 msgstr "חתימה בלתי חוקית"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr ""
 
@@ -22368,20 +22697,28 @@ msgstr "תיקייה נוכחית"
 msgid "Current Message"
 msgstr "הודעה נוכחית"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "בחר תמונה"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "מפת עול�"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 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:109
+msgid "Online"
+msgstr "מקוון"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 #, fuzzy
 msgid "Sync with:"
@@ -22407,63 +22744,63 @@ msgstr ""
 msgid "Column width"
 msgstr "רוחב עמודה"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 #, fuzzy
 msgid "Click here to change the search type"
 msgstr "לחץ כ�ן לצרף קובץ"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "חפש _עכשיו"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_נקה"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1018
+#: ../widgets/misc/e-search-bar.c:1006
 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:1035
+#: ../widgets/misc/e-search-bar.c:1023
 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:1047
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr ""
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 #, fuzzy
 msgid "Cursor Row"
 msgstr "יש סמן"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr ""
@@ -22482,7 +22819,7 @@ msgstr "בחר תיקייה"
 msgid "Cursor Mode"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 #, fuzzy
 msgid "When de_leted:"
 msgstr "%d נמחק"
@@ -22510,10 +22847,6 @@ msgstr "<b>מחפש</b>"
 msgid "A_uto-delete sent item"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "סיווג"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr ""
@@ -22620,19 +22953,19 @@ msgid "_When opened:"
 msgstr "_�יפה:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% הסתיי�)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "לחץ כ�ן כדי לעבור לכתובת"
 
@@ -22653,7 +22986,7 @@ msgstr "_קטגוריות �פשרויות:"
 msgid "categories"
 msgstr "קטגוריות"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr ""
 
@@ -22849,83 +23182,83 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (פריט �חד)"
 msgstr[1] "%s (%d פריטי�)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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
 msgid "Alternating Row Colors"
 msgstr ""
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr ""
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr ""
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+#: ../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
 #, fuzzy
 msgid "Draw focus"
 msgstr "יש פוקוס"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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
 msgid "Cursor mode"
 msgstr ""
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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
 #, fuzzy
 msgid "Selection model"
 msgstr "בחר תיקייה"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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
 msgid "Length Threshold"
 msgstr ""
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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
 msgid "Uniform row height"
 msgstr ""
 
-#: ../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: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
 #, fuzzy
 msgid "Frozen"
 msgstr "מ�ת"
@@ -23008,41 +23341,41 @@ msgstr "מידע מיון"
 msgid "Tree"
 msgstr "פנוי"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 #, fuzzy
 msgid "Table header"
 msgstr "כותרת ההודעה"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 #, fuzzy
 msgid "Table model"
 msgstr "מודל טקסט"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 #, fuzzy
 msgid "Cursor row"
 msgstr "יש סמן"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 #, fuzzy
 msgid "Always search"
 msgstr "תמיד"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 #, fuzzy
 msgid "Use click to add"
 msgstr "לחץ כ�ן כדי להוסיף משימה"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr ""
 
@@ -23061,7 +23394,7 @@ msgstr "מודגש"
 
 #: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
-msgstr ""
+msgstr "קו חוצה"
 
 #: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
@@ -23069,7 +23402,7 @@ msgstr "עוגן"
 
 #: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
-msgstr ""
+msgstr "יישור"
 
 #: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 #, fuzzy
@@ -23155,6 +23488,122 @@ msgstr ""
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "Upcoming Appointments"
+#~ msgstr "פגישות קרובות"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "_Properties..."
+#~ msgstr "_מ�פייני�..."
+
+#~ msgid "D_escription:"
+#~ msgstr "תי_�ור:"
+
+#~ msgid "De_scription:"
+#~ msgstr "תי�ו_ר:"
+
+#~ msgid "Updating query"
+#~ msgstr "מעדכן ש�ילתה"
+
+#~ msgid "_Save Message"
+#~ msgstr "_שמור הודעה"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Enable attachment reminder plugin"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Enable attachment reminder plugin."
+
+#, fuzzy
+#~ msgid "Remind _missing attachments"
+#~ msgstr "שומר תצריף"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "A string description of the current printer settings."
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Decides whether the crash detection should be run or not."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Skip recovery warning dialog"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Whether crash detection should be done or not"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "Whether the warning dialog in recovery of Evolution is skipped."
+
+#~ msgid "No folder name specified."
+#~ msgstr "ל� צויין ש� תיקייה."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "ש� התיקייה ל� יכול להכיל �ת התו \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "ש� התיקייה ל� יכול להכיל �ת התו \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' ו '..' ה� שמות תיקיות שמורי�."
+
+#, fuzzy
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "תקלת Evolution"
+
+#~ msgid "Ig_nore"
+#~ msgstr "ה_תעל�"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "�ל _תציג הודעה ז�ת שוב"
+
+#~ msgid "All Day Event"
+#~ msgstr "�ירוע חדש לכל היו�"
+
+#~ msgid "Send _Options"
+#~ msgstr "�פשרויות _שליחה"
+
+#, fuzzy
+#~ msgid "Show messages in the normal style"
+#~ msgstr "מעביר הודעות �ל התיקייה %s"
+
+#~ msgid "C_lose"
+#~ msgstr "_סגור"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and Close"
+#~ msgstr "שמור וסגור"
+
+#~ msgid "Save and _Close"
+#~ msgstr "שמור ו_סגור"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "שמור �ת הקובץ הנוכחי וסגור �ת החלון"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "שלח �ת הדו�ר בתצורת HTML"
+
+#~ msgid "Refresh List"
+#~ msgstr "רענן רשימה"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "ה_פוך בחירה"
+
+#, fuzzy
+#~ msgid "Status Details"
+#~ msgstr "פרטי�"
+
+#~ msgid "Time Zone"
+#~ msgstr "�זור זמן"
+
+#, fuzzy
+#~ msgid "%.1f KB"
+#~ msgstr "%ld ק\"ב"
+
 #, fuzzy
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr "סמן �ת כל ההודעות הגלויות כ�ילו נקר�ו"
@@ -23162,10 +23611,6 @@ msgstr ""
 #~ msgid "Only on _Current Folder"
 #~ msgstr "בתיקייה ה_נוכחית בלבד"
 
-#, fuzzy
-#~ msgid "on Current Folder and _Subfolders"
-#~ msgstr "צור תיקייה"
-
 #~ msgid "Permission Denied."
 #~ msgstr "ההרש�ה נדחתה."
 
@@ -23184,9 +23629,6 @@ msgstr ""
 #~ msgid "Name:"
 #~ msgstr "ש�:"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "המשך ב_עריכה"
-
 #~ msgid "_Refresh:"
 #~ msgstr "_רענן:"
 
@@ -23219,9 +23661,6 @@ msgstr ""
 #~ msgid "Save As"
 #~ msgstr "שמור בש�"
 
-#~ msgid "Save Draft"
-#~ msgstr "שמור טיוטה"
-
 #~ msgid "Save in folder..."
 #~ msgstr "שמור בתיקייה..."
 
@@ -23357,9 +23796,6 @@ msgstr ""
 #~ msgid "(Untitled)"
 #~ msgstr "(לל� כותרת)"
 
-#~ msgid "_Phone List"
-#~ msgstr "_רשימת טלפוני�"
-
 #~ msgid "_Edit..."
 #~ msgstr "_עריכה..."
 
diff --git a/po/hi.po b/po/hi.po
index 9c68d06baf..4cff033d2c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,51 +1,50 @@
-# translation of evolution.HEAD.hi .po to Hindi
-# translation of evolution.HEAD.hi.po to Hindi
-# translation of evolution.HEAD.po to Gnome Hindi Team
+# translation of evolution.HEAD.pot.po to Hindi
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Rajesh Ranjan <rranjan@redhat.com>, 2004, 2005, 2006.
-#
-#: ../mail/em-format-html-display.c:683
+#: ../shell/main.c:589
+# Rajesh Ranjan <rranjan@redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.hi\n"
+"Project-Id-Version: evolution.HEAD.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-04 08:57+0200\n"
-"PO-Revision-Date: 2006-09-04 13:52+0530\n"
+"POT-Creation-Date: 2008-09-11 06:07+0000\n"
+"PO-Revision-Date: 2008-09-11 16:58+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
-"Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
+"Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n\n"
 "\n"
-"X-Generator: KBabel 1.9.1\n"
+"\n"
+"\n"
+"\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:180
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "�वोल�यूशन पता प�स�तिका"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "नया संपर�क"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "नयी संपर�क सूची"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "मौजूदा पता प�स�तिका फोल�डर %s में %d कार�ड है"
-msgstr[1] "मौजूदा पता प�स�तिका फोल�डर %s में %d कार�ड हैं"
+msgstr[1] "मौजूदा पता प�स�तिका फोल�डर %s में %d कार�ड है"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "खोलें"
 
@@ -61,28 +60,28 @@ msgstr "संपर�क: "
 msgid "evolution minicard"
 msgstr "�वोल�यूशन मिनीकार�ड"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "इसमें �लार�म है."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "इसमें आवृत�ति है."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "यह �क बैठक है."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "कैलेंडर मद: सार %s है."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "कैलेंडर मद: इसमें कोई सार नहीं है."
 
-#: ../a11y/calendar/ea-cal-view-event.c:298
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "कैलेंडर दृश�य मद"
 
@@ -90,50 +89,50 @@ msgstr "कैलेंडर दृश�य मद"
 msgid "Grab Focus"
 msgstr "फोकस पायें"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "नई म�लाकात"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "नई पूरी दिनचर�या"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "नई बैठक"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "आज पर जायें"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "तिथि पर जायें"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
-#: ../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 "मौजूदा समय परिसर देखने व च�नने के लिये �क तालिका"
 
 #. 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."
 msgstr[0] "इसमें %d मद है."
-msgstr[1] "इसमें %d मद हैं."
+msgstr[1] "इसमें %d मद है."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../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 "इसमें कोई मद नहीं है."
 
 #. 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 "कार�य सप�ताह दृश�य: %s. %s"
@@ -141,21 +140,21 @@ msgstr "कार�य सप�ताह दृश�य: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "दिवस दृश�य: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "कार�य सप�ताह के लिये कैलेंडर दृश�य"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "�क या ज�यादा दिन के लिये कैलेंडर दृश�य"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:707
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -165,32 +164,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:190
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
-#: ../calendar/gui/e-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:760
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../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
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../a11y/calendar/ea-gnome-calendar.c: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:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -199,138 +196,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:220
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
-#: ../calendar/gui/e-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:786
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1582
+#: ../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:766
 msgid "Gnome Calendar"
 msgstr "गनोम कैलेंडर"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "खोज पट�टी"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "�वोल�यूशन कैलेंडर खोज पट�टी"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "जंप बटन"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "यहां क�लिक करें, आप ज�यादा मद पायेंगे."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "माह दृश�य: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "सप�ताह दृश�य: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "महीने के लिये कैलेंडर दृश�य"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "�क या ज�यादा सप�ताह के लिये कैलेंडर दृश�य"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "पॉपअप"
 
 #. 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 "�क संतति पॉपअप करें"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "संपादन"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "इस सेल का संपादन श�रू करें"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "टॉगल"
 
 #. 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 "सेल टॉगल करें"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "बढायें"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "इस सेल को रखने वाले ETree की पंक�ति का विस�तार करता है"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "निपात"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "इस शेल को रखने वाले ETree में पंक�ति निपात करें"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "तालिका सेल"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
+#: ../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 "जोड़ने के लिये क�लिक करें"
 
-#: ../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 "क�लिक"
 
-#: ../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 "छांटे"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../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:304
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "कैलेंडर: %s से %s में"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "�वोल�यूशन कैलेंडर मद"
 
-#: ../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 "मूलभूत सक�रिय करें"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "पॉपअप मेनू"
 
@@ -342,7 +337,14 @@ msgstr "संलग�नक पट�टी टॉगल करें"
 msgid "activate"
 msgstr "सक�रिय करें"
 
-#: ../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?"
@@ -350,19 +352,23 @@ msgstr ""
 "इस संपर�क का ईमेल पता या नाम इस फोल�डर में पहले से ही उपस�थित है.  क�या आप किसी तरह इसमें "
 "समान पते के साथ �क नया कार�ड जोड़ना चाहेंगे?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "पता '{0}' पहले से उपस�थित है."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "संपर�क हटा नहीं सकता."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "श�रेणी संपादक मौजूद नहीं है."
 
-#: ../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; "
@@ -372,75 +378,68 @@ msgstr ""
 "कर रहे हैं. याद रखें कि बह�त से शब�दकूट क�छ खास केस के प�रति संवेदनशील होते हैं; आपका कैप�सलाक "
 "ऑन हो सकता है."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP सर�वर के लि� स�कीमा सूचना नहीं पा सका"
 
-#: ../addressbook/addressbook.error.xml.h:7
-msgid "Could not remove addressbook."
-msgstr "पता प�स�तिका नहीं हटा सकता"
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove address book."
+msgstr ""
 
-#: ../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 "पता प�स�तिका '{0}' मिटायें?"
 
-#: ../addressbook/addressbook.error.xml.h:10
-msgid "Error loading addressbook."
-msgstr "पता प�स�तिका लोड करने में त�र�टि"
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading address book."
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} को {1} में सहेजने में त�र�टि: 2"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP सर�वर के साथ सत�यापन में असफल."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "संपर�क मिटाने में विफल"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "समूहीकृत पता प�स�तिका निर�माण:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP सर�वर ने वैध स�कीमा सूचना के साथ अन�क�रिया नहीं किया."
 
-#: ../addressbook/addressbook.error.xml.h:16
-msgid "Permission Denied."
-msgstr "अन�मति निषेधित."
-
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Server Version"
 msgstr "सर�वर संस�करण"
 
-#: ../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."
-msgstr "�वोल�यूशन पता प�स�तिका अप�रत�याशित रूप से बंद हो गया."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
+msgstr ""
 
-#: ../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 "
@@ -449,55 +448,51 @@ msgstr ""
 "संभव है LDAP सर�वर LDAP का प�राना रूप उपयोग करता हो, जो इस कार�य का समर�थन नहीं करता "
 "है या यह क�विन�यस�त हो सकता है. अपने प�रशासक को समर�थित खोज आधार के लि� कहि�."
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "This address book will be removed permanently."
-msgstr "पता प�स�तिका हमेशा के लिये हटा दी जायेगी."
-
-#: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook could not be opened."
-msgstr "पता प�स�तिका खोली नहीं जा सकी."
-
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "इस पता प�स�तिका सर�वर के पास कोई स��ाया गया खोज आधार नहीं है."
+msgid "This address book could not be opened."
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
-"यह पता प�स�तिका सर�वर पह�ंच से बाहर हो सकती है या सर�वर के नाम की वर�तनी अश�द�ध हो सकती "
-"है या आपका नेटवर�क संबंधन कमजोर हो सकता है."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "पता प�स�तिका हमेशा के लिये हटा दी जायेगी."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "यह सर�वर LDAPv3 स�कीमा सूचना का समर�थन नहीं करता है."
 
-#: ../addressbook/addressbook.error.xml.h:27
-msgid "Unable to open addressbook"
-msgstr "पता प�स�तिका खोलने में असमर�थ"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
+msgstr "पता प�स�तिका खोलने में विफल"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "खोजने में असमर�थ"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} सहेजने में असमर�थ."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
-msgstr "क�या आप बदलाव को सहेजना चाहेंगे?"
+msgstr "क�या आप परिवर�तनों को सहेजना चाहेंगे?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
-"आप �क पता प�स�तिका से दूसरे में �क संपर�क को डालने की कोशिश कर रहे हैं लेकिन इसे श�रोत से नहीं "
-"हटाया जा सकता. क�या आप बदले में �क कॉपी स�रक�षित रखना चाहते हैं?"
 
-#: ../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 "
@@ -507,53 +502,71 @@ msgstr ""
 "सामना कर सकते हैं. सबसे अच�छे परिणाम के लिये सर�वर को समर�थित संस�करण के लिये उन�नत बनाया "
 "जाना चाहिये"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../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 "जबतक �वोल�यूशन प�नः श�रू नहीं होता तबतक {0} के लि� आपका संपर�क उपलब�ध नहीं हो पायेगा."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
+#: ../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 "जोड़ें (_A)"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "त�यागें (_D)"
 
-#: ../addressbook/addressbook.error.xml.h:37
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:41
+msgid "_Resize"
+msgstr "आकार बदलें (_R)"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr ""
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this 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}"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "मूलभूत त�ल�यकालित पता:"
 
-#: ../addressbook/conduit/address-conduit.c:1241
-#: ../addressbook/conduit/address-conduit.c:1242
-msgid "Could not load addressbook"
-msgstr "पता प�स�तिका लोड नहीं कर सका"
+#: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
+msgstr ""
 
-#: ../addressbook/conduit/address-conduit.c:1310
-#: ../addressbook/conduit/address-conduit.c:1313
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "पाइलट का पता अन�प�रयोग खंड नहीं पढ़ सका"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
-msgstr "स�वसमापन"
+msgstr "स�वतःपूर�ण करें"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
@@ -569,19 +582,20 @@ msgstr "स�वसमापन यहां विन�यस�त करे
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
-msgstr "संपर�क"
+msgstr "सम�पर�क"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book"
 msgstr "�वोल�यूशन पता प�स�तिका"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "�वोल�यूशन पता प�स�तिका पता पॉप-अप"
+msgid "Evolution Address Book address popup"
+msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -596,8 +610,8 @@ msgid "Evolution Address Book component"
 msgstr "�वोल�यूशन पता प�स�तिका घटक"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "�वोल�यूशन S/Mime प�रमाणपत�र प�रबंधन नियंत�रण"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -609,14 +623,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:141
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573 ../calendar/gui/migration.c:1081
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
 msgid "On This Computer"
 msgstr "इस कम�प�यूटर पर"
 
@@ -625,137 +640,139 @@ msgstr "इस कम�प�यूटर पर"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581 ../calendar/gui/migration.c:1089
-#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../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/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 "व�यक�तिगत"
+msgstr "निजी"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP सर�वर पर"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
-msgstr "संपर�क (_C)"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "न� संपर�क बना�ं"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
-msgstr "संपर�क सूची (_L)"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "नयी संपर�क सूची बना�ं"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "नयी पता प�स�तिका"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "पता प�स�तिका (_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "नयी पता प�स�तिका बना�ं"
 
-#: ../addressbook/gui/component/addressbook-component.c:407
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "पता प�स�तिका जमावट या फोल�डरों के अद�यतन करने में असफल"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "आधार"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "प�रकार (_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "ऑफलाइन संक�रिया के लि� प�स�तक की समाग�री स�थानीय रूप से कापी करें"
+#: ../addressbook/gui/component/addressbook-config.c:619
+msgid "Copy _book content locally for offline operation"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2051
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "सामान�य"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:569
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "पता प�स�तिका"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "सर�वर जानकारी"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "प�रमाणीकरण"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "विवरण"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
-msgstr "खोज रहा है"
+msgstr "ढूंढा जा रहा है"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "डाउनलोड किया जा रहा है"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "पता प�स�तिका विशेषता"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "उत�प�रवासित हो रहा है..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "`%s' में उत�प�रवासित कर रहा है"
+msgid "Migrating '%s':"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
-msgstr "LDAP सर�वर"
+msgstr "�लडी�पी सर�वर�स"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "स�वसमापन जमावट"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -766,7 +783,7 @@ msgstr ""
 "\n"
 "कृपया धैर�य रखें जबतक �वोल�यूशन आपके फोल�डर में उत�प�रवासित होता है..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -776,7 +793,7 @@ msgstr ""
 "\n"
 "कृपया धैर�य रखें जबतक �वोल�यूशन आपके फोल�डर में उत�प�रवासित होता है..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -786,7 +803,7 @@ msgstr ""
 "\n"
 "कृपया धैर�य रखें जबतक �वोल�यूशन आपके फोल�डर में उत�प�रवासित होता है..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -796,96 +813,102 @@ msgstr ""
 "\n"
 "कृपया धीरज रखें जबतक �वोल�यूशन आपके पाइलट त�ल�यकालित आंकड़ा उत�परवासित करता है..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" फोल�डर का प�नर�नामकरण �से करें:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "फोल�डर का प�नर�नामकरण करें"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "फोल�डर नाम'/' अक�षर नहीं रख सकता है."
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "इस नाम से फोल�डर पहले से उपस�थित है"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "नयी पता प�स�तिका (_N)"
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:985
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1131
+#: ../addressbook/gui/component/addressbook-view.c:943
+msgid "Save As vCard..."
+msgstr ""
+
+#: ../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
+#: ../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:30 ../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 "मिटा�� (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "वीकार�ड के रूप में सहेजें..."
-
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
-msgid "_Properties..."
-msgstr "ग�ण (_P)..."
+#: ../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 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "ग�ण (_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "श�रोत चयनकर�ता से संपर�क करें"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP सर�वर का अज�ञात रूप से अभिगम कर रहा है"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "प�रमाणीकरण में असफल.\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../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 "%s के लिये शब�दकूट डालें (उपयोक�ता %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../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:49
+msgid "Enter password"
+msgstr "कूटशब�द दाखिल करें"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "स�वसमापन लंबाई"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "URI समाप�त करने की सूची के लि� XML EFolderList"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "URI समाप�त करने की सूची के लि� XML EFolderList"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../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 "उर�ध�वाधर पट�टी की अवस�थिति, कार�ड व सूची दृश�य के बीच और पूर�वालोकन पट�टी, पिक�सेल में."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "पूर�वावलोकन पट�टी दिखा�ं"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../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."
@@ -893,20 +916,20 @@ msgstr ""
 "मात�राओं की संख�या जिसे �वोल�यूशन के स�वसमापन के लि� प�रयास के पहले निश�चित रूप से टाइप किया "
 "जाना चाहि� "
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "चयनित नाम वार�तालाप में प�रय�क�त फोल�डर के लि� URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../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.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "लंबवत पट�टी स�थिति"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "क�या पूर�वावलोकन पट�टी दिखाया जाना है."
 
@@ -931,43 +954,39 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>सत�यापन</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>प�रदर�शित करें</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>अधिभारित करें</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>खोज रहा है</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>सर�वर सूचना</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>टाइप:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "पता प�स�तिका जोड़ें"
 
-#: ../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:761
 msgid "Always"
 msgstr "हमेशा"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "अज�ञात रूप से"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../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 "मूल"
@@ -978,7 +997,7 @@ msgstr "विशिष�ट नाम"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
-msgstr "ईमेल पता"
+msgstr "ई-मेल पता"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
@@ -993,16 +1012,16 @@ msgid "Lo_gin:"
 msgstr "लागिन करें (_g)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "कभी नहीं"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
-msgstr "कोई गोपन नहीं"
+msgstr "कोई �नक�रिप�शन नहीं"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
@@ -1012,9 +1031,9 @@ 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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
-msgstr "SSL गोपन"
+msgstr "�स�स�ल �नक�रिप�शन"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
@@ -1078,9 +1097,9 @@ 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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
-msgstr "TLS गोपन"
+msgstr "टी�ल�स �नक�रिप�शन"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
@@ -1171,12 +1190,12 @@ msgid "_Login method:"
 msgstr "लागिन विधि (_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:163
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
-msgstr "नाम: (_N)"
+msgstr "नाम (_N):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
@@ -1187,10 +1206,10 @@ msgid "_Search scope:"
 msgstr "खोज दायरा (_S)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
-msgstr "सर�वर (_S)"
+msgstr "सर�वर (_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
@@ -1206,14 +1225,14 @@ msgstr "कार�ड�स"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../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 "मिनट"
+msgstr "मिनट�स"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
@@ -1225,7 +1244,7 @@ msgstr "<b>घर</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
-msgstr "<b>तत�काल संदेशा</b>"
+msgstr "<b>इंस�टेंट मैसेज</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Job</b>"
@@ -1252,98 +1271,99 @@ msgid "<b>Work</b>"
 msgstr "<b>कार�य</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
-msgstr "AIM"
+msgstr "�आई�म"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
-msgid "Contact"
-msgstr "संपर�क"
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "श�रेणियां (_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
+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
 msgid "Contact Editor"
 msgstr "संपर�क संपादक"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "पूरा नाम (_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "छवि"
 
-#: ../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
 msgid "MSN Messenger"
-msgstr "MSN संदेशवाहक"
+msgstr "�म�स�न मैसेंजर"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "संप�रेषण पता"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "उपनाम (_c)"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+msgid "Nic_kname:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "नावेल समूह"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "व�यक�तिगत जानकारी"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "टेलिफोन"
 
 #. 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:204
+#: ../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:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
 msgid "Work"
-msgstr "कार�य"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
-msgstr "पता (_A): "
+msgstr "कार�यस�थल"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "पता (_A):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "वर�षगांठ (_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "सहायक (_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "जन�मदिन (_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "कैलेंडर (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "श�रेणियां (_C)..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "शहर (_C):"
@@ -1420,7 +1440,7 @@ msgid "_Web Log:"
 msgstr "वेब लाग (_W):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "कहां (_W):"
 
@@ -1428,1117 +1448,1121 @@ msgstr "कहां (_W):"
 msgid "_Zip/Postal Code:"
 msgstr "जिप/डाक कूट (_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../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 "पता"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/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-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1821 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
-msgstr "संशोधनीय"
+msgstr "संपादित करने योग�य"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "यूनाइटेड स�टेट�स"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "अफगानिस�तान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "अलबानिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "अल�जीरिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
-msgstr "अमेरिकन सामोआ"
+msgstr "अमेरिकी सामोआ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "अंडोरा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "अंगोला"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
-msgstr "�ंग�विला"
+msgstr "�ंग��ला"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "अंटार�कटिका"
 
-#: ../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 "�ंटीग�आ और बारब�डा"
+msgstr "�न�टिग�आ और बारबूडा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
-msgstr "अर�जेन�टिना"
+msgstr "अर�जेंटीना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
-msgstr "आर�मेनियाई"
+msgstr "आर�मेनिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "अरूबा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "आस�ट�रेलिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "आस�ट�रिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "अजरबैजान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "बहामा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
-msgstr "बहरीन"
+msgstr "बहारीन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "बांग�लादेश"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
-msgstr "बारबोडस"
+msgstr "बारबाडोस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "बेलारूस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "बेल�जियम"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
-msgstr "बेलाइज"
+msgstr "बेलिज"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "बेनिन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "बरम�डा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "भूटान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
-msgstr "बोलीविया"
+msgstr "बोलिविया"
 
-#: ../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 "बोस�निया और हर�जेगोविना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "बोत�सवाना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
-msgstr "बौभेट द�वीप"
+msgstr "बोउवेत आइलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "ब�राजील"
 
-#: ../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 "ब�रिटिश भारतीय साम�द�रिक परिक�षेत�र"
+msgstr "ब�रिटिश इंडियन ओसन क�षेत�र"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
-msgstr "ब�र�नेई दारूसलाम"
+msgstr "ब�रूनेई दारेस�सलाम"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
-msgstr "बल�गारिया"
+msgstr "ब�ल�गारिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "ब�र�किना फासो"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "ब�रूंडी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "कंबोडिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "कैमरून"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "कनाडा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "केप वर�डे"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "कैमन द�वीप"
 
-#: ../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 "केंद�रीय अफ�रीकी गणतंत�र"
+msgstr "सेंट�रल अफ�रीकन रिपब�लिक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "चाड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "चिली"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "चीन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "क�रिसमस द�वीप"
 
-#: ../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 "कोकोस (कीलिंग) द�वीप"
+msgstr "कोकोस (कीलिंग) आइलैंड�स"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
-msgstr "कोलंबिया"
+msgstr "कोलम�बिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
-msgstr "कोमोरॉस"
+msgstr "कोमोरोस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
-msgstr "कांगो"
+msgstr "कोंगो"
 
-#: ../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 "कांगो का लोकतांत�रिक गणतंत�र"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "क�क द�वीप"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "कोस�टा रिका"
 
-#: ../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 "कोटे डि इवायर"
+msgstr "कोटे डिल�वायर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
-msgstr "क�रोशिया"
+msgstr "क�रो�शिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "क�यूबा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "साइप�रस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
-msgstr "चेक गणतंत�र"
+msgstr "चेक रिपब�लिक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "डेनमार�क"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
-msgstr "दिबॉती"
+msgstr "डिबौती"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "डोमिनिका"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
-msgstr "डोमिनिकन गणतंत�र"
+msgstr "डोमिनिकन रिपब�लिक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "इक�वेडर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "मिश�र"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "अल सल�वाडोर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
-msgstr "भूमध�यरेखीय गायना"
+msgstr "इक�वेटोरियल ग��ना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
-msgstr "इरीट�रिया"
+msgstr "�रिट�रीया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
-msgstr "इस�टोनिया"
+msgstr "�स�तोनिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
-msgstr "इथोपिया"
+msgstr "इथियोपिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
-msgstr "फाकलैंड द�वीप"
+msgstr "फाकलैंड आइलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
-msgstr "फैरो द�वीप"
+msgstr "फारो द�वीपओ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "फिजी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "फिनलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "फ�रांस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
-msgstr "फ�रेंच गायना"
+msgstr "फ�रेंच ग�याना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
-msgstr "फ�रेंच पोलीनेशिया"
+msgstr "फ�रेंच पॉलीनेसिया"
 
-#: ../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 "फ�रेंच दक�षिण परिक�षेत�र"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
-msgstr "गैबन"
+msgstr "गेबॉन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
-msgstr "गैंबिया"
+msgstr "जाम�बिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
-msgstr "जार�जिया"
+msgstr "ज�यार�जिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "जर�मनी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "घाना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "जिब�राल�टर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "ग�रीस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "ग�रीनलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "ग�रेनाडा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
-msgstr "ग�आडेलोप"
+msgstr "ग�य�आडेलोप"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
-msgstr "ग�आम"
+msgstr "ग�वाम"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
-msgstr "ग�आटेमाला"
+msgstr "ग�वाटेमाला"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "ग��र�नसी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
-msgstr "गायना"
+msgstr "ग�ईना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "गायना-बिस�साउ"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "ग��ना-बिसाऊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
-msgstr "ग�आयना"
+msgstr "ग�याना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "हैती"
 
-#: ../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 "हर�ड और मैकडोनाल�ड द�वीप"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "होली सी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "होंड�रास"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
-msgstr "हांग कांग"
+msgstr "हांगकांग"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "हंगरी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
-msgstr "आइसलैंड"
+msgstr "आयरलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "भारत"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "इंडोनेशिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "इरान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "इराक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "आयरलैंड"
 
-#: ../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 "आयल ऑफ मैन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
-msgstr "इसरायल"
+msgstr "इज़राइल"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "इटली"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "जमैका"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "जापान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "जरसी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
-msgstr "जोर�डन"
+msgstr "जॉर�डन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
-msgstr "कजाखस�तान"
+msgstr "कज़ाखिस�तान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
-msgstr "कीनिया"
+msgstr "केन�या"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "किरीबाती"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
-msgstr "कोरिया लोकतांत�रिक जन गणतंत�र"
+msgstr "डेमोक�रेटिक पीप�ल�स रिपब�लिक ऑफ कोरिया"
 
-#: ../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 "कोरिया गणतंत�र"
+msgstr "कोरिया गणराज�य"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "क�वैत"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
-msgstr "किर�गीस�तान"
+msgstr "किर�गिजिस�तान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "लाओस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "लाटविया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "लेबनान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "लेसोथो"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "लाइबेरिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "लीबिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
-msgstr "लिचेंस�टाइन"
+msgstr "लिचटेनस�टीन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "लिथ�आनिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "लक�समबर�ग"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "मकाओ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "मकदूनिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
-msgstr "मैडागास�कर"
+msgstr "मेडागास�कर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "मलावी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "मलेशिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "मालदीव"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "माली"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "माल�टा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
-msgstr "मार�शल द�वीप"
+msgstr "मार�शल आइलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
-msgstr "मारटीनिक"
+msgstr "मार�टीनीक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
-msgstr "मारीटेनिया"
+msgstr "मारीतानिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
-msgstr "मौरीसस"
+msgstr "मॉरीशस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
-msgstr "मयोटे"
+msgstr "मयोट�टे"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
-msgstr "मैक�सिको"
+msgstr "मेक�सिको"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
-msgstr "माइक�रोनेशिया"
+msgstr "माइक�रोनेसिया"
 
-#: ../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 "माल�डोवा गणतंत�र"
+msgstr "रिपब�लिक ऑफ मोलदोवा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "मोनेको"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "मंगोलिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
-msgstr "मोंट�सेराट"
+msgstr "मॉटसेरट"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
-msgstr "मोरोक�को"
+msgstr "मोरक�को"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
-msgstr "मोजांबिक"
+msgstr "मोज़ाम�बीक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
-msgstr "म�यांमार"
+msgstr "म�यनमार"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "नामीबिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "नौरू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "नेपाल"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "नीदरलैंड�स"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
-msgstr "नीदरलैंड�स �ंटीलेस"
+msgstr "नीदरलैंड �न�टीलीस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
-msgstr "न�यू कैलिडोनिया"
+msgstr "न�यू केलेदूनिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
-msgstr "न�यू जीलैंड"
+msgstr "न�यूजीलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "निकाराग�आ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
-msgstr "नाइजर"
+msgstr "निगर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "नाइजीरिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
-msgstr "निवे"
+msgstr "नियू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
-msgstr "नारफाक द�वीप"
+msgstr "नार�फाक द�वीप"
 
-#: ../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 "उत�तरी मरियाना द�वीप"
+msgstr "उत�तरी मारीआना द�वीपओ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "नार�वे"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "ओमान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "पाकिस�तान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
-msgstr "पलाऊ"
+msgstr "पलाउ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
-msgstr "फिलीस�तीनी क�षेत�र"
+msgstr "फिलीस�तीनी टेरिटरी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "पनामा"
 
-#: ../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 "पाप�आ न�यू गिनी"
+msgstr "पाप�आ न�यू गियाना"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
-msgstr "पराग�वे"
+msgstr "पैराग��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "पेरू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
-msgstr "फिलीपीन"
+msgstr "फिलिप�पीन�स"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "पिटकैर�न"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
-msgstr "पोलेंड"
+msgstr "पोलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "प�र�तगाल"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
-msgstr "प�यूरिटो रिको"
+msgstr "प�यूर�टो रिको"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
-msgstr "कातार"
+msgstr "क़तर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "रीयूनियन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "रोमानिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
-msgstr "रूस परिसंघ"
+msgstr "रूसी फेडरेशन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "रवांडा"
 
-#: ../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 "सेंट किट�स �वं नेविस"
+msgstr "सेंट किट�स तथा नेविस"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
-msgstr "सेंट ल�सिया"
+msgstr "संत ल�य�सीआ"
 
-#: ../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 "सेंट विंसेट और दि ग�रेना-डाइन�स"
+msgstr "सेंट विंसेंट तथा ग�रेनेडाइन�स"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
-msgstr "समोआ"
+msgstr "सामोआ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
-msgstr "सैन मेरिनो"
+msgstr "सेन मेरिनो"
 
-#: ../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 "साओ टोमे �वं प�रिंसिपी"
+msgstr "साओ टोम तथा प�रिंसिपी"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "सऊदी अरब"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "सेनेगल"
 
-#: ../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 "सर�बिया �वं मोंटेनेग�रो"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
-msgstr "सिचेलीस"
+msgstr "शेसेल�स"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
-msgstr "सियरा लियोन"
+msgstr "सि�रा लिओन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
-msgstr "सिंगाप�र"
+msgstr "सिंगापोर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "स�लोवाकिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "स�लोवेनिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
-msgstr "सोलोमन द�वीप"
+msgstr "सोलोमन आइलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "सोमालिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
-msgstr "दक�षिण अफ�रीका"
+msgstr "दक�षिणी अफ�रीका"
 
-#: ../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 "दक�षिण जार�जिया �वं दि साउथ सेंडविच द�वीप"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "स�पेन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
-msgstr "श�रीलंका"
+msgstr "श�री लंका"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "सेंट हेलेना"
 
-#: ../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 "सेंट पियरे �वं मिक�वेलन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "सूडान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
-msgstr "स�रीनाम"
+msgstr "सूरीनाम"
 
-#: ../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 "स�वालबार�ड �वं जान मेयन द�वीप"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "स�वाजीलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
-msgstr "स�वीडेन"
+msgstr "स�वीडन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "स�विट�जरलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "सीरिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
-msgstr "ताइवान"
+msgstr "ताईवान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "ताजीकिस�तान"
 
-#: ../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 "संय�क�त तंजानिया गणतंत�र"
+msgstr "तंजानिया यूनाइटेड रिपब�लिक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "थाइलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
-msgstr "तिमोर-लेस�टे"
+msgstr "तिमोर-लेस�ते"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "टोगो"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
-msgstr "टोकेलाऊ"
+msgstr "तोकेलाऊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
-msgstr "टोंगा"
+msgstr "टोन�गा"
 
-#: ../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 "त�रिनीनाड �वं टोबैगो"
+msgstr "ट�रिनिडाड और टोबैगो"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "ट�यूनीशिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "त�र�की"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "त�र�कमेनिस�तान"
 
-#: ../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 "त�र�क �वं कैकोस द�वीप"
+msgstr "त�र�क तथा कैकोस आइलैंड"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
-msgstr "त�वैल�"
+msgstr "त�वालू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
-msgstr "यूगांडा"
+msgstr "उगांडा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "उक�रेन"
 
-#: ../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 "संय�क�त अरब अमीरात"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "यूनाइटेड किंगडम"
 
-#: ../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 "यूनाइटेड स�टेट�स माइनर आउटलाइंग आइलैंड�स"
+msgstr "य�नाईटेड स�टेट�स माईनोर आउटलाईंग द�वीपओ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "उर�गवे"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
-msgstr "उजबेकिस�तान"
+msgstr "उज�बेकिस�तान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
-msgstr "वैन�आट�"
+msgstr "वनौतू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "वेनेज��ला"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "वियतनाम"
 
-#: ../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 "वर�जिन आइलैंड�स, ब�रिटिश"
+msgstr "वर�जिन आइलैंड, ब�रिटिश"
 
-#: ../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 "वर�जिन आइलैंड�स, यू.�स."
+msgstr "वर�जिन आइलैंड, यू.�स."
 
-#: ../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 "वैलिस �वं फ�ट�ना द�वीप"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
-msgstr "पश�चिम सहारा"
+msgstr "पश�चिमी सहारा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "यमन"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
-msgstr "जांबिया"
+msgstr "ज़ाम�बिया"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
-msgstr "जिंबाबवे"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
-#: ../widgets/menus/gal-view-new-dialog.c:73
+msgstr "जिम�बाबवे"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "नाम"
 
-#: ../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 "AOL तत�काल संदेशवाहक"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
-msgstr "जैब�बर"
+msgstr "जैबर"
 
-#: ../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
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu मेसेंजर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
-msgstr "ICQ"
+msgstr "आईसीक�यू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "सेवा"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../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
 msgid "Location"
 msgstr "स�थान"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
-msgstr "उपयोक�ता नाम"
+msgstr "प�रयोक�तानाम"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "घर"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "याहू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
-msgstr "गाडू-गाडू"
+msgstr "गडू-गडू"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
-msgstr "MSN"
+msgstr "�म�स�न"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
-msgstr "समूहीकृत"
+msgstr "ग�र�पवाइज़"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "श�रोत प�स�तिका"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "लक�ष�य प�स�तिका"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "नया संपर�क है"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "लिखने योग�य क�षेत�र"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "जरूरी क�षेत�र"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
-msgstr "परिवर�तित"
+msgstr "बदला"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "संपर�क संपादक - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "कृपया इस संपर�क के लिये �क बिंब का चयन करें"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "कोई बिंब नहीं (_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2546,47 +2570,47 @@ msgstr ""
 "संपर�क आंकड़ा अवैध है:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' के पास अवैध प�रारूप है"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' के पास �क अवैध प�रारूप है"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' खाली है"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "अवैध संपर�क."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "क�विक-�ड को संपर�क करें"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "पूरा संपादित करें (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "पूरा नाम (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "ई-मेल (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "पता प�स�तिका च�नें (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2595,7 +2619,7 @@ msgstr ""
 "क�या आप निश�चित हैं कि आप इन\n"
 "संपर�क सूची (%s) को मिटाना चाहते हैं?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2603,7 +2627,7 @@ msgstr ""
 "क�या आप निश�चित हैं कि आप इन\n"
 "संपर�क सूची को मिटाना चाहते हैं?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2612,7 +2636,7 @@ msgstr ""
 "क�या आप निश�चित हैं कि आप\n"
 "इस संपर�क (%s) को मिटाना चाहते हैं?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2636,24 +2660,20 @@ msgstr "देश (_y):"
 msgid "Full Address"
 msgstr "पूरा पता"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "पता (_A):"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "जिप कोड (_Z):"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
-msgstr "डा."
+msgstr "डॉ."
 
 #: ../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:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "पूरा नाम"
 
@@ -2671,7 +2691,7 @@ msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
-msgstr "Jr."
+msgstr "कनिष�ठ"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
@@ -2679,7 +2699,7 @@ msgstr "क�मारी"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
-msgstr "श�री"
+msgstr "श�रीमान�"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
@@ -2691,7 +2711,7 @@ msgstr "स�श�री"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
-msgstr "Sr."
+msgstr "वरिष�ठ"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
@@ -2724,73 +2744,58 @@ msgstr "IM सेवा (_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:235
+#: ../plugins/exchange-operations/exchange-calendar.c:243
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "स�थान (_L):"
 
 #: ../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 "सूची में �क ईमेल जोड़ें"
+msgid "<b>Members</b>"
+msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../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 "सूची संपादक को संपर�क करें"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "पता प�स�तिका से ईमेल पता को डालें"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "सदस�यों"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "सूची से �क ईमेल पता को हटायें"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "च�नें..."
 
-#: ../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 "इस सूची में पत�र भेजने वक�त पता छिपा दीजि� (_H)"
 
-#: ../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 "सूची नाम (_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "च�नें (_S)"
-
-#: ../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 "ईमेल पता टाइप करें या निम�न सूची में संपर�क को लायें (_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
-#: ../addressbook/gui/widgets/e-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 "संपर�क सूची सदस�य"
+
+#: ../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 "सदस�य (_M)"
+
+#: ../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:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "प�स�तक"
 
-#: ../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 "नयी सूची है"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
-msgid "_Members"
-msgstr "सदस�य (_M)"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "संपर�क सूची सदस�य"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "परिवर�तित संपर�क"
@@ -2806,11 +2811,9 @@ msgstr "नकल संपर�क पाया गया"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
-"इस संपर�क का परिवर�तित ईमेल या नाम इस फोल�डर में \n"
-"पहले से ही उपस�थित है.  क�या आप किसी तरह इसे जोड़ना चाहेंगे?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2828,173 +2831,179 @@ msgstr ""
 "इस संपर�क का ईमेल पता या नाम इस फोल�डर में \n"
 "पहले से ही उपस�थित है.  क�या आप किसी तरह इसे जोड़ना चाहेंगे?"
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
+msgid "_Merge"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr ""
+
+#: ../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
+msgid "Email"
+msgstr "ईमेल"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "ईमेल श�र� होता है"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Name begins with"
-msgstr "नाम श�र� होता है"
+msgid "Name contains"
+msgstr "नाम में शामिल है"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "कोई संपर�क नहीं"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d संपर�क"
 msgstr[1] "%d संपर�क"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
-msgstr "सवाल"
+msgstr "जानकारी"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "प�स�तक दृश�य पाने में त�र�टि"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3329
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../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
 msgid "Model"
 msgstr "मॉडल"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "कार�ड संशोधन में त�र�टि"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "नाम श�र� होता है"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
-msgstr "श�रोत"
+msgstr "स�रोत"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:250
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../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:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
-msgstr "प�रकार"
+msgstr "क़िस�म"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:840
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "वीकार�ड के रूप में सहेजें..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+msgid "Save as vCard..."
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../calendar/gui/dialogs/comp-editor.c:1101
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "खोलें (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "नया संपर�क...(_N)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "नयी संपर�क सूची... (_L)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
-msgid "_Save as VCard..."
-msgstr "वीकार�ड के र�प में सहेजें (_S)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+msgid "_Save as vCard..."
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "संपर�क अग�रसारित करें (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "संपर�क अग�रसारित करें (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "संपर�क को संदेश भेजें (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "सूची को संदेश भेजें (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "संपर�क को संदेश भेजें (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "छापें (_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "पता प�स�तिका में कापी करें... (_y)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "पता प�स�तिका में जायें... (_v)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:982
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "काटें (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
-#: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1117 ../mail/message-list.c:1919
+#: ../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 ../mail/em-folder-tree.c:1005
+#: ../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-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 "कॉपी करें (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "चिपका�� (_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:422
+#: ../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
 msgid "Any Category"
 msgstr "किसी श�रेणी"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
-msgid "Print cards"
-msgstr "कार�ड छापें"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-msgid "Other error"
-msgstr "अन�य त�र�टि"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "सहायक"
 
@@ -3024,98 +3033,93 @@ msgstr "कार फोन"
 
 #: ../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 "श�रेणियां"
+msgstr "श�रेणिया�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "कंपनी फोन"
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "संस�था"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "ई-मेल"
+msgid "Company Phone"
+msgstr "कंपनी फोन"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "ईमेल २"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "ईमेल ३"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
-msgstr "परिवार का नाम"
+msgstr "परिवार नाम"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "�से फाइल करें"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "दिया गया नाम"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
-msgstr "आवास फैक�स"
+msgstr "घर का फैक�स"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
-msgstr "आवास फोन"
+msgstr "घर का फोन"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
-msgstr "आवास फोन २"
+msgstr "घर का फोन 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN फोन"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
-msgstr "पत�रिका"
+msgstr "दैनिकी"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "प�रबंधक"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "मोबाइल फोन"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "उपनाम"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "टिप�पणी"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "कार�यालय"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "संगठन"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "अन�य फैक�स"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
-msgstr "अन�य फोन"
+msgstr "अन�य दूरभाष"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
@@ -3130,15 +3134,14 @@ msgid "Radio"
 msgstr "रेडियो"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:497
+#: ../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 "भूमिका"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "जीवनसाथी"
 
@@ -3169,38 +3172,38 @@ msgid "Web Site"
 msgstr "वेब साइट"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:656
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-field-chooser-item.c:655
+#: ../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
 msgid "Width"
 msgstr "चौड़ाई"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:663
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
-#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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
 msgid "Height"
 msgstr "ऊ�चाई"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "फोकस रखता है"
 
@@ -3210,7 +3213,7 @@ msgstr "क�षेत�र"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
-msgstr "क�षेत�र नाम"
+msgstr "फील�ड नाम"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
@@ -3220,11 +3223,18 @@ msgstr "पाठ माडल"
 msgid "Max field name length"
 msgstr "अधिकतम क�षेत�र नाम लंबाई"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
-msgstr "कालम चौड़ाई"
+msgstr "स�तंभ चौड़ाई"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3238,7 +3248,7 @@ msgstr ""
 "\n"
 "न� संपर�क निर�मित करने के लि� दो बार क�लिक करें."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3252,7 +3262,7 @@ msgstr ""
 "\n"
 "न� संपर�क निर�मित करने के लि� दो बार क�लिक करें."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3262,7 +3272,7 @@ msgstr ""
 "\n"
 "संपर�क के लिये खोजें."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3272,267 +3282,272 @@ msgstr ""
 "\n"
 "इस दृश�य में कोई मद दिखाने के लिये नहीं है."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "अन�कूलक"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "कार�यालय ई-मेल"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "आवास ईमेल"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "अन�य ईमेल"
 
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
-msgstr "चयनित"
+msgstr "च�ना गया"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "कर�सर रखता है"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
-msgstr "ब�राउजर में लिंक खोलें (_O)"
+msgstr "कड़ी को ब�राउज़र में खोलें (_O)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2516
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
-msgstr "लिंक स�थान को कापी करें (_C)"
+msgstr "कड़ी स�थान की प�रतिलिपि बना�ं (_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "इसमें नया संदेश भेजें (_S)..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+msgid "_Send New Message To..."
+msgstr "इसे नया संदेश भेजें (_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
-msgstr "ई-मेल पता कॉपी करें (_E):"
+msgstr "ईमेल पता कॉपी करें (_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../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 "(मानचित�र)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../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 "मानचित�र"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../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 "सदस�यों को सूचीबद�ध करें"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "ई-मेल"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "विभाग"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "व�यवसाय"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "स�थिति"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
-msgstr "वीडियो चैट"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2286
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:388
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:598
-#: ../plugins/hula-account-setup/camel-hula-listener.c:379
-#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+msgstr "विडियो बात-चीत"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../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-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 "कैलेंडर"
+msgstr "कैलेन�डर"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "म�क�त/व�यस�त:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "फोन"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
-msgstr "फैक�स"
+msgstr "फॉक�स"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
-msgstr "पहला पन�ना"
+msgstr "घर पृष�ठ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "वेब लाग"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "जन�मदिन"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "वर�षगांठ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
-msgstr "पद नाम"
+msgstr "कार�य उपाधि"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
-msgstr "पहला पन�ना"
+msgstr "होम पेज"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "ब�लॉग"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
-msgstr "सफल"
+msgstr "सफलता"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "बैकेंड व�यस�त"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "अभिलेखागार ऑफलाइन"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "पता प�स�तिका मौजूद नहीं है"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "कोई स�व संपर�क परिभाषित नहीं"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "संपर�क नहीं मिला"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "संपर�क पहचान पहले से मौजूद है"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "प�रोटोकॉल समर�थित नहीं"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../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
 msgid "Canceled"
 msgstr "रद�द"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "रद�द नहीं कर सका"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "सत�यापन विफल"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "सत�यापन आवश�यक"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS मौजूद नहीं"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "वैसा श�रोत नहीं है"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "ऑफलाइन मोड में उपलब�ध नहीं है"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "अन�य त�र�टि"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "अमान�य सर�वर संस�करण"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 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:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, 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 ""
-"इस पता प�स�तिका को हमलोग खोलने में असमर�थ थे.  कृपया जांचे कि पथ %s मौजूद है और इसके "
-"अभिगम की आपको आज�ञा है."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 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 ""
-"इस पता प�स�तिका को हमलोग खोलने में असमर�थ थे.  इसका मतलब या तो आपने गलत URI में प�रवेश "
-"किया है, या LDAP सर�वर पह�ंच से बाहर है."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
@@ -3541,69 +3556,71 @@ msgstr ""
 "�वोल�यूशन का इस संस�करण में LDAP समर�थन समाहित नहीं है.  अगर आप �वोल�यूशन में LDAP का "
 "उपयोग करना चाहते हैं, आपको LDAP-क�षम �वोल�यूशन पैकेज अधिष�ठापित करना चाहिये."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 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 ""
-"इस पता प�स�तिका को हमलोग खोलने में असमर�थ थे.  इसका मतलब या तो आपने गलत URI में प�रवेश "
-"किया है, या सर�वर पह�ंच से बाहर है."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error:"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr " सर�वरपता प�स�तिका�वोल�यूशनकार�ड�स के लिये.विन�यास "
+"the directory server preferences for this address book."
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 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."
-msgstr " सर�वरपता प�स�तिकापता प�स�तिकाके लिये के लिये."
+"preferences for this address book."
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "इस पता प�स�तिका के लिये पश�चशिरा इस सवाल की व�याख�या करने में असमर�थ था."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "इस पता प�स�तिका के लिये पश�चशिरा इस सवाल को करने से मना किया."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "यह सवाल सफलतापूर�वक पूरा नहीं ह�आ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "सूची में जोड़ने में त�र�टि"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "संपर�क में जोड़ने में त�र�टि"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "सूची संशोधन में त�र�टि"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "संपर�क संशोधन में त�र�टि"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "सूची को हटाने में त�र�टि"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "संपर�को हटाने में त�र�टि"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3615,10 +3632,19 @@ msgstr[0] ""
 "%d संपर�क को खोलने से %d नया विंडो भी ख�लेगा.\n"
 "क�या आप इस संपर�क को वास�तव में प�रदर�शित करना चाहते हैं?"
 msgstr[1] ""
-"%d संपर�कों को खोलने से %d नया विंडो भी ख�लेगा.\n"
-"क�या आप इन सभी संपर�कों को वास�तव में प�रदर�शित करना चाहते हैं?"
+"%d संपर�क को खोलने से %d नया विंडो भी ख�लेगा.\n"
+"क�या आप इस संपर�क को वास�तव में प�रदर�शित करना चाहते हैं?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
+msgid "_Don't Display"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+msgid "Display _All Contacts"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3627,166 +3653,144 @@ msgstr ""
 "%s पूर�व मौजूद है\n"
 "क�या आप इसके उपर लिखना चाहते हैं?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 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:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "संपर�क"
 msgstr[1] "संपर�क"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "कार�ड.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "पता प�स�तिका च�नें"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "सूची"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "संपर�क को यहां खिसकायें"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "संपर�क को यहां कापी करें"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "संपर�कों को यहां खिसकायें"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "संपर�कों को यहां कापी करें"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
-msgid "Multiple VCards"
-msgstr "कई वीकार�ड�स"
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
+msgid "Multiple vCards"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
-msgid "VCard for %s"
-msgstr "%s के लिये वीकार�ड"
+msgid "vCard for %s"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#, c-format
 msgid "Contact information"
 msgstr "संपर�क सूचना"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s के लिये संपर�क सूचना"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "पता प�स�तिका से प�रश�न कर रहा है..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "�क अन�य संपर�क है."
-msgstr[1] "%d अन�य संपर�क हैं."
+msgstr[1] "%d अन�य संपर�क है."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "पूरा वीकार�ड दिखा�ं"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "पूरा संहत वीकार�ड दिखा�ं"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Save in addressbook"
-msgstr "पता प�स�तिका में सहेजें"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+msgid "Save in address book"
+msgstr ""
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "कार�ड दृश�य"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK तरू दृश�य"
-
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
+#: ../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
 msgid "Importing..."
 msgstr "आयात कर रहा है..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV या Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "आउटल�क CSV और टैब आयातक"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV या Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV और टैब आयातक"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�वोल�यूशन CSV या Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "�वोल�यूशन CSV और टैब आयातक"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
-msgid "Importing ..."
-msgstr "आयात कर रहा है..."
-
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP आंकड़ा विनिमय फारमेट(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "�वोल�यूशन LDIF आयातक"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "वीकार�ड (.vcf, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr ""
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "�वोल�यूशन वीकार�ड आयातक"
-
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "लिफाफा छापें"
-
-#: ../addressbook/printing/e-contact-print.c:849
-msgid "Print contacts"
-msgstr "संपर�कों छापें"
-
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
-msgid "Print contact"
-msgstr "संपर�क छापें"
+msgid "Evolution vCard Importer"
+msgstr ""
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3802,7 +3806,7 @@ msgstr "समाप�ति पर खाली पृष�ठ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
-msgstr "शरीर"
+msgstr "बॉडी"
 
 #: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
@@ -3826,25 +3830,25 @@ msgstr "पदांत:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
-msgstr "प�रारूप"
+msgstr "फॉर�मेट"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:649
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:432 ../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-selection-model.c:309
 msgid "Header"
-msgstr "शीर�ष"
+msgstr "शीर�षक"
 
 #: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
-msgstr "शीर�ष/पदांत"
+msgstr "हेडर/फ�टर"
 
 #: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
-msgstr "शीर�षक"
+msgstr "शीर�षकें"
 
 #: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
@@ -3852,7 +3856,7 @@ msgstr "पà¥�रतà¥�येक अकà¥�षर के लिये शीरà¥
 
 #: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
-msgstr "ऊंचाई:"
+msgstr "ऊ�चाईः"
 
 #: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
@@ -3864,7 +3868,7 @@ msgstr "शामिल करें:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
-msgstr "भूदृश�यावली"
+msgstr "आड़ा"
 
 #: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
@@ -3876,18 +3880,17 @@ msgstr "किनारे में अक�षर टैब"
 
 #: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
-msgstr "हाशिया"
+msgstr "हाशि�"
 
 #: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
-msgstr "कालम की संख�या:"
+msgstr "स�तम�भों की संख�या:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "विकल�प"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "दिशा"
 
@@ -3909,7 +3912,7 @@ msgstr "कागज श�रोत:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
-msgstr "व�यक�तिबिंबा "
+msgstr "खड़ा "
 
 #: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
@@ -3933,15 +3936,15 @@ msgstr "खंड:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
-msgstr "छायांकन"
+msgstr "शेडिंग"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
-msgstr "आकार:"
+msgstr "आकारः"
 
 #: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
@@ -3956,36 +3959,36 @@ msgid "Top:"
 msgstr "शीर�ष:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
-msgstr "प�रकार:"
+msgstr "क़िस�मः"
 
 #: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
-msgstr "चौड़ाई:"
+msgstr "चौडाईः"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "फंट (_F)..."
 
-#: ../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 "छपाई शैली संपादक परीक�षण को संपर�क करें"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "कापीराइट (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 "इसे संपर�क प�रिंट शैली संपादक विजेट का परीक�षण करना चाहि�"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "छपाई परीक�षण को संपर�क करें"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "इसे संपर�क छपाई कूट का परीक�षण करना चाहि�"
 
@@ -3996,78 +3999,82 @@ msgid "Can not open file"
 msgstr "फाइल नहीं खोल सकता है"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "पता प�स�तिकाओं की सूची नहीं पा सका"
+msgid "Couldn't get list of address books"
+msgstr ""
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "प�स�तक खोलने में असफल"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "मानक आउटप�ट के बजाय आउटप�ट फाइल को निर�दिष�ट करें"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "आउटप�ट फाइल"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
-msgstr "स�थानीय पता प�स�तिका फोल�डरों की सूची दें"
+#: ../addressbook/tools/evolution-addressbook-export.c:53
+msgid "List local address book folders"
+msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "वीकार�ड या csv फाइल के रूप में कार�ड दिखायें"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "अत�ल�यकालिक स�थिति में निर�यात"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "अत�ल�यकालिक स�थिति में �क आउटप�ट फाइल में कार�ड की संख�या, मूलभूत आकार १००."
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "संख�या"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "समादेश रेखीय तर�क त�र�टि, कृपया इसके उपयोग को देखने के लि� --help विकल�प देखें."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "सिर�फ csv या वीकार�ड प�रारूप को समर�थन दें."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "अत�ल�यकालिक स�थिति में, आउटप�ट निश�चित रूप से फाइल होगी."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "सामान�य स�थिति में आकार विकल�प की आवश�यकता नहीं रहनी चाहि�."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "अनियंत�रित त�र�टि"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "मूलभूत पता प�स�तिका के अधिभारण में त�र�टि"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "इनप�ट फाइल"
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-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:1
+#: ../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."
@@ -4075,134 +4082,141 @@ 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
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr "इन यथारूप प�रविष�टियों की सभी सूचना�ं  मिटा दी जायेंगी और फिर सहेजी नहीं जा सकेगी."
+#: ../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
-msgid "All information in this journal will be deleted and can not be restored."
-msgstr "इस यथारूप प�रविष�टि की सभी सूचना�ं मिट दी जायेंगी और फिर सहेजी नहीं जा सकेगी."
+#: ../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
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr "इस यथारूप प�रविष�टि की सभी सूचना�ं  मिटा दी जायेंगी और फिर सहेजी नहीं जा सकेंगी."
-
-#: ../calendar/calendar.error.xml.h:9
+#: ../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:10
+#: ../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:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "इस कार�य की सभी सूचना�ं  मिट दी जायेंगी और फिर सहेजी नहीं जा सकेगी."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "क�या आप निश�चित हैं कि आप '{0}' कार�य को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "क�या आप निश�चित हैं कि आप '{0}' म�लाकात को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "क�या आप निश�चित हैं कि आप '{0}' यथारूप प�रविष�टि को मिटाना चाहते हैं?"
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr ""
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "क�या आप निश�चित हैं कि आप इस {0} म�लाकातों को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "क�या आप निश�चित हैं कि आप इन {0} यथारूप प�रविष�टियों को मिटाना चाहते हैं?"
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr ""
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "क�या आप निश�चित हैं कि आप इन {0} कार�यों को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "क�या आप निश�चित हैं कि आप इस म�लाकात को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "क�या आप निश�चित हैं कि आप इस यथारूप प�रविष�टि को मिटाना चाहते हैं?"
-
-#: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "क�या आप निश�चित हैं कि आप इस बैठक को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
+#, 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
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "क�या आप निश�चित हैं कि आप इस कार�य को मिटाना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:25
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "क�या आप निश�चित हैं कि आप बिना सार के म�लाकात भेजना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "क�या आप निश�चित हैं कि आप बिना सार के कार�य भेजना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "�क नया मद नहीं बना सकता है"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' कैलेंडर मिटायें?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' मेमो सूची मिटायें?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' कार�य सूची मिटायें?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "मत भेजें (_n)"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "डाउनलोड प�रगति में है. क�या आप इस म�लाकात को सहेजना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "डाउनलोड प�रगति में है. क�या आप इस कार�य को सहेजना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "संपादक भारित नहीं की जा सकी."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4210,39 +4224,37 @@ msgstr ""
 "ई-मेल आमंत�रण सभी सहभागियों को भेजा जायेगा और इस कार�य को स�वीकार करने की उन�हें अन�मति "
 "होगी."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../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:33
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "कैलेंडर भारन में त�र�टि"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "मेमो सूची में लोड करने में त�र�टि"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "कार�य सूची में लोड करने में त�र�टि"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
+"the meeting is canceled."
 msgstr ""
-"अगर आप रद�द करने की सूचना नहीं भेजते हैं, अन�य सहभागी नहीं जान पायेंगे कि जर�नल मिटाया जा "
-"च�का है."
+"अगर आप रद�द करने की सूचना नहीं भेजते हैं, अन�य सहभागी नहीं जान पायेंगे कि बैठक रद�द हो च�की "
+"है."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"the memo has been deleted."
 msgstr ""
-"अगर आप रद�द करने की सूचना नहीं भेजते हैं, अन�य सहभागी नहीं जान पायेंगे कि बैठक रद�द हो च�की "
-"है."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../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."
@@ -4250,19 +4262,19 @@ msgstr ""
 "अगर आप रद�द करने की सूचना नहीं भेजते हैं, अन�य सहभागी नहीं जान पायेंगे कि कार�य मिटाया जा "
 "च�का है."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "अद�यतनीकृत सूचना भेजना अन�य सहभागियों को अपने कैलेंडर को अद�यतन रखने में मदद करता है."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "अद�यतनीकृत सूचना भेजना अन�य सहभागियों को अपने कार�य सूची को अद�यतन रखने में मदद करता है."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4270,7 +4282,7 @@ msgstr ""
 "क�छ संलग�नक हैं जो डाउनलोड हो रहे हैं. म�लाकात को सहेजना इन संलग�नक की क�षति के रूप में "
 "परिणाम देगा."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4278,83 +4290,83 @@ msgstr ""
 "क�छ संलग�नक हैं जो डाउनलोड हो रहे हैं. म�लाकात को सहेजना इन संलग�नक की क�षति के रूप में "
 "परिणाम देगा."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "आपके मौजूदा सर�वर के साथ क�छ फीचर ठीक से मेल काम नहीं कर सकता है."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "�वोल�यूशनअप�रत�याशित"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "�वोल�यूशन मेमो अप�रत�याशित रूप से बाहर हो गया है."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "�वोल�यूशन कार�य अप�रत�याशित रूप से बंद हो गया."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "ऑफलाइन प�रयोग के लिये कैलेंडर चिह�नित नहीं है"
 
-#: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
-msgstr "ऑफलाइन प�रयोग के लिये मेमो सूची चिह�नित नहीं है"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr ""
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "ऑफलाइन प�रयोग के लिये कार�य सूची चिह�नित नहीं है"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "कैलेंडर स�थायी रूप से मिटा दी जायेगी."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "मेमो सूची स�थायी रूप से मिटा दी जायेगी."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "कार�य सूची स�थायी रूप से मिटा दी जायेगी."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "क�या आप म�लाकात में कि� ग� बदलावों को संग�रहित करना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "क�या आप मेमो में कि� ग� बदलावों को सहेजना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "क�या आप कार�य में कि� ग� बदलावों को सहेजना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "क�या आप रद�द करने की सूचना इस जर�नल प�रविष�टि के लिये भेजना चाहेंगे?"
+#: ../calendar/calendar.error.xml.h:62
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "क�या आप सभी सहभागी को रद�द करने की सूचना देना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "क�या आप सहभागियों को बैठक के लिये आमंत�रण भेजना चाहते हैं?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "क�या आप सहभागियों को यह कार�य भेजना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "क�या आप सहभागियों को बैठक की अद�यतन सूचना भेजना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "क�या आप सहभागियों को अद�यतनीकृत कार�य सूचना भेजना चाहेंगे?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4364,121 +4376,109 @@ msgstr ""
 "सामना कर सकते हैं. सबसे अच�छे परिणाम के लिये सर�वर को समर�थित संस�करण के लिये उन�नत बनाया "
 "जाना चाहिये."
 
-#: ../calendar/calendar.error.xml.h:63
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-"आपने सिर�फ पठन के लिये कैलेंडर श�रोत चयन किया है. कैलेंडर दृश�य में बदलें और �क कैलेंडर उभारें जो "
-"कि म�लाकात स�वीकार करता है."
-
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "आपने इस म�लाकात में बदलाव किया है लेकिन अबतक सहेजा नहीं है."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "आपने इस कार�य में बदलाव किया है लेकिन अबतक सहेजा नहीं है."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "आपने इस मेमो में बदलाव किया है लेकिन अबतक सहेजा नहीं है."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "�वोल�यूशनजबतक."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "आपका मेमो उपलब�ध नहीं रहेगा जबतक कि �वोल�यूशन फिर आरंभ नहीं होता है."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "�वोल�यूशनजबतक."
 
-#: ../calendar/calendar.error.xml.h:70
-#: ../composer/mail-composer.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "बदलावों को छोड़ें (_D)"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "सहेजें (_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "बदलाव सहेजें (_S)"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "भेजें (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "सूचना भेजि� (_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "शब�दकूट दाखिल करें"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "बह� दिवस घटनाओं को विखंडित करें:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1432
-#: ../calendar/conduits/calendar/calendar-conduit.c:1433
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr " सर�वर�वोल�यूशन-आंकड़ा-सर�वर को आरंभ नहीं कर सका"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1529
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "पायलट के कैलेंडर अन�प�रयोग खंड को नहीं पढ़ सका"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "पायलट के मेमो अन�प�रयोग खंड को नहीं पढ़ सका"
 
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "पायलट के मेमो अन�प�रयोग खंड को नहीं पढ़ सका"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "मूलभूत प�राथमिकता:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1112
-#: ../calendar/conduits/todo/todo-conduit.c:1115
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "पायलट के ToDo अन�प�रयोग खंड को नहीं पढ़ सका"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "पायलट के ToDo अन�प�रयोग खंड को नहीं लिख सका"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "कैलेंडर �वं कार�य"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
-msgstr "कैलेंडर"
+msgstr "कैलेण�डर"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
@@ -4517,22 +4517,25 @@ msgid "Memo_s"
 msgstr "मेमो (_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/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/memos-control.c:370
 msgid "Memos"
 msgstr "मेमो"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1840
-#: ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../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/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: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 "कार�य"
@@ -4550,25 +4553,26 @@ msgstr "कार�य (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "�वोल�यूशन कैलेंडर सचेतक ज�ञापन सेवा"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "मिनट"
 msgstr[1] "मिनट"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../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] "घंटे"
 msgstr[1] "घंटे"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "प�रारंभ समय"
 
@@ -4579,10 +4583,10 @@ msgstr "नियोजित भेंट"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "स�थानः"
 
@@ -4591,17 +4595,15 @@ msgid "Snooze _time:"
 msgstr "स�नूज़ काल (_t):"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:46
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "संपादन (_E)"
 
@@ -4613,31 +4615,32 @@ msgstr "स�नूज़ (_S)"
 msgid "location of appointment"
 msgstr "म�लाकात की अवस�थिति"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "कोई सार उपलब�ध नहीं है."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
-msgstr "कोई विवरण उपलब�ध नहीं है."
+msgstr "कोई वर�णन उपलब�ध नहीं"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "कोई स�थान सूचना उपलब�ध नहीं है."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "आपके पास %d �लार�म है."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4649,7 +4652,7 @@ msgstr ""
 "ईडाक भेजने के लि� विन�यस�त किया गया था.  �वोल�यूशन बदले में �क सामान�य\n"
 "यादपत�र वार�तालाप पेटी प�रदर�शित करेगा."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4666,34 +4669,36 @@ msgstr ""
 "\n"
 "क�या आप निश�चित हैं कि आप इस प�रोग�राम को चलाना चाहते है?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "इस प�रोग�राम के संबंध म��े फिर मत पूछें."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "बोनोबो प�रारंभ नहीं कर सका"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "�लार�म सूचना सेवा फैक�टरी का निर�णाण नहीं कर सका"
+#: ../calendar/gui/alarm-notify/notify-main.c:151
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "अवैध समय"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d घंटा"
-msgstr[1] "%d घंटे"
+msgstr[1] "%d घंटा"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4703,163 +4708,167 @@ msgstr[1] "%d मिनट"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d सेकेंड"
 msgstr[1] "%d सेकेंड"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "�लार�म प�रोग�राम"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "मद विलोपित करने पूर�व संप�ष�टि के लिये पूछें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "कार�य का पृष�ठभूमि रंग जो आज किया जाना है, \"#rrggbb\" प�रारूप में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "कार�य का पृष�ठभूमि रंग जो काफी दिनों से पड़ी है, \"#rrggbb\" प�रारूप में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "इसके लि� �लार�म चलाने के लिये कैलेंडर"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../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 "Marcus Bains Line को समय पट�टी में दिखाने के लिये रंग (मूलभूत रूप से खाली)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "दिन दृश�य में मार�कस बैन पंक�ति खींचने के लिये रंग."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "मास दृश�य में सप�ताहांतों को संक�चित करें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "�क�सपंज स�निश�चित करें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "दिन जिसपर कार�य घंटे की श�रूआत व अंत दिखायी जानी चाहिये."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "मूलभूत म�लाकात सूचक"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "मूलभूत संसूचक ईकाई"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "मूलभूत संसूचक मान"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "घटना नति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "घटना पारदर�शिता"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "म�क�त/व�यस�त सर�वर यूआऱ�ल"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "रिक�त/व�यस�त टेंपलेट URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "कैलेंडर दृश�य में घटना की नति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "समाप�त ह�� कार�यों को छ�पा�ं"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "कार�य ईकाई छ�पायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "कार�य मान छ�पायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "क�षैतिज पट�टी स�थिति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "घंटे जहां कार�यदिवस समाप�त होता है, चौबीस घंटे के प�रारूप में , 0 से 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "घंटे जहां कार�यदिवस श�रू होता है, चौबीस घंटे के प�रारूप में , 0 से 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "दिन और कार�य सप�ताह दृश�य में दिखाया गया अंतराल, मिनट में"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "अंतिम �लार�म समय"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "म�क�त/व�यस�त प�रकाशन के लिये सर�वर url की सूची"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains पंक�ति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains पंक�ति रंग - दिवस दृश�य"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains पंक�ति रंग - समय बार"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "मिनट जब कार�यदिवस समाप�त होता है 0 से 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "मिनट जब कार�यदिवस श�रू होता है 0 से 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "मास दृश�य क�षैतिज पट�टी की अवस�थिति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "मास दृश�य में उर�ध�वाधर पट�टी की स�थिति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "मूलभूत संसूचक के लिये इकाइयों की संख�या"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "यह निर�धारित करने के लिये इकाइयों की संख�या कि कार�यों को कब छ�पाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "मियाद समाप�त कार�य"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../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."
@@ -4867,7 +4876,7 @@ msgstr ""
 "क�षैतिज पट�टी की स�थिति, तिथि संचरण कैलेंडर और कार�य सूची के बीच जब महीने दृश�य में न हो, "
 "पिक�सेल में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../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."
@@ -4875,13 +4884,13 @@ msgstr ""
 "क�षैतिज पट�टी की स�थिति, दृश�य और तिथि संचरण कैलेंडर और कार�य सूची के बीच जब महीने दृश�य मे "
 "हो, पिक�सेल में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../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 "लंबव पट�टी की स�थिति, कैलेंडर सूची और तिथि नेविगेटर कैलेंडर के बीच."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../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."
@@ -4889,7 +4898,7 @@ msgstr ""
 "कार�य दृश�य में उर�ध�वाधर पट�टी की अवस�थिति, कार�य सूची व कार�य पूर�वावलोकन पट�टी के बीच, "
 "पिक�सेल में"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../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."
@@ -4897,7 +4906,7 @@ msgstr ""
 "लंबवत पट�टी की स�थिति, दृश�य और तिथि संचरण कैलेंडर और कार�य सूची के बीच जब महीने दृश�य मे "
 "हो, पिक�सेल में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../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."
@@ -4905,65 +4914,69 @@ msgstr ""
 "लंबवत पट�टी की स�थिति, दृश�य और तिथि संचरण कैलेंडर और कार�य सूची के बीच जब महीने दृश�य में न "
 "हो, पिक�सेल में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "प�रोग�राम जो सचेतक के द�वारा चलता है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में RSVP क�षेत�र दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में भूमिका क�षेत�र दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "सप�ताह और महीना दृश�य में म�लाकात समाप�ति समय को दिखा�ं"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "घटना/बैठक/कार�य संपादक में श�रेणी क�षेत�र दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "सूचना तश�तरी में प�रदर�शन चेतावनी दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में प�रस�थिति क�षेत�र दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"पूर�वावलोकन\" पट�टी दिखा�ं"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"पूर�वावलोकन\" पट�टी दिखा�ं."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "घटना/बैठक संपादक में समयक�षेत�र क�षेत�र दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में प�रकार क�षेत�र दिखायें"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "तिथि नेविगेटर में सप�ताह की संख�या को दिखा�ं"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "आज समाप�त होने वाले कार�य का रंग"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "कार�य लंबवत पट�टी स�थिति"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../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 "
@@ -4972,7 +4985,7 @@ msgstr ""
 "URL टेपलेट �क म�क�त/व�यस�त आंकड़ा फॉलबैक के रूप में प�रयोग के लिये, %u को मेल पता के उपयोक�ता "
 "भाग से प�रतिस�थापित किया जाता है और %d को डोमेन से हटाया जाता है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../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\"."
@@ -4980,172 +4993,201 @@ msgstr ""
 "कैलेंडर में तिथि व समय के लिये मूलभूत समय क�षेत�र, Olsen समयक�षेत�र डाटाबेस \"America/New "
 "York\" की तरह बिना अन�वादित रूप में."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "काल विभाजन"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "समय जब आखिरी बार �लार�म बजा इस समय में (_t)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "समयक�षेत�र"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../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 "कैलेंडर दृश�य में घटना की पारदर�शिता, 0 (पारदर�शी) और 1 (अपारदर�शी) के बीच �क मान."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "चौबीस घंटे समय प�रारूप"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "मूलभूत संसूचक के लिये ईकाई, \"मिनट\", \"घंटे\" या \"दिन\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "यह निर�धारित करने के लिये इकाइयां कि कार�यों को कब छ�पाना है \"मिनट\", \"घंटे\" या \"दिन"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "सप�ताह आरंभ होता है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "सप�ताह का वह दिन जब सप�ताह श�रू होता है रविवार (0) से शनिवार (6) तक."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "चेतावनी दिखाने के लिये क�या सूचना ट�रे का प�रयोग करना है या नहीं"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "क�या संप�ष�टि के लिये पूछना है जब �क म�लाकात या कार�य मिटाना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "क�या संप�ष�टि के लिये पूछना है जब �क म�लाकात या कार�य खत�म करना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../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 "क�या माह दृश�य में सप�ताह को रखना है, जो शनिवार व रविवार को �क सप�ताह दिन में रखता है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../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 "क�या सप�ताह और महीना दृश�य में घटना समाप�ति समय को दिखा�ं"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../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 "क�या कैलेंडर में Marcus Bains Line (line at current time) खींचना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "क�या कार�य दृश�य में पूरे कार�य को छ�पाना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "क�या म�लाकात के लिये मूलभूत यादपत�र सेट करना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में RSVP सूची क�या दिखाया जाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "घटना/बैठक संपादक में श�रेणी क�षेत�र क�या दिखाया जाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में भूमिका क�षेत�र क�या दिखाया जाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में प�रस�थिति क�षेत�र क�या दिखाया जाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../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 "क�या समय को चौबीस घंटे के प�रारूप में रखना है बजाय am/pm में प�रयोग करने के."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "घटना/बैठक संपादक में समयक�षेत�र क�षेत�र क�या दिखाया जाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "घटना/कार�य/बैठक संपादक में प�रकार क�षेत�र क�या दिखाया जाना है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "तिथि नेविगेटर में सप�ताह की संख�या दिखाया जाना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "डेलाइट सेविंग समय को क�या घटना के प�रदर�शन पर प�रयोग करना है."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "कार�य दिवस:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "घंटा जब कार�यदिवस समाप�त होता है"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "कार�यदिवस समाप�ति मिनट"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "कार�यदिवस श�रू होने का घंटा"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "कार�यदिवस श�रू होने का मिनट"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "डेलाइट सेविंग समय"
 
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "सारांश में समाहित है"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "विवरण में समाहित है"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "श�रेणी है"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "टिप�पणी में समाहित है"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "स�थान में समाहित है"
 
-#: ../calendar/gui/cal-search-bar.c:426
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "बेमेल"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/cal-search-bar.c:637
+msgid "Next 7 Days' Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:641
+msgid "Active Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:645
+msgid "Overdue Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:649
+msgid "Completed Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:653
+msgid "Tasks with Attachments"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:699
+msgid "Active Appointments"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:703
+msgid "Next 7 Days' Appointments"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:92 ../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 "छापें"
+msgstr "छपाई"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5154,16 +5196,17 @@ msgstr ""
 "यह संक�रिया चयनित समय सीमा से प�राने सभी घटनाओं को स�थायी रूप से मिटा देगा. अगर आप "
 "जारी रखते हैं, आप इस घटना को प�नः प�राप�त करने में सफल नहीं होंगे."
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "इससे प�रानी घटनाओं को निकाल दें"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../calendar/gui/calendar-commands.c:328
+#: ../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 "दिन"
 
@@ -5171,125 +5214,349 @@ msgstr "दिन"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600 ../calendar/gui/migration.c:1108
-#: ../calendar/gui/tasks-component.c:217
+#: ../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 "वेब पर"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "जन�मदिन और वर�षगांठ"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "मौसम"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "नया कैलेंडर (_N)"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2106
+msgid "_Copy..."
+msgstr "कापी करें (_C)..."
+
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "कैलेंडर के अद�यतन में विफल."
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "घटनाओं और बैटकों के निर�माण के लिये '%s' कैलेंडर को खोलने में अक�षम"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "घटनाओं और बैटकों के निर�माण के लिये कोई कैलेंडर उपलब�ध नहीं है"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "कैलेंडर श�रोत चयनकर�ता"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "नई म�लाकात"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
-msgstr "म�लाकात (_A)"
+msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "नई म�लाकात बना�ं"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "नया बैठक"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
-msgstr "बैठक (_e)"
+msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "नया बैठक आग�रह बना�ं"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "नई पूर�ण दिवसीय म�लाकात"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "पूर�ण दिवसीय म�लाकात (_p)"
+msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "नई पूर�ण दिवसीय म�लाकात बना�ं"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "नया कैलेंडर"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
-msgstr "कैलेंडर (_n)"
+msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "नया कैलेंडर बना�ं"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "दिवस दृश�य"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "कार�य सप�ताह दृश�य"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "सप�ताह दृश�य"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "महीना दृश�य"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "संलग�नक"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "उपस�थित व�यक�ति"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "व�यवसाय"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "श�रेणी"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "वर�गीकरण"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr ""
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "गोपनीय"
+
+#: ../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 "वर�णन"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
+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
+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
+msgid "Exist"
+msgstr "उपस�थित"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr ""
+
+#: ../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
+msgid "Holiday"
+msgstr "अवकाश"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "विचार"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "अंतर�राष�ट�रीय"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "विविध"
+
+#: ../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
+msgid "Organizer"
+msgstr "आर�गेनाइज़र"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr ""
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "निजी"
+
+#: ../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:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "सार�वजनिक"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "आवृत�ति"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "स�थिति"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "रणनीति"
+
+#: ../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:361
+msgid "Summary"
+msgstr "सारांश"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
+msgid "Summary Contains"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "सप�लायर�स"
+
+#: ../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
+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
+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
+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
+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
+msgid "is not"
+msgstr "नहीं है"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "कैलेंडर को खोलने में त�र�टि"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "कैलेंडर खोलने के दौरान विधि समर�थन अन�पलब�ध"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "कैलेंडर को खोलने में त�र�टि"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "अज�ञात त�र�टि"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "�लार�म संपादित करें"
 
@@ -5322,81 +5589,85 @@ msgid "Mes_sage:"
 msgstr "संदेश (_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
-msgstr "�क ध�वनि चला�ं"
+msgstr "ध�वनि बजा�ं"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "�क प�रोग�राम चला��"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "भेंजे:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "�क ईमेल भेंजे"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "वितर�क (_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "प�रोग�राम (_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "सचेतक को द�हरायें (_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "ध�वनि (_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "पश�चात"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "पहले"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
-msgstr "दिन(नों)"
+msgstr "दिन"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "म�लाकात की समाप�ति"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "अतिरिक�त समय प�रत�येक"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
-msgstr "घंटा(टों)"
+msgstr "घंटा"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
-msgstr "मिनट(टों)"
+msgstr "मिनट"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "म�लाकात की श�रूआत"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "क�रिया/ट�रिगर"
 
@@ -5407,23 +5678,19 @@ msgstr "जोड़ें (_d)"
 #: ../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 "सचेतक"
+msgstr "अलार�म�स"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "संलग�नक के स�वचालित प�रर�दशन की सलाह दें (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "फाइल(ओं) संलग�न करें"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
 msgstr "�लार�म के लिये चयनित कैलेंडर"
 
@@ -5447,7 +5714,7 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
 msgstr "<i>%u और %d को ईमेल पता से उपयोक�ता व डोमेन से विस�थापित किया जायेगा.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">सचेत करता है</span>"
 
@@ -5483,11 +5750,11 @@ msgstr "दिवसांत (_e):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
-msgstr "प�रदर�शित करें"
+msgstr "प�रदर�शक"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "श�क�रवार"
 
@@ -5502,8 +5769,8 @@ msgstr ""
 "दिन"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "सोमवार"
 
@@ -5526,8 +5793,7 @@ msgstr ""
 "रविवार"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "�क रंग च�नें"
 
@@ -5537,8 +5803,8 @@ msgid "S_un"
 msgstr "सूर�य (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "शनिवार"
 
@@ -5555,8 +5821,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "तिथि नेविगेटर में सप�ताह की संख�या को दिखा�ं (_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "रविवार"
 
@@ -5574,31 +5840,31 @@ msgid "Template:"
 msgstr "टैम�प�लेट:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
-msgstr "वृहस�पतिवार"
+msgstr "ग�र�वार"
 
 #: ../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 "समय क�षेत�र (_z):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
-msgstr "समय प�ररूप:"
+msgstr "समय फार�मेटः"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1086
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
-msgstr "ब�द�धवार"
+msgstr "ब�धवार"
 
 #. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
@@ -5674,346 +5940,453 @@ msgstr "ब�ध (_W)"
 msgid "before every appointment"
 msgstr "प�रत�येक म�लाकात के पहले"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ऑफलाइन संक�रिया के लि� कैलेंडर सामग�री की स�थानीय रूप से कॉपी करें"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ऑफलाइन संक�रिया के लि� कार�य सूची सामग�री स�थानीय रूप से कापी करें (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ऑफलाइन संक�रिया के लि� मेमो सूची सामग�री स�थानीय रूप से कापी करें (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "C_olor:"
-msgstr "रंग (_o):"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
+msgstr "रंग (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "कार�य सूची"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "मेमो सूची"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "कैलेंडर ग�ण"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "नया कैलेंडर"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "कार�य सूची ग�ण"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
-msgid "New Memo List"
-msgstr "नयी मेमो सूची"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "कैलेंडर जोड़ें"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "कार�य सूची जोड़ें"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "कैलेंडर जोड़ें (_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "कार�य सूची जोड़ें (_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "ताजा करें (_R):"
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "यूआर�ल: (_U) "
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "सप�ताह"
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "New Memo List"
+msgstr "नयी मेमो सूची"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "यह घटना मिटायी जा च�की है."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "यह कार�य मिटायी जा च�की है."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "यह यथारूप प�रविष�टि मिटायी जा च�की है."
+#: ../calendar/gui/dialogs/changed-comp.c:64
+msgid "This memo has been deleted."
+msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  आपने बदलाव किया है. उन बदलावों को भूलें और संपादक को बंद करें?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  आपने कोई बदलाव नहीं किया है, संपादक को बंद करें?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "यह घटना बदली जा च�की है."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "यह कार�य बदली जा च�की है."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "यह यथारूप प�रविष�टि बदली जा च�की है."
+#: ../calendar/gui/dialogs/changed-comp.c:88
+msgid "This memo has been changed."
+msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  आपने बदलाव किया है. उन बदलावों को भूलें और संपादक को अद�यतनीकृत करें?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  आपने कोई बदलाव नहीं किया है, संपादक अद�यतन करें?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "वैधता त�र�टि: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
-msgstr " प�रति "
+msgstr " to "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (समाप�त "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "समाप�त "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
-msgstr " (शेष "
+msgstr " (Due "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "शेष "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "संगल�न संदेश  - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "संलग�न संदेश"
 msgstr[1] "%d संलग�न संदेश"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1013 ../mail/message-list.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
-msgstr "विस�थापित करें (_M)"
+msgstr "खिसका�� (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1922
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "ड�रैग निरस�त करें (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "संलग�नक"
+
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "कर�म अद�यतन नहीं कर सका"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "म�लाकात संपादन"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "बैठक - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "म�लाकात - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "सौंपा गया कार�य - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "कार�य - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "मौजूदा विंडो बंद करने के लिये यहां क�लिक करें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "क�लिपबोर�ड से चयनित पाठ की कॉपी लें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "क�लिपबोर�ड से चयनित पाठ काटें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "उपलब�ध मदद देखने के लिये यहां क�लिक करें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "क�लिपबोर�ड से पाठ चिपका��"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "मौजूदा विंडो सहेजने के लिये यहां क�लिक करें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "सभी पाठ च�नें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "वर�गीकरण (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "फ़ाइल (_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "मदद (_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "प�रविष�ट करें (_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "विकल�प (_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "देखें (_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "संलग�नक (_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "फाइल जोड़ने के लिये यहां क�लिक करें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "श�रेणी (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "टॉगल करें कि क�या श�रेणी दिखाना है"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "समय क�षेत�र (_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "टॉगल करें कि क�या समय क�षेत�र दिखाना है"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "सार�वजनिक (_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "सार�वजनिक रूप में वर�गीकृत करें"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "निजी (_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "गोपनीय (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "भूमिका क�षेत�र (_o)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "टॉगल करें कि क�या भूमिका श�रेत�र दिखाया गया है"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "टॉगल करें कि क�या RSVP श�रेत�र दिखाया गया है"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "प�रस�थिति क�षेत�र (_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "टॉगल करें कि क�या प�रस�थिति श�रेत�र दिखाना गया है"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "प�रकार क�षेत�र (_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "संलग�न"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:980
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "संलग�नक बार छ�पायें (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
-#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "संलग�नक बार दिखायें (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../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
 #: ../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 "मिटा�� (_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1103
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
-msgid "_Properties"
-msgstr "ग�ण (_P)"
+msgstr "हटा�ं (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1046
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "संलग�नक जोड़ें (_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1492
-#: ../mail/em-format-html-display.c:2266
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "संलग�नक दिखायें"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "संलग�नक पट�टी टॉगल करने के लिये स�पेस क�ंजी दबायें"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
-msgid "Edit Appointment"
-msgstr "म�लाकात संपादन"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2106
-#: ../calendar/gui/dialogs/comp-editor.c:2149
-#, c-format
-msgid "Meeting - %s"
-msgstr "बैठक - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2108
-#: ../calendar/gui/dialogs/comp-editor.c:2151
-#, c-format
-msgid "Appointment - %s"
-msgstr "म�लाकात - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2112
-#: ../calendar/gui/dialogs/comp-editor.c:2155
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "सौंपा गया कार�य - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
-#, c-format
-msgid "Task - %s"
-msgstr "कार�य - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2117
-#: ../calendar/gui/dialogs/comp-editor.c:2160
-#, c-format
-msgid "Journal entry - %s"
-msgstr "यथारूप प�रविष�टि - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2128
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-msgid "No summary"
-msgstr "कोई सारांश नहीं"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2715
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:365
-msgid "attachment"
-msgstr "संलग�नक"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2804
-#: ../calendar/gui/dialogs/comp-editor.c:2858
-#: ../calendar/gui/dialogs/comp-editor.c:2882
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "इस मद में कि� गये बदलावों का त�याग किया जा सकता है अगर �क अद�यतन सामने आता है"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2906
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "मौजूदा संस�करण के प�रयोग में अक�षम!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "श�रोत को नहीं खोल सका"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "गंतव�य को नहीं खोल सका"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "गंतव�य सिर�फ पठनीय है"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "इस मद को सारे अन�य प�राप�तकर�ता मेलबॉक�स से मिटायें (_D)?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "कोरबा त�र�टि की वजह से घटना विलोपित नहीं की जा सकी"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "कोरबा त�र�टि की वजह से कार�य विलोपित नहीं की जा सकी"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "कोरबा त�र�टि की वजह से यथारूप प�रविष�टि विलोपित नहीं की जा सकी"
+#: ../calendar/gui/dialogs/delete-error.c:58
+msgid "The memo could not be deleted due to a corba error"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "कोरबा त�र�टि की वजह से मद विलोपित नहीं किया जा सका"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "अन�मति की मनाही के कारण मद विलोपित नहीं किया जा सका"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "अन�मति की मनाही के कारण कार�य विलोपित नहीं किया जा सका"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "अन�मति की मनाही के कारण यथारूप प�रविष�टि विलोपित नहीं किया जा सका"
+#: ../calendar/gui/dialogs/delete-error.c:74
+msgid "The memo could not be deleted because permission was denied"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "अन�मति की मनाही के कारण मद विलोपित नहीं किया जा सका"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "�क त�र�टि के कारण मद विलोपित नहीं किया जा सका "
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "�क त�र�टि के कारण कार�य विलोपित नहीं किया जा सका "
 
-#: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "�क त�र�टि के कारण यथारूप प�रविष�टि विलोपित नहीं किया जा सका "
+#: ../calendar/gui/dialogs/delete-error.c:90
+msgid "The memo could not be deleted due to an error"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "�क त�र�टि के कारण मद विलोपित नहीं किया जा सका "
 
@@ -6022,7 +6395,7 @@ msgid "Contacts..."
 msgstr "संपर�क..."
 
 #: ../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 "इसको दिया गया:"
 
@@ -6030,130 +6403,183 @@ msgstr "इसको दिया गया:"
 msgid "Enter Delegate"
 msgstr "कार�यदल दाखिल करें"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "�लार�म (_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "इस घटना के लिये �लार�म सेट करने व नहीं करने के लि� यहां क�लिक करें"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "आवृत�ति (_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "इसे बारंबार होने वाली घटना बनायें"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../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
+msgid "Insert advanced send options"
+msgstr "उन�नत प�रेषण विकल�प डालें"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "संपूर�ण दिवसीय घटना (_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "टॉगल करें कि क�या सारे दिन की घटना रखना है"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "टॉगल करें कि क�या समय व�यस�त दिखाना है"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "म�क�त/व�यस�त (_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "उपस�थित व�यक�ति के लिये रिक�त/व�यस�त सूचना प�रश�नगत करें"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "म�लाकात (_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "आवृत�ति"
-
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "इस घटना में �लार�म है."
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:441
 msgid "Or_ganizer:"
 msgstr "आयोजक (_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "प�रतिनिधि (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "उपस�थित व�यक�ति (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "प�रारंभ तिथि के बिना घटना"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "अंत�य तिथि के बिना घटना"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "प�रारंभ तिथि गलत है"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "अंत�य तिथि गलत है"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "प�रारंभ समय गलत है"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "अंत�य समय गलत है गलत है"
 
-#: ../calendar/gui/dialogs/event-page.c:1454
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "चयनित आयोजक के पास अब �क खाता नहीं है."
 
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "�क आयोजक की जरूरत है."
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "कम के कम �क श�रोता की आवश�यकता है."
 
-#: ../calendar/gui/dialogs/event-page.c:1897
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "जोड़ें (_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' कैलेंडर को खोलने में अक�षम."
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "म�लाकात के %d दिन पहले"
-msgstr[1] "म�लाकात के %d दिनों पहले"
+msgstr[1] "म�लाकात के %d दिन पहले"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "म�लाकात के %d घंटा पहले"
-msgstr[1] "म�लाकात के %d घंटे पहले"
+msgstr[1] "म�लाकात के %d घंटा पहले"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
-msgid "%d minute before appointement"
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "म�लाकात के %d मिनट पहले"
-msgstr[1] "म�लाकात के %d मिनट पहले"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
-msgstr "मनपसंद बनायें"
+msgstr "मनपसंद"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../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
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1739
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../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-signature-combo-box.c:70
 msgid "None"
-msgstr "कोई नहीं"
+msgstr "क�छ नहीं"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
@@ -6171,43 +6597,40 @@ msgstr "म�लाकात के १५ मिनट पहले"
 msgid "Attendee_s..."
 msgstr "उपस�थित व�यक�ति (_s)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "श�रेणियां (_t)..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "मनपसंद �लार�म:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "विवरण (_e):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "घटना विवरणः"
 
-#: ../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 "सारांश (_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "�लार�म (_A)"
 
+#: ../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 "वर�णन (_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
-msgstr "समय (T):"
+msgstr "समय (_T):"
 
 #. 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 "के लिये"
+msgstr "केलि�"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
@@ -6216,56 +6639,6 @@ msgstr "के लिये"
 msgid "until"
 msgstr "जबतक"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "उपस�थित व�यक�ति"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "�क श�रोता जोड़ने के लि� यहां क�लिक करें"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "सा�ा नाम"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "इससे डेलिगेट"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "इसके सौंपा गया"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "भाषा"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "सदस�य"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:509
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "संपर�क करें"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:520
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "स�तर"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>श�रोता</b>"
@@ -6278,140 +6651,97 @@ msgstr "आयोजक बदलें (_h)"
 msgid "Co_ntacts..."
 msgstr "संपर�क (_n)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "व�यवस�थापक"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "आयोजक:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "मेमो"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' में मेमो खोलने में अक�षम."
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
-msgstr "प�रति"
+msgstr "को"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:3
 #: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Sta_rt date:"
 msgstr "प�रवर�तन तिथि (_r):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "सारांश (_m)"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "प�रति (_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "समूह (_G):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-msgid "_Memo Content:"
-msgstr "मेमो सामग�री (_M):"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>कैलेंडर विकल�प</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "नया कैलेंडर जोड़ें"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "कैलेंडर समूह"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "कैलेंडर स�थान"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "कैलेंडर नाम"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>कार�य सूची विकल�प</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "नया कार�य सूची जोड़ें"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "कार�य सूची समूह"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "कार�य सूची नाम"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "आप बारंबार होने वाली घटना को रूपांतरण कर रहे हैं. आप क�या रूपांतरण करना चाहेंगे?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "आप बारंबार होने वाली घटना का दूसरे को सौंप रहे हैं. आप क�या सौंपना चाहेंगे?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "आप बारंबार होने वाले कार�य का रूपांतरण कर रहे हैं. आप क�या रूपांतरण करना चाहेंगे?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "आप बारंबार होने वाली जर�नल प�रविष�टि का रूपांतरण कर रहे हैं. आप क�या रूपांतरण करना चाहेंगे?"
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "सिर�फ इस दृष�टांत"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "यह और इसके पहले का दृष�टांत"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "यह और भविष�य का दृष�टांत"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "सभी दृष�टांत"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�वोल�यूशन"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
-msgstr "पर"
+msgstr "में"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "पहला"
 
@@ -6420,15 +6750,15 @@ 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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
-msgstr "दूसरा"
+msgstr "सेकण�ड"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "तीसरा"
 
@@ -6436,7 +6766,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "चौथा"
 
@@ -6444,13 +6774,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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "अंतिम"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "अन�य तिथि"
 
@@ -6458,7 +6788,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1ला से 10वां"
 
@@ -6466,7 +6796,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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11वां से 20वां"
 
@@ -6474,35 +6804,54 @@ 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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21वां से 31वां"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "दिन"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "पर"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "आवृत�ति"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2378
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
+msgid "Add exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
+msgid "Could not get a selection to delete."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
-msgstr "तिथि/समय"
+msgstr "तारीख़/समय"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>अपवाद</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>पूर�वावलोकन</b>"
 
@@ -6514,25 +6863,25 @@ msgstr "<b>प�नरावृति</b>"
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
-msgstr "प�रत�येक"
+msgstr "हरेक"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
-msgstr "यह म�लाकात फिर आती है (_u)"
+msgstr "यह म�लाकात फिर आती है"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
-msgstr "सदा के लिये"
+msgstr "हमेशा के लि�"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
-msgstr "महीना(नों)"
+msgstr "माह"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6542,16 +6891,16 @@ msgstr "सप�ताह"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
-msgstr "वर�ष(र�षों)"
+msgstr "वर�ष"
 
-#: ../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 "पूर�ण की गई तिथि गलत है"
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
-msgstr "वेब पेज"
+msgstr "वेब पृष�ठ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
@@ -6564,48 +6913,55 @@ msgstr "<span weight=\"bold\">स�थिति</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
+#: ../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-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
 msgid "Completed"
-msgstr "समाप�त"
+msgstr "पूर�ण"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../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
 msgid "High"
-msgstr "ज�यादा"
+msgstr "उच�च"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../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
 msgid "In Progress"
-msgstr "प�रगति में है"
+msgstr "प�रगति पर है"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../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
 msgid "Low"
-msgstr "कम"
+msgstr "निम�न"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "सामान�य"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../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/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "प�रारंभ नहीं ह�आ"
 
@@ -6618,16 +6974,16 @@ msgid "Stat_us:"
 msgstr "प�रस�थिति(_u):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
-msgstr "अपरिभाषित"
+msgstr "अपारिभाषित "
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "तिथि समाप�त (_D):"
 
 #: ../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 "प�राथमिकता (_P):"
 
@@ -6635,20 +6991,37 @@ msgstr "प�राथमिकता (_P):"
 msgid "_Web Page:"
 msgstr "वेब पृष�ठ (_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "प�रस�थिति विवरण (_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
+msgid "_Send Options"
+msgstr "विकल�प भेजें (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "कार�य (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "कार�य विवरण"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "समाप�त करने की तिथि गलत है"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' में कार�यों को खोलने में अक�षम."
@@ -6661,234 +7034,164 @@ msgstr "उपस�थित व�यक�ति (_n)..."
 msgid "Categor_ies..."
 msgstr "श�रेणियां (_i)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "आयोजक (_g):"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_ue date:"
+msgstr ""
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "समय क�षेत�र:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "समाप�ति तिथि (_D):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>रिक�त/व�यस�त कैलेंडर (C_)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>प�रकाशकीय आवृति</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>प�रकाशकीय स�थान (_L)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "रिक�त/व�यस�त प�रकाशन जमावट"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "दैनिक (_D)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "मेन�अल (_M)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "शब�दकूट (_P):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "शब�दकूट याद रखें (_R)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "उपभोक�ता नाम (_U):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "साप�ताहिक (_W)"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d दिन"
-msgstr[1] "%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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d सप�ताह"
 msgstr[1] "%d सप�ताह"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "अज�ञात क�रिया किया जाना है"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "अज�ञात ट�रिगर प�रकार के लि� %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2884
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "%s को खोलने के लिये क�लिक करें"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
-msgstr "शीर�षकविहीन"
+msgstr "बिना शीर�षक"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../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 "प�रारंभिक तिथि:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../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 "विवरणः"
+msgstr "वर�णनः"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "वेब पृष�ठ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1103
+#: ../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 "सारांश:"
+msgstr "सारांशः"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "समाप�ति तिथि:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1127
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "स�थिति:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
-msgstr "प�राथमिकता:"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
-msgid "Public"
-msgstr "सार�वजनिक"
-
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
-msgid "Private"
-msgstr "निजी"
-
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Confidential"
-msgstr "गोपनीय"
+msgstr "प�राथमिकताः"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
-msgstr "समाप�ति तिथि"
+msgstr "समाप�ति तारीख़"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
-msgstr "श�रू करने की तिथि"
+msgstr "प�रारंभ तारीख़"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "सारांश"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "म�क�त"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "व�यस�त"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6898,204 +7201,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "हा�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "नहीं"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1330
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1764
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../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-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
+#: ../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:926
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "आवृत�ति"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
-msgstr "निय�क�त किया"
+msgstr "नियत किया"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
-msgstr "इस रूप में सहेजें"
+msgstr "�से सहेजें..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2112
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "चयनित संलग�नक सहेजने के लिये फोल�डर च�नें..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "शीर�षकविहीनबिंब.%s (_i)"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1127 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
-msgstr "इस रूप में संग�रिहत करें (_S)..."
+msgstr "इस रूप में सहेजें... (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "पृष�ठभूमि के रूप में नियत करें (_B)"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "चयनित सहेजें (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "%s में खोलें..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "आयोजक: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "चयनित वस�त�ओं को मिटा रहा है"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "वस�त�ओं को अद�यतनीकृत कर रहा है"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../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:277
 msgid "Save as..."
-msgstr "इस रूप में सहेजें..."
+msgstr "�से सहेजें..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "नया कार�य (_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "वेब पृष�ठ खोलिये (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1128
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "म�द�रित करें (_P)..."
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "काटें (_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "चिपका�� (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "दिया गया कार�य (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "आईकैलेंडर के रूप में अग�रसारित करें (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "समाप�त के रूप में चिह�नित करें (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "चयनित कार�यों को समाप�त के रूप में चिह�नित करें (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "अपूर�ण रूप में चिह�नित करें (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "चयनित कार�यों को अपूर�ण रूप में चिह�नित करें (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "चयनित कार�यों को मिटायें (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "�क कार�य जोड़ने के लि� क�लिक करें"
@@ -7105,7 +7429,7 @@ msgstr "à¤�क कारà¥�य जोड़ने के लिà¤� कà¥�लिà
 msgid "% Complete"
 msgstr "% पूर�ण"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "पूर�ण"
 
@@ -7115,146 +7439,131 @@ msgstr "समाप�ति की तिथि"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
-msgstr "समाप�ति तिथि"
+msgstr "नियत तारीख़"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "प�राथमिकता"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
-msgstr "प�रवर�तन तिथि"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "कार�य छांटें"
+msgstr "प�रारंभ तारीख़"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "मदों को स�थानांतरित कर रहा है"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "मदों को कापी कर रहा है"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "नई म�लाकात (_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "नई पूर�ण दिवस घटना (_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "नई बैठक (_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "मौजूदा दृश�य (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "आज का चयन करें (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "तिथि च�निये(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1673
+msgid "Pri_nt..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "कैलेंडर में चिपका�ं (_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "कैलेंडर में खिसका�ं (_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "डेलिगेट मीटिंग (_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "बैठक अन�सूचन (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "आईकैलेंडर के रूप में अग�रसारित करें (_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "जवाब (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1122
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "सबको जबाव दें (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "इस आवृत�ति को भ�रमण योग�य बनायें (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "इस आवृत�ति को मिटा�� (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "सभी आवृत�तियों को मिटा�� (_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "आयोजक: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
-#, c-format
-msgid "Organizer: %s"
-msgstr "आयोजक: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "स�थानः%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:124
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
-"प�रारूप में तिथि अवश�य दाखिल की जानी चाहिये: \n"
-"\n"
-"%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i मिनट विभाजन"
@@ -7265,413 +7574,414 @@ msgstr "%02i मिनट विभाजन"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1549
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1087
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:789 ../calendar/gui/e-week-view.c:524
+#: ../calendar/gui/print.c:829
 msgid "am"
-msgstr "पूर�वाह�न"
+msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "अपराह�न"
 
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "हां. (जटिल आवृत�ति)"
 
-#: ../calendar/gui/e-itip-control.c:770
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "प�रतिदिन"
-msgstr[1] "प�रत�येक %d दिनों"
+msgstr[1] "प�रतिदिन %d"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "प�रत�येक सप�ताह"
 msgstr[1] "प�रत�येक %d सप�ताह"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "प�रत�येक सप�ताह जारी "
 msgstr[1] "प�रत�येक %d सप�ताह जारी "
 
-#: ../calendar/gui/e-itip-control.c:785
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
-msgstr " और "
+msgstr "और"
 
-#: ../calendar/gui/e-itip-control.c:792
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "इसका %s दिन"
 
-#: ../calendar/gui/e-itip-control.c:805
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s के "
 
-#: ../calendar/gui/e-itip-control.c:812
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "प�रत�येक महीना"
 msgstr[1] "प�रत�येक %d महीना"
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "प�रत�येक वर�ष"
 msgstr[1] "प�रत�येक %d वर�ष"
 
-#: ../calendar/gui/e-itip-control.c:827
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "%d समय का क�ल"
-msgstr[1] "%d समयों का क�ल"
+msgstr[1] "%d समय का क�ल"
 
-#: ../calendar/gui/e-itip-control.c:836
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", इसपर समाप�त कर रहा है "
 
-#: ../calendar/gui/e-itip-control.c:857
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "प�रारंभ होता है"
 
-#: ../calendar/gui/e-itip-control.c:870
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "समाप�त होता है"
 
-#: ../calendar/gui/e-itip-control.c:904
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "शेष"
 
-#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "आईकैलेंडर सूचना"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "आईकैलेंडर त�र�टि"
 
-#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
-#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../calendar/gui/e-itip-control.c: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 "�क अज�ञात व�यक�ति"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1084
+#: ../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>कृपया निम�नलिखित सूचना की समीक�षा करें, और नीचे की मीनू से �क कार�य च�नें."
 
-#: ../calendar/gui/e-itip-control.c:1132
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
-#: ../plugins/itip-formatter/itip-formatter.c:1752
+#: ../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:2034
 msgid "Accepted"
 msgstr "स�वीकृत"
 
-#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:688
-#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "औपबंधिक रूप से स�वीकृत"
 
-#: ../calendar/gui/e-itip-control.c:1140
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
-#: ../plugins/itip-formatter/itip-formatter.c:1758
+#: ../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:2040
 msgid "Declined"
-msgstr "मनाही की गई"
+msgstr "अस�वीकृत"
 
-#: ../calendar/gui/e-itip-control.c:1224
+#: ../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:1226
+#: ../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:1305
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ने बैठक सूचना प�रकाशित किया है."
 
-#: ../calendar/gui/e-itip-control.c:1306
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "बैठक सूचना"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../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> �क बैठक में %s की उपस�थिति के लि� आग�रह करता है."
 
-#: ../calendar/gui/e-itip-control.c:1314
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �क बैठक में आपकी उपस�थिति के लि� आग�रह करता है."
 
-#: ../calendar/gui/e-itip-control.c:1315
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "बैठक प�रस�ताव"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> �क मौजूदा बैठक में जोड़ना चाहता है."
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "बैठक अद�यतनीकरण"
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> बैठक की अद�यतन सूचना पाना चाहता है."
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "बैठक अद�यतनीकरण आग�रह"
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ने बैठक के आग�रह के लि� जबाव दिया है."
 
-#: ../calendar/gui/e-itip-control.c:1335
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "बैठक जबाव"
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ने बैठक रद�द कर दी."
 
-#: ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "बैठक निरसन"
 
-#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c: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> ने क�लिष�ठ संदेश भेजा है."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "गलत बैठक सूचना"
 
-#: ../calendar/gui/e-itip-control.c:1381
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>कार�य सूचना प�रकाशित की है."
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "कार�य सूचना"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ने %s को कार�य संपादन के लि� आग�रह करता है."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> आपको कार�य संपादन के लि� आग�रह करता है."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "कार�य प�रस�ताव"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> मौजूदा कार�य में जोड़ना चाहता है."
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "कार�य अद�यतन"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> अद�यतन कार�य सूचना पाना चाहता है."
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "कार�य अद�यतन आग�रह"
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ने कार�य भार को जबाव दिया है."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "कार�य जबाव"
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ने कार�य रद�द कर दिया है."
 
-#: ../calendar/gui/e-itip-control.c:1420
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "कार�य निरसन"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "गलत कार�य संदेश"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ने रिक�त/व�यस�त सूचना प�रकाशित की है."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "रिक�त/व�यस�त सूचना"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> आरके रिक�त/व�यस�त सूचना को आग�रह करता है."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "रिक�त/व�यस�त प�रस�ताव"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>ने रिक�त/व�यस�त आग�रह को जबाव दिया है."
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "रिक�त/व�यस�त जबाव"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "गलत रिक�त/व�यस�त प�रस�ताव"
 
-#: ../calendar/gui/e-itip-control.c:1546
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "संदेश सही स�वरूप में नहीं सामने आता है"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "संदेश सिर�फ असमर�थित आग�रह रखता है."
 
-#: ../calendar/gui/e-itip-control.c:1638
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "संलग�नक के पास वैध कैलेंडर संदेश है."
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "संलग�नक के पास दर�शनीय कैलेंडर मद नहीं है"
 
-#: ../calendar/gui/e-itip-control.c:1904
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "अद�यतन पूर�ण\n"
 
-#: ../calendar/gui/e-itip-control.c:1932
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "वस�त� अवैध है और अद�यतन नहीं किया जा सकता है\n"
 
-#: ../calendar/gui/e-itip-control.c:1942
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "यह अन�क�रिया मौजूदा श�रोता से नहीं है.  �क श�रोता के रूप में जोड़ें?"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "�क अवैध स�थिति के कारण श�रोता स�थिति अद�यतन नहीं किया जा सका!\n"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "श�रोता स�थिति अद�यतनीकृत \n"
 
-#: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "श�रोता स�थिति अद�यतन नहीं की जा सकती क�योंकि मद अब उपस�थित नहीं है"
 
-#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "मद भेज दिया गया!\n"
 
-#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "यह मद नहीं भेजा जा सका!\n"
 
-#: ../calendar/gui/e-itip-control.c:2130
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "�क क�रिया च�नें:"
 
-#: ../calendar/gui/e-itip-control.c:2202
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "अद�यतन"
 
-#: ../calendar/gui/e-itip-control.c:2230
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
-msgstr "स�वीकार"
+msgstr "स�वीकृत"
 
-#: ../calendar/gui/e-itip-control.c:2231
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "औपबंधिक रूप से स�वीकृत"
 
-#: ../calendar/gui/e-itip-control.c:2232
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
-msgstr "मनाही"
+msgstr "अस�वीकार"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "रिक�त/व�यस�त सूचना भेजें"
 
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "जबावदार प�रस�थिति को अद�यतन करें"
 
-#: ../calendar/gui/e-itip-control.c:2317
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "नवीनतम सूचना भेजें"
 
-#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:708
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr "निरस�त"
+msgstr "रद�द करें"
 
 #: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
@@ -7683,7 +7993,7 @@ msgstr "कैलेंडर संदेश"
 
 #: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
-msgstr "दिनांक"
+msgstr "तारीख़ः"
 
 #: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
@@ -7697,99 +8007,112 @@ msgstr "कैलेंडर अधिभारित कर रहा है..
 msgid "Server Message:"
 msgstr "सर�वर संदेश:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "अध�यक�ष"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "सहभागी चाहि�"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "वैकल�पिक सहभागी"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
-msgstr "संसाधन"
+msgstr "संसाधन "
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-list-view.c:152
+msgid "Attendees"
+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
 msgid "Individual"
 msgstr "व�यक�ति"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../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:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "समूह"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
-msgstr "संसाधन"
+msgstr "साधन"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "कमरा"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
 msgid "Chair"
-msgstr "क�र�सी"
+msgstr "सभापति"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-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
 msgid "Required Participant"
 msgstr "जरूरी सहभागी"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
-msgstr "वैकल�पिक सहभागी"
+msgstr "वैकल�पिक भाग लेने वाले"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "गैर-सहभागी"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-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 "�क�शन की जर�रत है"
+msgstr "क�रिया की आवश�यकता"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-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
 msgid "Tentative"
-msgstr "औपबंधिक"
+msgstr "अंतरिम"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../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
 msgid "Delegated"
 msgstr "प�रतिनिधित�व"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:470
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "आगंत�क                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#. 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 "संपर�क करें"
+
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "प�रक�रिया में"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7797,95 +8120,115 @@ 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:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "कार�यालय के बाहर"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "कोई सूचना नहीं"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "उपस�थित व�यक�ति (_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "विकल�प (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "केवल कार�य घंटों को दिखा�ं (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "आकार ह�रास दिखा�ं (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "रिक�त/व�यस�त को अद�यतन करें (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "स�वतःचयन (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "सभी व�यक�ति �वं संसाधन (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "सभी व�यक�ति �वं �क संसाधन (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "आवश�यक व�यक�ति (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "आवश�यक व�यक�ति और �क संसाधन (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "प�रारंभ समय (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "अंत�य समय (_E):"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "�क श�रोता जोड़ने के लि� यहां क�लिक करें"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "सामान�य नाम"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "इससे डेलिगेट"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "इसके सौंपा गया"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "भाषा"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "सदस�य"
+
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "चयनित मेमो को मिटायें (_D)"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�क मेमो जोड़ने के लि� क�लिक करें"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "मेमो छांटन"
-
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2748
+#: ../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"
@@ -7894,90 +8237,80 @@ msgstr ""
 "%s पर त�र�टि:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "मेमो लोड कर रहा है"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s पर मेमो खोल रहा है"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "चयनित वस�त�ओं को मिटा रहा है..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "%s के लिये शब�दकूट डालें"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "कार�य को लोड कर रहा है"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s पर कार�य को खोल रहा है"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "कार�यों को पूरा कर रहा है..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "पूर�ण विलोपन करें"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
-msgid "Updating query"
-msgstr "प�रश�न अद�यतन कर रहा है"
-
-#: ../calendar/gui/gnome-cal.c:2409
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "मनपसंद दृश�य (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "मनपसंद दृश�य सहेजें (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2415
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "दृश�य परिभाषित करें (_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2579
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "म�लाकात %s पर भारित कर रहा है"
 
-#: ../calendar/gui/gnome-cal.c:2598
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "कार�यों को %s पर भारित कर रहा है"
 
-#: ../calendar/gui/gnome-cal.c:2607
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s पर मेमो लोड कर रहा है"
 
-#: ../calendar/gui/gnome-cal.c:2713
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
-msgstr "\"%s\" खोल रहा है."
+msgstr "\"%s\" को खोल रहे."
 
-#: ../calendar/gui/gnome-cal.c:3641
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "साफ कर रहा है"
 
@@ -7995,7 +8328,7 @@ msgstr "दिसम�बर"
 
 #: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
-msgstr "फ़रवरी"
+msgstr "फरवरी"
 
 #: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
@@ -8037,8 +8370,8 @@ msgstr "सितम�बर"
 msgid "_Select Today"
 msgstr "आज च�नें (_S)"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../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 "�क आयोजक निश�चित तय किया जाना चाहि�."
 
@@ -8046,128 +8379,134 @@ msgstr "à¤�क आयोजक निशà¥�चित तय किया जाà
 msgid "At least one attendee is necessary"
 msgstr "कम से कम �क श�रोता आवश�यक है"
 
-#: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "घटना सूचना"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "कार�य सूचना"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
-msgid "Journal information"
-msgstr "यथारूप सूचना"
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+msgid "Memo information"
+msgstr ""
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "रिक�त/व�यस�त सूचना"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "कैलेंडर सूचना"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
-msgstr "अद�यतनीकृत"
+msgstr "अद�यतन किया गया"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
-msgstr "ताजा करें"
+msgstr "ताज़ा करें"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "विरोधी-प�रस�ताव"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "रिक�त/व�यस�त सूचना (%s से %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "आईकैलेंडर सूचना"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "आपको घटना का श�रोता निश�चित होना चाहि�."
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "नयी मेमो सूची (_N)"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d मेमो"
 msgstr[1] "%d मेमो"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
-#: ../mail/mail-component.c:560
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d चयनित"
 msgstr[1] ", %d चयनित"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "मेमो उन�नयन में विफल."
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "घटनाओं और बैठकों के निर�माण के लि� '%s' मेमो सूची को खोलने में अक�षम"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "मेमो बनाने के लि� कोई कैलेंडर मौजूद नहीं है"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "मेमो श�रोत चयनक"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "नया मेमो"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
-msgstr "मेमो (_o)"
+msgstr ""
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "नया मेमो बनायें"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "नया सा�ा मेमो"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
-msgstr "सा�ा मेमो (_S)"
+msgstr ""
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "सा�ा नया मेमो बनायें"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "नया मेमो सूची"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
-msgstr "मेमो सूची (_s)"
+msgstr ""
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "नयी मेमो सूची बनायें"
 
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "मेमो छापें"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr ""
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8178,7 +8517,7 @@ msgstr ""
 "\n"
 "कृपया धैर�य रखें जबतक �वोल�यूशन आपके फोल�डर उत�प�रवासित होता है..."
 
-#: ../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"
@@ -8190,327 +8529,297 @@ msgstr ""
 "कृपया धीरज रखें जबतक �वोल�यूशन आपके फोल�डर में उत�प�रवासित होता है..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771 ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb से प�रानी जमावट में उत�प�रवासित होने में अक�षम"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "`%s' कैलेंडर में उत�प�रवासित होने में अक�षम"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "`%s' कार�य में उत�प�रवासित होने में अक�षम"
 
-#: ../calendar/gui/migration.c:1212
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+#: ../calendar/gui/migration.c: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 "टिप�पणी"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "1st"
-msgstr "पहला"
+msgstr "1हला"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "2nd"
-msgstr "दूसरा"
+msgstr "2रा"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "3rd"
-msgstr "तीसरा"
+msgstr "3रा"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "4th"
-msgstr "चौथा"
+msgstr "4था"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "5th"
-msgstr "पांचवा"
+msgstr "5वा�"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "6th"
-msgstr "छठा"
+msgstr "6ठा"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "7th"
-msgstr "सातवां"
+msgstr "7वा�"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "8th"
-msgstr "आठवां"
+msgstr "8वा�"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "9th"
-msgstr "नवां"
+msgstr "9वा�"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "10th"
-msgstr "दसवां"
+msgstr "10वा�"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "11th"
-msgstr "ग�यारहवां"
+msgstr "11वा�"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "12th"
-msgstr "बारहवां"
+msgstr "12वा�"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "13th"
-msgstr "तेरहवां"
+msgstr "13वा�"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "14th"
-msgstr "चौदहवां"
+msgstr "14वा�"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "15th"
-msgstr "पंद�रहवां"
+msgstr "15वा�"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "16th"
-msgstr "सोलहवां"
+msgstr "16वा�"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "17th"
-msgstr "सत�रहवां"
+msgstr "17वा�"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "18th"
-msgstr "अठारहवां"
+msgstr "18वा�"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "19th"
-msgstr "उन�नीसवां"
+msgstr "19वा�"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "20th"
-msgstr "बीसवां"
+msgstr "20वा�"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "21st"
-msgstr "इक�कीसवां"
+msgstr "21वा�"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "22nd"
-msgstr "बाइसवां"
+msgstr "22वा�"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "23rd"
-msgstr "तेइसवां"
+msgstr "23वा�"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "24th"
-msgstr "चौबीसवां"
+msgstr "24वा�"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "25th"
-msgstr "पच�चीसवां"
+msgstr "25वा�"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "26th"
-msgstr "छब�बीसवां"
+msgstr "26वा�"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "27th"
-msgstr "सत�ताइसवां"
+msgstr "27वा�"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "28th"
-msgstr "अट�ठाइसवां"
+msgstr "28वा�"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "29th"
-msgstr "उनतीसवां"
+msgstr "29वा�"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "30th"
-msgstr "तीसवां"
+msgstr "30वा�"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:521
 msgid "31st"
-msgstr "इकतीसवां"
+msgstr "31वा�"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "रवि"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "सोम"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "मंगल"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "ब�ध"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "ग�रू"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "श�क�र"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "शनि"
 
-#. Day
-#: ../calendar/gui/print.c:1936
-msgid "Selected day (%a %b %d %Y)"
-msgstr "चयनित दिवस (%a %b %d %Y)"
-
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: ../calendar/gui/print.c:1962
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: ../calendar/gui/print.c:1973
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "चयनित सप�ताह (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:1981
-msgid "Selected month (%b %Y)"
-msgstr "चयनित महीना (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:1988
-msgid "Selected year (%Y)"
-msgstr "चयनित वर�ष (%Y)"
-
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "म�लाकात"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "कार�य"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "सारांश:%s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2522
+msgid "Attendees: "
+msgstr ""
+
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "स�थिति: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "प�राथमिकता: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "प�रतिशत समाप�त: %iर�ण"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
-msgstr "यू आर �ल : %s"
+msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "श�रेणियां: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "संपर�क: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
-msgid "Print Preview"
-msgstr "प�रिंट पूर�व दर�शन"
-
-#: ../calendar/gui/print.c:2636
-msgid "Print Item"
-msgstr "मद छापें"
-
-#: ../calendar/gui/tasks-component.c:441
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "नयी कार�य सूची (_N)"
 
-#: ../calendar/gui/tasks-component.c:517
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d कार�य"
 msgstr[1] "%d कार�य"
 
-#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "असफल"
 
-#: ../calendar/gui/tasks-component.c:877
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "घटनाओं और बैठकों के निर�माण के लि� '%s' कार�य सूची को खोलने में अक�षम"
 
-#: ../calendar/gui/tasks-component.c:890
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "कार�यों के निर�माण के लि� कोई कैलेंडर मौजूद नहीं है"
 
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "कार�य श�रोत चयनक"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "नया कार�य"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "कार�य (_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "नया कार�य सृजित करें"
 
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "सौंपा गया नया कार�य"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "सौंपा गया कार�य (_d)"
+msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "दि� ग� न� कार�य को निर�मित करें"
 
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "नयी कार�य सूची"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "कार�य सूची (_k)"
+msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "नयी कार�य सूची सृजित करें"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../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"
@@ -8522,1734 +8831,1893 @@ msgstr ""
 "\n"
 "वास�तव में इन कार�यों को मिटाना चाहते हैं?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "म��से फिर मत पूछें."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "म�द�रण कार�य"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "SMTWTFS"
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% पूर�ण"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr ""
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "प�रगति पर है"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "इससे बड़ा है"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "इससे छोटा है"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "म�लाकात �वं बैठक"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "कैलेंडर खोल रहा है"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "आईकैलेंडर फाइल (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "�वोल�यूशन आईकैलेंडर आयातक"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "यादपत�र!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "वीकैलेंडर फाइल (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "�वोल�यूशन वीकैलेंडर आयातक"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "कैलेंडर घटना"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 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)
+#. *
+#.
+#.
 #. * 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 "अफ�रीका/आबिदजान"
+msgstr "अफ�रीका/अबीदियन"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
-msgstr "अफ�रीका/अक�रा"
+msgstr "अफ�रीका/�क�रा"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "अफ�रीका/अदिस_अबाबा"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
-msgstr "अफ�रीका/अल�जीयर�स"
+msgstr "अफ�रीका/अलगियर�स"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
-msgstr "अफ�रीका/अस�मेरा"
+msgstr "अफ�रीका/असमेरा"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "अफ�रीका/बमाको"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
-msgstr "अफ�रीका/बांग�वी"
+msgstr "अफ�रीका/बानग�इ"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
-msgstr "अफ�रीका/बांज�ल"
+msgstr "अफ�रीका/बैनज�ल"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
-msgstr "अफ�रीका/बिस�साओ"
+msgstr "अफ�रीका/बिसाउ"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
-msgstr "अफ�रीका/ब�लैंटायर"
+msgstr "अफ�रीका/ब�लांटायर"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
-msgstr "अफ�रीका/ब�रैज�जाविले"
+msgstr "अफ�रीका/ब�राज़ावेल"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
-msgstr "अफ�रीका/ब�ज�ंबरा"
+msgstr "अफ�रीका/ब�ज�ंब�रा"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
-msgstr "अफ�रीका/कैरो"
+msgstr "अफ�रीका/कायरो"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
-msgstr "अफ�रीका/कासाब�लांका"
+msgstr "अफ�रीका/कैसबलंका"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
-msgstr "अफ�रीका/सीय�टा"
+msgstr "अफ�रीका/सेउटा"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "अफ�रीका/कोनाक�री"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
-msgstr "अफ�रीका/डकार"
+msgstr "अफ�रीका/डकर"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
-msgstr "अफ�रीका/दार_�स_सलाम"
+msgstr "अफ�रीका/डर_�स_सलाम"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
-msgstr "अफ�रीका/दिबॉती"
+msgstr "अफ�रीका/जिबोउटी"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
-msgstr "अफ�रीका/डोउला"
+msgstr "अफ�रीका/डॉउला"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
-msgstr "अफ�रीका/�ल_�उन"
+msgstr "अफ�रीका/अल_आ�उन"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "अफ�रीका/फ�रीटाउन"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
-msgstr "अफ�रीका/गैब�रोन"
+msgstr "अफ�रीका/गबोरोन"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "अफ�रीका/हरारे"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
-msgstr "अफ�रीका/जोहांसबर�ग"
+msgstr "अफ�रीका/जॉनेसबर�ग"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
-msgstr "अफ�रीका/कंपाला"
+msgstr "अफ�रीका/कमपाला"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
-msgstr "अफ�रीका/खार�टून"
+msgstr "अफ�रीका/खार�टोउम"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "अफ�रीका/किगाली"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
-msgstr "अफ�रीका/किंशासा"
+msgstr "अफ�रीका/किंसहासा"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "अफ�रीका/लागोस"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
-msgstr "अफ�रीका/लिवरविले"
+msgstr "अफ�रीका/लिब�रेवेल"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "अफ�रीका/लोम"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
-msgstr "अफ�रीका/ल�आंडा"
+msgstr "अफ�रिका/ल�आंडा"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "अफ�रीका/ल�ब�ंबाशी"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "अफ�रीका/ल�साका"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
-msgstr "अफ�रीका/मलाबो"
+msgstr "अफ�रीका/मालाबो"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "अफ�रीका/मप�टो"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
-msgstr "अफ�रीका/मसेर�"
+msgstr "अफ�रीका/मासेर�"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
-msgstr "अफ�रीका/म�बाबने"
+msgstr "अफ�रीका/बाबने"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
-msgstr "अफ�रीका/मोगाडिश�"
+msgstr "अफ�रीका/मॉगाडिश�"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
-msgstr "अफ�रीका/मानरोबिया"
+msgstr "अफ�रीका/मॉनरोविया"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
-msgstr "अफ�रीका/नैरोबी"
+msgstr "अफ�रीका/नारौबी"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
-msgstr "अफ�रीका/न�ड�जामेना"
+msgstr "अफ�रीका/जमीना"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
-msgstr "अफ�रीका/नियामी"
+msgstr "अफ�रीका/नियमये"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
-msgstr "अफ�रीका/न�आकचोट"
+msgstr "अफ�रीका/नाउआकोट"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
-msgstr "अफ�रीका/उआगाडोगू"
+msgstr "अफ�रीका/ओयूगाडॉउगॉउ"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
-msgstr "अफ�रीका/पोर�टो-नोवो"
+msgstr "अफ�रीका/पॉर�टो_नोवो"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
-msgstr "अफ�रीका/साओ_टोमे"
+msgstr "अफ�रीका/साओ_टोम"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
-msgstr "अफ�रीका/टिम�बकटू"
+msgstr "अफ�रीका/टिम�ब�क�टू"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
-msgstr "अफ�रीका/त�रिपोली"
+msgstr "अफ�रीका/ट�रिपोली"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
-msgstr "अफ�रीका/ट�यूनिस"
+msgstr "अफ�रीका/त�निस"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "अफ�रीका/विंडहोक"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
-msgstr "अमेरिका/अडक"
+msgstr "अमेरिका/अडाक"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
-msgstr "अमेरिका/�न�करेज"
+msgstr "अमेरिका/�ंकोरेज"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
-msgstr "अमेरिका/�ंग�विला"
+msgstr "अमेरिका/�ंग�ला"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "अमेरिका/�ंटिग�आ"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
-msgstr "अमेरिका/अराग�वैना"
+msgstr "अमेरिका/अरग�येना"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
-msgstr "अमेरिका/अरूबा"
+msgstr "अमेरिका/अर�बा"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
-msgstr "अमेरिका/�संसियन"
+msgstr "अमेरिका/अस�नसन"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
-msgstr "अमेरिका/बारबोडस"
+msgstr "अमेरिका/बारबेडोस"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
-msgstr "अमेरिका/बेलम"
+msgstr "अमेरिका/बेलेम"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "अमेरिका/बेलाइज"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "अमेरिका/बोआ_विस�टा"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
-msgstr "अमेरिका/बगोटा"
+msgstr "अमेरिका/बोगोटा"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
-msgstr "अमेरिका/ब�वायज"
+msgstr "अमेरिका/बोइज"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
-msgstr "अमेरिका/ब�यूनस_आयर�स"
+msgstr "अमेरिका/ब��नॉस_�रिस"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
-msgstr "अमेरिका/कैम�ब�रिज_बे"
+msgstr "अमेरिका/कैमब�रिज_बे"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
-msgstr "अमेरिका/कानक�न"
+msgstr "अमेरिका/कैनक�न"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
-msgstr "अमेरिका/काराकस"
+msgstr "अमेरिका/कराकस"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
-msgstr "अमेरिका/काटामार�का"
+msgstr "अमेरिका/कैटामारका"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
-msgstr "अमेरिका/कैयनी"
+msgstr "अमेरिका/सायेने"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
-msgstr "अमेरिका/केमन"
+msgstr "अमेरिका/केमान"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "अमेरिका/शिकागो"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "अमेरिका/चिह�आह�आ"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
-msgstr "अमेरिका/कार�डोबा"
+msgstr "अमेरिका/कॉर�डोबा"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "अमेरिका/कोस�टा_रिका"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
-msgstr "अमेरिका/क�यू�बा"
+msgstr "अमेरिका/क��बा"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
-msgstr "अमेरिका/क�यूराकाओ"
+msgstr "अमेरिका/क�राकाओ"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
-msgstr "अमेरिका/डनमार�क�शाव�न"
+msgstr "अमेरिका/डेनमार�कशावन"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
-msgstr "अमेरिका/डाउसन"
+msgstr "अमेरिका/डॉसन"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
-msgstr "अमेरिका/डाउसन_क�रीक"
+msgstr "अमेरिका/डॉसन_क�रिक"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "अमेरिका/डेनवर"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
-msgstr "अमेरिका/डेट�रायट"
+msgstr "अमेरिका/डैट�रिरॉइट"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "अमेरिका/डोमिनिका"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
-msgstr "अमेरिका/�डमोंटेन"
+msgstr "अमेरिका/इडमॉनटॉन"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
-msgstr "अमेरिका/�रनेपे"
+msgstr "अमेरिका/�यर�नपे"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
-msgstr "अमेरिका/अल_सल�वाडोर"
+msgstr "अमेरिका/�ल_सलवाडोर"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
-msgstr "अमेरिका/फोर�टालेजा"
+msgstr "अमेरिका/फॉर�टलेज़ा"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "अमेरिका/ग�लेस_बे"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
-msgstr "अमेरिका/गाडथैब"
+msgstr "अमेरिका/गॉडथब"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "अमेरिका/गूज_बे"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
-msgstr "अमेरिका/ग�रैंड_टर�क"
+msgstr "अमेरिका/ग�रैंड_त�र�क"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
-msgstr "अमेरिका/ग�रेनाडा"
+msgstr "अमेरिका/ग�रेनडा"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
-msgstr "अमेरिका/ग�आडेलोप"
+msgstr "अमेरिका/ग�आडेलोउप"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "अमेरिका/ग�आटेमाला"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
-msgstr "अमेरिका/ग��याक�विल"
+msgstr "अमेरिका/ग�आयाक़�य�ल"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
-msgstr "अमेरिका/ग�आयना"
+msgstr "अमेरिका/ग�याना"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
-msgstr "अमेरिका/हैलीफैक�स"
+msgstr "अमेरिका/हैलीफ़ैक�स"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "अमेरिका/हवाना"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
-msgstr "अमेरिका/हर�मोसिलो"
+msgstr "अमेरिका/हरमॉसिलो"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "अमेरिका/इंडियाना/इंडियानापोलिस"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
-msgstr "अमेरिका/इंडियाना/नोक�स"
+msgstr "अमेरिका/इंडियाना/नॉक�स"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "अमेरिका/इंडियाना/मारेंगो"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
-msgstr "अमेरिका/इंडियाना/वीवे"
+msgstr "अमेरिका/इंडियाना/वेवेय"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
-msgstr "अमेरिका/इंडियानापोलिस"
+msgstr "अमेरिका/इंडियापॉलिस"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "अमेरिका/इन�विक"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
-msgstr "अमेरिका/इकाल�यूत"
+msgstr "अमेरिका/इक़�ल�इट"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
-msgstr "अमेरिका/जमैका"
+msgstr "अमेरिका/जैमा�का"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
-msgstr "अमेरिका/ज�ज��"
+msgstr "अमेरिका/ज�ज�ई"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
-msgstr "अमेरिका/ज�नेऊ"
+msgstr "अमेरिका/ज�नेआयू"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "अमेरिका/केंटकी/ल�इसविले"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
-msgstr "अमेरिका/केंट�की/मोंटीसेलो"
+msgstr "अमेरिका/कैंटकी/मॉंटिसेलो"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "अमेरिका/ला_पाज"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
-msgstr "अमेरिका/लीमा"
+msgstr "अमेरिका/लिमा"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
-msgstr "अमेरिका/लास_�ंजेल�स"
+msgstr "अमेरिका/लॉस_�ंजेलिस"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
-msgstr "अमेरिका/ल�इसविले"
+msgstr "अमेरिका/ल�इसवेल"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
-msgstr "अमेरिका/मेसीओ"
+msgstr "अमेरिका/मैसिओ"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "अमेरिका/मानाग�आ"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
-msgstr "अमेरिका/मैनोस"
+msgstr "अमेरिका/मनौअस"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
-msgstr "अमेरिका/मारटीनिक"
+msgstr "अमेरिका/मार�टिनिक"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
-msgstr "अमेरिका/मजात�लान"
+msgstr "अमेरिका/मजाटलान"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
-msgstr "अमेरिका/मेंडोजा"
+msgstr "अमेरिका/मेंडोज़ा"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "अमेरिका/मेनोमिनी"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
-msgstr "अमेरिका/मेरीडा"
+msgstr "अमेरिका/मरिदा"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
-msgstr "अमेरिका/मैक�सिको_सिटी"
+msgstr "अमेरिका/मैक�सिको_शहर"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
-msgstr "अमेरिका/मिक�वेलन"
+msgstr "अमेरिका/मिक�यूलॉन"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
-msgstr "अमेरिका/मोंटेर�री"
+msgstr "अमेरिका/मॉन�टेरेय"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
-msgstr "अमेरिका/मोंटेवीडियो"
+msgstr "अमेरिका/मोंटेविडिओ"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
-msgstr "अमेरिका/मोंट�रियल"
+msgstr "अमेरिका/मॉंटरियल"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
-msgstr "अमेरिका/मोंट�सेराट"
+msgstr "अमेरिका/मॉन�टसेरट"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
-msgstr "अमेरिका/नासाऊ"
+msgstr "अमेरिका/नासाउ"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
-msgstr "अमेरिका/न�यू_यार�क"
+msgstr "अमेरिका/न�यूयॉर�क"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "अमेरिका/निपिगन"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "अमेरिका/नोम"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
-msgstr "अमेरिका/नोरोन�हा"
+msgstr "अमेरिका/नॉरॉनहा"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
-msgstr "अमेरिका/उत�तरी_डकोटा/सेंटर"
+msgstr "अमेरिका/नॉर�थ_डकोटा/सेंटर"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "अमेरिका/पनामा"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
-msgstr "अमेरिका/पैंग�नीर�टन�ग"
+msgstr "अमेरिका/पांगनिर�टंग"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
-msgstr "अमेरिका/पारामारिबो"
+msgstr "अमेरिका/पैरामारिबो"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
-msgstr "अमेरिका/फोनिक�स"
+msgstr "अमेरिका/फीनिक�स"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
-msgstr "अमेरिका/पोर�ट-ओ-प�रिंस"
+msgstr "अमेरिका/पॉर�ट_ऑ_प�रिंस"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
-msgstr "अमेरिका/पोर�ट_आफ_स�पेन"
+msgstr "अमेरिका/पॉर�ट_ऑफ_स�पेन"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
-msgstr "अमेरिका/पोर�टो_वेल�हो"
+msgstr "अमेरिका/पॉर�टो_वेलहो"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
-msgstr "अमेरिका/प�यूर�टो_रिको"
+msgstr "अमेरिका/प��र�टो_रिको"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "अमेरिका/रेनी_रिवर"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
-msgstr "अमेरिका/रेंकिन_इनलेट"
+msgstr "अमेरिका/रेंकिन_इंलेट"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
-msgstr "अमेरिका/रिसाइफ"
+msgstr "अमेरिका/रेसाइफ"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
-msgstr "अमेरिका/रेजीना"
+msgstr "अमेरिका/रेगिना"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
-msgstr "अमेरिका/रियो_ब�रैंको"
+msgstr "अमेरिका/रिओ_ब�रांको"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
-msgstr "अमेरिका/रोसारियो"
+msgstr "अमेरिका/रॉसरियो"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
-msgstr "अमेरिका/सैंटियागो"
+msgstr "अमेरिका/सेनिटिआगो"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
-msgstr "अमेरिका/सेंटो_डोमिन�गो"
+msgstr "अमेरिका/सेंटो_डोमिनिका"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
-msgstr "अमेरिका/साओ_पोलो"
+msgstr "अमेरिका/साओ_पालॉ"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
-msgstr "अमेरिका/स�कोर�सबाइसंड"
+msgstr "अमेरिका/स�कोर�सबाइस�ंड"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
-msgstr "अमेरिका/शिप�रोक"
+msgstr "अमेरिका/शिपरॉक"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
-msgstr "अमेरिका/सेंट_जान�स"
+msgstr "अमेरिका/सेंट_जॉहंस"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
-msgstr "अमेरिका/सेंट_किट�स"
+msgstr "अमेरिका/सेंट_किटस"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "अमेरिका/सेंट_ल�सिया"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
-msgstr "अमेरिका/सेंट_थामस"
+msgstr "अमेरिका/सेंट_थॉमस"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
-msgstr "अमेरिका/सेंट_विंसेट"
+msgstr "अमेरिका/सेंट_विंसेंट"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
-msgstr "अमेरिका/स�विफ�ट_करंट"
+msgstr "अमेरिका/स�फिट_करेंट"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
-msgstr "अमेरिका/टेग�कीगल�पा"
+msgstr "अमेरिका/टेग�सिगलपा"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
-msgstr "अमेरिका/थ�ले"
+msgstr "अमेरिका/थूले"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "अमेरिका/थंडर_बे"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
-msgstr "अमेरिका/तिज�आना"
+msgstr "अमेरिका/टिज�आना"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
-msgstr "अमेरिका/टोर�टोला"
+msgstr "अमेरिका/टॉरटोला"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
-msgstr "अमेरिका/वैंकूवर"
+msgstr "अमेरिका/वनकाउवर"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
-msgstr "अमेरिका/व�हाइटहोर�स"
+msgstr "अमेरिका/वाइट_हॉर�स"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
-msgstr "अमेरिका/विनिपेग"
+msgstr "अमेरिका/विनीपेग"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
-msgstr "अमेरिका/याक�तात"
+msgstr "अमेरिका/यक�टट"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
-msgstr "अमेरिका/यल�लोनाइफ"
+msgstr "अमेरिका/येलोनाइफ"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
-msgstr "अंटार�कटिका/कैसे"
+msgstr "�ंटार�कटिका/कसेय"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
-msgstr "अंटार�कटिका/डेविस"
+msgstr "�ंटार�कटिका/डेविस"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
-msgstr "अंटार�कटिका/ड�यूमाडीऊरूविले"
+msgstr "�ंटार�कटिका/ड�मॉंटड�वेल"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
-msgstr "अंटार�कटिका/माउसन"
+msgstr "�ंटार�कटिका/माकसन"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
-msgstr "अंटार�कटिका/मैकमर�डो"
+msgstr "�ंटार�कटिका/मैकम�र�दो"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
-msgstr "अंटार�कटिका/पाल�मर"
+msgstr "�ंटार�कटिका/पलमेर"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
-msgstr "अंटार�कटिका/दक�षिणी_ध�र�व"
+msgstr "�ंटार�कटिका/साउथपोल"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
-msgstr "अंटार�कटिका/स�योवा"
+msgstr "�ंटार�कटिका/स�योवा"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
-msgstr "अंटार�कटिका/वोस�तोक"
+msgstr "�ंटार�कटिका/वॉस�टोक"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
-msgstr "आर�कटिक/लोंगइयरबायन"
+msgstr "आर�टिक/लॉगयेआर�वियन"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
-msgstr "�शिया/अदन"
+msgstr "�शिया/�डेन"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
-msgstr "�शिया/अलमाटी"
+msgstr "�शिया/अलमाती"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
-msgstr "�शिया/अम�मान"
+msgstr "�शिया/अमान"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
-msgstr "�शिया/�नाडिर"
+msgstr "�शिया/अनादीर"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
-msgstr "�शिया/�क�टाउ"
+msgstr "�शिया/अक़�ताउ"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
-msgstr "�शिया/�क�टोब"
+msgstr "�शिया/अक़�टोब"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
-msgstr "�शिया/�शगबात"
+msgstr "�शिया/अशगाबाट"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "�शिया/बगदाद"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
-msgstr "�शिया/बहरीन"
+msgstr "�श�या/बहरिन"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "�शिया/बाकू"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
-msgstr "�शिया/बैंकाक"
+msgstr "�शिया/बैंककॉक"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
-msgstr "�शिया/बेरूत"
+msgstr "�शिया/बेर�त"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
-msgstr "�शिया/बिश�केक"
+msgstr "�शिया/बिशकेक"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
-msgstr "�शिया/ब�र�नेई"
+msgstr "�शिया/ब�र�नइ"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "�शिया/कोलकाता"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
-msgstr "�शिया/चोयबलसान"
+msgstr "�शिया/चोइबालसन"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "�शिया/चोंगकिंग"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
-msgstr "�शिया/कोलंबो"
+msgstr "�शिया/कोलोंबो"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
-msgstr "�शिया/दमस�क"
+msgstr "�शिया/डमास�कस"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
-msgstr "�शिया/ढ़ाका"
+msgstr "�शिया/ढाका"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "�शिया/दिली"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "�शिया/द�बई"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
-msgstr "�शिया/द�शान�बे"
+msgstr "�शिया/डशंबे"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
-msgstr "�शिया/गाजा"
+msgstr "�शिया/गाज़ा"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
-msgstr "�शिया/हार�बिन"
+msgstr "�शिया/हरबिन"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
-msgstr "�शिया/हांग_कांग"
+msgstr "�शिया/हॉंग_कॉंग"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
-msgstr "�शिया/होव�ड"
+msgstr "�शिया/हावड"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
-msgstr "�शिया/इरक�त�स�क"
+msgstr "�शिया/इरक�टस�क"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "�शिया/इस�तांब�ल"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "�शिया/जकार�ता"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
-msgstr "�शिया/जयप�र"
+msgstr "�शिया/जयाप�रा"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
-msgstr "�शिया/जेरूसलम"
+msgstr "�शिया/जेर�शलम"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "�शिया/काब�ल"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
-msgstr "�शिया/कमचटका"
+msgstr "�शिया/कैमचटका"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "�शिया/कराची"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
-msgstr "�शिया/काश�गर"
+msgstr "�शिया/काशगर"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
-msgstr "�शिया/काठमांड�"
+msgstr "�शिया/काठमांडू"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
-msgstr "�शिया/क�रैस�नोयार�स�क"
+msgstr "�शिया/क�रास�नोयार�सक"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
-msgstr "�शिया/क�वाला_लांप�र"
+msgstr "�शिया/कौला_लामप�र"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "�शिया/क�चिंग"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
-msgstr "�शिया/क�वैत"
+msgstr "�शिया/क�बैत"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "�शिया/मकाओ"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
-msgstr "�शिया/मकाउ"
+msgstr "�शिया/मक�का"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
-msgstr "�शिया/मागादान"
+msgstr "�शिया/मगदान"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
-msgstr "�शिया/"
+msgstr "�शिया/मकासार"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "�शिया/मनीला"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
-msgstr "�शिया/मस�कट"
+msgstr "�शिया/मसकट"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "�शिया/निकोसिया"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
-msgstr "�शिया/नोवोसिबिर�स�क"
+msgstr "�शिया/नोवोसिबिर�क"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
-msgstr "�शिया/ओम�स�क"
+msgstr "�शिया/ओमस�क"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
-msgstr "�शिया/ओरल"
+msgstr "�शिया/ऑराल"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
-msgstr "�शिया/नोम_पेन�ह"
+msgstr "�शिया/फेनॉम_पेनह"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
-msgstr "�शिया/पोंटियानाक"
+msgstr "�शिया/पांटिआनाक"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
-msgstr "�शिया/प�योंगयांग"
+msgstr "�शिया/प�योंगयाग"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
-msgstr "�शिया/कातार"
+msgstr "�शिया/क़तर"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
-msgstr "�शिया/कैजीलोर�डा"
+msgstr "�शिया/क़�योज़ाइलोर�डा"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "�शिया/रंगून"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "�शिया/रियाद"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
-msgstr "�शिया/सैगोन"
+msgstr "�शिया/साइगॉन"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
-msgstr "�शिया/सखालिन"
+msgstr "�शिया/सकहालिन"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "�शिया/समरकंद"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "�शिया/सियोल"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
-msgstr "�शिया/शंघाई"
+msgstr "�शिया/शैंघाई"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "�शिया/सिंगाप�र"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
-msgstr "�शिया/ताइपेइ"
+msgstr "�शिया/ताइवान"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "�शिया/ताशकंद"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
-msgstr "�शिया/त�बिलिसी"
+msgstr "�शिया/बिलिसी"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "�शिया/तेहरान"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
-msgstr "�शिया/थिंफू"
+msgstr "�शिया/थिमफू"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
-msgstr "�शिया/टोकियो"
+msgstr "�शिया/टोक�यो"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
-msgstr "�शिया/उज�ंग_पंडांग"
+msgstr "�शिया/उजंग_पंगडांग"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
-msgstr "�शिया/उलनबटोर"
+msgstr "�शिया/उलानबाटर"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
-msgstr "�शिया/उरूम�की"
+msgstr "�शिया/उर�ंगी"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "�शिया/वियतनाम"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
-msgstr "�शिया/व�लाडीवास�टाक"
+msgstr "�शिया/वलादिवोस�टोक"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
-msgstr "�शिया/याक�त�सक"
+msgstr "�शिया/याक�टस�क"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
-msgstr "�शिया/येकाटेरिनबर�ग"
+msgstr "�शिया/येकाटेरिंबर�ग"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
-msgstr "�शिया/येरेवान"
+msgstr "�शिया/येरेवन"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
-msgstr "�टलांटिक/अजोरस"
+msgstr "अटलांटिक/अज़ोरेस"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
-msgstr "�टलांटिक/बरम�डा"
+msgstr "अटलांटिक/बरम�डा"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
-msgstr "�टलांटिक/केनारी"
+msgstr "अटलांटिक/कैनरी"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
-msgstr "�टलांटिक/केप_वर�डे"
+msgstr "अमेरिका/केप_वर�डे"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
-msgstr "�टलांटिक/फायरो"
+msgstr "अटलांटिक/फा�रे"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
-msgstr "�टलांटिक/जान_मेयन"
+msgstr "अटलांटिक/जैन_मायेन"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
-msgstr "�टलांटिक/मडायरा"
+msgstr "अटलांटिक/मैडेरा"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
-msgstr "�टलांटिक/रीक�याज�विक"
+msgstr "अटलांटिक/रेकजाविक"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
-msgstr "�टलांटिक/दक�षिण_जार�जिया"
+msgstr "अटलांटिक/साउथ_जोर�जिया"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
-msgstr "�टलांटिक/सेंट_हेलेना"
+msgstr "अटलांटिक/सेंट_हेलेना"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
-msgstr "�टलांटिक/स�टैनली"
+msgstr "अटलांटिक/स�टांले"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
-msgstr "आस�ट�रेलिया/�डीलेड"
+msgstr "ऑस�ट�रेलिया/�डलेड"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
-msgstr "आस�ट�रेलिया/ब�रिसबेन"
+msgstr "ऑस�ट�रेलिया/ब�रिसबन"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
-msgstr "आस�ट�रेलिया/ब�रोकेन_हिल"
+msgstr "ऑस�ट�रेलिया/ब�रोकन_हिल"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
-msgstr "आस�ट�रेलिया/डार�विन"
+msgstr "ऑस�ट�रेलिया/डार�विन"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
-msgstr "आस�ट�रेलिया/होबार�ट"
+msgstr "ऑस�ट�रेलिया/हॉबर�ट"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
-msgstr "आस�ट�रेलिया/लिंडेमान"
+msgstr "ऑस�ट�रेलिया/लिंडमन"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
-msgstr "आस�ट�रेलिया/लार�ड_होवे"
+msgstr "ऑस�ट�रेलिया/लॉर�ड_हॉव"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
-msgstr "आस�ट�रेलिया/मेलबोर�न"
+msgstr "ऑस�ट�रेलिया/मेलबर�न"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
-msgstr "आस�ट�रेलिया/पर�थ"
+msgstr "ऑस�ट�रेलिया/पर�थ"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
-msgstr "आस�ट�रेलिया/सिडनी"
+msgstr "ऑस�ट�रेलिया/सिडनी"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
-msgstr "यूरोप/�म�सटर�डम"
+msgstr "यूरोप/�मस�टरडम"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
-msgstr "यूरोप/अंडोरा"
+msgstr "यूरोप/�ंडोरा"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "यूरोप/�थेंस"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "यूरोप/बेलफास�ट"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "यूरोप/बेलग�रेड"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "यूरोप/बर�लिन"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
-msgstr "यूरोप/ब�रैतिस�लावा"
+msgstr "यूरोप/ब�राटिस�लवा"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
-msgstr "यूरोप/ब�रसेल�स"
+msgstr "यूरोप/ब�र�सल�स"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
-msgstr "यूरोप/ब�खारेस�ट"
+msgstr "यूरोप/ब�चारेस�ट"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "यूरोप/ब�डापेस�ट"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
-msgstr "यूरोप/चिसिनाउ"
+msgstr "यूरोप/चिसिंनाउ"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
-msgstr "यूरोप/कोपेनहेगन"
+msgstr "यूरोप/कोपेनहागन"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
-msgstr "यूरोप/डब�लिन"
+msgstr "यूरोप/डबलिन"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
-msgstr "यूरोप/जिब�राल�टर"
+msgstr "यूरोप/गिब�रालटर"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "यूरोप/हेलसिंकी"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
-msgstr "यूरोप/इस�तांब�ल"
+msgstr "यूरोप/इसतानब�ल"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
-msgstr "यूरोप/कालिनीग�रैड"
+msgstr "यूरोप/कैलिनिंग�राद"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
-msgstr "यूरोप/कीव"
+msgstr "यूरोप/केव"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "यूरोप/लिस�बन"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
-msgstr "यूरोप/ज�ब�ल�जाना"
+msgstr "यूरोप/ज़�बज़ाना"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
-msgstr "यूरोप/लंदन"
+msgstr "यूरोप/लंडन"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
-msgstr "यूरोप/लक�समबर�ग"
+msgstr "यूरोप/लक�सेमबर�ग"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "यूरोप/मैड�रिड"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
-msgstr "यूरोप/माल�टा"
+msgstr "यूरोप/मालटा"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
-msgstr "यूरोप/मिन�स�क"
+msgstr "यूरोप/मिंस�क"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
-msgstr "यूरोप/मोनेको"
+msgstr "यूरोप/मोनाको"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "यूरोप/मास�को"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "यूरोप/निकोसिया"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "यूरोप/ओस�लो"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "यूरोप/पेरिस"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
-msgstr "यूरोप/प�राग"
+msgstr "यूरोप/प�रग"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
-msgstr "यूरोप/रीगा"
+msgstr "यूरोप/रिगा"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "यूरोप/रोम"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "यूरोप/समारा"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "यूरोप/सेन_मेरिनो"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
-msgstr "यूरोप/साराजेवो"
+msgstr "यूरोप/साराजवो"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
-msgstr "यूरोप/सिंफेरोपोल"
+msgstr "यूरोप/सिमफेरोपॉल"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
-msgstr "यूरोप/स�कोपजे"
+msgstr "यूरोप/स�कोपज"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "यूरोप/सोफिया"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
-msgstr "यूरोप/स�टाकहोम"
+msgstr "यूरोप/स�टॉकहॉम"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
-msgstr "यूरोप/टैल�लिन"
+msgstr "यूरोप/टलिन"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
-msgstr "यूरोप/टिराने"
+msgstr "यूरोप/तिराने"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
-msgstr "यूरोप/उ�गोरोड"
+msgstr "यूरोप/उज़गोरोड"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
-msgstr "यूरोप/वाड�ज"
+msgstr "यूरोप/वद�ज़"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "यूरोप/वेटिकन"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "यूरोप/वियना"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
-msgstr "यूरोप/विल�न�यूस"
+msgstr "यूरोप/विलनियस"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
-msgstr "यूरोप/वार�सा"
+msgstr "यूरोप/वारसॉ"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
-msgstr "यूरोप/जैग�रेब"
+msgstr "यूरोप/जग�रेब"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
-msgstr "यूरोप/जैपोरो�ा�"
+msgstr "यूरोप/ज़पोरोज़ाय"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
-msgstr "यूरोप/ज�यूरिख"
+msgstr "यूरोप/ज�रिच"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "इंडियन/�ंटानानारिवो"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
-msgstr "इंडियन/चागोस"
+msgstr "इंडियन/चगोस"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "इंडियन/क�रिसमस"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "इंडियन/कोकोस"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "इंडियन/कोमोरो"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
-msgstr "इंडियन/केरग��लेन"
+msgstr "इंडियन/केर�ग��लिन"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "इंडियन/माहे"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
-msgstr "इंडियन/मालदीव"
+msgstr "इंडियन/मालद�वीप"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
-msgstr "इंडियन/मौरीसस"
+msgstr "इंडियन/मौरिसस"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
-msgstr "इंडियन/मयोटे"
+msgstr "इंडियन/मयोट�टे"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "इंडियन/रीयूनियन"
+msgstr "इंडियन/रिय�नियन"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "प�रशांत/�पिया"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
-msgstr "प�रशांत/आकलैन�ड"
+msgstr "प�रशांत/ऑकलैंड"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
-msgstr "प�रशांत/चाथम"
+msgstr "प�रशांत/चटहाम"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "प�रशांत/इस�टर"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "प�रशांत/इफेट"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "प�रशांत/�ंडरबरी"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
-msgstr "प�रशांत/फकौफो"
+msgstr "प�रशांत/फकाओफो"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "प�रशांत/फिजी"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "प�रशांत/फ�नाफ�टी"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
-msgstr "प�रशांत/गालापैगोस"
+msgstr "प�रशांत/गलापगोस"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "प�रशांत/गैंबियर"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
-msgstr "प�रशांत/ग�आडलकेनाल"
+msgstr "प�रशांत/ग�आडालकनल"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "प�रशांत/ग�आम"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "प�रशांत/होनोलूलू"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
-msgstr "प�रशांत/जांस�टन"
+msgstr "प�रशांत/जॉनस�टन"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
-msgstr "प�रशांत/किरीटिमाटी"
+msgstr "प�रशांत/किरितिमाती"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
-msgstr "प�रशांत/कोसरे"
+msgstr "प�रशांत/कोस�रे"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
-msgstr "प�रशांत/क�वाजालिन"
+msgstr "प�रशांत/क�वाजलिन"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
-msgstr "प�रशांत/माज�रो"
+msgstr "प�रशांत/मज�रा"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
-msgstr "प�रशांत/मार�क�वेस"
+msgstr "प�रशांत/मारक�यूसास"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "प�रशांत/मिडवे"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
-msgstr "प�रशांत/नौरू"
+msgstr "प�रशांत/नाउरू"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
-msgstr "प�रशांत/निवे"
+msgstr "प�रशांत/निउ"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
-msgstr "प�रशांत/नार�फाक"
+msgstr "प�रशांत/नॉरफॉक"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
-msgstr "प�रशांत/नौमिया"
+msgstr "प�रशांत/नाउमिया"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
-msgstr "प�रशांत/पैगो_पैगो"
+msgstr "प�रशांत/पागो_पादो"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
-msgstr "प�रशांत/पलाऊ"
+msgstr "प�रशांत/पलाउ"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
-msgstr "प�रशांत/पिटकैर�न"
+msgstr "प�रशांत/पिटकैम"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
-msgstr "प�रशांत/पोनापे"
+msgstr "प�रशांत/पोनेप"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
-msgstr "प�रशांत/पोर�ट_मोरेसबी"
+msgstr "प�रशांत/पॉर�ट_मोरेस�बी"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "प�रशांत/रारोटोंगा"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "प�रशांत/सैपान"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
-msgstr "प�रशांत/ताहिती"
+msgstr "प�रशांत/तहिती"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
-msgstr "प�रशांत/तरावा"
+msgstr "प�रशांत/टरावा"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
-msgstr "प�रशांत/टोंगाटापू"
+msgstr "प�रशांत/टॉन�गाटाप�"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
-msgstr "प�रशांत/ट�रक"
+msgstr "प�रशांत/ट�र�क"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
-msgstr "प�रशांत/वाके"
+msgstr "प�रशांत/वेक"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "प�रशांत/वालिस"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "प�रशांत/याप"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr ""
 
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "संपादक से संदेश प�नर�प�राप�त करने में असमर�थ "
 
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "संलग�नक डालें"
 
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1027
-msgid "Attachment Bar"
-msgstr "संलग�नक बार"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "संलग�न करें (_t)"
 
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "%s: %s फाइल संलग�न नहीं कर सकता है"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "शीर�षकविहीन संदेश"
 
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "%s फाइल संलग�न नहीं कर सकता है: नियमित फाइल नहीं है"
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "�क फाइल संलग�न करें"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "संलग�नक ग�ण"
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "बंद करें (_C)"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "फाइल नाम:"
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "वर�तमान फ़ाइल बंद करें"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME प�रकारः"
+#: ../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 "छापें... (_P)"
 
-#: ../composer/e-msg-composer-hdrs.c:570
-msgid "Posting destination"
-msgstr "प�रेषण गंतव�य"
+#: ../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 "छपाई पूर�वावलोकन (_v)"
 
-#: ../composer/e-msg-composer-hdrs.c:571
-msgid "Choose folders to post the message to."
-msgstr "इसमें संदेश प�रेषण हेत� फोल�डर च�नें"
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "वर�तमान फ़ाइल सहेजें"
 
-#: ../composer/e-msg-composer-hdrs.c:603
-msgid "Click here for the address book"
-msgstr "पता प�स�तिका के लिये यहां क�लिक करें"
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "�से सहेजें... (_A)"
 
-#.
-#. * 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:635
-msgid "_Reply-To:"
-msgstr "इसे जबाव दें ( _R):"
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "वर�तमान फ़ाइल �क भिन�न नाम से सहेजें"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:642
-msgid "Fr_om:"
-msgstr "प�रारूप (_o):"
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "ड�राफ�ट सहेजें (_D)"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:649
-msgid "S_ubject:"
-msgstr "विषय (_u):"
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "ड�राफ�ट के रूप में सहेजें"
 
-#: ../composer/e-msg-composer-hdrs.c:658
-msgid "_To:"
-msgstr "प�रति (_T):"
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "यह संदेश भेजें"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "स�रक�षा (_S)"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "आपने PGP से इस संदेश को गोपनीय बना�ं"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "अपने PGP क�ंजी से इस संदेश पर हस�ताक�षर करें"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "संदेश की प�राथमिकता तय करें (_P)"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "संदेश प�राथमिकता काफी उच�च सेट करें"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr ""
+
+#: ../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 ""
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "आपने S/MIME गोपन प�रमाणपत�र से इस सदेश को गोपनीय बना�ं"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "अपने S/MIME हस�ताक�षर प�रमाणपत�र के साथ इस संदेश पर हस�ताक�षर करें"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "Bcc क�षेत�र (_B)"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "यदि BCC क�षेत�र प�रदर�शित है तो टॉगल करें"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "Cc क�षेत�र (_C)"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "यदि CC क�षेत�र प�रदर�शित है तो टॉगल करें"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "क�षेत�र से (_F)"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "यदि प�रेषक चयनकर�ता प�रदर�शित है तो टॉगल करें"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "प�रेषित करें क�षेत�र (_P)"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "यदि प�रेषित करें क�षेत�र प�रदर�शित है तो टॉगल करें"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "जबाव दें क�षेत�र (_R)"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "यदि जबाव दें क�षेत�र प�रदर�शित है तो टॉगल करें"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "प�रति क�षेत�र (_T)"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "यदि प�रति क�षेत�र को प�रदर�शित है तो टॉगल करें"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "संदेश के प�राप�तकर�ताओं को दाखिल करें"
 
-#: ../composer/e-msg-composer-hdrs.c:662
-msgid "_Cc:"
-msgstr "_Cc:"
-
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "उन पता को डालें जो कि संदेश का कार�बन कापी प�राप�त करेगा"
 
-#: ../composer/e-msg-composer-hdrs.c:666
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../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 "उन पता को डालें जो संदेश के प�राप�तकर�ता सूची में दिखे बिना संदेश का कार�बन कापी प�राप�त करेगा."
+"appearing in the recipient list of the message"
+msgstr ""
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "प�रारूप (_o):"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "इसे जबाव दें ( _R):"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "तक (_T):"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "इन�हें प�रेषित करें (_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:679
-msgid "Click here to select folders to post to"
-msgstr "इसे प�रेषित करने हेत� फोल�डर चयन के लि� यहीं क�लिक करें"
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr "विषय (_u):"
 
-#: ../composer/e-msg-composer-hdrs.c:684
-msgid "Post To:"
-msgstr "इन�हें प�रेषित करें:"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "हस�ताक�षर (_g)"
 
-#: ../composer/e-msg-composer-select-file.c:82
-msgid "A_ttach"
-msgstr "संलग�न करें (_t)"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "पता प�स�तिका के लिये यहां क�लिक करें"
 
-#: ../composer/e-msg-composer-select-file.c:243
-msgid "Insert Attachment"
-msgstr "संलग�नक डालें"
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "प�रेषण गंतव�य"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "इसमें संदेश प�रेषण हेत� फोल�डर च�नें"
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "इसे प�रेषित करने हेत� फोल�डर चयन के लि� यहीं क�लिक करें"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+msgid "Show _Attachment Bar"
+msgstr "संलग�नक बार दिखायें (_A)"
+
+#: ../composer/e-msg-composer.c:870
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "बाहर जाने वाले संदेश को हस�ताक�षर नहीं कर सकता: इस खाता के लि� कोई हस�ताक�षर प�रमाणपत�र "
 "नहीं दिया गया"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:877
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10257,52 +10725,23 @@ msgstr ""
 "बाहर जाने वाले संदेश को ग�प�त नहीं कर सकता: इस खाता के लि� कोई गोपन प�रमाणपत�र नहीं "
 "दिया गया"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1498 ../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:1554
 msgid "Hide _Attachment Bar"
 msgstr "संलग�नक बार छ�पायें (_A)"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
-msgid "Show _Attachment Bar"
-msgstr "संलग�नक बार दिखायें (_A)"
-
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
-msgstr "अज�ञात कारण"
-
-#: ../composer/e-msg-composer.c:1401
-msgid "Could not open file"
-msgstr "फाइल नहीं खोल सका"
-
-#: ../composer/e-msg-composer.c:1409
-msgid "Unable to retrieve message from editor"
-msgstr "संपादक से संदेश प�नर�प�राप�त करने में असमर�थ "
-
-#: ../composer/e-msg-composer.c:1688
-msgid "Untitled Message"
-msgstr "शीर�षकविहीन संदेश"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
-msgid "Open File"
-msgstr "फ़ाइल खोलें"
-
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "स�वयंभू"
-
-#: ../composer/e-msg-composer.c:2276
-msgid "Si_gnature:"
-msgstr "हस�ताक�षर (_g)"
-
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
 msgid "Compose Message"
 msgstr "संदेश लिखें"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4053
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10330,8 +10769,7 @@ msgstr "कà¥�या आप निशà¥�चित रूप से संदेà
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "क�योंकि &quot;{0}&quot;, आपको अलग डाक विकल�प चयन की आवश�यकता होगी."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "क�योंकि &quot;{1}&quot;."
 
@@ -10387,10 +10825,20 @@ msgid ""
 msgstr "�वोल�यूशनअप�रत�याशित"
 
 #: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Send options available only for Novell Groupwise and Microsoft Exchange "
+"accounts."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Send options not available."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "फाइल `{0}' �क सामान�य फाइल नहीं है और संदेश में भेजी नहीं जा सकती है."
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../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."
@@ -10398,7 +10846,7 @@ msgstr ""
 "इस निर�देशिका की सामग�री को संलग�न करने के लिये, या तो फाइल को इस निर�देशिका में निजी "
 "तौर पर संलग�न कीजिये, या निर�देशिका का �क अभिलेख बनायें और इसमें संलग�न करें."
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -10409,51 +10857,53 @@ msgstr ""
 "\n"
 "कृपया स�निश�चित करें कि आपके पास gtkhtml व libgtkhtml का सही संस�करण अधिष�ठापित है."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
 msgstr "पता चयनक नियंत�रक को सक�रिय करने में असमर�थ"
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
 msgstr "असमाप�त संदेश मिला"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
 msgstr "चेतावनी: रूपांतरित फाइल"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "आप `{0}' फाइल को इस संदेश से संलग�न नहीं कर सकते."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "विन�यास पहले."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "प�नर�प�राप�त मत करें (_D)"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "फिर प�राप�त करें (_R)"
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Save Message"
-msgstr "संदेश सहेजें (_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr ""
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
-msgid "Evolution"
-msgstr "�वोल�यूशन"
+msgid "Evolution Mail and Calendar"
+msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:574
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "ग�रूपवेयर सूट"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "�वोल�यूशन PIM और ईमेल क�लाइंट"
+msgid "Manage your email, contacts and schedule"
+msgstr ""
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10463,305 +10913,321 @@ msgstr "पता कार�ड"
 msgid "calendar information"
 msgstr "कैलेंडर सूचना"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>अभी आपकी अवस�थिति \"कार�यालय से बाहर\" है. </b>\n"
-"\n"
-"क�या आप अपनी अवस�थिति को \"कार�यालय में\" के रूप में परिवर�तित करना चाहेंगे? "
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+msgid "Evolution Error"
+msgstr "�वोल�यूशन त�र�टि"
 
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>कार�यालय से बाहर संदेश:</b>"
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+msgid "Evolution Warning"
+msgstr "�वोल�यूशन चेतावनी"
 
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b> स�तर:</b>"
+#: ../e-util/e-error.c:117
+msgid "Evolution Information"
+msgstr "�वोल�यूशन सूचना"
 
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>नीचे निर�दिष�ट संदेश उन सभी लोगों को स�वतः भेज दिया जायेगा जिसने \n"
-"आपको कार�यालय से बाहर रहने के दौरान डाक भेजा है.</small>"
+#: ../e-util/e-error.c:119
+msgid "Evolution Query"
+msgstr "�वोल�यूशन पूछताछ"
 
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "मैं अभी कार�यालय में हू�"
+#. setup a dummy error
+#: ../e-util/e-error.c:449
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "आंतरिक त�र�टि, अनजान त�र�टि '%s' निवेदित"
 
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "मैं अभी कार�यालय से बाहर हू�"
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "अवयव"
 
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "नहीं, स�थिति नहीं बदलें"
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "कार�यालय के बाहर का सहायक"
+#: ../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
+msgid "Enabled"
+msgstr "सक�षम"
 
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "नहीं, स�थिति बदलें"
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>ई-डाक प�राप�त कर रहा है</b>"
+#: ../e-util/e-print.c:160
+msgid "An error occurred while printing"
+msgstr "छपाई के दौरान गलती आई"
 
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>ई-डाक भेज रहा है:</b>"
+#: ../e-util/e-print.c:167
+msgid "The printing system reported the following details about the error:"
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+#: ../e-util/e-print.c:173
+msgid "The printing system did not report any additional details about the error."
 msgstr ""
-"<small>यह पृष�ठ आपको च�नने के लिये कहता है कि अगर आप अपने द�वारा भेजे गये संदेश को \n"
-"पढ़े जाने पर पठित रसीद के रूप में बताने के लिये च�नते हैं, और निर�दिष�ट करने के लिये कि �वोल�यूशन "
-"को क�या करना चाहिये जब कोई आपसे रसीद के लिये लिये पूछता है.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "हमेशा पठित रसीद भेजें"
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "म��से पूछें कि मैं पठित रसीद वापस भेजना चाहता हूं"
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "कभी पठन रसीद वापस नहीं भेजें"
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "पठन रसीद"
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "क�या आप इसके ऊपर लिखना चाहते हैं?"
 
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "मेरे द�वारा भेजे जाने वाले सभी संदेशों के लि� पठन रसीद का आग�रह करें"
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "या तो संदेश मेलिंग सूची पर भेजा गया है, और न कि निजी रूप से म��े"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "फ़ाइल को मिटाकर लिखें?"
 
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "जब आप पठन रसीद सहित �क ईडाक पाते हैं, तब �वोल�यूशन को क�या करना चाहि�?"
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+msgid "_Overwrite"
+msgstr "मिटाकर लिखें (_O)"
 
-#: ../e-util/e-dialog-utils.c:283
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
 msgstr ""
-"उस नाम से फाइल पहले से ही उपस�थित है.\n"
-"इसके ऊपर लिखें?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "इसके ऊपर लिखें?"
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "महत�वपूर�ण (_m)"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
-msgid "Evolution Error"
-msgstr "�वोल�यूशन त�र�टि"
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "कार�य (_W)"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
-msgid "Evolution Warning"
-msgstr "�वोल�यूशन चेतावनी"
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "निजी (_P)"
 
-#: ../e-util/e-error.c:126
-msgid "Evolution Information"
-msgstr "�वोल�यूशन सूचना"
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "शेष कार�य (_T)"
 
-#: ../e-util/e-error.c:128
-msgid "Evolution Query"
-msgstr "�वोल�यूशन पूछताछ"
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "बाद में (_L)"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:454
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "आंतरिक त�र�टि, अनजान त�र�टि '%s' निवेदित"
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; फाइल को नहीं खोल सकता है."
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; फाइल को सहेज नहीं सकता है."
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "क�या आप इसके ऊपर लिखना चाहते हैं?"
+#: ../e-util/e-util-labels.c:351
+msgid "Label name cannot be empty."
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; फाइल मौजूद है."
+#: ../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/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
-msgid "_Overwrite"
-msgstr "मिटाकर लिखें (_O)"
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf त�र�टि: %s"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "ट�रै का अभिम�खन"
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "आगे की सभी त�र�टियां सिर�फ टर�मिनल पर दिखा��."
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 सेकेंड पहले"
 msgstr[1] "%d सेकेंड पहले"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 मिनट पहले"
 msgstr[1] "%d मिनट पहले"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 घंटा पहले"
-msgstr[1] "%d घंटे पहले"
+msgstr[1] "%d घंटा पहले"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 दिन पहले"
-msgstr[1] "%d दिनों पहले"
+msgstr[1] "%d दिन पहले"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 सप�ताह पहले"
 msgstr[1] "%d सप�ताह पहले"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 महीना पहले"
-msgstr[1] "%d महीने पहले"
+msgstr[1] "%dमहीना पहले"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 साल पहले"
 msgstr[1] "%d साल पहले"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<तिथि के चयन के लि� यहां क�लिक करें>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
-msgstr "अब"
+msgstr "अभी"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "इससे त�लना करने के लि� समय च�नें"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
-msgstr "�क फाइल च�नें"
-
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "महत�वपूर�ण"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "करने के लि�"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "बाद में"
+msgstr "�क फ़ाइल च�नें"
 
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
-msgstr "जा�च"
+msgstr "जांच"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "खोज नाम (_S):"
+#: ../filter/filter-rule.c:852
+msgid "R_ule name:"
+msgstr ""
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "मद पायें जो कि निम�न मापदंड से मेल खाता है"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:914
+msgid "A_dd Filter Criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "अगर सभी मापदंड हैं"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "अगर कोई मापदंड मिलता है"
 
-#: ../filter/filter-rule.c:868
-msgid "Find items:"
-msgstr "मद पायें:"
+#: ../filter/filter-rule.c:922
+msgid "_Find items:"
+msgstr ""
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "सभी संबंधित"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "जबाव"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "जबाव व जनक"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "कोई जवाब नहीं या जनक"
 
-#: ../filter/filter-rule.c:891
-msgid "Include threads"
-msgstr "सूत�रों को शामिल करें"
+#: ../filter/filter-rule.c:946
+msgid "I_nclude threads"
+msgstr ""
 
-#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "आने वाला"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "जाने वाला"
 
@@ -10785,7 +11251,7 @@ msgstr "तिथि अन�पस�थित."
 msgid "Missing file name."
 msgstr "फाइल नाम अन�पस�थित."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "नाम अन�पस�थित."
 
@@ -10853,35 +11319,46 @@ msgstr "मौजूदा समय के सापेक�ष समय"
 msgid "ago"
 msgstr "पहले"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "महीने"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "सेकण�ड"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "मौजूदा समय"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "समय जिसे आपने निर�दिष�ट किया है"
 
-#: ../filter/filter.glade.h:22
+#: ../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 "सप�ताह"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "साल"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "नियम जोड़ें"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
-msgstr "नियम का संपादन करें"
+msgstr "नियम संपादित करें"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "नियम का नाम"
 
@@ -10902,58 +11379,69 @@ msgid "Configure your email accounts here"
 msgstr "ईडाक खाता को यहां विन�यस�त करें"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "�वोल�यूशन डाक"
 
-#: ../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 "�वोल�यूशन डाक खाता विन�यास नियंत�रण"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "�वोल�यूशन डाक घटक"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "�वोल�यूशन डाक कंपोजर"
 
-#: ../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 "�वोल�यूशन डाक कंपोजर विन�यास नियंत�रण"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "�वोल�यूशन डाक ........ नियंत�रण"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:522
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr ""
+
+#: ../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:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
-msgstr "डाक"
+msgstr "मेल"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "डाक खाता"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "डाक ......"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "डाक (_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s लाइसेंस मसौदा"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10966,117 +11454,109 @@ msgstr ""
 "मसौदे को ध�यान से पढ़ें\n"
 "और इसे स�वीकार करने के लि� चेक बॉक�स में टिक करें\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "फोल�डर च�नें"
 
-#: ../mail/em-account-editor.c:778
+#: ../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
+msgid "Autogenerated"
+msgstr "स�वयंभू"
+
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "प�रत�येक संदेश के लिये पूछें"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
-msgstr "पहचान"
+msgstr "उपयोक�ता"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "ई-मेल प�राप�त कर रहा है"
 
-#: ../mail/em-account-editor.c:2046
-msgid "Automatically check for _new mail every"
-msgstr "नये मेल के लिये हर इतने अंतराल पर स�वतः जांचें (_n)"
+#: ../mail/em-account-editor.c:2131
+msgid "Check for _new messages every"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2139
+msgid "minu_tes"
+msgstr ""
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "ईडाक भेज रहा है"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
-msgstr "मूलभूत"
+msgstr "डिफ़ॉल�ट�स"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "स�रक�षा"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "प�राप�ति विकल�प"
 
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
-msgid "Checking for New Mail"
-msgstr "नयी डाक के लिये जांच"
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+msgid "Checking for New Messages"
+msgstr ""
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "खाता संपादक"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "�वोल�यूशन खाता सहायक"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "निष�क�रिय"
-
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "सक�षम"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[मूलभूत]"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
-msgid "Enabled"
-msgstr "सक�षम"
-
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "खाता नाम"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
-msgstr "प�रोटोकॉल"
+msgstr "प�रोटोकाल"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../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 "बेनाम"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "भाषा(ओं)"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "हस�ताक�षर स�क�रिप�ट जोड़ें"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "हस�ताक�षर(रों)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- अग�रसारित संदेश --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "�क अज�ञात प�रेषक"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11084,14 +11564,18 @@ msgstr ""
 "पर ${AbbrevWeekdayName}, ${साल}-${महीना}-${दिन} के ${२४ घंटे}:${मिनट} ${समय "
 "क�षेत�र}, ${प�रेषक} लिखा:"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-composer-utils.c:2152
+msgid "-----Original Message-----"
+msgstr ""
+
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "फिल�टर नियम (_F)"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
-msgstr "स�कोर �डजस�ट करें"
+msgstr "अंक समंजित करें"
 
 #: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
@@ -11101,362 +11585,383 @@ msgstr "रंग दें"
 msgid "Assign Score"
 msgstr "स�कोर दें"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "संलग�नक "
-
 #: ../mail/em-filter-i18n.h:6
-msgid "Beep"
-msgstr "बीप"
+msgid "BCC"
+msgstr "ग�मनाम पता.: "
 
 #: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "रखता है"
+msgid "Beep"
+msgstr "बीप"
 
 #: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "नक़ल: "
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "फोल�डर से कॉपी बना�ं"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "तिथि प�राप�त ह�ई"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "तिथि भेजी गई"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:767
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "मिटा��"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
-msgstr "विलोपित"
+msgstr "मिटाया"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
-msgstr "नहीं रखता है"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "इससे समाप�त नहीं होता है"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "उपस�थित नहीं है"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "नहीं लौटता है"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "उस तरह का नहीं लगता"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "इससे आरंभ नहीं होता है"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "मौजूद नहीं है"
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "ड�राफ�ट"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "इससे समाप�त होता है"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr "उपस�थित"
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "उपस�थित है"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
-msgstr "�क�सप�रेशन"
+msgstr "अभिव�यक�ति"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "फोलो अप"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "है"
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "महत�वपूर�ण"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "इसके पश�चात है"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "इसके पहले है"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "फ�लैग किया गया है"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr "इससे बड़ा है"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
-msgstr "इससे छोटा है"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
-msgstr "है नहीं"
-
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "फ�लैग नहीं किया गया है"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "जंक"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "जंक जांच"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "लेबल"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "डाक सूची"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "सभी मिलायें"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
-msgstr "संदेश शरीर"
+msgstr "संदेश ढांचा"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "संदेश शीर�ष"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "संदेश जंक है"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "संदेश जंक नहीं है"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "फोल�डर में ले जा�ं"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "पाइप से प�रोग�राम में"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
-msgstr "ध�वनि बजा�ं"
+msgstr "ध�वनि बजा��"
 
-#: ../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:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "पढ़ें"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "प�राप�तकर�ता"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "Regex मेल"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "इसे जबाव दिया गया"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "लौटाता है"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "इससे ज�यादा लौटाता है"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "इससे कम लौटाता है"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "प�रोग�राम चला�ं"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "अंक"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "प�रेषक"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "स�थिति निश�चित करें"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "आकार (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "उस तरह का दिखता है"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "श�रोत खाता"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "विशिष�ट शीर�ष"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "इससे आरंभ होता है"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "प�रक�रिया को रोकें"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
 msgstr "विषय"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "प�रस�थिति अनसेट करें"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>तब</b>"
+#: ../mail/em-filter-rule.c:522
+msgid "Then"
+msgstr "Then"
+
+#: ../mail/em-filter-rule.c:550
+msgid "Add Ac_tion"
+msgstr ""
 
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "खोज से खोज फोल�डर बना�ं (_r)..."
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "सारे संदेश"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "अपठित संदेश"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "कोई लेबल नहीं"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "संदेश पढ़ें"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "नवीनतम संदेश"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "अंतिम 5 दिन का संदेश"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "संलग�नक के साथ संदेश"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "महत�वपूर�ण संदेश"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "संदेश जंक नहीं है"
 
+#: ../mail/em-folder-browser.c:1171
+msgid "Account Search"
+msgstr ""
+
+#: ../mail/em-folder-browser.c:1224
+msgid "All Account Search"
+msgstr ""
+
+#. 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] "अपठित संदेश:"
+msgstr[1] "अपठित संदेश:"
+
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "क�ल संदेश"
 msgstr[1] "क�ल संदेश"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "अपठित संदेश:"
-msgstr[1] "अपठित संदेश"
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr ""
 
-#: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../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:160
+#: ../mail/mail-component.c:581
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "इनबॉक�स"
+
+#: ../mail/em-folder-properties.c:389
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "फोल�डर ग�ण"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<�क फोल�डर के चयन के लि� यहां क�लिक करें>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "बना��"
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr "बना�ं (_r)"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "फोल�डर नाम (_n):"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#. load store to mail component at the end, when everything is loaded
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "फोल�डर खोजें"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "बेमेल"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "ड�राफ�ट"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
-msgid "Inbox"
-msgstr "इनबॉक�स"
-
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
-msgstr "आउटबॉक�स"
+msgstr "Outbox"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "भेजी-डाक"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
-msgstr "अधिभारित कर रहा है..."
+msgstr "लोड किया जा रहा है..."
 
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. "%s" will be replaced by
@@ -11473,295 +11978,323 @@ msgstr "अधिभारित कर रहा है..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr ""
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "डाक फोल�डर तरू"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s फोल�डर को विस�थापित कर रहा है"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s फोल�डर कापी कर रहा है"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1824
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s फोल�डर में संदेश विस�थापित कर रहा है"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1826
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s फोल�डर में संदेश कापी कर रहा है"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "शीर�षस�तर भंडार में संदेश दे नहीं सकता"
 
-#: ../mail/em-folder-tree.c:1000 ../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 "फोल�डर में कॉपी लें (_C)"
 
-#: ../mail/em-folder-tree.c:1001 ../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 "फोल�डर में विस�थापित करें(_M)"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" में फोल�डर स�कैन कर रहा है"
 
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
-msgid "_View"
-msgstr "देखें (_V)"
-
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "न� विंडो में खोलें (_N)"
 
-#: ../mail/em-folder-tree.c:2070
-msgid "_Copy..."
-msgstr "कापी करें (_C)..."
-
-#: ../mail/em-folder-tree.c:2071
-msgid "_Move..."
-msgstr "विस�थापित करें (_M)..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "नया फोल�डर (_N)..."
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2107
+msgid "_Move..."
+msgstr "खिसका�ं (_M)..."
+
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
-msgstr "प�नर�नामकरण करें (_R)..."
+msgstr "नाम बदलें... (_R)"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2115
+msgid "Re_fresh"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2116
+msgid "Fl_ush Outbox"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "रद�दी खाली करें (_E)"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' को `%s' में कॉपी कर रहा है"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1013
-#: ../mail/em-folder-view.c:1028
-#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
+#: ../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
 msgid "Select folder"
 msgstr "फोल�डर च�नें"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1028
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
-msgstr "कापी करें (_o)"
+msgstr "कॉपी करें (_o)"
 
-#: ../mail/em-folder-utils.c:581
+#: ../mail/em-folder-utils.c:585
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr " `%s' फोल�डर बना रहा है"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:743
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "फोल�डर बना�ं"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:743
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "निर�दिष�ट करें कि कहां फोल�डर बनाना है:"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "प�रेषक को जबाव दें (_R)"
 
-#: ../mail/em-folder-view.c:1123 ../mail/em-popup.c:561 ../mail/em-popup.c:572
-#: ../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 "अग�रसारित करें (_F)"
+msgstr "आगे (_F)"
 
-#: ../mail/em-folder-view.c:1126 ../ui/evolution-mail-message.xml.h:107
+#. 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 "न� संदेश का संपादन करें (_E)..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "प�रतिविलोपित करें (_n)"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "फोल�डर में विस�थापित करें (_M)..."
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "फोल�डर से कापी करें (_C)..."
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "पढ़े ग� के रूप में चिह�नित करें (_k)"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "अपठित के रूप में चिह�नित करें (_U)"
 
-#: ../mail/em-folder-view.c:1139
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "महत�वपूर�ण के रूप में चिह�नित करें (_I)"
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "गैर महत�वपूर�ण के रूप में चिह�नित करें (_i)"
 
-#: ../mail/em-folder-view.c:1141
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "जंक के रूप में चिह�नित करें (_J)"
 
-#: ../mail/em-folder-view.c:1142
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "जंक नहीं है के रूप में चिह�नित करें (_N)"
 
-#: ../mail/em-folder-view.c:1143
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "फोलो अप के लिये चिह�नित करें (_w)..."
 
-#: ../mail/em-folder-view.c:1145
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "लेबल (_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1146 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "क�छ नहीं (_N)"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "फ�लैग समाप�त (_g)"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "फ�लैग हटा�ं (_e)"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "संदेश से नियम बना�ं (_t)"
 
-#: ../mail/em-folder-view.c:1156
-msgid "Search Folder from _Subject"
-msgstr "विषय से फोल�डर खोजें (_S)"
+#. 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 ""
 
-#: ../mail/em-folder-view.c:1157
-msgid "Search Folder from Se_nder"
-msgstr "प�रेषक से फोल�डर खोजें (_n)"
+#: ../mail/em-folder-view.c:1369
+msgid "Search Folder based on Se_nder"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1158
-msgid "Search Folder from _Recipients"
-msgstr "प�राप�तकर�ता से फोल�डर खोजें (_R)"
+#: ../mail/em-folder-view.c:1370
+msgid "Search Folder based on _Recipients"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1159
-msgid "Search Folder from Mailing _List"
-msgstr "डाक सूची से फोल�डर खोजें (_L)"
+#: ../mail/em-folder-view.c:1371
+msgid "Search Folder based on Mailing _List"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1163
-msgid "Filter on Sub_ject"
-msgstr "विषय पर फिल�टर (_j)"
+#. 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 ""
 
-#: ../mail/em-folder-view.c:1164
-msgid "Filter on Sen_der"
-msgstr "प�रेषक पर फिल�टर (_d)"
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1165
-msgid "Filter on Re_cipients"
-msgstr "प�राप�तकर�ता पर फिल�टर (_c)"
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1166
-msgid "Filter on _Mailing List"
-msgstr "डाक सूची पर फिल�टर (_M)"
+#: ../mail/em-folder-view.c:1379
+msgid "Filter based on _Mailing List"
+msgstr ""
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2017 ../mail/em-folder-view.c:2061
+#. 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 "मूलभूत"
-
-#: ../mail/em-folder-view.c:2160
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "संदेश म�द�रित करें"
+msgstr "डिफ़ॉल�ट"
 
-#: ../mail/em-folder-view.c:2320
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "संदेश प�नर�प�राप�त करने में असमर�थ "
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2535
+msgid "Retrieving Message..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2794
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "खोज फोल�डर बना�ं (_S)"
 
-#: ../mail/em-folder-view.c:2519
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "इस पता से (_F)"
 
-#: ../mail/em-folder-view.c:2520
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "इस पता में (_T)"
 
-#: ../mail/em-folder-view.c:2877
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s डाक पर क�लिक करें"
 
-#: ../mail/em-folder-view.c:2882
+#: ../mail/em-folder-view.c:3308
+#, c-format
+msgid "Click to call %s"
+msgstr ""
+
+#: ../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:503
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "मेल: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Fi_nd:"
-msgstr "ढूंढे (_n):"
+#: ../mail/em-format-html-display.c:615
+msgid "Fin_d:"
+msgstr "खोजें (_d):"
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:639
+msgid "_Previous"
+msgstr "पिछला (_P)"
 
-#: ../mail/em-format-html-display.c:674
-msgid "Fo_rward"
-msgstr "अग�रसारित (_r)"
+#: ../mail/em-format-html-display.c:644
+msgid "_Next"
+msgstr "अगला (_N)"
 
-#: ../mail/em-format-html-display.c:679
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "मिलान केस (_a)"
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "अहस�ताक�षरित"
 
-#: ../mail/em-format-html-display.c:926
+#: ../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:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "वैध हस�ताक�षर"
 
-#: ../mail/em-format-html-display.c:927
+#: ../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."
@@ -11769,41 +12302,51 @@ msgstr ""
 "यह संदेश हस�ताक�षरित है और वैध है. इसका मतलब है कि इसकी ज�यादा संभावना है कि यह संदेश "
 "सत�यापित है."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "अवैध हस�ताक�षर"
 
-#: ../mail/em-format-html-display.c:928
+#: ../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:929
-msgid "Valid signature, cannot verify sender"
-msgstr "वैध हस�ताक�षर, प�रेषक को नहीं जांच सकता है"
+#: ../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:929
+#: ../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:935 ../mail/em-format-html.c:627
+#: ../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:952
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
-msgstr "विगोपित"
+msgstr "अन�नक�रिप�टेड"
 
-#: ../mail/em-format-html-display.c:935
+#: ../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:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "ग�प�त, द�र�बल"
 
-#: ../mail/em-format-html-display.c:936
+#: ../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 "
@@ -11812,21 +12355,21 @@ msgstr ""
 "यह संदेश ग�प�त है, लेकिन �क द�र�बल गोपन �लागरिथम के साथ है.  यह कठिन होगा लेकिन किसी "
 "बाहरी के लि� प�रायोगिक समय सीमा में संदेश की सामग�री देखना असंभव नहीं होगा."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
-msgstr "ग�प�त"
+msgstr "�नक�रिप�टेड"
 
-#: ../mail/em-format-html-display.c:937
+#: ../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:938 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "ग�प�त, मजबूत"
 
-#: ../mail/em-format-html-display.c:938
+#: ../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 "
@@ -11835,268 +12378,371 @@ msgstr ""
 "यह संदेश ग�प�त है, �क मजबूत गोपन �लागरिथम के साथ.  किसी बाहरी के लि� प�रायोगिक समय "
 "सीमा में संदेश की सामग�री देखना बह�त कठिन होगा."
 
-#: ../mail/em-format-html-display.c:1039 ../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 "प�रमाणपत�र देखें (_V)"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "प�रमाणत�र दृश�य नहीं"
 
-#: ../mail/em-format-html-display.c:1373
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p पर समाप�त"
 
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "मियाद पूर�ण:"
 
-#: ../mail/em-format-html-display.c:1384
+#: ../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:1444
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "इनलाइन देखें (_V)"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "छ�पा�� (_H)"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "चौडाई में ठीक (_F)"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "मौलिक संदेश दिखायें (_O)"
 
-#: ../mail/em-format-html-display.c:1866 ../mail/mail-config.glade.h:44
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "संलग�नक"
+#: ../mail/em-format-html-display.c:1989
+msgid "Save attachment as"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:2073
-msgid "Select folder to save all attachments..."
-msgstr "सभी संलग�नक सहेजने के लिये फोल�डर च�नें..."
+#: ../mail/em-format-html-display.c:1993
+msgid "Select folder to save all attachments"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:2120
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "चयनित सहेजें (_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2187
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d संलग�नक (_t)"
 msgstr[1] "%d संलग�नक (_t)"
 
-#: ../mail/em-format-html-display.c:2194 ../mail/em-format-html-display.c:2272
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "सहेजें (_a)"
 
-#: ../mail/em-format-html-display.c:2205
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "सबको सहेजें (_a)"
 
-#: ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "कोई संलग�नक नहीं"
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+msgid "View _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2346
+msgid "Hide _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2403
+msgid "O_pen With"
+msgstr ""
+
+#: ../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 ""
+
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
-msgstr "%d का %d पृष�ठ"
+msgstr "पृष�ठ %d %d का"
 
-#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' प�नःप�राप�त कर रहा है"
 
-#: ../mail/em-format-html.c:621
-msgid "Valid signature but cannot verify sender"
-msgstr "वैध हस�ताक�षर, प�रेषक को नहीं जांच सकता है"
+#: ../mail/em-format-html.c:925
+msgid "Unknown external-body part."
+msgstr ""
 
-#: ../mail/em-format-html.c:892
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "बदरूप बाह�य शरीर हिस�सा"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP साइट (%s) में संकेतक"
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "स�थानीय फाइल (%s) में संकेतक \"%s\" साइट पर मान�य"
 
-#: ../mail/em-format-html.c:935
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "स�थानीय फाइल (%s) में संकेतक"
 
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "दूरस�थ डाटा में संकेतक (%s)"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "अनजान बाह�य आंकड़ा (\"%s\" प�रकार) में संकेतक"
 
-#: ../mail/em-format-html.c:1194
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "संदेश संरूपित कर रहा है"
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "यहा� से"
-
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
-msgid "Reply-To"
-msgstr "इसे जबाव दें"
+#: ../mail/em-format-html.c:1410
+msgid "Formatting Message..."
+msgstr ""
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+#: ../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 "इन�हें भी"
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+#: ../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 "बेनामी प�रतिलिपि: "
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1025
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "मेलर"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1691
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1771
+msgid " (%a, %R %Z)"
+msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1694
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../mail/em-format-html.c:1776
+msgid " (%R %Z)"
+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:1907
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../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 "से"
+
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
+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
 msgid "Date"
-msgstr "तिथि"
+msgstr "तारीख़"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
-msgstr "समाचार समूह"
+msgstr "Newsgroups"
 
-#: ../mail/em-format.c:1102
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s संलग�नक"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME संदेश का विश�लेषण नहीं कर सकता है: अज�ञात त�र�टि"
 
-#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME संदेश का विश�लेषण नहीं कर सकता है: श�रोत के रूप में प�रदर�शित कर रहा है."
 
-#: ../mail/em-format.c:1279
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "मल�टीपार�ट/गोपित के लिये अमर�थित गोपन"
 
-#: ../mail/em-format.c:1446
+#: ../mail/em-format.c:1354
+msgid "Could not parse PGP/MIME message"
+msgstr ""
+
+#: ../mail/em-format.c:1354
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "असमर�थित हस�ताक�षर प�रारूप"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "हस�ताक�षर जांच के दौरान त�र�टि"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "हस�ताक�षर जांच के दौरान अज�ञात त�र�टि"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-format.c:1662
+msgid "Could not parse PGP message"
+msgstr ""
+
+#: ../mail/em-format.c:1662
+msgid "Could not parse PGP message: Unknown error"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "हमेशा"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "दिन में �क बार"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "सप�ताह में �क बार"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "महीने में �क बार"
 
-#: ../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..."
+#: ../mail/em-mailer-prefs.c:326
+msgid "Add Custom Junk Header"
 msgstr ""
-"�वोल�यूशन डाकपेटी फोल�डर का स�थान और पदक�रम �वोल�यूशन 1.x. से बदल गया है\n"
-"\n"
-"कृपया धैर�य रखें जबकि �वोल�यूशन आपके फोल�डर में उत�प�रवासित होता है..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-mailer-prefs.c:330
+msgid "Header Name:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Value Contains:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:436
+msgid "Contains Value"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:458
+msgid "Color"
+msgstr "रंग"
+
+#: ../mail/em-mailer-prefs.c:461
+msgid "Tag"
+msgstr "टैग"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#, c-format
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:1107
+msgid "No Junk plugin available"
+msgstr ""
+
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "करने के लि�"
+
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "बाद में"
+
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "न� फोल�डर `%s' बनाने में असमर�थ: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "`%s' फोल�डर को `%s' में कापी करने में असमर�थ: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "मौजूदा डाकपेटियों के लिये `%s' पर स�कैन करने असमर�थ: %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 ""
+"�वोल�यूशन डाकपेटी फोल�डर का स�थान और पदक�रम �वोल�यूशन 1.x. से बदल गया है\n"
+"\n"
+"कृपया धैर�य रखें जबकि �वोल�यूशन आपके फोल�डर में उत�प�रवासित होता है..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "प�राने POP सर�वर पर रखने वाले आंकड़ा `%s' को खोलने में असमर�थ: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "प�राने POP सर�वर पर रखने वाले आंकड़ा `%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 "प�राने POP3 सर�वर पर रखने वाले आंकड़ा `%s' को कॉपी करने में असमर�थ: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "स�थानीय डाक भंडारण `%s' को बनाने में विफल: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../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
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' पर स�थानीय डाक फोल�डर बनाने में विफल: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12104,185 +12750,299 @@ msgstr ""
 "पहले �वोल�यूशन अधिभारण से जमावटों को पढ़ने में विफल, `evolution/config.xmldb' मौजूद "
 "नहीं है या खराब हो च�का है."
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "प�रेषक को जबाव दें (_R)"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "सूची को जबाव दें (_L)"
 
-#: ../mail/em-popup.c:621
-msgid "_Send New Message To..."
-msgstr "इसे नया संदेश भेजें (_S)..."
-
-#: ../mail/em-popup.c:622
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "पता प�स�तिका में जोड़ें (_A)"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "यह भंडार सदस�यता को समर�थन नहीं देता है, या वे सक�रिय नहीं किया ह�आ है."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
-msgstr "सदस�यता स�वीकृत"
+msgstr "सदस�यता लिया ह�आ"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "फ़ोल�डर"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "कृपया �क सर�वर च�नें."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "कोई सर�वर नहीं च�ना गया है"
 
-#: ../mail/em-utils.c:141
-msgid "Do not show this message again."
-msgstr "यह संदेश फिर मत दिखा�ं."
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
+msgid "_Do not show this message again."
+msgstr ""
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "संदेश फिल�टर"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "संदेश"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "संदेश सहेजें..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "पता जोड़ें"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s से संदेश"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "फोल�डर खोजें (_F)"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "फोल�डर श�रोत खोजें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Always request read receipt"
+msgstr ""
+
+#: ../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
+msgid "Automatic emoticon recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "स�वचालित लिंक पहचान"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
-msgid "Automatic smiley recognition"
-msgstr "स�वचालित स�माइली पहचान"
-
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "जंक के रूप में आगत मेल जांचें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "प�रशस�ति-पत�र को रंग से उभारें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "प�रशस�ति-पत�र को रंग से उभारें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "कंपोजर विंडो मूलभूत ऊंचाई"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "कंपोजर विंडो मूलभूत चौड़ाई"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../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.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "प�रति/कॉपी/ग�प�त कॉपी में पता के प�रदर�शन को सिकोड़े address_count में निर�दिष�ट संख�या मे."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "मूलभूत चारसेट जिसमें संदेश लिखना है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "मूलभूत चारसेट जिसमें संदेश लिखना है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "मूलभूत चारसेट जिसमें संदेश दिखाना है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "मूलभूत चारसेट जिसमें संदेश दिखाना है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "मूलभूत अग�रसारण शैली"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
-msgid "Default height of the Composer Window"
-msgstr "कंपोजर विंडो की मूलभूत ऊंचाई"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the Composer Window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Message Window"
-msgstr "संदेश विंडो की मूलभूत ऊंचाई"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the message window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Subscribe dialog"
-msgstr "सदस�यता संवाद की मूलभूत ऊंचाई"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default height of the subscribe dialog."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "मूलभूत जबाव शैली"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
-msgid "Default width of the Composer Window"
-msgstr "कंपोजर विंडो की मूलभूत चौड़ाई"
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Default value for thread expand state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the Composer Window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Message Window"
-msgstr "संदेश विंडो की मूलभूत चौड़ाई"
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the message window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Subscribe dialog"
-msgstr "सदस�यता संवाद की मूलभूत चौड़ाई"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default width of the subscribe dialog."
+msgstr ""
+
+#: ../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: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.in.h:22
+#: ../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.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "निकास पर ट�रैश फोल�डर को खाली करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "�वोल�यूशन से निकास पर सभी ट�रैश फोल�डर को खाली करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../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.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Enable or disable magic space bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "खोज ग�ण के आगे प�रकार सक�रिय व निष�क�रिय करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable search folders"
+msgstr ""
+
+#: ../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 "
@@ -12293,19 +13053,33 @@ msgstr ""
 "सकें. इसका उपयोग है कि आप किनारे की पट�टी में आसानी से फोल�डर फोल�डर नाम टाइप कर पा "
 "सकते हैं और तब चयन स�वतः उस फोल�डर पर पह�ंच जाता है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../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
+msgid "Enable to render message text part of limited size."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "हंसपद मोड सक�रिय/निष�क�रिय करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "संदेश-सूची पट�टी की ऊंचाई"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "संदेश-सूची पट�टी की ऊंचाई."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../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."
@@ -12313,13 +13087,13 @@ msgstr ""
 "अगर �क उपयोक�ता 10 या ज�यादा संदेशों को �कसाथ खोलना चाहता है, उपयोक�ता से पूछें कि वे "
 "वास�तव में इसे चाहते हैं."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../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.in.h:33
+#: ../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 "
@@ -12329,27 +13103,69 @@ msgstr ""
 "mime-types जो सूची में आ रहा है जो बोनोबो घटक प�रदर�शक में मैप करता हैGNOME's mime-"
 "type डाटाबेस में जिसे अंतर�वस�त� प�रदरिशत करने के लिये प�रयोग किया जाता है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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.in.h:35
+#: ../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:69
 msgid "Last time empty trash was run"
 msgstr "अंतिम बार जब रद�दी खाली किया गया था"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../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.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "स�वीकृत लाइसेंस की सूची"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "खाताओं की सूची"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../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."
@@ -12357,11 +13173,15 @@ msgstr ""
 "�वोल�यूशन के डाक घटक को जाना जाने वाला खाता की सूची. यह सूची में /apps/evolution/"
 "mail/accounts के सापेक�ष नामित उपनिर�देशिका है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "पसंदीदा हेडर की सूची और क�या वे सक�रिय हैं."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../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."
@@ -12369,117 +13189,122 @@ msgstr ""
 "�वोल�यूशन के डाक घटक को जाना जाने वाला लेबल की सूची. सूची में name:color को समाहित "
 "करने वाला स�ट�रिंग है जहां रंग HTML हेस�क �नकोडिंग का प�रयोग करता है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "बोनोबो घटक दृश�य के लिये जांचने के लिये माइम प�रकार की सूची"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "प�रोटोकाल नामों की सूची जिसका लाइसेंस स�वीकृत किया गया है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "HTML संदेश के लिये http के ऊपर बिंब को अधिभारित करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../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 mail 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 ""
-"http(s) के ऊपर HTML संदेशों के लि� बिंबों को अधिभारित करें. संभावित मूल�य हैं: 0 - net 1 से "
-"इतर बिंबों को कभी अधिभारित नहीं करें - प�रेषक पता प�स�तिका 2 से बिंबों को अधिभारित करें - "
-"हमेशा बिंबों को नेट से इतर अधिभारित करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
-msgstr "लाग निस�पंदन क�रिया"
+msgstr "फ़िल�टर क�रिया�� लॉग करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "निर�दिष�ट लाग फाइल के लि� लाग निस�पंदन क�रिया करें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "लाग निस�पंदन क�रिया  के लि� लाग फाइल"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "लाग निस�पंदन क�रिया  के लि� लाग फाइल."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "निर�दिष�ट समय के पश�चात देखे ग� के रूप में चिह�नित करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "निर�दिष�ट समय के पश�चात देखे ग� के रूप में चिह�नित करें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "संदेश में उल�लेख को चिह�नित करें \"पूर�वावलोकनः\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "संदेश में उल�लेख को चिह�नित करें \"पूर�वावलोकनः\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "संदेश विंडो मूलभूत ऊंचाई"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "संदेश विंडो मूलभूत चौड़ाई"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "संदेश-प�रदर�शन शैली (\"सामान�य\", \"पूर�ण शीर�ष\", \"श�रोत\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "छोड़ने पर रद�दी को खाली करने पर न�यूनतम दिन"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../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:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "छोड़ने पर रद�दी को खाली करने पर न�यूनतम समय. दिनों में"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
-msgid "New Mail Notify sound file"
-msgstr "नया डाक सूचना ध�वनि फाइल"
-
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "New Mail Notify type"
-msgstr "नयी डाक सूचना फाइल"
-
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "प�रति/कॉपी/ग�प�त कॉपी में प�रदर�शित पताओं की संख�या"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "रिक�त विषय पर संकेत करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../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.in.h:64
+#: ../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.in.h:65
+#: ../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:102
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "जब उपभोक�ता पूर�ण विलोपित करे तो संकेत करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "जब उपभोक�ता सिर�फ Bcc भरे तो संकेत करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "संकेत करें जब उपभोक�ता १० या ज�यादा संदेश को �क साथ खोलना चाहता है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../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."
@@ -12487,101 +13312,158 @@ msgstr ""
 "संकेत करें जब उपभोक�ता HTML डाक प�राप�तकर�ता को भेजने की कोशिश करता है जो HTML डाक नहीं "
 "प�राप�त करना चाहता है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "प�रांप�ट जब उपयोक�ता बिना To या Cc प�राप�तकर�ता के संदेश भेजने की कोशिश करता है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "संकेत करें जब उपभोक�ता अनचाहा HTML डाक भेजने की कोशिश करता है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "बह�ल संदेश चिह�नित करने के दौरान प�रांप�ट करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "पाठ में लिंक पहचाने और उसे बदलें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Recognize smileys in text and replace them with images."
-msgstr "पाठ में स�माइली पहचाने और उसे बिंब से बदलें."
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Run junk test on incoming mail."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Run junk test on incoming mail"
-msgstr "आने वाली डाक पर जंक परीक�षण चला�ं"
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Save directory"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../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 "HTML डाक मूलभूत रूप से भेजें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "HTML डाक मूलभूत रूप से भेजें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "सजीवन दिखा�ं"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "सजीवित बिंबों को सजीवन के रूप में दिखा�ं."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../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.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "संदेश सूची में विलोपित संदेशों को दिखा�ं"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "संदेश सूची में संदेश य�ग�म कॉलम में प�रेषक का ईमेल दिखायें"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr "संदेश सूची में संदेश कॉलम में प�रेषक का ईमेल दिखायें"
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show photo of the sender"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
-msgid "Sound file to play when new mail arrives."
-msgstr "नयी डाक आने पर ध�वनि फाइल चला�ं."
+#: ../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.in.h:86
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "नये डाक सूचना के प�रकार निर�दिष�ट करें जिसे उपयोक�ता प�रयोग करना चाहता है."
+#: ../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.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "कतार में वर�तनी जांच करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "वार�तालाप मूलभूत ऊंचाई स�वीकार करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "वार�तालाप मूलभूत चौड़ाई स�वीकार करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "टर�मिनल फंट"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Text message part limit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../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:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "अंतिम समय जब रद�दी खाली करें चलाया गया, खास समय से दिनों में"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-msgid "The terminal font for mail display"
-msgstr "डाक प�रदर�शन के लिये टर�मिनल फंट"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "The terminal font for mail display."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid "The variable width font for mail display"
-msgstr "डाक प�रदर�शन के लिये चर चौड़ाई फंट"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "The variable width font for mail display."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../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."
+msgstr ""
+
+#: ../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: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 ""
+
+#: ../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;"
@@ -12592,7 +13474,18 @@ msgstr ""
 "निष�क�रिय किया जाना है. XML संरचना का प�रारूप &lt;header enabled&gt; है - सक�रिय के "
 "रूप में सेट करें अगर हेजर को डाक दृश�य में दिखाया जाना है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../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:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12600,103 +13493,128 @@ msgstr ""
 "यह पता की संख�या सेट करता है मूलभूत संदेश सूची दृश�य में दिखाने के लिये जिसके आगे '...' दिखाया "
 "जाता है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../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 ""
+
+#: ../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:150
 msgid "Thread the message list."
 msgstr "संदेश सूची को सूत�रित करें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "संदेश-सूची को सूत�रित करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "विषय आधारित संदेश-सूची को सूत�रित करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
-msgid "Timeout for marking message as Seen"
-msgstr "देखे गये के रूप में संदेश चिह�नित करने के लिये समय समाप�ति"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
-msgid "Timeout for marking message as Seen."
-msgstr "देखे गये के रूप में संदेश चिह�नित करने के लिये समय समाप�ति."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "मूलभूत खाता की UID पंक�ति."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
-msgid "Use Spamassassin daemon and client"
-msgstr "स�पैम�स�सेसिन डेमन और ग�राहक का प�रयोग करें"
+#: ../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.in.h:103
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "स�पैम�स�सेसिन डेमन और ग�राहक का प�रयोग करें (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "कस�टम फंट का उपयोग करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "Use custom fonts for displaying mail"
-msgstr "डाक दिखाने के लिये कस�टम फंट का उपयोग करें"
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Use custom fonts for displaying mail."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "सिर�फ स�थानीय स�पैम परीक�षणों का उपयोग करें."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "स�थानीय स�पैम परीक�षण का सिर�फ उपयोग करें (कोई DNS नहीं)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "अगल बगल या विस�तृत लेआउट का प�रयोग करें"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "चर चौड़ाई फंट"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "दृश�य/Bcc मेनू मद जांच किया गया है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "दृश�य/Bcc मेनू मद जांच किया गया है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "दृश�य/Cc मेनू मद जांच किया गया है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "दृश�य/Cc मेनू मद जांच किया गया है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "दृश�य/द�वारा मेनू मद जांच किया गया है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "दृश�य/द�वारा मेनू मद जांच किया गया है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "दृश�य/प�रेषित मेनू मद जांच किया गया है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "दृश�य/प�रेषित मेनू मद जांच किया गया है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "दृश�य/जबाव मेनू मद जांच किया गया है"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "दृश�य/जबाव मेनू मद जांच किया गया है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../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."
@@ -12704,345 +13622,303 @@ msgstr ""
 "क�या विषय पर फाल बैक होना है या नहीं जब संदेश में In-Reply-To या संदर�भ हेडर समाहित नहीं "
 "है."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../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 "संदेश-सूची पट�टी की चौड़ाई"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "संदेश-सूची पट�टी की चौड़ाई"
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm आंकड़ा आयात कर रहा है"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "�वोल�यूशन Elm आयातक"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm से डाक आयात करें."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
-msgstr "गंतव�य फोल�डर:"
+msgstr "गंतव�य फ़ोल�डर :"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "इसमें आयातित करने के लि� फोल�डर च�नें"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "बर�कले डाकबॉक�स (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "आयातक बर�कले डाकबॉक�स प�रारूप फोल�डर"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "`%s' आयात कर रहा है"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "कृपया प�रतीक�षा करें"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "मेलबॉक�स आयात कर रहा है"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
-msgid "Scanning %s"
-msgstr "%s स�कैन कर रहा है"
+msgid "Importing `%s'"
+msgstr "`%s' आयात कर रहा है"
 
-#: ../mail/importers/netscape-importer.c:74
+#: ../mail/importers/mail-importer.c:372
 #, c-format
-msgid "Priority Filter \"%s\""
-msgstr "प�राथमिकता फिल�टर \"%s\""
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"आपका क�छ Netscape ईमेल फिल�टर \n"
-"ईमेल प�राथमिकता पर आधारित है, जो �वोल�यूशन में प�रय�क�त नहीं होता है.\n"
-"बदले में, �वोल�यूशन \n"
-"-3 से 3 तक के परिसर में अ�क देता है जो ईमेल का नियत किया जा \n"
-"सकता है.\n"
-"\n"
-"समाधान के रूप में, \"Priority Filter\" नामक फिल�टर का सेट\n"
-"जोड़ा गया जो Netscape के ईमेल प�राथमिकता को\n"
-"�वोल�यूशन अंक के रूप में बदलता है और प�रभावित फिल�टर \n"
-"प�राथमिकता के बजाय अंक का प�रयोग करता है. आयातित फिल�टर को यह निश�चित करने के लिये जांचें "
-"कि\n"
-"सबक�छ अबतक इच�छान�सार हो रहा है."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"आपके क�छ Netscape ईमेल फिल�टर\n"
-"\"Ignore Thread\" या \"Watch Thread\"\n"
-"फीचर का प�रयोग करते हैं, जो �वोल�यूशन में समर�थित नहीं है.\n"
-"इन फिल�टरों को छोड़ दिया जायेगा."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"आपका क�छ Netscape ईमेल फिल�टर ईमेल की \n"
-"सामग�री को दिये गये स�ट�रिंग में समानता/असमानता \n"
-"को जांचता है, जो �वोल�यूशन में समर�थित नहीं है. वे फिल�टर\n"
-"जांचने के लिये रूपांतरित हैं कि वह स�ट�रिंग संदेश बॉडी में समाहित है\n"
-"या नहीं."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "�वोल�यूशन आपका प�राना नेटस�केप आंकड़ा आयात कर रहा है"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "नेटस�केप आंकड़ा आयात कर रहा है"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "जमावट"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "डाक फिल�टर"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"�वोल�यूशन ने नेटस�केप डाक फाइल पाया है.\n"
-"क�या आप उनको �वोल�यूशन में आयातित करना चाहेंगे?"
+msgid "Scanning %s"
+msgstr "%s स�कैन कर रहा है"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "पाइन आंकड़ा आयात कर रहा है"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "�वोल�यूशन पाइन आयातक"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Pine से डाक आयात करें."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "%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 "%s से डाक"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "विषय है %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s डाक सूची"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "फिल�टर नियम जोड़ें"
 
-#: ../mail/mail-component.c:521
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "प�रारूप"
+
+#: ../mail/mail-component.c:546
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d विलोपित"
 msgstr[1] "%d विलोपित"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d जंक"
 msgstr[1] "%d जंक"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ड�राफ�ट"
 msgstr[1] "%d ड�राफ�ट"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d प�रेषित"
 msgstr[1] "%d प�रेषित"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d अप�रेषित"
 msgstr[1] "%d अप�रेषित"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:570
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "क�ल %d"
 msgstr[1] "क�ल %d"
 
-#: ../mail/mail-component.c:556
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d अपठित"
-msgstr[1] ", %d अपठित"
-
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "नया डाक संदेश"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
-msgstr "डाक संदेश (_M)"
+msgstr ""
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "नया डाक संदेश लिखें"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "नया डाक फोल�डर"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
-msgstr "डाक फोल�डर (_F)"
+msgstr ""
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "नया डाक फोल�डर बना�ं"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "डाक जमावट या फोल�डर अद�यतन करने में विफल"
 
-#: ../mail/mail-config.c:85
-msgid "I_mportant"
-msgstr "महत�वपूर�ण (_m)"
+#: ../mail/mail-component.c:1596
+msgid "Error"
+msgstr "त�र�टि"
 
-#. red
-#: ../mail/mail-config.c:86
-msgid "_Work"
-msgstr "कार�य (_W)"
+#: ../mail/mail-component.c:1596
+msgid "Errors"
+msgstr "त�र�टिया�"
 
-#. orange
-#: ../mail/mail-config.c:87
-msgid "_Personal"
-msgstr "निजी (_P)"
+#: ../mail/mail-component.c:1597
+msgid "Warnings and Errors"
+msgstr ""
 
-#. forest green
-#: ../mail/mail-config.c:88
-msgid "_To Do"
-msgstr "शेष कार�य (_T)"
+#: ../mail/mail-component.c:1598
+msgid "Debug"
+msgstr "दोषस�धार"
 
-#. blue
-#: ../mail/mail-config.c:89
-msgid "_Later"
-msgstr "बाद में (_L)"
+#: ../mail/mail-component.c:1598
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1725
+msgid "Debug Logs"
+msgstr ""
+
+#: ../mail/mail-component.c:1739
+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
+msgid "second(s)."
+msgstr ""
+
+#: ../mail/mail-component.c:1761
+msgid "Log Messages:"
+msgstr ""
+
+#: ../mail/mail-component.c:1802
+msgid "Log Level"
+msgstr ""
+
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+msgid "Time"
+msgstr "समय"
+
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "संदेश"
+
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "इस विंडो को बन�द करें"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "समर�थित प�रकारों के लिये जांचें "
 
-#: ../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
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL Evolution के निर�माण में समर�थित नहीं है</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../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>हस�ताक�षर (_n)</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>भाषा (_L)</b>"
 
-#: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>यह फिल�टर का ज�यादा भरोसेमंद लेकिन अपेक�षाकृत धीमा बनायेगा</small>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">खाता सूचना</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\"> सत�यापन प�रकार</span>"
-
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\"> सत�यापन</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">संदेश लिख रहा है</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">विन�यास</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\"> मूलभूत व�यवहार </span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">डाक मिटा��</span>"
 
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">प�रदर�शित डाक शीर�ष (_H)</span>"
-
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">निस�पंदन विकल�प</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">लेबल और रंग</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13061,26 +13937,26 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">संदेश प�राप�ति</span>"
 
 #: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\"> नयी डाक सूचना</span>"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">वैकल�पिक सूचना</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">विकल�प</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../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:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">प�रिंटेड फ़ॉन�ट�स</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\">आवश�यक सूचना</span>"
@@ -13101,62 +13977,62 @@ msgstr "<span weight=\"bold\">प�रेषित �वं ड�राफ�
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">सर�वर विन�यास</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "खाता प�रबंधन"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "नया हस�ताक�षर जोड़ें (_w)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "लिपि जोड़ें (_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "इस खाते का प�रयोग करते वक�त हमेशा बाहर जाने वाले संदेश को हस�ताक�षर करें (_w)"
 
-#: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "जब भी गोपन डाक भेजें स�वयं को गोपन करें (_f)"
-
 #: ../mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "इन�हें हमेशा कार�बन प�रति (cc) भेजें (_s):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "इन�हें हमेशा अंध कार�बन प�रति (bcc) भेजें (_b):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "गोपन के दौरान हमेशा मेरे कीरिंग की क�ंजी पर विश�वास करें (_t)"
 
-#: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "जब भी गोपन डाक भेजें म��े भी गोपन करें (_m)"
-
 #: ../mail/mail-config.glade.h:43
-msgid "Attach original message"
-msgstr "मूल संदेश संलग�न करें"
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
-msgstr "हंसम�ख बिंबों को स�वतः डालें (_s)"
+#: ../mail/mail-config.glade.h:44
+msgid "Always request rea_d receipt"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "बाल�टिक (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "बाल�टिक (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
-msgid "Beep w_hen new mail arrives"
-msgstr "नयी डाक आने पर बीप करें (_h)"
-
 #: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "अक�षर सम�च�चय (_h):"
@@ -13166,33 +14042,33 @@ msgid "Ch_eck for Supported Types "
 msgstr "समर�थित प�रकार के लिये जांचें (_e)"
 
 #: ../mail/mail-config.glade.h:51
-msgid "Check in_coming mail for junk"
-msgstr "जंक के लिये आने वाली डाक जांचें (_c)"
+msgid "Check cu_stom headers for junk"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "जब मैं लिखूं तो वर�तनी जांच करें (_t)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "आगत डाक संदेश में से जंक को जांचें"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "साफ़ करें (_a)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "साफ़ करें (_C)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "अश�द�ध शब�द के लिये रंग (_m):"
 
-#: ../mail/mail-config.glade.h:57
-msgid "Colors"
-msgstr "रंग"
-
 #: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "फोल�डर के पूर�ण विलोपन के वक�त स�वीकृति लें (_w)"
@@ -13221,126 +14097,165 @@ msgstr "मूलभूत (_f)"
 msgid "Default character e_ncoding:"
 msgstr "मूलभूत संप�रतीक �नकोडिंग (_n):"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "बाहर जाने वाले संदेश को ग�प�त करें (मूलभूत रूप से) (_E)"
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:70
-msgid "Do not quote original message"
-msgstr "मूल संदेश उद�धृत नहीं करें"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:71
-msgid "Done"
-msgstr "सम�पन�न"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:72
-msgid "Drafts _Folder:"
-msgstr "ड�राफ�ट फोल�डर (_F):"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:73
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "सक�रिय (_n)"
+msgid "Do not quote"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:74
+msgid "Done"
+msgstr "सम�पन�न"
+
+#: ../mail/mail-config.glade.h:75
+msgid "Drafts _Folder:"
+msgstr "ड�राफ�ट फोल�डर (_F):"
+
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "ई-मेल खाता"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "ई-मेल पता:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "निकास पर ट�रैश फोल�डर खाली करें (_x)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "गोपन प�रमाणपत�र (_p):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "बाहर जाने वाले संदेश को ग�प�त करें (मूलभूत रूप से) (_E)"
 
-#: ../mail/mail-config.glade.h:80
-msgid "Fi_xed width Font:"
-msgstr "निर�धीरित-चौड़ाई फंट (_x):"
-
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "निर�धीरित-चौड़ाई "
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "फंट ग�ण"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "_HTML में संदेश प�रारूप दें"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "पूरा नाम (_e):"
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr "HTML डाक"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr "�चटी�म�ल संदेश"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
-msgstr "शीर�ष"
+msgstr "पृष�ठ के ऊपर की टीका"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "इससे उद�धरण को उभारें (_q)"
 
-#: ../mail/mail-config.glade.h:89
-msgid "I_nclude remote tests"
-msgstr "दूरस�थ परीक�षण को शामिल करें (_n)"
-
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
-msgstr "इनलाइल"
+msgstr "इनलाइन"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "KB"
+msgstr "कि.बा."
+
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "लेबिलें"
+
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "भाषा तालिका"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "डाक विन�यास"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "डाक हैटर तालिका"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "डाकपेटी स�थान"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "संदेश लेखक"
 
-#: ../mail/mail-config.glade.h:101
+#: ../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:102
+#: ../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 "संगठन (_g):"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG क�ंजी ID (_K):"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr "जब नई डाक आ� तो ध�वनि फाइल चला�ं (_v)"
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:107
+#: ../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."
@@ -13348,7 +14263,7 @@ msgstr ""
 "कृपया नीचे स�थान में �क स�थान में इस खाता के लिये विवरणात�मक नाम डालें.\n"
 "इस नाम को प�रदर�शन उद�देश�य से सिर�फ दिखाया जायेगा."
 
-#: ../mail/mail-config.glade.h:109
+#: ../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."
@@ -13356,7 +14271,7 @@ msgstr ""
 "कृपया सूचना दें कि किस रूप में आप मेल भेजेंगे. अगर आफ निश�चित नहीं हैं, अपने सिस�टम प�रशासक या "
 "इंटर सर�विस प�रोवाइडर को पूछें."
 
-#: ../mail/mail-config.glade.h:110
+#: ../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 "
@@ -13365,121 +14280,121 @@ msgstr ""
 "कृपया अपना नाम व ईमेल पता नीचे डालें. नीचे \"वैकल�पिक\" क�षेत�र को भरे जाने की जरूरत नहीं "
 "है, जबतक कि आप सूचना को ईमेल में भेजे जाने के लिये नहीं च�नते हैं."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "कृपया निम�नलिखित विकल�पों में से च�नें"
 
-#: ../mail/mail-config.glade.h:112
+#: ../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 "सिर�फ परिभाषित Bcc प�राप�तकर�ता के साथ संदेश भेजने के दौरान प�रांप�ट करें (_o)"
 
-#: ../mail/mail-config.glade.h:113
-msgid "Quote original message"
-msgstr "मूल संदेश उद�धृत करें"
-
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "उद�धृत"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "शब�दकूट याद करें (_m)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "जबाव दें (_p)"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "शब�दकूट याद रखें (_p)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../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 "च�नें (_e)..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "संदेश प�राप�ति सूचना भेजें (_e):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "मानक फंट (t):"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Se_lect..."
-msgstr "च�नें (_l)..."
-
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "�चटी�म�ल के पूर�व निर�धारित चौड़ाई वाला फंट खोजें"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "प�रिन�ट करने के लि� �च टी �म �ल के पूर�व निर�धारित फंट खोजें"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "�चटी�म�ल का अनियत चौड़ाई वाला फंट खोजें"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "छा�टें �चटी�म�ल के अनियत चौड़ाई वाले फंट को प�रिन�टिंग के लि�"
 
-#: ../mail/mail-config.glade.h:128
-msgid "Select sound file"
-msgstr "ध�वनि फ़ाइल च�नें"
-
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "डाक भेज रहा है"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "संदेश फोल�डर भेजा गया (_M):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "सर�वर को सत�यापन की आवश�यकता है (_v)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "सर�वर प�रकार (_T): "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "हस�ताक�षर प�रमाणपत�र (_n)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "हस�ताक�षर (_u)"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "हस�ताक�षर"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "हस�ताक�षर तालिका"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Specify _filename:"
-msgstr "फाइलनाम निर�दिष�ट करें (_f)"
-
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
-msgstr "वर�तनी जांच"
+msgstr "वर�तनी की जांच "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "प�रकार (_y): "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "यहां भाषा की सूची सिर�फ उन भाषाओं को बताती है जिसके लिये आपमें शब�दकोश अधिष�ठापित है."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13489,7 +14404,7 @@ msgstr ""
 "प�रय�क�त किया जायेगा. आपके द�वारा निर�दिष�ट नाम \n"
 "को प�रदर�शन उद�देश�य से प�रयोग किया जायेगा. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13497,15 +14412,26 @@ msgstr ""
 "नाम टंकित करें जिससे आप इस खाता को संदर�भ करना चाहते हैं.\n"
 "उदाहरण के लिये: \"कार�य\" या \"निजी\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:156 ../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 "उपभोक�ता नाम (_n):"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "चर चौड़ाई (_a):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13515,88 +14441,124 @@ msgstr ""
 "\n"
 "श�रू करने के लि� \"Forward\" क�लिक करें. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "हस�ताक�षर जोड़ें (_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "हमेशा इंटरनेट से बिंब अधिभारित करें (_A)"
 
-#: ../mail/mail-config.glade.h:156
-msgid "_Do not notify me when new mail arrives"
-msgstr "हमें सूचित न करें जब नये मेल आते है (_D)."
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:164
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "बैठक आग�रह पर हस�ताक�षर मत करें (_D) (Outlook स�संगतता के लिये)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "अग�रसारित शैली (_F):"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Load images in mail from contacts"
-msgstr "संपर�क से डाक में बिंब लोड करें (_L)"
+#: ../mail/mail-config.glade.h:169
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
+msgid "_Load images in messages from contacts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "इसे मेरा मूलभूत खाता बना�ं (_M)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "इसके बाद संदेश को पठित के रूप में चिह�नित करें (_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "इंटरनेट से बिंबों को कभी नहीं अधिभारित करें (_N)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "पथ (_P):"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "तब प�रांप�ट करें जब HTML संदेश उसे भेजा जा रहा हो जो न चाहता है (_P)"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "तब प�रांप�ट करें जब रिक�त विषय रेखा के साथ संदेश जा रहा हो (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "जबाव शैली (_R):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "स�क�रिप�ट (_S):"
 
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:183
+msgid "_Select..."
+msgstr ""
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "बिंब सजीवन दिखा�ं (_S)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:187
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "प�रति / कॉपी / ग�प�त कॉपी इसमें सिकोड़ें (_S)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "स�रक�षित संबंधन का उपयोग करें (_U):"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "अन�य अन�प�रयोग की तरह समान फंट का प�रयोग करें (_U)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "पता"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "रंग"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "वर�णन"
 
@@ -13630,50 +14592,49 @@ msgstr "सभी स�थानीय फोल�डर"
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
-msgstr "स�थिति के प�रति संवेदनशील (_s)"
+msgstr "केस सेंसिटिव (_s)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "समाप�त (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "ढूंढे (_i):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "संदेश सें ढूंढें"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "फोलोअप के लिये पताका"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "फोल�डर सदस�यता"
 
-#: ../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 "कोई नहीं चयनित"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "सर�वर (_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
-msgstr "स�रक�षा सूचना"
+msgstr "स�रक�षा जानकारी"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "विशिष�ट फोल�डर"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../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."
@@ -13681,42 +14642,42 @@ msgstr ""
 "संदेश जिसे आपने फोलोअप के लिये च�ना है वो नीचे है.\n"
 "कृपया \"Flag\" मेनू से फोलोअप क�रिया च�नें."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "लाइसेंस स�वीकार करें (_A)"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "इस समय तक जरूरी (_D):"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ध�वज (_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "लाइसेंस मसौदे को स�वीकार करने के लि� यहां टिक करें (_T)"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "%s को पिंग कर रहा है"
 
 #: ../mail/mail-ops.c:105
-msgid "Filtering Folder"
-msgstr "फोल�डर निस�पंदित कर रहा है"
+msgid "Filtering Selected Messages"
+msgstr ""
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "डाक ला रहा है"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "आउटगोइंग फिल�टर चलाने में असफल: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13725,12 +14686,16 @@ msgstr ""
 "%s में जोड़ने में विफल: %s\n"
 "बदले में स�थानीय `प�रेषित' फोल�डर में जोड़ रहा है."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "स�थानीय `प�रेषित' फोल�डर में जोड़ने में विफल: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr ""
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d के %d संदेश को भेज रहा है"
@@ -13740,99 +14705,104 @@ msgstr "%d के %d संदेश को भेज रहा है"
 msgid "Failed to send %d of %d messages"
 msgstr "%d के %d संदेश भेजने में असफल"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
-msgstr "निरसित."
+msgstr "रद�द"
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "पूर�ण."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "फोल�डर में संदेश संग�रहित कर रहा है"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s में संदेश खिसका रहा है"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s में संदेश कापी कर रहा है"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "अग�रसारित संदेश"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s फोल�डर खोल रहा है"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "%s भंडार खोल रहा है"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s फोल�डर हटा रहा है"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' फोल�डर भंडारण कर रहा है"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' खाते को पूर�ण विलोपित तथा भंचारण कर रहा है"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' खाते का भंडारण कर रहा है"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "फोल�डर ताजा कर रहा है"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "फोल�डर पूर�ण विलोपित कर रहा है"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' में ट�रैश खाली कर रहा है"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
-msgstr "स�थानीय फोल�डर"
+msgstr "स�थानीय फ़ोल�डर"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s संदेश प�नःप�राप�त कर रहा है"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d संदेश प�नःप�राप�त कर रहा है"
 msgstr[1] "%d संदेश प�नःप�राप�त कर रहा है"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "%d संदेश संग�रहित कर रहा है"
-msgstr[1] "%d संदेश संग�रहित कर रहा है"
+msgid_plural "Saving %d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13841,11 +14811,11 @@ msgstr ""
 "संदेश संग�रहित करने में त�र�टि: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "संलग�नक संग�रहित कर रहा है"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13854,84 +14824,89 @@ msgstr ""
 "निर�गत फाइल बनाने में असमथ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "आंकड़ों को नहीं लिख सका: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s से संबंध तोड़ रहा है"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s से संबंध जोोड़ रहा है"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2413
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr ""
+
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "सेवा की जांच कर रहा है"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "रद�द कर रहा है..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "डाक भेजें और प�राप�त करें"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "सबको निरस�त करें (_A)"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "अद�यतन कर रहा है..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
-msgstr "प�रतीक�षारत है..."
+msgstr "प�रतीक�षारत है...  "
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:799
+#, c-format
 msgid "Checking for new mail"
 msgstr "नयी डाक के लिये जांच"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s के लिये शब�दकूट डालें"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "शब�दकूट डालें"
 
-#: ../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 "%s के लिये शब�दकूट दाखिल करें"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
-msgstr "शब�दकूट दाखिल करें"
+msgstr "कूटशब�द दाखिल करें"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "उपयोक�ता ने संक�रिया रद�द की"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "हस�ताक�षर संपादित करें"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr ""
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "इस हस�ताक�षर के लिये �क नाम दाखिल करें."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr ""
 
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "नाम:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr ""
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -13957,81 +14932,82 @@ msgstr "अग�रसारित संदेश"
 msgid "Invalid folder: `%s'"
 msgstr "अवैध फोल�डर: `%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "खोज फोल�डर जमा रहा है: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' के लिये खोज फोल�डरों का अद�यतनीकरण"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' के लिये खोज फोल�डरों का अद�यतनीकरण"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "खोज फोल�डर संपादित करें"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "नया खोज फोल�डर"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "&quot;{1}&quot; नाम से फोल�डर पहले से उपस�थित है. कृपया दूसरे नाम का उपयोग करें."
+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 &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."
 msgstr ""
-"&quot;{1}&quot; पर �क फोल�डर जो खाली नहीं है, पहले से ही उपस�थित है.\n"
-"\n"
-"आप इस फोल�डर को अनदेखा कर सकते हैं, सामग�री पर लिख और जोड़ सकते हैं, या छोड़ सकते हैं."
-
-#: ../mail/mail.error.xml.h:5
-msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
-msgstr "�क पठन रसीद सूचना &quot;{1}&quot; के लिये निवेदित है.  प�राप�ति सूचना {0} को दें?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "&quot;{1}&quot; नाम के साथ हस�ताक�षर पहले से उपस�थित है. कृपया दूसरे नाम का उपयोग करें."
+"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:8
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "क�या आप निश�चित हैं कि आप इस खाते और इसके सभी प�रॉक�सी को विलोपित करना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "क�या आप निश�चित हैं कि आप इस खाते को विलोपित करना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "क�या आप निश�चित हैं कि आप इस खाते और इसके सभी प�रॉक�सी को विलोपित करना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "क�या आप निश�चित हैं कि आप {0} संदेश �क साथ खोलना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14039,118 +15015,119 @@ msgstr ""
 "क�या आप निश�चित हैं कि आप सारे फोल�डर से सारे विलोपित संदेशों को स�थायी रूप से मिटाना चाहते "
 "हैं?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "इस फोल�डर &quot;{1}&quot; से सभी विलोपित संदेशों को स�थायी रूप से हटा�ं?"
+"folder \"{0}\"?"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "क�या आप निश�चित हैं कि आप HTML प�रारूप में संदेश भेजना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "क�या आप निश�चित हैं कि आप सिर�फ BCC के संदेश भेजना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "क�या आप निश�चित हैं कि आप बिना विषय के संदेश भेजना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:17
-msgid "Because &quot;{0}&quot;."
-msgstr "क�योंकि &quot;{0}&quot; "
-
-#: ../mail/mail.error.xml.h:19
-msgid "Because &quot;{2}&quot;."
-msgstr "क�योंकि &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:18
+msgid "Because \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "रिक�त हस�ताक�षर"
+msgid "Because \"{2}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:21
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "खोज फोल�डर &quot;{0}&quot; जोड़ नहीं सकता है."
+msgid "Blank Signature"
+msgstr "रिक�त हस�ताक�षर"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "फोल�डर &quot;{0}&quot; &quot;{1}&quot; में कापी नहीं कर सकता है."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "फोल�डर &quot;{0}&quot; बना नहीं सकता है"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create temporary save directory."
-msgstr "अस�थायी सहेजी निर�देशिका नहीं बना सकता"
+msgid "Cannot create folder \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:25
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "सहेजा गया निर�देशिका बना नहीं सकता क�योंकि &quot;{1}&quot; "
+msgid "Cannot create temporary save directory."
+msgstr "अस�थायी सहेजी निर�देशिका नहीं बना सकता"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "फोल�डर &quot;{0}&quot; मिटा नहीं सकता है"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; फोल�डर मिटा नहीं सकता है."
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "खोज फोल�डर &quot;{0}&quot; संपादित नहीं कर सकता है क�योंकि यह उपस�थित नहीं है."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "फोल�डर &quot;{0}&quot; को &quot;{1}&quot; में विस�थापित नहीं कर सकता है."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "&quot;{1}&quot;  को म�क�त श�रोत नहीं कर सकता है"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "श�रोत &quot;{2}&quot; को म�क�त नहीं कर सकता है"
+msgid "Cannot open source \"{1}\""
+msgstr ""
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "लक�ष�य &quot;{2}&quot; खोल नहीं सकता."
+msgid "Cannot open source \"{2}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:33
-msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+msgid "Cannot open target \"{2}\"."
 msgstr ""
-"अधिष�ठापन समस�या के कारण लाइसेंस फाइल &quot;{0}&quot; न पढ़ सका.  आप इस उपलब�धकर�ता "
-"का उपयोग न कर पायेंगे जबतक कि आप लाइसेंस स�वीकार न कर लें."
 
 #: ../mail/mail.error.xml.h:34
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; का &quot;{1}&quot; प�नर�नामकरण नहीं कर सकता."
+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 or move system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; सिस�टम फोल�डर का प�नर�नामकरण या हटा नहीं सकता."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot save changes to account."
-msgstr "खाता में बदलाव को संग�रहित नहीं कर सकता है."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:37
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; डायरेक�टरी में संग�रहित नहीं कर सकता है. "
+msgid "Cannot save changes to account."
+msgstr "खाता में बदलाव को संग�रहित नहीं कर सकता है."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; फाइल में संग�रहित नहीं कर सकता है."
+msgid "Cannot save to directory \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "हस�ताक�षर स�क�रिप�ट &quot;{0}&quot; नहीं सेट कर सकता."
+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."
@@ -14158,71 +15135,85 @@ msgstr ""
 "यह स�निश�चित करने के लिये जांचें कि आपके शब�दकूट की वर�तनी ठीक है.  याद रखें कि ज�यादातर "
 "शब�दकूट स�थितियों के प�रति संवेदनशील होते हैं; आपका कैप�स लॉक चालू हो सकता है."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "हस�ताक�षर फाइल सहेज नहीं सका."
 
-#: ../mail/mail.error.xml.h:42
-msgid "Delete &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot; मिटा�� ?"
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "खाता मिटा��?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../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 ""
+
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "बदलाव त�यागें?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:49
+msgid "Do not d_elete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "मत मिटायें"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "निष�क�रिय मत करें"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "क�या आप उपफोल�डर में संक�रिया करना चाहते हैं ?"
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "सभी संदेश पठित रूप में चिह�नित करना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "क�या आप आपने बदलाव को संग�रहित करना चाहते हैं?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "शब�दकूट दाखिल करें."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "फिल�टर परिभाषा के अधिभारण में त�र�टि"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "संक�रिया निष�पादन में त�र�टि"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "{0} के दौरान त�र�टि."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "फाइल मौजूद है लेकिन इसपर लिख नहीं सकता"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "फाइल मौजूद है लेकिन �क सामान�य फाइल नहीं है."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "अगर आप जारी रखते हैं, आप इन संदेश को प�राप�त करने में समर�थ न हो पायेंगे."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14230,11 +15221,11 @@ msgstr ""
 "अगर आप इस फोल�डर को विलोपित करते हैं, इसकी सभी अंतर�वस�त� और इसके उपफोल�डर की अंतर�वस�त� "
 "स�थायी रूप से विलोपित हो जायेगी."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "अगर आप बढ़ते हैं, सारे प�रॉक�सी खाता स�थायी रूप से मिटा दी जायेगी."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14242,29 +15233,29 @@ msgstr ""
 "अगर आप बढ़ते हैं तो खाता सूचना और\n"
 " सभी प�रॉक�सी सूचना स�थायी रूप से विल�प�त हो जायेगी."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "अगर आप बढ़ते हैं तो खाता सूचना स�थायी रूप से विल�प�त हो जायेगी."
 
-#: ../mail/mail.error.xml.h:62
+#: ../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:63
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
-msgstr "नजरअंदाज करें"
+msgstr "नज़रअंदाज़ करें"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "अवैध सत�यापन"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "डाक फिल�टर स�वतः अद�यतनीकृत ह�आ."
 
-#: ../mail/mail.error.xml.h:66
+#: ../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 "
@@ -14275,39 +15266,31 @@ msgstr ""
 "रखता है. यह हेडर, अगर जोड़ा गया, आपके संदेश के सारे प�राप�त कर�ता को सूची बद�ध करेगा. इससे "
 "बचने के लिये, आपको कम से कम �क प�रति: या सीसी: प�राप�तकर�ता को जोड़ना चाहिये."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "सभी संदेश पठित रूप में चिह�नित करें"
 
-#: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "सभी संदेश उपफोल�डर में पढ़े जा च�के के रूप में चिह�नित करे?"
-
-#: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "पठित रूप में चिह�नित करें (_R)"
-
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "ग�म फोल�डर."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "कोई श�रोत चयनित नहीं."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "�कसाथ कई संदेश खोलना ज�यादा लंबा समय ले सकता है."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "कृपया अपना खाता जमावट जांचें और फिर कोशिश करें."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "खाता सक�रिय करें या अन�य खाता के प�रयोग से भेजें."
 
-#: ../mail/mail.error.xml.h:76
+#: ../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."
@@ -14315,58 +15298,70 @@ msgstr ""
 "कृपया प�रति: क�षेत�र में वैध ईमेल पता भरें. आप आमेल पता को प�रति: बटन पर प�रविष�टि बॉक�स में "
 "क�लिक करके खोज सकते हैं."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
-"कृपया निश�चित करें कि ये प�राप�तकर�ता HTML ईमेल को पाने के इच�छ�क व समर�थ हैं कि नहीं:\n"
-"{0}\n"
-"किसीतरह भेजें?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "यह हस�ताक�षर पहचानने के लिये �क अद�वितीय नाम डालें."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
-msgstr "कृपया प�रतीक�षा करें"
+msgstr "कृपया इंतजार करें."
 
-#: ../mail/mail.error.xml.h:82
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; प�राने डाक फोल�डर में उत�प�रवासित करने में समस�या."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "सर�वर से पूछताछ"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "समर�थित सत�यापन यांत�रिकी के सूची के लिये सर�वर से पूछ रहा है"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "पठन रसीद निवेदित."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "फोल�डर &quot;{0}&quot; और इसके सभी उपफोल�डरों को वास�तव में विलोपित करना चाहते हैं?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:87
+#: ../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 "खोज फोल�डर स�वतः अद�यतनीकृत हो गया"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "प�रेषण रसीद"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "हस�ताक�षर पहले से मौजूद है"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "सिंक�रोनाइज़"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14374,7 +15369,7 @@ msgstr ""
 "�वोल�यूशन के ठीक से काम करने के लिये सिस�टम फोल�डर जरूरी है और प�नर�नामकरण, विस�थापन व "
 "विलोपन नहीं किया जा सकता है."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14389,39 +15384,29 @@ msgstr ""
 "रखता है. यह हेडर, अगर जोड़ा गया, आपके संदेश के सारे प�राप�त कर�ता को सूची बद�ध करेगा. इससे "
 "बचने के लिये, आपको कम से कम �क प�रति: या सीसी: प�राप�तकर�ता को जोड़ना चाहिये."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 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 ""
-"निम�नलिखित खोज फोल�डर(रों):\n"
-"{0}\n"
-"अब हटाया गया फोल�डर प�रय�क�त:\n"
-"    &quot;{1}&quot;\n"
-"और अद�यतन किया जा रहा है."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 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 ""
-"निम�नलिखित फिल�टर नियम (मों):\n"
-"{0}\n"
-"हटाया गया फोल�डर प�रय�क�त:\n"
-"    &quot;{1}&quot;\"\n"
-"और अद�यतन किया जा रहा है."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "स�क�रिप�ट फाइल निश�चित रहनी चाहिये और निष�पादनीय होनी चाहिये."
 
-#: ../mail/mail.error.xml.h:105
+#: ../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."
@@ -14429,17 +15414,17 @@ msgstr ""
 "इस फोल�डर को परोक�ष तौर पर जोड़ा गया है,\n"
 "खोज फोल�डर संपादक में जाकर प�रत�यक�ष रूप से जोड़ें, अगर जरूरी हो."
 
-#: ../mail/mail.error.xml.h:107
+#: ../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:108
+#: ../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:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14447,59 +15432,66 @@ msgstr ""
 "यह सर�वर इस प�रकार के सत�यापन का समर�थन नहीम करता है और सत�यापन को किसी प�रकार समर�थन "
 "नहीं करता."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "हस�ताक�षर बदला जा रहा है लेकिन संग�रहित नहीं किया गया है."
 
-#: ../mail/mail.error.xml.h:111
+#: ../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:112
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise सर�वर से ज�ड़ने में असमर�थ."
 
-#: ../mail/mail.error.xml.h:113
+#: ../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:114
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "मसौदा फाइल पढ़ने में त�र�टि"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "मूलभूत का उपयोग करें (_D)"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "मूलभूत ड�राफ�ट फोल�डर का प�रयोग करें?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../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 "सभी जरूरी सूचनाओं को आपने नहीं भरा है"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "आपने संदेश नहीं भेजा, क�या आप किसी तरह छोड़ना चाहेंगे?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "आप समान नाम के साथ दो खाता बना नहीं सकते."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "आप इस खोज फोल�डर को जरूर नाम दें."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "आप अवश�य �क फोल�डर निर�दिष�ठ करें."
 
-#: ../mail/mail.error.xml.h:122
+#: ../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 "
@@ -14509,101 +15501,112 @@ msgstr ""
 "या तो फोल�डर को निजी रूप से च�नते ह�ये, और/या सारे स�थानीय फोल�ड को च�नते ह�ये, सारे दूरस�थ "
 "फोल�डर , या दोनों."
 
-#: ../mail/mail.error.xml.h:124
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "&quot;{0}&quot; रूप में आपके सर�वर &quot;{0}&quot; से लागिन असफल."
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "जोड़ें (_A)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "बदलाव त�यागें (_D)"
 
-#: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "पठित रूप में चिह�नित मत करें (_k)"
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "पूर�ण विलोपित करें (_E)"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "संदेश खोलें (_O)"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "अपठित"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "पठित"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "उत�तरित"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "आगे भेजा गया"
+
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "बह� अपठित संदेश"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "बह� संदेश"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1061
 msgid "Lowest"
-msgstr "निम�नतम"
+msgstr "न�यूनतम"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1062
 msgid "Lower"
-msgstr "निम�नतर"
+msgstr "निचला"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "उच�चतर"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1067
 msgid "Highest"
-msgstr "सर�वोच�च"
+msgstr "उच�चतम"
 
-#: ../mail/message-list.c:1466 ../widgets/table/e-cell-date.c:57
+#: ../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:1473 ../plugins/itip-formatter/itip-view.c:202
-#: ../widgets/table/e-cell-date.c:72
+#: ../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 "आज %l:%M %p"
 
-#: ../mail/message-list.c:1482 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "कल %l:%M %p"
 
-#: ../mail/message-list.c:1494 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1502 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1504 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2259 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "संदेश"
-
-#: ../mail/message-list.c:3647
+#. 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
 msgid "Generating message list"
 msgstr "संदेश सूची उत�पन�न कर रहा है"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr ""
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "इस समय तक मांगा गया"
@@ -14620,52 +15623,52 @@ msgstr "फ�लैग किया ह�आ"
 msgid "Follow Up Flag"
 msgstr "फोलो-अप फ�लैग"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "हस�तगत"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr "प�रेषित संदेश"
+msgstr "प�रेषित सन�देश"
 
-#: ../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 "आकार"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "कॉल"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "अग�रसारित नहीं करें"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "फोलो-अप"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "आपके सूचनार�थ"
 
-#: ../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 "अग�रसारित"
+msgstr "आगे"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "कोई अन�क�रिया आवश�यक नहीं"
 
-#: ../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 "जवाब"
 
-#: ../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 "सबको जवाब"
+msgstr "सब को जवाब भेजें"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "समीक�षा"
 
@@ -14690,6 +15693,10 @@ msgid "Subject contains"
 msgstr "विषय में यह समाहित है"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "विषय या प�रेषक में यह समाहित है"
 
@@ -14701,6 +15708,48 @@ msgstr "स�थानीय पता प�स�तिका"
 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:474
+#: ../plugins/templates/templates.c:394
+msgid "Keywords"
+msgstr "की-वर�डस"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 "
@@ -14711,38 +15760,146 @@ msgstr "à¤�क फॉरमेटर पà¥�लगिन जो ऑडियो à
 msgid "Audio inline plugin"
 msgstr "ऑडियो इनलाइन प�लगिन"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
-msgstr "�वोल�यूशन लेखागार का नाम च�नें"
+#: ../plugins/backup-restore/backup-restore.c:127
+msgid "Select name of the Evolution backup file"
+msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "बैकअप के बाद �वोल�यूशन फिर श�रू करें (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr "प�नर�भंडारण के लिये �वोल�यूशन च�नें"
+#: ../plugins/backup-restore/backup-restore.c:179
+msgid "Select name of the Evolution backup file to restore"
+msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "प�नर�भंडारण के लिये �वोल�यूशन फिर श�रू करें (_R)"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:276
+msgid "Restore from backup"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/backup-restore/backup-restore.c:291
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:294
+msgid "Choose a file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "बैकअप �वोल�यूशन निर�देशिका"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "�वोल�यूशन निर�देशिका प�नर�भंडारित करें"
 
-#: ../plugins/backup-restore/backup.c:113
-msgid "Check Evolution archive"
-msgstr "�वोल�यूशन अभिलेख जांचें"
+#: ../plugins/backup-restore/backup.c:70
+msgid "Check Evolution Backup"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "�वोल�यूशन फिर आरंभ नहीं कर सकता"
 
+#: ../plugins/backup-restore/backup.c:74
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
+msgid "Shutting down Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:132
+msgid "Backing Evolution accounts and settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
+msgid "Restarting Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:262
+msgid "Backup current Evolution data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:267
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:274
+msgid "Loading Evolution settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:278
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/backup-restore/backup.c:460
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr ""
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:479
+msgid "Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:479
+msgid "Evolution Restore"
+msgstr ""
+
+#: ../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 "बैकअप और �वोल�यूशन डाटा और जमावट के लिये प�लगिन"
@@ -14752,71 +15909,172 @@ msgstr "बैकअप और à¤�वोलà¥�यूशन डाटा और à
 msgid "Backup and restore plugin"
 msgstr "बैकअप और प�नर�भंडारण प�लगिन"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "बैकअप जमावट ..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../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 ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Please select a valid backup file to restore."
+msgstr ""
+
+#: ../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 "�वोल�यूशन डाटा व जमावट का बैकअप लें व फिर भंडारित करें"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "जमावट फिर लगायें..."
+msgid "_Backup Settings..."
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "स�वचालित संपर�क"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
-msgid "_Automatically create entries in the addressbook when responding to mail"
-msgstr "पता प�स�तिका में स�वतः प�रविष�टि का बनाता है जब मेल को अन�क�रिया किया जा रहा होता है (_A)"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "स�वचालित संपर�क के लिये पता प�स�तिका च�नें"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "तत�काल संदेश संपर�क"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
-msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "कालिक रूप से संपर�क सूचना व बिंब को त�ल�यकालित करता है मेरे गेम बडी सूची से."
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
-msgstr "गेम बडी सूची के लिये पता प�स�तिका च�नें"
+#: ../plugins/bbdb/bbdb.c:609
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "मित�रसूची से त�ल�यकालित करें (_b)"
 
 #: ../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 ""
-"स�वचालित रूप से नाम व ईमेल पता के साथ आपके पता प�स�तिका को भरता है जैसे ही आप मेल का "
-"जबाब देते हैं. साथ ही IM संपर�क सूचना में आपके मित�र सूची से भरता है."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#. 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
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+msgid "Convert message text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr ""
+
+#: ../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:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/calendar-http/calendar-http.c:126
+msgid "_URL:"
+msgstr "यूआर�ल: (_U) "
+
+#: ../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 "SSL का प�रयोग करें (_S)"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr ""
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "स�थानीय कैलेंडर"
@@ -14825,10 +16083,21 @@ msgstr "स�थानीय कैलेंडर"
 msgid "Provides core functionality for local calendars."
 msgstr "स�थानीय कैलेंडर के लिये केंद�रीय कार�यशीलता दें."
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../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 "स�रक�षित संबंधन (_S)"
 
+#: ../plugins/calendar-http/calendar-http.c:397
+msgid "Userna_me:"
+msgstr ""
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP कैलेंडर"
@@ -14870,15 +16139,15 @@ msgstr "मौसम: थंडरस�टार�म"
 msgid "Select a location"
 msgstr "�क स�थान च�नें"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "इकाई (_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "मेट�रिक (सेल�सियस, सेमी, आदि)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "इंपीरियल (फॉरेनहाइट, इंच, आदि)"
 
@@ -14902,11 +16171,11 @@ msgstr ""
 msgid "Copy tool"
 msgstr "कॉपी उपकरण"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "जांचे कि क�या �वोल�यूशन मूलभूत मेलर है"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../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 "हर बार जब �वोल�यूशन श�रू होता है जांचे कि क�या �वोल�यूशन मूलभूत मेलर है"
 
@@ -14922,10 +16191,26 @@ msgstr "मूलभूत डाक क�लाइंट"
 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:585
+msgid "Evolution"
+msgstr "�वॉल�यूशन"
+
 #: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
-msgid "Mark as _default folder"
-msgstr "मूलभूत फोल�डर के रूप में चिह�नित करें (_d)"
+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"
@@ -14933,9 +16218,53 @@ msgstr "मूलभूत श�रोत"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionallity for marking a calendar or addressbook as the default "
-"one."
-msgstr "मूलभूत रूप में कैलेंडर या पताप�स�तिका चिह�नित करने के लिये कार�यशीलता देता है."
+"Provides functionality for marking a calendar or an address book as the "
+"default one."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "क�ंजी"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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"
@@ -14943,7 +16272,7 @@ msgstr "अन�य उपयोक�ता फ़ोल�डर खोले
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
-msgstr "खाता (_A):"
+msgstr "खाता: (_A)"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
@@ -14951,35 +16280,35 @@ msgstr "फ़ोल�डर नाम (_F):"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
 msgid "_User:"
-msgstr "उपयोगकर�ताः"
+msgstr "प�रयोक�ता (_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "स�रक�षित शब�दकूट"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "Kerberos 4 सत�यापन के उपयोग से यह विकल�प सर�वर से जोड़ेगा."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "सादापाठ शब�दकूट"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "प�लेनपाठ शब�दकूट सत�यापन के उपयोग से यह विकल�प विनिमय सर�वर से जोड़ेगा."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "कार�यालय के बाहर"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -14987,72 +16316,88 @@ msgstr ""
 "नीचे निर�दिष�ट संदेश उन सभी लोगों को स�वतः भेज दिया जायेगा जिसने \n"
 "आपको कार�यालय से बाहर रहने के दौरान डाक भेजा है."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "मैं अभी कार�यालय से बाहर हू�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "मैं अभी कार�यालय में हू�"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "लेनदेन खाते के लिये शब�दकूट डालें"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
-msgstr "शब�दकूट बदलें"
+msgstr "पासवर�ड बदलें"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "लेनदेन खाता के लिये डेलिगेट जमावट प�रबंधित करें"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
-msgstr "डेलिगेशन सहायक"
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
+msgid "Delegation Assistant"
+msgstr ""
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "विविध"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "सभी लेनदेन फोल�डरों का आकार देखें"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "फोल�डर आकार"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "लेनदेन जमावट"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "सत�यापन (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "सत�यापन प�रकार"
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+msgid "_Authentication Type"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "समर�थित प�रकार के लिये जांचें (_e)"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
+msgid "0 KB"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-calendar.c:192
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15063,13 +16408,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 "दो शब�दकूट नहीं मेल खाता. कृपया शब�दकूट फिर डालें."
 
@@ -15089,77 +16434,120 @@ msgstr "नया शब�दकूट"
 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 "आपका शब�दकूट का अगले %d दिनों में खत�म हो गया."
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1572
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "मनपसंद"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../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.glade.h:1
+msgid "Author (read, create)"
+msgstr "लेखक (पढे, बनायें)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../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.glade.h:6
 msgid "Delegate Permissions"
 msgstr "डेलिगेट अन�मतिया�"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s के लिये अन�मति"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#. 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
+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:346
+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
+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
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "को दिया गया"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr " %s डेलिगेट हटायें? "
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "सक�रिय डिरेक�ट�री नहीं अभिगम कर सकता"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "सक�रिय डिरेक�ट�री में स�वयं को पा नहीं सकता"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "%s डेलिगेट को सक�रिय निर�देशिका में नहीं पा सकता"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "%s डेलिगेट हटा नहीं सकता"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "डेलिगेट की सूची अद�यतन नहीं कर सकता."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "डेलिगेट %s जोड़ नहीं सका"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "डेलिगेट सूची पढने में त�र�टि"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "लेखक (पढे, बनायें)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
-msgstr "तिथिपत�री: (_a)"
+msgstr "कैलेंडर: (_a)"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
@@ -15170,18 +16558,10 @@ msgstr "संपर�क (_n): "
 msgid "Delegates"
 msgstr "डेलिगेट"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "संपादक (पढे, बनायें, संपादक)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "इसके लिये अन�मतिया�"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "समीक�षक (सिर�फ पढने के लिये)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15199,25 +16579,34 @@ msgstr "डेलिगेट निजी मद देख सकता है
 msgid "_Inbox:"
 msgstr "इनबॉक�स (_I)"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr ""
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "कार�य (_T)"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "अन�मति..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "फ़ोल�डर नाम"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "फोल�डर आकार"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. 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 "अन�य उपयोक�ता फोल�डर की सदस�यता लें"
@@ -15226,24 +16615,71 @@ msgstr "अनà¥�य उपयोकà¥�ता फोलà¥�डर की सदà¤
 msgid "Exchange Folder Tree"
 msgstr "फोल�डर तरू बदलें"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../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 "फोल�डरों की सदस�यता अस�वीकार करें ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" से वास�तव में सदस�यता वापस लेना चाहते हैं?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%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 ""
+"<b>अभी आपकी अवस�थिति \"कार�यालय से बाहर\" है. </b>\n"
+"\n"
+"क�या आप अपनी अवस�थिति को \"कार�यालय में\" के रूप में परिवर�तित करना चाहेंगे? "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>कार�यालय से बाहर संदेश:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b> स�तर:</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 ""
+"<small>नीचे निर�दिष�ट संदेश उन सभी लोगों को स�वतः भेज दिया जायेगा जिसने \n"
+"आपको कार�यालय से बाहर रहने के दौरान डाक भेजा है.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "मैं अभी कार�यालय में हू�"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "मैं अभी कार�यालय से बाहर हू�"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "नहीं, स�थिति नहीं बदलें"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "कार�यालय के बाहर का सहायक"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "नहीं, स�थिति बदलें"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "शब�दकूट समयसामप�ति चेतावनी..."
@@ -15256,21 +16692,20 @@ msgstr "आपका शब�दकूट 7 दिन में समाप�
 msgid "_Change Password"
 msgstr "शब�दकूट बदलें (_C)"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
-msgid "ok_button"
-msgstr "ठीक बटन (_b)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(अन�मति निषेधित.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "उपयोक�ता जोड़ें :"
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
-msgstr "उपयोक�ता जोड़ें"
+msgstr "प�रयोक�ता जोड़ें"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 msgid "<b>Permissions</b>"
@@ -15328,15 +16763,62 @@ msgstr "मद पढ़ें"
 msgid "Role: "
 msgstr "भूमिका: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "नहीं, स�थिति नहीं बदलें"
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "प�रयोक�ता (_U)"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
-msgstr "उपयोक�ता च�नें"
+msgstr "प�रयोक�ता को च�नि�"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "पता-प�स�तिका..."
 
@@ -15350,9 +16832,9 @@ msgstr "अनà¥�य उपयोकà¥�ता कैलेंडर की सà¤
 
 #: ../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 "�क प�लगिन जो कि विनिमय खाता विशिष�ट संक�रिया व ग�ण के संग�रह का नियंत�रण करता है."
+msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15441,10 +16923,14 @@ msgid "Could not update out-of-office state"
 msgstr "कार�यालय से बाहर स�थिति नहीं अद�यतन कर सका"
 
 #: ../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 "लेनदेन खाता ऑफलाइन है"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -15472,98 +16958,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "डेलिगेट अद�यतन में विफल:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "फोल�डर पहले ले उपस�थित है"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "फोल�डर उपस�थित नहीं है"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "फोल�डर ऑफलाइन"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
-msgstr "ज़ेनेरिक त�र�टि"
+msgstr "जेनेरिक त�र�टि"
 
-#: ../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 "अगर OWA �क अलग पथ पर चल रहा है, आप निश�चित रूप से खाता विन�यास संवाद में बतायें."
 
-#: ../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 "{0} के लिये डाकपेटी इस सर�वर पर नहीं है."
 
-#: ../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 "निश�चित करें कि URL ठीक है और फिर कोशिश करें."
 
-#: ../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 "उपयोक�ता {0} का {1} पर कोई डाकपेटी नहीं."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "वैसा कोई {0} उपयोक�ता नहीं"
 
-#: ../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:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "कृपया स�निश�चित करें कि ग�लोबल कैटालॉग सर�वर नाम सही है."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "�वोल�यूशन को फिर बदलाव के लागू होने के लिये फिर आरंभ करें"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "कृपया �क उपयोक�ता च�नें."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../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:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../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."
@@ -15571,7 +17061,7 @@ msgstr ""
 "सर�वर �क�सेंज 5.5 चला रहा है. �क�सेंच संबंधक \n"
 "सिर�फ Microsoft Exchange 2000 औऱ 2003 को समर�थन करता है."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../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"
@@ -15585,63 +17075,70 @@ msgstr ""
 "\n"
 "या संभव है कि आपने शब�दकूट गलत लिखा हो."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../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:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "पह�ंच नियंत�रण सूची में उपयोक�ता जोड़ने में असमर�थ :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "डेलिगेट संपादन में विफल."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "{0} के लिये देखने वाला अज�ञात त�र�टि"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "अज�ञात त�र�टि."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "अज�ञात प�रकार"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "असमर�थित संक�रिया"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../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:72
+#: ../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 "आप स�वयं को नहीं दे सकते हैं"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../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:74
+#: ../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:75
+#: ../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 "आपका मौजूदा प�रयोग है : {0}KB. क�छ मेल मिटाकर स�थान खाली करने की कोशिश करें."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../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 "आपका मौजूदा प�रयोग है : {0}KB. आप अब मेल भेजने व पाने में समर�थ न हो पायेंगे."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../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."
@@ -15649,19 +17146,19 @@ msgstr ""
 "आपका मौजूदा प�रयोग है : {0}KB. आप तबतक मेल न भेज पायेंगे जबतक कि क�छ मेल मिटाकर स�थान "
 "खाली करने की कोशिश करें."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../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:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} को पह�ंच नियंत�रण सूचा में जोड़ नहीं सकता"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} पहले से �क डेलिगेट है"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} पहले से सूची में है"
 
@@ -15673,7 +17170,87 @@ msgstr "अनà¥�य उपयोकà¥�ता कारà¥�य की सदसà¥
 msgid "Check folder permissions"
 msgstr "फोल�डर अन�मति जांचें"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../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 "बाहरी संपादक"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/face/face.c:69
+msgid "PNG files"
+msgstr "पी�नजी फ़ाइलें"
+
+#: ../plugins/face/face.c:126
+msgid "_Face"
+msgstr ""
+
+#: ../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/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\""
 msgstr "\"%s\" फोल�डर से सदस�यता वापस ले रहा है"
@@ -15690,23 +17267,96 @@ msgstr "फोलà¥�डरों से सदसà¥�यता वापस लà¥
 msgid "_Unsubscribe"
 msgstr "सदस�यता वापस लें (_U)"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../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 "गूगल"
+
+#: ../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
+msgid "A plugin to setup google calendar and contacts."
+msgstr ""
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 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 ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
 msgstr "ग�रूपवाइज खाता सेटअप"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/install-shared.c:219
+#, 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:224
+msgid "Install the shared folder"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:226
+msgid "Shared Folder Installation"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "जंक जमावट"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>जंक मेल सेटिंग</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "जंक मेल जमावट"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "जंक मेल सेटिंग..."
 
@@ -15718,14 +17368,10 @@ msgstr "<b>जंक सूची:</b>"
 msgid "Email:"
 msgstr "ईमेलः"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "जंक मेल जमावट"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
-msgstr "असमर�थ करें (_D)"
+msgstr "निष�क�रिय करें (_D)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
 msgid "_Enable"
@@ -15736,10 +17382,20 @@ msgid "_Junk List"
 msgstr "जंक सूची (_J)"
 
 #: ../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 "संदेश सफलतापूर�वक वापस किया गया"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "डाक ला रहा है"
 
@@ -15747,12 +17403,6 @@ msgstr "डाक ला रहा है"
 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"
-msgstr "विकल�प भेजें"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "ग�रूपवाइज खाता में फीचर के लिये प�लगिन"
@@ -15761,7 +17411,72 @@ msgstr "गà¥�रूपवाइज खाता में फीचर के à
 msgid "Groupwise Features"
 msgstr "ग�रूपवाइज फीचर"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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 ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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 ""
+
+#: ../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 ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "औपबंधिक स�वीकारें"
 
@@ -15769,34 +17484,34 @@ msgstr "औपबंधिक स�वीकारें"
 msgid "<b>Users:</b>"
 msgstr "<b>उपयोक�ता:</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr ""
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Con_tacts..."
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "संदेश"
 
-#: ../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 "सहभागी निम�न सूचना पायेंगे.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "संपर�क (_C)..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "अधिसूचना संदेश मनपसंद बनायें (_C)"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "सा�ाकृत नहीं (_N)"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With ..."
-msgstr "इसके साथ सा�ा (_S) ..."
+msgid "_Shared With..."
+msgstr ""
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -15808,7 +17523,7 @@ msgstr "<b> नाम</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
-msgstr "पह�ंच अधिकार"
+msgstr "पह��च अधिकार"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 msgid "Add/Edit"
@@ -15839,14 +17554,14 @@ msgid "Subscribe to my _notifications"
 msgstr "मेरी सूचना की सदस�यता लें (_n)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "पढ़ें (_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "लिखें (_W)"
 
+#. 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 ""
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "प�रॉक�सी"
@@ -15859,9 +17574,9 @@ msgstr "<b>खाता नाम</b>"
 msgid "Proxy Login"
 msgstr "प�रॉक�सी लॉगिन"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15870,35 +17585,97 @@ 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:517
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "प�रॉक�सी लॉगिन (_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "प�रॉक�सी टैब के खाता ऑनलाइन रहने पर उपलब�ध होगा."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:696
 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-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
-msgstr "उपयोक�ता"
+msgstr "प�रयोक�ता"
 
-#: ../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 "नया सा�ाकृत फोल�डर (_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
-msgstr "सा�ा कर रहा है"
+msgstr "सा�ेदारी"
+
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder.c:755
+msgid "Add   "
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder.c:761
+msgid "Modify"
+msgstr "स�धारें"
+
+#: ../plugins/groupwise-features/status-track.c:105
+msgid "Message Status"
+msgstr "संदेश स�थिति"
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "विषय:"
+
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "सेः"
+
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:187
+msgid "Recipient: "
+msgstr ""
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:194
+msgid "Delivered: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:200
+msgid "Opened: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:205
+msgid "Accepted: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:210
+msgid "Deleted: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:215
+msgid "Declined: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:220
+msgid "Completed: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "संदेश स�थिति ट�रैक करें..."
 
@@ -15910,39 +17687,119 @@ msgstr "हà¥�ला कैलेंडर शà¥�रोत सेट करनà¥
 msgid "Hula Account Setup"
 msgstr "ह�ला खाता सेटअप"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/imap-features/imap-headers.c:320
+msgid "Custom Headers"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.c:333
+msgid "IMAP Headers"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers</b>"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid "Fetch A_ll Headers"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "कैलेंडर में आयात करें (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "कार�य में आयात करें (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:198
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "आयात ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:226
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "कार�य सूची च�नें"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:230
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "कैलेंडर च�नें"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "आयात करें (_I)"
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+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
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+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:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "आईकैलेंडर प�रारूप (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "चयनित कार�य/कैलेंडर/पता प�स�तिका को 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
 msgid "Synchronize to iPod"
@@ -15952,152 +17809,142 @@ msgstr "iPod से त�ल�यकालित करें"
 msgid "iPod Synchronization"
 msgstr "iPod त�ल�यकालन"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "कोई आउटप�ट निर�देशिका नहीं!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"iPod पर आउटप�ट निर�देशिका नहीं मिल पाया! कृपया स�निश�चित करें कि iPod को ठीक से सेट "
-"किया गया है या फिर कोशिश करें."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "आंकड़ों को निर�यात नहीं कर सका!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "आंकड़ा निर�यात विफल."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "पताप�स�तिका खोल नहीं कर सका!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "�वोल�यूशन पता प�स�तिका आंकड़ा निर�यात के लिये खोल नहीं सका."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "कैलेंडर/शेष कार�य खोल नहीं सका!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "�वोल�यूशन कैलेंडर/कार�यक�रम सूची को आंकड़ा निर�यात करने के लिये नहीं खोल सका."
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' कैलेंडर को लोड करने में विफल."
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "कैलेंडर '%s' में इस बैठक के साथ म�लाकात में विरोध"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' कैलेंडर में म�लाकात मिली."
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "किसी कैलेंडर को पाने में विफल"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "किसी कैलेंडर इस बैठक को पाने में असमर�थ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "किसी कार�य सूची को इस कार�य में पाने में असमर�थ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "किसी जर�नल में इस जर�नल प�रविष�टि पाने में असमर�थ"
+#: ../plugins/itip-formatter/itip-formatter.c:705
+msgid "Unable to find this memo in any memo list"
+msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "इस म�लाकात के मौजूदा संस�करण के लिये खोज कर रहा है"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "मद विश�लेषण में अक�षम"
 
-#: ../plugins/itip-formatter/itip-formatter.c:857
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' में मद भेजने में असमर�थ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' कैलेंडर को प�रेषित स�वीकृत ह�आ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:872
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "अस�थायी रूप से '%s' कैलेंडर में प�रेषित"
 
-#: ../plugins/itip-formatter/itip-formatter.c:877
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "मनाही रूप से '%s' कैलेंडर में प�रेषित"
 
-#: ../plugins/itip-formatter/itip-formatter.c:882
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "रद�द रूप से '%s' कैलेंडर में प�रेषित"
 
-#: ../plugins/itip-formatter/itip-formatter.c:975
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "संगठक ने %s डेलिगेट को हल कर लिया "
 
-#: ../plugins/itip-formatter/itip-formatter.c:982
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "प�रतिनिधि को रद�द सूचना प�रेषित"
 
-#: ../plugins/itip-formatter/itip-formatter.c:984
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "प�रतिनिधि को रद�द सूचना नहीं भेज सका"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1069
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "श�रोता स�थिति अद�यतन नहीं हो सकती क�योंकि स�थिति अमान�य है"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "उपस�थित के अद�यतन में असमर�थ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "उपस�तिति प�रस�थति अद�यतन"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1275
+msgid "Meeting information sent"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+msgid "Task information sent"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1281
+msgid "Memo information sent"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1290
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1293
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1296
+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
 msgid "The calendar attached is not valid"
 msgstr "संलग�न कैलेंडर मान�य नहीं है"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1228
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "संदेश �क कैलेंडर रखने का दावा करता है, लेकिन कैलेंडर �क मान�य iCalendar नहीं है."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
-#: ../plugins/itip-formatter/itip-formatter.c:1281
-#: ../plugins/itip-formatter/itip-formatter.c:1359
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "कैलेंडर का मद मान�य नहीं है"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
-#: ../plugins/itip-formatter/itip-formatter.c:1282
-#: ../plugins/itip-formatter/itip-formatter.c:1360
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16105,430 +17952,498 @@ msgstr ""
 "यह संदेश �क कैलेंडर धारण करता है, लेकिन कैलेंडर में कोई घटना नहीं है, कार�य या म�क�त/व�यस�त "
 "सूचना."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "संलग�न कैलेंडर में कई मद समाहित हैं"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "इन सभी मदों की प�रक�रिया के लिये फाइल सहेजना चाहिये और कैलेंडर आयातित करना चाहिये"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2148
+msgid "This meeting recurs"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2151
+msgid "This task recurs"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2154
+msgid "This memo recurs"
+msgstr ""
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "कार�य के बाद संदेश मिटायें (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2077
-#: ../plugins/itip-formatter/itip-formatter.c:2109
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "विरोधी खोज"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "बैठक विरोध के लिये ढ़ूंढ़ने के लिये कैलेंडर च�नें"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "आज"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "आज %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "आज %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "आज %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "कल"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "कल %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "कल %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "कल %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "कल %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../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:258
+#: ../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:262
+#: ../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:267
+#: ../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:271
+#: ../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:280
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../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:348
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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> %s से होकर ने निम�न बैठक सूचना प�रकाशित की है:"
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ने निम�न बैठक सूचना प�रकाशित किया है."
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ने आपको निम�न बैठक डेलिगेट किया है."
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> %s से होकर निम�न बैठक में आपकी उपस�थिति का आग�रह करता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> �क बैठक में आपकी उपस�थिति के लि� आग�रह करता है."
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> %s के द�वारा �क मौजूदा बैठक में जोड़ना चाहता है."
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> �क मौजूदा बैठक में जोड़ना चाहता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c: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 "<b>%s</b> निम�न बैठक के लिये अद�यतन कार�य सूचना पाना चाहता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ने निम�न बैठक  संदेश भेजा है."
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> %s के द�वारा निम�न बैठक रद�द कर दिया है:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ने निम�न बैठक रद�द कर दिया है."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:398
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ने बैठक बदलाव को प�रस�तावित किया गया है."
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> %s ने निम�न बदलाव बैठक के आग�रह के लि� मना कर दिया है."
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ने बैठक के आग�रह के लि� जबाव दिया है."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> %s के द�वारा कार�य प�रकाशित की है."
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> निम�न कार�य प�रकाशित की है."
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> %s के कार�यभार का आग�रह निम�न कार�य में करता है."
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ने %s के द�वारा कार�य को आपको सौंपा है."
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ने आपको �क कार�य नियत किया है."
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> %s से होकर मौजूदा कार�य में जोड़ना चाहता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> मौजूदा कार�य में जोड़ना चाहता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c: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 "<b>%s</b> निम�न दिये गये कार�य के लिये अद�यतन सूचना पाना चाहता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../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> ने निम�न नियत कार�य अन�क�रिया को फिर वापस भेजा है:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../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> %s के द�वारा ने निम�न नियत कार�य को रद�द कर दिया है."
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ने निम�न नियत कार�य को रद�द कर दिया है:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c: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> ने निम�न कार�य भार बदलाव का प�रस�ताव रखा है:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../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> %s से होकर ने निम�न कार�य के लिये मना किया:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ने कार�य भार को मना कर दिया है."
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> %s के द�वारा निम�नलिखित मेमो प�रकाशित की है."
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> निम�न मेमो प�रकाशित की है."
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> %s के द�वारा �क मौजूदा मेमो में जोड़ना चाहता है."
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> �क मौजूदा मेमो में जोड़ना चाहता है:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ने %s के द�वारा निम�न सा�ा मेमो रद�द कर दिया है:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ने निम�न सा�ा मेमो रद�द कर दिया है:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "कैलेंडर खोलें (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c: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 "मनाही (_D)"
+msgstr "मना करें (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c: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 "स�वीकारें (_A)"
+msgstr "स�वीकृत (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "सबको मना करें (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "सभी अंतरिम (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c: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 "अंतरिम (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "सबको स�वीकारें (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "सूचना भेजें (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "उपस�थित प�रस�थिति अद�यतन करें (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "अद�यतन करें (_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "प�रारंभ समय:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "अंत�य समय:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "टिप�पणीः"
 
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
-msgstr "श�रोता को अद�यतन भेजें (_p)"
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
+msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "A_pply to all instances"
-msgstr "सभी दृष�टांत में लागू करें (_p)"
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "कार�य (_T) :"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "मेमो :"
 
@@ -16568,33 +18483,157 @@ msgstr "खाताओं के निषà¥�कà¥�रियकरण की à¤
 msgid "Disable Account"
 msgstr "खाता निष�क�रिय करें"
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: ../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
+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 ""
+
+#: ../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 ""
+
+#: ../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:254
+msgid "Generate a _D-Bus message"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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
 #, c-format
-msgid "System error: %s"
-msgstr "सिस�टम त�र�टि: %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] ""
 
-#: ../plugins/mail-remote/client.c:32
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
-msgid "Camel error: %s"
-msgstr "कैमल त�र�टि: %s"
+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:479
+#: ../plugins/mail-notification/mail-notification.c:484
+msgid "New email"
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "खाता ईमेल नहीं भेज सकता है"
+#: ../plugins/mail-notification/mail-notification.c:541
+msgid "Show icon in _notification area"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:544
+msgid "B_link icon in notification area"
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "कोई भंडार उपलब�ध नहीं है."
+#: ../plugins/mail-notification/mail-notification.c:546
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:727
+msgid "_Play sound when new messages arrive"
+msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+#: ../plugins/mail-notification/mail-notification.c:733
+msgid "_Beep"
 msgstr ""
-"�क प�लगिन जो �क CORBA अंतरफलक को लाग� करता है डाक आंकड़ा को दूरस�थ रूप से अभिगम करने के "
-"लिये."
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "डाक दूरस�थ"
+#: ../plugins/mail-notification/mail-notification.c:734
+msgid "Play _sound file"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:745
+msgid "Specify _filename:"
+msgstr "फाइलनाम निर�दिष�ट करें (_f)"
+
+#: ../plugins/mail-notification/mail-notification.c:746
+msgid "Select sound file"
+msgstr "ध�वनि फ़ाइल च�नें"
+
+#: ../plugins/mail-notification/mail-notification.c:747
+msgid "Pl_ay"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:804
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../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 ""
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16610,6 +18649,17 @@ msgstr "बैठक को बदलें (_v)"
 msgid "Mail to meeting"
 msgstr "मीटिंग को डाक भेजें"
 
+#: ../plugins/mail-to-task/mail-to-task.c:287
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr ""
+
+#: ../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 "
@@ -16651,10 +18701,8 @@ msgid "Mailing _List"
 msgstr "डाक सूची (_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
-msgstr "सा�ा मेलिंग सूची समादेश के लिये क�रिया दें (सदस�यता लें, सदस�यता वापस करें, ...)."
+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"
@@ -16712,14 +18760,10 @@ msgstr "डाक सूची को ई संदेश भेजें ?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"कार�रवाई न की जा सकी. इसका मतलब है कि इस क�रिया के लिये हेडर कोई क�रिया नियंत�रित नहीं "
-"करता है जिसे हम नियंत�रित कर सकते हैं.\n"
-"\n"
-"हेडर: {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
@@ -16793,6 +18837,24 @@ msgstr "सूची की सदस�यता लें (_S)"
 msgid "_Unsubscribe from List"
 msgstr "सूची से सदस�यता वापस लें (_U)"
 
+#: ../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 "सबको पठित रूप में चिह�नित करें"
@@ -16814,12 +18876,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "ऑफलाइन देखने के लिये चयनित कैलेंडर चिह�नित करें"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "इसे ऑफलाइन मत बनायें (_D)"
+msgid "_Do not make available for offline use"
+msgstr ""
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "ऑफलाइन प�रयोग के लिये कैलेंडर चिह�नित करें (_M)"
+msgid "_Make available for offline use"
+msgstr ""
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -16829,25 +18891,13 @@ msgstr "à¤�क पà¥�लगिन जो à¤�कल पà¥�लगिन लागà
 msgid "Mono Loader"
 msgstr "�कल भारक"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "नयी डाक आने पर D-BUS संदेश उत�पन�न करें."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "नई डाक की सूचना"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "नया डाक सूचना"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "देखरेख के लिये प�लगिन कि कौन सा प�लगिन सक�रिय है या निष�क�रिय."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "प�लगइन प�रबंधक"
 
@@ -16859,22 +18909,24 @@ msgstr "पà¥�लगिन सकà¥�रिय व निषà¥�कà¥�रिय à¤
 msgid "_Plugins"
 msgstr "प�लगिन (_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "लेखक"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
-msgid "Description"
-msgstr "वर�णन"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "कॉन�फ़िगरेशन"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "नोट: फिर श�रू करने के पहले क�छ बदलाव नहीं प�रभावी हो सकते"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:291
+msgid "Overview"
+msgstr "ओवरव�यू"
+
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "प�लगइन"
 
@@ -16899,36 +18951,21 @@ msgstr "सादा पाठ मोड"
 msgid "Prefer plain-text"
 msgstr "सादा पाठ को वरीयता दें"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "HTML दिखायें अगर मौजूद है"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "PLAIN को वरीयता दें"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "सिर�फ कभी PLAIN दिखायें"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "HTML मोड"
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "कंपोजर से मेल म�द�रित करने पर �क विकल�प दें"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h: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 "म�द�रण पूर�वावलोकन (_v)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "संदेश छापें"
+#: ../plugins/prefer-plain/prefer-plain.c:236
+msgid "HTML _Mode"
+msgstr ""
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
@@ -16954,7 +18991,7 @@ msgstr "अवस�थिति"
 msgid "_Publish Calendar Information"
 msgstr "कैलेंडर सूचना प�रकाशित करें (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "क�या आप निश�चित हैं कि आप इस URL को हटाना चाहते हैं?"
 
@@ -16976,6 +19013,10 @@ msgstr ""
 "साप�ताहिक\n"
 "मैन�अल (क�रिया मेनू से होकर)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "सक�रिय (_n)"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "पोर�ट (_o):"
@@ -17014,10 +19055,22 @@ msgstr "सेवा प�रकार (_t):"
 msgid "_File:"
 msgstr "फ़ाइल (_F):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "कूटशब�द (_P):"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "�से प�रकाशित करें (_P):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "शब�दकूट याद रखें (_R)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "प�रयोक�ता नाम (_U):"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17026,21 +19079,91 @@ msgstr ""
 "iCal\n"
 "म�क�त/व�यस�त"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
-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:108
+msgid "SpamAssassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+msgid "I_nclude remote tests"
+msgstr "दूरस�थ परीक�षण को शामिल करें (_n)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
 msgstr ""
-"स�पैम�सेसिन के प�रयोग से जंक संदेश फिल�टर करें. इस प�लगिन के लिये स�पैम�सेसिन के अधिष�ठापित होने "
-"की जरूरत है."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
-msgstr "स�पैम�सेसिन जंक प�लगिन"
+msgid "SpamAssassin junk plugin"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr ""
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17048,27 +19171,27 @@ 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
 msgid "Save attachments"
 msgstr "संलग�नक सहेजें"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments ..."
+msgid "Save Attachments..."
 msgstr "संलग�नक सहेजें..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "सभी संलग�नक सहेजें"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "सेव आधार नाम च�नें"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "माइम प�रकार"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "सहेजें"
 
@@ -17076,79 +19199,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:171
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
-msgstr "UID"
+msgstr "यूआईडी"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "विवरण  सूची"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "श�रेणी सूची"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "टिप�पणी सूची"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
-msgstr "उत�पन�न किया"
+msgstr "निर�मित"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "सम�पर�क सूची"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "प�रारंभ"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "अंत"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "प�रतिशत समाप�त"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "श�रोता सूची"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
-msgstr "रूपांतरक"
+msgstr "परिवर�धित"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV प�रारूप के लिये उन�नत विकल�प"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "हेडर पहले लायें"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "मूल�य परिमापक"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "डिलिमिटर रिकार�ड करें:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "इसके साथ मान डालें:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "कौमा पृथक मान प�रारूप (.csv)"
 
@@ -17169,16 +19292,15 @@ msgstr "डिस�क में सहेजें (_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF प�रारूप (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "गंतव�य फाइल च�नें"
 
@@ -17195,26 +19317,30 @@ msgid "Show _only this Calendar"
 msgstr "सिर�फ इस कैलेंडर को दिखायें (_o)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "सिर�फ इस कार�य सूची दिखायें (_o)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "�क प�लगिन जो आरंभीकरण विजार�ड नियंत�रित करा है."
+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 "आरंभिक विजार�ड"
+msgid "Setup Assistant"
+msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "�वोल�यूशन जमावट सहायक"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
-msgstr "स�वागतम�"
+msgstr "स�स�वागतम"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -17226,22 +19352,32 @@ msgstr ""
 "\n"
 "जारी रखने के लि� कृपया \"आगे बढायें\" बटन क�लिक करें. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:133
+msgid "Importing files"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "कृपया सूचना का चयन करें जिसे आप आयात करना चाहते हैं:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "%s से:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
+#, c-format
 msgid "Importing data."
 msgstr "आंकड़ा आयात कर रहा है"
 
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
+msgid "Please wait"
+msgstr "कृपया ठहरि�"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "संकेत करता है कि संदेश का थ�रेडिंग विषय में वापस जायेगा."
@@ -17255,9 +19391,61 @@ msgid "Thread messages by subject"
 msgstr "विषय आधारित संदेश थ�रेड करें"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
-msgstr "विषय के आधार पर थ�रेडिंग संदेश पर आना (_j)"
+#: ../plugins/subject-thread/subject-thread.c:56
+msgid "F_all back to threading messages by subject"
+msgstr ""
+
+#: ../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:615
+msgid "No title"
+msgstr ""
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr ""
+
+#: ../plugins/templates/templates.c:745
+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
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr ""
+
+#: ../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"
@@ -17267,89 +19455,153 @@ msgstr "�वोल�यूशन शेल"
 msgid "Evolution Shell Config factory"
 msgstr "�वोल�यूशन शेल कॉन�फिग फैक�टरी"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "�वोल�यूशन जांच"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "�वोल�यूशन जांच घटक"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
-msgstr "मौजूदा म�द�रक जमावट का GNOME म�द�रण विवरण"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../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 "विन�यास संस�करण"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "मूलभूत साइडबार चौड़ाई"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "मूलभूत विंडो ऊंचाई"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "मूलभूत विंडो स�थिति"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "मूलभूत विंडो चौड़ाई"
 
-#: ../shell/apps_evolution_shell.schemas.in.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
+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 या उपनाम श�रू होने पर मूलभूत के रूप में प�रदर�शित."
 
-#: ../shell/apps_evolution_shell.schemas.in.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 "अंतिम उन�नत विन�यास संस�करण"
 
-#: ../shell/apps_evolution_shell.schemas.in.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.in.h:10
-msgid "Printer settings"
-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.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "किनारे की पट�टी दृश�यमान है"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "विकास चेतावनी संवाद छोड़ें"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "ऑफलाइन मोड में आरंभ करें"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "प�रस�थिति पट�टी दृश�यमान है"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../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 "�वोल�यूशन का विन�यास संस�करण, म�ख�य/माइनर/विन�यास स�तर के साथ (उदाहरण के लिये \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "म�ख�य विंडो की मूलभूत ऊंचाई पिक�सेल में"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "संदेश विंडो की मूलभूत चौड़ाई "
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "साइड बार पट�टी की मूलभूत चौड़ाई, पिक�सेल में"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17357,7 +19609,37 @@ msgstr ""
 "�वोल�यूशन का अंतिम उन�नत विन�यास संस�करण, म�ख�य/कमतर/विन�यास स�तर के साथ (उदाहरण के लिये "
 "\"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../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 "
@@ -17366,43 +19648,63 @@ msgstr ""
 "विंडो बटन की शेली. \"text\", \"icons\", \"both\", \"toolbar\" हो सकात है. अगर "
 "\"toolbar\" सेट किया जाता है, बटन की शैली GNOME टूलबार सेटिंग से निश�चित होगी."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../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 "उपकरण पट�टी दृश�यमान है"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../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.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "क�या विंडो सबसे बड़े आकार का होना चाहिये या नहीं."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "क�या किनारा पट�टी दिखाई देनी चाहिये"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "क�या प�रस�थिति पट�टी दिखाई देनी चाहिये"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "क�या उपकरण पट�टी दृश�य होनी चाहिये"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../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.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "क�या विंडो बटन को दृश�य होना चाहिये"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "विंडो बटन शैली"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "विंडो बटन दृश�य है"
 
@@ -17418,33 +19720,21 @@ msgstr "सक�रिय संबंधन"
 msgid "Click OK to close these connections and go offline"
 msgstr "इन संबंधनों को बंद करने के लि� OK पर क�लिक करें और ऑफलाइन जा�ं"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(शीर�षकविहीन)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "चलाने के लि� आयातक के प�रकार को च�नें:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../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.\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 ""
-"फाइल च�नें जिसे आप �वोल�यूशन में आयातित करना चाहते हों, और सूची से च�नें कि यह किस प�रकार की "
-"फाइल है.\n"
-"\n"
-"आप \"स�वचालित\" च�न सकते हैं अगर आप नहीं जानते हैं, और �वोल�यूशन इसे करने की कोशिश करेगा."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "इस आयात के लिये गंतव�य च�नें"
 
-#: ../shell/e-shell-importer.c:152
+#: ../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"
@@ -17456,127 +19746,124 @@ msgstr ""
 "जमावट मिला. अगर आप फिर \n"
 "कोशिश करना चाहते हैं, कृपया \"पीछे\" बटन पर क�लिक करें.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "फाइलनाम (_i):"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
-msgstr "�क फ़ाइल च�नें"
+msgstr "�क फाइल च�नें"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "फाइल प�रकार (_t):"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "प�राने प�रोग�रामों से आंकड़ों और जमावटों का आयात करें (_o)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "�कमात�र फाइल आयात करें (_s)"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "�वोल�यूशन वरीयता"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "कोई फोल�डर नाम निर�दिष�ट नहीं."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "फोल�डर नाम में लौटाने वाला संप�रतीक नहीं समाहित रख सकता."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "फोल�डर नाम \"/\" अक�षर नहीं रख सकता है."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "फोल�डर नाम \"#\" अक�षर नहीं रख सकता है."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' और '..' स�रक�षित फोल�डर नाम हैं."
+#. 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
+#, c-format
+msgid "%s - Evolution"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME इस सिस�टम पर अधिष�ठापित होता ह�आ नहीं दिखाई पड़ता."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s के निष�पादन में त�र�टि"
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "बग बड�डी अधिभारित नहीं है."
 
-#: ../shell/e-shell-window-commands.c:130
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "बग बड�डी चलाया नहीं जा सका."
 
 #. The translator-credits string is for translators to list
-#. * per language credits for translation, displayed in the
-#. * about box
-#: ../shell/e-shell-window-commands.c:560
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
+msgstr "संगीता क�मारी (sangeeta09@gmail.com)"
+
+#: ../shell/e-shell-window-commands.c:740
+msgid "Evolution Website"
 msgstr ""
-"राजेश रंजन (rranjan@redhat.com, rajeshkajha@yahoo.com) \n"
-"Rajesh Ranjan (rranjan@redhat.com, rajeshkajha@yahoo.com)"
 
-#: ../shell/e-shell-window-commands.c:805
+#: ../shell/e-shell-window-commands.c:758
+msgid "Error opening the FAQ webpage."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "ऑनलाइन कार�य करें (_W)"
 
-#: ../shell/e-shell-window-commands.c:818 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
-msgstr "ऑफलाइन कार�य करें (_W)"
+msgstr "ऑफ़लाइन कार�य करें (_W)"
 
-#: ../shell/e-shell-window-commands.c:831
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
-msgstr "ऑफलाइन कार�य करें"
+msgstr "ऑफ़लाइन कार�य करें"
 
-#: ../shell/e-shell-window.c:371
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "�वोल�यूशन अभी ऑनलाइन है. ऑफलाइन कार�य करने के लि� इस बटन पर क�लिक करें."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "�वोल�यूशन ऑफलाइन होने की प�रक�रिया में है."
 
-#: ../shell/e-shell-window.c:386
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "�वोल�यूशन अभी ऑफलाइन है. ऑनलाइन कार�य करने के लि� इस बटन पर क�लिक करें."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
 
 #: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s पर जा�ं"
 
-#: ../shell/e-shell.c:634
-msgid "Uknown system error."
-msgstr "अज�ञात सिस�टम त�र�टि"
+#: ../shell/e-shell.c:641
+msgid "Unknown system error."
+msgstr ""
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "ठीक"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "अवैध तर�क"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF पर दर�ज नहीं कर सकता"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "विन�यास डाटाबेस नहीं मिला"
 
@@ -17586,15 +19873,16 @@ msgstr "विन�यास डाटाबेस नहीं मिला"
 msgid "New"
 msgstr "नया"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "नया परीक�षण"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
-msgstr "परीक�षण (_T)"
+msgstr "जांचें (_T)"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "नया परीक�षण मद निर�मित करें"
 
@@ -17608,7 +19896,7 @@ msgstr "�वोल�यूशन आयात सहायक"
 
 #: ../shell/import.glade.h:3
 msgid "Import File"
-msgstr "फाइल आयात करें"
+msgstr "फाइल को निर�यात करो"
 
 #: ../shell/import.glade.h:4
 msgid "Import Location"
@@ -17637,7 +19925,7 @@ msgstr ""
 "निर�देशित कि� जायेंगे."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17672,7 +19960,7 @@ msgstr ""
 "हमें आशा है कि आप हमारी कड़ी मिहनत का आनंद लेंगे, और हमें\n"
 "आपके योगदान की प�रतीक�षा है!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17680,7 +19968,7 @@ msgstr ""
 "धन�यवाद\n"
 "�वोल�यूशन टीम\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "म��से फिर मत कहें."
 
@@ -17708,11 +19996,15 @@ msgstr "�क फाइल के सभी घटकों को दोषम
 msgid "Disable loading of any plugins."
 msgstr "किसी प�लगिन के लोडिंग को सक�रिय करें."
 
-#: ../shell/main.c:516
+#: ../shell/main.c:487
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �वोल�यूशन PIM और ईमेल क�लाइंट"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17852,7 +20144,7 @@ msgstr ""
 "\n"
 "अगर आप जारी रखते हैं, आप अपने क�छ प�राने आंकड़ों का अभिगम नहीं कर सकते.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17863,7 +20155,7 @@ msgstr ""
 "\n"
 "ट�रस�ट जमावट का संपादन करें:"
 
-#: ../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 "
@@ -17872,7 +20164,7 @@ 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 "
@@ -17882,60 +20174,75 @@ msgstr ""
 "किया है, तब आप इस प�रमाणपत�र के सत�यापन पर विश�वास नहीं कीजि� जबतक यहां यह दिखाया "
 "नहीं गया हो"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../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 "आयात के लि� �क प�रमाणपत�र च�नें..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "सभी फ़ाइलें"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "प�रमाणपत�र नाम"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "उद�देश�य"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "क�रम संख�या"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "समाप�त"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
-msgstr "ई-डाक पता"
+msgstr "ईमेल पता"
+
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr ""
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "प�रमाणपत�र दर�शक: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "`%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 "प�रमाणपत�र डाटाबेस के लिये नया शब�दकूट दाखिल करें"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "नया शब�दकूट दाखिल करें"
 
 #. 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"
@@ -17944,7 +20251,7 @@ msgstr ""
 "इसे निर�गत किया गया:\n"
 "  विषय: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17953,7 +20260,7 @@ msgstr ""
 "इसके द�वारा निर�गत किया गया:\n"
 "  विषय: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "प�रमाणपत�र च�नें"
 
@@ -17979,11 +20286,11 @@ msgstr "<b>फ़िंगरप�रिंट�स</b>"
 
 #: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
-msgstr "<b>इसके द�वारा जारी किया गया</b>"
+msgstr "<b>के द�वारा निर�गत</b>"
 
 #: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
-msgstr "<b>इसको जारी किया गया</b>"
+msgstr "<b>को निर�गत</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
@@ -18115,7 +20422,7 @@ msgstr "वेब साइटों की पहचान में इस CA
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
-msgstr "दिखा�ं"
+msgstr "दृश�य"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
@@ -18138,7 +20445,7 @@ msgid "_Edit CA Trust"
 msgstr "CA ट�रस�ट का संपादन करें (_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "प�रमाणपत�र पहले से उपस�थित है"
 
@@ -18149,11 +20456,11 @@ msgstr "%d/%m/%Y"
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:425
 msgid "Sign"
-msgstr "हस�ताक�षर करें"
+msgstr "हस�ताक�षर"
 
 #: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
-msgstr "गोपन करें"
+msgstr "�नक�रिप�ट"
 
 #: ../smime/lib/e-cert.c:531
 msgid "Version"
@@ -18242,7 +20549,7 @@ msgstr "ई-डाक प�रमाणपत�र प�राधिकार
 
 #: ../smime/lib/e-cert.c:867
 msgid "Signing"
-msgstr "हस�ताक�षर कर रहा है"
+msgstr "हस�ताक�षर किया जा रहा है"
 
 #: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
@@ -18258,7 +20565,7 @@ msgstr "आंकड़ा इनसाइफरमेंट"
 
 #: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
-msgstr "क�ंजी मसौदा"
+msgstr "क�ंजी अन�बंध"
 
 #: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
@@ -18270,7 +20577,7 @@ msgstr "CRL हस�ताक�षरकर�ता"
 
 #: ../smime/lib/e-cert.c:939
 msgid "Critical"
-msgstr "गंभीर"
+msgstr "नाज�क"
 
 #: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
@@ -18305,42 +20612,18 @@ msgstr "विषय अद�वितीय ID"
 msgid "Certificate Signature Value"
 msgstr "प�रमाणपत�र हस�ताक�षर मूल�य"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 फाइल शब�दकूट"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 फाइल के लिये शब�दकूट दाखिल करें:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "प�रमाणपत�र आयातित किया"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "जोड़ने के लि� �क संलग�नक"
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "संलग�नक का अंतर�वस�त� प�रकार."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "डाक में प�रदर�शन हेत� फाइलनाम"
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "संलग�नक का विवरण."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "मूलभूत रूप से अंतर�रेखीय दिखाने के लिये संलग�नक चिह�नित करें."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "संदेश के लिये मूलभूत विषय."
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -18370,11 +20653,10 @@ msgstr "सारे संपरà¥�कों को यहां कापी à
 msgid "Contact _Preview"
 msgstr "संपर�क पूर�वावलोकन (_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
-msgstr "कॉपी"
+msgstr "नक़ल"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
@@ -18386,25 +20668,24 @@ msgstr "चयनित फोलà¥�डर के संपरà¥�क को दà
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "चयन की कॉपी लें"
+msgstr "चयनित कॉपी करें"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "इस फोल�डर में कॉपी लें..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
-msgstr "नयी पता प�स�तिका फोल�डर बना�ं"
+msgid "Create a new address book folder"
+msgstr ""
 
-#: ../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 "काटो"
+msgstr "काटें"
 
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr "चयनित को काटें"
+msgstr "चयनित काटें"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
@@ -18438,15 +20719,14 @@ msgstr "चयनित फोलà¥�डर के संपरà¥�क को दà
 msgid "Move to Folder..."
 msgstr "फोल�डर में विस�थापित करें..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "चिपका��"
 
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
-msgstr "क�लिपबोर�ड चिपका��"
+msgstr "क�लिपबोर�ड को चिपका��"
 
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
@@ -18464,6 +20744,10 @@ msgstr "चयनित फोल�डर का प�नर�नामकर
 msgid "S_ave Address Book As VCard"
 msgstr "वी कार�ड के रूप में पता प�स�तिका सहेजें (_a)"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "वीकार�ड के रूप में सहेजें..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Vकार�ड के रूप में चयनित संपर�क को सहेजें."
@@ -18472,13 +20756,11 @@ msgstr "Vकार�ड के रूप में चयनित संपर
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Vकार�ड के रूप में चयनित फोल�डर सहेजें."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "सभी च�नें"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "सभी च�नें (_A)"
 
@@ -18508,7 +20790,7 @@ msgstr "रोकें (_o)"
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
-msgstr "रोकें"
+msgstr "रूकें"
 
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
@@ -18547,7 +20829,7 @@ msgstr "संपर�क को यहां खिसकायें (_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "फोल�डर सामग�री इसमें ले जायें (_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "नया (_N)"
 
@@ -18589,7 +20871,7 @@ msgstr "इस आवृत�ति को मिटा��"
 
 #: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
-msgstr "यहां जा�ं"
+msgstr " पर जा�ं"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
@@ -18608,7 +20890,7 @@ msgid "Month"
 msgstr "माह"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "अगला"
 
@@ -18617,7 +20899,7 @@ msgid "Previews the calendar to be printed"
 msgstr "म�द�रित होने वाले कैलेंडर का पूर�वावलोकन करता है"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "पिछला"
 
@@ -18685,227 +20967,6 @@ msgstr "कार�य सप�ताह"
 msgid "_Open Appointment"
 msgstr "म�लाकात खोलें (_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "क�लिपबोर�ड से चयनित पाठ की कॉपी लें"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "क�लिपबोर�ड पर चयन कॉपी करें"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "क�लिपबोर�ड से चयनित पाठ काटें"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "क�लिपबोर�ड पर अपना चयन काटें"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "क�लिपबोर�ड से चिपकायें"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "क�लिपबोर�ड से पाठ चिपका��"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "सभी पाठ च�नें"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "संलग�न करें"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "फाइल जोड़ने के लिये यहां क�लिक करें"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "मौजूदा विंडो बंद करने के लिये यहां क�लिक करें"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "मौजूदा विंडो सहेजने के लिये यहां क�लिक करें"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "उपलब�ध मदद देखने के लिये यहां क�लिक करें"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "बंद करें"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "डालें (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
-msgid "_Attachment..."
-msgstr "संलग�नक (_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "बंद करें (_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "फाइल (_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
-msgid "_Help"
-msgstr "मदद (_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "विकल�प (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "संपूर�ण दिवस घटना"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "संपूर�ण दिवसीय घटना (_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "गोपनीय रूप में वर�गीकृत करें"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "निजी रूप में वर�गीकृत करें"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "सार�वजनिक रूप में वर�गीकृत करें"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "इस घटना के लिये �लार�म सेट करने व नहीं करने के लि� यहां क�लिक करें"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "उन�नत प�रेषण विकल�प डालें"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "इसे बारंबार होने वाली घटना बनायें"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "सार�वजनिक (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "उपस�थित व�यक�ति के लिये रिक�त/व�यस�त सूचना प�रश�नगत करें"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "भूमिका क�षेत�र (_o)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as _busy"
-msgstr "समय व�यस�त के रूप में दिखा�ं (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "समय क�षेत�र (_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "टॉगल करें कि क�या उपस�थित व�यक�ति प�रकार श�रेत�र दिखाया गया है"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "टॉगल करें कि क�या RSVP श�रेत�र दिखाया गया है"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "टॉगल करें कि क�या भूमिका श�रेत�र दिखाया गया है"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "टॉगल करें कि क�या प�रस�थिति श�रेत�र दिखाना गया है"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "टॉगल करें कि क�या समय क�षेत�र दिखाना है"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "टॉगल करें कि क�या श�रेणी दिखाना है"
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "Toggles whether to have All Day Event"
-msgstr "टॉगल करें कि क�या सारे दिन की घटना रखना है"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to show time as busy"
-msgstr "टॉगल करें कि क�या समय व�यस�त दिखाना है"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "_Alarms"
-msgstr "�लार�म (_A)"
-
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "श�रेणी (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "वर�गीकरण (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "गोपनीय (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30
-msgid "_Free/Busy"
-msgstr "म�क�त/व�यस�त (_F)"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "निजी (_P)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:33
-msgid "_Recurrence"
-msgstr "आवृत�ति (_R)"
-
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "प�रस�थिति क�षेत�र (_S)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "प�रकार क�षेत�र (_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "मौजूदा डाक संक�रिया को रद�द करें"
@@ -18927,79 +20988,94 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "नये डाक के निस�पंदन के लिये नियमों को सृजित या संपादित करें"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
-msgstr "कूड़ेदान खाली करें (_T)"
+msgstr "रद�दी खाली करें (_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../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 "फोल�डर (_o)"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "चयनित फोल�डर को दूसरे फोल�डर में खिसका��"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "सभी फोल�डरों से सभी विलोपित संदेशों को स�थायी रूप से हटा�ं"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "फोल�डर खोजें (_o)"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "संदेश पूर�वावलोकन दिखायें (_P)"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "संदेश सूची के नीचे संदेश पूर�वावलोकन दिखाता है"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../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:16
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "संदेश पूर�वावलोकन विंडो दिखा�ं"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "दूरस�थ सर�वर पर फोल�डरों को स�वीकार या अस�वीकार करें"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "चिरसम�मत दृश�य (_C)"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "फोल�डर इसमें कापी करें (_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "संदेश फिल�टर (_M)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "फोल�डर इसमें विस�थापित करें (_M)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "नया (_N)..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "पूर�वावलोकन (_P)"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "सदस�यता (_S)"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "लंबवत दृश�य (_V)"
 
@@ -19061,62 +21137,82 @@ msgid "Mar_k All Messages as Read"
 msgstr "सभी संदेश पठित रूप में चिह�नित करें (_k)"
 
 #: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "क�लिपबोर�ड सें संदेश(शों) को चिपका��"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "इस फोल�डर से सभी विलोपित संदेशों को स�थायी रूप से हटा�ं"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "इस फोल�डर को स�थायी रूप से हटा�ं"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "संदेश थ�रेड च�नें (_T)"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "सभी संदेशों को च�नें (_A)"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "सभी और सिर�फ उन संदेशों को च�नें जो अभी नहीं चयनित कि� ग� हैं"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../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:24
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "सभी दृश�य संदेशों को च�नें"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "छ�पे संदेश दिखायें (_n)"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "संदेशों को दिखा�ं जो अस�थायी तौर पर छ�पा� ग� हैं"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "सभी संदेशों को अस�थायी तौर पर छ�पा�ं जो कि पहले पढ़े जा च�के हैं"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "चयनित संदेशों को अस�थायी तौर पर छ�पा�ं"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "सूत�रित संदेश सूची"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "थ�रेड से समूहीकृत (_G)"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../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 "संदेश (_M)"
@@ -19419,8 +21515,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "डाक सूची से फोल�डर खोजें (_L)..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "प�राप�तकर�ता से फोल�डर खोजें ..."
+msgid "Search Folder from Recipien_ts..."
+msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -19442,7 +21538,7 @@ msgstr "सभी पाठ च�नें (_A)"
 msgid "Select all the text in a message"
 msgstr "संदेश में सब पाठ च�नें"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "अपने मौजूदा प�रिंटर के लिये पृष�ठ जमावट की व�यवस�था करें"
 
@@ -19451,101 +21547,102 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "प�रर�दशित संदेशों के शरीर पर �क टिमटिमाता कर�सर दिखा�ं"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "सामान�य शैली में संदेश को दिखा�ं"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "सभी ईमेल शीर�षों के साथ संदेश को दिखा�ं"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "संदेश के कच�चे ईमेल श�रोत दिखा�ं"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "चयनित संदेशों का प�रतिविलोपन करें"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "गैरमहत�वपूर�ण (_m)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "छोटा आकार (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "संलग�न करें (_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "हंसपद मोड (_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "फ�लैग हटा�ं (_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "विलोपित करें संदेश (_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "संदेश सें ढूंढें (_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "फ�लैग समाप�त (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "इसपर जा�ं (_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "महत�वपूर�ण (_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "इनलाइन (_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "जंक (_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "बिंब अधिभारित करें (_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "संदेश श�रोत (_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "अगला संदेश (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "सामान�य आकार (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "जंक नहीं (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "न� विंडो में खोलें (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "पूर�व संदेश (_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "उद�धृत (_Q)"
 
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "पढ़ें (_R)"
+
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "संदेश सहेजें (_S)..."
@@ -19564,13 +21661,13 @@ msgstr "बड़ा करें (_Z)"
 
 #: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
-msgstr "बड़ा आकार (_Z)"
+msgstr "आकार बड़ा करें(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "इस विंडो को बन�द करें"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "बंद करें"
 
-#: ../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 "म�ख�य उपकरण-पट�टी"
 
@@ -19606,265 +21703,6 @@ msgstr "चयनित मेमो देखें"
 msgid "_Open Memo"
 msgstr "मेमो खोलें (_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "�क फाइल संलग�न करें"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "बर�तमान फाइल बंद करें"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "हस�ताक�षर छोड़ सबको मिटा��"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "आपने PGP से इस संदेश को गोपनीय बना�ं"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "आपने S/MIME गोपन प�रमाणपत�र से इस सदेश को गोपनीय बना�ं"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "प�रारूप (_m)"
-
-#: ../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 (_M)"
-
-#: ../ui/evolution-message-composer.xml.h:13
-msgid "Open a file"
-msgstr "�क फ़ाइल खोलें"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "PGP Encrypt"
-msgstr "PGP गोपन"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Sign"
-msgstr "PGP चिह�न"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "R_equest Read Receipt"
-msgstr "पठन रसीद के लिये आग�रह करें (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "S/MIME Encrypt"
-msgstr "S/MIME गोपन"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "S/MIME Sign"
-msgstr "S/MIME चिह�न"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "इस रूप में सहेजें"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "Save Draft"
-msgstr "ड�राफ�ट सहेजें"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "Save _As..."
-msgstr "इस रूप में सहेजें (_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "Save _Draft"
-msgstr "ड�राफ�ट सहेजें (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "Save as draft"
-msgstr "ड�राफ�ट के रूप में सहेजें"
-
-#: ../ui/evolution-message-composer.xml.h:25
-msgid "Save in folder..."
-msgstr "फोल�डर में सहेजें..."
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save the current file"
-msgstr "वर�तमान फाइल सहेजें"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save the current file with a different name"
-msgstr "वर�तमान फाइल �क भिन�न नाम से सहेजें"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save the message in a specified folder"
-msgstr "संदेश को विशेष फोल�डर सहेजें"
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Send"
-msgstr "भेजें"
-
-#: ../ui/evolution-message-composer.xml.h:30
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "HTML प�रारूप में डाक भेजें"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Send this message"
-msgstr "यह संदेश भेजें"
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Set the message priority to high"
-msgstr "संदेश प�राथमिकता काफी उच�च सेट करें"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "अपने PGP क�ंजी से इस संदेश पर हस�ताक�षर करें"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "अपने S/MIME हस�ताक�षर प�रमाणपत�र के साथ इस संदेश पर हस�ताक�षर करें"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the BCC field is displayed"
-msgstr "यदि BCC क�षेत�र प�रदर�शित है तो टॉगल करें"
-
-#: ../ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the CC field is displayed"
-msgstr "यदि CC क�षेत�र प�रदर�शित है तो टॉगल करें"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the From chooser is displayed"
-msgstr "यदि प�रेषक चयनकर�ता प�रदर�शित है तो टॉगल करें"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "यदि प�रेषित करें क�षेत�र प�रदर�शित है तो टॉगल करें"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "यदि जबाव दें क�षेत�र प�रदर�शित है तो टॉगल करें"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Toggles whether the To field is displayed"
-msgstr "यदि प�रति क�षेत�र को प�रदर�शित है तो टॉगल करें"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "_Bcc Field"
-msgstr "Bcc क�षेत�र (_B)"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "_Cc Field"
-msgstr "Cc क�षेत�र (_C)"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "_Delete all"
-msgstr "सबको मिटा�� (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_From Field"
-msgstr "क�षेत�र से (_F)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Open..."
-msgstr "खोलें (_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:50
-msgid "_Post-To Field"
-msgstr "प�रेषित करें क�षेत�र (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Prioritize Message"
-msgstr "संदेश की प�राथमिकता तय करें (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:52
-msgid "_Reply-To Field"
-msgstr "जबाव दें क�षेत�र (_R)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "स�रक�षा (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_To Field"
-msgstr "प�रति क�षेत�र (_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "बंद करें (_l)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML (_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "सहेजें �वं बंद करें"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "सहेजें �वं बंद करें (_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "मौजूदा फाइल को सहेजें और विंडो बंद करें"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "आपके सदस�यता प�राप�त फोल�डर की सूची में फोल�डर जोड़ें"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "ताजा करें"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "फोल�डर सूची ताजा करें"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "आपके सदस�यता प�राप�त फोल�डर की सूची से फोल�डर हटा�ं"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "सदस�यता"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "सदस�यता त�याग"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "चयन उलटें (_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "कार�य की प�रस�थिति बदलाव / दृश�य पर क�लिक करें"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "प�रस�थिति विवरण"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "समय क�षेत�र"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "विकल�प भेजें (_S)"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "प�रस�थिति विवरण (_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "चयनित कार�य कॉपी करें"
@@ -19950,81 +21788,89 @@ msgid "Display window buttons with text only"
 msgstr "विंडो बटन को पाठ के साथ सिर�फ दिखायें"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr ""
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "प�रोग�राम से बाहर जा�ं"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "याद कि� ग� शब�दकूट को भूल ग�, इसलि� आपको इसकेे लिय प�नः प�रांप�ट किया जायेंगे"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "विंडो बटन छ�पायें"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "आयात करें (_m)..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
-msgstr "आइकन व पाठ (_a)"
-
 #: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr ""
+
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "दूसरे प�रोग�राम से आंकड़ा आयातित करें"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "लेआउट (_o)"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "नया विंडो (_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "पृष�ठ सेटअप (_u)..."
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "वरीयता�� (_n)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "भेजें/पायें"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "भेजें/पायें (_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "संरेखित मद भेजें और न� मद प�नर�प�राप�त करें"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "पाइलट विन�यास स�थापित करें"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "किनारे की पट�टी दिखायें (_B)"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "प�रस�थिति पट�टी दिखायें (_S)"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "औजारपट�टी दिखायें (_T)"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "�वोल�यूशन से संबंधित सूचना दिखा�ं"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
-msgstr "दोष रिपोर�ट प�रस�त�त करें"
+msgstr "बग रपट जमा करें"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "दोष रिपोर�ट प�रस�त�त करें (_B)"
@@ -20038,8 +21884,8 @@ msgid "Toggle whether we are working offline."
 msgstr "यदि हमलोग ऑफलाइन कार�य कर रहे हैं तो टॉगल करें."
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
-msgstr "औजार पट�टी शैली (_b)"
+msgid "Tool_bar Style"
+msgstr ""
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -20050,46 +21896,54 @@ msgid "View/Hide the Status Bar"
 msgstr "प�रस�थिति पट�टी देखें/छ�पायें"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr ""
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "के बारे में (_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "विंडो बंद करें (_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "शब�दकूट भूल गये हैं (_F)"
 
 #: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "बटन छ�पायें (_H)"
+msgid "_Frequently Asked Questions"
+msgstr ""
 
-#: ../ui/evolution.xml.h:46
-msgid "_Icons only"
-msgstr "सिर�फ आइकन (_I)"
+#: ../ui/evolution.xml.h:47
+msgid "_Hide Buttons"
+msgstr ""
 
 #: ../ui/evolution.xml.h:48
+msgid "_Icons Only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "द�र�त संदर�भ (_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "बाहर (_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "स�विचर प�रकटन (_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "त�ल�यकालन विकल�प (_S)..."
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
+#: ../ui/evolution.xml.h:54
+msgid "_Text Only"
 msgstr "सिर�फ पाठ (_T)"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "विंडो (_W)"
 
@@ -20101,9 +21955,9 @@ msgstr "कंपनी के अन�सार (_C)"
 msgid "_Address Cards"
 msgstr "पता कार�ड�स (_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "फोन सूची (_P)"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "सूची दृश�य (_L)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20113,10 +21967,6 @@ msgstr "सप�ताह दृश�य (_e)"
 msgid "_Day View"
 msgstr "दिवस दृश�य (_D)"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "सूची दृश�य (_L)"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "माह दृश�य (_M)"
@@ -20169,12 +22019,12 @@ msgstr "समाप�त करने की तिथि के साथ (_D
 msgid "With _Status"
 msgstr "अवस�थिति के साथ (_S)"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#. 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"
 
@@ -20191,8 +22041,8 @@ msgid "Select a Time Zone"
 msgstr "�क समय क�षेत�र च�नें"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "समयक�षेत�र कोंबोबॉक�स"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -20205,18 +22055,18 @@ msgstr ""
 "आकार घटाने के लिये दांयें माउस बटन का उपयोग करें."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "संग�रह"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../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 "%s के लिये दृश�य परिभाषित करें"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "दृश�यों को परिभाषित करें..."
 
@@ -20225,22 +22075,18 @@ msgstr "दृश�यों को परिभाषित करें..."
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" के लिये दृश�यों को परिभाषित करें"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "संपादन (_E)..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
-msgstr "तालिका"
+msgstr "सारणी"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
-msgstr "उदाहरण"
+msgstr "इंस�टेंस"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "वर�तमान दृश�य सहेजें"
 
@@ -20253,33 +22099,50 @@ msgid "_Replace existing view"
 msgstr "मौजूदा दृश�य को विस�थापित करें (_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "पसंदीदा दृश�य"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "मनपसंद दृश�य सहेजें"
 
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "दृश�य परिभाषित करें..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "मौजूदा दृश�य (_u)"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:329
+#, c-format
+msgid "Select View: %s"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:373
+msgid "Current view is a customized view"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "पसंदीदा दृश�यों को सहेजें..."
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Save current custom view"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:397
+msgid "Create or edit views"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "फैक�टरी"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "नया दृश�य परिभाषित करें"
 
@@ -20295,431 +22158,457 @@ msgstr "देखने का तरीका:"
 msgid "Type of view:"
 msgstr "देखने का तरीका:"
 
+#: ../widgets/misc/e-attachment-bar.c:1137
+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
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "%s: %s फाइल संलग�न नहीं कर सकता है"
+
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "%s फाइल संलग�न नहीं कर सकता है: नियमित फाइल नहीं है"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "संलग�नक ग�ण"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "फ़ाइल नामः"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "माइम प�रकारः"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "संलग�नक के स�वचालित प�रर�दशन के लि� सलाह दें"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1747
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "माह कैलेंडर"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../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
 msgid "Fill color"
-msgstr "रंग भरें"
-
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+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
 msgid "GDK fill color"
 msgstr "GDK रंग भरें"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../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
 msgid "Fill stipple"
 msgstr "भरें स�टिपल"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../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
 msgid "Minimum width"
 msgstr "न�यूनतम चौड़ाई"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3016
+#: ../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
 msgid "Minimum Width"
 msgstr "न�यूनतम चौड़ाई"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
-msgstr "स�थान"
+msgstr "जगह"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
-msgstr "अब"
+msgstr "अभी"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "समय अवश�य प�रारूप में होना चाहि�: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "प�रतिशत मान ० और १०० के बीच अवश�य होनी चाहि�, अंतर�वेशित"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Arabic"
+msgstr "अरबी"
+
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "बाल�टिक"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "मध�य यूरोपीय"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "चीनी"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "साइरिलिक"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
-msgstr "ग�रीक"
+msgstr "यूनानी"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "हिब�रू"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "जापानी"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "कोरियाई"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "थाई"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
-msgstr "त�र�कीश"
+msgstr "त�र�की"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "यूनिकोड"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
-msgstr "पाश�चात�य यूरोपीय"
+msgstr "पश�चिमी यूरोपीय"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "पाश�चात�य यूरोपीय, नया"
 
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "परंपरागत"
 
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
-#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c: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 "सरलीकृत"
 
-#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "उक�रेनियाई"
 
-#: ../widgets/misc/e-charset-picker.c:105
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
-msgstr "चाक�ष�ष"
+msgstr "दृष�टि"
 
-#: ../widgets/misc/e-charset-picker.c:174
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "अज�ञात संप�रतीक सम�च�चय: %s"
 
-#: ../widgets/misc/e-charset-picker.c:219
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
-msgstr "संप�रतीक �नकोडिंग"
+msgstr "अक�षर �नकोडिंग"
 
-#: ../widgets/misc/e-charset-picker.c:234
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "प�रयोग के लिये संप�रतीक सम�च�चय दाखिल करें"
 
-#: ../widgets/misc/e-charset-picker.c:341
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "अन�य..."
 
-#: ../widgets/misc/e-charset-picker.c:482
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "संप�रतीक कूटलेखन (_a)"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
-msgstr "दिनांक व समय"
+msgstr "तिथि और समय"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "तिथि डालने के लिये पाठ प�रविष�टि"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "�क कैलेंडर दिखाने के इस बटन को क�लिक करें"
 
-#: ../widgets/misc/e-dateedit.c:384
-msgid "Combo box to select time"
-msgstr "समय च�नने के लिये कोंबो बॉक�स"
-
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "समय"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "अब (_w)"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "आज (_T)"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../widgets/misc/e-dateedit.c:1641
+msgid "Invalid Date Value"
+msgstr ""
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: ../widgets/misc/e-dateedit.c:1670
+msgid "Invalid Time Value"
+msgstr ""
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
-msgstr "विस�तारित"
+msgstr "विस�तृत"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "क�या इस विस�तारक को विस�तारित नहीं किया जाना है"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "विस�तारक लेबल का पाठ�यांश"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "रेखांकन का प�रयोग करें"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "के लिये "
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "लेबल और संतति के बीच दी जाने वाली जगह"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "लेबल विज़ेट"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "सामान�य विस�तारक लेबल के स�थान पर प�रदर�शित करने के लि� �क विज़ेट"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "विस�तारक का आकार"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "विस�तारक के तीर का आकार"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
-msgstr "सूचकों के बीच स�थान"
+msgstr "संकेतक के बीच स�थान"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "विस�तारक तीर के गिर�द स�थान"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:168
+#: ../widgets/misc/e-filter-bar.c: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 "उन�नत खोज"
+msgstr "विस�तृत खोज"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:216
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "खोज सहेजें"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "खोज (_S)"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "खोज"
 
-#: ../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 "खोज सहेजें (_S)..."
 
-#: ../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 "सहेजें खोजों का संपादन करें (_E)..."
 
-#: ../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 "उन�नत खोज (_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "सभी खाता"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "मौजूदा खाता"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "मौजूदा फोल�डर"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
-msgstr "मौजूदा संदेश"
+msgstr "वर�तमान संदेश"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
-msgstr "बिंब च�नें"
+msgstr "छवि च�नें"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "विश�व मानचित�र"
 
-#: ../widgets/misc/e-map.c:631
+#: ../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-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "ऑनलाइन"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "इसके साथ त�ल�यकालन"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "त�ल�यकालिक निजी अभिलेख:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "त�ल�यकालिक श�रेणियां:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "खाली संदेश"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "मॉडल फिर फ�लो करें"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
-msgstr "स�तंभ चौड़ाई"
+msgstr "स�तंभ चौड़ाई "
+
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
+msgid "Search"
+msgstr "ढूंढें"
 
-#: ../widgets/misc/e-search-bar.c:573
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "ढूंढें (_S)"
 
-#: ../widgets/misc/e-search-bar.c:579
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "अब ढूंढ़ें (_F)"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "साफ़ करें (_C)"
 
-#: ../widgets/misc/e-search-bar.c:831
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "मद ID"
 
-#: ../widgets/misc/e-search-bar.c:838 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:971
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "दिखायें (_w): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:988
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "ढूंढें (_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1000
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr "में (_n) "
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "कर�सर पंक�ति"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "कर�सर कॉलम"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "छांटक"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "चयन मोड"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "कर�सर मोड"
 
@@ -20747,10 +22636,6 @@ msgstr "<b>प�रस�थिति खोज</b>"
 msgid "A_uto-delete sent item"
 msgstr "प�रेषित मद स�वतः मिटा�� (_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "वर�गीकरण"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "नयी सूचना को प�राप�त करने के लिये �क प�रेषण मद बनायें"
@@ -20831,41 +22716,45 @@ msgstr "के बाद (_A):"
 msgid "_All information"
 msgstr "सभी सूचना (_A)"
 
-#: ../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 "संदेश छोड़ने में विलंब (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "दिया गया (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "समाप�ति तिथि तय करें (_S) "
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Until:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "जब स�विधाजनक हो (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "जब खोला गया (_W):"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:255
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% समाप�त)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL पर जायें के लि� यहां क�लिक करें"
 
@@ -20885,178 +22774,168 @@ msgstr "उपलब�ध श�रेणी (_A)"
 msgid "categories"
 msgstr "श�रेणियां"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "पॉपअप लिस�ट"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "चयनित कॉलम"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "केंद�रित कॉलम"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "अचयनित कॉलम"
 
-#: ../widgets/table/e-cell-text.c:1793
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "हटाया गया कॉलम"
 
-#: ../widgets/table/e-cell-text.c:1800
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "रेखांकित कॉलम"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "गहरा कॉलम"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "रंग कॉलम"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG रंग कॉलम"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- हटायें (_R)"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "स�थिति"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(घटते क�रम में)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(घटते क�रम में)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "नहीं छांटा गया"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "कोई समूहीकरण नहीं"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "क�षेत�र दिखायें"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "उपलब�ध क�षेत�र"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "उपलब�ध क�षेत�र (_v):"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
-msgstr "बढ़ते क�रम में"
+msgstr "आरोहण क�रम"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
-msgstr "सबको हटायें"
+msgstr "सभी साफ करें"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1593
+msgid "Clear _All"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "घटते क�रम में"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "इसके द�वारा समूहीकृत"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "नीचे खिसका�� (_D)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
-msgstr "ऊपर खिसका�� (_U)"
+msgstr "ऊपर जा�ं (_U)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "इन क�षेत�रों को क�रम में दिखायें (_o):"
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "क�षेत�र दिखायें"
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr "दृश�य में क�षेत�र दिखायें"
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
-msgstr "छांटक"
+msgstr "सोर�ट"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "से छांटें"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
-msgstr "तब द�वारा"
+msgstr "फिर इस आधार पर"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "जोड़ें (_A) ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "दिखाया गया क�षेत�र (_F)..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "छांटें (_S)..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "स�थिति"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(घटते क�रम में)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(घटते क�रम में)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "नहीं छांटा गया"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "कोई समूहीकरण नहीं"
-
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "उपलब�ध क�षेत�र"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "इसके द�वारा समूहीकृत (_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "इन क�षेत�रों को क�रम में दिखायें (_S):"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:635
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "छांटें (_S)..."
+
+#: ../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
 msgid "DnD code"
 msgstr "DnD कोड"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:642
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../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
 msgid "Full Header"
 msgstr "पूरा शीर�षक"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "�क कॉलम जोड़ें"
 
@@ -21072,336 +22951,304 @@ msgstr ""
 "अपनी तालिका में �क कॉलम जोड़ने के लिये, इसे \n"
 "उस स�थान में ले जायें जहां इसे आप देखना चाहते हैं."
 
-#: ../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 मद)"
 msgstr[1] "%s : %s (%d मद)"
 
-#: ../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 मद)"
 msgstr[1] "%s (%d मद)"
 
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "पंक�ति रंग को बदल रहा है"
 
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
-#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "क�षैतिज आलेख ग�रिड"
 
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "लंबवत आलेख ग�रिड"
 
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "फोकस करें"
 
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "कर�सर मोड"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "मॉडल चयन"
 
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
-#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../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: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
 msgid "Length Threshold"
 msgstr "लंबाई थ�रेसहोल�ड"
 
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../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: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
 msgid "Uniform row height"
 msgstr "�कसार कतार ऊंचाई"
 
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
+#: ../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 "फ�रोजन"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "मनपसंद मौज़ूदा दृश�य"
 
-#: ../widgets/table/e-table-header-item.c:1491
-msgid "Sort Ascending"
-msgstr "आरोहण क�रम में छा�टें"
+#: ../widgets/table/e-table-header-item.c:1473
+msgid "Sort _Ascending"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Descending"
-msgstr "अवरोहण क�रम में छा�टें"
+#: ../widgets/table/e-table-header-item.c:1474
+msgid "Sort _Descending"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Unsort"
-msgstr "छांटे को वापस लें"
+#: ../widgets/table/e-table-header-item.c:1475
+msgid "_Unsort"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1495
-msgid "Group By This Field"
-msgstr "समूह बनायें इस क�षेत�र से"
+#: ../widgets/table/e-table-header-item.c:1477
+msgid "Group By This _Field"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By Box"
-msgstr "समूह बनाये बक�स के आधार पर"
+#: ../widgets/table/e-table-header-item.c:1478
+msgid "Group By _Box"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1498
-msgid "Remove This Column"
-msgstr "हटा�ं स�तम�भ"
+#: ../widgets/table/e-table-header-item.c:1480
+msgid "Remove This _Column"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Add a Column..."
-msgstr "जोड़ें �क स�तम�भ."
+#: ../widgets/table/e-table-header-item.c:1481
+msgid "Add a C_olumn..."
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1501
-msgid "Alignment"
-msgstr "संरेखण"
+#: ../widgets/table/e-table-header-item.c:1483
+msgid "A_lignment"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Best Fit"
-msgstr "सर�वोत�तम अन�रूप"
+#: ../widgets/table/e-table-header-item.c:1484
+msgid "B_est Fit"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Format Columns..."
-msgstr "कॉलम संरूपित करें..."
+#: ../widgets/table/e-table-header-item.c:1485
+msgid "Format Column_s..."
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1505
-msgid "Customize Current View..."
-msgstr "मौज़ूदा दृश�य पसंदीदा करें..."
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Custo_mize Current View..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1543
+msgid "_Sort By"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "इससे छांटें"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1561
+msgid "_Custom"
+msgstr "पसंदीदा (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-msgid "Fontset"
-msgstr "फंटसेट"
+#: ../widgets/table/e-table-header-item.c:1894
+msgid "Font Description"
+msgstr "फॉन�ट विवरण"
 
-#: ../widgets/table/e-table-header-item.c:1920
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "जानकारी छा�टें"
 
-#: ../widgets/table/e-table-header-item.c:1934
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
-msgstr "तरू"
+msgstr "ट�री"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
-msgstr "तालिका शीर�ष"
+msgstr "टेबल शीर�षक"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "तालिका मॉडल"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "कर�सर पंक�ति"
 
-#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "हमेशा ढूंढे"
 
-#: ../widgets/table/e-table.c:3322
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "जोड़ने के लिये क�लिक करें"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree तालिका अन�कूलक"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "रीट�रो रूप"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "पंक�ति खींचें और +/- विस�तारक."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "मिनीकार�ड जांच"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "कॉपीराइट (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "इसे मिनीकार�ड कैनवास मद का परीक�षण करना चाहि�"
+#: ../widgets/text/e-text.c:2735
+msgid "Input Methods"
+msgstr "इनप�ट पद�धति"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "घटना प�रोसेसर"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-msgid "Font"
-msgstr "फ़ॉन�ट"
-
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-msgid "GDKFont"
-msgstr "GDKFont"
-
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
-msgid "Justification"
-msgstr "औचित�य"
-
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
-msgid "Use ellipsis"
-msgstr "दीर�घवृत का प�रयोग करें"
-
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
-msgid "Ellipsis"
-msgstr "दीर�घवृत"
-
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
-msgid "Line wrap"
-msgstr "पंक�ति लपेटना"
-
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
-msgid "Break characters"
-msgstr "टूटा संप�रतीक"
-
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
-msgid "Max lines"
-msgstr "अधिकतम पंक�तिया�"
-
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "नयी पंक�ति स�वीकारें"
-
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
-msgid "Draw borders"
-msgstr "किनारा खींचें"
-
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
-msgid "Draw background"
-msgstr "पृष�ठभूमि खींचें"
-
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
-msgid "Draw button"
-msgstr "बटन खीचें"
-
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
-msgid "Cursor position"
-msgstr "कर�सर स�थिति"
-
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
-msgid "Emulate label resize"
-msgstr "लेबल प�नःआकार की नकल करें"
-
-#: ../widgets/text/e-text.c:2739
-msgid "Input Methods"
-msgstr "इनप�ट पद�धति"
-
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "गाढ़ा"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
-msgstr "आर-पार काटें"
+msgstr "हटायें"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "�ंकर"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+msgid "Justification"
+msgstr "औचित�य"
+
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "चौड़ाई काटें"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "ऊ�चाई काटें"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "काटें"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "क�लिप आयताकार भरें"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "�क�स ऑफसेट"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "वाई ऑफसेट"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "पाठ चौड़ाई"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "पाठ ऊंचाई"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+msgid "Use ellipsis"
+msgstr "दीर�घवृत का प�रयोग करें"
+
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+msgid "Ellipsis"
+msgstr "दीर�घवृत"
+
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+msgid "Line wrap"
+msgstr "पंक�ति लपेट"
+
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+msgid "Break characters"
+msgstr "टूटा संप�रतीक"
+
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+msgid "Max lines"
+msgstr "अधिकतम पंक�तिया�"
+
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+msgid "Draw borders"
+msgstr "किनारा खींचें"
+
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+msgid "Allow newlines"
+msgstr "नयी पंक�ति स�वीकारें"
+
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+msgid "Draw background"
+msgstr "पृष�ठभूमि खींचें"
+
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+msgid "Draw button"
+msgstr "बटन खीचें"
+
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+msgid "Cursor position"
+msgstr "कर�सर स�थिति"
+
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM संदर�भ"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "पॉप अप संभालें"
 
diff --git a/po/hr.po b/po/hr.po
index 71159837c3..e8add14457 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,163 +1,163 @@
 # Translation of evolution to Croatiann
 # Copyright (C) Croatiann team
-# Translators: Automatski Prijevod <>,Boris Tudan <boris.tudan@ka.htnet.hr>,Danijel Studen <dstuden@vuka.hr>,Denis Lackovic <delacko@fly.srk.fer.hr>,Diana Ćorluka <dina@iskrameco.hr>,Igor Jagec <igorm5@yahoo.com>,Ivan Knežević <kn3z@lycos.com>,Jerko Bakotin <jere_b@lycos.com>,Željko Brajdić <zorz@iskon.hr>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,pr pr <delacko@192.168.0.1>,Robert Avilov <ravilov@linux.hr>,Robert Sedak <robert.sedak@sk.tel.hr>,Robert Vuković <robi@surfer.hr>,Sasa Poznanovic <sasa.poznanovic@vuka.hr>,Tanja Minarik <tanja@finte.net>,Vedran Vyroubal <vedran.vyroubal@inet.hr>,Vladimir Žderić <vz@piksel.hr>,Vlatko Kosturjak <kost@linux.hr>,
+# Translators: Automatski Prijevod <>,Boris Tudan <boris.tudan@ka.htnet.hr>,Danijel Studen <dstuden@vuka.hr>,Denis Lackovic <delacko@fly.srk.fer.hr>,Diana Ćorluka <dina@iskrameco.hr>,Igor Jagec <igorm5@yahoo.com>,Ivan Knežević <kn3z@lycos.com>,Jerko Bakotin <jere_b@lycos.com>,Željko Brajdić <zorz@iskon.hr>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,pr pr <delacko@192.168.0.1>,Robert Avilov <ravilov@linux.hr>,Robert Sedak <robert.sedak@sk.t-com.hr>,Robert Vuković <robi@surfer.hr>,Sasa Poznanovic <sasa.poznanovic@vuka.hr>,Tanja Minarik <tanja@finte.net>,Vedran Vyroubal <vedran.vyroubal@inet.hr>,Vladimir Žderić <vz@piksel.hr>,Vlatko Kosturjak <kost@linux.hr>,
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2004-03-29 00:45+CEST\n"
-"Last-Translator: auto\n"
+"POT-Creation-Date: 2008-09-07 23:04+0200\n"
+"PO-Revision-Date: 2008-05-27 20:22+0000\n"
+"Last-Translator: Launchpad Translations Administrators <rosetta@launchpad."
+"net>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: TransDict server\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2008-05-28 07:28+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:169
-msgid "evolution addressbook"
-msgstr ""
+#: ../a11y/addressbook/ea-minicard-view.c:178
+#, fuzzy
+msgid "evolution address book"
+msgstr "Evolution adresar"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nova lista kontakata"
 
-#: ../a11y/addressbook/ea-minicard-view.c:152
-#, fuzzy, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "Izlistavanje lokalnih mapa adresara"
-msgstr[1] "Izlistavanje lokalnih mapa adresara"
-msgstr[2] "Izlistavanje lokalnih mapa adresara"
+#: ../a11y/addressbook/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "trenutna mapa adresara %s ima %d karticu"
+msgstr[1] "trenutna mapa adresara %s ima %d kartice"
+msgstr[2] "trenutna mapa adresara %s ima %d kartica"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Otvori"
 
 #: ../a11y/addressbook/ea-minicard.c:141
-#, fuzzy
 msgid "Contact List: "
-msgstr "Kontakt _lista"
+msgstr "Lista kontakata: "
 
 #: ../a11y/addressbook/ea-minicard.c:142
-#, fuzzy
 msgid "Contact: "
-msgstr "Konatkti: "
+msgstr "Kontakt: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
-msgstr ""
+msgstr "evolution mini kartica"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
-msgstr ""
+msgstr "Postoje alarmi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
-msgstr "_Bez ponavljanja"
+msgstr "Postoje alarmi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
-msgstr ""
+msgstr "Sastanak."
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-cal-view-event.c:277
+#, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Kalendarski događaji"
+msgstr "Kalendarski događaj: sažetak je %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
-msgstr "Kalendarski događaji"
+msgstr "Kalendarski događaj: nema sažetka."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
-msgstr "Kalendarski događaji"
+msgstr "prikaži kalendarski događaj"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
-msgstr "Sadrži Fokus"
+msgstr "Preuzmi fokus"
 
-#: ../a11y/calendar/ea-cal-view.c:306
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
-msgstr "Novi zakazani sastanak"
+msgstr "Novi sastanak"
 
-#: ../a11y/calendar/ea-cal-view.c:307
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
-msgstr "Novi cjelodnevni _događaj"
+msgstr "Novi cjelodnevni događaj"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: ../a11y/calendar/ea-cal-view.c:309
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
-msgstr "_Idi na Danas"
+msgstr "Idi na Danas"
 
-#: ../a11y/calendar/ea-cal-view.c:310
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
-msgstr "Idi na _datum"
+msgstr "Idi na datum"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
-#: ../a11y/calendar/ea-week-view-main-item.c:301
-#, fuzzy
+#: ../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 "vrijeme u odnosu na trenutno vrijeme"
+msgstr "tablica za pregled i odabir trenutnog vremenskog raspona"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sadrži %d događaj."
+msgstr[1] "Sadrži %d događaja."
+msgstr[2] "Sadrži %d događaja."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
-msgstr ""
+msgstr "Nema događaja."
 
-#: ../a11y/calendar/ea-day-view.c:152
-#, fuzzy, c-format
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:159
+#, c-format
 msgid "Work Week View: %s. %s"
-msgstr "Pregled radnog tjedna "
+msgstr "Pregled radnog tjedna: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
-#, fuzzy, c-format
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:165
+#, c-format
 msgid "Day View: %s. %s"
-msgstr "Dnevni pregled"
+msgstr "Dnevni pregled: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
-#, fuzzy
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
-msgstr "informacije o kalendaru"
+msgstr "pregled kalendara za radni tjedan"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "pregled kalendara za jedan ili više dana"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
-msgstr "%a %d %b %Y"
+msgstr "%A %d %b %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -165,379 +165,427 @@ msgstr "%a %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c: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:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c: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
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c: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:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
-msgstr "%d %B %Y"
+msgstr "%d %b %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c: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: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:738
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
-msgstr "Baza _pretrage:"
+msgstr "traka za pretragu"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
-msgstr "Preglednik Evolution kalendara"
+msgstr "traka za pretragu Evolution kalendara"
 
-#: ../a11y/calendar/ea-jump-button.c:149
-#, fuzzy
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
-msgstr "Iscrtaj gumb"
+msgstr "Sko�i tipka"
 
-#: ../a11y/calendar/ea-jump-button.c:158
-#, fuzzy
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
-msgstr "Kliknite ovdje za dodavanje sudionika"
+msgstr "Kliknite ovdje za više događaja"
 
-#: ../a11y/calendar/ea-week-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:154
+#, c-format
 msgid "Month View: %s. %s"
-msgstr "Mjese�ni pregled"
+msgstr "Mjese�ni pregled: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:158
+#, c-format
 msgid "Week View: %s. %s"
-msgstr "Tjedni pregled"
+msgstr "Tjedni pregled: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
-#, fuzzy
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
-msgstr "informacije o kalendaru"
+msgstr "pregled kalendara za mjesec"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
-msgstr ""
+msgstr "pregled kalendara za jedan ili više tjedana"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
-msgstr ""
+msgstr "popup"
 
 #. 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 ""
+msgstr "popup a child"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
-msgstr "Uređivanje"
+msgstr "uredi"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
-msgstr ""
+msgstr "po�ni uređivati ovu ćeliju"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
-msgstr ""
+msgstr "uklju�i/isklju�i"
 
 #. 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 ""
+msgstr "uklju�i/isklju�i ćeliju"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
-msgstr "Prošireno"
+msgstr "proširi"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
-msgstr ""
+msgstr "proširi redak u ETree koji sadrži ovu ćeliju"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
-msgstr ""
+msgstr "sažmi"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
-msgstr ""
+msgstr "sažmi redak u ETree koji sadrži ovu ćeliju"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
-msgstr "Tablica"
+msgstr "Ćelija tablice"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
-#, fuzzy
+#: ../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 "Koristite klik za dodavanje"
+msgstr "kliknite za dodavanje"
 
-#: ../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 ""
+msgstr "kliknite"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
-msgstr "Poništi razvrstavanje"
+msgstr "razvrstaj"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../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:304
-#, fuzzy, c-format
+#: ../a11y/widgets/ea-calendar-item.c:303
+#, c-format
 msgid "Calendar: from %s to %s"
-msgstr "Informacije o kalendaru"
+msgstr "Kalendar: od %s do %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
-#, fuzzy
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
-msgstr "Preglednik Evolution kalendara"
+msgstr "stavka Evolution kalendara"
 
-#: ../a11y/widgets/ea-combo-button.c:40
-#, fuzzy
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
-msgstr "Konkurencija"
+msgstr "Kombinirani gumb"
 
-#: ../a11y/widgets/ea-combo-button.c:50
-#, fuzzy
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
-msgstr "Uobi�ajeno"
+msgstr "Aktiviraj podrazumijevano"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
+msgstr "Popup izbornik"
+
+#: ../a11y/widgets/ea-expander.c:40
+msgid "Toggle Attachment Bar"
+msgstr "Prikaži / sakrij traku s prilozima"
+
+#: ../a11y/widgets/ea-expander.c:50
+msgid "activate"
+msgstr "uklju�i"
+
+#. 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:1
-#, fuzzy
+#: ../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 ""
-"Promenjena elektronska adresa ili ime ovog kontakta\n"
-"već postoji u ovoj mapi. Želite li je svejedno dodati?"
+"Kontakt sa ovom adresom već postoji. Želite li dodati novu karticu sa istom "
+"adresom?"
 
-#: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "Mapa već postoji"
+msgstr "Adresa '{0}' već postoji."
 
-#: ../addressbook/addressbook.error.xml.h:3
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
-msgstr "Unesi novi kontakt"
+msgstr "Ne mogu ukloniti kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Uređiva� kategorija nije dostupan."
 
-#: ../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 ""
+"Provjerite je li vaša lozinka ispravno upisana i koristite li podržanu "
+"metodu prijave. Prisjetite se da su mnoge lozinke osjetljive na velika i "
+"mala slova; tipka za velika slova je možda uklju�ena."
 
-#: ../addressbook/addressbook.error.xml.h:6
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
-msgstr "Ne mogu dohvatiti �lanak %s s NNTP poslužitelja"
+msgstr "Ne mogu dohvatiti shema informaciju za LDAP server."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:10
 #, fuzzy
-msgid "Could not remove addressbook."
-msgstr "Ne mogu u�itati adresar"
+msgid "Could not remove address book."
+msgstr "Ne mogu ukloniti adresar."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:11
 #, fuzzy
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr ""
+"Trenuta�no možete pristupiti jedino GroupWise adresaru iz Evolutiona. Molim "
+"vas da prvo koristite neki drugi GroupWise poštanski klijent da biste dobili "
+"Frequent Contacts i Groupwise Personal Contacts mape."
+
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "Odaberite odredišni adresar."
+msgstr "Obrisati adresar '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:13
 #, fuzzy
-msgid "Error loading addressbook."
-msgstr "Greška kod u�itavanja inicijalnog adresara."
+msgid "Error loading address book."
+msgstr "Greška kod u�itavanja adresara."
 
-#: ../addressbook/addressbook.error.xml.h:10
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
-msgstr "Greška prilikom dodavanja kontakta"
+msgstr "Greška prilikom spremanja {0} u {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
-msgstr "Neuspjela prijava na LDAP server"
+msgstr "Neuspjela prijava na LDAP poslužitelj."
 
-#: ../addressbook/addressbook.error.xml.h:12
-#, fuzzy
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+msgid "Failed to delete contact"
+msgstr "Neuspjeh pri brisanju kontakta"
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "GroupWise Address book creation:"
+msgstr "kreiranje GroupWise adresara:"
+
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
-msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
+msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme."
 
-#: ../addressbook/addressbook.error.xml.h:13
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Server Version"
-msgstr "Ina�ica"
+msgstr "Verzija servera"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
+"Neke mogućnosti možda neće raditi ispravno s vašim trenutnim poslužiteljom"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:21
 #, fuzzy
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Preglednik adresa Evolution adresara"
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "Evolution adresar je ugašen neo�ekivano."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
+"Slika koju ste odabrali je prevelika. Želite li promijeniti veli�inu i "
+"spremiti sliku?"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../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 ""
+"Ovaj LDAP poslužitelj možda koristi stariju verziju LDAP-a, koja ne podržava "
+"ovu funkcionalnost ili je neispravno podešen. Upitajte vašeg administratora "
+"koje su podržane baze pretrage."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:24
 #, fuzzy
-msgid "This address book will be removed permanently."
-msgstr "Unos nije mogao biti poslan!\n"
+msgid "This address book could not be opened."
+msgstr "Ovaj adresar se ne može otvoriti."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:25
 #, fuzzy
-msgid "This addressbook could not be opened."
-msgstr "Unos nije mogao biti poslan!\n"
+msgid "This address book server does not have any suggested search bases."
+msgstr "Ovaj poslužitelj adresara nema nikakvih prijedloga za baze pretrage."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:26
 #, fuzzy
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Server je odgovorio nepodržanim bazama za pretragu"
-
-#: ../addressbook/addressbook.error.xml.h:21
 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 ""
+"Ovaj poslužitelj adresara je možda nedostupan ili je ime poslužitelja "
+"neispravno ili je vaša mrežna veza neaktivna."
 
-#: ../addressbook/addressbook.error.xml.h:22
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Ovaj adresar će biti trajno uklonjen."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
-msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
+msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:29
 #, fuzzy
-msgid "Unable to open addressbook"
-msgstr "Spremi u adresaru"
+msgid "Unable to open address book"
+msgstr "Otvaranje adresara nije uspjelo"
 
-#: ../addressbook/addressbook.error.xml.h:24
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
-msgstr "Nisam mogao da prođem kroz mapu sa redom"
+msgstr "Neuspjelo izvršavanje pretrage."
 
-#: ../addressbook/addressbook.error.xml.h:25
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
-msgstr "Nije moguća analiza sadržaja poruke"
+msgstr "Neuspjelo spremanje {0}."
 
-#: ../addressbook/addressbook.error.xml.h:26
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
-msgstr "Želite li spremiti promjene?"
+msgstr "Želite li spremiti vaše izmjene?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../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 ""
+"Pokušavate prebaciti kontakt iz jednog adresara u drugi ali kontakt ne može "
+"biti uklonjen iz izvornog. Želite li spremiti kopiju?"
 
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../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 ""
+"Spajate se na nepodržani GroupWise poslužitelj i možda ćete naići na "
+"probleme u korištenju Evolutiona. Za najbolje rezultate bi trebalo "
+"nadograditi poslužitelj na podržanu verziju."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr ""
+msgstr "Napravili ste izmjene za ovaj kontakt. Želite li spremiti izmjene?"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
+"Vaši kontakti za {0} neće biti dostupni do ponovnog pokretanja Evolutiona."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../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:15
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr "Ne spremaj"
+
+#: ../addressbook/addressbook.error.xml.h:41
+msgid "_Resize"
+msgstr "_Promjena veli�ine"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr "Koristi postojeće"
+
+#. 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 ""
+msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
-msgstr ""
+msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Uobi�ajena adresa za sinhroniziranje:"
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
+#, fuzzy
+msgid "Could not load address book"
 msgstr "Ne mogu u�itati adresar"
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao pro�itati programski blok adresa pilota"
 
@@ -546,9 +594,8 @@ msgid "Autocompletion"
 msgstr "Automatsko dovršavanje"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
 msgid "C_ontacts"
-msgstr "Kontakti"
+msgstr "K_ontakti"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
@@ -561,33 +608,37 @@ msgstr "Ovdje podesite automatsko nadopunjavanje"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Kontakti"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
 msgstr "Evolution adresar"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Iska�ući prozor za adrese Evolution adresara"
+#, fuzzy
+msgid "Evolution Address Book address popup"
+msgstr "popup adresa Evoluion adresara"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolution adresara"
+msgid "Evolution Address Book address viewer"
+msgstr "preglednik adresa Evolution adresara"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolution adresara"
+msgid "Evolution Address Book card viewer"
+msgstr "preglednik kartica Evolution adresara"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Dio Evolution adresara"
+msgid "Evolution Address Book component"
+msgstr "sastavnica Evolution adresara"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolution S/Mime kontrola za upravljanje certifikatima"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -601,12 +652,15 @@ msgstr "Upravljanje vašim S/Mime certifikatima"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
 msgid "On This Computer"
 msgstr "Na ovom ra�unalu"
 
@@ -615,140 +669,124 @@ msgstr "Na ovom ra�unalu"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/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 "Osobni podaci"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Na LDAP poslužiteljima"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
-msgid "Contact _List"
-msgstr "Kontakt _lista"
-
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Napravi novi kontakt popis"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
-#, fuzzy
-msgid "Address _Book"
-msgstr "Adresar:"
-
-#: ../addressbook/gui/component/addressbook-component.c:243
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
-msgstr "Unesi novi zadatak"
+msgstr "Izradi novi adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
-msgstr ""
+#: ../addressbook/gui/component/addressbook-component.c:410
+msgid "Failed upgrading Address Book settings or folders."
+msgstr "Neuspješna nadogradnja postavki adresara ili mapa."
 
-#: ../addressbook/gui/component/addressbook-config.c:313
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
-msgstr "Osnovno"
+msgstr "Baza"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
-msgstr "Tip:"
+msgstr "_Vrsta:"
 
-#: ../addressbook/gui/component/addressbook-config.c:607
-#, fuzzy
-msgid "Copy book content locally for offline operation"
-msgstr "Kopiraj sadržaj mape lokalno za neumreženi rad"
+#: ../addressbook/gui/component/addressbook-config.c:619
+msgid "Copy _book content locally for offline operation"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Općenito"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
+msgid "Address Book"
 msgstr "Adresar"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
-msgstr "Korak 2: Poslužitelj podataka"
+msgstr "Informacije o poslužitelju"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
-msgstr "SMTP prijava"
+msgstr "Autorizacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalji"
 
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Pretraživanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
-msgstr "<b>Šaljem poštu:</b>"
+msgstr "Preuzimam"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Postavke knjige adresara"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migriranje..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
-#, c-format
-msgid "Migrating `%s':"
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
 msgstr "Migriram `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "Mijenjaj LDAP poslužitelje"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Postavke automatskog dopunjavanja"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -760,322 +798,340 @@ msgstr ""
 "\n"
 "Molim pri�ekajte dok Evolution ne migrira vaše mape..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od ina�ice "
-"Evolutiona 1.x.\n"
+"Format zapisa mailing lista se promjenio.\n"
 "\n"
-"Molim pri�ekajte dok Evolution ne migrira vaše mape..."
+"Pri�ekajte dok Evolution konvertira vaše mape..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od ina�ice "
-"Evolutiona 1.x.\n"
+"Format zapisa telefonskih brojeva se promjenio.\n"
 "\n"
-"Molim pri�ekajte dok Evolution ne migrira vaše mape..."
+"Pri�ekajte dok Evolution konvertira vaše mape..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od ina�ice "
-"Evolutiona 1.x.\n"
+"Format zapisa Palm Sync zapisa i mapa se promjenio.\n"
 "\n"
-"Molim pri�ekajte dok Evolution ne migrira vaše mape..."
+"Pri�ekajte dok Evolution konvertira vaše mape..."
 
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Obriši"
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Preimenuj mapu \"%s\" u:"
 
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "Postavke..."
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
+msgid "Rename Folder"
+msgstr "Preimenuj mapu"
 
-#: ../addressbook/gui/component/addressbook-view.c:1144
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
+msgid "Folder names cannot contain '/'"
+msgstr "Ime mape ne može sadržavati znak '/'"
+
+#: ../addressbook/gui/component/addressbook-view.c:942
+msgid "_New Address Book"
+msgstr "_Novi adresar"
+
+#: ../addressbook/gui/component/addressbook-view.c:943
+msgid "Save As vCard..."
+msgstr ""
+
+#: ../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
+#: ../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 "_Obriši"
+
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Postavke"
+
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
-msgstr "Nije odabran poslužitelj"
+msgstr "Kontakt izbornik izvora"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
-#, fuzzy, c-format
+#: ../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 "%sUnesite zaporku za %s (korisnik %s)"
+msgstr "Unesite lozinku za %s (korisnik %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-#, fuzzy
+#: ../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:49
+msgid "Enter password"
+msgstr "Upišite lozinku"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
-msgstr "Automatsko dovršavanje"
+msgstr "Automatsko dovršavanje trajanja"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList xml za popis adresa koje se nadopunjavaju"
+msgstr "EFolderList xml za popis izvršenih URL-ova"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList xml za popis adresa koje se nadopunjavaju"
+msgstr "EFolderList xml za popis izvršenih URL-ova"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-#, fuzzy
+#: ../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 "Pozicija okomite plo�e u mjese�nom pogledu"
+msgstr ""
+"Položaj vertikalnog okna, između prikaza u karticama i listama, i prethodnog "
+"okna, u pikseilma."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
-msgstr "Prikaži karticu \"Pregled\""
+msgstr "Prikaži plo�u pregleda"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-#, fuzzy
+#: ../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."
 msgstr ""
-"Broj znakova koji moraju biti utipkani prije nego evolution pokuša napraviti "
+"Broj znakova koji moraju biti utipkani prije nego Evolution pokuša napraviti "
 "automatsko nadopunjavanje."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
-msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena"
+msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
-msgstr ""
+msgstr "Okomita pozicija polja"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
-msgstr "Treba li pokazati traku mapa"
+msgstr "Treba li prikazati pregledno polje."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
-msgstr ""
+msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
-msgstr ""
+msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
-msgstr "SMTP prijava"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-#, fuzzy
-msgid "<b>Display</b>"
-msgstr "_Zaslon"
+msgstr "<b>Autorizacija</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Downloading</b>"
-msgstr "<b>Šaljem poštu:</b>"
+msgstr "<b>Preuzimanje</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
-msgstr "Pretraživanje"
+msgstr "<b>Pretraživanje</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
-msgid "<b>Server Information</b>"
-msgstr "Korak 2: Poslužitelj podataka"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Vrsta:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
-msgstr "Adresar"
+msgstr "Dodaj adresar"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Uvijek"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#. 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 "Osnovno"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
-msgstr "Posebno _ime:"
+msgstr "Posebno ime:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
-msgstr "Poštanska adresa"
+msgstr "Email adresa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution će koristiti ovu adresu e-pošte za prijavljivanje na server"
+msgstr ""
+"Evolution će koristiti ovu adresu e-pošte za prijavljivanje na poslužitelj."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
-msgstr "Podržane baze za pretragu"
+msgstr "Pronađi baze pretrage"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
-msgstr "Korisni�ka oznaka"
+msgstr "Pri_java:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nikada"
 
+#. 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
+msgid "No encryption"
+msgstr "Bez enkripcije"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Jedan"
 
+#. 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
-#, fuzzy
-msgid "Search _base:"
-msgstr "Baza _pretrage:"
+#: ../mail/em-account-editor.c:296
+msgid "SSL encryption"
+msgstr "SSL enkripcija"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-#, fuzzy
+msgid "Search Filter"
+msgstr "Pravilo pretraživanja"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search _base:"
+msgstr "Pretraži _bazu:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid "Search _filter:"
+msgstr "_Pravilo pretraživanja"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid "Search filter"
+msgstr "Pravilo pretraživanja"
+
+#: ../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 ""
+"Pravilo pretraživanja je vrsta objekta koji se traži. Ako se ostavi kako je "
+"zadano, tražiti će se objekt vrsta \"osoba\"."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
-"Odabir ove opcije zna�i da će se Evolution povezati na vaš LDAP server samo "
-"akoi\n"
-"on podržava SSL ili TLS."
+"Odabirom ove opcije Evolution će se povezivati samo na LDAP poslužitelje "
+"koji podržavaju SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
-"Odabiranje ove opcije zna�i da će Evolution pokušati da koristi samo SSL/TLS "
-"ako okruženje \n"
-"nije sigurno. Na primjer, ako je vaš LDAP server iza vatrozida na poslu,\n"
-"onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
-"sigurna."
+"Odabirom ove opcije Evolution će se povezivati samo na LDAP poslužitelje "
+"koji podržavaju TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
-"Odabiranje ove opcije zna�i da vaš ne podržava ni SSL ni  TLS.  To \n"
-"zna�i da će vaša baza biti nesigurna, i da ćete biti ranjivi na sigurnosne\n"
-"napade. "
+"Odabir ove opcije zna�i da vaš poslužitelj ne podržava niti SSL niti TLS. "
+"Vaša će veza biti nezaštićena, te ćete stoga biti ranjivi na sigurnosne "
+"napade."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Pod"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-#, fuzzy
+#. 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:292
+msgid "TLS encryption"
+msgstr "TLS enkripcija"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
-"Baza za pretragu je posebno ime (DN) unosa odakle će vaša pretraga\n"
-"po�eti. Ako ovo ostavite prazno, pretraga će po�eti iz korijena stabla "
-"direktorija."
+"Baza pretrage je razlikovno ime (DN) unosa gdje želite da zapo�nu vaše "
+"pretrage. Ako ovo ostavite prazno, pretraga će zapo�eti u korijenskom "
+"direktoriju stabla."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
+#: ../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 "
@@ -1083,17 +1139,17 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 "Opseg pretrage određuje dubinu pretrage po stablu direktorija. Opseg "
-"pretrage \n"
+"pretrage\n"
 "\"sub\" će uklju�iti sve unose ispod vaše baze za pretragu.\n"
-"Opseg pretrage \"one\" će uklju�iti samo unose jedan nivo ispod vaše baze.\n"
+"Opseg pretrage \"one\" će uklju�iti samo unose jedan nivo ispod vaše baze."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Puno ime vašeg LDAP servera. Na primjer, \"ldap.mojafirma.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
@@ -1102,26 +1158,25 @@ msgstr ""
 "Najveći broj unosa za preuzimanje. Ako unesete preveliki \n"
 "broj, vaš će se adresar usporiti."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Metoda koju će Evolution koristiti za vašu prijavu.Postavka \"Email Address"
+"Metoda koju će Evolution koristiti za vašu prijavu. Postavka \"Email adresa"
 "\" zahtijeva anonimni pristup na vaš LDAP poslužitelj."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 "Ime poslužitelja koje će se pojaviti u popisu mapa Evolutiona.\n"
-"Služi samo za potrebe prikazivanja."
+"Služi samo za potrebe prikazivanja. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
@@ -1132,147 +1187,141 @@ msgstr ""
 "Ponuđen je popis standardnih portova. Pitajte svog administratora\n"
 "koji port da odaberete."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
-msgstr "Koristim adresu elektronske pošte"
+msgstr "Koristim adresu e-pošte"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
-msgstr "Adresar"
+msgstr "_Dodaj adresar"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
-msgstr "Podržane baze za pretragu"
+msgstr "_Podržane baze za pretragu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "_Login method:"
-msgstr "Metoda _prijave: "
+msgstr "Metoda _prijave:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
-msgstr "_Prioritet:"
+msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
 msgid "_Search scope:"
 msgstr "Ops_eg pretrage:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 #, fuzzy
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
-msgstr "Oblik vremena:"
+msgstr "_Istek vremena:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
-msgstr ""
+msgstr "_Koristi sigurnu vezu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karte"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../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 "minute"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
-msgstr "<b>Šaljem poštu:</b>"
+msgstr "<b>Email</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Home</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Dom</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
-msgstr "Trenutno slanje poruka"
+msgstr "<b>Brzo dopisivanje</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Job</b>"
-msgstr "<b>Ako</b> "
+msgstr "<b>Posao</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Vrijednost polja</b>"
+msgstr "<b>Razno</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Other</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Drugo</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Telephone</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Telefon</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
-msgstr ""
+msgstr "<b>Web adresa</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
-msgstr "<b>Ako</b> "
+msgstr "<b>Posao</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../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 "_Kategorije..."
+
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -1281,51 +1330,47 @@ msgid "Full _Name..."
 msgstr "Pu_no ime..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
 msgid "Image"
-msgstr "Stranica"
+msgstr "Slika"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../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
-#, fuzzy
 msgid "Mailing Address"
-msgstr "Adresa e-pošte"
+msgstr "Poštanska adresa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#, fuzzy
-msgid "Ni_ckname:"
-msgstr "_Nadimak:"
+msgid "Nic_kname:"
+msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
 msgid "Personal Information"
-msgstr "Informacije o dnevniku"
+msgstr "Osobni podaci"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#, fuzzy
 msgid "Telephone"
-msgstr "<b>Tada</b> "
+msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Posao"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresa:"
 
@@ -1335,9 +1380,8 @@ msgid "_Anniversary:"
 msgstr "God_išnjica:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
 msgid "_Assistant:"
-msgstr "Pomoćnik"
+msgstr "_Pomoćnik:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
@@ -1345,1276 +1389,1294 @@ msgid "_Birthday:"
 msgstr "_Rođendan:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
-msgstr "Kalendar:"
+msgstr "_Kalendar:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
-msgid "_Categories"
-msgstr "Kategorije"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
 msgid "_City:"
 msgstr "_Grad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Company:"
-msgstr "Naredba:"
+msgstr "_Tvrtka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Country:"
 msgstr "_Država:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Department:"
 msgstr "O_djel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_File under:"
-msgstr "Ime trake:"
+msgstr "Da_toteka pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
-msgstr "URL za s_lobodan/zauzet:"
+msgstr "_Slobodan/Zauzet:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
-msgstr "Po�etna stranica"
+msgstr "_Web stranica:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Manager:"
-msgstr "Upravitelj"
+msgstr "_Upravitelj"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_Notes:"
 msgstr "_Bilješke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Office:"
-msgstr "_Ured: "
+msgstr "_Ured:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #, fuzzy
 msgid "_Profession:"
 msgstr "Z_animanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Su_pružnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Država/pokrajina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Naslov:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Video Chat:"
-msgstr ""
+msgstr "_Video �avrljanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Wants to receive HTML mail"
-msgstr "Želi primati _HTML poruke"
+msgstr "_Želi primati poštu u HTML formatu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Web Log:"
-msgstr "_Web stranica:"
+msgstr "_Web zapis:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
-msgstr "_Poslužitelj:"
+msgstr "_Gdje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #, fuzzy
 msgid "_Zip/Postal Code:"
 msgstr "_Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c: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:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../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-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Može se uređivati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Sjedinjene Ameri�ke Države"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alžir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Ameri�ki Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antartika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbedžan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahami"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladeš"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Bjelorusija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Butan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosna i Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Bocvana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Bouvet Otok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Teritorij Britanskog Indijskog Oceana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../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:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bugarska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../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:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../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:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Kajmansko oto�je"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "Centralna Afri�ka Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "ÄŒad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "ÄŒile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Kina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Christmas Otok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Oto�je"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komori"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, Demokratska Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cook Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Hrvatska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Cipar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Češka Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Danska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "�ibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikanska Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Evkador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egipat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../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:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Ekvatorijalna Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritreja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Foklandski otoci"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Faroe Oto�je"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiđi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francuska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Francuska Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Francuska Polinezija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Francuski južni teritoriji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Njema�ka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Gr�ka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Greenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-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:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Gvajana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Heard And McDonald Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Sveta Stolica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../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:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Indija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea, Demokratska Narodna Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Korea, Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Linhenštajn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Ožujak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Makedonija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldivi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauricijus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Republika Moldavija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monako"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Mianmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nova Kaledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Novi Zeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigerija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestinski teritorij"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papua Nova Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paragvaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipini"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../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:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Kvatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Rumunjska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Ruska Federacija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "Sveti Kitts i Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Sveta Lucija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent i Grena-dines"
+msgstr "Saint Vincent i Grenadines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../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:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome and Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Saudijska Arabija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Srbija i Crna Gora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Sejšeli"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../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:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slova�ka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Solomonsko oto�je"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Južna Afrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južna Georgia i Južni Sandwich Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Å panjolska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Å ri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../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:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre And Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard And Jan Mayen Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Svazilend"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Å vedska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Sirija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, Ujedinjena Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tajland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../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:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad i Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Turks i Caicos oto�je"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Ujedinjeni Arapski Emirati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../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:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venecuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Viet Nam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Britanski Djevi�anski Otoci"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Ameri�ki Djevi�anski Otoci"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Otoci Wallis And Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Zapadna Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+msgid "Gadu-Gadu Messenger"
+msgstr "Gadu-Gadu dopisnik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Servis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../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
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Korisni�ko ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Polazno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../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:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../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/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
-msgstr "_Obavezne osobe"
+msgstr "Obavezna polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
 msgid "Contact Editor - %s"
-msgstr "Sva polja"
+msgstr "Uređiva� kontakta - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
-msgstr "Molim odaberite neku od slijedećih opcija"
+msgstr "Molim odaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
-#, fuzzy
-msgid "No image"
-msgstr "Niger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+msgid "_No image"
+msgstr "_Nema slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "Datum povratka nije ispravan"
+msgstr ""
+"Kontakt podaci su neispravni:\n"
+"\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "'%s' ima neispravan format"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s'%s' ima neispravan format"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s '%s' je prazan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
-msgstr "Neispravni potpis"
+msgstr "Neispravni kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-#, fuzzy
-msgid "_Full name:"
-msgstr "_Puno ime:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+msgid "_Full name"
+msgstr "_Puno ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "E-_pošta:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+msgid "E_mail"
+msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+msgid "_Select Address Book"
+msgstr "_Odaberi adresar"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
 msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ove kontakte?"
+"Jeste li sigurni da želite\n"
+"ukloniti kontakt listu (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-#, fuzzy
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ove kontakte?"
+"Jeste li sigurni da želite\n"
+"obrisati ove popise kontakata?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
 msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ove kontakte?"
+"Jeste li sigurni da želite\n"
+"ukloniti kontakt (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2622,177 +2684,159 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "_Adresa 2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Ci_ty:"
 msgstr "_Grad:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Countr_y:"
 msgstr "_Država:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "Puna Adresa"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "K"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Mlađi"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "GÄ‘ica"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Gdin."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "GÄ‘a."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "GÄ‘a."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "St."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Prezime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Srednje ime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufiks:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:1
 msgid "Add IM Account"
 msgstr "Dodaj IM korisni�ki ra�un"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "_Account name:"
 msgstr "_Ime korisni�kog ra�una:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_IM Service:"
 msgstr "Servis _IM:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:243
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Lokacija:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "Add an email to the List"
+msgid "<b>Members</b>"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
-msgid "Insert email addresses from Address Book"
-msgstr "Odabir kontakata iz adresara"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Members"
-msgstr "ÄŒlanovi"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-#, fuzzy
-msgid "Remove an email address from the List"
-msgstr "Ukloni odabrane predmete sa liste priloga"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
-msgstr "_Sakrij adrese prilikom slanja pošte na ovaj popis "
+msgstr "_Sakrij adrese prilikom slanja pošte na ovaj popis"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "Ime _liste:"
 
-#: ../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 "_Unesite adresu e-pošte ili prevucite kontakt u donji popis:"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 #, fuzzy
-msgid "_Select"
-msgstr "Odabrano"
+msgid "Contact List Members"
+msgstr "Popis �lanova"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
-msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Unesite elektronsku adresu ili prevucite kontakt u donji popis:"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../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 "_ÄŒlanovi"
+
+#: ../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:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Knjiga"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Je li novi popis"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
-#, fuzzy
-msgid "_Members"
-msgstr "ÄŒlanovi"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
-#, fuzzy
-msgid "Contact List Members"
-msgstr "Popis �lanova"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Promijenjen kontakt:"
@@ -2808,11 +2852,11 @@ msgstr "Otkriven duplicirani kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
-"Promenjena elektronska adresa ili ime ovog kontakta\n"
-"već postoji u ovoj mapi. Želite li je svejedno dodati?"
+"Ime ili email izabranog kontakta već postoji u ovom direktoriju. Želite li "
+"ga svejedno dodati?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2827,182 +2871,184 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Ime ili elektronska adresa ovog kontakta već postoji\n"
+"Ime ili adresa e-pošte ovog kontakta već postoji\n"
 "u ovom direktoriju. Želite li svejedno dodati?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "Napredna pretraga"
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
+msgid "_Merge"
+msgstr "Spoji"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Spoji kontakt"
+
+#: ../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
+msgid "Email"
+msgstr "E-pošta"
+
+#: ../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
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+msgid "Any field contains"
+msgstr "Polje koje sadrži"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Email begins with"
+msgstr "Poruka po�inje sa"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#, fuzzy
+msgid "Name contains"
+msgstr "sadrži"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "Nema kontakata"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakta"
+msgstr[2] "%d kontakata"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Upit"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Greška kod u�itavanja pregleda adresara"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Greška kod promijene karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "Ime po�inje sa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "Poruka po�inje sa"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Kategorija je"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Polje koje sadrži"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Napredno..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Izvor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../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 "Tip"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Adresar"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Spremi kao VCard"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+msgid "Save as vCard..."
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c: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
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "Novi kontakt..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "Nova lista kontakata..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+msgid "_New Contact..."
+msgstr "_Novi kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Prosljedi kontakt"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-#, fuzzy
-msgid "Forward Contacts"
-msgstr "Prosljedi kontakt"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+msgid "New Contact _List..."
+msgstr "Novi _popis kontakata..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "Pošalji kontaktu poruku"
+msgid "_Save as vCard..."
+msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#, fuzzy
-msgid "Send Message to List"
-msgstr "Pošalji kontaktu poruku"
+msgid "_Forward Contact"
+msgstr "_Proslijedi kontakt"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-#, fuzzy
-msgid "Send Message to Contacts"
-msgstr "Pošalji kontaktu poruku"
+msgid "_Forward Contacts"
+msgstr "_Proslijedi kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Ispis"
+msgid "Send _Message to Contact"
+msgstr "Pošalji poruku_ za kontakt"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+msgid "Send _Message to List"
+msgstr "Pošalji _poruku za popis"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+msgid "Send _Message to Contacts"
+msgstr "Pošalji _poruku za kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
-msgstr "Kopiraj u adresar..."
+msgid "_Print"
+msgstr "_Ispis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
-msgstr "Premjesti u adresar..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+msgid "Cop_y to Address Book..."
+msgstr "Kop_iraj u adresar..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Izreži"
+msgid "Mo_ve to Address Book..."
+msgstr "Pre_baci u adresar..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopiraj"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+msgid "Cu_t"
+msgstr "Iz_reži"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Umetni"
+#: ../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
+#: ../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 "_Kopiraj"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+msgid "P_aste"
+msgstr "_Umetni"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
-#, fuzzy
-msgid "Print cards"
-msgstr "Ispiši zadatke"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "Pomoćnik"
 
@@ -3031,91 +3077,87 @@ msgid "Car Phone"
 msgstr "Telefon (u autu)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-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 "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Telefon poduzeća"
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "Tvrtka"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-pošta"
+msgid "Company Phone"
+msgstr "Telefon poduzeća"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Obiteljsko ime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Datoteka kao"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Dano ime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Faks kod kuće"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Telefon 2 (dom)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Dnevnik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "Upravitelj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "Bilješka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Ured"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Organization"
-msgstr "Organizacija"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3137,14 +3179,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Uloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "Supružnik"
 
@@ -3175,38 +3217,38 @@ msgid "Web Site"
 msgstr "Web-lokacija"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-field-chooser-item.c:655
+#: ../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
 msgid "Width"
 msgstr "Å irina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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
 msgid "Height"
 msgstr "Visina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Sadrži Fokus"
 
@@ -3226,26 +3268,36 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Å irina stupca"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 #, fuzzy
 msgid ""
 "\n"
 "\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Tražim kontakte."
+
+#: ../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"
-"Nema stavki koje sada treba prikazati.\n"
+"Potražite kontakt\n"
 "\n"
-"Kliknite dva puta da biste napravili novi kontakt."
+"ili dva puta kliknite kako biste napravili novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3259,15 +3311,17 @@ msgstr ""
 "\n"
 "Kliknite dva puta da biste napravili novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "Tražim kontakte..."
+msgstr ""
+"\n"
+"\n"
+"Tražim kontakte."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3277,247 +3331,324 @@ msgstr ""
 "\n"
 "Nema se Å¡to pokazati u ovom pogledu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Kartica"
 
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:99
+msgid "Work Email"
+msgstr "Radna e-pošta"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Home Email"
+msgstr "Kućna e-pošta"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
+msgid "Other Email"
+msgstr "Druga e-pošta"
+
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Odabrano"
 
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Sadrži Pokaziva�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+msgid "_Open Link in Browser"
+msgstr "_Otvori vezu u pregledniku"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2795
+msgid "_Copy Link Location"
+msgstr "_Kopiraj lokaciju veze"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+msgid "_Send New Message To..."
+msgstr "_Pošalji nove poruku na..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopiraj _adresu pošte"
+
+#: ../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 "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../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 "karta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Popis �lanova"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
-msgid "E-mail"
-msgstr "E-pošta"
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+msgid "Department"
+msgstr "Odjel"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+msgid "Profession"
+msgstr "Zanimanje"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr "Video savjetovanje"
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+msgid "Video Chat"
+msgstr "Video razgovor"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../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-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 "Kalendar"
+
+#: ../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 "Slobodan/Zauzet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-msgid "work"
-msgstr "posao"
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+msgid "Home Page"
+msgstr "Po�etna stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr "WWW"
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
+msgid "Web Log"
+msgstr "Web zapis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Blog"
-msgstr "Blog"
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+msgid "Birthday"
+msgstr "Rođendan"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
-msgid "personal"
-msgstr "osobno"
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+msgid "Anniversary"
+msgstr "Godišnjica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Poslovna titula"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Po�etna stranica"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
+msgid "Blog"
+msgstr "Blog"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Uspjeh"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
-msgstr ""
+msgstr "Podsustav zauzet"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Arhiva nije na mreži"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
-msgstr "Nova lista kontakata"
+msgstr "Nije definiran osobni kontakt"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Kontakt nije nađen"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Identifikator kontakta već postoji"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c: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
+msgid "Canceled"
 msgstr "Otkazano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
-msgstr "Ne mogu otvoriti izvor"
+msgstr "Ne mogu otkazati"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Provjera vjerodostojnosti neuspješna"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Zahtijev za autentifikaciju obavezan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
-msgstr "Nema takve poruke"
+msgstr "Nema takvog izvora"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
-msgstr "Po�ni sa radom bez mreže"
+msgstr "Nije dostupno u radu bez mreže"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Druga greška"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
-msgstr "Ina�ica"
+msgstr "Neispravna verzija poslužitelja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "Nepodržana operacija"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#, fuzzy
 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 ""
+"Ne mogu otvoriti ovaj adresar. Ovo zna�i da adresar nije ozna�en za "
+"korištenje bez mreže ili još nije preuzet. Molimo u�itajte adresar jedanput "
+"dok ste povezani kako bi se njegov sadržaj preuzeo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
-"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
-"dozvole pristupiti joj."
+"Ne mogu otvoriti ovaj adresar. Molimo provjerite postoji li %s putanja i "
+"imate li dozvole za pristup."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#, 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 ""
 "Ne mogu otvoriti adresar. To zna�i da ste, vjerovatno, unijeli neispravni "
 "URI, ili je LDAP poslužitelj nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 ""
-"Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite "
-"koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
-"nakon Å¡to skinete OpenLDAP sa donjeg linka."
+"Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako ipak želite "
+"koristiti LDAP u Evolutionu, morate instalirati dodatak za LDAP podršku."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, 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 ""
 "Ne mogu otvoriti adresar. To zna�i da ste, vjerovatno, unijeli neispravni "
 "URI, ili je poslužitelj nedostupan"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#, fuzzy
+msgid "Detailed error:"
+msgstr "Neobrađena greška"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#, 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 ""
 "Više karti odgovara upitu koji je ili server tako  \n"
 "podešen vratio ili je Evolution tako podešen da pokaže.\n"
 "Molim da preciznije oblikujete upit ili povećate limit\n"
 "broja rezultata u podešavanjima adresara za server direktorija."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#, 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 ""
 "Vrijeme za izvršavanje ovog upita prekora�uje ograni�enje poslužitelja ili\n"
 "ograni�enje koje ste postavili za ovaj adresar. Molim, preciznije "
@@ -3526,46 +3657,48 @@ msgstr ""
 "direktorija\n"
 "za ovaj adresar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspješno završen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Greška kod dodavanja popisa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Greška prilikom dodavanja kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Greška kod izmjene popisa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Greška prilikom mijenjanja kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja popisa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3573,16 +3706,25 @@ 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] ""
-"Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
-"Da li doista želite prikazati sve ove kontakte?"
+"Otvaranje %d kontakta će otvoriti %d novi prozor.\n"
+"Da li doista želite prikazati ovaj kontakt?"
 msgstr[1] ""
-"Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
-"Da li doista želite prikazati sve ove kontakte?"
+"Otvaranje %d kontakta će otvoriti %d nova prozora.\n"
+"Da li doista želite prikazati ove kontakte?"
 msgstr[2] ""
 "Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
 "Da li doista želite prikazati sve ove kontakte?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
+msgid "_Don't Display"
+msgstr "Ne prikazuj"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
+msgid "Display _All Contacts"
+msgstr "Prikaži sve kontakte"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3591,161 +3733,146 @@ msgstr ""
 "%s već postoji\n"
 "Želite li  prepisati preko njega?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Prebriši"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
-msgstr[0] "Kontakt"
-msgstr[1] "Kontakt"
-msgstr[2] "Kontakt"
+msgstr[0] "kontakt"
+msgstr[1] "kontakta"
+msgstr[2] "kontakata"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
+msgid "Select Address Book"
+msgstr "Odaberite adresar"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "popis"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Premjesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
-msgstr "Kopiraj kontakt u "
+msgstr "Kopiraj kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Premjesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
-msgstr "Kopiraj kontakte u "
+msgstr "Kopiraj kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr "Odaberite odredišni adresar."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
+msgid "Multiple vCards"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(niti jedan) "
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-#, fuzzy
-msgid "Primary Email"
-msgstr "Glavna email adresa"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "Odaberi akciju"
+msgid "vCard for %s"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
+msgid "Contact information"
+msgstr "Informacije o kontaktu"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+msgid "Contact information for %s"
+msgstr "Kontakt informacije za %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Pretražujem adresar..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Postoji još %d kontakt."
+msgstr[1] "Postoje još %d kontakta."
+msgstr[2] "Postoji još %d kontakata."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "Prikaži potpun VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži kompaktan VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Save in addressbook"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#, fuzzy
+msgid "Save in address book"
 msgstr "Spremi u adresaru"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Karti�ni pogled"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Pogled GTK stabla"
-
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
-#, fuzzy
-msgid "Importing ..."
+#: ../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
+msgid "Importing..."
 msgstr "Obrađujem"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-csv-importer.c:863
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV ili Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:864
+msgid "Outlook CSV and Tab Importer"
+msgstr "Outlook CSV i Tab uvoznik"
+
+#: ../addressbook/importers/evolution-csv-importer.c:872
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV ili Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:873
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Mozilla CSV i Tab uvoznik"
+
+#: ../addressbook/importers/evolution-csv-importer.c:881
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV ili Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:882
+msgid "Evolution CSV and Tab Importer"
+msgstr "Evolution CSV i Tab uvoznik"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP format razmjene podataka"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolucija LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: ../addressbook/importers/evolution-vcard-importer.c:530
-msgid "Evolution VCard Importer"
-msgstr "Evolucija VCard uvoznik"
-
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Ispis koverte "
-
-#: ../addressbook/printing/e-contact-print.c:1001
-msgid "Print contacts"
-msgstr "Ispiši kontakte"
+#: ../addressbook/importers/evolution-vcard-importer.c:547
+msgid "vCard (.vcf, .gcrd)"
+msgstr ""
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
-msgid "Print contact"
-msgstr "Ispiši kontakt"
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+msgid "Evolution vCard Importer"
+msgstr ""
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3788,12 +3915,12 @@ msgid "Format"
 msgstr "Oblikovanje"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:432 ../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-selection-model.c:309
 msgid "Header"
 msgstr "Zaglavlje"
 
@@ -3846,7 +3973,6 @@ msgid "Options"
 msgstr "Odrednice"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orijentacija"
 
@@ -3896,9 +4022,9 @@ msgstr "Sjen�anje"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Veli�ina:"
 
@@ -3915,7 +4041,7 @@ msgid "Top:"
 msgstr "Vrh:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "Tip:"
 
@@ -3927,473 +4053,537 @@ msgstr "Å irina:"
 msgid "_Font..."
 msgstr "_Pismo..."
 
-#: ../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 "Testiranje uređiva�a za ispis stila kontakta"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (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 "Ovo bi trebalo testirati element uređiva�a stila ispisa"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Testiranje ispisa kontakata"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "To bi trebalo iskušati kontaktni kod za ispis"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Ne mogu otvoriti datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 #, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Ne mogu u�itati adresar"
+msgid "Couldn't get list of address books"
+msgstr "Ne mogu o�itati listu adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
-msgstr "Ne mogu otvoriti adresar"
+msgstr "ne mogu otvoriti knjigu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "Odredi izlaznu datoteku umjesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
+#: ../addressbook/tools/evolution-addressbook-export.c:53
+#, fuzzy
+msgid "List local address book folders"
 msgstr "Izlistavanje lokalnih mapa adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "Prikaži kartice kao vcard ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
-msgstr "Izvoz u asinhronom na�inu rada"
+msgstr "Izvoz u asinkronom na�inu rada"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr ""
-"Broj kartica u jednoj izlaznoj datoteci u asinhronom na�inu rada, uobi�ajena "
-"veli�ina je 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Greška kod argumenata u naredbenoj liniji, molim koristite --help da biste "
 "vidjeli na�in korištenja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "Podržava asmo csv i vcard formate."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "U asinhronom na�inu rada, izlaz mora biti datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 #, fuzzy
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom na�inu rada, ne treba postojati postavka veli�ine."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
-msgstr "Nepoznata greška"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Greška kod u�itavanja inicijalnog adresara."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Ulazna datoteka"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Ime datoteke nije dano"
-
-#: ../calendar/calendar.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
+msgstr "Neobrađena greška"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"'{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 ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
+"'{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 ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
 msgstr ""
+"Dodavanje suvislog sažetka u vaš zakazani sastanak će dati vašim "
+"primateljima informacije o vašem sastanaku."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"All information in this journal will be deleted and can not be restored."
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr ""
+"Dodavanje suvislog sažetka u vaš zadatak će dati vašim primateljima "
+"informaciju o vašem zadatku."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:8
-msgid "All information on these tasks will be deleted and can not be restored."
+msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
-"All information on this appointment will be deleted and can not be restored."
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr ""
+"Sve informacije o ovim zakazanim sastancima će biti obrisane i neće se moći "
+"povratiti."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
+"Sve informacije o ovim zadacima će biti obrisane i neće se moći povratiti."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid ""
-"All information on this meeting will be deleted and can not be restored."
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
+"Sve informacije o ovom zakazanom sastanku će biti obrisane i neće se moći "
+"povratiti."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this task will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
+"Sve informacije o ovom sastanku će biti obrisane i neće se moći povratiti."
 
 #: ../calendar/calendar.error.xml.h:13
-#, fuzzy
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:14
-#, fuzzy
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+"Sve informacije o ovom zadatku će biti obrisane i neće se moći povratiti."
 
 #: ../calendar/calendar.error.xml.h:15
-#, fuzzy
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Jeste li sigurni da želite obrisati '{0}' zadatak?"
 
 #: ../calendar/calendar.error.xml.h:16
-#, fuzzy
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Jeste li sigurni da želite obrisati sastanak '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
-#, fuzzy
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:18
-#, fuzzy
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Jeste li sigurni da želite obrisati ove {0} sastanke?"
 
 #: ../calendar/calendar.error.xml.h:19
-#, fuzzy
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:20
-#, fuzzy
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Sigurno želite obrisati ovih {0} zadataka?"
 
 #: ../calendar/calendar.error.xml.h:21
-#, fuzzy
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Sigurno želite poništiti i obrisati ovaj sastanak?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Sigurno želite obrisati ovaj sastanak?"
 
 #: ../calendar/calendar.error.xml.h:22
-#, fuzzy
-msgid "Are you sure you want to delete this task?"
-msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+#: ../calendar/gui/dialogs/delete-comp.c:178
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Sigurno želite obrisati ovaj sastanak?"
 
 #: ../calendar/calendar.error.xml.h:23
-#, fuzzy
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Upitaj korisnika kada pokuša poslati poruku bez naslova."
+#: ../calendar/gui/dialogs/delete-comp.c:184
+msgid "Are you sure you want to delete this memo?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:24
-#, fuzzy
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Upitaj korisnika kada pokuša poslati poruku bez naslova."
+#: ../calendar/gui/dialogs/delete-comp.c:181
+msgid "Are you sure you want to delete this task?"
+msgstr "Sigurno želite obrisati ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:25
-#, fuzzy
-msgid "Delete calendar '{0}'?"
-msgstr "Obriši \"%s\""
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:26
-#, fuzzy
-msgid "Delete task list '{0}'?"
-msgstr "Obriši ovaj popis"
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Sigurno želite poslati sastanak bez sažetka?"
 
 #: ../calendar/calendar.error.xml.h:27
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promjene"
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Sigurno želite poslati zadatak bez sažetka?"
 
 #: ../calendar/calendar.error.xml.h:28
-#, fuzzy
-msgid "Don't Send"
-msgstr "Ne briši"
+msgid "Cannot create a new event"
+msgstr "Ne mogu kreirati novi događaj"
 
 #: ../calendar/calendar.error.xml.h:29
 #, fuzzy
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+msgid "Cannot save event"
+msgstr "Ne mogu kreirati novi događaj"
 
 #: ../calendar/calendar.error.xml.h:30
-#, fuzzy
-msgid "Download in progress. Do you want to save the task?"
-msgstr "Želite li spremiti promjene?"
+msgid "Delete calendar '{0}'?"
+msgstr "Obrisati kalendar '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:31
-#, fuzzy
-msgid "Editor could not be loaded."
-msgstr "Objekt se ne može naći\n"
+msgid "Delete memo list '{0}'?"
+msgstr "Obrisati listu dopisa '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
+msgid "Delete task list '{0}'?"
+msgstr "Obriši listu zadataka '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:33
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
+msgid "Do _not Send"
+msgstr "_Nemoj poslati"
 
 #: ../calendar/calendar.error.xml.h:34
-#, fuzzy
-msgid "Error loading calendar"
-msgstr "Greška kod otvaranja kalendara"
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Preuzimanje u tijeku. Želite li spremiti sastanak?"
 
 #: ../calendar/calendar.error.xml.h:35
-#, fuzzy
-msgid "Error loading task list"
-msgstr "Greška kod dodavanja popisa"
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Preuzimanje u tijeku. Želite li spremiti promjene?"
 
 #: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr ""
+msgid "Editor could not be loaded."
+msgstr "Uređiva� ne može biti u�itan."
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
+"E-mail pozivnice će biti poslane svim sudionicima i omogućiti će im da "
+"prihvate zadatak."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
+"E-mail pozivnice će biti poslane svim sudionicima i omogućiti će im da "
+"odgovore."
 
 #: ../calendar/calendar.error.xml.h:39
-#, fuzzy
-msgid "Save Changes"
-msgstr "Spremi poruku..."
+msgid "Error loading calendar"
+msgstr "Greška kod u�itavanja kalendara"
 
 #: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Pošalji"
+msgid "Error loading memo list"
+msgstr "Greška kod u�itavanja liste dopisa"
 
 #: ../calendar/calendar.error.xml.h:41
-#, fuzzy
-msgid "Send Notice"
-msgstr "Za:"
+msgid "Error loading task list"
+msgstr "Greška kod u�itavanja popisa zadataka"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
+"Ako ne pošaljete obavijest o poništenju, ostali sudionici možda neće znati "
+"da je sastanak otkazan."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+"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:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Ako ne pošaljete obavijest o poništenju, ostali sudionici možda neće znati "
+"da je zadatak obrisan."
+
 #: ../calendar/calendar.error.xml.h:45
-#, fuzzy
-msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Evolution vCalendar uvoznik"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Slanje ažuriranih informacija dozvoljava ostalim sudionicima da zadrže "
+"kalendare ažuriranima."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "The Evolution tasks have quit unexpectedly."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr ""
+"Slanje ažuriranih informacija dozvoljava ostalim sudionicima da zadrže "
+"popise zadataka ažuriranima."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
+"Neki privitci su u toku preuzimanja. Spremanje zakazanog sastanka će "
+"rezultirati gubljenjem tih privitaka."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
+"Neki privitci su u toku preuzimanja. Spremanje zadatka će rezultirati "
+"gubljenjem tih privitaka."
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "This calendar will be removed permanently."
+msgid "Some features may not work properly with your current server."
 msgstr ""
+"Neke mogućnosti možda neće ispravno raditi s vašim trenutnim poslužiteljom."
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "This task list will be removed permanently."
-msgstr ""
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution kalendar je neo�ekivano ugašen."
 
 #: ../calendar/calendar.error.xml.h:51
-#, fuzzy
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Želite li spremiti promjene?"
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Evolution memo je neo�ekivano završio"
 
 #: ../calendar/calendar.error.xml.h:52
-#, fuzzy
-msgid "Would you like to save your changes to this task?"
-msgstr "Želite li spremiti promjene?"
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Evolution zadaci su neo�ekivano ugašeni."
 
 #: ../calendar/calendar.error.xml.h:53
-#, fuzzy
-msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr "Sigurno želite poništiti i obrisati ovaj unos u dnevnik?"
+msgid "The calendar is not marked for offline usage."
+msgstr "Kalendar nije ozna�en za offline korištenje."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr ""
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
+msgstr "Lista dopisa nije ozna�ena za offline korištenje"
 
 #: ../calendar/calendar.error.xml.h:55
-msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
+msgid "The task list is not marked for offline usage."
+msgstr "Lista zadatak nije ozna�ena za offline korištenje"
 
 #: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send this task to participants?"
-msgstr ""
+msgid "This calendar will be removed permanently."
+msgstr "Ovaj kalendar će biti trajno uklonjen."
 
 #: ../calendar/calendar.error.xml.h:57
-msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
+msgid "This memo list will be removed permanently."
+msgstr "Ova lista dopisa će biti trajno uklonjena."
 
 #: ../calendar/calendar.error.xml.h:58
-msgid "Would you like to send updated task information to participants?"
-msgstr ""
+msgid "This task list will be removed permanently."
+msgstr "Ova lista zadataka će biti trajno uklonjena."
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Želite li spremiti promjene za ovaj sastanak?"
 
 #: ../calendar/calendar.error.xml.h:60
-#, fuzzy
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređiva�?"
+msgid "Would you like to save your changes to this memo?"
+msgstr "Želite li spremiti izmjene za ovaj dopis?"
 
 #: ../calendar/calendar.error.xml.h:61
-#, fuzzy
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređiva�?"
+msgid "Would you like to save your changes to this task?"
+msgstr "Želite li spremiti promjene za ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:62
-msgid "Your calendars will not be available until Evolution is restarted."
+msgid "Would you like to send a cancelation notice for this memo?"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "Želite li poslati obavijest o poništenju svim sudionicima?"
 
 #: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Save"
-msgstr "_Spremi"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Želite li sudionicima poslati pozivnice za sastanak?"
 
 #: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
-#, fuzzy
-msgid "_Send"
-msgstr "Pošalji"
+msgid "Would you like to send this task to participants?"
+msgstr "Želite li poslati ovaj zadatak sudionicima?"
 
 #: ../calendar/calendar.error.xml.h:66
-msgid "{0}."
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Želite li sudionicima poslati ažurirane informacije o sastanku?"
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to send updated task information to participants?"
+msgstr "Želite li sudionicima poslati ažurirane informacije o zadatku?"
+
+#: ../calendar/calendar.error.xml.h:68
+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 ""
+"Spajate se na nepodržani GroupWise poslužitelj i možete susresti probleme u "
+"korištenju Evolutiona. Za najbolje rezultate, poslužitelj bi trebalo "
+"nadograditi na podržanu verziju."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
-msgid "Enter password"
-msgstr "Upišite lozinku"
+#: ../calendar/calendar.error.xml.h:69
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Izmijenili ste ovaj zakazani sastanak ali ga niste još spremili."
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "You have changed this task, but not yet saved it."
+msgstr "Izmijenili ste ovaj zadatak ali ga niste još spremili."
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Izmijenili ste ovaj dopis ali ga niste još spremili."
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "Vaši kalendari neće biti dostupni do ponovnog pokretanja Evolutiona."
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+"Vaši podsjetnici neće biti dostupni dok se Evolution ne pokrene ponovno"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/calendar.error.xml.h:74
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Vaši zadaci neće biti dostupni do ponovnog pokretanja Evolutiona."
+
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Discard Changes"
+msgstr "_Zanemari promjene"
+
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+msgid "_Save"
+msgstr "_Spremi"
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "_Save Changes"
+msgstr "_Spremi izmjene"
+
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "_Pošalji"
+
+#: ../calendar/calendar.error.xml.h:79
+msgid "_Send Notice"
+msgstr "_Pošalji obavijest"
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "{0}."
+msgstr "{0}."
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Podijeli višednevne događaje:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
-#, fuzzy
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
-msgstr "Nisam mogao pokrenuti wombat server"
+msgstr "Nisam mogao pokrenuti evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisam mogao pro�itati programski blok Kalendara"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
+msgid "Could not read pilot's Memo application block"
+msgstr "Ne mogu �itati pilot's Memo blok programa"
+
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
+msgid "Could not write pilot's Memo application block"
+msgstr "Ne mogu zapisati na pilot's Memo blok programa"
+
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Predefinirani prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao pro�itati pilotov ToDo programski blok"
 
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
+msgid "Could not write pilot's ToDo application block"
+msgstr "Ne mogu zapisati na pilot's ToDo blok programa"
+
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalendari"
 
@@ -4422,27 +4612,46 @@ msgid "Evolution's Calendar component"
 msgstr "Kalendar komponenta Evolutiona"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Evolution Dopisi komponenta"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Komponenta zadataka Evolutiona"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "Dopi_si"
+
+#: ../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/memos-control.c:370
+msgid "Memos"
+msgstr "Dopisi"
+
+#: ../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/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: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 "Zadaci"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
-msgstr "Kalendari"
+msgstr "_Kalendari"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zadaci"
@@ -4451,56 +4660,59 @@ msgstr "_Zadaci"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servis za alarm obavijesti Evolution kalendara"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "minute"
+msgstr[0] "minuta"
 msgstr[1] "minute"
-msgstr[2] "minute"
+msgstr[2] "minuta"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
-#, fuzzy
-msgid "Start time"
-msgstr "_Po�etno vrijeme:"
+#: ../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] "sat"
+msgstr[1] "sata"
+msgstr[2] "sati"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+msgid "Start time"
+msgstr "Vrijeme po�etka"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-#, fuzzy
 msgid "Appointments"
-msgstr "Obveza"
+msgstr "Sastanci"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Lokacija:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#, fuzzy
 msgid "Snooze _time:"
-msgstr "Vrijeme drijemanja (u minutama)"
+msgstr "Vrijeme _drijemanja:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../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
+#: ../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 "_Uredi"
 
@@ -4509,58 +4721,36 @@ msgstr "_Uredi"
 msgid "_Snooze"
 msgstr "_Drijemaj"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#, fuzzy
-msgid "description of appointment"
-msgstr "po�etak zakazanog sastanka"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#, fuzzy
 msgid "location of appointment"
-msgstr "po�etak zakazanog sastanka"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr "Odbaci"
+msgstr "mjesto sastanka"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr "Otpusti _sve"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
-msgstr "Opis ne postoji."
+msgstr "Ne postoji sažetak."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Opis ne postoji."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
-msgstr "Opis ne postoji."
+msgstr "Ne postoje informacije o mjestu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarm za %s\n"
-"%s\n"
-"Po�inje u %s\n"
-"Završava u %s"
+msgid "You have %d alarms"
+msgstr "Imate %d podsjetnika"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4572,7 +4762,7 @@ msgstr ""
 "podsjetnik podešen za slanje poruke. Evolucija će\n"
 "umjesto toga pokazati normalan prozor za dijalog."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4589,397 +4779,552 @@ msgstr ""
 "\n"
 "Sigurno želite pokrenite ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu aplikaciju."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Ne mogu inicijalizirati Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid "Could not create the alarm notify service factory"
-msgstr "Nisam mogao pokrenuti stvaranje servisa za alarm obavijesti"
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "pogrešno vrijeme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
-#, fuzzy
+#. 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/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sata"
+msgstr[2] "%d sati"
+
+#. 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/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minute"
+msgstr[2] "%d minuta"
+
+#. 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/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekunde"
+msgstr[2] "%d sekundi"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
-msgstr "Pokreni program"
+msgstr "Programi podsjetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
-msgstr "Tr_aži potvrdu za brisanje podataka"
+msgstr "Traži potvrdu za brisanje podataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Boja zadataka koji su danas na redu"
+msgstr "Boja zadataka koji su danas na redu, u \"#rrggbb\" obliku."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Boja zadataka kojima je prošao rok"
+msgstr "Boja zadataka kojima je prošao rok, u \"#rrggbb\" obliku."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalendari za koje se pokreću alarmi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../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 ""
+"Boja za iscrtavanje Marcus Bains linije u vremenskoj traci (prazno za "
+"uobi�ajenu)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr ""
+msgstr "Boja za iscrtavanje Marcus Bains linije u dnevnom pregledu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
-msgstr "_Skupi tjedne u mjese�ni prikaz"
+msgstr "Skupi tjedne u mjese�ni prikaz"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
-msgstr ""
+msgstr "Potvrdite brisanje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
+msgstr "Dani na kojima će biti ozna�eni sati za po�etak i kraj radnog vremena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
-msgstr "Obriši sastanak"
+msgstr "Uobi�ajeni podsjetnik za sastanke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
-msgstr "Predefinirani prioritet:"
+msgstr "Jedinice uobi�ajenog podsjetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
-msgstr "Jedinice uobi�ajenog podsjetnika"
+msgstr "Vrijednost uobi�ajenog podsjetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
-msgid "Free/busy server urls"
-msgstr "Slobodan/zauzet zahtjev"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-#, fuzzy
-msgid "Free/busy template url"
-msgstr "Slobodan/zauzet odgovor"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Event Gradient"
+msgstr "Gradijent događaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+msgid "Event Transparency"
+msgstr "Prozirnost događaja"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+msgid "Free/busy server URLs"
+msgstr "URL-ovi poslužitelja za slobodan/zauzet"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy template URL"
+msgstr "URL-ovi predloška za slobodan/zauzet"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+msgid "Gradient of the events in calendar views."
+msgstr "Gradijent događaja u prikazu kalendara."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
-msgstr "_Sakrij ispunjene zadatke nakon "
+msgstr "Sakrij ispunjene zadatke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
-msgstr "Novi popis zadataka"
+msgstr "Sakrij jedinice zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
-msgstr ""
+msgstr "Sakrij vrijednost zadatka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
-msgstr "Vodoravna mreža za crtanje"
+msgstr "Položaj vodoravnog okna"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
+msgstr "Sat završetka radnog dana, od 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
+msgstr "Sat po�etka radnog dana, od 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Intervali prikazani u pogledu dana i radnog tjedna."
+msgstr ""
+"Intervali prikazani u dnevnim prikazima i prikazima radnih tjedana, u "
+"minutama."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
-msgstr ""
+msgstr "Vrijeme posljednjeg alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-#, fuzzy
-msgid "List of server urls for free/busy publishing."
-msgstr "Popis adresa za objavljivanje podatka o dostupnosti/zauzetosti"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+msgid "List of server URLs for free/busy publishing."
+msgstr "Lista URL poslužitelja za slobodno/zauzeto oglašavanje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
-msgstr ""
+msgstr "Marcus Bains linija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
-msgstr ""
+msgstr "Boja Marcus Bains linije - dnevni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
+msgstr "Boja Marcus Bains linije - vremenska traka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minuta na kojoj završava radni dan"
+msgstr "Minuta završetka radnog dana, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minuta na kojoj zapo�inje radni dan"
+msgstr "Minuta po�etka radnog dana, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
-msgstr "Pozicija vodoravne plo�e"
+msgstr "Vodoravna pozivija plo�e mjese�nog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
-msgstr "Pozicija okomite plo�e u glavnom pogledu"
+msgstr "Mjese�ni prikaz vertikalnog prozora položaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-#, fuzzy
-msgid "Number of units for determining for a default reminder."
-msgstr "Broj jedinica za uobi�ajeni podsjetnik"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Number of units for determining a default reminder."
+msgstr "Broj jedinica za određivanje uobi�ajenog podsjetnika."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
-msgstr "Broj jedinica za određivanje kada treba sakriti zadatke"
+msgstr "Broj jedinica za određivanje kada treba sakriti zadatke."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
-msgstr "_Neispunjena zaduženja:"
+msgstr "Boja zakašnjelih zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../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 ""
+"Pozicija vodoravne plo�e, između upravlja�a datuma kalendara i liste "
+"zadataka kada nije u mjese�nom pregledu, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../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 ""
+"Položaj vodoravnog prozora, između prikaza i upravlja�a datumima, kalendara "
+"i liste zadataka u mjese�nom prikazu, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-#, fuzzy
+#: ../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 ""
+"Pozicija vertikalne plo�e, između liste kalendara i pretraživa�a datuma "
+"kalendara."
+
+#: ../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 "Pozicija okomite plo�e u popisu zadataka"
+msgstr ""
+"Položaj vertikalnog prozora, između liste zadataka i okna za prikaz "
+"zadataka, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../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 ""
+"Pozicija okomite plo�e, između upravlja�a datuma kalendara i liste zadataka "
+"kada nije u mjese�nom pregledu, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../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 ""
+"Položaj vertikalnog okna, između prikaza, upravlja�a datumima, kalendara i "
+"liste zadataka, kada nije u mjese�nom prikazu, u pixelima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
-msgstr "Programi koji se mogu pokretati kao dio alarma"
+msgstr "Programi koji se mogu pokretati alarmima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Prikaži RSVP polje u uređiva�u događaja/zadataka/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Prikaži polje Uloga u uređiva�u događaja/zadataka/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
-msgstr "_Pokaži završetke zakazanih sastanaka u tjednim i mjese�nim prikazima"
+msgstr "_Pokaži završetke u tjednim i mjese�nim prikazima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Prikaži polje kategorija u uređiva�u događaja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
-msgstr ""
+msgstr "Prikaži prikaz alarma u obavjesnoj traci"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Prikaži polje stanja u događaj/zadatak/sastanak uređiva�u"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show the \"Preview\" pane"
+msgstr "Prikaži karticu \"Pregled\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show the \"Preview\" pane."
+msgstr "Prikaži karticu \"Pregled\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Prikaži polje vremenske zone u događaj/sastanak uređiva�u"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Prikaži polje vrste u događaj/zadatak/sastanak uređiva�u"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
-msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
+msgstr "Prikaži brojeve tjedana u upravlja�u tjednima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
-msgstr "Z_adaci za danas:"
+msgstr "Bojanje zadataka tijekom dana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
-msgstr ""
+msgstr "Pozicija okomite plo�e zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
+"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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, no-c-format
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
+"Uobi�ajena vremenska zona koja će se koristiti za datum i vrijeme u "
+"kalendaru, nešto kao neprevedena lokacija Olsen baza vremenskih zona kao "
+"\"Amerika/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
-msgstr "Podjela _vremena:"
+msgstr "Vremenska podjela"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
-msgstr "Vrijeme kada je istekao zadnji alarm"
+msgstr "Vrijeme kada je istekao zadnji alarm, u time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:107
 #, fuzzy
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-msgid "Twenty four hour time format"
+#: ../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 ""
+"Prozirnost događaja u pregledu kalendara, vrijednost između 0 (prozirno) i 1 "
+"(neprozirno)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+msgid "Twenty four hour time format"
+msgstr "Prikaži vrijeme koristeći 24-satni oblik"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
+"Jedinice za standardni podsjetnik, \"minutes\", \"hours\" ili \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jedinice koje određuju kada treba sakriti zadatke"
+msgstr ""
+"Jedinice koje određuju kada treba sakriti zadatke, \"minutes\", \"hours\" "
+"ili \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
-msgstr "Po�etak t_jedna:"
+msgstr "Po�etak tjedna"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Radni dan na koji tjedan po�inje "
+msgstr "Prvi dan u tjednu, od nedjelje (0) do subote (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr ""
+msgstr "Koristiti ili ne obavjesnu traku za prikaz alarma."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Treba li tražiti potvrdu prilikom brisanja sastanka"
+msgstr "Treba li tražiti potvrdu prilikom brisanja sastanka ili zadatka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Treba li tražiti potvrdu prilikom brisanja sastanka"
+msgstr ""
+"Treba li tražiti potvrdu prilikom bespovratnog brisanja sastanka ili "
+"zadataka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../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 ""
+"Treba li sažeti vikende u pregledu mjeseca, što stavlja subote i nedjelje u "
+"prostor za jedan dan u tjednu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-#, fuzzy
+#: ../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 "_Pokaži završetke zakazanih sastanaka u tjednim i mjese�nim prikazima"
+msgstr ""
+"Treba li pokazati završetke zakazanih sastanaka u tjednim i mjese�nim "
+"prikazima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../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 ""
+"Treba li crtati Marcus Bainsovu liniju (linija trenutnog vremena) u "
+"kalendaru."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Treba li sakriti završene zadatke"
+msgstr "Treba li sakriti završene zadatke."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
-msgstr "Treba li postaviti uobi�ajeni podsjetnik za sve događaje"
+msgstr "Treba li postaviti uobi�ajeni podsjetnik za sve događaje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Treba li prikazati RSVP polje u uređiva�u događaja/zadataka/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Treba li pokazati polje kategorija u uređiva�u događaja/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Treba li prikazati polje uloge u uređiva�u događaja/zadataka/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+"Treba li prikazati polje statusa u uređiva�u događaja/zadataka/sastanaka"
+
+#: ../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 "Treba li prikazivati vrijeme u 24 satnom obliku umjesto am/pm formata"
+msgstr "Treba li prikazivati vrijeme u 24 satnom obliku umjesto am/pm formata."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Treba li pokazati polje vremenske zone u uređiva�u događaja/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Treba li prikazati polje tipa u uređiva�u događaja/zadataka/sastanaka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Treba li prikazivati brojeve tjedana u navigatoru datumima"
+msgstr "Treba li prikazivati brojeve tjedana u navigatoru datuma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Whether to use daylight savings time while displaying events."
+msgstr "Treba li koristiti ažuriranje vremena prilikom pikaza događaja."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
-msgstr "Radni dani:"
+msgstr "Radni dani"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
-msgstr ""
+msgstr "Kraj radnog vremena (sat)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
-msgstr ""
+msgstr "Kraj radnog vremena (minuta)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
-msgstr "Sat na koji zapo�inje radni dan"
+msgstr "Po�etak radnog dana (sat)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
-msgstr "Sat na koji zapo�inje radni dan"
+msgstr "Po�etak radnog dana (minuta)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "daylight savings time"
+msgstr "ažuriranje vremena"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:73
+msgid "Category is"
+msgstr "Kategorija je"
+
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Mjesto sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Neupariv"
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
-msgid "Calendar"
-msgstr "Kalendar"
+#: ../calendar/gui/cal-search-bar.c:637
+msgid "Next 7 Days' Tasks"
+msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/cal-search-bar.c:641
+msgid "Active Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:645
+msgid "Overdue Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:649
+msgid "Completed Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:653
+msgid "Tasks with Attachments"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:699
+msgid "Active Appointments"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:703
+msgid "Next 7 Days' Appointments"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Ispis"
+
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -4988,163 +5333,380 @@ msgstr ""
 "Ova operacija će trajno obrisati sve događaje starije od odabranog "
 "vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Izbriši događaje starije od"
 
-#: ../calendar/gui/calendar-commands.c:365
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
-#: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../calendar/gui/calendar-commands.c:328
+#: ../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 "dana"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c: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 webu"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i obljetnice"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
-#, fuzzy
 msgid "Weather"
-msgstr "Ostalo"
+msgstr "Vrijeme"
 
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
-msgstr "Novi kalendar"
+#: ../calendar/gui/calendar-component.c:615
+msgid "_New Calendar"
+msgstr "_Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:858
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2106
+msgid "_Copy..."
+msgstr "_Kopiraj..."
+
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
-msgstr "U�itavam kalendar..."
+msgstr "Nisam uspio ažurirati kalendare..."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "NIje moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za stvaranje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1284
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
-msgstr "Lokacija kalendara"
+msgstr "Izbor izvora kalendara"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: ../calendar/gui/calendar-component.c:1476
-msgid "_Appointment"
-msgstr "_Obveza"
-
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1484
-msgid "M_eeting"
-msgstr "_Sastanak"
-
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1492
-#, fuzzy
-msgid "All Day A_ppointment"
-msgstr "Cijelo_dnevni zakazani sastanak"
-
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:1500
-#, fuzzy
-msgid "Cale_ndar"
-msgstr "Kalendar"
-
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Dnevni pregled"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
-msgstr "Pregled radnog tjedna "
+msgstr "Pregled radnog tjedna"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Tjedni pregled"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Mjese�ni pregled"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "Polje"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Privici"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Sudionik"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "Poslovni faks"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "Kategorija je"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Datum dovršetka"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Povjerljivo"
+
+#: ../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 "Opis"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
+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
+msgid "Do Not Exist"
+msgstr "Ne postoji"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Postoji"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "Mauricijus"
+
+#: ../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 "Danas"
+
+#: ../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 "Kontakti"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "dana"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "Tradicionalno"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "Prilagođeni"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Razno"
+
+#: ../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
+msgid "Organizer"
+msgstr "Organizator"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "Telefon"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privatno"
+
+#: ../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
+msgid "Public"
+msgstr "Javno"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Ponavljanje"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "kategorije"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Sažetak"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
+msgid "Summary Contains"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "Odgovori"
+
+#: ../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 "Pri�ekajte..."
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "sadrži"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "ne sadrži"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+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:36
+msgid "is not"
+msgstr "nije"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nije podržana kod otvaranja kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
+msgid "Edit Alarm"
+msgstr "Uredi alarm"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Alarm</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Alarm</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Options</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+msgstr "<b>Postavke</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Repeat</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Ponovi</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
-#, fuzzy
 msgid "Add Alarm"
-msgstr "Dodaj novi kalendar"
+msgstr "Dodaj alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
@@ -5153,98 +5715,92 @@ msgstr "Sastavi poruku"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
-msgstr ""
+msgstr "Zvuk alarma po želji"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
-#, fuzzy
 msgid "Mes_sage:"
-msgstr "_Poruke"
+msgstr "_Poruke:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Odsviraj zvuk"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
-msgstr ""
+msgstr "Izbaci prozor sa alarmom"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Pokreni program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "Odaberite datoteku"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Za:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Pošalji e-poštu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
-msgstr "_Ra�un:"
+msgstr "_Argumenti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
-msgstr "Pokreni program:"
+msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
-msgstr "Ponovi alarm"
+msgstr "Ponovi ala_rm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
-msgstr "Pošalji"
+msgstr "Zvuk"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "nakon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "prije"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#. 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 "dan(a)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kraj zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "sat(i)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "sati"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuta(e)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "po�etak zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Akcija/okida�"
 
@@ -5253,752 +5809,740 @@ msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
-msgstr "Alarm na %s"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
+msgstr "Alarmi"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
+msgid "_Suggest automatic display of attachment"
+msgstr "_Sugeriraj automatski prikaz privitka"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "prilog"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-#, fuzzy
-msgid "_Properties"
-msgstr "Svojstva"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-#, fuzzy
-msgid "_Add attachment..."
-msgstr "Dodaj prilog..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-#, fuzzy
-msgid "Attachment Bar"
-msgstr "Privitak"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Predloži automatsko otvaranje privitka"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Ne mogu priložiti datoteku %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Ne mogu priložiti datoteku %s: nije standardna datoteka"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Svojstva priloga"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Ime trake:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+msgid "Selected Calendars for Alarms"
+msgstr "Odabrani kalendari za alarme"
 
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "Mime tip:"
-
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Omogućeno"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-msgid "Are you sure you want to remove this URL?"
-msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "Ukloni"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-msgid "Don't Remove"
-msgstr "Nemoj ukloniti"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Onemogući"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Omogući"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minuta"
+#: ../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 minuta\n"
+"30 minuta\n"
+"15 minuta\n"
+"10 minuta\n"
+"05 minuta"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Alerts</b>"
-msgstr "<b>Tada</b> "
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u i %d bit će zamjenjeni sa korisnikom i domenom iz email adrese.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Postavke kalendara</b>"
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Upozorenja</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "<b>General</b>"
-msgstr "<b>Tada</b> "
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Uobi�ajeni slobodan/zauzet poslužitelj</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Publishing</b>"
-msgstr "Frekvencija objavljivanja"
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Općenito</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "<b>Task List</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Lista zadataka</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
-msgid "<b>Time</b>"
-msgstr "<b>Tada</b> "
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Vrijeme</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "<b>Work Week</b>"
-msgstr "<b>Ako</b> "
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Radni tjedan</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
+msgstr "Podesi ažuriranje _vremena"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Postave kalendara i zadataka"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Boja zakašnjelih zadataka"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Boja zadataka kojima danas isti�e rok"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Dan _kona�ni:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "dani"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
-msgstr "_Zaslon"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "_Omogući"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Free/Busy"
-msgstr "URL za s_lobodan/zauzet:"
+msgstr "Prikaži"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Sati"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuta"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Minute\n"
+"Sati\n"
+"Dani"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Ponedjeljak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Publishing Table"
-msgstr "svjetlo plava"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Ponedjeljak\n"
+"Utorak\n"
+"Srijeda\n"
+"ÄŒetvrtak\n"
+"Petak\n"
+"Subota\n"
+"Nedjelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:113
+msgid "Pick a color"
+msgstr "Odabir boje"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "S_un"
 msgstr "_Ned"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Select the calendars for alarm notification"
+msgstr "Odaberite kalendare za obavještavanje alarmom"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsjetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "T_hu"
 msgstr "_Čet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Template:"
-msgstr ""
+msgstr "Predložak:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ÄŒetvrtak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "Po�etak t_jedna:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Srijeda"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Wee_k starts on:"
+msgstr "Tjeda_n po�inje u:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 satni (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
 msgstr "_24-satno"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Add URL"
-msgstr "_Dodaj adresu"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "Tr_aži potvrdu za brisanje podataka"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr "_Skupi tjedne u mjese�ni prikaz"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
 msgstr "Po�etak _dana:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
-msgstr "_Sakrij ispunjene zadatke nakon "
+msgstr "_Sakrij ispunjene zadatke nakon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Overdue tasks:"
 msgstr "_Neispunjena zaduženja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
-msgstr "_Pokaži završetke zakazanih sastanaka u tjednim i mjese�nim prikazima"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "_Show appointment end times in week and month view"
+msgstr "_Prikaži kraj sastanaka u tjednom i mjese�nom prikazu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
 msgstr "Podjela _vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Tue"
 msgstr "_Uto"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Wed"
 msgstr "_Sri"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr "prije svakog zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr ""
+#: ../calendar/gui/dialogs/calendar-setup.c:270
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "_Kopiraj sadržaj kalendara lokalno za neumreženi rad"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr ""
+#: ../calendar/gui/dialogs/calendar-setup.c:272
+msgid "Cop_y task list contents locally for offline operation"
+msgstr "_Kopiraj listu zadataka lokalno za neumreženi rad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
-#, fuzzy
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Kopiraj sadržaj mape lokalno za neumreženi rad"
+#: ../calendar/gui/dialogs/calendar-setup.c:274
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr "_Kopiraj popis podsjetnika lokalno za neumreženi rad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #, fuzzy
-msgid "Copy task list contents locally for offline operation"
-msgstr "Kopiraj sadržaj mape lokalno za neumreženi rad"
+msgid "Colo_r:"
+msgstr "_Boja:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "boja"
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "Popis zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#, fuzzy
-msgid "Tasks List"
-msgstr "Lista zadataka"
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+msgid "Memo List"
+msgstr "Popis podsjetnika"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Svojstva kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:475
+msgid "New Calendar"
+msgstr "Novi kalendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Osobine popisa zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Task List"
-msgstr "Dodaj novi popis zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Odabir boje"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Task List"
-msgstr "Dodaj novi popis zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
-#: ../plugins/calendar-weather/calendar-weather.c:548
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 #, fuzzy
-msgid "_Refresh:"
-msgstr "Osvježi"
+msgid "New Task List"
+msgstr "_Nova lista zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 #, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+msgid "Memo List Properties"
+msgstr "Osobine popisa zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "tjedni"
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "New Memo List"
+msgstr "Nova lista bilješki"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Ovaj zadatak je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Ovaj unos u dnevnik je obrisan."
+#: ../calendar/gui/dialogs/changed-comp.c:64
+msgid "This memo has been deleted."
+msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i zatvoriti uređiva�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Zatvoriti uređiva�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Ovaj događaj je mijenjan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Ovaj zadatak je mijenjan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Ovaj unos u dnevnik je mijenjan."
+#: ../calendar/gui/dialogs/changed-comp.c:88
+msgid "This memo has been changed."
+msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređiva�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređiva�?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška pri provjeri: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
-msgstr "do"
+msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
-msgstr "(Završeno "
+msgstr " (Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:232
+#, c-format
 msgid "Attached message - %s"
-msgstr "Prosljeđena poruka - %s"
+msgstr "Poruka u privitku - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
-#, fuzzy, c-format
+#: ../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
+#, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "Pridruži izvornu poruku"
-msgstr[1] "Pridruži izvornu poruku"
-msgstr[2] "Pridruži izvornu poruku"
-
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_Kopiraj"
+msgstr[0] "%d poruka u privitku"
+msgstr[1] "%d poruke u privitku"
+msgstr[2] "%d poruka u privitku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Pomakni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
-msgstr "Otkaži zadatak"
+msgstr "Otkaži _povla�enje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "prilog"
+
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Nisam mogao ažurirati objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
-#, fuzzy, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "Dodana <b>%d</b> datoteka"
-msgstr[1] "Dodane <b>%d</b> datoteke"
-msgstr[2] "Dodano <b>%d</b> datoteka"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#, fuzzy
-msgid "_Attachment Bar (drop attachments here)"
-msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Promijeni zakazani sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
 msgid "Meeting - %s"
-msgstr "Sastanak"
+msgstr "Sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
 msgid "Assigned Task - %s"
-msgstr "Dodijeli zadatak"
+msgstr "Dodijeljen zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Stavka dnevnika - %s"
+msgid "Memo - %s"
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
-msgid "No summary"
+#: ../calendar/gui/dialogs/comp-editor.c:968
+#, fuzzy
+msgid "No Summary"
 msgstr "Nema sažetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Klikni ovdje za zatvaranje trenutnog prozora"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Kopiraj odabrani tekst u odlagalište"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Izreži odabrani tekst u odlagalište"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Klikni ovdje za pregled raspoložive pomoći"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Umetni tekst iz međumemorije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Klikni ovdje za spremanje trenutnog prozora"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Odaberi sav tekst"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Svrstavanje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+#, fuzzy
+msgid "_Insert"
+msgstr "_Ubaci"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Opcije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "P_ogled"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Prilog..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Kliknite ovdje za dodavanje datoteke"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "K_ategorije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Određuje jesu li prikazane kategorije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Vremenska _zona"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Određuje je li vremenska zona prikazana"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "_Javno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Ozna�i kao javno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Osobno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+#, fuzzy
+msgid "Classify as private"
+msgstr "Ozna�i kao osobno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Povjerljivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Ozna�i kao povjerljivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "Popis ul_oga"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Određuje je li polje uloge prikazano"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Određuje je li RSVP polje prikazano"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Polje statusa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Određuje je li polje statusa prikazano"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Polje vrste"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Određuje je li polje vrste sudionika prikazano"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "% završeno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Dodaj"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
+#, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] "<b>%d</b>Privitak"
+msgstr[1] "<b>%d</b>Privitka"
+msgstr[2] "<b>%d</b>Privitaka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1912
+msgid "Hide Attachment _Bar"
+msgstr "Sakrij traku sa privitcima"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+msgid "Show Attachment _Bar"
+msgstr "Prikaži traku sa privitcima"
+
+#: ../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
+#: ../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 "_Ukloni"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "Dodaj privitak..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
+msgid "Show Attachments"
+msgstr "Prikaži privitke"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2246
+msgid "Press space key to toggle attachment bar"
+msgstr "Pritisnite space tipku za aktiviranje i deaktiviranje trake privitaka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmjene u�injene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Ne mogu koristiti trenutnu ina�icu!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Ne mogu otvoriti izvor"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Ne mogu otvoriti odredište"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Odredište je samo za �itanje"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-comp.c:201
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "_Obrisati stavku iz sadnu�ića ostalih primatelja?"
+
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zadatak se ne može obrisati zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Unos u dnevniku nije mogao biti obrisan zbog corba greške"
+#: ../calendar/gui/dialogs/delete-error.c:58
+msgid "The memo could not be deleted due to a corba error"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Unos nije mogao biti obrisan zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zadatak se ne može obrisati jer nemate potrebne ovlasti"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Unos u dnevniku nije mogao biti obrisan zbog nemogućnosti pristupa"
+#: ../calendar/gui/dialogs/delete-error.c:74
+msgid "The memo could not be deleted because permission was denied"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj se ne može obrisati zbog greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Zbog greške je zadatak nemoguće izbrisati"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Zbog greške je nemoguće obrisati stavku dnevnika"
+#: ../calendar/gui/dialogs/delete-error.c:90
+msgid "The memo could not be deleted due to an error"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Zbog greške je stavku nemoguće obrisati"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-#, fuzzy
 msgid "Contacts..."
-msgstr "Kontakti"
+msgstr "Kontakti..."
 
 #: ../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 "Delegiraj za:"
 
@@ -6006,321 +6550,250 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Obveza"
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarmi"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
-msgid "Recurrence"
-msgstr "Ponavljanje"
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+"Kliknite ovdje za postavljanje ili isklju�ivanje alarma za ovaj događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "Raspored"
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Ponavljajući"
 
-#: ../calendar/gui/dialogs/event-editor.c:174
-#, fuzzy
-msgid "Delegatees"
-msgstr "Delegirano"
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Postavi ovo kao ponavljajući događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
-#, fuzzy
-msgid "Attendees"
-msgstr "Sudionik"
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opcije slanja"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Ubaci napredne opcije slanja"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "_Cjelodnevni događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Određuje da li će se imati cjelodnevni događaj"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
 #, fuzzy
-msgid "Invitations"
-msgstr "Orijentacija"
+msgid "Show Time as _Busy"
+msgstr "Pokaži vrijeme kao _zauzeto"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Određuje prikazivanje vremena kao zauzetog"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Zauzet/slobodan"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Upitaj sudionike o zauzeću/slobodnosti"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
+msgid "Appoint_ment"
+msgstr "_Sastanak"
 
 #: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
+msgid "This event has alarms"
+msgstr "Ovaj događaj ima alarme"
+
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "_Organizator:"
+
+#: ../calendar/gui/dialogs/event-page.c:840
+msgid "_Delegatees"
+msgstr "_Delegati"
+
+#: ../calendar/gui/dialogs/event-page.c:842
+msgid "Atte_ndees"
+msgstr "_Sudionici"
+
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Događaj bez datuma po�etka"
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Po�etni datum je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Završni datum je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Po�etno vrijeme je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
+msgid "The organizer selected no longer has an account."
+msgstr "Odabrani organizator više nema ra�un."
+
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
+msgid "An organizer is required."
+msgstr "Potreban je organizator."
+
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
+msgid "At least one attendee is required."
+msgstr "Nužna je najmanje jedna prisutna osoba."
+
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
+msgid "_Add "
+msgstr "_Dodaj "
+
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2914
+#, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "prije svakog zakazanog sastanka"
-msgstr[1] "prije svakog zakazanog sastanka"
-msgstr[2] "prije svakog zakazanog sastanka"
+msgstr[0] "%d dan prije sastanka"
+msgstr[1] "%d dana prije sastanka"
+msgstr[2] "%d dana prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:1900
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/event-page.c:2920
+#, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "kraj zakazanog sastanka"
-msgstr[1] "kraj zakazanog sastanka"
-msgstr[2] "kraj zakazanog sastanka"
+msgstr[0] "%d sat prije sastanka"
+msgstr[1] "%d sata prije sastanka"
+msgstr[2] "%d sati prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:1908
-#, fuzzy, c-format
-msgid "%d minute before appointement"
+#: ../calendar/gui/dialogs/event-page.c:2926
+#, c-format
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "prije svakog zakazanog sastanka"
-msgstr[1] "prije svakog zakazanog sastanka"
-msgstr[2] "prije svakog zakazanog sastanka"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:2939
+msgid "Customize"
+msgstr "Prilagodi"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../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
+#: ../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.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-signature-combo-box.c:70
+msgid "None"
+msgstr "Nijedan"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
-msgstr "prije svakog zakazanog sastanka"
+msgstr "1 dan prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
-msgstr "prije svakog zakazanog sastanka"
+msgstr "1 sat prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
-msgstr "prije svakog zakazanog sastanka"
+msgstr "15 minuta prije sastanka"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-#, fuzzy
-msgid "<b>Basics</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy
-msgid "<b>Date and Time</b>"
-msgstr "<b>Tada</b> "
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
-msgid "<b>Send Options</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+msgid "Attendee_s..."
+msgstr "Sudioni_ci..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "Cije_lodnevni događaj"
+msgid "Custom Alarm:"
+msgstr "Prilagođen alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
-msgid "C_ustomize..."
-msgstr "Spremi korisni�ki pogled..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Ca_tegories..."
-msgstr "_Kategorije..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#, fuzzy
-msgid "Cale_ndar:"
-msgstr "Kalendar:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Classi_fication:"
-msgstr "Klasifikacija"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "Povjerljivo"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#, fuzzy
 msgid "Event Description"
-msgstr "Opis"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#, fuzzy
-msgid "Locat_ion:"
-msgstr "Lokacija:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "Privatno"
+msgstr "Opis događaja"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "Javno"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#, fuzzy
-msgid "Show time as _busy"
-msgstr "Pokaži vrijeme kao"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../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 "_Sažetak:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
-msgstr "_O�isti"
+msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "_Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "_Krajnje vrijeme:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "_Po�etno vrijeme:"
-
-#: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Tada</b> "
-
-#: ../calendar/gui/dialogs/meeting-page.c:307
-#, fuzzy
-msgid "<b>From:</b>"
-msgstr "<b>Tada</b> "
-
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "Nijedan"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "Odabrani organizator više nema ra�un."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "Potreban je organizator."
-
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-msgstr "Nužna je najmanje jedna prisutna osoba."
-
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-msgstr "_Delegiraj za..."
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Sudionik"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Kliknite ovdje za dodavanje sudionika"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Uobi�ajeno ime"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegirano od"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegirano za"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jezik"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "ÄŒlan"
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "_Vrijeme:"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
+#. 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 "Za"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
+#. 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 "do"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
-#, fuzzy
 msgid "<b>Att_endees</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>_Sudionici</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
@@ -6328,153 +6801,205 @@ msgid "C_hange Organizer"
 msgstr "_Promijeni organizatora"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
-#, fuzzy
-msgid "Con_tacts..."
-msgstr "Kontakti"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "Or_ganizer:"
-msgstr "Organizator:"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#, fuzzy
-msgid "Organizer"
-msgstr "Organizator:"
+msgid "Co_ntacts..."
+msgstr "_Kontakti..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "<b>Calendar options</b>"
-msgstr "<b>Postavke kalendara</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Add New Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Group"
-msgstr "Grupa kalendara"
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+msgid "Memo"
+msgstr "Bilješka"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Location"
-msgstr "Lokacija kalendara"
+#: ../calendar/gui/dialogs/memo-page.c:847
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Ne mogu otvoriti bilješke u'%s'."
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
-msgid "Calendar Name"
-msgstr "Ime kalendara"
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
+msgid "To"
+msgstr "Prima"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "<b>Task List Options</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "_Po�etni datum:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Add New Task List"
-msgstr "Dodaj novi popis zadataka"
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+msgid "T_o:"
+msgstr "_Za:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Group"
-msgstr "Grupa popisa zadataka"
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Grupa:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:5
-msgid "Task List Name"
-msgstr "Ime popisa zadataka"
+#: ../calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Mijenjate ponavljajući događaj. Što želite promjeniti?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Mijenjate povratni događaj, što želite promijeniti?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, fuzzy
-msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "Mijenjate povratni događaj, što želite promijeniti?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Prenosite ponavljajući događaj. Što želite prenjeti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Mijenjate povratni zadatak,što želite promijeniti?"
+#: ../calendar/gui/dialogs/recur-comp.c:56
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Mijenjate ponavljajući zadatak. Što želite promjeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Mijenjate povratni unos u dnevnik, što želite promijeniti?"
+#: ../calendar/gui/dialogs/recur-comp.c:60
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Samo ova pojava"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Ova i prethodne instance"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Ova i buduće pojave"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Svi unosi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Datum povratka nije ispravan"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
 #: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "uklju�eno"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "prvi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+#, fuzzy
 msgid "second"
-msgstr "sekunda"
+msgstr "drugi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "treći"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "�etvrti"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "posljednjoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Drugi datum"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "1. do 10."
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "11. do 20."
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "21. do 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
 msgid "day"
 msgstr "dan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ponavljanja"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
+msgid "Add exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
+msgid "Could not get a selection to delete."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/vrijeme"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-#, fuzzy
 msgid "<b>Exceptions</b>"
-msgstr "Izuzetci"
+msgstr "<b>Izuzeci</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:3
@@ -6482,382 +7007,346 @@ msgid "<b>Preview</b>"
 msgstr "<b>Pregled</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
 msgid "<b>Recurrence</b>"
-msgstr "Ponavljanje"
+msgstr "<b>Ponavljanje</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "Svaki"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
+#. 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 "_Promijeni sastanak"
+msgstr "Ovaj sastanak se po_navlja"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "Za"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "uvijek"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "mjesec(i)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "do"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "tjedan(a)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: ../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 "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
-#, fuzzy
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
-msgstr "_Web stranica:"
+msgstr "Web stranica"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
-#, fuzzy
 msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<b>Vrijednost polja</b>"
+msgstr "<span weight=\"bold\">Razno</span>"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Stanje</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c: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-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
 msgid "Completed"
 msgstr "Završeno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Visok"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c: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
 msgid "In Progress"
 msgstr "Izvodi se"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Nisko"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
+#: ../calendar/gui/e-cal-component-preview.c: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
 msgid "Normal"
 msgstr "Obi�no"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c: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/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Nije zapo�elo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:10
-#, fuzzy
 msgid "P_ercent complete:"
-msgstr "Postotak završenog: %i"
+msgstr "_Završeni postotak:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+msgid "Stat_us:"
+msgstr "_Stanje:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Neodređeno"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Datum dovršetka:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "_Stanje:"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Web stranica:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "Zadatak"
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Detalji stanja"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Klikni promijeni / pogledaj detalje stanja za zadatak"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr "Dodjela"
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "_Opcije slanja"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-editor.c:318
+msgid "_Task"
+msgstr "_Zadatak"
+
+#: ../calendar/gui/dialogs/task-editor.c:321
+msgid "Task Details"
+msgstr "Detalji zadatka"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-#, fuzzy
-msgid "D_escription:"
-msgstr "Opis:"
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "_Sudionici..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
-msgid "Sta_rt date:"
-msgstr "_Po�etni datum:"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "_Kategorije..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
-msgid "Task Description"
-msgstr "Opis"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:15
-msgid "_Due date:"
+msgid "D_ue date:"
 msgstr "_Datum krajnjeg roka:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-#, fuzzy
-msgid "_Group:"
-msgstr "Grupa:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-#, fuzzy
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Postavke kalendara</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "<b>Publishing Frequency</b>"
-msgstr "Frekvencija objavljivanja"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-#, fuzzy
-msgid "<b>Publishing _Location</b>"
-msgstr "Slobodna/zauzeta lokacija izdavanja"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-#, fuzzy
-msgid "Free/Busy Publishing Settings"
-msgstr "Slobodan/zauzet zahtjev"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-#, fuzzy
-msgid "_Daily"
-msgstr "Dnevno"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
-msgid "_Manual"
-msgstr "_Pošta:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#, fuzzy
-msgid "_Password:"
-msgstr "Lozinka:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#, fuzzy
-msgid "_Remember password"
-msgstr "Zapamti lozinku"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-#, fuzzy
-msgid "_Username:"
-msgstr "_Korisni�ko ime:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
-#, fuzzy
-msgid "_Weekly"
-msgstr "Tjedno"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr "Vremenska zona:"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dan"
+msgstr[1] "%d dana"
+msgstr[2] "%d dana"
 
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d tjedan"
+msgstr[1] "%d tjedna"
+msgstr[2] "%d tjedana"
 
-#: ../calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/e-alarm-list.c:415
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Izvršit će se nepoznata akcija"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prije po�etka sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon po�etka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na po�etku sastanka"
 
+#. 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
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prije kraja sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s kod %s"
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokreta�a"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Bez naslova"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
-#: ../calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sažetak:"
-
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../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�etni datum"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../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 "Opis:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
+msgid "Web Page:"
+msgstr "Web stranica:"
+
+#: ../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 "Sažetak:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Datum krajnjeg roka:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-#, fuzzy
-msgid "Web Page:"
-msgstr "_Web stranica:"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Završni datum"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "Datum po�etka"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "Sažetak"
-
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Slobodno"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6867,171 +7356,228 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../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-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
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Ponavljajući"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Dodijeljeno"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+msgid "Save As..."
+msgstr "Snimi kao..."
+
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+msgid "Select folder to save selected attachments..."
+msgstr "Odaberite mapu gdje želite spremiti privitke..."
+
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#, c-format
+msgid "untitled_image.%s"
+msgstr "nenaslovljena_slika.%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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+msgid "_Save As..."
+msgstr "_Spremi Kao..."
+
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
+msgid "Set as _Background"
+msgstr "Postavi kao _pozadinu"
+
+#: ../calendar/gui/e-cal-popup.c:287
+msgid "_Save Selected"
+msgstr "_Spremi odabrano"
+
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#, c-format
+msgid "Open in %s..."
+msgstr "Otvori u %s..."
+
+#: ../calendar/gui/e-calendar-table.c:338
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Nema sažetka"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizator: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+#, fuzzy
+msgid "Start: "
+msgstr "Po�etak"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "Due "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-#, fuzzy
-msgid "Task Table"
-msgstr "Ažuriranje zadatka"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Spremi kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
+msgid "New _Task"
+msgstr "_Novi zadatak"
+
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Otvori _web stranicu"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "_Spremi Kao..."
-
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
-msgid "_Print..."
-msgstr "_Ispis..."
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../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 "I_zreži"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
+#: ../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 "_Zaljepi"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Dodijeli zadatak"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
-msgstr "_Proslijedi kao iCalendar "
+msgstr "_Proslijedi kao iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
-msgstr "_Obilježi kao izvršeno "
+msgstr "_Obilježi kao izvršeno"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
-msgstr "_Obilježi odabrane zadatke kao izvršene "
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_Obriši"
+msgstr "_Obilježi odabrane zadatke kao izvršene"
+
+#: ../calendar/gui/e-calendar-table.c:1591
+msgid "_Mark as Incomplete"
+msgstr "Ozna�i kao _nedovršeno"
+
+#: ../calendar/gui/e-calendar-table.c:1592
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_Ozna�i odabrani zadatak kao nedovršen"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši odabrane zadatke"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite ovdje za dodavanje zadatka"
@@ -7041,7 +7587,7 @@ msgstr "Kliknite ovdje za dodavanje zadatka"
 msgid "% Complete"
 msgstr "% gotovo"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Završi"
 
@@ -7054,7 +7600,8 @@ msgid "Due date"
 msgstr "Datum krajnjeg roka"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -7062,120 +7609,119 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Datum po�etka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Razvrstani zadaci"
-
-#: ../calendar/gui/e-calendar-view.c:1231
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
-msgstr "Premještam poruke"
+msgstr "Premještam stavke"
 
-#: ../calendar/gui/e-calendar-view.c:1233
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
-msgstr "Kopiram poruke"
+msgstr "Kopiram stavke"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "Novi zadatak"
+#: ../calendar/gui/e-calendar-view.c:1653
+msgid "New _Meeting"
+msgstr "_Novi sastanak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "Trenuta�ni pogled"
+#: ../calendar/gui/e-calendar-view.c:1664
+msgid "_Current View"
+msgstr "_Trenuta�ni pogled"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "Select _Today"
-msgstr "Odaberi _nit"
+#: ../calendar/gui/e-calendar-view.c:1666
+msgid "Select T_oday"
+msgstr "_Odaberi danas"
 
-#: ../calendar/gui/e-calendar-view.c:1519
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
-msgstr "_Obriši..."
+msgstr "_Odaberi datum..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Objavi slobodnu/zauzetu informaciju"
+#: ../calendar/gui/e-calendar-view.c:1673
+msgid "Pri_nt..."
+msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1540
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
-msgstr "Kopiraj u mapu..."
+msgstr "_Kopiraj u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
-msgstr "_Premjesti u mapu..."
+msgstr "_Premjesti u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
-msgstr "_Zakaži sastanak..."
+msgstr "_Odaberi delegata za sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
-msgstr "_Proslijedi kao iCalendar... "
+msgstr "_Proslijedi kao iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1688
+msgid "_Reply"
+msgstr "_Odgovori"
+
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "_Odgovori svima"
+
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
-msgstr "Obriši ovu pojavu"
+msgstr "_U�ini ovaj događaj pokretnim"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#, c-format
+msgid "Location: %s"
+msgstr "Mjesto: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2269
+#, c-format
+msgid "Time: %s %s"
+msgstr "Vrijeme: %s %s"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
-"Datum morate unijeti u formatu: \n"
-"\n"
-"%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "razmaci od %02i minuta"
@@ -7186,544 +7732,555 @@ msgstr "razmaci od %02i minuta"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povratak)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Svaki %d dan"
+msgstr[1] "Svakih %d dana"
+msgstr[2] "Svakih %d dana"
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Svaki %d tjedan"
+msgstr[1] "Svakih %d tjedna"
+msgstr[2] "Svakih %d tjedana"
 
-#: ../calendar/gui/e-itip-control.c:781
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Svaki %d tjedan u "
+msgstr[1] "Svakih %d tjedna u "
+msgstr[2] "Svakih %d tjedana u "
 
-#: ../calendar/gui/e-itip-control.c:789
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
-msgstr " i"
+msgstr " i "
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "svaki %d mjesec"
+msgstr[1] "svakih %d mjeseca"
+msgstr[2] "svakih %d mjeseci"
 
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Svake %d godine"
+msgstr[1] "Svakih %d godine"
+msgstr[2] "Svakih %d godina"
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ukupno %d put"
+msgstr[1] "ukupno %d puta"
+msgstr[2] "ukupno %d puta"
 
-#: ../calendar/gui/e-itip-control.c:840
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", završavajući sa "
 
-#: ../calendar/gui/e-itip-control.c:864
-#, fuzzy
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
-msgstr "Status"
+msgstr "Po�inje"
 
-#: ../calendar/gui/e-itip-control.c:877
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
-msgstr ""
+msgstr "Završava"
 
-#: ../calendar/gui/e-itip-control.c:911
-#: ../plugins/save-calendar/csv-format.c:395
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
-msgstr "Due "
+msgstr "Krajnji rok"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar informacije"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Greška iCalendara"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c: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 "Nepoznata osoba"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../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> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
 
-#: ../calendar/gui/e-itip-control.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c: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:2034
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c: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:2040
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
+msgstr "Sastanak je otkazan, ali ne može biti pronađen u kalendarima"
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr "Zadatak je otkazan, ali ne može biti pronađen u listi zadataka"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../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> traži da %s bude prisutan na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> želi dodati postojećem sastanku."
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> je otkazo sastanak."
+msgid "<b>%s</b> has canceled a meeting."
+msgstr "<b>%s</b> je otkazao sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
-msgstr "Otkaz sastanka"
+#: ../calendar/gui/e-itip-control.c:1401
+msgid "Meeting Cancelation"
+msgstr "Otkazivanje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c: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> je poslao nerazumljivu poruku."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informacija o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži obavljanje zadatka od %s."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> želi dodati postojećem zadatku."
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1478
+msgid "Task Cancelation"
 msgstr "Otkazivanje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Neispravna poruka o dostupnosti"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "Čini se da poruka nije ispravno sa�injena"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahtjeve."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt je neispravan i ne može biti ažuriran\n"
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje prisutne osobe ne može biti osvježeno jer unos više ne postoji"
 
-#: ../calendar/gui/e-itip-control.c:2011
-msgid "Removal Complete"
-msgstr "Uklanjanje završeno"
-
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Odaberite akciju:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: ../calendar/gui/e-itip-control.c:2265
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2267
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Odbijanje"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--za--"
 
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "Poruka kalendara"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "U�itavam kalendar"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "U�itavam kalendar..."
 
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Poruka poslužitelja:"
 
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "krajnji-datum"
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "po�etni-datum"
-
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Predsjedništvo"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Obavezni sudionici"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Resursi"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:152
+#, fuzzy
+msgid "Attendees"
+msgstr "Sudionik"
+
+#: ../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
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../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
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Resurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../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
 msgid "Chair"
 msgstr "Mjesto"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../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
 msgid "Required Participant"
 msgstr "Obavezan sudionik"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Slobodan u�esnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Ne-u�esnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c: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 "Zahtjeva akciju"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../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
 msgid "Tentative"
 msgstr "Okvirno"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-list-view.c: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
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:491
+msgid "Attendee                          "
+msgstr "Sudionik                          "
+
+#. 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 "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "U toku"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7731,91 +8288,115 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Odsutan..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Nema podataka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:415
+msgid "A_ttendees..."
+msgstr "_Sudionici..."
+
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
-msgstr "Odrednice"
+msgstr "_Postavke"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
-msgstr "Pokaži _samo radne sate"
+msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
-msgstr "Pokaži _umanjeno"
+msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
-msgstr "Ažuriraj slobodan/zauzet"
+msgstr "_Ažuriraj slobodan/zauzet"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Sam bira"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
-msgstr "_Sve osobe i svi izvori"
+msgstr "_Sve osobe i svi resursi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
-msgstr "Sve _osobe i jedan izvor"
+msgstr "Sve _osobe i jedan resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
-msgstr "_Obavezne osobe"
+msgstr "_Potrebne osobe"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
-#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
-msgstr "_Obavezni sudionici i jedan izvor"
+msgstr "_Obavezni sudionici i jedan resurs"
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Unesite lozinku za %s"
+#: ../calendar/gui/e-meeting-time-sel.c:606
+msgid "_Start time:"
+msgstr "_Po�etno vrijeme:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:633
+msgid "_End time:"
+msgstr "_Krajnje vrijeme:"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Kliknite ovdje za dodavanje sudionika"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Uobi�ajeno ime"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegirano od"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegirano za"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Jezik"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "ÄŒlan"
+
+#: ../calendar/gui/e-memo-table.c:942
+msgid "_Delete Selected Memos"
+msgstr "_Obriši odabrane bilješke"
+
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Kliknite za dodavanje bilješku"
+
+#: ../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"
@@ -7824,75 +8405,80 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:809
+msgid "Loading memos"
+msgstr "U�itavam bilješke"
+
+#: ../calendar/gui/e-memos.c:890
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Otvaram bilješke u %s"
+
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+msgid "Deleting selected objects..."
+msgstr "Brišem odabrane objekte..."
+
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "U�itavanje zadataka"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "Brišem odabrane objekte..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: ../calendar/gui/e-timezone-entry.c:133
-#, fuzzy
-msgid "Timezone Button"
-msgstr "Vremenska zona"
+#: ../calendar/gui/e-timezone-entry.c:129
+msgid "Select Timezone"
+msgstr "Odaberite vremensku zonu"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
-#, fuzzy
-msgid "Updating query"
-msgstr "Unosim promene u objekte"
+#: ../calendar/gui/gnome-cal.c:2576
+msgid "_Custom View"
+msgstr "_Prilagođen prikaz"
 
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Korisni�ki pogled"
+#: ../calendar/gui/gnome-cal.c:2577
+msgid "_Save Custom View"
+msgstr "_Spremi prilagođen prikaz"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Spremi podešeni izgled"
+#: ../calendar/gui/gnome-cal.c:2582
+msgid "_Define Views..."
+msgstr "_Definiraj poglede..."
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Odredi poglede..."
-
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "U�itavam sastanke kod %s"
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "U�itavam zadatke kod %s"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2815
+#, c-format
+msgid "Loading memos at %s"
+msgstr "U�itavanje podsjetnika na %s"
+
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -7941,74 +8527,141 @@ msgid "October"
 msgstr "Listopad"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "Odaberi sav tekst"
+msgstr "Odaberite datum"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Rujan"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "_Select Today"
-msgstr "Izaberite direktorij"
+msgstr "_Odaberite danas"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../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 "Organizator mora biti poslan."
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Nužna je najmanje jedna prisutna osoba"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Informacije o događaju"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informacija o zadatku"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
-msgid "Journal information"
-msgstr "Informacije o dnevniku"
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+msgid "Memo information"
+msgstr ""
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Slobodan/zauzet informacija"
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informacije o kalendaru"
 
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Ažurirano"
 
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Kontra-prijedlog"
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodan/zauzet informacija (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar informacije"
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Morate biti sudionik događaja"
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:464
+msgid "_New Memo List"
+msgstr "_Novi popis podsjetnika"
+
+#: ../calendar/gui/memos-component.c:544
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d bilješka"
+msgstr[1] "%d bilješke"
+msgstr[2] "%d bilješki"
+
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d odabran"
+msgstr[1] ", %d odabrana"
+msgstr[2] ", %d odabranih"
+
+#: ../calendar/gui/memos-component.c:593
+msgid "Failed upgrading memos."
+msgstr "Neuspješna nadogradnja bilješki."
+
+#: ../calendar/gui/memos-component.c:953
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "Ne mogu otvoriti listu bilješki '%s' za kreiranje događaja i sastanaka"
+
+#: ../calendar/gui/memos-component.c:966
+msgid "There is no calendar available for creating memos"
+msgstr "Nema slobodnih kalendara za kreiranje bilješki"
+
+#: ../calendar/gui/memos-component.c:1076
+msgid "Memo Source Selector"
+msgstr "Odabir izvora bilješke"
+
+#: ../calendar/gui/memos-component.c:1260
+msgid "New memo"
+msgstr "Nova bilješka"
+
+#: ../calendar/gui/memos-component.c:1262
+msgid "Create a new memo"
+msgstr "Stvoriti novu bilješku"
+
+#: ../calendar/gui/memos-component.c:1268
+msgid "New shared memo"
+msgstr "Novi dijeljeni podsjetnik"
+
+#: ../calendar/gui/memos-component.c:1270
+msgid "Create a shared new memo"
+msgstr "Izradi novi dijeljeni podsjetnik"
+
+#: ../calendar/gui/memos-component.c:1276
+msgid "New memo list"
+msgstr "Nova lista bilješki"
+
+#: ../calendar/gui/memos-component.c:1278
+msgid "Create a new memo list"
+msgstr "Stvorite novu listu bilješki"
+
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+msgid "Print Memos"
+msgstr "Ispiši bilješke"
+
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr ""
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8020,7 +8673,7 @@ msgstr ""
 "\n"
 "Molim pri�ekajte dok Evolution ne migrira vaše mape..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8033,335 +8686,283 @@ msgstr ""
 "Molim pri�ekajte dok Evolution ne migrira vaše mape..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "Ne mogu premjestiti stare postavke iz evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
-#, fuzzy, c-format
+#: ../calendar/gui/migration.c:804
+#, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "Nije moguće otvoriti kalendar '%s'."
+msgstr "Ne mogu premjestiti kalendar `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
-#, fuzzy, c-format
+#: ../calendar/gui/migration.c:972
+#, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "Nije moguće otvaranje zadataka u '%s'."
+msgstr "Ne mogu premjestiti zadatke `%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 "Bilješke"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "14th"
-msgstr "14. "
+msgstr "14."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "15th"
-msgstr "15. "
+msgstr "15."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "20og"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "21og"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "Su"
 
-#. Day
-#: ../calendar/gui/print.c:1917
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Odabrani dan (%a %b %d %Y)"
-
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: ../calendar/gui/print.c:1943
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
+#: ../calendar/gui/print.c:2472
+msgid "Appointment"
+msgstr "Obveza"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+#: ../calendar/gui/print.c:2474
+msgid "Task"
+msgstr "Zadatak"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:2499
 #, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Odabrani tjedan (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:1962
-msgid "Selected month (%b %Y)"
-msgstr "Odabran mjesec (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:1969
-msgid "Selected year (%Y)"
-msgstr "Odabrana godina (%Y)"
-
-#: ../calendar/gui/print.c:2320
-#, fuzzy, c-format
 msgid "Summary: %s"
-msgstr "Sažetak:"
+msgstr "Sažetak: %s"
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
-msgid "Location: %s"
-msgstr "Lokacija:"
+#: ../calendar/gui/print.c:2522
+msgid "Attendees: "
+msgstr ""
 
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
-msgstr "Prioritet: %s "
+msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Konatkti: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
-msgid "Print Preview"
-msgstr "Pogled prije ispisa"
+#: ../calendar/gui/tasks-component.c:455
+msgid "_New Task List"
+msgstr "_Nova lista zadataka"
 
-#: ../calendar/gui/print.c:2612
-msgid "Print Item"
-msgstr "Ispiši stavku"
-
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
-msgstr "Novi popis zadataka"
-
-#: ../calendar/gui/tasks-component.c:515
-#, fuzzy, c-format
+#: ../calendar/gui/tasks-component.c:535
+#, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "Novi zadatak"
-msgstr[1] "Novi zadatak"
-msgstr[2] "Novi zadatak"
+msgstr[0] "%d zadatak"
+msgstr[1] "%d zadatka"
+msgstr[2] "%d zadataka"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, fuzzy, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "Obrisano"
-msgstr[1] "Obrisano"
-msgstr[2] "Obrisano"
-
-#: ../calendar/gui/tasks-component.c:564
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
-msgstr "U�itavanje zadataka"
+msgstr "Neuspješna nadogradnja zadataka."
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Nije moguće otvoriti listu zadataka '%s' fa kreiranje događaja i sastanaka"
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za stvaranje zadataka"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
-msgstr ""
+msgstr "Odabir izvora zadataka"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1165
-msgid "_Task"
-msgstr "_Zadatak"
-
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1172
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
-msgstr "Dodijeli zadatak"
-
-#: ../calendar/gui/tasks-component.c:1173
-#, fuzzy
-msgid "Assigne_d Task"
-msgstr "Dodijeli zadatak"
+msgstr "Novi pridruženi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1174
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
-msgstr "Unesi novi zadatak"
+msgstr "Unesi novi pridruženi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Novi popis zadataka"
 
-#: ../calendar/gui/tasks-component.c:1181
-#, fuzzy
-msgid "Task l_ist"
-msgstr "popis zadataka"
-
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Stvori novi popis zadataka"
 
-#: ../calendar/gui/tasks-control.c:419
+#: ../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"
@@ -8373,1680 +8974,1896 @@ msgstr ""
 "\n"
 "Jeste li sigurni da želite obrisati zadatke?"
 
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovno."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Ispiši zadatke"
 
-#. 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
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% gotovo"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+#, fuzzy
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+#, fuzzy
+msgid "In progress"
+msgstr "Izvodi se"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "je veće od"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "je manje od"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Obveze i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
-msgstr "Otvaram direktorij"
+msgstr "Otvaram kalendar"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar datoteke (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr "Podsjetnik!!"
+#: ../calendar/importers/icalendar-importer.c:515
+msgid "Reminder!"
+msgstr "Podsjetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik Evolution kalendara"
 
 #.
+#. *
+#. * 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/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Adis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Alžir"
 
-#: ../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 "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/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/Djibouti"
 
-#: ../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/Johannesbur"
 
-#: ../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/Liberville"
 
-#: ../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/Tripoli"
 
-#: ../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/Costa_Rica"
 
-#: ../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/Guadaloupe"
 
-#: ../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/Guyana"
 
-#: ../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/Jamaica"
 
-#: ../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/Martinique"
 
-#: ../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
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../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/Paramari"
 
-#: ../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/Puerto_Rico"
 
-#: ../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 "America/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 "Antarktika/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Azija/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Azija/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Azija/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Azija/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Azija/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Azija/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Azija/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Azija/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Azija/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Azija/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Azija/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Azija/Bejrut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Azija/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Azija/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Azija/Kalkuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Azija/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Azija/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Azija/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Azija/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Azija/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Azija/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Azija/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Azija/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Azija/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Azija/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Azija/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Azija/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Azija/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Azija/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Azija/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Azija/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Azija/Jeruzalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Azija/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Azija/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Azija/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Azija/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Azija/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Azija/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azija/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Azija/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Azija/Kuvajt"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Azija/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Azija/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Azija/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Azija/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Azija/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Azija/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Azija/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Azija/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Azija/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Azija/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Azija/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Azija/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Azija/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Azija/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Azija/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Azija/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Azijia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Azija/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Azija/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Azija/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Azija/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Azija/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Azija/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Azija/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Azija/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Azija/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Azija/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Azija/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Azija/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Azija/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanari"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../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/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sv._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 "Australija/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australija/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australija/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australija/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australija/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australija/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australija/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australija/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australija/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australija/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andora"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atena"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelles"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukurešt"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budimpešta"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisabon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nikozija"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Pariz"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Rime"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferpol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Be�"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varšava"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozyhe"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indijski_ocean/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indijski ocean/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indijski ocean/Božićni_otoci"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indijski_ocean/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indijski ocean/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indijski_ocean/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indijski_ocean/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indijski_ocean/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indijski_ocean/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indijski ocean/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indijski_ocean/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacifik/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacifik/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacifik/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacifik/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacifik/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacifik/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacifik/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacifik/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifik/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacifik/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacifik/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacifik/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacifik/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacifik/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacifik/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacifik/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacifik/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacifik/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifik/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacifik/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacifik/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifik/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacifik/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacifik/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacifik/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacifik/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacifik/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacifik/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacifik/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:558
-msgid "Posting destination"
-msgstr "Odredište slanja"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "Ne mogu otvoriti datoteku"
 
-#: ../composer/e-msg-composer-hdrs.c:559
-msgid "Choose folders to post the message to."
-msgstr "Odaberi mape u koje će se poslati poruka."
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Ne mogu da povratim poruku iz urednika"
 
-#: ../composer/e-msg-composer-hdrs.c:593
-msgid "Click here for the address book"
-msgstr "Kliknite ovdje za adresar."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Umetni privitak"
 
-#.
-#. * 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:623
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "_Dodaj"
+
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "Priloži datoteku"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "Zatvori trenutnu datoteku"
+
+#: ../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 "_Ispis..."
+
+#: ../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 "_Pregled prije ispisa"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "Spremi trenutnu datoteku"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "_Spremi Kao..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "Makni trenutni pogled na spremink"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "Spremi skicu"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "Spremi kao nedovršenu poruku"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "Pošalji ovu poruku"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:534
 #, fuzzy
-msgid "_Reply-To:"
-msgstr "Odgovor na:"
+msgid "New _Message"
+msgstr "_Poruka"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-composer-actions.c:536
 #, fuzzy
-msgid "Fr_om:"
-msgstr "Od:"
+msgid "Open New Message window"
+msgstr "_Pošalji nove poruku na..."
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-composer-actions.c:543
 #, fuzzy
-msgid "S_ubject:"
-msgstr "Tema:"
+msgid "Character _Encoding"
+msgstr "Kodiranje znakova"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "Sigurnost"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "Å ifriraj ovu poruku PGP-om"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "Potpiši ovu poruku pomoću PGP klju�a"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "_Daj prednost poruci"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "Postavi prioritet poruke na visok"
+
+#: ../composer/e-composer-actions.c:584
 #, fuzzy
-msgid "_To:"
-msgstr "Za:"
+msgid "Re_quest Read Receipt"
+msgstr "Zat_raži potvrdu pro�itanosti"
 
-#: ../composer/e-msg-composer-hdrs.c:647
-msgid "Enter the recipients of the message"
-msgstr "Unesite primatelje poruke"
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr "Primi potvrdu o primljenosti kada je vaša poruka pro�itana"
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Enkriptiraj ovu poruku pomoću vašeg S/MIME certifikata"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Potpisivanje ove poruke vašim S/MIME certifikatom"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "_Bcc zaglavlje"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Prikazati polje BCC ili ne"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "_Cc zaglavlje"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "Prikazati polje CC ili ne"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "O_d zaglavlje"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Prikazati polje From ili ne"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "Post-To polje"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Prikazati polje Reply-To ili ne"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "Odgo_vori-na polje"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Prikazati polje Reply-To ili ne"
+
+#: ../composer/e-composer-actions.c:648
 #, fuzzy
-msgid "_Cc:"
-msgstr "Cc:"
+msgid "_Subject Field"
+msgstr "_Cc zaglavlje"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-composer-actions.c:650
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Određuje je li polje statusa prikazano"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "_Za polje"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "Prikazati polje CC ili ne"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "Unesite primatelje poruke"
+
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese na koje će se slati kopija poruke"
 
-#: ../composer/e-msg-composer-hdrs.c:654
-#, fuzzy
-msgid "_Bcc:"
-msgstr "Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../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."
+"appearing in the recipient list of the message"
 msgstr ""
-"Unesite adrese na koje će se poslati kopija poruke, a koje se neće pojaviti "
-"u popisu primatelja."
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:662
-#, fuzzy
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_Od:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "Odgovo_r na:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_Za:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
-msgstr "Oglasi na:"
+msgstr "_Pošalji na:"
+
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr "_Tema:"
+
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "_Potpis:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "Kliknite ovdje za adresar."
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Odredište slanja"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Odaberi mape u koje će se poslati poruka."
+
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovdje za odabir mapa u koje će se slati poruke"
 
-#: ../composer/e-msg-composer-hdrs.c:673
-msgid "Post To:"
-msgstr "Oglasi na:"
-
-#: ../composer/e-msg-composer-select-file.c:82
-#, fuzzy
-msgid "A_ttach"
-msgstr "Dodaj"
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "Prikaži traku sa _privitcima"
 
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer.c:872
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -10054,7 +10871,7 @@ msgstr ""
 "Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
 "korisni�ki ra�un"
 
-#: ../composer/e-msg-composer.c:745
+#: ../composer/e-msg-composer.c:879
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -10063,83 +10880,57 @@ msgstr ""
 "Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
 "za ovaj korisni�ki ra�un"
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
-
-#: ../composer/e-msg-composer.c:1294
+#: ../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
+#: ../mail/message-list.etspec.h:1
 #, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu otvoriti datoteku"
-
-#: ../composer/e-msg-composer.c:1302
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: ../composer/e-msg-composer.c:1572
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
-#, fuzzy
-msgid "Open File"
-msgstr "Otvori datoteku"
-
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
-msgid "Autogenerated"
-msgstr "Automatski stvoren"
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Privitak"
+msgstr[1] "Privitak"
+msgstr[2] "Privitak"
 
-#: ../composer/e-msg-composer.c:2105
-#, fuzzy
-msgid "Si_gnature:"
-msgstr "Potpis:"
+#: ../composer/e-msg-composer.c:1556
+msgid "Hide _Attachment Bar"
+msgstr "Sakrij traku sa _privitcima"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
-msgstr "Sastavi poruku"
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+msgid "Compose Message"
+msgstr "Napiši poruku"
 
-#: ../composer/e-msg-composer.c:3643
-#, fuzzy
-msgid "_Attachment Bar"
-msgstr "Privitak"
-
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:4055
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr ""
-"<b>(Urednik sadrži poruku koja nije tekstualna, te ne može biti mijenjana.)"
-"<b>"
+"<b>(Kompozitor sadrži tijelo poruke koje nije u teksutalnom obliku, te se "
+"stoga ne može uređivati.)</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 ""
+" Nekoliko privitaka se još preuzima. Slanje pošte izazvati će to da će pošta "
+"biti poslana bez privitaka u o�ekivanju "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
-msgstr ""
+msgstr "Maknuti su svi korisni�ki ra�uni."
 
 #: ../composer/mail-composer.error.xml.h:3
-#, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
+msgstr "Jeste li sigurni da želite odbaciti poruku '{0}', koju pišete?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
+msgstr "Zbog &quot;{0}&quot;, možda ćete morati odabrati druge postavke pošte."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
-msgstr ""
+msgstr "Zbog &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -10147,132 +10938,136 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
+"Zatvaranjem ovog prozora poruku ćete trajno odbaciti, ukoliko ne odaberete "
+"spremanje u mapu nedovršenih poruka. To će vam omogućiti kasnije "
+"nastavljanje pisanja poruke."
 
 #: ../composer/mail-composer.error.xml.h:7
-#, fuzzy
 msgid "Could not create composer window."
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgstr "Ne mogu stvoriti prozor za pisanje."
 
 #: ../composer/mail-composer.error.xml.h:8
-#, fuzzy
 msgid "Could not create message."
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgstr "Ne mogu stvoriti poruku."
 
 #: ../composer/mail-composer.error.xml.h:9
-#, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Nisam mogao sa�uvati datoteku sa potpisom: %s"
+msgstr "Ne mogu �itati datoteku sa potpisom &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:10
-#, fuzzy
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgstr "Ne mogu dohvatiti poruku za priviti od {0}."
 
 #: ../composer/mail-composer.error.xml.h:11
-#, fuzzy
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Nisam mogao sa�uvati datoteku sa potpisom: %s"
+msgstr "Ne mogu spremiti u automatsko spremajuću datoteku &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "Direktoriji se ne mogu priviti u poruke."
 
 #: ../composer/mail-composer.error.xml.h:13
-#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr "Želite li spremiti promjene?"
+msgstr "Želite li vratiti nezavršene poruke?"
 
 #: ../composer/mail-composer.error.xml.h:14
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Nemoj ukloniti"
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Preuzimanje u tijeku. Želite li poslati poštu?"
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Greška pri  automatskon spremanju zbog &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "Error saving to autosave because &quot;{1}&quot;."
+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 se neo�ekivano isklju�io dok ste vi pisali novu poruku. Povrat "
+"poruke omogu�it će vam nastavljanje od kuda ste stali."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Send options available only for Novell Groupwise and Microsoft Exchange "
+"accounts."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:18
-#, fuzzy
-msgid "Recover"
-msgstr "Ukloni"
+msgid "Send options not available."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+msgstr "Datoteka `{0}' nije obi�na datoteka i nemože biti poslana u poruci."
 
 #: ../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 ""
+"Ukoliko želite priložiti sadržaj ovog dorektorjia, ili dodajte svaku "
+"datoteku zasebno, ili stvorite arhivu direktorija i onda ju privite."
 
 #: ../composer/mail-composer.error.xml.h:21
-#, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu aktivirati komponentu HTML urednika.\n"
-"Molim vas da provjerite imate li odgovarajuće ina�ice\n"
-"gtkhtml i libgtkhtml na sistemu.\n"
+"Ne mogu aktivirati HTML kontrolu obrade.\n"
+"\n"
+"Molim provjerite imate li instaliranu ispravnu ina�icu gtkhtml-a i "
+"libgtkhtml-a."
 
 #: ../composer/mail-composer.error.xml.h:24
-#, fuzzy
 msgid "Unable to activate the address selector control."
-msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu pokrenuti kontrolu biranja adresa."
+msgstr "Ne mogu aktivirati kontrolu odabira adresa."
 
 #: ../composer/mail-composer.error.xml.h:25
-#, fuzzy
 msgid "Unfinished messages found"
-msgstr "Nepro�itane poruke"
+msgstr "Pronađene su nezavršene poruke"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
 
 #: ../composer/mail-composer.error.xml.h:27
-#, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "Dodaj datoteku poruci"
+msgstr "Ne možete priviti datoteku `{0}' ovoj poruci."
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog da biste mogli sastaviti poruku."
 
 #: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Zanemari promjene"
+msgid "_Continue Editing"
+msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Do not Recover"
+msgstr "_Ne obnavljaj"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Recover"
+msgstr "_Obnovi"
+
+#: ../composer/mail-composer.error.xml.h:33
 #, fuzzy
-msgid "_Save Message"
-msgstr "Spremi poruku..."
+msgid "_Save Draft"
+msgstr "Spremi nedovršenu poruku"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:2
-#, fuzzy
-msgid "The Evolution Groupware Suite"
-msgstr "Ximian Evolution Groupware okruženje"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+msgid "Groupware Suite"
+msgstr "Groupware Suite"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Manage your email, contacts and schedule"
+msgstr ""
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10282,469 +11077,370 @@ msgstr "kartica adresara"
 msgid "calendar information"
 msgstr "informacije o kalendaru"
 
-#: ../designs/OOA/ooa.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Vaš trenutni status je \"Izvan ureda\". </b>\n"
-"\n"
-"Želite li ga promijeniti na \"U uredu\"? "
-
-#: ../designs/OOA/ooa.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Poruka:</b>"
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+msgid "Evolution Error"
+msgstr "Greška u Evolutionu"
 
-#: ../designs/OOA/ooa.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b>"
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+msgid "Evolution Warning"
+msgstr "Upozorenje Evolutiona"
 
-#: ../designs/OOA/ooa.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Donja poruka bit će poslana svakome tko vam pošalje\n"
-"poštu dok ste izvan ureda.</small>"
+#: ../e-util/e-error.c:117
+msgid "Evolution Information"
+msgstr "Informacije Evolutiona"
 
-#: ../designs/OOA/ooa.glade.h:8
-msgid "I am currently in the office"
-msgstr "Trenutno sam u uredu"
+#: ../e-util/e-error.c:119
+msgid "Evolution Query"
+msgstr "Upitnik Evolutiona"
 
-#: ../designs/OOA/ooa.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Trenutno sam izvan ureda"
+#. setup a dummy error
+#: ../e-util/e-error.c:449
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Unutarnja greška, nepoznata greška '%s' zatražila"
 
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Ne, nemoj mijenjati status"
+#: ../e-util/e-logger.c:156
+#, fuzzy
+msgid "Component"
+msgstr "Završi"
 
-#: ../designs/OOA/ooa.glade.h:12
-msgid "Out of Office Assistant"
-msgstr "Asistent izvan kacelarije"
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:13
-msgid "Yes, Change Status"
-msgstr "Da, promijeni status"
+#: ../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
+msgid "Enabled"
+msgstr "Omogućeno"
 
-#: ../designs/read_receipts/read.glade.h:1
-msgid "      "
-msgstr "      "
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Treba li proširiti proširitelj"
 
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Primam poštu</b>"
+#: ../e-util/e-print.c:160
+msgid "An error occurred while printing"
+msgstr "Greška kod ispisa"
 
-#: ../designs/read_receipts/read.glade.h:3
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Šaljem poštu:</b>"
+#: ../e-util/e-print.c:167
+msgid "The printing system reported the following details about the error:"
+msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:4
+#: ../e-util/e-print.c:173
 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>"
+"The printing system did not report any additional details about the error."
 msgstr ""
-"<small>Na ovoj stranici možete odabrati želite li dobiti obavijest kada "
-"osoba kojoj šaljete poštu pro�ita poruku, te\n"
-"odrediti što da Evolution napravi kad netko od vas zatraži potvrdu da ste "
-"pro�itali poruku.</small>"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 #, fuzzy
-msgid "Always send back a read receipt"
-msgstr "Uvijek pošalji povratnicu"
+msgid "Because \"{1}\"."
+msgstr "Zbog &quot;{1}&quot;."
 
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Pitaj me želim li poslati povratnicu"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Never send back a read receipt"
-msgstr "Nikada ne Å¡alji povratnicu"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Read Receipts"
-msgstr "Pokaži ra�une"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Request a read receipt for all messages I send"
-msgstr "Za sve poslane poruke potrebna potvrda da su pro�itane"
+#: ../e-util/e-system.error.xml.h:2
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Ne mogu otvoriti datoteku"
 
-#: ../designs/read_receipts/read.glade.h:11
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "Osim ako je poruka poslata na dopisnu listu, a ne osobno meni"
+#: ../e-util/e-system.error.xml.h:3
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Ne mogu spremiti datoteku &quot;{0}&quot;."
 
-#: ../designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"Kada primite poruku sa zahtjevom za odgovorom, što treba Evolution u�initi? "
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "Želite li ju prebrisati?"
 
-#: ../e-util/e-dialog-utils.c:267
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Datoteka pod tim imenom već postoji.\n"
-"Da je prepišem?"
+#: ../e-util/e-system.error.xml.h:5
+#, fuzzy
+msgid "File exists \"{0}\"."
+msgstr "Datoteka postoji &quot;{0}&quot;."
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Prepiši datoteku?"
 
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
-#, fuzzy
-msgid "Evolution Error"
-msgstr "Evolution"
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+msgid "_Overwrite"
+msgstr "_Prepiši"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-util.c:97
 #, fuzzy
-msgid "Evolution Warning"
-msgstr "Evolucija pošta"
+msgid "Could not display help for Evolution."
+msgstr "Ne mogu ažurirati ovlasti mapa."
 
-#: ../e-util/e-error.c:124
-#, fuzzy
-msgid "Evolution Information"
-msgstr "Informacije o sastanku"
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "_Važno"
 
-#: ../e-util/e-error.c:126
-#, fuzzy
-msgid "Evolution Query"
-msgstr "Evolution Test"
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "_Rad"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:438
-#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "_Osobno"
+
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "_Za u�initi"
+
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "_Kasnije"
+
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:2
-#, fuzzy
-msgid "Cannot open file &quot;{0}&quot;."
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
 msgstr ""
-"Ne mogu spremiti u `%s'\n"
-" %s"
 
-#: ../e-util/e-system.error.xml.h:3
-#, fuzzy
-msgid "Cannot save file &quot;{0}&quot;."
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
 msgstr ""
-"Ne mogu spremiti u `%s'\n"
-" %s"
 
-#: ../e-util/e-system.error.xml.h:4
-#, fuzzy
-msgid "Do you wish to overwrite it?"
+#: ../e-util/e-util-labels.c:351
+msgid "Label name cannot be empty."
 msgstr ""
-"%s već postoji\n"
-"Želite li  prepisati preko njega?"
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+#: ../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/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
-#, fuzzy
-msgid "_Overwrite"
-msgstr "Prebriši"
+#: ../e-util/gconf-bridge.c:1218
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr "Greška pri provjeri: %s"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %m/%d/%Y %I:%M %p"
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ""
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %m/%d/%Y %H:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %m/%d/%Y %I %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %m/%d/%Y %H"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%m/%d/%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%m/%d/%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%m/%d/%Y %I:%M %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d.%m.%Y. %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%m/%d/%Y %I %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%m/%d/%Y %H"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
-#, fuzzy
-msgid "The orientation of the tray."
-msgstr "Opis priloga."
-
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "prije jedne sekunde"
+msgstr[0] "prije %d sekunde"
 msgstr[1] "prije %d sekunde"
 msgstr[2] "prije %d sekundi"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "prije jedne minute"
+msgstr[0] "prije %d minute"
 msgstr[1] "prije %d minute"
 msgstr[2] "prije %d minuta"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "prije jednog sata"
+msgstr[0] "prije %d sata"
 msgstr[1] "prije %d sata"
 msgstr[2] "prije %d sati"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "prije jednog dana"
+msgstr[0] "prije %d dana"
 msgstr[1] "prije %d dana"
 msgstr[2] "prije %d dana"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "prije jednog tjedna"
+msgstr[0] "prije %d tjedna"
 msgstr[1] "prije %d tjedna"
 msgstr[2] "prije %d tjedana"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] "prije jednog mjeseca"
+msgstr[0] "prije %d mjeseca"
 msgstr[1] "prije %d mjeseca"
 msgstr[2] "prije %d mjeseci"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] "prije jedne godine"
+msgstr[0] "prije %d godine"
 msgstr[1] "prije %d godine"
 msgstr[2] "prije %d godina"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<kliknite ovdje za odabir datuma>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "Odaberite ime za usporedbu"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Izaberite datoteku"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "Važno"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Za napraviti"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "Kasnije"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:791
-#, fuzzy
-msgid "_Rule name:"
-msgstr "Ime pravila: "
+#: ../filter/filter-rule.c:852
+msgid "R_ule name:"
+msgstr ""
 
-#: ../filter/filter-rule.c:819
-#, fuzzy
-msgid "If"
-msgstr "K"
+#: ../filter/filter-rule.c:880
+msgid "Find items that meet the following criteria"
+msgstr "Pronađi stavke koje zadovoljavaju sljedeće kriterije"
 
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
-msgstr "ako su svi uvjeti zadovoljeni"
+#: ../filter/filter-rule.c:914
+msgid "A_dd Filter Criteria"
+msgstr ""
 
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
-msgstr "ako je bilo koji uvjet zadovoljen"
+#: ../filter/filter-rule.c:920
+msgid "If all criteria are met"
+msgstr "Ako su svi kriteriji zadovoljeni"
 
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Izvrši akcije"
+#: ../filter/filter-rule.c:920
+msgid "If any criteria are met"
+msgstr "Ako je bilo koji kriterij zadovoljen"
 
-#: ../filter/filter-rule.c:881
-#, fuzzy
+#: ../filter/filter-rule.c:922
+msgid "_Find items:"
+msgstr ""
+
+#: ../filter/filter-rule.c:944
 msgid "All related"
-msgstr "Delegirano"
+msgstr "Sve odgovarajuće"
 
-#: ../filter/filter-rule.c:881
-#, fuzzy
+#: ../filter/filter-rule.c:944
 msgid "Replies"
-msgstr "Primatelji"
+msgstr "Odgovori"
 
-#: ../filter/filter-rule.c:881
-#, fuzzy
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
-msgstr "Odgovara na %s"
+msgstr "Odgovori i referencirani �lanci"
 
-#: ../filter/filter-rule.c:883
-#, fuzzy
-msgid "Include threads"
-msgstr "Uklju�i:"
+#: ../filter/filter-rule.c:944
+msgid "No reply or parent"
+msgstr "Nema odgovora ili prethodne poruke"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:946
+msgid "I_nclude threads"
+msgstr ""
+
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Odlazeći"
 
 #: ../filter/filter.error.xml.h:1
-#, fuzzy
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr ""
-"Greška u regularnom izrazu '%s':\n"
-"%s"
+msgstr "Loš regularni izraz &quot;{0}&quot;."
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr ""
+msgstr "Ne mogu pripremiti regularni izraz &quot;{1}&quot;."
 
 #: ../filter/filter.error.xml.h:3
-#, fuzzy
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna."
+msgstr "Datoteka &quot;{0}&quot; ne postoji ili nije regularna."
 
 #: ../filter/filter.error.xml.h:4
-#, fuzzy
 msgid "Missing date."
-msgstr "Ažuriranje sastanka"
+msgstr "Nedostaje datum."
 
 #: ../filter/filter.error.xml.h:5
-#, fuzzy
 msgid "Missing file name."
-msgstr "Posebno _ime:"
+msgstr "Nedostaje ime datoteke."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
-#, fuzzy
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
-msgstr "Dodjela"
+msgstr "Nedostaje ime."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
-msgstr ""
+msgstr "Ime &quot;{0}&quot; se već koristi."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
-msgstr ""
+msgstr "Molim birajte drugo ime."
 
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
@@ -10768,7 +11464,7 @@ msgstr "Usporedi sa"
 
 #: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "Prikaži filtere za poštu:"
 
 #: ../filter/filter.glade.h:5
 msgid ""
@@ -10802,35 +11498,46 @@ msgstr "vrijeme u odnosu na trenutno vrijeme"
 msgid "ago"
 msgstr "prije"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "mjeseci"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "sekunde"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "trenutno vrijeme"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "vrijeme koje ste odredili"
 
-#: ../filter/filter.glade.h:22
+#: ../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 "tjedni"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "godine"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "Promjeni pravilo"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Ime pravila"
 
@@ -10852,56 +11559,70 @@ msgid "Configure your email accounts here"
 msgstr "Podesite vaše naloge za poštu ovdje"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "Podesite vaše naloge za poštu ovdje"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
+msgid "Evolution Mail"
+msgstr "Evolution e-pošta"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolution korisni�kih ra�una"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Sastavlja� Evolucija pošte"
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolution pošte"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavlja�a"
+msgid "Evolution Mail composer"
+msgstr "Sastavlja� Evolution pošte"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolution sastavlja�a"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
+msgstr "Kontrola osobina Evolution pošte"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "Kontrola podešavanja Evolution kalendara"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h: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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Poštanski ra�un"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
-msgstr "Osobine pošte"
+msgstr "Postavke pošte"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
+msgid "Network Preferences"
+msgstr "Postavke uređiva�a poruka"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
-msgstr "_Pošta:"
+msgstr "_Pošta"
 
 #: ../mail/em-account-editor.c:387
-#, fuzzy, c-format
+#, c-format
 msgid "%s License Agreement"
-msgstr "Klju�ni dogovor"
+msgstr "%s Licencni dogovor"
 
 #: ../mail/em-account-editor.c:394
 #, c-format
@@ -10911,118 +11632,128 @@ msgid ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 msgstr ""
+"\n"
+"Molim pažljivo pro�itajte licencni dogovor\n"
+"za %s prikazan ispod\n"
+"i markirajte ku�icu za prihvaćanje\n"
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Ozna�i mapu"
 
-#: ../mail/em-account-editor.c:760
-#, fuzzy
+#: ../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
+msgid "Autogenerated"
+msgstr "Automatski stvoren"
+
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
-msgstr "Nema takve poruke"
+msgstr "Pitaj za svaku poruku"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: ../mail/em-account-editor.c:1943
-msgid "Automatically check for _new mail every"
+#: ../mail/em-account-editor.c:2131
+msgid "Check for _new messages every"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2139
+msgid "minu_tes"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
-msgstr ""
+msgstr "Uobi�ajeno"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
-msgstr ""
+msgstr "Sigurnost"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
-msgstr ""
+msgstr "Prijemne postavke"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
-#, fuzzy
-msgid "Checking for New Mail"
-msgstr "Provjeravam za novu poštu"
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+msgid "Checking for New Messages"
+msgstr ""
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Urednik ra�una"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolution ra�una"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Predefinirano]"
 
-#: ../mail/em-account-prefs.c:510
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Ime ra�una"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../mail/em-account-prefs.c:517
-#, fuzzy
-msgid "Mail Accounts Table"
-msgstr "Poštanski ra�un"
-
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../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 "Neimenovano"
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: ../mail/em-composer-prefs.c:940
-#, fuzzy
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
-msgstr "Dod_aj potpis"
+msgstr "Dodaj skriptu za potpis"
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Proslijeđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "nepoznati pošiljatelj"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1695
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
+"U ${AbbrevWeekdayName}, ${Day}. ${Month}. ${Year}., u ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} je napisao/la:"
 
-#: ../mail/em-filter-editor.c:147
-#, fuzzy
+#: ../mail/em-composer-utils.c:2152
+msgid "-----Original Message-----"
+msgstr ""
+
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
-msgstr "<b>Pravila _filtera</b>"
+msgstr "_Pravila filtera"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11037,625 +11768,701 @@ msgstr "Dodijeli boju"
 msgid "Assign Score"
 msgstr "Dodijeli bodovanje"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Privici"
-
 #: ../mail/em-filter-i18n.h:6
-msgid "Beep"
-msgstr "Zvu�ni signal"
+msgid "BCC"
+msgstr ""
 
 #: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "sadrži"
+msgid "Beep"
+msgstr "Zvu�ni signal"
 
 #: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopiraj u mapu"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Datum primanja"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Datum slanja"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:767
+#: ../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 "Obriši"
+
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
-msgstr "ne sadrži"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ne završava sa"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "ne postoji"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "ne vraća"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "ne zvu�i kao"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "ne po�inje sa"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ne postoji"
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Nacrt"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "završava sa"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr "Postoji"
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "postoji"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Izraz"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Sljedi"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "je"
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "Važno"
 
-#: ../mail/em-filter-i18n.h:28
-#, fuzzy
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
-msgstr "Prenosim podatke sa %1$S"
+msgstr "je nakon"
 
-#: ../mail/em-filter-i18n.h:29
-#, fuzzy
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
-msgstr "Å aljem zahtjev na %1$S"
+msgstr "je prije"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "je ozna�en"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr "je veće od"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
-msgstr "je manje od"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
-msgstr "nije"
-
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "nije ozna�en"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr "Smeće"
+msgstr "Nepoželjno"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
-msgstr "Testiranje pošte smeća"
+msgstr "Testiranje nepoželjne pošte"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Oznaka"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Dopisna lista"
 
-#: ../mail/em-filter-i18n.h:39
-#, fuzzy
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
-msgstr "Backup All"
+msgstr "Za sve"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Tijelo poruke"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Zaglavlje poruke"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
-msgstr "Poruka je smeće"
+msgstr "Poruka je nepoželjna"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
-msgstr "Poruka nije smeće"
+msgstr "Poruka nije nepoželjna"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Premjesti u mapu"
 
-#: ../mail/em-filter-i18n.h:45
-#, fuzzy
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
-msgstr "Izlaz iz programa"
+msgstr "Preusmjeri u program"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#. 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
 msgid "Read"
 msgstr "ÄŒitaj"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Primatelji"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "Reg. izraz pretraga"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "Odgovoreno na"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "vraća"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "vraća više od"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "vraća manje od"
 
-#: ../mail/em-filter-i18n.h:54
-#, fuzzy
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
-msgstr "Pokreni program:"
+msgstr "Pokreni program"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Rezultat"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Postavi status"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Veli�ina (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 #, fuzzy
 msgid "sounds like"
 msgstr "zvu�i kao"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Izvorni izvještaj"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Određeno zaglavlje"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "po�inje sa"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-filter-i18n.h:72 ../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:1131
+#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Subjekt"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Nedodeljen status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>Tada</b> "
+#: ../mail/em-filter-rule.c:522
+msgid "Then"
+msgstr ""
 
-#: ../mail/em-folder-browser.c:134
-#, fuzzy
+#: ../mail/em-filter-rule.c:550
+msgid "Add Ac_tion"
+msgstr ""
+
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
-msgstr "Napravi _Virtualnu mapu iz pretrage..."
+msgstr "_Napravi mapu iz pretraživanja..."
+
+#: ../mail/em-folder-browser.c:215
+msgid "All Messages"
+msgstr "Sve poruke"
+
+#: ../mail/em-folder-browser.c:216
+msgid "Unread Messages"
+msgstr "Nepro�itane poruke"
+
+#: ../mail/em-folder-browser.c:218
+msgid "No Label"
+msgstr "Bez oznake"
+
+#: ../mail/em-folder-browser.c:225
+msgid "Read Messages"
+msgstr "Pro�itane poruke"
+
+#: ../mail/em-folder-browser.c:226
+msgid "Recent Messages"
+msgstr "Nedavne poruke"
+
+#: ../mail/em-folder-browser.c:227
+msgid "Last 5 Days' Messages"
+msgstr "Poruke unazad 5 dana"
+
+#: ../mail/em-folder-browser.c:228
+msgid "Messages with Attachments"
+msgstr "Poruke s privitcima"
+
+#: ../mail/em-folder-browser.c:229
+msgid "Important Messages"
+msgstr "Važne poruke"
+
+#: ../mail/em-folder-browser.c:230
+msgid "Messages Not Junk"
+msgstr "Poruke koje nisu nepoželjne"
+
+#: ../mail/em-folder-browser.c:1171
+msgid "Account Search"
+msgstr "Traženje ra�una"
+
+#: ../mail/em-folder-browser.c:1224
+msgid "All Account Search"
+msgstr "Traženje svih ra�una"
+
+#. 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] "Nepro�itana poruka:"
+msgstr[1] "Nepro�itane poruke:"
+msgstr[2] "Nepro�itanih poruka:"
 
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-#, fuzzy
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:178
+msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "Ukupno poruka"
-msgstr[1] "Ukupno poruka"
-msgstr[2] "Ukupno poruka"
+msgstr[0] "Ukupno poruka:"
+msgstr[1] "Ukupno poruke:"
+msgstr[2] "Ukupno poruka:"
+
+#: ../mail/em-folder-properties.c:196
+#, fuzzy, c-format
+msgid "Quota usage (%s):"
+msgstr "Ukupno poruka:"
 
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:198
 #, fuzzy
-msgid "Unread message:"
-msgid_plural "Unread messages:"
-msgstr[0] "Nepro�itane poruke"
-msgstr[1] "Nepro�itane poruke"
-msgstr[2] "Nepro�itane poruke"
+msgid "Quota usage"
+msgstr "Ukupno poruka:"
 
-#: ../mail/em-folder-properties.c:278
-#: ../plugins/groupwise-features/properties.glade.h:3
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Dolazna pošta"
+
+#: ../mail/em-folder-properties.c:389
+#: ../plugins/groupwise-features/properties.glade.h:4
 #, fuzzy
 msgid "Folder Properties"
 msgstr "Svojstva mape"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovdje za odabir mape>"
 
-#: ../mail/em-folder-selector.c:261
-#, fuzzy
-msgid "Create"
-msgstr "Napravi mapu"
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr ""
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-#, fuzzy
+#. load store to mail component at the end, when everything is loaded
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
-msgstr "Ozna�i mapu"
+msgstr "Pretraži mape"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "Neupariv"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
-#, fuzzy
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
-msgstr "Nacrt"
+msgstr "Nedovršeno"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
-msgid "Inbox"
-msgstr "Dolazna pošta"
-
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
-msgstr ""
+msgstr "Izlazna pošta"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
-#, fuzzy
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
-msgstr "Pošalji"
+msgstr "Poslano"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "U�itavam..."
 
-#: ../mail/em-folder-tree.c:689
-#, fuzzy
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
-msgstr "_Mapa pošte"
+msgstr "Stablo mapa pošte"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premještam mapu %s"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram mapu %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premještam poruke u mapu %s"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u mapu %s"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu ispustiti poruke u spremište najviše razine"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u mapu"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Premjesti u mapu"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
-msgid "_View"
-msgstr "P_ogled"
-
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/em-folder-tree.c:2036
-#, fuzzy
-msgid "_Copy..."
-msgstr "_Kopiraj"
-
-#: ../mail/em-folder-tree.c:2037
-#, fuzzy
-msgid "_Move..."
-msgstr "_Pomakni"
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
-#, fuzzy
+#: ../mail/em-folder-tree.c:2107
+msgid "_Move..."
+msgstr "_Premjesti..."
+
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
-msgstr "_Promijeni ime"
+msgstr "_Promijeni ime..."
 
-#: ../mail/em-folder-utils.c:104
-#, fuzzy, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Kopiram poruke u %s"
+#: ../mail/em-folder-tree.c:2115
+msgid "Re_fresh"
+msgstr ""
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
-msgid "Select folder"
-msgstr "Izaberite direktorij"
+#: ../mail/em-folder-tree.c:2116
+msgid "Fl_ush Outbox"
+msgstr ""
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
-#, fuzzy
-msgid "C_opy"
-msgstr "Kopiraj"
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "_Isprazni smeće"
 
-#: ../mail/em-folder-utils.c:503
+#: ../mail/em-folder-utils.c:101
 #, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Preimenuj mapu \"%s\" u:"
+msgid "Copying `%s' to `%s'"
+msgstr "Kopiram `%s' u `%s'"
 
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "Preimenuj mapu"
+#: ../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
+msgid "Select folder"
+msgstr "Izaberite direktorij"
 
-#: ../mail/em-folder-utils.c:511
-#, fuzzy
-msgid "Folder names cannot contain '/'"
-msgstr "Ime mape ne može sadržavati znak \"/\"."
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+msgid "C_opy"
+msgstr "_Kopiraj"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Stvaram mapu \"%s\""
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
+#: ../mail/em-folder-utils.c:743
+#: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
+#: ../mail/em-folder-utils.c:743
+#: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Navedite gdje napraviti mapu:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "_Odgovori svima"
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr ""
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#. 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 "_Uredi kao novu poruku..."
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Poništi brisanje"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Premjesti u mapu..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Ozna�i kao pro�itano"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1347
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Ozna�i kao _nepro�itano"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Ozna�_i kao važno"
 
-#: ../mail/em-folder-view.c:1058
-msgid "_Mark as Unimportant"
-msgstr "_Ozna�i kao nebitno "
+#: ../mail/em-folder-view.c:1349
+msgid "Mark as Un_important"
+msgstr "Ozna�i kao _nebitno"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
-msgstr "Ozna�i kao smeće"
+msgstr "Ozna�i kao _nepoželjno"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
-msgstr "Ozna�i da nije smeće"
+msgstr "Ozna�i da nije ne_poželjno"
 
-#: ../mail/em-folder-view.c:1061
-#, fuzzy
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
-msgstr "Pr_ati..."
+msgstr "Ozna�i za _odgovor..."
+
+#: ../mail/em-folder-view.c:1354
+msgid "_Label"
+msgstr "_Oznaka"
+
+#. 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
+msgid "_None"
+msgstr "_Nijedan"
+
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ozna�_i završene"
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Ukloni oznaku"
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: ../mail/em-folder-view.c:1074
-#, fuzzy
-msgid "Search Folder from _Subject"
-msgstr "VFolder na _Naslov"
+#. 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 ""
 
-#: ../mail/em-folder-view.c:1075
-#, fuzzy
-msgid "Search Folder from Se_nder"
-msgstr "VFolder na P_ošiljaoca"
+#: ../mail/em-folder-view.c:1369
+msgid "Search Folder based on Se_nder"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1076
-#, fuzzy
-msgid "Search Folder from _Recipients"
-msgstr "VFolder na _Primaoce"
+#: ../mail/em-folder-view.c:1370
+msgid "Search Folder based on _Recipients"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1077
-#, fuzzy
-msgid "Search Folder from Mailing _List"
-msgstr "VFolder na dopisnu _listu "
+#: ../mail/em-folder-view.c:1371
+msgid "Search Folder based on Mailing _List"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1081
-msgid "Filter on Sub_ject"
-msgstr "Filter na Sub_jekt"
+#. 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 ""
 
-#: ../mail/em-folder-view.c:1082
-msgid "Filter on Sen_der"
-msgstr "Filter na P_ošiljatelja"
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1083
-msgid "Filter on Re_cipients"
-msgstr "Filter na Pri_matelje"
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
+msgstr ""
 
-#: ../mail/em-folder-view.c:1084
-msgid "Filter on _Mailing List"
-msgstr "Filter na _Dopisni popis"
+#: ../mail/em-folder-view.c:1379
+msgid "Filter based on _Mailing List"
+msgstr ""
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#. 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 "Uobi�ajeno"
 
-#: ../mail/em-folder-view.c:2064
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "Ispiši poruku"
-
-#: ../mail/em-folder-view.c:2220
-#, fuzzy
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
-msgstr "Ne mogu da pokupim poruku: %s"
+msgstr "Ne mogu dohvatiti poruku"
 
-#: ../mail/em-folder-view.c:2413
-msgid "_Copy Link Location"
-msgstr "_Kopiraj lokaciju veze"
+#: ../mail/em-folder-view.c:2535
+msgid "Retrieving Message..."
+msgstr ""
 
-#: ../mail/em-folder-view.c:2415
-#, fuzzy
+#: ../mail/em-folder-view.c:2794
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
-msgstr "Napravi novi direktorij"
+msgstr "Napravi _mapu traženja"
 
-#: ../mail/em-folder-view.c:2416
-#, fuzzy
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
-msgstr "Poštanska adresa"
+msgstr "_Sa ove adrese"
 
-#: ../mail/em-folder-view.c:2417
-#, fuzzy
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
-msgstr "_Adresa:"
+msgstr "_Na ovu adresu"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za slanje pošte %s"
 
+#: ../mail/em-folder-view.c:3308
+#, c-format
+msgid "Click to call %s"
+msgstr ""
+
+#: ../mail/em-folder-view.c:3313
+msgid "Click to hide/unhide addresses"
+msgstr "Kliknite za otkrivanje/skrivanje poruka"
+
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:614
+msgid "Fin_d:"
+msgstr ""
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:638
+msgid "_Previous"
+msgstr "_Prethodni"
+
+#: ../mail/em-format-html-display.c:643
+msgid "_Next"
+msgstr "_Slijedeći"
+
+#: ../mail/em-format-html-display.c:648
+msgid "M_atch case"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke istinit."
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Ispravni potpis"
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11663,22 +12470,22 @@ msgstr ""
 "Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj za "
 "kojeg se predstavlja."
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Neispravni potpis"
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
 
-#: ../mail/em-format-html-display.c:699
-msgid "Valid signature, cannot verify sender"
-msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+msgid "Valid signature, but cannot verify sender"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11686,555 +12493,791 @@ msgstr ""
 "Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može "
 "provjeriti"
 
-#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:951
+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
 msgid "Unencrypted"
 msgstr "Nekriptirano"
 
-#: ../mail/em-format-html-display.c:705
-#, fuzzy
+#: ../mail/em-format-html-display.c:958
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
-"Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje "
-"internetom."
+"Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv prolazom kroz "
+"Internet."
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Kriptirano, slaba enkripcija"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:959
 msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"Ova poruka je kriptirana, ali sa slabim enkripcijskim algoritmom. Bilo bi "
-"teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno "
-"kratkom vremenu."
+"Ova poruka je kriptirana, ali sa slabim algoritmom. Bilo bi teško, ali ne i "
+"nemoguće za vanjske korisnike da vide sadržaj poruke u izvjesnom vremenu."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Å ifrirano"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Kriptirano, jaka enkripcija"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:961
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško "
-"stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
+"Ova poruka je kriptirana, sa jakim kriptirajućim algoritmom. Bilo bi vrlo "
+"teško vidjeti sadržaj poruke vanjskom korisniku u izvjesnom vremenu."
 
-#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno na %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Prekora�eno:"
 
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M %p"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Pogledaj unutar"
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../mail/em-format-html-display.c:1179
-#, fuzzy
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
-msgstr "Izreži širinu"
+msgstr "_Odgovara po Å¡irini"
 
-#: ../mail/em-format-html-display.c:1180
-#, fuzzy
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
-msgstr "Originalna _veli�ina"
-
-#: ../mail/em-format-html-display.c:1550
-#, fuzzy
-msgid "Attachment Button"
-msgstr "Privitak"
+msgstr "Prikaži _originalnu veli�inu"
 
-#: ../mail/em-format-html-display.c:1757
-#, fuzzy
-msgid "Select folder to save all attachments..."
-msgstr "Spremam prilog"
+#: ../mail/em-format-html-display.c:1983
+msgid "Save attachment as"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
+#: ../mail/em-format-html-display.c:1987
+msgid "Select folder to save all attachments"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1804
-#, fuzzy
-msgid "Save Selected..."
-msgstr "Ništa nije odabrano"
+#: ../mail/em-format-html-display.c:2038
+msgid "_Save Selected..."
+msgstr "_Spremi odabrano..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
-#, fuzzy, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%s prilog"
-msgstr[1] "%s prilog"
-msgstr[2] "%s prilog"
+#: ../mail/em-format-html-display.c:2105
+#, c-format
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
+msgstr[0] "%d privitak"
+msgstr[1] "%d privitka"
+msgstr[2] "%d privitaka"
+
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+msgid "S_ave"
+msgstr "_Spremi"
 
-#: ../mail/em-format-html-display.c:1935
-#, fuzzy
+#: ../mail/em-format-html-display.c:2123
+msgid "S_ave All"
+msgstr "_Spremi sve"
+
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
-msgstr "Privitak"
+msgstr "Bez privitaka"
 
-#: ../mail/em-format-html-display.c:1938
-#, fuzzy
-msgid "Save All"
-msgstr "Spremi kao"
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+msgid "View _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2340
+msgid "Hide _Unformatted"
+msgstr ""
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-display.c:2397
+msgid "O_pen With"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2473
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Dohvaćanje `%s'"
 
-#: ../mail/em-format-html.c:600
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
+#: ../mail/em-format-html.c:925
+msgid "Unknown external-body part."
+msgstr ""
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Neispravan vanjski dio poruke."
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokaziva� na FTP adresu (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pokaziva� na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokaziva� na lokalnu datoteku (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "Pokaziva� na mrežne podatke (%s) "
+msgstr "Pokaziva� na mrežne podatke (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokaziva� na nepoznati vanjski podatak (\"%s\" tipa) "
+msgstr "Pokaziva� na nepoznati vanjski podatak (\"%s\" tipa)"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formatiranje poruke"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
-msgid "From"
-msgstr "Od"
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
-msgid "Reply-To"
-msgstr "Odgovor-Za"
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Prima"
+#: ../mail/em-format-html.c:1410
+msgid "Formatting Message..."
+msgstr ""
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c: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 (kopija)"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c: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 (nevidljiva kopija)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Program e-pošte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1771
+msgid " (%a, %R %Z)"
+msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
+#: ../mail/em-format-html.c:1776
+msgid " (%R %Z)"
+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:1907
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:2
+#: ../mail/em-format-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:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
+msgid "Reply-To"
+msgstr "Odgovor-Za"
+
+#: ../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
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Interesne grupe"
 
-#: ../mail/em-format.c:1102
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržano šifriranje za višedjelno/šifrirano"
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1354
+msgid "Could not parse PGP/MIME message"
+msgstr ""
+
+#: ../mail/em-format.c:1354
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Nepodržani format potpisa"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Greška pri provjeri potpisa"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri provjeri potpisa"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-format.c:1662
+msgid "Could not parse PGP message"
+msgstr ""
+
+#: ../mail/em-format.c:1662
+msgid "Could not parse PGP message: Unknown error"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Uvijek"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Jednom dnevno"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Tjedno"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Mjese�no"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-mailer-prefs.c:326
+msgid "Add Custom Junk Header"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:330
+msgid "Header Name:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Value Contains:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:436
+msgid "Contains Value"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:458
+msgid "Color"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:461
+msgid "Tag"
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#, c-format
 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..."
+"%s plugin is not available. Please check whether the package is installed."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od ina�ice "
-"Evolutiona 1.x.\n"
-"\n"
-"Molim pri�ekajte dok Evolution ne migrira vaše mape..."
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-mailer-prefs.c:1107
+msgid "No Junk plugin available"
+msgstr ""
+
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "Za napraviti"
+
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "Kasnije"
+
+#: ../mail/em-migrate.c:1652
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
-#: ../mail/em-migrate.c:1658
-#, fuzzy, c-format
+#: ../mail/em-migrate.c:1678
+#, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
-"Ne mogu kopirati opis datoteke: %s\n"
-"%s"
+msgstr "Ne mogu kopirati mapu `%s' u `%s': %s"
 
-#: ../mail/em-migrate.c:1843
-#, fuzzy, c-format
+#: ../mail/em-migrate.c:1863
+#, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Nije se mogla snimiti datoteka sa listom grupa za %s: %s"
+msgstr "Ne mogu pretražiti za postojeće poštanske sandu�iće u `%s': %s"
 
-#: ../mail/em-migrate.c:2047
-#, fuzzy, c-format
+#: ../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 ""
+"Lokacija hijerarhije Evolution mape kontakata se promijenila od ina�ice "
+"Evolutiona 1.x.\n"
+"\n"
+"Molim pri�ekajte dok Evolution ne migrira vaše mape..."
+
+#: ../mail/em-migrate.c:2069
+#, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+msgstr "Ne mogu otvoriti stare POP ostavi-na-poslužitelju podatke `%s': %s"
 
-#: ../mail/em-migrate.c:2061
-#, fuzzy, c-format
+#: ../mail/em-migrate.c:2083
+#, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
+msgstr "Ne mogu stvoriti POP3 ostavi-na-poslužitelju mapu podataka `%s': %s"
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "Ne mogu kopirati POP3 ostavi-na-poslužitelju podatke `%s': %s"
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
-#, fuzzy, c-format
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
+msgstr "Ne mogu stvoriti lokalno spremište pošte `%s': %s"
 
-#: ../mail/em-migrate.c:2693
-#, fuzzy, c-format
-msgid "Unable to create local mail folders at `%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 ""
-"Ne mogu napraviti izlaznu datoteku: %s\n"
-" %s"
+"Lokacija hijerarhije Evolution mape kontakata se promijenila od ina�ice "
+"Evolutiona 1.x.\n"
+"\n"
+"Molim pri�ekajte dok Evolution ne migrira vaše mape..."
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2963
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Ne mogu stvoriti lokalne poštanske mape u `%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 ""
+"Ne mogu �itati postavke iz stare Evolution instalacije, `evolution/config."
+"xmldb' ne postoji ili je oštećena."
 
-#: ../mail/em-popup.c:399
-msgid "Save As..."
-msgstr "Snimi kao..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr "nenaslovljena_slika.%s"
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "Postavi kao _pozadinu"
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: ../mail/em-popup.c:607
-msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u pregledniku"
-
-#: ../mail/em-popup.c:608
-#, fuzzy
-msgid "_Send New Message To..."
-msgstr "Pošalji poruku na..."
-
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+msgid "_Add to Address Book"
 msgstr "_Dodaj u adresar"
 
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Otvori u %s..."
-
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ova lokacija ne podržava pretplate ili nije omgućena"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "U pretplati"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Molim odaberite server."
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Nije odabran poslužitelj"
 
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
-msgstr "Ne pokazuj ponovno ovu poruku."
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
+msgid "_Do not show this message again."
+msgstr ""
 
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr "Filteri"
+#: ../mail/em-utils.c:316
+msgid "Message Filters"
+msgstr "Filteri poruka"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "cedulja"
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Spremi poruku..."
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
-#: ../mail/em-vfolder-editor.c:104
-#, fuzzy
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
-msgstr "Ozna�i mapu"
+msgstr "Traži _mape"
 
-#: ../mail/em-vfolder-rule.c:574
-#, fuzzy
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
-msgstr "Ozna�i mapu"
+msgstr "Traži izvornu mapu"
+
+#: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Pošalji i primi poštu"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Pošalji i primi poštu"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Allows evolution to display text part of limited size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Always request read receipt"
+msgstr ""
+
+#: ../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
+msgid "Automatic emoticon recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
-msgid "Automatic smiley recognition"
-msgstr "Automatsko prepoznavanje smješka"
-
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
-msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
+msgstr "Provjera _dolazne pošte koja je prepoznata kao nepoželjna"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 #, fuzzy
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 #, fuzzy
 msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Visina prozora za pisanje poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Å irina prozora za pisanje poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../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:16
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "Uobi�ajeni znakovni skup u kojem se pišu poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Uobi�ajeni znakovni skup u kojem se pišu poruke."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Uobi�ajeni znakovni skup u kojem se prikazuju poruke."
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Uobi�ajeni znakovni skup u kojem se prikazuju poruke."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Uobi�ajeni na�in proslijeđivanja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
-msgid "Default height of the Composer Window"
-msgstr "Uobi�ajena visina prozora Composera"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the Composer Window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
-msgid "Default height of the Message Window"
-msgstr "Uobi�ajena visina prozora za poruke"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the message window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
-#, fuzzy
-msgid "Default height of the Subscribe dialog"
-msgstr "Uobi�ajena visina prozora za poruke"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default height of the subscribe dialog."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Uobi�ajeni na�in odgovaranja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Composer Window"
-msgstr "Uobi�ajena širina prozora Composera"
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Default value for thread expand state"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default width of the Message Window"
-msgstr "Uobi�ajena širina prozora za poruke"
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the Composer Window."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
-#, fuzzy
-msgid "Default width of the Subscribe dialog"
-msgstr "Uobi�ajena širina prozora za poruke"
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the message window."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default width of the subscribe dialog."
+msgstr ""
+
+#: ../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: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.in.h:20
+#: ../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 "Iscrtavanje grešaka u pravopisu prilikom utipkavanja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska iz Evolutiona."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Omogući caret na�in rada, tako da se vidi pokaziva� prilikom �itanja pošte."
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Enable or disable magic space bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable search folders"
+msgstr ""
+
+#: ../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 "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../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
+msgid "Enable to render message text part of limited size."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Omogući/onemogući caret na�in rada"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Visina plo�e s popisom poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Visina plo�e s popisom poruka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../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 ""
+"Ako korisnik želi otvoriti 10 ili više poruka istovremeno, pitaj korisnika "
+"želi li on to stvarno u�initi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../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: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 "
@@ -12244,25 +13287,69 @@ msgstr ""
 "mime-tipovi koji su prikazani u popisu a odgovaraju bonobo-component "
 "pregledniku u GNOME mime-tip bazi mogu se koristiti za pregled sadržaja."
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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: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:69
 msgid "Last time empty trash was run"
 msgstr "Zadnji put je bio pokrenut prazni koš za smeće"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
-#, fuzzy
+#: ../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 "Izlistavanje oznaka i njima pridruženih boja"
+msgstr "Popis oznaka i njima pridruženih boja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
-msgstr "Popis korisni�kih ra�una"
+msgstr "Popis prihvaćenih licenci"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Popis korisni�kih ra�una"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../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."
@@ -12271,132 +13358,140 @@ msgstr ""
 "sadrži znakovne nizove s imenima poddirektorija relativnih s /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Popis prilagođenih zaglavlja i da li su oni omogućeni."
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../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."
 msgstr ""
-"Popis korisni�kih ra�una poznat komponenti za e-poštu Evolutiona. Popis "
-"sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML heks "
-"kodiranje."
+"Popis oznaka poznat komponenti za e-poštu Evolutiona. Popis sadrži znakovne "
+"nizove u obliku ime:boja gdje boja koristi HTML heksadecimalno kodiranje."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Popis mime tipova koji traže bonobo preglednike komponenata"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
-msgstr ""
+msgstr "Popis imena protokola �ija je licenca prihvaćena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "U�itavanje slika za HTML poruke preko http-a"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
-#, fuzzy
+#: ../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 mail 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 ""
-"U�itavanje slika za HTML poruke preko http-a. Moguće vrijednosti su: 0 - "
-"Nikad ne u�itavaj slike s mreže 1 - U�itavaj slike ako je pošiljatelj u "
-"adresaru 2 - Uvijek u�itavaj slike s mreže"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Logiranje akcija filtra u navedenu log datoteku."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Logiranje akcija filtra."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Ozna�i kao pregledano nakon određenog vremena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Ozna�i kao pregledano nakon određenog vremena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Ozna�ivanje citata u pregledu poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Ozna�ivanje citata u pregledu poruke."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
-msgstr "Visina prozora poruke"
+msgstr "Standardna visina prozora poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Å irina prozora poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
-msgstr "Stil prikaza poruke (normalno, puna zaglavlja, kod)"
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "Stil prikaza poruka (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanji broj dana između pražnjenja koša za smeće"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../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:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Najmanji broj dana između pražnjenja koša za smeće kod izlaska iz programa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
-msgid "New Mail Notify sound file"
-msgstr "Zvu�na datoteka za obavijest o novopristigloj pošti"
-
-#: ../mail/evolution-mail.schemas.in.in.h:54
-msgid "New Mail Notify type"
-msgstr "Nova vrsta obavijesti o pristigloj pošti"
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Isko�i u slu�aju praznog naslova"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upitaj korisnika kada pokuša obrisati mapu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Upitaj korisnika kada pokuša poslati poruku bez naslova."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../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:102
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Upitaj korisnika prilikom brisanja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik popuni samo Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
+msgstr "Obavijesti kada korisnik želi otvoriti 10 ili više poruka odjednom"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../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."
@@ -12404,99 +13499,163 @@ msgstr ""
 "Upitaj kada korisnik pokuša poslati HTML poštu primateljima koji možda ne "
 "žele primati HTML poštu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upitaj kada korisnik pokuša poslati neželjeni HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zamijeni ih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
-msgid "Recognize smileys in text and replace them with images."
-msgstr "Prepoznaj smješke u tekstu i zamijeni ih slikama."
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Run junk test on incoming mail."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
-msgid "Run junk test on incoming mail"
-msgstr "Pokreni testiranje na smeće na dolaznoj pošti"
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Save directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "_Opcije sinkronizacije..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Prikaži animirane slike kao animacije"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikaži obrisane poruke (precrtane) u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Prikaži karticu \"Pregled\""
-
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Prikaži karticu \"Pregled\""
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show photo of the sender"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
-msgid "Sound file to play when new mail arrives."
-msgstr "Zvu�na datoteka koju treba odsvirati pri pristizanju nove pošte."
+#: ../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.in.h:76
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Određuje tip notifikacije o novoj pošti koju korisnik želi koristiti."
+#: ../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.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Provjera pravopisa na licu mjesta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:129
 #, fuzzy
-msgid "Subscribe dialog default height"
-msgstr "Visina prozora poruke"
+msgid "Spell checking color"
+msgstr "Provjera pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:130
 #, fuzzy
+msgid "Spell checking languages"
+msgstr "Provjera pravopisa na licu mjesta"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Subscribe dialog default height"
+msgstr "Uobi�ajena visina dijaloga za pretplatu"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
-msgstr "Å irina prozora poruke"
+msgstr "Uobi�ajena širina dijaloga za pretplatu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Pismo terminala"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Text message part limit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../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:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "Zadnji put kada je program koša za smeće bio pokrenut, u danima od "
 "pokretanja sustava."
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "The terminal font for mail display"
-msgstr "Pismo terminala za prikaz pošte"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "The terminal font for mail display."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-msgid "The variable width font for mail display"
-msgstr "Pismo varijabilne širine za prikaz pošte"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "The variable width font for mail display."
+msgstr ""
+
+#: ../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.in.h:84
+#: ../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."
+msgstr ""
+
+#: ../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: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 ""
+
+#: ../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;"
@@ -12507,101 +13666,145 @@ msgstr ""
 "sve Å¡to treba biti prikazano. Format XML strukture je &lt;header enabled&gt; "
 "- uklju�i ako zaglavlje treba biti prikazano u prikazu pošte."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../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: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:148
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../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:150
 msgid "Thread the message list."
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži listu poruka u obliku niti na temelju naslova"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
-msgid "Timeout for marking message as Seen"
-msgstr "Vremensko ograni�enje poruke obilježene kao viđene"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
-msgid "Timeout for marking message as Seen."
-msgstr "Vremensko ograni�enje poruke obilježene kao viđene"
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID string predefinirang korisni�kog ra�una"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
-#, fuzzy
-msgid "Use Spamassassin daemon and client"
-msgstr "Koristi Spamassassin daemon i klijent"
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-#, fuzzy
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "Koristi Spamassassin daemon i klijent (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Use SpamAssassin daemon and client"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Koristi prilagođena pisma"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
-msgid "Use custom fonts for displaying mail"
-msgstr "Koristi prilagođena pisma za prikaz pošte"
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Use custom fonts for displaying mail."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne testove za spam."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne testove za spam (bez DNS-a)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Use side-by-side or wide layout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Font promjenljive Å¡irine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Pogled/Bcc stavka izbornika je uklju�ena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Pogled/Bcc stavka izbornika je uklju�ena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Pogled/Cc stavka izbornika je uklju�ena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Pogled/Cc stavka izbornika je uklju�ena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Pogled/Od stavka izbornika je uklju�ena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Pogled/Od stavka izbornika je uklju�ena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Pogled/Za stavka izbornika je uklju�ena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Pogled/Za stavka izbornika je uklju�ena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Pogled/OdgovoriNa stavka izbornika je uklju�ena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Pogled/OdgovoriNa stavka izbornika je uklju�ena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../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."
@@ -12609,397 +13812,364 @@ msgstr ""
 "Treba li se prebaciti na nizanje po subjektu kada poruka ne sadrži In-Reply-"
 "To ili References zaglavlja."
 
-#: ../mail/importers/elm-importer.c:193
+#: ../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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Width of the message-list pane."
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Uvoz elm podataka"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm uvoznik"
 
-#: ../mail/importers/elm-importer.c:383
-#, fuzzy
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
-msgstr "Uvoz sandu�ića"
+msgstr "Uvezi poštu iz Elma."
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Odredišni direktorij:"
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Izaberite mapu za uvoz u"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
-msgstr ""
+msgstr "Berkley poštanski sandu�ić (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
-msgstr ""
+msgstr "Uvezi poštu iz Berkeley poštanskog sandu�ića"
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/mail-importer.c:148
+msgid "Importing mailbox"
+msgstr "Uvoz sandu�ića"
+
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvoz `%s'"
 
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
-msgstr "Obrađujem"
-
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
-msgid "Please wait"
-msgstr "Molim pri�ekajte"
-
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
-msgid "Importing mailbox"
-msgstr "Uvoz sandu�ića"
-
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:372
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem %s"
 
-#: ../mail/importers/netscape-importer.c:73
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Prioritetni filter \"%s\""
-
-#: ../mail/importers/netscape-importer.c:662
-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 ""
-"Neki od vaših Netscape filtera za poštu su zasnovani\n"
-"na prioritetima za poštu, koje Evolution ne koristi.\n"
-"Umjesto toga Evolution daje rezultate u rasponu od\n"
-"-3 do 3 koji se dodjeljuju porukama i u skladu sa time\n"
-"filtriraju.\n"
-"\n"
-"Kao privemeno rješenje, niz filtera nazvan \"Prioritetni filter\"\n"
-"je dodan koji pretvara Netscape filtere za poštu u\n"
-"rezultate Evolutiona, a promjenjeni filteri koriste rezultate umjesto\n"
-"prioriteta. Provjerite uvežene filtere da se uvjerite\n"
-"radi li sve kao Å¡to bi trebalo."
-
-#: ../mail/importers/netscape-importer.c:686
-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 ""
-"Neki od vaših Netscape filtera za poštu koriste\n"
-"\"Ignoriraj niz\" ili \"Gledaj niz\"\n"
-"opciju, koju Evolution ne podržava.\n"
-"Ovi filteri neće ostati."
-
-#: ../mail/importers/netscape-importer.c:703
-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 ""
-"Neki od vaših Netscape filtera za poštu provjeravaju\n"
-"tijelo poruke da li postoji (ne)jednakost u datom nizu,\n"
-"što Evolution ne podržava. Ovi filteri\n"
-"su promjenjeni da bi mogli provjeriti je li taj niz\n"
-"sadržan u tijelu poruke ili nije."
-
-#: ../mail/importers/netscape-importer.c:1250
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution uvozi vaše stare Netscape podatke"
-
-#: ../mail/importers/netscape-importer.c:1707
-msgid "Importing Netscape data"
-msgstr "Uvoz Netscape podataka"
-
-#: ../mail/importers/netscape-importer.c:1907
-msgid "Settings"
-msgstr "Postavke"
-
-#: ../mail/importers/netscape-importer.c:1912
-msgid "Mail Filters"
-msgstr "Filteri pošte"
-
-#: ../mail/importers/netscape-importer.c:1933
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution je pronašao Netscape datoteke pošte.\n"
-"Želite li ih uvesti u Evolution?"
-
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Uvoz Pine podataka"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolucija Pine uvoznik"
 
-#: ../mail/importers/pine-importer.c:435
-#, fuzzy
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
-msgstr "_Uvezi jednu datoteku"
+msgstr "Uvezi poštu iz Pinea."
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %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 "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Subjekt je %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo za filter"
 
-#: ../mail/mail-component.c:509
-#, fuzzy, c-format
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Predložak:"
+
+#: ../mail/mail-component.c:550
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../mail/mail-component.c:554
+#, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "Obrisano"
-msgstr[1] "Obrisano"
-msgstr[2] "Obrisano"
+msgstr[0] "%d obrisana"
+msgstr[1] "%d obrisane"
+msgstr[2] "%d obrisanih"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d smeće"
+msgstr[1] "%d smeća"
+msgstr[2] "%d smeća"
 
-#: ../mail/mail-component.c:534
-#, fuzzy, c-format
+#: ../mail/mail-component.c:564
+#, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "Nacrt"
-msgstr[1] "Nacrt"
-msgstr[2] "Nacrt"
+msgstr[0] "%d nedovršena"
+msgstr[1] "%d nedovršene"
+msgstr[2] "%d nedovršenih"
 
-#: ../mail/mail-component.c:536
-#, fuzzy, c-format
+#: ../mail/mail-component.c:566
+#, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
-msgstr[0] "Datum slanja"
-msgstr[1] "Datum slanja"
-msgstr[2] "Datum slanja"
+msgstr[0] "%d poslana"
+msgstr[1] "%d poslane"
+msgstr[2] "%d poslanih"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d neposlana"
+msgstr[1] "%d neposlane"
+msgstr[2] "%d neposlanih"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:574
 #, c-format
-msgid "%d total"
-msgid_plural "%d total"
+msgid "%d unread, "
+msgid_plural "%d unread, "
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:575
 #, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d ukupno"
+msgstr[1] "%d ukupno"
+msgstr[2] "%d ukupno"
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: ../mail/mail-component.c:766
-msgid "_Mail Message"
-msgstr "_Poruka"
-
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nova mapa za poštu"
 
-#: ../mail/mail-component.c:774
-msgid "Mail _Folder"
-msgstr "_Mapa pošte"
-
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Stvori novu mapu e-pošte"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
+msgstr "Neuspješna dogradnja posavki pošte ili mapa."
+
+#: ../mail/mail-component.c:1596
+msgid "Error"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-msgid "    "
-msgstr "    "
+#: ../mail/mail-component.c:1596
+msgid "Errors"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-component.c:1597
+msgid "Warnings and Errors"
+msgstr ""
+
+#: ../mail/mail-component.c:1598
+msgid "Debug"
+msgstr ""
+
+#: ../mail/mail-component.c:1598
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1725
+msgid "Debug Logs"
+msgstr ""
+
+#: ../mail/mail-component.c:1739
+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
+#, fuzzy
+msgid "second(s)."
+msgstr "sekunde"
+
+#: ../mail/mail-component.c:1761
+msgid "Log Messages:"
+msgstr ""
+
+#: ../mail/mail-component.c:1802
+msgid "Log Level"
+msgstr ""
+
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+msgid "Time"
+msgstr "Vrijeme"
+
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Poruke"
+
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zatvori ovaj prozor"
+
+#: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
+msgstr " Provjeri za podržan_e vrste "
+
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr ""
+msgstr "<b>SSL nije podržan u ovoj veziji Evolutiona</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>Pretraživanje</b>"
 
 #: ../mail/mail-config.glade.h:6
-msgid "<b>_Languages</b>"
-msgstr ""
+msgid "<b>Sig_natures</b>"
+msgstr "<b>Pot_pisi</b>"
 
 #: ../mail/mail-config.glade.h:7
-msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr ""
+msgid "<b>_Languages</b>"
+msgstr "<b>Je_zici</b>"
 
 #: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">Informacija o ra�unu</span>"
 
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Autorizacija</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Sastavljanje poruka</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Konfiguracija</span>"
 
 #: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Uobi�ajeno ponašanje</span>"
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Obriši poštu</span>"
 
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:17
-msgid "<span weight=\"bold\">Filter Options</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
+msgid "<span weight=\"bold\">Labels</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">U�itavanje slika</span>"
 
 #: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">Prikaz poruka</span>"
 
 #: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">Font poruka</span>"
 
 #: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<span weight=\"bold\">Ra�uni poruka</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<b>Vrijednost polja</b>"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">Opcionalne informacije</span>"
 
 #: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Opcije</span>"
 
 #: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr ""
+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\">Options</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">Fontovi za ispis</span>"
 
 #: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Stanje</span>"
 
 #: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">Potrebna informacija</span>"
 
 #: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr "<span weight=\"bold\">Siguran MIME (S/MIME)</span>"
 
 #: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">Sigurnost</span>"
 
 #: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Security</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "<span weight=\"bold\">Poslane i nedovršene poruke</span>"
 
 #: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr ""
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">Konfiguracija poslužitelja</span>"
 
 #: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">Server Configuration</span>"
+msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:35
@@ -13008,51 +14178,42 @@ msgstr "Upravljanje ra�unima"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr ""
+msgstr "Dodaj novi _potpis..."
 
 #: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
-msgstr ""
+msgstr "Dodaj _skriptu"
 
 #: ../mail/mail-config.glade.h:38
-#, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
-"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
-"korisni�ki ra�un"
+msgstr "Uvijek potpiši odlazeće poruke kada se koristi ovaj ra�un"
 
 #: ../mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "A_lso kriptiranje sebi prilikom slanja kriptirane pošte"
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr ""
+msgstr "_Kopiju poruke (cc) uvijek Å¡alji na:"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr ""
+msgstr "_Slijepu _kopiju poruke (bcc) uvijek Å¡alji na:"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvijek _vjeruj klju�evima u mojoj vezi kada šifriraš"
 
 #: ../mail/mail-config.glade.h:43
-#, fuzzy
-msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "Uvij_ek šifriraj na mene kod slanja šifrirane pošte"
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Pridruži izvornu poruku"
-
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Privitak"
+msgid "Always request rea_d receipt"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
+msgid "Automatically insert _emoticon images"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:47
@@ -13064,21 +14225,20 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "Balti�ki (ISO-8859-4)"
 
 #: ../mail/mail-config.glade.h:49
-msgid "Beep w_hen new mail arrives"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Kodna stranica:"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
+msgstr "Provjeri za podržane vrste "
+
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:52
-#, fuzzy
-msgid "Check _incoming mail for junk"
-msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
+msgid "Check incoming _messages for junk"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13086,7 +14246,7 @@ msgstr "Provjeri pravopis dok kucam"
 
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
-msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
+msgstr "Provjera _dolazne pošte koja je prepoznata kao nepoželjna"
 
 #: ../mail/mail-config.glade.h:55
 #, fuzzy
@@ -13094,23 +14254,18 @@ msgid "Cle_ar"
 msgstr "_O�isti"
 
 #: ../mail/mail-config.glade.h:56
-#, fuzzy
 msgid "Clea_r"
-msgstr "_O�isti"
+msgstr "O�ist_i"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Boja pogrešno napisanih rije�i:"
 
 #: ../mail/mail-config.glade.h:58
-msgid "Colors"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
-msgstr ""
+msgstr "Potvrdi _brisanje mape"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13126,136 +14281,186 @@ msgstr ""
 "\n"
 "Pritisnite \"Primjeni\" da sa�uvate podešavanja."
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Uobi�ajeno"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
+msgstr "Uobi�ajena kodna stranica:"
+
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:70
-#, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "_Kriptiranje izlaznih poruka (uobi�ajeno)"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not quote original message"
-msgstr "Ne citiraj originalnu poruku"
+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 "Ne briši"
+
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
-msgstr ""
+msgstr "Mapa ne_dovršenih poruka:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "Korisni�ki ra�uni za e-mail"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
-msgstr ""
+msgstr "_Adresa pošte:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
+msgstr "Isprazni mapu smeća na _izlasku"
+
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "_Potvrda kriptiranja:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Kriptiranje izlaznih poruka (uobi�ajeno)"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Izvrši zapovijed..."
-
-#: ../mail/mail-config.glade.h:82
-#, fuzzy
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
-msgstr "Fik_sirana -Å¡irina:"
+msgstr "_Nepromjenjiva Å¡irina:"
+
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "Formatiranje poruka u H_TML-u"
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
+#: ../mail/mail-config.glade.h:88
+msgid "Full Nam_e:"
+msgstr "_Puno ime:"
+
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:91
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "_Poštanski broj:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
-msgstr ""
+msgstr "Zaglavlja"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.glade.h:89
-#, fuzzy
-msgid "I_nclude remote tests"
-msgstr "Uklju�i:"
-
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Inline"
 
-#: ../mail/mail-config.glade.h:94
-#, fuzzy
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "KB"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
-msgstr "Jezik"
+msgstr "Tablica jezika"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
-msgstr ""
+msgstr "Tablica zaglavlja poruka"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Lokacija sandu�ića"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Sastavlja� poruke"
 
-#: ../mail/mail-config.glade.h:101
+#: ../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 "Napomena: biti ćete upitani za lozinku dok se ne spojite prvi put"
 
-#: ../mail/mail-config.glade.h:102
+#: ../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 "_Organizacija:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG osobna karta _klju�a:"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr ""
+#: ../mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Pass_word:"
+msgstr "_Lozinka:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../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 ""
+"Molim, upišite opisno ime za ovaj ra�un u prostor ispod.\n"
+"Ovo ime će biti korišteno samo u svrhu prikazivanja."
 
-#: ../mail/mail-config.glade.h:109
+#: ../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."
@@ -13263,7 +14468,7 @@ msgstr ""
 "Molim unesite podatke o na�inu na koji želite slati poštu. Ako niste "
 "sigurni, pitajte sustav administratora ili davatelja Internet usluga."
 
-#: ../mail/mail-config.glade.h:110
+#: ../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 "
@@ -13273,130 +14478,125 @@ msgstr ""
 "moraju biti popunjena, osim ako ne želite ove podatke uklju�iti u poruke "
 "koje Å¡aljete."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
 
-#: ../mail/mail-config.glade.h:113
-msgid "Quote original message"
-msgstr "Citiraj originalnu poruku"
-
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "kao citate"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
-msgstr ""
+msgstr "Zapamti _lozinku"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Odgovor na:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
+msgstr "_Zapamti lozinku"
+
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:127
 #, fuzzy
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Osigurava osnovnu funkcionalnost za lokalne adresare"
+
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
-msgstr "_Obriši..."
+msgstr "_Odaberi..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_tandard Font:"
+#: ../mail/mail-config.glade.h:129
+msgid "S_end message receipts:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Se_lect..."
-msgstr "Odabrano"
+#: ../mail/mail-config.glade.h:130
+msgid "S_tandard Font:"
+msgstr "Uobi�ajen font:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Odaberite pismo utvrđene širine za HTML"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberite pismo utvrđene širine za HTML radi ispisa"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Odaberite pismo promjenjljive Å¡irine za HTML"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberite pismo promjenjljive Å¡irine za HTML radi ispisa"
 
-#: ../mail/mail-config.glade.h:127
-#, fuzzy
-msgid "Send message receipts:"
-msgstr "Pošalji poruku na..."
-
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
-msgstr ""
+msgstr "Mapa _poslanih poruka:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Pos_lužitelj zahtijeva autentifikaciju"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
-msgstr "_Tip poslužitelja:"
+msgstr "_Tip poslužitelja: "
 
-#: ../mail/mail-config.glade.h:133
-#, fuzzy
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
-msgstr "Potpisivanje certifikata:"
+msgstr "_Potpisivanje certifikata:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
-msgstr ""
+msgstr "_Potpis:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
-msgstr ""
+msgstr "Potpisi"
 
-#: ../mail/mail-config.glade.h:136
-#, fuzzy
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
-msgstr "Potpis(i)"
-
-#: ../mail/mail-config.glade.h:137
-msgid "Specify _filename:"
-msgstr "Odredi ime _datoteke:"
+msgstr "Tablica potpisa"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
-msgstr ""
+msgstr "Provjera pravopisa"
 
-#: ../mail/mail-config.glade.h:139
-msgid "T_erminal Font:"
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
-msgstr ""
+msgstr "_Tip: "
 
-#: ../mail/mail-config.glade.h:141
-#, fuzzy
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo "
-"jezici za koje imate instaliran rje�nik."
+"U ovome popisu jezika se nalaze samo jezici za koje imate instaliran rje�nik."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13404,9 +14604,9 @@ msgid ""
 msgstr ""
 "Izlaz ove skripte će biti korišten kao vaš\n"
 "potpis. Ime koje ste dali će biti korišteno\n"
-"samo za svrhu prikazivanja na zaslonu."
+"samo za svrhu prikazivanja na zaslonu. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13414,15 +14614,28 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj korisni�ki ra�un.\n"
 "Na primjer: \"Poslovni\" ili \"Osobni\""
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:154
+#, fuzzy
+msgid "Us_ername:"
+msgstr "_Korisni�ko ime:"
+
+#: ../mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "Autorizacija"
+
+#: ../mail/mail-config.glade.h:156 ../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 "_Korisni�ko ime:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "V_arijabilna Å¡irina:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13432,147 +14645,205 @@ msgstr ""
 "\n"
 "Pritisnite \"Naprijed\" za po�etak. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "Dod_aj potpis"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
+msgstr "_Uvijek u�itaj slike sa interneta"
+
+#: ../mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Automatic proxy configuration URL:"
+msgstr "Automatsko prepoznavanje veza"
+
+#: ../mail/mail-config.glade.h:164
+msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:156
-msgid "_Do not notify me when new mail arrives"
-msgstr "_Nemoj me obavještavati kada stigne nova pošta"
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "Ne potpisuj zahtjeve za s_astancima (za kompatibilnost sa Outlook-om)"
+#: ../mail/mail-config.glade.h:166
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "Ne potpisuj _zahtjeve za susretom (za kompatibilnost sa Outlookom)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
-msgstr "Stil _prosljeđivanja "
+msgstr "Stil _prosljeđivanja"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_Puno ime:"
+#: ../mail/mail-config.glade.h:169
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:161
-msgid "_Load images in mail from contacts"
+#: ../mail/mail-config.glade.h:170
+msgid "_Load images in messages from contacts"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local address book only"
+msgstr "Izlistavanje lokalnih mapa adresara"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
-msgstr "_Neka je ovo moj glavni korisni�ki ra�un "
+msgstr "_Neka je ovo moj glavni korisni�ki ra�un"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "Podešavanje pošte"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
-msgstr "_Ozna�i poruke kao pro�itane poslije "
+msgstr "_Ozna�i poruke kao pro�itane poslije"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
-msgstr ""
+msgstr "_Nikada ne u�itavaj slike sa interneta"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Pitaj prilikom slanja HTML poruka primateljima koji ih ne žele"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "_Pokaži animirane slike"
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:173
-#, fuzzy
+#: ../mail/mail-config.glade.h:183
+msgid "_Select..."
+msgstr ""
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:186
+msgid "_Show image animations"
+msgstr "_Prikaži animacije slike"
+
+#: ../mail/mail-config.glade.h:187
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:188
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
-msgstr "Aktivne veze"
+msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:190
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Koristi _uobi�ajeno"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:192
+msgid "addresses"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "opis"
 
+#: ../mail/mail-dialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
 #: ../mail/mail-dialogs.glade.h:2
-#, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>vFolder izvori</b>"
+msgstr "<b>Pretraži izvore mape</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Digitalni potpis</span>"
 
 #: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Enkripcija</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-#, fuzzy
-msgid "Case _Sensitive"
-msgstr "Razlikuj velika i mala slova"
+msgid "All active remote folders"
+msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
-#, fuzzy
-msgid "Co_mpleted"
-msgstr "Završeno"
+#: ../mail/mail-dialogs.glade.h:6
+msgid "All local and active remote folders"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:8
-#, fuzzy
-msgid "F_ind:"
-msgstr "Nađi:"
+msgid "Case _sensitive"
+msgstr "_Osjetljivost na velika/mala slova"
 
 #: ../mail/mail-dialogs.glade.h:9
+msgid "Co_mpleted"
+msgstr "_Završeno"
+
+#: ../mail/mail-dialogs.glade.h:10
+msgid "F_ind:"
+msgstr "_Nađi:"
+
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Pronađi u poruci"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
-#: ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Ozna�i za praćenje"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Pretplate na direktorije"
 
-#: ../mail/mail-dialogs.glade.h:12
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
-msgstr "Klju�ni dogovor"
+msgstr "Licencni dogovor"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ništa nije odabrano"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Poslužitelj:"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Podaci o sigurnosti"
 
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18
+msgid "Specific folders"
+msgstr ""
+
+#: ../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."
@@ -13580,69 +14851,42 @@ msgstr ""
 "Poruke koje ste odabrali za praćenje su dole izlistane.\n"
 "Molim odaberite akciju za praćenje iz \"Oznaka\" menija."
 
-#: ../mail/mail-dialogs.glade.h:19
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
-msgstr "Prihvaćeno"
+msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
-msgstr ""
+msgstr "_Isti�e:"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Zastavica:"
 
-#: ../mail/mail-dialogs.glade.h:22
-msgid "_Subscribe"
-msgstr "_Pretplati se"
-
-#: ../mail/mail-dialogs.glade.h:23
-#, fuzzy
-msgid "_Tick this to accept the license agreement"
-msgstr "Popis korisni�kih ra�una"
-
 #: ../mail/mail-dialogs.glade.h:24
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Otkaži pretplatu"
-
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr "samo određene mape"
-
-#: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr "sa svim aktivnim mrežnim mapama"
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr "sa svim lokalnim i aktivnim mrežnim mapama"
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
-msgstr "sa svim lokalnim mapama"
+msgid "_Tick this to accept the license agreement"
+msgstr "_Ozna�te ovo za prihvaćanje licencnog dogovora"
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
 
-#: ../mail/mail-ops.c:102
-msgid "Filtering Folder"
-msgstr "Filtriram direktorij"
+#: ../mail/mail-ops.c:105
+msgid "Filtering Selected Messages"
+msgstr ""
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13651,123 +14895,125 @@ msgstr ""
 "Nisam mogao dodati u %s: %s\n"
 "Umjesto toga dodajem u lokalnu mapu \"Poslano\"."
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisam mogao smjestiti poštu u lokalnu mapu \"Poslano\": %s"
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr ""
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Å aljem poruku %d od %d"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Greška kod slanja %d od %d poruka"
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+msgid "Canceled."
 msgstr "Poništeno."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Gotovo."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1272
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Kontakt informacije za %s"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smo�nica %s"
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i spreman korisni�ki ra�un \"%s\""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Spremam korisni�ki ra�un '%s'"
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "U�itavam poruku %s"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dohvaćam %d poruku"
+msgstr[1] "Dohvaćam %d poruke"
+msgstr[2] "Dohvaćam %d poruka"
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../mail/mail-ops.c:1989
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Ne mogu napraviti izlaznu datoteku: %s\n"
-" %s"
+msgid_plural "Saving %d messages"
+msgstr[0] "Spremam %d poruku"
+msgstr[1] "Spremam %d poruke"
+msgstr[2] "Spremam %d poruka"
 
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13776,11 +15022,11 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13789,531 +15035,601 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2413
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr ""
+
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Provjeravam servis"
 
-#: ../mail/mail-send-recv.c:158
-#, fuzzy
-msgid "Cancelling..."
+#: ../mail/mail-send-recv.c:181
+msgid "Canceling..."
 msgstr "Poništavam..."
 
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "Poslužitelj: %s, tip: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "Putanja: %s, tip: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr "Tip: %s"
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Pošalji i primi poštu"
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Poništi sve"
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Ažuriram..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Pri�ekajte..."
 
-#: ../mail/mail-send-recv.c:699
-#, fuzzy
+#: ../mail/mail-send-recv.c:799
 msgid "Checking for new mail"
-msgstr "Provjeravam za novu poštu"
+msgstr "Provjeravam novu e-poštu"
 
 #: ../mail/mail-session.c:207
 #, c-format
+msgid "Enter Passphrase for %s"
+msgstr ""
+
+#: ../mail/mail-session.c:209
+msgid "Enter Passphrase"
+msgstr ""
+
+#: ../mail/mail-session.c:212
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: ../mail/mail-signature-editor.c:372
-msgid "Edit signature"
-msgstr "Promjeni potpis"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Spremi i zatvori"
 
-#: ../mail/mail-signature-editor.c:412
-msgid "Enter a name for this signature."
-msgstr "Unesite ime za ovaj potpis."
+#: ../mail/mail-signature-editor.c:355
+#, fuzzy
+msgid "Edit Signature"
+msgstr "Promjeni potpis"
 
-#: ../mail/mail-signature-editor.c:415
-#: ../plugins/groupwise-features/properties.glade.h:5
-msgid "Name:"
-msgstr "Ime:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "Tablica potpisa"
 
-#: ../mail/mail-tools.c:116
+#: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Ne mogu napraviti spool direktorij `%s': %s"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 "Pokušaj premjestiti e-poštu u izvor \"%s\", koji nije poštanski sandu�ić."
 
-#: ../mail/mail-tools.c:242
+#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosljeđena poruka - %s"
 
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "Prosljeđena poruka"
 
-#: ../mail/mail-tools.c:284
+#: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Neispravna mapa: `%s'"
 
-#: ../mail/mail-vfolder.c:91
-#, fuzzy, c-format
+#: ../mail/mail-vfolder.c:89
+#, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "Postavljam vfolder: %s"
+msgstr "Postavljam mapu za pretraživanje: %s"
 
-#: ../mail/mail-vfolder.c:240
-#, fuzzy, c-format
+#: ../mail/mail-vfolder.c:233
+#, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Osvežavam vfolder-e za uri: %s"
+msgstr "Osvježavam mapu za pretraživanje za '%s:%s'"
 
-#: ../mail/mail-vfolder.c:247
-#, fuzzy, c-format
+#: ../mail/mail-vfolder.c:240
+#, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Osvežavam vfolder-e za uri: %s"
+msgstr "Osvježavam mape za pretraživanje za '%s'"
 
-#: ../mail/mail-vfolder.c:1046
-#, fuzzy
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
-msgstr "Ozna�i mapu"
+msgstr "Uredi mapu za pretraživanje"
 
-#: ../mail/mail-vfolder.c:1130
-#, fuzzy
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
-msgstr "Ozna�i mapu"
+msgstr "Nova mapa za pretraživanje"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "Mapa pod imenom \"%s\" već postoji. Molim koristite neko drugo ime."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr ""
+"Mapa pod imenom &quot;{1}&quot; već postoji. Molim koristite neko drugo ime."
 
 #: ../mail/mail.error.xml.h:2
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+"Mapa pod imenom &quot;{1}&quot; već postoji. Molim koristite neko drugo ime."
+
+#: ../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.\n"
+"quit."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
+#, fuzzy
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
+"Potvrda pro�itanosti poruke je zatražena za &quot;{1}&quot;. Poslati potvrdu "
+"na {0}?"
 
 #: ../mail/mail.error.xml.h:7
+#, fuzzy
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+"Potpis već postoji sa imenom &quot;{0}&quot;. Molim, koristite neko drugo "
+"ime."
+
+#: ../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 ""
+"Upisivanje smislene teme u vaše poruke će dati vašim primateljima ideju o "
+"tome o �emu govori vaša poruka."
 
-#: ../mail/mail.error.xml.h:8
-#, fuzzy
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "Sigurni ste da želite obrisati ovaj ra�un?"
+msgstr "Sigurni ste da želite obrisati ovaj ra�un i sve njegove proxyje?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurni ste da želite obrisati ovaj ra�un?"
 
-#: ../mail/mail.error.xml.h:10
-#, fuzzy
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Sigurni ste da želite isklju�iti ovaj ra�un i sve njegove proxyje?"
+
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
+msgstr "Sigurni ste da želite otvoriti {0} poruka odjednom?"
 
-#: ../mail/mail.error.xml.h:11
-#, fuzzy
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "Trajno ukloni sve obrisane poruke iz svih direktorija"
+msgstr ""
+"Sigurni ste da želite trajno ukloniti sve obrisane poruke iz svih mapa?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:14
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "Trajno uklanjanje svih obrisanih poruka iz ovog direktorija"
+"folder \"{0}\"?"
+msgstr ""
+"Sigurni ste da želite trajno ukloniti sve obrisane poruke iz svih mapa?"
 
-#: ../mail/mail.error.xml.h:13
-#, fuzzy
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
+msgstr "Sigurni ste da želite poslati poruku u HTML formatu?"
 
-#: ../mail/mail.error.xml.h:14
-#, fuzzy
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
+msgstr ""
+"Sigurni ste da želite poslati poruku samo primateljima slijepih kopija (BCC)?"
 
-#: ../mail/mail.error.xml.h:15
-#, fuzzy
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "Upitaj korisnika kada pokuša poslati poruku bez naslova."
-
-#: ../mail/mail.error.xml.h:16
-msgid "Because &quot;{0}&quot;."
-msgstr ""
+msgstr "Sigurni ste da želite poslati poruku bez naslova?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{2}&quot;."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:19
 #, fuzzy
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Ne mogu obrisati mapu %s."
+msgid "Because \"{0}\"."
+msgstr "Zato Å¡to &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:20
 #, fuzzy
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ne mogu stvoriti mapu: %s: %s"
+msgid "Because \"{2}\"."
+msgstr "Zato Å¡to &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:21
-#, fuzzy
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Ne mogu stvoriti mapu: %s: %s"
+msgid "Blank Signature"
+msgstr "Prazan potpis"
 
 #: ../mail/mail.error.xml.h:22
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nisam mogao napraviti privremeni direktorij: %s"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Ne mogu dodati mapu za pretraživanje &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:23
 #, fuzzy
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Ne mogu otvoriti direktorij  `%s': %s."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Ne mogu kopirati mapu &quot;{0}&quot; u &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:24
 #, fuzzy
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Ne mogu obrisati mapu %s."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ne mogu kreirati mapu &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:25
-#, fuzzy
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Ne mogu obrisati mapu %s."
+msgid "Cannot create temporary save directory."
+msgstr "Ne mogu kreirati privremeni direktorij za spremanje"
 
 #: ../mail/mail.error.xml.h:26
 #, fuzzy
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Ne mogu kreirati direktorij za spremanje, zato Å¡to &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:27
 #, fuzzy
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ne mogu obrisati mapu %s."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Ne mogu obrisati mapu &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:28
 #, fuzzy
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Ne mogu otvoriti izvor"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne mogu obrisati sistemsku mapu &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:29
 #, fuzzy
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Ne mogu otvoriti izvor"
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Ne mogu urediti mapu za pretraživanje &quot;{0}&quot; jer ne postoji"
 
 #: ../mail/mail.error.xml.h:30
 #, fuzzy
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Ne mogu otvoriti poruku"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ne mogu pomaknuti mapu &quot;{0}&quot; u &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:31
-msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
-"license."
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Ne mogu otvoriti izvor &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:32
 #, fuzzy
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Ne mogu stvoriti mapu: %s: %s"
+msgid "Cannot open source \"{2}\"."
+msgstr "Ne mogu otvoriti izvor &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:33
 #, fuzzy
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Ne mogu preimenovati mapu %s."
+msgid "Cannot open target \"{2}\"."
+msgstr "Ne mogu otvoriti cilj &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:34
 #, fuzzy
-msgid "Cannot save changes to account."
-msgstr "Unesi novi kontakt"
+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 ""
+"Ne mogu pro�itati licencnu datoteku &quot;{0}&quot;, zbog instalacijskog "
+"problema. Nećete moći koristiti ovog davatelja dok ne prihvatite njegovu "
+"licencu."
 
 #: ../mail/mail.error.xml.h:35
 #, fuzzy
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Ne mogu otvoriti direktorij  `%s': %s."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Ne mogu preimenovati mapu &quot;{0}&quot; u &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:36
 #, fuzzy
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr ""
-"Ne mogu spremiti u `%s'\n"
-" %s"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ne mogu preimenovati ili premjestiti sistemsku mapu &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:37
-#, fuzzy
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Dod_aj potpis"
+msgid "Cannot save changes to account."
+msgstr "Ne mogu spremiti promjene na ra�unu."
 
 #: ../mail/mail.error.xml.h:38
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Ne mogu spremiti u direktorij &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:39
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Nisam mogao sa�uvati datoteku sa potpisom: %s"
+msgid "Cannot save to file \"{0}\"."
+msgstr "Ne mogu spremiti u datoteku &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:40
 #, fuzzy
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Obriši \"%s\""
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Ne mogu postaviti skriptu potpisa &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:41
 #, fuzzy
-msgid "Delete account?"
-msgstr "Obriši odabrane kontakte"
+msgid "Check Junk Failed"
+msgstr "Provjeri _Spam"
 
 #: ../mail/mail.error.xml.h:42
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Odbaci promjene"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Provjerite je li vaša lozika ispravno upisana. Zapamtite da su mnoge lozinke "
+"osjetljive na velika i mala slova; vaša Caps lock tipka bi mogla biti "
+"uklju�ena."
 
 #: ../mail/mail.error.xml.h:43
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr ""
+msgid "Could not save signature file."
+msgstr "Nisam mogao spremiti datoteku sa potpisom."
 
 #: ../mail/mail.error.xml.h:44
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Želite li spremiti promjene?"
+msgid "Delete \"{0}\"?"
+msgstr "Obriši"
 
 #: ../mail/mail.error.xml.h:45
-#, fuzzy
-msgid "Don't delete"
-msgstr "_Vrati obrisano"
+msgid "Delete account?"
+msgstr "Obrisati ra�un?"
 
 #: ../mail/mail.error.xml.h:46
 #, fuzzy
-msgid "Enter password."
-msgstr "Upišite lozinku"
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Kopiraj odabrane poruke u drugu mapu"
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
-msgid "Error loading filter definitions."
+msgid "Delete messages in Search Folder?"
 msgstr ""
-"Greška kod u�itavanja podataka filtera:\n"
-"%s"
 
 #: ../mail/mail.error.xml.h:48
+msgid "Discard changes?"
+msgstr "Odbaciti promjene?"
+
+#: ../mail/mail.error.xml.h:49
+msgid "Do not d_elete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do not delete"
+msgstr "Ne briši"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do not disable"
+msgstr "Ne isklju�uj"
+
+#: ../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 "Želite li ozna�iti sve poruke pro�itanima?"
+
+#: ../mail/mail.error.xml.h:54
 #, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Želite li spremiti promjene?"
+
+#: ../mail/mail.error.xml.h:55
+msgid "Enter password."
+msgstr "Upišite lozinku."
+
+#: ../mail/mail.error.xml.h:56
+msgid "Error loading filter definitions."
+msgstr "Greška kod u�itavanja definicija fiiltera."
+
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr ""
-"Greška kod izvršenja operacije:\n"
+"Greška kod izvršenja operacije.\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:49
-#, fuzzy
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
-msgstr ""
-"Greška pri '%s':\n"
-"%s"
+msgstr "Greška prilikom {0}."
 
-#: ../mail/mail.error.xml.h:50
-#, fuzzy
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
-msgstr "Datoteka postoji, prepisai preko nje?"
+msgstr "Datoteka postoji ali ne mogu prepisati preko nje."
 
-#: ../mail/mail.error.xml.h:51
-#, fuzzy
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna."
+msgstr "Datoteka postoji ali nije obi�na datoteka."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+msgstr "Ako nastavite, nećete moći vratiti ove poruke."
 
-#: ../mail/mail.error.xml.h:53
+#: ../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 ""
+"Ako obrišete mapu, sav njen sadržaj i sadržaj njenih podmapa će biti trajno "
+"pobrisan."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:63
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Ako nastavite, svi proxy ra�uni će biti trajno pobrisani."
+
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
+"Ako nastavite, informacija o ra�unu i\n"
+"sve informacije o proxy-ju će biti trajno pobrisane."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgstr "Ako nastavite, informacija o ra�unu će biti trajno pobrisana."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
+"Ako izađete, ove poruke neće biti poslane sve dok se Evolution ponovo ne "
+"starta."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
-msgstr ""
+msgstr "Ignoriraj"
 
-#: ../mail/mail.error.xml.h:59
-#, fuzzy
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
-msgstr "SMTP prijava"
+msgstr "Neuspjela autorizacija"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
-msgstr ""
+msgstr "Filteri su automatski nadograđeni."
 
-#: ../mail/mail.error.xml.h:61
+#: ../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 ""
+"Mnogi sistemi e-pošte dodaju Apparently-To zaglavlje za poruke koje imaju "
+"samo BCC primatelje. Ovo zaglavlje, ako je dodano, će usprkos tome ispisati "
+"sve vaše primatelje u vašoj poruci. Da bi ste to izbjegli, trebali bi ste "
+"dodati bar jednog primatelja u Za: ili CC: polje."
 
-#: ../mail/mail.error.xml.h:62
-#, fuzzy
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
-msgstr "Ozna�i sve vidljive poruke kao pro�itane"
+msgstr "Ozna�i sve poruke kao pro�itane"
 
-#: ../mail/mail.error.xml.h:63
-#, fuzzy
-msgid "Mark all messages as read in the selected folder"
-msgstr "_Ozna�i poruke kao pro�itane poslije "
-
-#: ../mail/mail.error.xml.h:64
-#, fuzzy
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
-msgstr "Premještam mapu %s"
+msgstr "Nedostaje mapa."
 
-#: ../mail/mail.error.xml.h:66
-#, fuzzy
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
-msgstr "Nije odabran poslužitelj"
+msgstr "Izvori nisu odabrani."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "Otvaranje previše poruka odjednom bi moglo predugo potrajati."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
-msgstr ""
+msgstr "Molim, provjerite postavke vašeg ra�una i pokušajte ponovo."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:79
+msgid "Please enable the account or send using another account."
+msgstr "Molim, uklju�ite ra�un ili pošaljite poruku koristeći drugi ra�un."
+
+#: ../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 ""
+"Molim, upišite ispravnu adresu u Za: polje. Možete potražiti adresu "
+"klikajući na Za: gumb koji se nalazi do polja za upisivanje adrese."
 
-#: ../mail/mail.error.xml.h:70
-#, fuzzy
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
-"Šaljete HTML formatiranu poruku. Osigurajte se da sljedeći primatelji\n"
-"žele i mogu primati HTML poruke:\n"
-"%s Treba li ipak poslati?"
 
-#: ../mail/mail.error.xml.h:73
-#, fuzzy
+#: ../mail/mail.error.xml.h:83
+msgid "Please provide an unique name to identify this signature."
+msgstr "Molim, upišite jedinstveno ime za ozna�avanje ovog potpisa."
+
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
-msgstr "Molim pri�ekajte"
+msgstr "Molim pri�ekajte."
 
-#: ../mail/mail.error.xml.h:74
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr ""
+#: ../mail/mail.error.xml.h:85
+#, fuzzy
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem sa preseljenjem mape stare pošte &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
-msgstr ""
+msgstr "Šaljem upit na poslužitelj"
 
-#: ../mail/mail.error.xml.h:76
-#, fuzzy
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Obavezno šifriranje za traženi mehanizam prijave"
+msgstr "Pitam poslužitelj za popis podržanih mehanizama autorizacije."
 
-#: ../mail/mail.error.xml.h:77
-#, fuzzy
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
-msgstr "Pokaži ra�une"
+msgstr "Zatražena potvrda pro�itanosti poruke."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:89
 #, fuzzy
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Treba li doista obrisati mapu \"%s\" i sve njene podmape?"
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Treba li doista obrisati mapu &quot;{0}&quot; i sve njene podmape?"
 
-#: ../mail/mail.error.xml.h:79
-msgid "Search Folders automatically updated."
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Uvezi datoteku"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
-#, fuzzy
+#: ../mail/mail.error.xml.h:92
+msgid "Search Folders automatically updated."
+msgstr "Mape za pretraživanje su automatski nadograđene."
+
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
-msgstr "Pokaži ra�une"
+msgstr "Pošalji potvrdu o pro�itanoj poruci"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:94
+msgid "Signature Already Exists"
+msgstr "Potpis već postoji"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14322,236 +15638,265 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
+"Kontakt popis kome šaljete je podešen da sakrije popis primatelja.\n"
+"\n"
+"Mnogi sistemi pošte dodaju Apparently-To zaglavlje za poruke koje imaju samo "
+"BCC primatelje. Ovo zaglavlje, ako je dodano, će usprkos tome ispisati sve "
+"vaše primatelje u vašoj poruci. Da bi ste to izbjegli, trebali bi ste dodati "
+"bar jednog primatelja u Za: ili CC: polje. "
 
-#: ../mail/mail.error.xml.h:85
+#: ../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 ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorij:\n"
-"    '%s'\n"
-"Potom su osvježeni."
+"Slijedeće mape za pretraživanje:\n"
+"{0}\n"
+"su koristile sada pobrisane mape:\n"
+"    &quot;{1}&quot;\n"
+"i osvježene su."
 
-#: ../mail/mail.error.xml.h:90
+#: ../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 ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorij:\n"
-"    '%s'\n"
-"Potom su osvježeni."
-
-#: ../mail/mail.error.xml.h:95
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
-msgstr ""
+"Slijedeća pravila za filtere:\n"
+"{0}\n"
+"su koristila sada pobrisane mape:\n"
+"    &quot;{1}&quot;\n"
+"i osvježene su."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
-msgstr ""
+msgstr "Datoteka skripte mora postojati i biti izvršna."
 
-#: ../mail/mail.error.xml.h:98
+#: ../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 ""
+"Ova mapa je možda dodana implicitno,\n"
+"idite u uređiva� mapa za pretraživanje i dodajte je izri�ito, ako je "
+"potrebno."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:114
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr ""
+"Ova poruka nije mogla biti poslana zato što ra�un koji ste odabrali za "
+"slanje nije uklju�en"
 
-#: ../mail/mail.error.xml.h:101
-#, fuzzy
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Ova poruka nije mogla biti poslana zato Å¡to niste odredili niti jednog "
+"primatelja"
+
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "SMTP poslužitelj %s ne podržava traženi tip autorizacije (%s)."
+msgstr ""
+"Ovaj poslužitelj ne podržava ovu vrstu autorizacije i možda uopće ne "
+"podržava autorizaciju."
 
-#: ../mail/mail.error.xml.h:102
-#, fuzzy
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
+msgstr "Ovaj potpis je promjenjen, ali nije spremljen."
+
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr ""
-"Ovaj potpis je promenjen, ali nije spremljen.\n"
-"\n"
-"Želite li ga spremiti?"
+"Ovo će ozna�iti sve poruke kao pro�itane u odabranoj mapi i njenim podmapama."
 
-#: ../mail/mail.error.xml.h:103
-#, fuzzy
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
-msgstr "Neuspešno povezivanje sa LDAP serverom"
+msgstr "Neuspešno povezivanje sa GroupWise poslužiteljem."
 
-#: ../mail/mail.error.xml.h:104
-#, fuzzy
+#: ../mail/mail.error.xml.h:120
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"Ne mogu otvoriti mapu sa pripremom za ovaj ra�un.\n"
-"Želite li da koristite predefinisanu mapu sa pripremom?"
+"Ne mogu otvoriti mapu sa nedovršenim porukama za ovaj ra�un. Koristiti "
+"sistemsku mapu sa nedovršenim porukama umjesto toga?"
 
-#: ../mail/mail.error.xml.h:105
-#, fuzzy
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
-msgstr ""
-"Ne mogu da tražim datoteku: %s\n"
-"%s"
+msgstr "Ne mogu pro�itati licencnu datoteku."
 
-#: ../mail/mail.error.xml.h:106
-#, fuzzy
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
-msgstr "Uobi�ajeno"
+msgstr "Koristi _uobi�ajeno"
 
-#: ../mail/mail.error.xml.h:107
-#, fuzzy
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
-msgstr "Putanja do uobi�ajene mape kontakata"
+msgstr "Koristiti uobi�ajenu mapu za nedovršene poruke?"
+
+#: ../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:108
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Niste unijeli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlane poruke, želite li svejedno izaći?"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete otvoriti dva naloga sa istim imenom."
 
-#: ../mail/mail.error.xml.h:111
-#, fuzzy
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
-msgstr "Morate imenovati ovaj vfolder."
+msgstr "Morate imenovati ovu mapu za pretraživanje."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Morate odrediti mapu."
 
-#: ../mail/mail.error.xml.h:113
+#: ../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 ""
+"Morate odrediti bar jednu mapu kao izvor.\n"
+"To �inite klikajući na mape individualno i/ili ozna�avanjem svih lokalnih "
+"mapa, svih udaljenih mapa , ili oboje."
 
-#: ../mail/mail.error.xml.h:115
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:116
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#: ../mail/mail.error.xml.h:134
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
+"Neuspjela prijava na vaš poslužitelj &quot;{0}&quot; kao &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:117
-#, fuzzy
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
-msgstr "Pošalji"
+msgstr "_Dodaj"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Odbaci promjene"
 
-#: ../mail/mail.error.xml.h:119
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Isprazni smeće"
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:139
 #, fuzzy
 msgid "_Expunge"
 msgstr "_Izbaci"
 
-#: ../mail/mail.error.xml.h:121
-#, fuzzy
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
-msgstr "_Otvori poruku"
+msgstr "_Otvori poruke"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1055
+#, fuzzy
+msgid "Forwarded"
+msgstr "Naprijed"
+
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Viši"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Najviši"
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../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:1345 ../plugins/itip-formatter/itip-view.c:198
-#: ../widgets/table/e-cell-date.c:72
+#: ../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 "Danas %k:%M %p"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ju�er %l:%M %p"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: ../mail/message-list.c:2042
-#, fuzzy
-msgid "Message List"
-msgstr "_Poruke"
-
-#: ../mail/message-list.c:3387
+#. 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
 msgid "Generating message list"
 msgstr "Radim popis poruka"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4226
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"Nema se Å¡to pokazati u ovom pogledu."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Dospijeva do"
@@ -14568,51 +15913,52 @@ msgstr "Obilježeno zastavicom"
 msgid "Follow Up Flag"
 msgstr "Slijedna zastavica"
 
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "Orginalna lokacija"
-
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Primljeno"
 
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Veli�ina"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Poziv"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ne proslijeđuj"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "_Sljedi"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Naprijed"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Nije nužan odgovor"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Ponovni pregled"
 
@@ -14638,868 +15984,1414 @@ msgstr "Subjekt sadrži"
 
 #: ../mail/searchtypes.xml.h:6
 #, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Tema ili pošiljatelj sadrži"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
-msgstr "Subjekt sadrži"
+msgstr "Tema ili pošiljatelj sadrži"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Lokalni adresari"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "Osigurava osnovnu funkcionalnost za lokalne adresare"
+
+#: ../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:474
+#: ../plugins/templates/templates.c:394
+msgid "Keywords"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#, fuzzy
+msgid "_Edit Message"
+msgstr "_Uredi poruku"
 
 #: ../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 ""
+"Dodatak koji prikazuje zvu�ne privitke unutar programa i omogućuje da ih "
+"slušate direktno iz Evolutiona."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr ""
+msgstr "Zvu�ni dodatak"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:127
+msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
-msgstr ""
+msgstr "Ponovo pok_reni Evolution nakon izrade sigurnosne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:179
+msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
+msgstr "Ponovo pok_reni Evolution nakon povrata"
+
+#: ../plugins/backup-restore/backup-restore.c:276
+msgid "Restore from backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:109
-#, fuzzy
+#: ../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 ""
+
+#: ../plugins/backup-restore/backup-restore.c:291
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:294
+msgid "Choose a file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
-msgstr "Evolution"
+msgstr "Izradi sigurnosnu kopiju direktorija Evolutiona"
 
-#: ../plugins/backup-restore/backup.c:111
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
-msgstr "Evolution"
+msgstr "Povrati direktorij Evolutiona"
+
+#: ../plugins/backup-restore/backup.c:70
+msgid "Check Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:72
+msgid "Restart Evolution"
+msgstr "Ponovo pokreni Evolution"
+
+#: ../plugins/backup-restore/backup.c:74
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
+msgid "Shutting down Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:132
+msgid "Backing Evolution accounts and settings"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:113
+#: ../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 ""
+
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
+msgid "Restarting Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:262
+msgid "Backup current Evolution data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:267
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:274
+msgid "Loading Evolution settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:278
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/backup-restore/backup.c:460
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr ""
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:479
+msgid "Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:479
+msgid "Evolution Restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:514
 #, fuzzy
-msgid "Check Evolution archive"
-msgstr "Ximian Evolution Groupware okruženje"
+msgid "Backing up Evolution Data"
+msgstr "Izradi sigurnosnu kopiju direktorija Evolutiona"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../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 "Restart Evolution"
-msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
+msgid "Restoring Evolution Data"
+msgstr "Ponovo pokreni 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
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
+"Dodatak za izradu sigurnosne kopije i povrat podataka i postavki Evolutiona."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
+msgstr "Dodatak za izradu i vraćanje sigurnosne kopije"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../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
 #, fuzzy
-msgid "Backup Settings..."
-msgstr "_Postavke..."
+msgid "Insufficient Permissions"
+msgstr "Delegiraj ovlasti"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Invalid Evolution backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Please select a valid backup file to restore."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 #, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Kopiraj odabranu mapu u drugu mapu"
+
+#: ../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 "Promijeni postavke Evolutiona"
+msgstr "Izrada i vraćanje sigurnosne kopije podataka i postavki Evolutiona"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-#, fuzzy
-msgid "Restore Settings..."
-msgstr "Podešavanja pilota..."
+msgid "_Backup Settings..."
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:404
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
-msgstr "Važni kontakti"
-
-#: ../plugins/bbdb/bbdb.c:413
-#, fuzzy
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<b>Vrijednost polja</b>"
+msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:444
-#, fuzzy
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<b>Vrijednost polja</b>"
+#: ../plugins/bbdb/bbdb.c:573
+msgid "Select Address book for Automatic Contacts"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:588
+msgid "Instant Messaging Contacts"
+msgstr "Instant Messaging (IM) kontakti"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
-msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
-msgid "Synchronize with _buddy list now"
+#: ../plugins/bbdb/bbdb.c:609
+msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
-msgid "Automatic contacts"
-msgstr "Nema kontakata"
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:620
+msgid "Synchronize with _buddy list now"
+msgstr "Sinkroniziraj sa listom IM kontakata"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#, fuzzy
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"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 ""
+"Automatski napuni imenik sa imenima i adresama kada odgovarate na poruke. "
+"Isto tako napuni kontaktne informacije iz vaše liste IM kontakata."
 
 #: ../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:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Greška kod ispisa"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+msgid "Convert message text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filters junk messages using Bogofilter."
+msgstr "Filtrira smeće koristeći 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 "Koristi _SSL"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
 msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-#, fuzzy
 msgid "Local Calendars"
-msgstr "U�itavam kalendar"
+msgstr "Lokalni kalendari"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
+msgstr "Osigurava osnovnu funkcionalnost lokalnih kalendara."
+
+#: ../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
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "_Osvježi:"
+
+#: ../plugins/calendar-http/calendar-http.c:332
+msgid "_Secure connection"
+msgstr "_Sigurna veza"
+
+#: ../plugins/calendar-http/calendar-http.c:397
+msgid "Userna_me:"
 msgstr ""
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-#, fuzzy
 msgid "HTTP Calendars"
-msgstr "Kalendari"
+msgstr "HTTP kalendari"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
+msgstr "Osigurava osnovno funkcioniranje za webcal i http kalendare."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
-msgstr ""
+msgstr "Vrijeme: Obla�no"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
-msgstr ""
+msgstr "Vrijeme: Magla"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "Vrijeme: Djelomi�no obla�no"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
-msgstr ""
+msgstr "Vrijeme: Kiša"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
-msgstr ""
+msgstr "Vrijeme: Snijeg"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
-msgstr ""
+msgstr "Vrijeme: Sun�ano"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
-msgstr ""
+msgstr "Vrijeme: Grmljavina"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
-#, fuzzy
 msgid "Select a location"
-msgstr "Odaberi akciju"
+msgstr "Odaberite lokaciju"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
-msgstr "Jedinica"
+msgstr "_Mjere:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
-msgstr ""
+msgstr "Metri�ne (Celzij, cm itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
+msgstr "Imperijalne (Fahrenheit, in�i, itd.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
-msgstr ""
+msgstr "Osigurava osnovnu funkcionalnost za vremenske kalendare."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-#, fuzzy
 msgid "Weather Calendars"
-msgstr "Kalendari"
+msgstr "Vremenski kalendari"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
-msgid "Copy _Email Address"
-msgstr "Poštanska adresa"
+"Testni dodatak koji demonstrira dodatak popup izbornika koji vam omogućuje "
+"kopiranje stvari u spremnik."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#, fuzzy
 msgid "Copy tool"
-msgstr "Kopiraj u mapu"
+msgstr "Alat za kopiranje"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
-#, fuzzy
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "Putanja do uobi�ajene mape e-pošte"
+msgstr "Provjeri je li Evolution uobi�ajeni program za slanje pošte"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../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 ""
+"Provjeri je li Evolution uobi�ajeni program za slanje pošte svaki put kada "
+"se program pokreće."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
 msgstr ""
+"Provjeri prilikom pokretanja Evolutiona da li je uobi�ajeni program za "
+"slanje i �itanje pošte."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-#, fuzzy
 msgid "Default Mail Client "
-msgstr "Uobi�ajeni na�in odgovaranja"
+msgstr "Uobi�ajeni program za e-poštu "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
+msgstr "Želite li koristiti Evolution kao uobi�ajeni e-mail program?"
+
+#: ../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
-#: ../plugins/default-source/default-source.c:109
 #, fuzzy
-msgid "Mark as default folder"
-msgstr "Putanja do uobi�ajene mape kontakata"
+msgid "Mark as _default address book"
+msgstr "Ozna�i kao _uobi�ajenu mapu"
+
+#: ../plugins/default-source/default-source.c:103
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "Ozna�i kao _uobi�ajenu mapu"
+
+#: ../plugins/default-source/default-source.c:104
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "Ozna�i kao _uobi�ajenu mapu"
+
+#: ../plugins/default-source/default-source.c:105
+#, fuzzy
+msgid "Mark as _default memo list"
+msgstr "Ozna�i kao _uobi�ajenu mapu"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Uobi�ajeni izvori"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
+msgid ""
+"Provides functionality for marking a calendar or an address book as the "
+"default one."
+msgstr "Osigurava osnovnu funkcionalnost za lokalne adresare"
+
+#: ../plugins/email-custom-header/email-custom-header.c:558
+#, fuzzy
+msgid "_Custom Header"
+msgstr "_Prilagođen prikaz"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+#, fuzzy
+msgid "Key"
+msgstr "Kenija"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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
+#, fuzzy
+msgid "Custom Header"
+msgstr "Sastavi poruku"
+
+#: ../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 "Otvaranje mape drugog korisnika"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "_Ime korisni�kog ra�una:"
+msgstr "Korisni�ki _ra�un:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
-msgstr "_Ime mape: "
+msgstr "_Ime mape:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-#, fuzzy
 msgid "_User:"
-msgstr "_Korisni�ko ime:"
+msgstr "_Korisnik:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
-msgstr "Upišite šifru"
+msgstr "Osiguraj lozinku"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr "Spajanje na poslužitelj korištenjem Kerberos 4 autentifikacije."
+msgstr ""
+"Ova opcija će spojiti na Exchange poslužitelj koristeći autorizaciju sigurne "
+"lozinke (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
-msgstr "Upišite šifru"
+msgstr "Lozinka kao �isti tekst"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u �istom tekstu."
+msgstr ""
+"Ova opcija će spojiti na Exchange poslužitelj koristeći autorizaciju sa "
+"standardnom tekstualnom lozinkom."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
-msgstr "Odsutan..."
+msgstr "Izvan ureda..."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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 ""
-"<small>Donja poruka bit će poslana svakome tko vam pošalje\n"
-"poštu dok ste izvan ureda.</small>"
+"Donja poruka bit će automatski poslana svakome \n"
+"tko vam pošalje poruku dok ste izvan ureda."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
-msgstr "Trenutno sam izvan ureda"
+msgstr "Izvan ureda sam"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 #, fuzzy
 msgid "I am in the office"
 msgstr "Trenutno sam u uredu"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
-msgstr "Unesite lozinku za %s"
+msgstr "Promjenite lozinku za Exchange korisni�ki ra�un"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
-msgstr "Upišite šifru"
+msgstr "Promjenite lozinku"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "Uredite zastupni�ke postavke za Exchange ra�un"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
-#, fuzzy
-msgid "Delegation Assitant"
-msgstr "Pomoćnik za stvaranje kalendara"
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
+msgid "Delegation Assistant"
+msgstr ""
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
-msgstr "<b>Vrijednost polja</b>"
+msgstr "Razno"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
-msgstr "sa svim lokalnim mapama"
+msgstr "Pogledaj veli�inu svih Exchange mapa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
-msgstr "Mape"
+msgstr "Veli�ine mapa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
-msgstr "Postavke"
+msgstr "Exchange postavke"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
+msgid "_OWA URL:"
+msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
-msgstr "Provjera vjerodostojnosti neuspješna"
+msgstr "Provjera vjerodostojnosti"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 #, fuzzy
-msgid "Authentication Type"
-msgstr "Provjera vjerodostojnosti neuspješna"
+msgid "_Mailbox:"
+msgstr "_Pošta"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+msgid "_Authentication Type"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
+msgstr "Provjeri podržane vrste"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+msgid "0 KB"
 msgstr ""
 
+#: ../plugins/exchange-operations/exchange-calendar.c:192
+#: ../plugins/exchange-operations/exchange-contacts.c:165
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+"Evolution nije spojen na internet. Sada ne možete kreirati ili mijenjati "
+"mape.\n"
+"Molimo, spojite Evolution na internet za takve operacije."
+
 #. 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 ""
+"Trenutna lozinka se na slaže sa postojećom lozinkom za vaš korisni�ki ra�un. "
+"Molim unesite ispravnu lozinku"
 
-#: ../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 ""
+msgstr "Obje lozinke se ne podudaraju. Molim unesite lozinke ponovno."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Confirm Password:"
-msgstr "Upišite šifru"
+msgstr "Potvrdite lozinku:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Current Password:"
-msgstr "Upišite šifru"
+msgstr "Trenutna lozinka:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "New Password:"
-msgstr "Lozinka:"
+msgstr "Nova lozinka:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
+msgstr "Vaša trenutna lozinka je istekla. Molim promjenite lozinku."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "Vaša lozinka će isteći u sljedećih %d dana"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
-msgstr "Korisni�ki pogled"
+msgstr "Prilagođeni"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "Urednik (�itaj, izradi, izmjeni)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Autor (�itaj, stvori)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "Preglednik (samo �itanje)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Delegiraj ovlasti"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#, c-format
 msgid "Permissions for %s"
-msgstr "Pristup odbijen"
+msgstr "Ovlasti za %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
-#, fuzzy
+#. 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
+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:346
+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
+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
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
-msgstr "Delegiraj za:"
+msgstr "Delegiraj za"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "Makni delegaciju %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
-msgstr ""
-"Ne mogu kreirati mapu %s:\n"
-"%s"
+msgstr "Ne mogu pristupiti Active Directoryu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
-msgstr "Nisam mogao otvoriti direktorij za pri�uvnu memoriju: %s"
+msgstr "Ne mogu se pronaći u Active Directoryu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-delegates.c:725
+#, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "Nisam mogao otvoriti direktorij za pri�uvnu memoriju: %s"
+msgstr "Ne mogu pronaći delegata %s u Active Directoryu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-delegates.c:737
+#, c-format
 msgid "Could not remove delegate %s"
-msgstr "Nisam mogao da upišem: %s"
+msgstr "Ne mogu maknuti delegata %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
-msgstr "Nisam mogao ažurirati objekt"
+msgstr "Ne mogu ažurirati listu delegata."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-delegates.c:815
+#, c-format
 msgid "Could not add delegate %s"
-msgstr "Ne mogu obrisati mapu: %s"
+msgstr "Ne mogu dodati delegata %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
-msgstr "Greška kod dodavanja popisa"
+msgstr "Greška prilikom �itanja liste delegata."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "K_alendar"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-#, fuzzy
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
-msgstr "Konatkti: "
+msgstr "_Kontakti:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
-msgid "Delegate Permissions"
-msgstr "Delegirano"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
-msgstr "Delegirano"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Editor (read, create, edit)"
-msgstr ""
+msgstr "Delegati"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
-msgstr "Pristup odbijen"
+msgstr "Ovlasti za"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#, fuzzy
-msgid "Reviewer (read-only)"
-msgstr "Servis spreman"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
+"Ovi korisnici će moći slati poštu u vaše ime,\n"
+"i moći će pristupiti vašim mapama sa ovlastima koje im vi date."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "Unesi novi zadatak"
+msgstr "_Delegati mogu vidjeti vaše privatne stavke"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-#, fuzzy
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
-msgstr "Dolazna pošta"
+msgstr "_Dolazna pošta:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "Za_duženja:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-#, fuzzy
 msgid "Permissions..."
-msgstr "Pristup odbijen"
+msgstr "Ovlasti..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Naziv mape"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
-msgstr "Naziv mape"
+msgstr "Veli�ina mape"
 
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 #, fuzzy
+msgid "User"
+msgstr "Korisnici"
+
+#: ../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 "Pretplati se za Other Users mapu"
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
-msgstr "_Mapa pošte"
+msgstr "Exchange stablo mapa"
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#, fuzzy
+#: ../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 "Pretplati se na mape..."
+msgstr "Makni pretplatu na mapu..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
+#, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
+msgstr "Želite li stvarno otkazati pretplatu na mapu \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
+#, c-format
 msgid "Unsubscribe from \"%s\""
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
+msgstr "Otkaži pretplatu od \"%s\""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
-#, fuzzy
+#: ../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 ""
+"<b>Vaš trenutni status je \"Izvan ureda\". </b>\n"
+"\n"
+"Želite li ga promijeniti na \"U uredu\"? "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Poruka:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Status:</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 ""
+"<small>Donja poruka bit će poslana svakome tko vam pošalje\n"
+"poštu dok ste izvan ureda.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Trenutno sam u uredu"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Trenutno sam izvan ureda"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Ne, nemoj mijenjati status"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Asistent izvan kacelarije"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Da, promijeni status"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "Upozorenje o isteku lozinke..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "Vaša lozinka će isteći za 7 dana..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "_Promjenite lozinku"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
-msgstr "Pristup odbijen"
+msgstr "(Pristup odbijen.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
-msgstr ""
+msgstr "Dodaj korisnika:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
-#, fuzzy
+#: ../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
 msgid "Add User"
-msgstr "_Dodaj adresu"
+msgstr "Dodaj korisnika"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 msgid "<b>Permissions</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+msgstr "<b>Ovlasti</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "Cannot Delete"
-msgstr "Unesi delegata"
+msgstr "Ne mogu obrisati"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Edit"
-msgstr "Sva polja"
+msgstr "Ne mogu izmijeniti"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Create items"
-msgstr "Napravi mapu"
+msgstr "Napravi stavke"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create subfolders"
-msgstr "Napravi mapu"
+msgstr "Kreiranje podmapa"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
-msgstr "Delegirano"
+msgstr "Brisanje bilo koje stavke"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
-msgstr "Delegirano"
+msgstr "Brisanje vlastitih stavki"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
-msgstr "Kategorije"
+msgstr "Izmjena bilo koje stavke"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
-msgstr "Kategorije"
+msgstr "Izmijeni vlastite stavke"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Folder contact"
-msgstr "Nema kontakata"
+msgstr "Kontakt mape"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder owner"
-msgstr "VFolder na P_ošiljaoca"
+msgstr "Vlasnik mape"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder visible"
-msgstr "Mape"
+msgstr "Mapa je vidljiva"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
-msgstr "Pokaži ra�une"
+msgstr "ÄŒitaj stavke"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Role: "
-msgstr "Uloga"
+msgstr "Uloga: "
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
-msgstr "Ozna�i mapu"
+msgstr "Odaberite korisnika"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+msgid "Address Book..."
 msgstr "Adresar..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "Pretplati se na Other User kontakte"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-#, fuzzy
 msgid "Subscribe to Other User's Calendar"
-msgstr "Otvaranje mape drugog korisnika"
+msgstr "Pretplati se na Other User kalendar"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+#, fuzzy
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+"Dodatak koji barata sa kolekcijom Exchange specifi�nih zahvata i svojstava "
+"korisni�kih ra�una."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Exchange operacije"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr ""
+msgstr "Ne mogu promjeniti lozinku zbog problema u konfiguraciji."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-#, fuzzy
 msgid "Cannot display folders."
-msgstr "Ne mogu stvoriti mapu: %s: %s"
+msgstr "Ne mogu prikazati mape."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
+msgid "Cannot perform the operation."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
-msgid "Could not authenticate to server."
-msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+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
-#, fuzzy
-msgid "Could not change password."
-msgstr "Niste unijeli lozinku."
+msgid "Could not authenticate to server."
+msgstr "Ne mogu se autentificirati poslužitelju."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid "Could not change password."
+msgstr "Ne mogu promjeniti lozinku."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-#, fuzzy
-msgid "Could not connect to server {0}."
-msgstr "Nisam se mogao povezati na POP server %s"
+"Ne mogu konfigurirati Exchange korisni�ki ra�un zbog\n"
+"nepoznate greške. Provjerite URL,\n"
+"korisni�ko ime, lozinku, te pokušajte ponovno."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
-#, fuzzy
-msgid "Could not determine folder permissions for delegates."
-msgstr "Ne mogu dohvatiti �lanak %s s NNTP poslužitelja"
+msgid "Could not connect to Exchange server."
+msgstr "Ne mogu se povezati sa Exchange poslužiteljem."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgid "Could not connect to server {0}."
+msgstr "Ne mogu se povezati sa poslužiteljem {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-#, fuzzy
-msgid "Could not locate server {0}."
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgid "Could not determine folder permissions for delegates."
+msgstr "Ne mogu odrediti ovlasti mapa za delegate."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not make {0} a delegate"
-msgstr ""
+msgid "Could not find Exchange Web Storage System."
+msgstr "Ne mogu pronaći Exchange mrežni sustav pohrane."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-#, fuzzy
-msgid "Could not read folder permissions"
-msgstr "Nisam mogao preimenovati direktorij: %s"
+msgid "Could not locate server {0}."
+msgstr "Ne mogu locirati poslužitelj {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-#, fuzzy
-msgid "Could not read folder permissions."
-msgstr "Nisam mogao preimenovati direktorij: %s"
+msgid "Could not make {0} a delegate"
+msgstr "Ne mogu napraviti {0} delegatom"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-#, fuzzy
-msgid "Could not read out-of-office state"
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgid "Could not read folder permissions"
+msgstr "Ne mogu �itati ovlasti mapa"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-#, fuzzy
-msgid "Could not update folder permissions."
-msgstr "Ne mogu obrisati mapu: %s"
+msgid "Could not read folder permissions."
+msgstr "Ne mogu �itati ovlasti mapa."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-#, fuzzy
-msgid "Could not update out-of-office state"
-msgstr "Nisam mogao ažurirati objekt"
+msgid "Could not read out-of-office state"
+msgstr "Ne mogu �itati izvan-uredsko stanje"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Exchange Account is offline."
-msgstr ""
+msgid "Could not update folder permissions."
+msgstr "Ne mogu ažurirati ovlasti mapa."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr ""
+msgid "Could not update out-of-office state"
+msgstr "Ne mogu ažurirati izvan-uredsko stanje"
 
 #: ../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 "Exchange korisni�ki ra�un nije priklju�en."
+
+#: ../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"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
+"xchange Connector zahtjeva pristup određenim\n"
+"funkcionalnostima na Exchange poslužitelju koje su izgleda\n"
+"onemogućene ili blokirane. (Ovo je ina�e\n"
+"nenamjerno.) Vaš Exchange administrator će\n"
+"morati uklju�iti ovu funkcionalnost ukoliko\n"
+"želite koristiti Evolution Exchange Connector.\n"
+"\n"
+"Za informacije koje želite proslijediti vašem Exchange\n"
+"administratoru, molim slijedite link ispod:\n"
+"\n"
+"{0}\n"
+"  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
-msgstr "Neuspjela prijava.\n"
+msgstr "Neuspjelo ažuriranje delegata:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
-msgstr "Certifikat već postoji"
+msgstr "Mapa već postoji"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
-msgstr "Mapa `%s' ne postoji."
+msgstr "Mapa ne postoji"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
-msgstr "Neumreženi rad"
+msgstr "Mapa nije priklju�ena"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Generi�ka greška"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../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:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
+"Ako ja OWA pokrenuta na drugoj putanji, morate to navesti u dijalogu "
+"konfiguracije korisni�kog ra�una."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
-msgstr ""
+msgstr "Poštanski sandu�ić za {0} nije na ovom poslužitelju."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
-msgstr ""
+msgstr "Provjerite da je li URL ispravan i pokušajte ponovno."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
+"Provjerite je li ime poslužitelja ispravno napisano i pokušajte ponovno."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
+"Provjerite jesu li korisni�ko ime i lozinka ispravni i pokušajte ponovno."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr ""
+"Nema Global Catalog poslužitelja konfiguriranog za ovaj korisni�ki ra�un."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "Nema poštanskog sandu�ića za korisnika {0} na {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
-msgstr "Nema takve mape %s"
+msgstr "Nema takvog korisnika {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
+msgstr "Lozinka je uspješno promjenjena."
+
+#: ../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:48
-#, fuzzy
-msgid "Please restart Evolution"
-msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
+#: ../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:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "Please restart Evolution for changes to take effect"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Molim odaberite korisnika."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
-msgstr ""
+msgstr "Poslužitelj je odbio lozinku zato što je preslaba."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr ""
+msgstr "Exchange korisni�ki ra�un bit će onemogućen kada ugasite Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr ""
+msgstr "Exchange korisni�ki ra�un bit će maknut kada ugasite Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr ""
+msgstr "Exchange poslužitelj nije kompatibilan sa Exchange Connector-om."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
+"Na poslužitelju je pokrenut Exchange 5.5. Exchange Connector\n"
+"podržava samo Microsoft Exchange 2000 i 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../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"
@@ -15507,842 +17399,1450 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"Ovo vjerojatno zna�i da vaš poslužitelj zahtjeva\n"
+"od vas da navedete ime Windows domene\n"
+"kao dio vašeg korisni�kog imena (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Ili ste možda krivo upisali lozinku."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
-msgstr ""
+msgstr "Pokušajte ponovno sa drugom lozinkom."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
-msgstr "Nisam mogao da prođem kroz mapu sa redom"
+msgstr "Ne mogu dodati korisnika za pristup kontrolnoj listi:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
-msgstr "Ne mogu da ovjerim potpis lista"
+msgstr "Ne mogu promjeniti delegate."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
-msgstr "Nepoznata greška"
+msgstr "Nepoznata greška tražeći {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
-msgstr "Nepoznata greška"
+msgstr "Nepoznata greška."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
-msgstr "Nepoznato"
+msgstr "Nepoznati tip"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-#, fuzzy
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
-msgstr "Korisnik je poništio operaciju."
+msgstr "Nepodržana operacija"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-#, fuzzy
-msgid "You are nearing your quota available for storing mails on this server."
-msgstr "Za �itanje i spremanje pošte na IMAP servere."
+#: ../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 "Bližite se dozvoljenoj kvoti za spremanje pošte na ovom poslužitelju."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "You cannot make yourself your own delegate"
+#: ../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:70
-msgid "You have exceeded your quota for storing mails on this server."
-msgstr ""
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You cannot make yourself your own delegate"
+msgstr "Ne možete napraviti sebe vašim delegatom"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+msgid "You have exceeded your quota for storing mail on this server."
+msgstr "Ispunili ste kvotu za spremanje pošte na ovom poslužitelju."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "Možete konfigurirati samo jedan Exchange korisni�ki ra�un."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../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 "
-"mails."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr ""
+"Vaše trenutno zauzeće je: {0} KB. Pokušajte osloboditi mjesta brišući "
+"nekoliko poruka."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../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 "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr ""
+"Vaše trenutno zauzeće je: {0} KB. Sada nećete moći poslati, a niti primiti "
+"poštu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../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 mails till you "
-"clear up some space by deleting some mails."
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
 msgstr ""
+"Vaše trenutno zauzeće je: {0} KB. Nećete moći poslati poštu ukoliko ne "
+"o�istite malo mjesta brišući koju poruku."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
-msgstr ""
+msgstr "Vaša lozinka je istekla."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "{0} ne može biti dodan u ulaznu kontrolnu listu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "{0} je već delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "{0} je već u listi"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "Pretplatite se na zadatke ostalih korisnika"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-#, fuzzy
 msgid "Check folder permissions"
-msgstr "Provjeravam dosljednost mape"
+msgstr "Provjerite ovlasti mape"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 #, fuzzy
-msgid "Subscribe to Other User's Folder"
-msgstr "Otvaranje mape drugog korisnika"
+msgid "Default External Editor"
+msgstr "Uobi�ajeni program za e-poštu "
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
-#, fuzzy, c-format
+#: ../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 ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Ne mogu kreirati privremeni direktorij za spremanje"
+
+#: ../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"
+msgstr "Å irina prozora za pisanje poruke"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/face/face.c:69
+msgid "PNG files"
+msgstr ""
+
+#: ../plugins/face/face.c:126
+msgid "_Face"
+msgstr ""
+
+#: ../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/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\""
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
+msgstr "Ukidam pretplatu na mapu \"%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 ""
+"Omogućuje ukidanje pretplate mapa pošte u kontekstnom izborniku stabla mapa."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-#, fuzzy
 msgid "Unsubscribe Folders"
-msgstr "Pretplati se na mape..."
+msgstr "Ukini preplatu na mape"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "_Otkaži pretplatu"
+
+#: ../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 ""
+
+#: ../plugins/google-account-setup/google-source.c:439
+#, fuzzy
+msgid "Please enter user name first."
+msgstr "Molim birajte drugo ime."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Dodaj mapuu popis pretplaćenih mapa"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/google-account-setup/google-source.c:693
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "_Kalendar:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "Dohvaćanje `%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 "<b>Pregled</b>"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Dodatak za postavljanje Hula izvora kalendara."
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Kontrolni popis"
 
 #: ../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 ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
-msgstr "Grupa"
+msgstr "Podešavanje Groupwise korisni�kog ra�una"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
-#, fuzzy
+#: ../plugins/groupwise-features/install-shared.c:219
+#, 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:224
+msgid "Install the shared folder"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:226
+msgid "Shared Folder Installation"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
-msgstr "Postavke"
+msgstr "Postavke spama"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-#, fuzzy
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Postavke pošte smeća"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
-#, fuzzy
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
-msgstr "Podešavanja Pi_lota..."
+msgstr "Postavke spam pošte..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
-msgid "<b>Junk List :</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+msgid "<b>Junk List:</b>"
+msgstr "<b>Lista spam pošte:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
-#, fuzzy
 msgid "Email:"
-msgstr "E-pošta"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-#, fuzzy
-msgid "Junk Mail Settings"
-msgstr "Postavke"
+msgstr "Pošta:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
-#, fuzzy
 msgid "_Disable"
-msgstr "Onemogući"
+msgstr "_Onemogući"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
 msgid "_Enable"
 msgstr "Omogući"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
-#, fuzzy
 msgid "_Junk List"
-msgstr "Testiranje pošte smeća"
+msgstr "_Lista pošte smeća"
+
+#: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Zaglavlje poruke"
+
+#: ../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:87
+msgid "Retract Mail"
+msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
+msgstr "Dodaj opcije slanja groupwise porukama"
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr "Dodatak za svojstva u Groupwise korisni�kim ra�unima."
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr "Groupwise svojstva"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Poruka sadrži"
+
+#: ../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 "Pretvori odabranu poruku u novi zadatak"
+
+#: ../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 "Neispravni potpis"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Ne mogu spremiti u datoteku &quot;{0}&quot;."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Odaberite korisnika"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "Send Options"
-msgstr "Odrednice"
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"Mapa pod imenom &quot;{1}&quot; već postoji. Molim koristite neko drugo ime."
 
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "Potpis već postoji"
+
+#: ../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-groupwise-features.eplug.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 #, fuzzy
-msgid "Groupwise Features"
-msgstr "Grupa"
+msgid "This is a recurring meeting"
+msgstr "Postavi ovo kao ponavljajući događaj"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Želite li spremiti vaše izmjene?"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Želite li spremiti vaše izmjene?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Ne mogu spremiti u automatsko spremajuću datoteku &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"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
-msgstr "Okvirno"
+msgstr "Okvirno prihvati"
+
+#: ../plugins/groupwise-features/properties.glade.h:1
+msgid "<b>Users:</b>"
+msgstr "<b>Korisnici:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:3
 #, fuzzy
-msgid "<b>Users :</b>"
-msgstr "<b>Tada</b> "
+msgid "Con_tacts..."
+msgstr "Kontakti"
 
-#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "Poruka"
 
 #: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "Obavijest o djeljenim mapama"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr ""
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-#, fuzzy
-msgid "_Contacts..."
-msgstr "Kontakti"
+msgstr "Sudionici će dobiti sljedeće izvješće.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-#, fuzzy
-msgid "_Cutomize notification message"
-msgstr "Nisam mogao napraviti cjevovod: %s"
-
-#: ../plugins/groupwise-features/properties.glade.h:13
-#, fuzzy
 msgid "_Not Shared"
-msgstr "Nije zapo�elo"
+msgstr "_Nije zajedni�ko"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
-msgid "_Shared With ..."
+#: ../plugins/groupwise-features/properties.glade.h:14
+msgid "_Shared With..."
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:16
-#, fuzzy
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
-msgstr "Sjen�anje"
+msgstr "_Dijeljenje"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Name</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Ime</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
-msgstr ""
+msgstr "Prava pristupa"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
-#, fuzzy
 msgid "Add/Edit"
-msgstr "Uređivanje"
+msgstr "Dodaj/Uredi"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
-#, fuzzy
 msgid "Con_tacts"
-msgstr "Kontakti"
+msgstr "Kon_takti"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr ""
+msgstr "Promijeni _mape/opcije/pravila"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr ""
+msgstr "Pro�itaj stavke ozna�ene kao _privatne"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
-#, fuzzy
 msgid "Reminder Notes"
-msgstr "Podsjetnici"
+msgstr "Poruke podsjetnika"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
-#, fuzzy
 msgid "Subscribe to my _alarms"
-msgstr "_Pretplati se"
+msgstr "Pretplati se na moje _alarme"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
-#, fuzzy
 msgid "Subscribe to my _notifications"
-msgstr "_Pretplati se"
+msgstr "_Pretplati se na moje _obavijesti"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
-#, fuzzy
-msgid "_Read"
-msgstr "ÄŒitaj"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
-#, fuzzy
 msgid "_Write"
-msgstr "_Ispis"
+msgstr "_Piši"
+
+#. 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 ""
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
-#, fuzzy
 msgid "Proxy"
-msgstr "Prioritet"
-
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialog1"
+msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Account Name</b>"
-msgstr "Ime ra�una"
+msgstr "<b>Ime ra�una</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
-#, fuzzy
 msgid "Proxy Login"
-msgstr "Korisni�ka oznaka"
+msgstr "Proxy prijava"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
-#, fuzzy
+#. 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
 msgid "_Proxy Login..."
-msgstr "_Ispis..."
+msgstr "_Proxy prijava..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:691
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+"Proxy kartica će biti omogućena samo kada je korisni�ki ra�un spojen na "
+"internet."
+
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
+"Proxy kartica će biti pristupna samo kada je omogućen korisni�ki ra�un."
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
-msgstr "_Korisnik:"
+msgstr "Korisnici"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "Upišite korisnike i postavite ovlasti"
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
-msgstr "_Novi direktorij..."
+msgstr "Nova _djeljena mapa..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
-#, fuzzy
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
-msgstr "Sjen�anje"
+msgstr "Dijeljenje"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/share-folder.c:533
 #, fuzzy
+msgid "Custom Notification"
+msgstr "Obostrano poravnanje"
+
+#: ../plugins/groupwise-features/share-folder.c:755
+msgid "Add   "
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder.c:761
+msgid "Modify"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:105
+msgid "Message Status"
+msgstr ""
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:187
+msgid "Recipient: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:194
+msgid "Delivered: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:200
+msgid "Opened: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:205
+msgid "Accepted: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:210
+msgid "Deleted: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:215
+msgid "Declined: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:220
+msgid "Completed: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
-msgstr "Spremi poruku..."
+msgstr "Prati stanje poruke..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
-#, fuzzy
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr "Dodatak za postavljanje Hula izvora kalendara."
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "Podesi Hula korisni�ki ra�un"
+
+#: ../plugins/imap-features/imap-headers.c:320
+msgid "Custom Headers"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.c:333
+msgid "IMAP Headers"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers</b>"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid "Fetch A_ll Headers"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:78
+msgid "_Import to Calendar"
+msgstr "_Unesi u kalendar"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Tasks"
+msgstr "_Unesi u zadatke"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:201
+msgid "Import ICS"
+msgstr "Unesi ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:224
+msgid "Select Task List"
+msgstr "Odaberi listu zadataka"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:228
+msgid "Select Calendar"
+msgstr "Odaberi kalendar"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
+msgid "_Import"
+msgstr "_Uvoz"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+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
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+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:118
+#: ../plugins/save-calendar/ical-format.c:163
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar oblik datoteke (.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 "Sinkroniziraj sa iPodom"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr "iPod sinkronizacija"
+
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Neuspješno u�itavanje kalendara '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:588
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Dogovor u kalendaru '%s' se sukobi za ovim sastankom"
+
+#: ../plugins/itip-formatter/itip-formatter.c:614
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Našao sam dogovor u kelendaru '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:690
+msgid "Unable to find any calendars"
+msgstr "Ne mogu naći niti jedan kalendar"
+
+#: ../plugins/itip-formatter/itip-formatter.c:697
+msgid "Unable to find this meeting in any calendar"
+msgstr "Ne mogu naći ovaj sastanak niti u jednom kalendaru"
+
+#: ../plugins/itip-formatter/itip-formatter.c:701
+msgid "Unable to find this task in any task list"
+msgstr "Ne mogu naći ovaj zadatak niti u jednom popisu zadataka"
+
+#: ../plugins/itip-formatter/itip-formatter.c:705
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:776
+msgid "Searching for an existing version of this appointment"
+msgstr "Tražim postojeće verzije ovoga sastanka"
+
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
-msgstr "Nije moguća analiza sadržaja poruke"
+msgstr "Ne mogu analizirati stavku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1003
+#, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Nije moguće otvoriti kalendar '%s'."
+msgstr "Ne mogu poslati stavku u kalendar '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+msgstr "Poslao u kalendar '%s' kao prihvaćeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "Poslano u kalendar '%s' kao provizorno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr ""
+msgstr "Poslano u kalendar '%s' kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
-msgstr ""
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Poslano u kalendar '%s' kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "Organizator je uklonio delegata %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
-msgstr ""
+#: ../plugins/itip-formatter/itip-formatter.c:1130
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Delegatu sam poslao poruku o otkazu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
-msgid "Could not send the cancellation notice to the delegate"
-msgstr "Sigurno želite poništiti i obrisati ovaj unos u dnevnik?"
+#: ../plugins/itip-formatter/itip-formatter.c:1132
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Ne mogu poslati otkaznu obavijest delegatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
+msgstr "Stanje sudionika nije moglo biti ažurirano zbog neispravnog stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1245
+#, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Nije moguće otvoriti kalendar '%s'."
+msgstr "Ne mogu ažurirati sudionika. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
-msgstr "Osvježeno stanje prisutne osobe\n"
+msgstr "Ažurirano stanje sudionika"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1275
+msgid "Meeting information sent"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+msgid "Task information sent"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1281
+msgid "Memo information sent"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1290
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1293
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1296
+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
 msgid "The calendar attached is not valid"
-msgstr "Datum povratka nije ispravan"
+msgstr "Privijeni kalendar nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr ""
+msgstr "Poruka tvrdi da sadrži kalendar, ali kalendar nije ispravan iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
-msgstr "Pogled koji pokazuje kada se kalendar pokreće"
+msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
+"Poruka sadrži kalendar, ali kalendar ne sadrži nikakve događaje, zadatke ili "
+"slobodne/zauzete informacije"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
-msgstr ""
+msgstr "Privijeni kalendar sadrži višestruke stavke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
+"Za obradu svih stavki, datoteka bi trebala biti spremljena i unesena u "
+"kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-#, fuzzy
-msgid "Meetings and Tasks"
-msgstr "Kalendar i zadaci"
+#: ../plugins/itip-formatter/itip-formatter.c:2148
+msgid "This meeting recurs"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2151
+msgid "This task recurs"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2154
+msgid "This memo recurs"
+msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "_Obriši poruku nakon djelovanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-#, fuzzy
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<b>Vrijednost polja</b>"
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
+msgid "Conflict Search"
+msgstr "Pretraga za sukobima"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr ""
+msgstr "Odaberi kalendare u potrazi za sukobljenim sastancima"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
-msgstr "Danas %k:%M %p"
+msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
-msgstr "Danas %k:%M %p"
+msgstr "Danas %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
-msgstr "Danas %k:%M %p"
+msgstr "Danas %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
-msgstr "Komori"
+msgstr "Sutra"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
-msgstr ""
+msgstr "Sutra %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "Sutra %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
-msgstr "Danas %k:%M %p"
+msgstr "Sutra %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "Danas %k:%M %p"
+msgstr "Sutra %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:254
 #, c-format
 msgid "%A"
-msgstr ""
+msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
-msgstr "%H:%M"
+msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:263
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:267
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
-msgstr "%I:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:276
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:286
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%m/%d/%Y %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:291
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:295
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:306
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:310
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:315
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "do %d. %B, %Y. %k:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:319
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "do %d. %B, %Y. %k:%M %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
-#, fuzzy, c-format
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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> je objavio podatke o sastanku."
+msgstr "<b>%s</b> kroz %s je objavio sljedeću informaciju o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:346
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:358
+#, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> je objavio podatke o sastanku."
+msgstr "<b>%s</b> je objavio sljedeće informacije o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:363
+#, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
+msgstr "<b>%s</b> je ovlastio slijedeći sastanak na vas:"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:366
+#, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> traži da budete prisutni na sastanku."
+msgstr "<b>%s</b> kroz %s zahtjeva vaše prisustvo na sljedećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:368
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> traži da budete prisutni na sastanku."
+msgstr "<b>%s</b> zahtjeva vaše prisustvo na sljedećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#, fuzzy, c-format
+#: ../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> želi dodati postojećem sastanku."
+msgstr "<b>%s</b> kroz %s želi dodati postojećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> želi dodati postojećem sastanku."
+msgstr "<b>%s</b> želi dodati postojećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#, fuzzy, c-format
+#: ../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 "<b>%s</b> želi dobiti posljednje podatke o zadatku."
+msgstr "<b>%s</b> želi dobiti najnovije informacije za sljedeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> je poslao nerazumljivu poruku."
+msgstr "<b>%s</b> je poslao sljedeći odgovor na sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b> je otkazo sastanak."
+#: ../plugins/itip-formatter/itip-view.c:392
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr "<b>%s</b> kroz %s je otkazao slijedeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b> je otkazo sastanak."
+#: ../plugins/itip-formatter/itip-view.c:394
+#, c-format
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr "<b>%s</b> je otkazao slijedeći sastanak."
 
-#: ../plugins/itip-formatter/itip-view.c:379
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:398
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:400
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
+msgstr "<b>%s</b> je predložio slijedeće promjene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:383
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:404
+#, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
+msgstr "<b>%s</b> kroz %s je odbio slijedeće promjene sastanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:406
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
+msgstr "<b>%s</b> je odbio slijedeće promjene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:412
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:444
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> je objavio podatke o zadatku."
+msgstr "<b>%s</b> kroz %s je objavio slijedeći zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:446
+#, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> je objavio podatke o zadatku."
+msgstr "<b>%s</b> je objavio slijedeći zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:419
-#, fuzzy, c-format
+#: ../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> traži da %s bude prisutan na sastanku."
+msgstr "<b>%s</b> traži dodjeljivanje %s slijedećem zadatku:"
 
-#: ../plugins/itip-formatter/itip-view.c:422
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:454
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> je otkazao zadatak."
+msgstr "<b>%s</b> kroz %s vam je dodijelio slijedeći zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:456
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> je otkazao zadatak."
+msgstr "<b>%s</b> je dodijelio vama slijedeći zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:430
-#, fuzzy, c-format
+#: ../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> želi dodati postojećem zadatku."
+msgstr "<b>%s</b> kroz %s želi dodati na postojeći zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:464
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> želi dodati postojećem zadatku."
+msgstr "<b>%s</b> želi dodati na postojeći zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:435
-#, fuzzy, c-format
+#: ../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 "<b>%s</b> želi dobiti posljednje podatke o zadatku."
+msgstr ""
+"<b>%s</b> želi dobiti najnovije informacije o slijedećem dodijeljenom "
+"zadatku:"
 
-#: ../plugins/itip-formatter/itip-view.c:438
-#, fuzzy, c-format
+#: ../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> je poslao nerazumljivu poruku."
+msgstr "<b>%s</b> je poslao slijedeći odgovor o dodijeljenom zadatku:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
-#, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b> je otkazao zadatak."
+#: ../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> kroz %s je otkazao slijedeći dodijeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
-#, fuzzy, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
-msgstr "<b>%s</b> je otkazao zadatak."
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
+msgstr "<b>%s</b> je otkazao slijedeći dodijeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
-#, fuzzy, c-format
+#: ../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> je odgovorio na dodijeljeni zadatak."
+msgstr "<b>%s</b> je predložio slijedeće promjene na dodijeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b>%s</b> kroz %s je odbio slijedeći dodijeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:494
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
+msgstr "<b>%s</b> je odbio slijedeći dodijeljeni zadatak:"
+
+#: ../plugins/itip-formatter/itip-view.c:532
+#, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:534
+#, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:539
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:541
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:545
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:547
+#, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr ""
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:818
+msgid "_Open Calendar"
+msgstr "_Otvori kalendar"
+
+#: ../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 "_Odbij"
+
+#: ../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 "_Prihvati"
+
+#: ../plugins/itip-formatter/itip-view.c:828
+msgid "_Decline all"
+msgstr "_Odbij sve"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+msgid "_Tentative all"
+msgstr "_Probaj sve"
+
+#: ../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 "_Probaj"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+msgid "_Accept all"
+msgstr "_Prihvati sve"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:841
+msgid "_Send Information"
+msgstr "_Pošalji informaciju"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:845
+msgid "_Update Attendee Status"
+msgstr "_Osvježi status prisutnih"
+
+#: ../plugins/itip-formatter/itip-view.c:848
+msgid "_Update"
+msgstr "_Osvježi"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
-msgstr "_Po�etno vrijeme:"
+msgstr "Vrijeme po�etka:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
-msgstr "_Krajnje vrijeme:"
+msgstr "Vrijeme završetka:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
-msgstr "Naredba:"
+msgstr "Komentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
-msgid "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:990
-#, fuzzy
-msgid "A_pply to all instances"
-msgstr "Svi unosi"
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1852
+msgid "_Tasks :"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1854
+msgid "Memos :"
+msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#, fuzzy
 msgid "Displays text/calendar parts in messages."
-msgstr "Prikaži slijedeću važnu poruku"
+msgstr "Prikazuje tekstualne/kalendarske dijelove u porukama."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-#, fuzzy
 msgid "Itip Formatter"
-msgstr "Uvoznici"
+msgstr "Itip oblikovanje"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
+"&quot;{1}&quot;?"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#, fuzzy
 msgid "This meeting has been delegated"
-msgstr "Ovaj događaj je obrisan."
+msgstr "Ovaj sastanak je delegiran"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-#, fuzzy
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
+msgstr ""
+"Ovaj odgovor nije poslao trenutni sudionik. Dodati pošiljaoca u sudionike?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr ""
+msgstr "Proxy _odjava"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 #, fuzzy
@@ -16354,122 +18854,245 @@ msgstr "Popis korisni�kih ra�una"
 msgid "Disable Account"
 msgstr "Poštanski ra�un"
 
-#: ../plugins/mail-remote/client.c:30
-#, fuzzy, c-format
-msgid "System error: %s"
-msgstr "Greška u nizu podataka"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr ""
 
-#: ../plugins/mail-remote/client.c:32
-#, fuzzy, c-format
-msgid "Camel error: %s"
-msgstr "Greška pri provjeri: %s"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
 msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-#, fuzzy
-msgid "No store available"
-msgstr "Opis ne postoji."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+"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 ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: ../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
+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 ""
+
+#: ../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 ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+#: ../plugins/mail-notification/mail-notification.c:254
+msgid "Generate a _D-Bus message"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:377
 #, fuzzy
-msgid "Mail Remote"
-msgstr "Udaljeno"
+msgid "Evolution's Mail Notification"
+msgstr "Komponenta Evolution pošte"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Osobine popisa zadataka"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:457
+#, 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:462
+#, 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:479
+#: ../plugins/mail-notification/mail-notification.c:484
+msgid "New email"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:541
+msgid "Show icon in _notification area"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:544
+msgid "B_link icon in notification area"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:546
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:727
+msgid "_Play sound when new messages arrive"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:733
+msgid "_Beep"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:734
+msgid "Play _sound file"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:745
+msgid "Specify _filename:"
+msgstr "Odredi ime _datoteke:"
+
+#: ../plugins/mail-notification/mail-notification.c:746
+msgid "Select sound file"
+msgstr "Izaberite zvu�nu datoteku"
+
+#: ../plugins/mail-notification/mail-notification.c:747
+msgid "Pl_ay"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:804
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../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 ""
 
 #: ../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 ""
+msgstr "Dodatak koji omogućuje kreiranje sastanaka iz sadržaja poruke."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-#, fuzzy
 msgid "Con_vert to Meeting"
-msgstr "O_tkaži sastanak"
+msgstr "Pretvori u sastanak"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to meeting"
-msgstr "Pošta za %s"
+msgstr "Poruka u sastanak"
+
+#: ../plugins/mail-to-task/mail-to-task.c:287
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr ""
+
+#: ../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 ""
+msgstr "Dodatak koji omogućuje kreiranje zadataka iz sadržaja poruke."
 
 #: ../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 ""
+msgstr "Pret_vori u zadatak"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to task"
-msgstr "Pošta za %s"
+msgstr "Poruka u zadatak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Pretvori odabranu poruku u novi zadatak"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
 msgid "Contact list _owner"
-msgstr "Urednik kontakt liste"
+msgstr "Kontaktiraj vlasnika dopisne liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
-msgstr ""
+msgstr "Dobavi _arhivu dopisne liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
 msgid "Get list _usage information"
-msgstr "Informacije o sastanku"
+msgstr "Dobavi podatke o _korištenju dopisne liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-#, fuzzy
 msgid "Mailing List Actions"
-msgstr "Dopisna lista"
+msgstr "Radnje dopisna liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-#, fuzzy
 msgid "Mailing _List"
-msgstr "Dopisna lista"
+msgstr "Dopisna _lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
 msgid "_Post message to list"
-msgstr "Pošalji _poruku na popis"
+msgstr "Pošalji _poruku na dopisnu listu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
 msgid "_Subscribe to list"
-msgstr "_Pretplati se"
+msgstr "_Pretplati se na dopisnu listu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
 msgid "_Un-subscribe to list"
-msgstr "_Otkaži pretplatu"
+msgstr "_Otkaži pretplatu na dopisnu listu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-#, fuzzy
 msgid "Action not available"
-msgstr "TLS nije dostupan"
+msgstr "Radnja nije dostupna"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
@@ -16479,40 +19102,48 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
+"Poruka će biti poslana na URL \"{0}\". Možete poslati poruku automatski, ili "
+"je prvo vidjeti i promjeniti.\n"
+"\n"
+"Trebali bi ste dobiti odgovor od dopisne liste kratko nakon Å¡to je poruka "
+"poslana."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-#, fuzzy
 msgid "Malformed header"
-msgstr "Neispravni potpis"
+msgstr "Neispravno zaglavlje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#, fuzzy
 msgid "No e-mail action"
-msgstr "Logiranje akcija filtra"
+msgstr "Nema radnje e-pošte"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
-#, fuzzy
 msgid "Posting not allowed"
-msgstr "News poslužitelj ne dozvoljava slanje"
+msgstr "Slanje poruke nije dozvoljeno"
 
 #: ../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 ""
+"Slanje poruke na ovu dopisnu listu nije dozvoljeno. Moguće je da je ovo "
+"dopisna lista samo za �itanje. Kontaktirajte vlasnika liste za detalje."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
-#, fuzzy
 msgid "Send e-mail message to mailing list?"
-msgstr "Pošalji _poruku na popis"
+msgstr "Poslati poruku na dopisnu listu?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
+"Ova radnja nije mogla biti izvršena. Ovo zna�i da zaglavlje za ovu radnju "
+"nije sadržavalo niti jednu radnju koja bi se mogla obaviti.\n"
+"\n"
+"Zaglavlje: {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
@@ -16520,239 +19151,436 @@ msgid ""
 "\n"
 "Header: {1}"
 msgstr ""
+"{0} zaglavlje za ovu poruku je neispravno i nije moglo biti obrađeno.\n"
+"\n"
+"Zaglavlje: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
+msgstr "Poruka ne sadrži informacije zaglavlja potrebne za ovu radnju."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-#, fuzzy
 msgid "_Edit message"
-msgstr "Slanje poruke"
+msgstr "_Uredi poruku"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-#, fuzzy
 msgid "_Send message"
-msgstr "Slanje poruke"
+msgstr "_Pošalji poruku"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
+msgstr "Konaktiraj vlasnika dopisne liste kojemu ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get an archive of the list this message belongs to"
+msgid "Get List _Archive"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get information about the usage of the list this message belongs to"
+msgid "Get List _Usage Information"
 msgstr ""
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get an archive of the list this message belongs to"
+msgstr "Dobavi arhivu dopisne liste kojoj ova poruka pripada"
+
+#: ../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 "Dobavi informaciju o korištenju dopisne liste kojoj ova poruka pripada"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Odgovori na dopisnu listu odabrane poruke"
+msgstr "Pošalji poruku na dopisnu listu kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Odgovori na dopisnu listu odabrane poruke"
+msgstr "Pretplati se na dopisnu listu kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Odgovori na dopisnu listu odabrane poruke"
+msgstr "Ukloni pretplatu na dopisnu listu kojoj ova poruka pripada"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post Message to List"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to List"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Premještam poruke u mapu %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 ""
+"Ovo će ozna�iti sve poruke kao pro�itane u odabranoj mapi i njenim podmapama."
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "Kreiranje podmapa"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Napravi mapu"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Ozna�i sve pro�itanim"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
+msgstr "_Ozna�i poruke kao pro�itane"
+
+#: ../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 "Korišteno za ozna�avanje svih poruka u mapi pro�itanim"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
-msgstr ""
+msgstr "Ozna�i kalendar odpojenim sa interneta"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-#, fuzzy
 msgid "Marks the selected calendar for offline viewing."
-msgstr "Ozna�i odabrane poruke za brisanje"
+msgstr "Ozna�ava odabrani kalendar za pregledavanje bez priklju�ka na mrežu"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+msgid "_Do not make available for offline use"
 msgstr ""
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
+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 ""
+msgstr "Dodatak koji primjenjuje mono dodatke."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-#, fuzzy
 msgid "Mono Loader"
-msgstr "Premjesti u mapu"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "_Nemoj me obavještavati kada stigne nova pošta"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-#, fuzzy
-msgid "New Mail Notification"
-msgstr "Nova vrsta obavijesti o pristigloj pošti"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-#, fuzzy
-msgid "New mail notify"
-msgstr "Nova vrsta obavijesti o pristigloj pošti"
+msgstr "Mono u�itavanje"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
+msgstr "Dodatak za određivanje koji dodaci su uklju�eni a koji isklju�eni."
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
-msgstr ""
+#: ../plugins/plugin-manager/plugin-manager.c:252
+msgid "Plugin Manager"
+msgstr "Upravitelj dodacima"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "Uklju�i ili isklju�i dodatke"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
-msgid "Plugins"
-msgstr "Brisanje"
+msgid "_Plugins"
+msgstr "_Dodaci"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
-msgstr "sat(i)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
-msgid "Id"
-msgstr "K"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-#, fuzzy
-msgid "Path"
-msgstr "_Putanja:"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
-msgid "Description"
-msgstr "Opis"
+msgstr "Autor(i)"
 
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
-msgid "Plugin Manager"
-msgstr "Upravitelj"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
+"Pažnja: neke promjene se neće aktivirati do slijedećeg pokretanja programa"
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:291
+msgid "Overview"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
-msgstr "Brisanje"
+msgstr "Dodatak"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
+"Testni dodatak koji demonstrira dodatak za formatiranje koji vam omogućuje "
+"da isklju�ite HTML poruke.\n"
+"\n"
+"Ovaj dodatak je samo nepodržana demonstracija koda.\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
-#, fuzzy
 msgid "Plain Text Mode"
-msgstr "Model teksta"
+msgstr "Mod obi�nog teksta"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "Preferiraj obi�an tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
-msgstr ""
+msgstr "Prikaži HTML ako postoji"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "Preferiraj obi�an tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
+msgstr "Uvijek prikazuj samo obi�an tekst"
+
+#: ../plugins/prefer-plain/prefer-plain.c:236
+msgid "HTML _Mode"
+msgstr ""
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Evolution profiler"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr "Zapisuje dnevnik događaja vezanih uz performanse aplikacije."
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "Dozvoljava da kalendari budu objavljeni na mrežu"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "Objavljivanje kalendara"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "Lokacije"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "_Objavi informacije iz kalendara"
+
+#: ../plugins/publish-calendar/publish-calendar.c:595
+msgid "Are you sure you want to remove this URL?"
+msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Lokacija</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Izvori</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"Dnevno\n"
+"Tjedno\n"
+"Ru�no (pomoću izornika sa radnjama)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Omogući"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "P_ort:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr "Lokacija objavljivanja"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr "_Frekvencija objavljivanja:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"Javni FTP\n"
+"FTP (sa prijavom)\n"
+"Windows djeljenje\n"
+"WebDAV (HTTP)\n"
+"Siguran WebDAV (HTTPS)\n"
+"Prilagođena lokacija"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr "Vr_sta servisa:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr "_Datoteka:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "_Objavi kao:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Zapamti lozinku"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#, fuzzy
+msgid "_Username:"
+msgstr "_Korisni�ko ime:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
 msgstr ""
+"iCal\n"
+"Slobodan/Zauzet"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 #, fuzzy
-msgid "HTML Mode"
-msgstr "Model teksta"
+msgid "Hello Python"
+msgstr "Kućni telefon"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
 msgstr ""
 
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_Pregled prije ispisa"
+#: ../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/print-message/org-gnome-print-message.xml.h:2
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 #, fuzzy
-msgid "Prints the message"
-msgstr "Ispiši ovu poruku"
+msgid "Python Loader"
+msgstr "Mono u�itavanje"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Ne mogu stvoriti lokalno spremište pošte `%s': %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Greška na %s:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy
+msgid "SpamAssassin is not available."
+msgstr "Radnja nije dostupna"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
-msgid "Spamassassin (built-in)"
-msgstr "Spamassassin (ugrađeni)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+msgid "I_nclude remote tests"
+msgstr "Uklju�i _udaljene testove"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
 msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
+msgid "SpamAssassin junk plugin"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
 msgstr ""
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr ""
+msgstr "Dodatak za spremanje svih privitaka ili dijelova poruka odmah."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
-msgstr "Spremam prilog"
+msgstr "Spremi privitke"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-#, fuzzy
-msgid "Save Attachments ..."
-msgstr "_Prilog..."
+msgid "Save Attachments..."
+msgstr ""
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-#, fuzzy
 msgid "Save all attachments"
-msgstr "Spremam prilog"
+msgstr "Spremi sve privitke"
 
-#: ../plugins/save-attachments/save-attachments.c:331
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
-msgstr "Odaberite vremensku zonu"
+msgstr "Odaberite osnovno ime za spremanje"
 
-#: ../plugins/save-attachments/save-attachments.c:351
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
-msgstr "Mime tip:"
+msgstr "MIME tip:"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Spremi"
 
@@ -16760,169 +19588,149 @@ msgstr "Spremi"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
-msgstr ""
+msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr ""
+#: ../plugins/save-calendar/csv-format.c:360
+msgid "UID"
+msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
-msgstr "Opis"
+msgstr "Lista opisa"
 
-#: ../plugins/save-calendar/csv-format.c:388
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
-msgstr "Kategorije: %s"
+msgstr "Lista kategorija"
 
-#: ../plugins/save-calendar/csv-format.c:389
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
-msgstr "Kontakt _lista"
+msgstr "Lista komentara"
 
-#: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
-msgstr "Napravi mapu"
+msgstr "Napravljeno"
 
-#: ../plugins/save-calendar/csv-format.c:392
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
-msgstr "Kontakt _lista"
+msgstr "Lista kontakata"
 
-#: ../plugins/save-calendar/csv-format.c:393
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
-msgstr "Status"
+msgstr "Po�etak"
 
-#: ../plugins/save-calendar/csv-format.c:394
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
-msgstr "2."
+msgstr "Kraj"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
-msgstr ""
+msgstr "% završeno"
 
-#: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr ""
+#: ../plugins/save-calendar/csv-format.c:373
+msgid "URL"
+msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:399
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
-msgstr "Sudionik"
+msgstr "Lista sudionika"
 
-#: ../plugins/save-calendar/csv-format.c:401
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
-msgstr "_Izmijeni"
+msgstr "Izmjenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
-msgstr ""
+msgstr "Dodatne opcije za CSV oblik"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
-msgstr ""
+msgstr "Dodaj zaglavlje"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
-msgstr ""
+msgstr "Odjeljiva� vrijednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
-msgstr ""
+msgstr "Odjeljiva� zapisa:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
-msgstr ""
+msgstr "Zatvori vrijednosti sa:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
-msgstr ""
-
-#: ../plugins/save-calendar/ical-format.c:137
-#, fuzzy
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar datoteke (.ics)"
+msgstr "Oblik vrijednosti odvojenih zarezom (.csv)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Save Selected"
-msgstr "Ništa nije odabrano"
+msgstr "Spremi odabrano"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
-msgid "Save to _Disk"
-msgstr "Spremi kao"
+msgid "Saves selected calendar or tasks list to disk."
+msgstr "Sprema odabrani kalendar ili listu zadataka na disk."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "Spremi odabrane kontakte kao VCard."
+msgid "_Save to Disk"
+msgstr "_Spremi na disk"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
-msgstr ""
+msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
-msgstr ""
+msgstr "RDF format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
-msgstr "Odaberite odredište %s"
-
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
+msgstr "Odaberite datoteku odredišta"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#, fuzzy
 msgid "Select one source"
-msgstr "Na�in odabira"
+msgstr "Odaberite jedan izvor"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
-msgstr ""
+msgstr "Odabire jedan kalendar ili izvor zadataka za pregled."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
-msgid "_Show only this Calendar"
-msgstr "Ispis ovog kalendara "
+msgid "Show _only this Calendar"
+msgstr "Prikaži _samo ovaj kalendar"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
+msgid "Show _only this Memo List"
 msgstr ""
 
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+msgid "Show _only this Task List"
+msgstr "Prikaži _samo ovu listu zadataka"
+
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Startup wizard"
+msgid "Guides you through your initial account setup."
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Pomoćnik"
+
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
-#, fuzzy
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -16930,36 +19738,43 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 "Dobrodošli u Evolution. Slijedećih nekoliko zaslona\n"
-"će vam omogućiti da se Evolution poveže na vaše e-mail\n"
+"će vam omogućiti da se Evolution poveže na vaše email\n"
 "ra�une, i da uveze datoteke iz drugih programa.\n"
 "\n"
 "Molim pritisnite gumb \"Naprijed\" za nastavak. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../plugins/startup-wizard/startup-wizard.c:133
+msgid "Importing files"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Molim odaberite podatke koje želite uvesti:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
-#, fuzzy
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 msgid "Importing data."
-msgstr "Uvoz elm podataka"
+msgstr "Uvozim podatke."
+
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
+msgid "Please wait"
+msgstr "Molim pri�ekajte"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "Oznaka treba li slaganje poruka u niti koristiti naslov poruke."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-#, fuzzy
 msgid "Subject Threading"
-msgstr "Odaberi _nit"
+msgstr "Slaganje u niti po naslovu"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 #, fuzzy
@@ -16967,8 +19782,66 @@ msgid "Thread messages by subject"
 msgstr "Prikaži listu poruka u obliku niti na temelju naslova"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#: ../plugins/subject-thread/subject-thread.c:56
+msgid "F_all back to threading messages by subject"
+msgstr ""
+
+#: ../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:615
+#, fuzzy
+msgid "No title"
+msgstr "Poslovna titula"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Spremi kao nedovršenu poruku"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Spremi kao nedovršenu poruku"
+
+#: ../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."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Dodatak za postavljanje Hula izvora kalendara."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Nema kontakata"
+
+#: ../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
@@ -16976,120 +19849,262 @@ msgid "Evolution Shell"
 msgstr "Evolucija konzola"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Shell Config factory"
-msgstr "Evolucija konzola"
+msgstr "Evolution tvornica shell konfiguracije"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution Test"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Probni dio Evolutiona"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Automatsko prepoznavanje veza"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
-msgstr "Ina�ica podešavanja Evolutiona"
+msgstr "Ina�ica konfiguracije"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "Uobi�ajena visina prozora"
+msgstr "Uobi�ajena širina bo�ne trake"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Uobi�ajena širina prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window state"
+msgstr "Uobi�ajen položaj prozora"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Uobi�ajena visina prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../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 "Upišite lozinku"
+
+#: ../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 ""
 "Identifikacijski broj ili  alias komponente koja se uobi�ajeno prikazuje "
 "prilikom pokretanja."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
-#, fuzzy
+#: ../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 "Ina�ica podešavanja Evolutiona"
+msgstr "Zadnja ažurirana ina�ica konfiguracije"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
-msgid "Printer settings"
-msgstr "Podešavanja pilota..."
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Non-proxy hosts"
+msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../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 "Podesi postavke 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
+msgid "Sidebar is visible"
+msgstr "Bo�na traka je vidljiva"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
-msgstr "Treba li presko�iti dijalog s upozorenjem o razvojnoj ina�ici"
+msgstr "Presko�i dijalog s upozorenjem o razvojnoj ina�ici"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Po�ni sa radom bez mreže"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Statusbar is visible"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
+"Konfiguracijska ina�ica Evolutiona, sa glavnom/manjom/konfiguracijskom "
+"razinom (primjer \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
-msgstr "Uobi�ajena visina prozora za poruke"
+msgstr "Uobi�ajena visina glavnog prozora, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
-msgstr "Uobi�ajena širina prozora za poruke"
+msgstr "Uobi�ajena širina glavnog prozora, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
-msgstr "Uobi�ajena širina za plo�u trake mapa"
+msgstr "Uobi�ajena širina rubne trake, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
+"Zadnja nadogradnja ina�ice konfiguracije Evolution-a, sa glavnom/manjom/"
+"konfiguracijskom razinom (primjer \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../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 ""
+"Stil prozorskih tipki. Može biti \"text\", \"icons\", \"both\", \"toolbar\". "
+"Ako je postavljeno na \"toolbar\", tada je stil tipki određen sa GNOME "
+"postavkama trake s alatima."
+
+#: ../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.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
+msgstr "Traka s alatima je vidljiva"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Zadnja ažurirana ina�ica konfiguracije"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../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
 #, fuzzy
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Ako je postavljeno, Evolution će se pokrenuti u neumreženom na�inu rada "
 "umjesto uobi�ajenom umreženom na�inu."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether the toolbar should be visible."
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "Whether or not the window should be maximized."
+msgstr "Treba li prozor biti preko cijelog zaslona."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Whether the sidebar should be visible."
+msgstr "Treba li bo�na traka biti vidljiva."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Whether the status bar should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid "Whether the toolbar should be visible."
+msgstr "Treba li alatna traka biti vidljiva."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 #, fuzzy
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
@@ -17097,22 +20112,21 @@ msgstr ""
 "Ako je postavljeno, neće se prikazati dijalog s upozorenjem u razvojnim "
 "ina�icama Evolutiona."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
-msgstr ""
+msgstr "Trebaju li gumbi prozora biti vidljivi."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
-msgstr ""
+msgstr "Stil gumba prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
-msgstr ""
+msgstr "Gumbi prozora su vidljivi"
 
 #: ../shell/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Active Connections</b>"
-msgstr "Aktivne veze"
+msgstr "<b>Aktivne veze</b>"
 
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
@@ -17122,22 +20136,15 @@ msgstr "Aktivne veze"
 msgid "Click OK to close these connections and go offline"
 msgstr "Odaberite OK za prekid ovih veza"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
-msgid "(Untitled)"
-msgstr "(Bez naziva) "
-
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Odaberite vrstu uvoznika:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../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 ""
 "Odaberite datoteku koju želite importirati u Evolution, te odaberite iz "
 "popisa koje je vrste.\n"
@@ -17145,182 +20152,199 @@ msgstr ""
 "Ako ne znate, odaberite \"Automatski\", pa će Evolution pokušati sam "
 "pogoditi."
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Odaberite odredište za ovaj uvoz"
 
-#: ../shell/e-shell-importer.c:148
-#, fuzzy
+#: ../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 ""
-"Evolucija je provjerila koja podešavanja može uvesti iz\n"
-"slijedećih programa: Pine, Netscape, Elm, iCalendar. Nije\n"
-"nađeno podešavanje koje se može uvesti. Ako želite\n"
+"Evolution je provjerio koje postavke može uvesti iz\n"
+"slijedećih programa: Pine, Netscape, Elm, iCalendar. Nisu\n"
+"pronađene postavke koje se mogu uvesti. Ako želite\n"
 "pokušati ponovo, molim pritisnite gumb \"Natrag\".\n"
 
-#: ../shell/e-shell-importer.c:283
-#, fuzzy
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
-msgstr "Ime trake:"
+msgstr "_Ime datoteke:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "_Uvezi podatke i postavke iz starijih programa"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "_Uvezi jednu datoteku"
 
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "_Uvoz"
-
-#: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Podešavanja Evolucije"
-
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Nije navedeno ime direktorija."
+#: ../shell/e-shell-settings-dialog.c:313
+msgid "Evolution Preferences"
+msgstr "Evolution postavke"
 
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Ime mape ne može sadržavati Return znak."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Ime mape ne može sadržavati znak \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Ime mape ne može sadržavati znak \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' i '..' su rezervirana imena mapa."
+#. 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
+#, c-format
+msgid "%s - Evolution"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "ÄŒini se da GNOME Pilot alati nisu instalirani na ovaj sistem."
 
-#: ../shell/e-shell-window-commands.c:78
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nije instaliran."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Ne mogu pokrenuti Bug buddy."
 
 #. The translator-credits string is for translators to list
-#. * per language credits for translation, displayed in the
-#. * about box
-#: ../shell/e-shell-window-commands.c:532
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
+"lokalizacija@linux.hr\n"
+"  Automatski Prijevod <>\n"
+"  Boris Tudan <boris.tudan@ka.htnet.hr>\n"
+"  Danijel Studen <dstuden@vuka.hr>\n"
+"  Denis Lackovic <delacko@linux.hr>\n"
+"  Diana Ćorluka <dina@iskrameco.hr>\n"
+"  Igor Jagec <igorm5@yahoo.com>\n"
+"  Ivan Knežević <kn3z@lycos.com>\n"
+"  Jerko Bakotin <jere_b@lycos.com>\n"
+"  Željko Brajdić <zorz@iskon.hr>\n"
+"  Mato Kutlić <mate@iskraemeco.hr>\n"
+"  Nikola Planinac <>\n"
+"  Robert Avilov <ravilov@linux.hr>\n"
+"  Robert Sedak <robert.sedak@sk.t-com.hr>\n"
+"  Robert Vuković <robi@surfer.hr>\n"
+"  Sasa Poznanovic <sasa.poznanovic@vuka.hr>\n"
+"  Tanja Minarik <tanja@finte.net>\n"
+"  Vedran Vyroubal <vedran.vyroubal@inet.hr>\n"
+"  Vladimir Žderić <vz@piksel.hr>\n"
+"  Vlatko Kosturjak <kost@linux.hr>"
+"\n"
+"Launchpad Contributions:\n"
+"  Ante Karamatić https://launchpad.net/~ivoks\n"
+"  Danijel Å najder https://launchpad.net/~phantomlord\n"
+"  Igor Svarc https://launchpad.net/~igor-svarc\n"
+"  Krešo Kunjas https://launchpad.net/~deresh\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta-"
+"admins\n"
+"  Mario �anić https://launchpad.net/~mario-danic\n"
+"  Miroslav Sabljić https://launchpad.net/~civija\n"
+"  Senko Rasic https://launchpad.net/~senko\n"
+"  Tomislav Mar�inković https://launchpad.net/~tmarcink\n"
+"  majstor https://launchpad.net/~lcosic"
 
-#: ../shell/e-shell-window-commands.c:546
-#, fuzzy
-msgid "Groupware Suite"
-msgstr "Grupa"
+#: ../shell/e-shell-window-commands.c:740
+msgid "Evolution Website"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:758
+msgid "Error opening the FAQ webpage."
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Neumreženi rad"
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Neumreženi rad"
 
-#: ../shell/e-shell-window.c:343
+#: ../shell/e-shell-window.c:381
 #, 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 ""
-"Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
-"mreže."
+"Evolution je trenutno povezan na mrežu. Stisnite na ovu tipku da radite "
+"nepovezani."
 
-#: ../shell/e-shell-window.c:351
-#, fuzzy
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution je u procesu odlaska u rad bez mreže."
+msgstr "Evolution je u procesu odlaska u rad bez mreže."
 
-#: ../shell/e-shell-window.c:358
+#: ../shell/e-shell-window.c:395
 #, 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 ""
-"Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na "
-"mreži."
+"Evolution je trenutno nepovezan. Stisnite ovu tipku za rad priklju�en na "
+"mrežu."
 
-#: ../shell/e-shell-window.c:724
-#, fuzzy, c-format
+#: ../shell/e-shell-window.c:786
+#, c-format
 msgid "Switch to %s"
-msgstr "Pošta za %s"
+msgstr "Prebaci se na %s"
 
-#: ../shell/e-shell.c:623
-#, fuzzy
-msgid "Uknown system error."
-msgstr "Nepoznata greška"
+#: ../shell/e-shell.c:641
+msgid "Unknown system error."
+msgstr ""
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
-#, fuzzy, c-format
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#, c-format
 msgid "%ld KB"
-msgstr "%d %B"
+msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "U redu"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Ne mogu se registrirati na OAF"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Baza sa postavkama nije pronađena"
 
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "Novi"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Novi test"
 
-#: ../shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Test"
-
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Unesi novi zadatak"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Odaberite \"Uvezi\" za po�etak uvoza datoteke u Evolution."
+msgstr "Odaberite \"Uvezi\" za po�etak uvoza datoteke u Evolution. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -17357,8 +20381,8 @@ msgstr ""
 "uvoza vanjskih datoteka u Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
-#, fuzzy, no-c-format
+#: ../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"
@@ -17369,68 +20393,74 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Zdravo. Hvala što ste uložili vrijeme da preuzmete ovo razvojno izdanje\n"
-"paketa grupnih alata Ximian Evolution.\n"
+"Pozdrav. Hvala što ste preuzeli ovu ina�icu\n"
+"Evolution groupware paketa.\n"
 "\n"
-"Ovo izdanje Evolution i dalje nije upotpunjeno. Sve je bliže,\n"
-"ali neke mogućnosti su ili nezavršene ili ne rade ispravno.\n"
+"Ova ina�ica Evolutiona još nije gotova. Zatvara se,\n"
+"ali neka svojstva su još nedovršena ili ne rade ispravno.\n"
 "\n"
-"Ukoliko želite stabilno izdanje Evolution, preporu�ujemo da uklonite\n"
-"ovo izdanje, i umjesto njega postavite izdanje %s.\n"
+"Ako želite stabilnu ina�icu Evolution-a, deinstalirajte\n"
+"ovu ina�icu, instalirajte %s ina�icu.\n"
 "\n"
-"Ukoliko pronađete greške, molimo prijavite nam ih na bugzilla.ximian.com.\n"
-"Ovaj proizvod dolazi bez garancija i nije namenjen pojedincima koji\n"
-"se nasilno izražavaju.\n"
+"Ako pronađete greške, molimo prijavite ih nama na bugzilla.gnome.org.\n"
+"Ovaj proizvod dolazi bez garancije i nije namjenjen\n"
+"pojedincima sklonima nasilju i bijesu.\n"
 "\n"
-"Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
-"željno iš�ekujemo vaše doprinose!\n"
+"Nadamo se da ćete uživati u rezultatima našeg napornog rada, i\n"
+"željno o�ekujemo vaše doprinose!\n"
 
-#: ../shell/main.c:254
-#, fuzzy
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 "Hvala\n"
-"The Ximian Evolution Team\n"
+"Evolution tim\n"
 
-#: ../shell/main.c:261
-msgid "Don't tell me again"
-msgstr "Nemoj mi ponovno reći"
+#: ../shell/main.c:248
+msgid "Do not tell me again"
+msgstr "Ne govori mi opet"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evolution aktiviranjem određene komponente"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Po�ni sa radom na mreži"
 
-#: ../shell/main.c:473
-#, fuzzy
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
-msgstr "Silom ugasi sve dijelove evolutiona"
+msgstr "Prisilno zaustavi sve komponente Evolutiona"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Inzistiraj na ponovnoj migraciji iz Evoultion 1.4"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih komponenti u datoteku."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
+msgstr "Isklju�i u�itavanje bilo kojeg dodatka."
+
+#: ../shell/main.c:487
+msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:513
+#: ../shell/main.c:572
+msgid "- The Evolution PIM and Email Client"
+msgstr ""
+
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17440,42 +20470,40 @@ msgstr ""
 "  Za više informacija, upišite %s.\n"
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+msgstr "Sigurni ste da želite zaboraviti sve zapamćene lozinke?"
 
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
 msgid "Continue"
-msgstr "Povezivanje"
+msgstr "Nastavi"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
-msgstr ""
+msgstr "Obrisati stare podatke iz verzije {0}?"
 
 #: ../shell/shell.error.xml.h:4
-#, fuzzy
 msgid "Evolution can not start."
-msgstr "Pomoćnik Evolution ra�una"
+msgstr "Evolution nije mogao startati."
 
 #: ../shell/shell.error.xml.h:5
-#, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
-msgstr "Zaboravi zapamćene lozinke kako bi ponovo bili upitani za iste"
+"reprompted next time they are needed."
+msgstr ""
+"Zaboravljanje vaših lozinki će pobrisati sve zapamćene lozinke. Bit će te "
+"upitani za iste slijedeći put kada budu trebale."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
-msgstr ""
+msgstr "Nedovoljno prostora na disku za nadogradnju."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
-msgstr ""
+msgstr "Stvarno pobrisati stare podatke?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17485,29 +20513,49 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
+"Kompletan sadržaj &quot;evolution&quot; direktorija će biti trajno "
+"pobrisan.\n"
+"\n"
+"Savjetuje se da provjerite da su sve vaše poruke e-pošte, kontakti i podaci "
+"kalendara prisutni, i da ova verzija Evolutiona funkcionira ispravno prije "
+"brisanja ovih starih podataka.\n"
+"\n"
+"Jednom pobrisana, ne možete se vratiti na prijašnju verziju Evolutiona bez "
+"ru�nog zahvata.\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; 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 ""
+"Prijašnja verzija evolutiona je spremila svoje podatke na drugo mjesto.\n"
+"\n"
+"Ako odaberete ukloniti ove podatke, kompletan sadržaj &quot;evolution&quot; "
+"direktorija će biti uklonjen trajno. Ako odaberete zadržati ove podatke, "
+"tada bi mogli ru�no ukloniti sadržaj &quot;evolution&quot; u vrijeme i na "
+"na�in koji vam odgovara.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
-msgstr ""
+msgstr "Nadogradnja sa prijašnje verzije nije uspjela: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
+"Nadogradnja vaših podataka i postavki zahtijeva do {0} diskovnog prostora, "
+"ali vi imate samo {1} slobodno.\n"
+"\n"
+"Morati će te napraviti više slobodnog prostora na vašem disku prije nastavka "
+"nadogradnje."
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17515,6 +20563,9 @@ msgid ""
 "\n"
 "Click help for details"
 msgstr ""
+"Vaša konfiguracija sustava ne odgovara konfiguraciji Evolutiona.\n"
+"\n"
+"Kliknite na pomoć za detalje"
 
 #: ../shell/shell.error.xml.h:26
 msgid ""
@@ -17524,20 +20575,23 @@ msgid ""
 "\n"
 "Click help for details."
 msgstr ""
+"Vaša konfiguracija sustava ne odgovara konfiguraciji Evolutiona.\n"
+"\n"
+"{0}\n"
+"\n"
+"Kliknite na pomoć za detalje"
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_Prioritet:"
+msgstr "_Zaboravi"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
-msgstr ""
+msgstr "_Zadrži podatke"
 
 #: ../shell/shell.error.xml.h:33
-#, fuzzy
 msgid "_Remind Me Later"
-msgstr "Podsjetnik"
+msgstr "_Podsjeti me kasnije"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -17546,84 +20600,109 @@ msgid ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
+"{1}\n"
+"\n"
+"Ako izaberete nastavak , možda nećete biti u mogućnosti pristupiti nekim od "
+"vaših starih podataka.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
+"Potvrda '%s' je CA potvrda.\n"
+"\n"
+"Uredi postavke povjerenja:"
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../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 ""
+"Zato Å¡to vjerujete potvrdi autoriteta koji je izdao ovu potvrdu, tada "
+"vjerujete autenti�nosti ove potvrde osim ako ovdje nije navedeno druga�ije"
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../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 ""
+"Zato Å¡to ne vjerujete potvrdi autoriteta koji je izdao ovu potvrdu, tada ne "
+"vjerujete autenti�nosti ove potvrde osim ako ovdje nije navedeno druga�ije."
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
-msgstr "Izaberi certifikat za uvoz"
+msgstr "Izaberi certifikat za uvoz..."
+
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "Purpose"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "Istje�e"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr ""
+
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Preglednik certifikata: %s"
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Unesite lozinku za `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Upišite novu lozinku za certificiranje baze"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Upišite novu lozinku"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17632,7 +20711,7 @@ msgstr ""
 "Izdano od\n"
 "  Naslov: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17641,10 +20720,9 @@ msgstr ""
 "Izdano od\n"
 "  Naslov: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
-#, fuzzy
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
-msgstr "SSL certifikat klijenta"
+msgstr "Izaberite certifikat"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
@@ -17702,7 +20780,7 @@ msgstr ""
 "Prije pružanja povjerenja CA-u u bilo koju svrhu, trebate pregledati njegov "
 "certifikat, politiku postupanja i procedure (ako je dostupno)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Potvrda"
 
@@ -17715,9 +20793,8 @@ msgid "Certificate details"
 msgstr "Detalji certifikata"
 
 #: ../smime/gui/smime-ui.glade.h:17
-#, fuzzy
 msgid "Certificates Table"
-msgstr "Certificate Name"
+msgstr "Tablica certifikata"
 
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
@@ -17729,7 +20806,7 @@ msgstr "Certifikati kontakata"
 
 #: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "Ne vjeruj autenti�nosti ovog certifikata"
 
 #: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
@@ -17740,17 +20817,16 @@ msgid "Edit"
 msgstr "Uređivanje"
 
 #: ../smime/gui/smime-ui.glade.h:24
-#, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "Ovlasti certifikata elektronske pošte"
+msgstr "Postavke povjerenja certifikata e-pošte"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
-msgstr "Certifikat elektronske pošte primatelja"
+msgstr "Certifikat e-pošte primatelja"
 
 #: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
-msgstr "Certifikat elektronske pošte potpisnika"
+msgstr "Certifikat e-pošte potpisnika"
 
 #: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
@@ -17780,17 +20856,17 @@ msgstr "Organizational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "SSL certifikat klijenta"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "SSL certifikat poslužitelja"
 
 #: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "Vjeruj autenti�nosti ovog certifikata"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
@@ -17828,254 +20904,188 @@ msgstr "Vaše potvrde"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr ""
+msgstr "_Uredi CA povjerenje"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certifikat već postoji"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
-#, fuzzy
+#: ../smime/lib/e-cert.c:425
 msgid "Sign"
-msgstr "Potpisujem"
+msgstr "Potpiši"
 
-#: ../smime/lib/e-cert.c:425
-#, fuzzy
+#: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
-msgstr "Å ifrirano"
+msgstr "Kriptiraj"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
 msgid "Version"
 msgstr "Ina�ica"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
 msgstr "Ina�ica 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
 msgstr "Ina�ica 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
 msgstr "Ina�ica 3"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 s RSA enkripcijom"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 s RSA enkripcijom"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 s RSA enkripcijom"
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA enkripcija"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr "Upotreba klju�eva certifikata"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr "Vrsta Netscape uvjerenja"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikator klju�eva izdava�a certifikata"
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: ../smime/lib/e-cert.c:687
-#, fuzzy, c-format
+#: ../smime/lib/e-cert.c:688
+#, c-format
 msgid "Object Identifier (%s)"
-msgstr "Identifikator objekta (%S)"
+msgstr "Identifikator objekta (%s)"
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr "Identifikator algoritma"
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr "Podaci o subject algoritmu javnog  klju�a"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Algoritam javnog klju�a"
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "Subjektov javni klju�"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "Greška: obrađivanje ekstenzije nije moguće"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "Potpisnik objekta"
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr "Izdava� SSL certifikata"
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
-msgstr "Ovlasti certifikata elektronske pošte"
+msgstr "Ovlasti certifikata e-pošte"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "Potpisujem"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr "Prihvaćanje"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
 msgstr "Klju� šifriranja"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "Å ifriranje podataka"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr "Klju�ni dogovor"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr "Potpisnik uvjerenja"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr "CRL Potpisnik"
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
 msgid "Critical"
 msgstr "Kriti�no"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "Nije kriti�no"
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
 msgstr "Nastavci"
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa certifikata"
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "Izdavatelj"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni ID Izdavatelja"
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "Jedinstveni ID subjekta"
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr "Vrijednost potpisa uvjerenja"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 datoteka s lozinkama"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Uvezeni certifikat"
 
-#: ../tools/evolution-launch-composer.c:324
-msgid "An attachment to add."
-msgstr "Prilog za dodavanje."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Content type of the attachment."
-msgstr "Tip koji sadrži prilog."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "The filename to display in the mail."
-msgstr "Ime datoteke koja se prikazuje u poruci."
-
-#: ../tools/evolution-launch-composer.c:327
-msgid "Description of the attachment."
-msgstr "Opis priloga."
-
-#: ../tools/evolution-launch-composer.c:328
-msgid "Mark attachment to be shown inline by default."
-msgstr "Ozna�i da se dodaci uobi�ajeno prikazuju unutar poruke."
-
-#: ../tools/evolution-launch-composer.c:329
-msgid "Default subject for the message."
-msgstr "Predefinirani naslov poruke."
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -18089,112 +21099,217 @@ msgstr "Nisam mogao izvršiti \"%s\": %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
 
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "Postavke imenika"
+
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
+msgid "Change the properties of the selected folder"
+msgstr "Promijeni postavke odabrane mape"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "Kopiraj sve kontakte u..."
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "Pregled kontakta"
+
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Kopiraj kontakt(e) u drugu mapu..."
+msgstr "Kopiraj odabrane kontakte u drugu mapu..."
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Kopiraj kontakte odabrane mape u drugu mapu"
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopiraj ozna�eno"
 
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "Kopiraj u mapu..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Create a new address book folder"
+msgstr "Kreiraj novu mapu adresara"
+
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izreži"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Izreži ozna�eno"
 
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "_Obriši adresar"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "Obriši odabrane kontakte"
 
-#: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "Obriši odabranu mapu"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Prosljedi kontakt"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "_Premjesti sve kontakte u..."
+
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Premjesti kontakt(e) u drugu mapu..."
+msgstr "Premjesti odabrane kontakte u drugu mapu..."
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "Premjesti kontakte odabrane mape u drugu mapu"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "Premjesti u mapu..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Umetni"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Nalijepi na poseban na�in"
 
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "Pregled kontakata za ispis"
 
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
-msgstr "Ispis odabranih kontakata "
+msgstr "Ispis odabranih kontakata"
 
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "Preimenuj odabranu mapu"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "Spremi adresar kao VCard"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Spremi kao VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Spremi odabrane kontakte kao VCard."
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "Spremi kontakte odabrane mape kao VCard"
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Ozna�i sve"
 
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:35
+msgid "Select _All"
+msgstr "Ozna�i _sve"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "Odaberi sve kontakte"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
 msgid "Send a message to the selected contacts."
 msgstr "Pošalji poruku odabranim kontaktima."
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Pošalji poruku kontaktu"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "Pošalji odabrane kontakte drugoj osobi."
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "Prikaži prozor za prekledom kontakata"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "_Zaustavi"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "Zaustavi u�itavanje"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "Pregledaj tekući kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "Kopiraj kontakte u..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "_Kopiraj kontakte iz mape u"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "O_briši kontakt"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
-msgstr "_Proslijedi kontakt... "
+msgstr "_Proslijedi kontakt..."
 
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr "_Prostor za pregled"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "Pre_mjesti kontakt u..."
 
-#: ../ui/evolution-addressbook.xml.h:41
-#, fuzzy
-msgid "_Save as VCard..."
-msgstr "_Sa�uvaj kao VCard"
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "Pre_mjesti kontakte iz mape u..."
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "_Odaberi sve"
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+msgid "_New"
+msgstr "_Novi"
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "P_romijeni ime"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "Spremi kontakt u VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "_Spremi kontakte iz mape kao VCard"
+
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
@@ -18203,60 +21318,58 @@ msgid "Day"
 msgstr "Dan"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "Obriši sve pojave"
+msgid "Delete _all Occurrences"
+msgstr "Obriši _sve pojave"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr "Obriši sastanak"
+msgid "Delete all occurrences"
+msgstr "Obriši sve pojave"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "Obriši ovu pojavu"
+msgid "Delete the appointment"
+msgstr "Obriši sastanak"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "Idi na"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "Idi nazad"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "Naprijed"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "Popis"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mjesec"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Dalje"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Pregled kalendara za ispis"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Prethodni"
 
-#: ../ui/evolution-calendar.xml.h:21
-msgid "Print this calendar"
-msgstr "Ispis ovog kalendara "
-
 #: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Objavi slobodan/zauzet informaciju za ovaj kalendar"
+msgid "Print this calendar"
+msgstr "Ispis ovog kalendara"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
@@ -18267,19 +21380,20 @@ msgid "Purge old appointments and meetings"
 msgstr "Izbriši stare dogovore i sastanke"
 
 #: ../ui/evolution-calendar.xml.h:25
-#, fuzzy
 msgid "Select _Date"
-msgstr "Odaberi sav tekst"
+msgstr "Odaberi _datum"
+
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Odaberi _danas"
 
 #: ../ui/evolution-calendar.xml.h:27
-#, fuzzy
 msgid "Select a specific date"
-msgstr "Idi na određeni datum"
+msgstr "Odaberi određeni datum"
 
 #: ../ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Select today"
-msgstr "Izaberite direktorij"
+msgstr "Odaberi danas"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -18317,232 +21431,256 @@ msgstr "Radni tjedan"
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../ui/evolution-composer-entries.xml.h:1
-msgid "Copy selected text to the clipboard"
-msgstr "Kopiraj odabrani tekst u odlagalište"
-
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "Iz_reži"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Cut selected text to the clipboard"
-msgstr "Izreži odabrani tekst u odlagalište"
-
-#: ../ui/evolution-composer-entries.xml.h:4
-msgid "Paste text from the clipboard"
-msgstr "Umetni tekst iz međumemorije"
-
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Ozna�i _sve"
-
-#: ../ui/evolution-composer-entries.xml.h:6
-msgid "Select all text"
-msgstr "Odaberi sav tekst"
-
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Prilagodi moj Evolution"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Otkaži aktivnu operaciju sa poštom"
 
 #: ../ui/evolution-mail-global.xml.h:3
-#, fuzzy
 msgid "Copy the selected folder into another folder"
-msgstr "Kopiraj odabrane poruke u drugu mapu"
+msgstr "Kopiraj odabranu mapu u drugu mapu"
 
 #: ../ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "Napravi virtualnu mapu  za ovu dopisnu grupu"
+msgstr "Napravi novu mapu za spremanje pošte"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "Napravi ili promijeni definicije prividnih mapa"
+msgstr "Napravi ili uredi definicije mapa za pretraživanje"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravi ili promijeni pravila za filtriranje nove pošte"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Isprazni smeće"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
-#: ../ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ../ui/evolution-mail-global.xml.h:9
-#, fuzzy
-msgid "Message F_ilters"
-msgstr "Filteri pošte"
-
 #: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
-msgid "Message _Preview"
-msgstr "Zaglavlje poruke"
-
-#: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Move the selected folder into another folder"
-msgstr "Premjesti odabranu poruku(e) u drugi direktorij"
+msgstr "Premjesti odabranu mapu u drugu mapu"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno ukloni sve obrisane poruke iz svih direktorija"
 
-#: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
-msgstr "Ozna�i mapu"
+msgstr "Pretraži _mape"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show Message _Preview"
+msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:15
+msgid "Show message preview below the message list"
+msgstr ""
+
+#: ../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 "Prikaži prozor za pregled poruke"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Pretplati se ili odjavi na direktorije na mrežnim serverima"
 
-#: ../ui/evolution-mail-global.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Classic View"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
-msgstr "_Kopiraj u mapu..."
+msgstr "_Kopiraj mapu u..."
 
-#: ../ui/evolution-mail-global.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:25
+msgid "_Message Filters"
+msgstr "Filteri _poruka"
+
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
-msgstr "_Premjesti u mapu..."
+msgstr "_Premjesti mapu u..."
 
-#: ../ui/evolution-mail-global.xml.h:19
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
-msgstr "_Novi"
+msgstr "_Novi..."
+
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Preview"
+msgstr ""
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
-msgstr "Pretplate na direktorije"
+msgstr "_Pretplate"
+
+#: ../ui/evolution-mail-global.xml.h:33
+msgid "_Vertical View"
+msgstr ""
 
 #: ../ui/evolution-mail-list.xml.h:1
-#, fuzzy
 msgid "Change the name of this folder"
-msgstr "Promijeni svojstva ove mape"
+msgstr "Promijeni ime ove mape"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "Promijeni svojstva ove mape"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "Skupi sve _niti"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "Skupi sve niti poruka"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiraj odabranu poruku(e) u odlagalište"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Izreži odabranu poruku(e) u odlagalište"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "_Raširi sve niti"
+
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "_Izbaci"
 
-#: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
-msgid "Group By _Threads"
-msgstr "Grupiraj po ovom polju"
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "Raširi sve niti poruka"
 
-#: ../ui/evolution-mail-list.xml.h:9
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr "Sakrij o_brisane poruke"
+msgstr "Sakrij _odabrane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "Sakrij o_brisane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "Sakrij pro_�itane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Sakrij obrisane poruke umjesto njihovog precrtavanja"
 
-#: ../ui/evolution-mail-list.xml.h:13
-#, fuzzy
-msgid "Mark Me_ssages as Read"
-msgstr "_Ozna�i poruke kao pro�itane poslije "
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "Ozna�i sve poru_ke kao pro�itane"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Ubaci poruku(e) iz međumemorije"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno uklanjanje svih obrisanih poruka iz ovog direktorija"
 
-#: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
-msgstr "Trajno uklanjanje svih obrisanih poruka iz ovog direktorija"
+msgstr "Trajno obriši ovu mapu"
 
-#: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
-msgstr "_Sakrij odabrane poruke"
+msgstr "Odaberi ni_t poruke"
 
-#: ../ui/evolution-mail-list.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
-msgstr "Odaberi sve vidljive poruke"
+msgstr "Odaberi _sve poruke"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Odaberi sve i samo poruke koje trenutno nisu odabrane"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Odaberi sve poruke iz iste niti kao i odabrana poruka"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Odaberi sve vidljive poruke"
 
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Sh_ow Hidden Messages"
-msgstr "Pri_kaži skrivene poruke"
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "Show Hidde_n Messages"
+msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Prikaži poruke koje su privremeno sakrivene"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Privremeno sakrij sve već pro�itane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Privremeno sakrij odabrane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Popis poruka prema temi razgovora"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:36
+msgid "_Group By Threads"
+msgstr "_Grupiraj po nitima"
+
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
-#, fuzzy
 msgid "_Message"
-msgstr "_Poruke"
+msgstr "_Poruka"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -18558,18 +21696,16 @@ msgid "Add Sender to Address Book"
 msgstr "Dodaj pošiljaoca u adresar"
 
 #: ../ui/evolution-mail-message.xml.h:5
-#, fuzzy
 msgid "All Message _Headers"
-msgstr "Zaglavlje poruke"
+msgstr "Sva zaglavlje _poruke"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr "Primjeni pravila filtriranja na odabrane poruke"
 
 #: ../ui/evolution-mail-message.xml.h:7
-#, fuzzy
 msgid "Check for _Junk"
-msgstr "Provjeravam za novu poštu"
+msgstr "Provjeri _Spam"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -18587,83 +21723,90 @@ msgstr "Odgovori na dopisnu listu odabrane poruke"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odgovori pošiljaocu odabrane poruke"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Kopiraj odabrane poruke u drugu mapu"
 
-#: ../ui/evolution-mail-message.xml.h:15
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopiraj odabrane poruke u spremnik"
+
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
-msgstr "Napravi mapu"
+msgstr "Napravi _pravilo"
 
-#: ../ui/evolution-mail-message.xml.h:16
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "Napravi virtualnu mapu  za ove primaoce"
+msgstr "Napravi mapu za pretraživanje za ove primaoce"
 
-#: ../ui/evolution-mail-message.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "Napravi virtualnu mapu  za ovu dopisnu grupu"
+msgstr "Napravi mapu za pretraživanje za ovu dopisnu grupu"
 
-#: ../ui/evolution-mail-message.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "Napravi virtualnu mapu  za ovog pošiljaoca"
+msgstr "Napravi mapu za pretraživanje za ovog pošiljaoca"
 
-#: ../ui/evolution-mail-message.xml.h:19
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "Napravi virtualnu mapu za ovaj naslov"
+msgstr "Napravi mapu za pretraživanje za ovaj naslov"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Napravi pravilo za filtriranje poruka od ovog pošiljaoca"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravi pravilo za filtriranje poruka ovim primateljima"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Napravi pravilo za filtriranje poruka na ovu dopisnu grupu"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Napravi pravilo za filtriranje poruka sa ovim naslovom"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Odreži odabrane poruke i premjesti ih u spremnik"
+
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Umanji veli�inu teksta"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Prikaži slijedeću važnu poruku"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Prikaži slijedeću poruku"
 
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr "Prikaži slijedeću nit"
+
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Prikaži slijedeću nepro�itanu poruku"
 
 #: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
-msgstr "Prikaži slijedeću nepro�itanu nit"
-
-#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr "Prikaži prethodnu važnu poruku"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Prikaži prethodnu poruku"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Prikaži prethodnu nepro�itanu poruku"
 
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "P_roslijedi kao..."
+
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtriraj prema Dopisnoj _Listi..."
@@ -18682,11 +21825,11 @@ msgstr "Filter prema _Subjektu..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Filtriraj ozna�ene poruke kao smeće"
+msgstr "Filtriraj nepoželjne poruke među ozna�enima"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Ozna�i odabrane poruke za praćenje"
+msgid "Flag selected messages for follow-up"
+msgstr "Ozna�i odabrane poruke za nastavljanje diskusije"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -18717,32 +21860,31 @@ msgid "Increase the text size"
 msgstr "Uvećaj veli�inu teksta"
 
 #: ../ui/evolution-mail-message.xml.h:49
-#, fuzzy
 msgid "Mar_k as"
-msgstr "Ozna�i kao pro�itano"
+msgstr "_Ozna�i kao"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Ozna�i odabrane poruke kao pro�itane"
+msgid "Mark the selected messages as having been read"
+msgstr "Ozna�i odabrane poruke kao da su pro�itane"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
+msgid "Mark the selected messages as important"
 msgstr "Ozna�i odabrane poruke kao važne"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Ozna�i odabrane poruke kao smeće"
+msgid "Mark the selected messages as junk"
+msgstr "Ozna�i odabrane poruke kao smeće (spam)"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Ozna�i da odabrane poruke nisu smeće"
+msgid "Mark the selected messages as not being junk"
+msgstr "Ozna�i odabrane poruke kao dobre (nisu spam)"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Ozna�i odabrane poruke kao nepro�itane"
+msgid "Mark the selected messages as not having been read"
+msgstr "Ozna�i odabrane poruke kao da nisu pro�itane"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
+msgid "Mark the selected messages as unimportant"
 msgstr "Ozna�i odabrane poruke kao nevažne"
 
 #: ../ui/evolution-mail-message.xml.h:56
@@ -18750,521 +21892,291 @@ msgid "Mark the selected messages for deletion"
 msgstr "Ozna�i odabrane poruke za brisanje"
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
-msgid "Message Source"
-msgstr "Spremnik za poruke"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "Pomakni"
+msgid "Move selected messages to another folder"
+msgstr "Premjesti odabrane poruke u drugu mapu"
 
 #: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
-msgstr "Premjesti odabranu poruku(e) u drugi direktorij"
-
-#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "Sljedeća _važna poruka"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Sljedeća _nit"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Sljedeća _nepro�itana poruka"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "Nije smeće"
+msgstr "Nije nepoželjno"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Otvori prozor za sastavljanje poruke"
 
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
-msgstr "Otvori odabranu poruku u novom prozoru"
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "Otvori odabrane poruke u novom prozoru"
 
-#: ../ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Open the selected message in the composer for editing"
-msgstr "Otvori odabranu poruku radi ponovnog slanja"
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr "Ozna�i odabrane poruke u sastavlja�u radi uređivanja"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepro�itana poruka"
 
-#: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Zalijepi poruke iz spremnika"
+
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
-msgstr "_Pošalji novu poruku"
+msgstr "_Pošalji novu poruku u mapu"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "_Pošalji odgovor"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "Pošalji poruku u javnu mapu"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "Pošalji odgovor na poruku u javnu mapu"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "Pregled poruke za ispis"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "Ispiši ovu poruku"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "Preu_smjeri"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preu_smeri (odbaci) odabrani poruku nekome"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Vrati tekst na izvornu veli�inu"
 
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr "Spremi odabrane poruke kao tekstualnu datoteku"
+
 #: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
-msgstr "Spremi poruku kao tekstualnu datoteku"
+msgid "Search Folder from Mailing _List..."
+msgstr "Mapa za pretraživanje iz dopisne _liste..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
-msgid "Search Folder from Mailing _List..."
-msgstr "VFolder na dopisnu _listu... "
+msgid "Search Folder from Recipien_ts..."
+msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:88
-#, fuzzy
-msgid "Search Folder from Recipients..."
-msgstr "VFolder direktorij na _primatelja..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-#, fuzzy
 msgid "Search Folder from S_ubject..."
-msgstr "VFolder na _Naslov..."
+msgstr "Mapa za pretraživanje od _teme..."
 
-#: ../ui/evolution-mail-message.xml.h:90
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "VFolder na _pošiljaoca... "
+msgstr "Mapa za pretraživanje od _pošiljaoca..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Traži tekst u tijelu prikazane poruke"
 
-#: ../ui/evolution-mail-message.xml.h:92
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
-msgstr "Odaberi sav tekst"
+msgstr "Odaberi s_av tekst"
 
-#: ../ui/evolution-mail-message.xml.h:93
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
-msgstr "Odaberi sve vidljive poruke"
+msgstr "Odaberi sav tekst u poruci"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Postavi postavke stranice za vaš trenutni pisa�"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikaži treptajući kursor u tijelu prikazane poruke"
 
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages with all email headers"
+msgstr "Prikaži poruke sa svim zaglavljima"
+
 #: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
-msgstr "Prikaži poruku u normalnom stilu"
+msgid "Show the raw email source of the message"
+msgstr "Prikaži izvorni kod e-poruke"
 
 #: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
-msgstr "Prikaži poruku sa svim zaglavljima e-pošte"
+msgid "Undelete the selected messages"
+msgstr "Vrati odabrane pobrisane poruke"
 
 #: ../ui/evolution-mail-message.xml.h:98
-msgid "Show the raw email source of the message"
-msgstr "Prikaži izvorni kod elektronske poruke"
+msgid "Uni_mportant"
+msgstr "_Nevažno"
 
 #: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
-msgstr "Vrati odabrane obrisane  poruke"
+msgid "Zoom _Out"
+msgstr "U_manji"
 
 #: ../ui/evolution-mail-message.xml.h:100
-#, fuzzy
-msgid "Uni_mportant"
-msgstr "Važno"
+msgid "_Attached"
+msgstr "_Priloženo"
 
 #: ../ui/evolution-mail-message.xml.h:101
-msgid "Zoom _Out"
-msgstr ""
+msgid "_Caret Mode"
+msgstr "Kursor _na�in rada"
 
 #: ../ui/evolution-mail-message.xml.h:102
-#, fuzzy
-msgid "_Caret Mode"
-msgstr "Caret _na�in rada"
+msgid "_Clear Flag"
+msgstr "_Ukloni oznaku"
 
 #: ../ui/evolution-mail-message.xml.h:105
-#, fuzzy
 msgid "_Delete Message"
-msgstr "Sakrij o_brisane poruke"
+msgstr "O_briši poruku"
 
 #: ../ui/evolution-mail-message.xml.h:107
-#, fuzzy
 msgid "_Find in Message..."
-msgstr "Pronađi u poruci"
+msgstr "_Pronađi u poruci..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Flag Completed"
+msgstr "_Ozna�i završeno"
+
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../ui/evolution-mail-message.xml.h:110
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
-msgstr "Važno"
+msgstr "_Važno"
 
-#: ../ui/evolution-mail-message.xml.h:111
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Inline"
+msgstr "_U liniji"
+
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
-msgstr "Smeće"
+msgstr "_Spam"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Load Images"
 msgstr "U�itaj _slike"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:116
+msgid "_Message Source"
+msgstr "_Izvor poruke"
+
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
-msgstr "_Slijedeća poruka "
+msgstr "_Slijedeća poruka"
 
-#: ../ui/evolution-mail-message.xml.h:116
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
-msgstr "Obi�no"
+msgstr "_Normalna Veli�ina"
 
-#: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
-msgstr "Nije smeće"
+msgstr "_Nije spam"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../ui/evolution-mail-message.xml.h:123
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:124
+msgid "_Quoted"
+msgstr "_Citirano"
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "_ÄŒitaj"
+
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "Spremi poruku..."
+msgstr "_Spremi poruku..."
 
-#: ../ui/evolution-mail-message.xml.h:124
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
-msgstr "_Slijedeća poruka "
+msgstr "_Vrati pobrisanu poruku"
 
-#: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
-msgstr "Ozna�i kao nepro�itano"
+msgstr "_Nepro�itano"
 
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Zoom In"
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Zoom"
 msgstr ""
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
+#: ../ui/evolution-mail-message.xml.h:132
+msgid "_Zoom In"
+msgstr "_Uvećaj"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Glavna traka s alatima"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Zatvori"
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Kopiraj odabranu bilješku"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr "_Datoteka"
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Izreži odabranu bilješku"
 
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Dodaj"
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Obriši odabrane bilješke"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Priloži datoteku"
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Zalijepi bilješku iz spremnika"
 
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Pregledava popis bilješki za ispis"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Zatvori trenutnu datoteku"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Delete all but signature"
-msgstr "Obriši sve osim potpisa"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with PGP"
-msgstr "Å ifriraj ovu poruku PGP-om"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#, fuzzy
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Šifriraj ovu poruku pomoću vašeg S/MIME certifikata za šifriranje"
-
-#: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Oblikovanje"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "_HTML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Open a file"
-msgstr "Otvori datoteku"
-
-#: ../ui/evolution-message-composer.xml.h:13
-msgid "PGP Encrypt"
-msgstr "PGP Å¡ifriranje"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "PGP Sign"
-msgstr "PGP potpis"
-
-#: ../ui/evolution-message-composer.xml.h:15
-#, fuzzy
-msgid "Request read receipt"
-msgstr "Pokaži ra�une"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "S/MIME Encrypt"
-msgstr "S/MIME Å¡ifriranje"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "S/MIME Sign"
-msgstr "S/MIME potpis"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Spremi kao"
-
-#: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
-msgid "Save Draft"
-msgstr "Spremi skicu"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "_Spremi Kao..."
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr "Spremi skicu"
-
-#: ../ui/evolution-message-composer.xml.h:23
-#, fuzzy
-msgid "Save as draft"
-msgstr "Spremi skicu"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr "Spremi u mapu..."
-
-#: ../ui/evolution-message-composer.xml.h:25
-msgid "Save the current file"
-msgstr "Spremi trenutnu datoteku"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr "Makni trenutni pogled na spremink"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr "Spremi poruku u nazna�enu mapu"
-
-#: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Send the mail in HTML format"
-msgstr "Pošalji poruku u HTML formatu"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Send this message"
-msgstr "Pošalji ovu poruku"
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Ispiši popis bilješki"
 
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Sign this message with your PGP key"
-msgstr "Potpiši ovu poruku pomoću PGP klju�a"
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "Pogledaj odabranu bilješku"
 
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Potpisivanje ove poruke vašim S/MIME certifikatom"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Prikazati polje BCC ili ne"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the CC field is displayed"
-msgstr "Prikazati polje CC ili ne"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Prikazati polje From ili ne"
-
-#: ../ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Prikazati polje Reply-To ili ne"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Prikazati polje Reply-To ili ne"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Toggles whether the To field is displayed"
-msgstr "Prikazati polje CC ili ne"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_Prilog..."
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "_Bcc Field"
-msgstr "_Bcc zaglavlje"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "_Cc Field"
-msgstr "_Cc zaglavlje"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "_Delete all"
-msgstr "Obri_Å¡i sve"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "_From Field"
-msgstr "O_d zaglavlje"
-
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Ubaci"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Open..."
-msgstr "_Otvori..."
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Post-To Field"
-msgstr "Post-To polje"
-
-#: ../ui/evolution-message-composer.xml.h:50
-msgid "_Reply-To Field"
-msgstr "Odgo_vori-na polje"
-
-#: ../ui/evolution-message-composer.xml.h:52
-msgid "_Security"
-msgstr "Sigurnost"
-
-#: ../ui/evolution-message-composer.xml.h:53
-msgid "_To Field"
-msgstr "_Za polje"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zatvori"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "_HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "Save and Close"
-msgstr "Spremi i zatvori"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
-msgid "Save and _Close"
-msgstr "_Spremi i zatvori"
-
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save the current file and close the window"
-msgstr "Spremi aktivnu datoteku i zatvori prozor"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Dodaj mapuu popis pretplaćenih mapa"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Osvježi popis"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Osvježi popis mapa"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ukloni mapu iz spiska pretplaćenih mapa"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Pretplati se"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Otkaži pretplatu"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverzni odabir"
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "_Otvori bilješkte"
 
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Kopiraj odabrani zadatak"
+msgid "Copy selected tasks"
+msgstr "Kopiraj odabrane zadatke"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Izreži odabrani zadatak"
+msgid "Cut selected tasks"
+msgstr "Odreži odabrane zadatke"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -19283,8 +22195,8 @@ msgid "Mark selected tasks as complete"
 msgstr "Ozna�i odabrane zadatke kao završene"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "Umetni zadatak iz međumemorije"
+msgid "Paste tasks from the clipboard"
+msgstr "Zalijepi zadatke iz spremnika"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -19292,58 +22204,64 @@ msgstr "Pregled liste zadataka za ispis"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "Ispis popisa zadataka "
+msgstr "Ispis popisa zadataka"
 
 #: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "Prikaži prozor pregleda zadataka"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "_Pregled zadataka"
+
+#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Pogledaj odabrani zadatak"
 
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
 #: ../ui/evolution.xml.h:1
-#, fuzzy
 msgid "About Evolution..."
-msgstr "O Ximian Evolutionu"
+msgstr "O Evolutionu..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Promijeni postavke Evolutiona"
 
 #: ../ui/evolution.xml.h:3
-#, fuzzy
 msgid "Change the visibility of the toolbar"
-msgstr "Promijeni svojstva ove mape"
+msgstr "Promijeni vidljivost trake sa alatima"
 
 #: ../ui/evolution.xml.h:5
-#, fuzzy
 msgid "Create a new window displaying this folder"
-msgstr "Stvori novu mapu e-pošte"
+msgstr "Kreiraj novi prozor koji prikazuje ovu mapu"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
+"Prikazi gumbe prozora koristeći postavke trake sa alatima radne površine"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
-msgstr ""
+msgstr "Prikaži gumbe prozora sa ikonama i tekstom"
 
 #: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
-msgstr ""
+msgstr "Prikaži gumbe prozora samo sa ikonama"
 
 #: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
-msgstr ""
+msgstr "Prikaži gumbe prozora samo sa tekstom"
 
 #: ../ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr "Izlaz iz programa"
+msgid "Evolution _FAQ"
+msgstr ""
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Zaboravi _lozinke"
+msgid "Exit the program"
+msgstr "Izlaz iz programa"
 
 #: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
@@ -19351,130 +22269,150 @@ msgstr "Zaboravi zapamćene lozinke kako bi ponovo bili upitani za iste"
 
 #: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
-msgstr ""
+msgstr "Sakrij gumbe prozora"
 
 #: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
-msgstr ""
+msgid "I_mport..."
+msgstr "_Uvezi..."
 
 #: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr ""
+
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Uvezi podatke iz drugih programa"
 
 #: ../ui/evolution.xml.h:17
-#, fuzzy
+msgid "Lay_out"
+msgstr ""
+
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
-msgstr "_Prozor"
+msgstr "Novi _prozor"
 
-#: ../ui/evolution.xml.h:18
-#, fuzzy
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr ""
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
-msgstr "Osobine pošte"
+msgstr "Po_stavke"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
-msgstr "Slanje / primanje"
+msgstr "Slanje / Primanje"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:24
+msgid "Send / _Receive"
+msgstr "Pošalji / _Primi"
+
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "Pošalji zakazane i dobavi nove stavke"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "Podesi postavke Pilota"
 
-#: ../ui/evolution.xml.h:22
-#, fuzzy
+#: ../ui/evolution.xml.h:28
+msgid "Show Side _Bar"
+msgstr ""
+
+#: ../ui/evolution.xml.h:29
+msgid "Show _Status Bar"
+msgstr ""
+
+#: ../ui/evolution.xml.h:30
+msgid "Show _Toolbar"
+msgstr ""
+
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
-msgstr "Prikaži informacije o Ximian Evolution"
+msgstr "Prikaži informacije o Evolutionu"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Prijavi grešku"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Prijavi grešku"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošalji izveštaj o grešcci pomoću Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "Rad na mreži ili ne."
 
-#: ../ui/evolution.xml.h:31
-#, fuzzy
-msgid "Tool_bar"
-msgstr "Glavna traka s alatima"
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
+msgstr ""
 
-#: ../ui/evolution.xml.h:32
-#, fuzzy
-msgid "Tool_bar style"
-msgstr "Glavna traka s alatima"
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Side Bar"
+msgstr "Pokaži/sakrij bo�nu traku"
 
-#: ../ui/evolution.xml.h:33
-#, fuzzy
-msgid "_About Evolution..."
-msgstr "O Ximian Evolutionu"
+#: ../ui/evolution.xml.h:38
+msgid "View/Hide the Status Bar"
+msgstr "Pokaži/sakrij traku stanja"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:39
 #, fuzzy
+msgid "Work _Offline"
+msgstr "Neumreženi rad"
+
+#: ../ui/evolution.xml.h:40
+msgid "_About"
+msgstr "_O programu..."
+
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
-msgstr "Zatvori ovaj prozor"
+msgstr "_Zatvori prozor"
 
-#: ../ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_Pomoć"
+#: ../ui/evolution.xml.h:44
+msgid "_Forget Passwords"
+msgstr "_Zaboravi lozinke"
 
-#: ../ui/evolution.xml.h:38
-msgid "_Hide buttons"
+#: ../ui/evolution.xml.h:45
+msgid "_Frequently Asked Questions"
 msgstr ""
 
-#: ../ui/evolution.xml.h:39
-msgid "_Icons only"
+#: ../ui/evolution.xml.h:47
+msgid "_Hide Buttons"
 msgstr ""
 
-#: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr "_Uvezi..."
-
-#: ../ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_Novi"
+#: ../ui/evolution.xml.h:48
+msgid "_Icons Only"
+msgstr ""
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Brza referenca"
 
-#: ../ui/evolution.xml.h:43
-#, fuzzy
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
-msgstr "I_zreži"
+msgstr "_Izlaz"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr "_Pošalji / Primi"
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
-msgstr ""
+msgstr "Izgled _prebaciva�a"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "_Opcije sinkronizacije..."
 
-#: ../ui/evolution.xml.h:47
-#, fuzzy
-msgid "_Text only"
-msgstr "Model teksta"
+#: ../ui/evolution.xml.h:54
+msgid "_Text Only"
+msgstr ""
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:56
 #, fuzzy
 msgid "_Window"
 msgstr "_Prozor"
@@ -19487,9 +22425,9 @@ msgstr "Prema _poduzeću"
 msgid "_Address Cards"
 msgstr "_Kartice adresara"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Telefonski imenik"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Pregled _liste"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -19499,78 +22437,84 @@ msgstr "_Tjedni pregled"
 msgid "_Day View"
 msgstr "_Dnevni pregled"
 
-#: ../views/calendar/galview.xml.h:3
-#, fuzzy
-msgid "_List View"
-msgstr "Korisni�ki pogled"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
-msgstr "_Mjese�ni pregled "
+msgstr "_Mjese�ni pregled"
 
 #: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Pregled _radnog tjedna"
 
 #: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "_Kao mapa Poslano"
 
-#: ../views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
 msgstr "_Prema statusu"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "_Po pošiljatelju"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
 msgstr "_Po predmetu"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
 msgstr "_Po slijednoj zastavici"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:8
 msgid "_Messages"
 msgstr "_Poruke"
 
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Bilješke"
+
 #: ../views/tasks/galview.xml.h:1
-#, fuzzy
 msgid "With _Due Date"
-msgstr "Datum krajnjeg roka:"
+msgstr "_Datum krajnjeg roka:"
 
 #: ../views/tasks/galview.xml.h:2
-#, fuzzy
 msgid "With _Status"
-msgstr "Postavi status"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+msgstr "Sa _statusom"
+
+#. 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:2
-#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
-msgstr "Vremenske zone"
+msgstr "<b>Vremenske zone</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>_Selection</b>"
-msgstr "_Odabir:"
+msgstr "<b>_Odabir</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "Odaberite vremensku zonu"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
-msgid "TimeZone Combobox"
-msgstr "Vremenska zona"
+#: ../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:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19580,324 +22524,367 @@ msgstr ""
 "Koristite desnu tipku miša za umanjivanje."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
-#, fuzzy
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
-msgstr "Povezivanje"
+msgstr "Kolekcija"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for %s"
-msgstr "Odredi poglede..."
+msgstr "Odredi poglede za %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#, fuzzy
+#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
-msgstr "Odredi poglede..."
+msgstr "Odredi poglede"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "Odredi poglede..."
-
-#: ../widgets/menus/gal-define-views.glade.h:5
-#, fuzzy
-msgid "_Edit..."
-msgstr "_Uredi"
+msgstr "Odredi poglede za \"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tablica"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
-#, fuzzy
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
-msgstr "Svi unosi"
+msgstr "Instanca"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
-#, fuzzy
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
-msgstr "Trenuta�ni pogled"
+msgstr "Spremi trenutni pogled"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
-#, fuzzy
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
-msgstr "Stvori novi prozor"
+msgstr "_Kreiraj novi pogled"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
+msgstr "_Zamijeni postojeći pogled"
+
+#. 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 "Korisni�ki pogled"
+
+#: ../widgets/menus/gal-view-instance.c:583
+msgid "Save Custom View"
+msgstr "Spremi podešeni izgled"
+
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:392
+msgid "Define Views..."
+msgstr "Odredi poglede..."
+
+#: ../widgets/menus/gal-view-menus.c:305
+msgid "C_urrent View"
+msgstr "_Trenutni pogled"
+
+#: ../widgets/menus/gal-view-menus.c:329
+#, c-format
+msgid "Select View: %s"
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Trenuta�ni pogled"
+#: ../widgets/menus/gal-view-menus.c:373
+msgid "Current view is a customized view"
+msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Spremi korisni�ki pogled..."
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Save current custom view"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:397
+msgid "Create or edit views"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Tvorni�ki"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
-#, fuzzy
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
-msgstr "Određivanje izgleda"
+msgstr "Određivanje novog pogleda"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
-msgstr ""
+msgstr "Naziv novog pogleda:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
-#, fuzzy
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Type of View"
-msgstr "Tip pogleda za prikaz"
+msgstr "Vrsta pogleda"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
-#, fuzzy
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
-msgstr "Tip pogleda za prikaz"
+msgstr "Vrsta pogleda:"
+
+#: ../widgets/misc/e-attachment-bar.c:1137
+msgid "Attachment Bar"
+msgstr "Traka privitaka"
+
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Ne mogu priložiti datoteku %s: %s"
+
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Ne mogu priložiti datoteku %s: nije standardna datoteka"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Svojstva priloga"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Ime trake:"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
-msgid "MTWTFSS"
-msgstr "PUSÄŒPSN"
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "Mime tip:"
+
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "Predloži automatsko otvaranje privitka"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-#, fuzzy
-msgid "Previous Button"
-msgstr "Prethodni"
-
-#: ../widgets/misc/e-calendar.c:226
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
-msgstr "U�itavam kalendar"
+msgstr "Mjese�ni kalendar"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Boja ispune"
 
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/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
 msgid "GDK fill color"
 msgstr "GDK boja ispunjavanja"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Popunjeno to�kama"
 
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
-msgstr ""
+msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
-msgstr ""
+msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
-msgstr ""
+msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
-msgstr ""
+msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../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
 msgid "Minimum width"
 msgstr "Minimalna Å¡irina"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../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
 msgid "Minimum Width"
 msgstr "Minimalna Å¡irina"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Razmak"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Sad"
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vrijeme mora biti u formatu: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Postotna vrijednost mora biti između 0 i 100, uklju�no"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Arabic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltik"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Srednjeeuropski"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kineski"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Ćirilica"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Gr�ki"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japanski"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korejski"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Thai"
+msgstr "Tajlandski"
+
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turski"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Zapadno europski"
 
-#: ../widgets/misc/e-charset-picker.c:74
-#, fuzzy
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
-msgstr "Zapadno europski"
+msgstr "Zapadnoeuropski, novi"
 
-#: ../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:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Tradicionalno"
 
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Pojednostavljen"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Vidljivo"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Kodiranje znakova"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Odaberite kodnu stranicu"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Ostalo..."
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#: ../widgets/misc/e-charset-picker.c:599
+msgid "Ch_aracter Encoding"
+msgstr "Kodn_a stranica"
 
-#: ../widgets/misc/e-dateedit.c:316
-#, fuzzy
-msgid "Date and Time Entry"
-msgstr "<b>Tada</b> "
+#: ../widgets/misc/e-dateedit.c:309
+msgid "Date and Time"
+msgstr "Datum i vrijeme"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
-msgstr ""
+msgstr "Unos teksta datuma"
 
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "Kliknite na ovaj gumb za prikazivanje kalendara"
 
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:394
 #, fuzzy
-msgid "Date Button"
-msgstr "Iscrtaj gumb"
+msgid "Drop-down combination box to select time"
+msgstr "Kontrola za odabir vremena"
 
-#: ../widgets/misc/e-dateedit.c:374
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:470
+msgid "No_w"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
+#: ../widgets/misc/e-dateedit.c:476
+msgid "_Today"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-dateedit.c:1641
+msgid "Invalid Date Value"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:1670
+msgid "Invalid Time Value"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Prošireno"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Treba li proširiti proširitelj"
 
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Tekst oznake razgranika"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Koristi podvlaku"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -19905,876 +22892,1063 @@ msgstr ""
 "Ukoliko je postavljeno, podvla�enje ozna�ava da se sljedeći znak koristi kao "
 "kratica"
 
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Razmak koji se stavlja između oznake i sadržanog elementa"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Element oznake"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Element koji se prikazuje umjesto uobi�ajene oznake grani�nika"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Veli�ina razgranika"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Veli�ina strelice razgra�nika"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Greška u sintaksi"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Razmaci oko strelica za grananje"
 
-#: ../widgets/misc/e-filter-bar.c:195
-#, fuzzy
-msgid "_Searches"
-msgstr "_&Traži"
-
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Urednik pretrage"
+#. 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 "Napredna pretraga"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Spremanje pretraživanja"
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.c:267
+msgid "_Searches"
+msgstr "_Pretrage"
+
+#: ../widgets/misc/e-filter-bar.c:269
+msgid "Searches"
+msgstr "Pretrage"
+
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "_Sa�uvaj pretragu..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
-msgstr "_Uredi spremljene pretrage... "
+msgstr "_Uredi spremljene pretrage..."
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
-msgstr "Napredna pretraga"
+msgstr "_Napredna pretraga..."
+
+#: ../widgets/misc/e-filter-bar.h:107
+msgid "All Accounts"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:108
+msgid "Current Account"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:109
+msgid "Current Folder"
+msgstr ""
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-filter-bar.h:110
+msgid "Current Message"
+msgstr ""
+
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Izaberite sliku"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
-msgstr ""
+msgstr "Mapa svijeta"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:629
+#, fuzzy
 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 ""
+"Interaktivna mapa za određivanje vremenske zone pomoću miša. Korisnici "
+"tipkovnice bi umjesto toga trebali odabrati vremensku zonu iz višenamjenskog "
+"prozora."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
 #, fuzzy
+msgid "Online"
+msgstr "Inline"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
-msgstr "završava sa"
+msgstr "Sinkroniziraj sa:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sinkroniziram osobne unose:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Sinkroniziram kategorije:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
-msgstr "Poruka o pomoći"
+msgstr "Prazna poruka"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
-msgstr "Test slanja"
+msgstr "Reorganiziraj model"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 #, fuzzy
 msgid "Column width"
 msgstr "Å irina stupca"
 
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
-#, fuzzy
-msgid "Search Text Entry"
-msgstr "Urednik pretrage"
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
+msgid "Search"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
+msgid "Click here to change the search type"
+msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_&Traži"
 
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Traži sad"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_O�isti"
 
-#: ../widgets/misc/e-search-bar.c:647
-#, fuzzy
-msgid "Search Type"
-msgstr "Ops_eg pretrage:"
-
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Identifikacijski broj stavke"
 
-#: ../widgets/misc/e-search-bar.c:858
-msgid "Subitem ID"
-msgstr "ID  podstavke"
-
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:945
-msgid "Find _Now"
-msgstr "_Traži sad"
+#. 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
+msgid "Sho_w: "
+msgstr ""
 
-#: ../widgets/misc/e-selection-model-array.c:546
-#: ../widgets/table/e-tree-selection-model.c:811
+#. 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
+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
+msgid " i_n "
+msgstr ""
+
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Red pokaziva�a"
 
-#: ../widgets/misc/e-selection-model-array.c:553
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Stupac pokaziva�a"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Razvrstavanje"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Na�in odabira"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Na�in rada pokaziva�a"
 
-#: ../widgets/misc/e-send-options.c:521
-#, fuzzy
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
-msgstr "Obrisano"
+msgstr "Kad je _obrisano:"
 
 #: ../widgets/misc/e-send-options.glade.h:1
-#, fuzzy
 msgid "<b>Delivery Options</b>"
-msgstr "<b>Postavke popisa zadataka</b>"
+msgstr "<b>Opcije dostavljanja</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:2
-#, fuzzy
 msgid "<b>Replies</b>"
-msgstr "<b>Tada</b> "
+msgstr "<b>Odgovori</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:3
-#, fuzzy
 msgid "<b>Return Notification</b>"
-msgstr "SMTP prijava"
+msgstr "<b>Poruka o povratku</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
-#, fuzzy
 msgid "<b>Status Tracking</b>"
-msgstr "Pretraživanje"
+msgstr "<b>Praćenje stanja</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
-#, fuzzy
 msgid "A_uto-delete sent item"
-msgstr "Obriši ovu stavku"
-
-#: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
-msgid "C_lassification"
-msgstr "Klasifikacija"
+msgstr "A_utomatski obriši poslanu stavku"
 
 #: ../widgets/misc/e-send-options.glade.h:7
-#, fuzzy
 msgid "Creat_e a sent item to track information"
-msgstr "Dobavi najnovije podatke o zaduženju"
+msgstr "Kr_eiraj poslanu stavku za praćenje informacije"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
-msgstr ""
+msgstr "Dosta_vljena i otvorena"
 
 #: ../widgets/misc/e-send-options.glade.h:9
-#, fuzzy
 msgid "Gene_ral Options"
-msgstr "_Odrednice"
+msgstr "_Opće odrednice"
 
 #: ../widgets/misc/e-send-options.glade.h:10
-#, fuzzy
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "Pokaži ra�une"
+msgstr ""
+"Nema\n"
+"Potvrda o poruci"
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
 "Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:16
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
-msgstr "_Stil odgovora:"
+msgstr "_Zatražen odgovor"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Sta_tus Tracking"
-msgstr ""
+msgstr "Praćenje s_tanja"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid ""
 "Undefined\n"
 "High\n"
 "Standard\n"
 "Low"
 msgstr ""
+"Neodređen\n"
+"Visok\n"
+"Standardan\n"
+"Nizak"
 
-#: ../widgets/misc/e-send-options.glade.h:23
-#, fuzzy
-msgid "W_ithin"
-msgstr "ÄŒekanje"
-
-#: ../widgets/misc/e-send-options.glade.h:24
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When acce_pted:"
-msgstr "Prihvaćeno"
+msgstr "Kad je prihvaćeno:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When co_mpleted:"
-msgstr "_Datum dovršetka:"
+msgstr "_Kad je završeno:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When decli_ned:"
-msgstr "Odbijeno"
+msgstr "Kad je odbijeno:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "Wi_thin"
+msgstr "U_nutar"
+
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_After:"
-msgstr "nakon"
+msgstr "_Nakon:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_All information"
-msgstr "Informacija o zadatku"
+msgstr "_Sve informacije"
 
-#: ../widgets/misc/e-send-options.glade.h:29
-#, fuzzy
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
-msgstr "Ostavi poruke na serveru"
+msgstr "_Odgodi dostavljanje poruke"
 
-#: ../widgets/misc/e-send-options.glade.h:30
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
-msgstr "_Obriši"
+msgstr "_Dostavljeno"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
-msgstr ""
+msgstr "_Odredi datum zastare"
 
-#: ../widgets/misc/e-send-options.glade.h:33
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
-msgstr "do"
+msgstr "_Do:"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
-msgstr ""
+msgstr "_Kad je zgodno"
 
-#: ../widgets/misc/e-send-options.glade.h:35
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
-msgstr "_Datum dovršetka:"
+msgstr "_Kada je otvoreno:"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:255
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
-#: ../widgets/misc/e-url-entry.c:107
-#, fuzzy
-msgid "click here to go to url"
-msgstr "<kliknite ovdje za odabir mape>"
+#: ../widgets/misc/e-url-entry.c:106
+msgid "Click here to go to URL"
+msgstr "Kliknite ovdje za odlazak na URL"
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
-msgstr ""
+msgstr "Uredi glavni popis kategorija..."
 
-#: ../widgets/misc/gal-categories.glade.h:3
-#, fuzzy
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
-msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
+msgstr "Stavke pripadaju sljedećim kategorijama:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-#, fuzzy
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "_Available Categories:"
-msgstr "Kategorije"
+msgstr "_Moguće kategorije:"
 
-#: ../widgets/misc/gal-categories.glade.h:5
-#, fuzzy
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "categories"
-msgstr "Kategorije"
+msgstr "kategorije"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
-msgstr ""
+msgstr "popis"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Odabrani stupac"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Fokusirani stupac"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Neodabrani stupac"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Precrtani stupac"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Podvu�eni stupac"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Masni stupac"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Oboji stupac"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Stupaca pozadinskih boja"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Ukloni"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "Država"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(Rastući)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(Padajući)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "Nije razvrstano"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "Bez grupiranja"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "Prikaži polja"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "Moguća polja"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
-#, fuzzy
 msgid "A_vailable Fields:"
-msgstr "Upisna polja"
+msgstr "Raspoloži_va polja:"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Rastuće"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
-#, fuzzy
 msgid "Clear All"
-msgstr "Ukloni oznaku"
+msgstr "O�isti sve"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
+msgid "Clear _All"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Silazno"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
-#, fuzzy
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "_Grupiraj po..."
+msgstr "Grupiraj stavke po"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
-msgstr ""
+msgstr "Pomakni _dolje"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
-#, fuzzy
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
-msgstr "Pomakni"
+msgstr "Pomakni _gore"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
 msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
-#: ../widgets/table/e-table-config.glade.h:10
-#, fuzzy
-msgid "Show Fields"
-msgstr "_Za polje"
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
 msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
-msgstr "Razvrstavanje"
+msgstr "Sortiranje"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
-msgstr "Razvrstavanje"
+msgstr "Sortiranje po"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "Onda za"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Dodaj"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
-msgstr ""
+msgstr "_Prikazana polja..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
 #, fuzzy
-msgid "_Sort..."
-msgstr "_Uvezi..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Država"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(Rastući)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(Padajući)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "Nije razvrstano"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "Bez grupiranja"
-
-#: ../widgets/table/e-table-config.c:584
-#, fuzzy
-msgid "Available Fields"
-msgstr "Upisna polja"
-
-#: ../widgets/table/e-table-config.glade.h:17
-#, fuzzy
 msgid "_Group By..."
 msgstr "_Grupiraj po..."
 
-#: ../widgets/table/e-table-config.glade.h:19
-msgid "_Show these fields in order:"
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
 msgstr ""
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-config.glade.h:23
+msgid "_Show these fields in order:"
+msgstr "Prika_ži ova polja po redu:"
+
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "_Sortiranje..."
+
+#: ../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
 msgid "DnD code"
 msgstr "DnD kod"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-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
 msgid "Full Header"
 msgstr "Puno zaglavlje"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "Dodaj kolonu"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
-#, fuzzy
 msgid "Field Chooser"
-msgstr "Naziv polja"
+msgstr "Biranje polja"
 
 #: ../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 ""
+"Za dodavanje stupca u tablicu, povucite ga na\n"
+"mjesto na koje želite da se pojavi."
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "%s : %s (%d stavka)"
+msgstr[1] "%s : %s (%d stavke)"
+msgstr[2] "%s : %s (%d stavki)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
-msgid "%s : %s (%d items)"
-msgstr ""
-
-#: ../widgets/table/e-table-group-container.c:356
-#, fuzzy, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d%% dovršeno)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d stavka)"
+msgstr[1] "%s (%d stavke)"
+msgstr[2] "%s (%d stavki)"
 
-#: ../widgets/table/e-table-group-container.c:357
-#, fuzzy, c-format
-msgid "%s (%d items)"
-msgstr "%s (%s)"
-
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Izmjenjivati boje redova"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Vodoravna mreža za crtanje"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Okomita mreža za crtanje"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Središte crtanja"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Na�in rada pokaziva�a"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Model za biranje"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-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: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
 msgid "Length Threshold"
 msgstr "Maksimalna dužina"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-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: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
 msgid "Uniform row height"
 msgstr "Ujedna�ena visina redova"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
+#: ../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 "Zamrznut"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Podešavanje trenutnog izgleda"
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Ascending"
-msgstr "Sortiraj uzlazno"
+#: ../widgets/table/e-table-header-item.c:1473
+msgid "Sort _Ascending"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Sort Descending"
-msgstr "Sortiraj silazno"
+#: ../widgets/table/e-table-header-item.c:1474
+msgid "Sort _Descending"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1494
-msgid "Unsort"
-msgstr "Poništi razvrstavanje"
+#: ../widgets/table/e-table-header-item.c:1475
+msgid "_Unsort"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By This Field"
-msgstr "Grupiraj po ovom polju"
+#: ../widgets/table/e-table-header-item.c:1477
+msgid "Group By This _Field"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1497
-msgid "Group By Box"
-msgstr "Grupiraj po okviru"
+#: ../widgets/table/e-table-header-item.c:1478
+msgid "Group By _Box"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Remove This Column"
-msgstr "Ukloni ovaj stupac"
+#: ../widgets/table/e-table-header-item.c:1480
+msgid "Remove This _Column"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1500
-msgid "Add a Column..."
-msgstr "Dodaj kolonu..."
+#: ../widgets/table/e-table-header-item.c:1481
+msgid "Add a C_olumn..."
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Alignment"
-msgstr "Poravnanje"
+#: ../widgets/table/e-table-header-item.c:1483
+msgid "A_lignment"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1484
+msgid "B_est Fit"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1485
+msgid "Format Column_s..."
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Best Fit"
-msgstr "Najbolje pristajanje"
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Custo_mize Current View..."
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1504
-msgid "Format Columns..."
-msgstr "Oblikuj stupce..."
+#: ../widgets/table/e-table-header-item.c:1543
+msgid "_Sort By"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1506
-msgid "Customize Current View..."
-msgstr "Prilagodi aktivni pogled..."
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1561
+msgid "_Custom"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-msgid "Fontset"
-msgstr "Skup pisama"
+#: ../widgets/table/e-table-header-item.c:1894
+msgid "Font Description"
+msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1838
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Detalji razvrstavanja"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Stablo"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
-#, fuzzy
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
-msgstr "Prilagodnik za ETree tablicu"
+msgstr "Zaglavlje tablice"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
-#, fuzzy
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
-msgstr "Model teksta"
+msgstr "Model tablice"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 #, fuzzy
 msgid "Cursor row"
 msgstr "Red pokaziva�a"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
-msgstr "Uvijek traži"
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
+msgid "Always search"
+msgstr "Uvijek pretražuj"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Koristite klik za dodavanje"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Prilagodnik za ETree tablicu"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Uvijek pretražuj"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Pogled u nazad"
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Crtaj linije i +/- proširitelje."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr ""
-
-#: ../widgets/text/e-entry-test.c:50
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-#, fuzzy
-msgid "This should test the minicard canvas item"
-msgstr "Ovo bi trebalo testirati element toka platna"
+#: ../widgets/text/e-text.c:2735
+msgid "Input Methods"
+msgstr "Ulazne metode"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Obrađiva� događaja"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-#, fuzzy
-msgid "Font"
-msgstr "Pisma"
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+msgid "Bold"
+msgstr "Masno"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#, fuzzy
-msgid "GDKFont"
-msgstr "Pisma"
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+msgid "Strikeout"
+msgstr "Precrtano"
+
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+msgid "Anchor"
+msgstr "Sidro"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Obostrano poravnanje"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+msgid "Clip Width"
+msgstr "Izreži širinu"
+
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+msgid "Clip Height"
+msgstr "Izreži visinu"
+
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+msgid "Clip"
+msgstr "Isje�ak"
+
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+msgid "Fill clip rectangle"
+msgstr "Ispuni pravokutnik isje�ka"
+
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+msgid "X Offset"
+msgstr "X pomak"
+
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+msgid "Y Offset"
+msgstr "Y pomak"
+
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+msgid "Text width"
+msgstr "Å irinu teksta"
+
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+msgid "Text height"
+msgstr "Visina teksta"
+
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Koristi elipsu"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Troto�ka"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Omatanje linija"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Znaci prijeloma"
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Najviše redova"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
-msgid "Allow newlines"
-msgstr "Omogući novi red"
-
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Iscrtaj rubove"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+msgid "Allow newlines"
+msgstr "Omogući novi red"
+
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Crtaj pozadinu"
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Iscrtaj gumb"
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Pozicija pokaziva�a"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
-msgid "Emulate label resize"
-msgstr ""
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+msgid "IM Context"
+msgstr "Kontekst na�ina unosa"
 
-#: ../widgets/text/e-text.c:2696
-msgid "Input Methods"
-msgstr "Ulazne metode"
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+msgid "Handle Popup"
+msgstr "Upravljaj sko�nim prozorom"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Bold"
-msgstr "Masno"
+#~ msgid "Permission Denied."
+#~ msgstr "Pristup nije dozvoljen."
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Strikeout"
-msgstr "Precrtano"
+#~ msgid "_Contact"
+#~ msgstr "_Kontakt"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Anchor"
-msgstr "Sidro"
+#~ msgid "Contact _List"
+#~ msgstr "Kontakt _lista"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
-msgid "Clip Width"
-msgstr "Izreži širinu"
+#~ msgid "Address _Book"
+#~ msgstr "A_dresar:"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
-msgid "Clip Height"
-msgstr "Izreži visinu"
+#~ msgid "_Properties..."
+#~ msgstr "_Postavke..."
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
-msgid "Clip"
-msgstr "Isje�ak"
+#~ msgid "_Appointment"
+#~ msgstr "_Obveza"
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
-msgid "Fill clip rectangle"
-msgstr "Ispuni pravokutnik isje�ka"
+#~ msgid "M_eeting"
+#~ msgstr "_Sastanak"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
-msgid "X Offset"
-msgstr "X pomak"
+#, fuzzy
+#~ msgid "All Day A_ppointment"
+#~ msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
-msgid "Y Offset"
-msgstr "Y pomak"
+#~ msgid "Cale_ndar"
+#~ msgstr "Kale_ndar"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
-msgid "Text width"
-msgstr "Å irinu teksta"
+#~ msgid "D_escription:"
+#~ msgstr "_Opis:"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
-msgid "Text height"
-msgstr "Visina teksta"
+#~ msgid "Updating query"
+#~ msgstr "Ažuriram upitnik"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
-msgid "IM Context"
-msgstr "Kontekst na�ina unosa"
+#~ msgid "Mem_o"
+#~ msgstr "Pod_sjetnik"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
-msgid "Handle Popup"
-msgstr "Upravljaj sko�nim prozorom"
+#~ msgid "_Shared memo"
+#~ msgstr "_Dijeljeni podsjetnici"
+
+#~ msgid "Memo li_st"
+#~ msgstr "Po_pis podsjetnika"
+
+#~ msgid "Assigne_d Task"
+#~ msgstr "_Pridruženi zadatak"
+
+#~ msgid "Tas_k list"
+#~ msgstr "Popis _zadataka"
+
+#~ msgid "Unknown reason"
+#~ msgstr "Nepoznat razlog"
+
+#, fuzzy
+#~ msgid "Open File"
+#~ msgstr "Otvori datoteku"
+
+#~ msgid "_Save Message"
+#~ msgstr "_Spremi poruku"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Ne mogu otvoriti datoteku &quot;{0}&quot;."
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "_Mail Message"
+#~ msgstr "_Poruka"
+
+#~ msgid "Mail _Folder"
+#~ msgstr "_Mapa pošte"
+
+#~ msgid "Attach original message"
+#~ msgstr "Pridruži izvornu poruku"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "Ne citiraj originalnu poruku"
+
+#~ msgid "Quote original message"
+#~ msgstr "Citiraj originalnu poruku"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Unesite ime za ovaj potpis."
+
+#~ msgid "Name:"
+#~ msgstr "Ime:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Sigurni ste da želite trajno ukloniti sve obrisane poruke iz mape &quot;"
+#~ "{0}&quot;?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "Obrisati &quot;{0}&quot;?"
+
+#~ msgid "Print Message"
+#~ msgstr "Ispiši poruku"
+
+#~ msgid "Prints the message"
+#~ msgstr "Ispisuje poruku"
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "Dodatak koji upravlja �arobnjakom za podizanje."
+
+#~ msgid "Startup wizard"
+#~ msgstr "ÄŒarobnjak"
+
+#~ msgid "No folder name specified."
+#~ msgstr "Nije navedeno ime direktorija."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Ime mape ne može sadržavati Return znak."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Ime mape ne može sadržavati znak \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Ime mape ne može sadržavati znak \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' i '..' su rezervirana imena mapa."
+
+#~ msgid "_Test"
+#~ msgstr "_Test"
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Kopiraj odabir u spremnik"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Izreži ozna�eno i premjesti u spremnik"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "Zalijepi iz spremnika"
+
+#~ msgid "All Day Event"
+#~ msgstr "Cjelodnevni događaj"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Prikaži poruke u normalnom obliku"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "Obriši sve osim potpisa"
+
+#~ msgid "For_mat"
+#~ msgstr "_Oblikovanje"
+
+#~ msgid "HT_ML"
+#~ msgstr "_HTML"
+
+#~ msgid "Open a file"
+#~ msgstr "Otvori datoteku"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP Å¡ifriranje"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP potpis"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "S/MIME Å¡ifriranje"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "S/MIME potpis"
+
+#~ msgid "Save As"
+#~ msgstr "Spremi kao"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Spremi u mapu..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Spremi poruku u nazna�enu mapu"
+
+#~ msgid "Send"
+#~ msgstr "Pošalji"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Pošalji poruku u HTML formatu"
+
+#~ msgid "_Delete all"
+#~ msgstr "Obri_Å¡i sve"
+
+#~ msgid "_Open..."
+#~ msgstr "_Otvori..."
+
+#~ msgid "C_lose"
+#~ msgstr "_Zatvori"
+
+#~ msgid "H_TML"
+#~ msgstr "_HTML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "_Spremi i zatvori"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Spremi aktivnu datoteku i zatvori prozor"
+
+#~ msgid "Refresh List"
+#~ msgstr "Osvježi popis"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Osvježi popis mapa"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Ukloni mapu iz spiska pretplaćenih mapa"
+
+#~ msgid "Subscribe"
+#~ msgstr "Pretplati se"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Otkaži pretplatu"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverzni odabir"
+
+#~ msgid "Status Details"
+#~ msgstr "Detalji stanja"
+
+#~ msgid "Time Zone"
+#~ msgstr "Vremenska zona"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "Kontrola vremenske zone"
diff --git a/po/it.po b/po/it.po
index 4397b43e1a..8282de8cb3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -31,12 +31,13 @@
 # molti commenti utili alla traduzione. Grazie all'svn e proverò
 # a recuperarli in seguito.  -Luca
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.22.x\n"
+"Project-Id-Version: evolution 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-07 14:32+0100\n"
-"PO-Revision-Date: 2008-03-07 14:56+0100\n"
+"POT-Creation-Date: 2008-09-07 16:42+0200\n"
+"PO-Revision-Date: 2008-09-07 21:57+0200\n"
 "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -44,23 +45,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+# GNOME-2-24
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "rubrica di evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nuovo elenco contatti"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -68,7 +70,6 @@ msgstr[0] "la cartella di rubrica corrente %s contiene %d tessera"
 msgstr[1] "la cartella di rubrica corrente %s contiene %d tessere"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Apri"
 
@@ -84,64 +85,64 @@ msgstr "Contatto: "
 msgid "evolution minicard"
 msgstr "minitessera di evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Presenta degli allarmi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Presenta delle ricorrenze."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "È una riunione."
 
-#: ../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 di calendario: l'indice è «%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 di calendario: nessun indice."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "evento vista calendario"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Cattura il focus"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nuovo appuntamento"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Nuovo evento intera giornata"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Vai ad oggi"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Vai alla data"
 
-#: ../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 ""
 "una tabella per visualizzare e selezionare l'intervallo di tempo corrente"
 
 #. 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."
@@ -150,14 +151,14 @@ msgstr[1] "Presenta %d eventi."
 
 #. 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 presenta eventi."
 
 #. 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 "Vista settimana lavorativa: %s. %s"
@@ -165,21 +166,21 @@ msgstr "Vista settimana lavorativa: %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 "Vista giornaliera: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "vista calendario per una settimana lavorativa"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "vista calendario per uno o più giorni"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -189,32 +190,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:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../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: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: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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -223,61 +222,59 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../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: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: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:766
 msgid "Gnome Calendar"
 msgstr "Calendario di GNOME"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barra di ricerca"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "barra di ricerca nel calendario di Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Pulsante \"vai a\""
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Fare clic qui per trovare altri eventi."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensile: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista settimanale: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "vista calendario per un mese"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "vista calendario per una o più settimane"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "popup"
 
 #. 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 "fa comparire un figlio"
 
@@ -289,12 +286,12 @@ msgstr "modifica"
 msgid "begin editing this cell"
 msgstr "avvia la modifica di questa cella"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "commuta"
 
 #. 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 "commuta la cella"
 
@@ -315,47 +312,47 @@ msgstr "contrai"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae la riga nel ETree che contiene questa cella"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Cella di tabella"
 
-#: ../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 "fare clic per aggiungere"
 
-#: ../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 "clic"
 
-#: ../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 "ordina"
 
-#: ../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 "Calendario: da %s a %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "voce calendario di evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Pulsante combinato"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Attiva il predefinito"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Menù a comparsa"
 
@@ -367,15 +364,13 @@ msgstr "Commuta barra allegati"
 msgid "activate"
 msgstr "attivato"
 
-# GNOME-2-22
+# GNOME-2-24
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
-"«{0}» p una sorgente di rubrica in sola lettura. Passare alla vista contatti "
-"ed evidenziare una rubrica che possa accettare contatii."
+"'{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}» è una rubrica in sola lettura e non può essere modificata. Selezionare una differente rubrica dal riquadro laterale nella vista contatti."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -418,14 +413,14 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Impossibile ottenere lo schema informazioni dal server LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Impossibile rimuovere la rubrica."
 
 #: ../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 ""
 "Al momento è possibile accedere da Evolution solo alla Rubrica di sistema di "
 "GroupWise. Usare un altro client di posta per GroupWise una volta, per "
@@ -437,7 +432,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Eliminare la rubrica «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Errore nel caricare la rubrica."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -450,7 +445,7 @@ msgstr "Autenticazione col server LDAP fallita."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Eliminazione del contatto fallita"
 
@@ -463,31 +458,27 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "Il server LDAP non ha risposto con uno schema informazioni valido."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Permesso negato."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Versione del server"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Alcune funzionalità potrebbero non operare correttamente col server "
 "attualmente in uso"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "La rubrica di Evolution è terminata in modo inatteso."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "L'immagine selezionata è troppo grande. Ridimensionare tale immagine e "
 "memorizzarla?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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 "
@@ -497,56 +488,54 @@ msgstr ""
 "supporta questa funzionalità, oppure potrebbe essere mal configurato. "
 "Chiedere all'amministratore le basi di ricerca supportate."
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "Questa rubrica sarà rimossa in modo permanente."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "Impossibile aprire questa rubrica."
 
-#: ../addressbook/addressbook.error.xml.h:27
-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 "Questo server di rubriche non ha alcuna base di ricerca suggerita."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Questo server di rubriche potrebbe essere non raggiungibile, oppure il nome "
 "del server potrebbe essere errato o ancora la connessione di rete potrebbe "
 "non essere attiva."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Questa rubrica sarà rimossa in modo permanente."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Questo server non supporta lo schema informazioni LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "Impossibile aprire la rubrica"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Impossibile effettuare la ricerca."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Impossibile salvare {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Salvare le modifiche apportate?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
-"Si sta cercando di spostare un contatto da una rubrica ad un'altra, ma "
-"questo non può essere rimosso dall'origine. Farne solamente la copia?"
+msgstr "Si sta tentando di spostare un contatto da una rubrica a un'altra, ma il contatto non può essere rimosso dall'origine. Farne solamente la copia?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -556,6 +545,11 @@ msgstr ""
 "potrebbero riscontrare dei problemi usando Evolution. Per risultati "
 "ottimali, sarebbe opportuno aggiornare il server ad una versione supportata."
 
+# GNOME-2-24
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Permessi non sufficienti per eliminare i contatti in questa rubrica."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -571,7 +565,7 @@ msgstr ""
 "I propri contatti per {0} non saranno disponibili fino al riavvio di "
 "Evolution."
 
-#: ../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
@@ -594,9 +588,9 @@ msgstr "_Ridimensiona"
 msgid "_Use as it is"
 msgstr "_Usa come è"
 
-#. 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:44
-#: ../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}"
 
@@ -605,17 +599,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Indirizzo sync predefinito:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "Impossibile caricare la rubrica"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco dell'applicazione Indirizzi del pilot"
 
@@ -637,10 +631,10 @@ msgstr "Configurare il completamento automatico"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Contatti"
 
@@ -649,7 +643,7 @@ msgid "Evolution Address Book"
 msgstr "Rubrica di Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "Pop-up indirizzo della rubrica di Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -665,7 +659,7 @@ msgid "Evolution Address Book component"
 msgstr "Componente rubrica di Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Controllo gestione certificati S/MIME di Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -681,12 +675,13 @@ msgstr "Gestione dei certificati S/MIME"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../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
 msgid "On This Computer"
 msgstr "Su questo computer"
 
@@ -699,122 +694,129 @@ msgstr "Su questo computer"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "Personale"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Su server LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+# GNOME-2-24
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Contatto"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+# GNOME-2-24
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "E_lenco contatti"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Crea un nuovo elenco contatti"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+# GNOME-2-24
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_Rubrica"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Crea una nuova rubrica"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Aggiornamento delle impostazioni o delle cartelle della rubrica fallito."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tipo:"
 
 # GNOME-2-22
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Copia il contenuto della _rubrica localmente per operazioni fuori rete"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generale"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Informazioni sul server"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "Dettagli"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Ricerca in corso"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Scaricamento in corso"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Proprietà della rubrica"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrazione in corso..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Migrazione di «%s»:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -868,70 +870,76 @@ msgstr ""
 "\n"
 "Attendere che Evolution finisca la migrazione dei dati di sincronizzazione..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinomina la cartella «%s» come:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Rinomina cartella"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "I nomi di cartella non possono contenere il carattere \"/\"."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Nuova rubrica"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Salva come vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../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 "Eli_mina"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "Pr_oprietà..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Proprietà"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Selettore origine contatti"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accesso anonimo al server LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../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 "Autenticazione fallita.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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 "Inserire la password per %s (utente %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Inserire la password"
 
@@ -1011,38 +1019,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Autenticazione</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Visualizzazione</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Scaricamento</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Ricerca</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Informazioni sul server</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Aggiungi rubrica"
 
-#: ../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:761
 msgid "Always"
 msgstr "Sempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonimo"
 
+#. 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 "Base"
@@ -1071,14 +1076,14 @@ msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Mai"
 
 #. 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
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Nessuna cifratura"
 
@@ -1090,7 +1095,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Cifratura SSL"
 
@@ -1158,7 +1163,7 @@ msgstr "Basi di ricerca supportate"
 #. 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
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Cifratura TLS"
 
@@ -1255,13 +1260,14 @@ msgstr "_Trova possibili basi di ricerca"
 msgid "_Login method:"
 msgstr "_Metodo di login:"
 
+# GNOME-2-24
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
-msgstr "_Nome:"
+msgstr "No_me:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
@@ -1272,7 +1278,7 @@ msgid "_Search scope:"
 msgstr "_Ampiezza ricerca:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1293,9 +1299,10 @@ msgstr "tessere"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minuti"
 
@@ -1336,7 +1343,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Lavoro</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1348,16 +1355,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorie..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contatto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Editor dei contatti"
 
@@ -1370,7 +1377,7 @@ msgid "Image"
 msgstr "Immagine"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "Messenger MSN"
 
@@ -1384,7 +1391,7 @@ msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1398,11 +1405,11 @@ msgstr "Telefono"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Lavoro"
 
@@ -1424,8 +1431,8 @@ msgid "_Birthday:"
 msgstr "Co_mpleanno:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendario:"
@@ -1518,1119 +1525,1121 @@ msgstr "_Dove:"
 msgid "_Zip/Postal Code:"
 msgstr "_CAP:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "Indirizzo"
 
-#: ../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:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Modificabile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Stati Uniti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "American 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 "Antartide"
 
-#: ../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 e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../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 "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Banglades"
 
-#: ../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 "Belarus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../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 "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../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 "Bosnia Erzegovina"
 
-#: ../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 "Isola Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasile"
 
-#: ../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 "Territori Britannici dell'Oceano Indiano"
 
-#: ../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 "Bulgaria"
 
-#: ../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 "Cambogia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Capo 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 "Isole Caimane"
 
-#: ../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 "Repubblica Centro Africana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Chad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Cile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Cina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Isole di Natale"
 
-#: ../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 "Isole Coco (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comorre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../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 "Congo, Repubblica Democratica del"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Isole Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../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:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Costa d'Avorio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croazia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Cipro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Repubblica Ceca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Danimarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Repubblica Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egitto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../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:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinea Equatoriale"
 
-#: ../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 "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Isole Falkland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Isole Faroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Guiana francese"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polinesia francese"
 
-#: ../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 "Territori Francesi Meridionali"
 
-#: ../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 "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Germania"
 
-#: ../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 "Gibilterra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../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"
-msgstr "Guinea-bissau"
+#: ../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:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../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 "Isole Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Santa Sede"
 
-#: ../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 "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Ungheria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islanda"
 
-#: ../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 "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../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 "Isola di Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israele"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Giappone"
 
-#: ../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 "Giordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea, Repubblica Popolare Democratica di"
 
-#: ../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 "Corea, Repubblica di"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: ../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 "Latvia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Libano"
 
-#: ../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 "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Lussemburgo"
 
-#: ../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 "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../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 "Malesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldive"
 
-#: ../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 "Isole Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../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 "Messico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../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 "Moldova, Repubblica della"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../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 "Marocco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambico"
 
-#: ../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 "Namibia"
 
-#: ../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 "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Olanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antille Olandesi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nuova Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nuova Zelanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../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 "Nigeria"
 
-#: ../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 "Isole 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 "Isole Mariana Settentrionali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../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 "Territorio Palestinese"
 
-#: ../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 Nuova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Perù"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filippine"
 
-#: ../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 "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portogallo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../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:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../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 "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Federazione Russa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../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 "Saint Kitts e 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 "Santa 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 "Saint Vincent e Grenadine"
 
-#: ../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 e 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 "Arabia Saudita"
 
-#: ../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 "Serbia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../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 "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slovacchia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Isole Solomon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Sud Africa"
 
-#: ../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 "Georgia del Sud e Isole Sandwich meridionali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Spagna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../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:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "S. Elena"
 
-#: ../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 "St. Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../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 "Isole Svalbard e Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Svizzera"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Siria"
 
-#: ../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 "Tajikistan"
 
-#: ../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 "Tanzania, Repubbliche Unite della"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../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 Est"
 
-#: ../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 e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turchia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../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 "Isole Turks e Caicos"
 
-#: ../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 "Ucraina"
 
-#: ../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 "Emirati Arabi Uniti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Gran Bretagna"
 
-#: ../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 "Isole minori degli Stati Uniti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../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 "Viet Nam"
 
-#: ../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 "Isole Vergini Britanniche"
 
-#: ../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 "Isole Vergini U.S.A"
 
-#: ../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 "Isole Wallis e Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Sahara occidentale"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Yemen"
 
-#: ../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
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nome"
 
-#: ../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 "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "Servizio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Ubicazione"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nome utente"
 
-#: ../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:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Casa"
 
-#: ../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:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Altro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "Rubrica d'origine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Rubrica di destinazione"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "È un nuovo contatto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Campi scrivibili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Campi richiesti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Cambiato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor dei contatti - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Selezionare un'immagine per questo contatto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Nessuna immagine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2638,47 +2647,47 @@ msgstr ""
 "I dati del contatto non sono validi:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» presenta un formato non valido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» presente un formato non valido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» è vuoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Contatto non valido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Aggiunta veloce di un contatto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Modifica completamente"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Nome completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Seleziona rubrica"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2687,7 +2696,7 @@ msgstr ""
 "Eliminare veramente\n"
 "l'elenco di contatti (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2695,7 +2704,7 @@ msgstr ""
 "Eliminare veramente\n"
 "questo elenco di contatti?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2704,7 +2713,7 @@ msgstr ""
 "Eliminare veramente\n"
 "il contatto (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2812,7 +2821,7 @@ msgstr "Servizio _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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Ubicazione:"
@@ -2823,7 +2832,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Membri</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 di elenco contatti"
 
@@ -2845,27 +2854,28 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Digitare un indirizzo email o trascinare un contatto nella lista qui sotto:"
 
-#: ../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 "Membri elenco contatti"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "_Membri"
+
+#: ../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:390
-#: ../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/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Rubrica"
 
-#: ../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 "È un nuovo elenco"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Membri"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contatto modificato:"
@@ -2904,41 +2914,42 @@ msgstr ""
 "email di questo contatto. Aggiungerlo comunque?"
 
 # GNOME-2-20
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Unione contatto"
-
-# GNOME-2-20
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Unisci"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+# GNOME-2-20
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Unione contatto"
+
+#: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Email"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Un campo qualsiasi contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "Email comincia per"
 
+# GNOME-2-24
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Nome comincia per"
+msgid "Name contains"
+msgstr "Nome contiene"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2952,10 +2963,10 @@ msgstr[0] "%d contatto"
 msgstr[1] "%d contatti"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Interrogazione"
 
@@ -2963,125 +2974,121 @@ msgstr "Interrogazione"
 msgid "Error getting book view"
 msgstr "Errore nell'ottenere la vista rubrica"
 
-#: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../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:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modello"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Errore nel modificare la tessera"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Nome comincia per"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Origine"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "Tipo"
 
 # GNOME-2-22
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Salva come vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Apri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Nuovo contatto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nuovo e_lenco contatti..."
 
 # GNOME-2-22
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Salva come vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Inoltra contatto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Inoltra contatti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Invia _messaggio al contatto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Invia _messaggio alla lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Invia _messaggio ai contatti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "Stam_pa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Cop_ia nella rubrica..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Sp_osta nella rubrica..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "_Taglia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../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
 #: ../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 "_Copia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Incolla"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Categoria qualsiasi"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "Altro errore"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3113,7 +3120,7 @@ msgstr "Telefono auto"
 
 #: ../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
@@ -3214,9 +3221,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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 "Ruolo"
 
@@ -3252,38 +3259,38 @@ msgid "Web Site"
 msgstr "Sito Web"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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
 msgid "Width"
 msgstr "Larghezza"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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
 msgid "Height"
 msgstr "Altezza"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ha il focus"
 
@@ -3303,11 +3310,19 @@ msgstr "Modello del testo"
 msgid "Max field name length"
 msgstr "Lunghezza massima del nome del campo"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Larghezza colonna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+# GNOME-2-24
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr "\n\nRicerca del contatto..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3321,7 +3336,7 @@ msgstr ""
 "\n"
 "o fare doppio clic qui per creare un nuovo contatto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3335,7 +3350,7 @@ msgstr ""
 "\n"
 "Fare doppio clic qui per creare un nuovo contatto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3345,7 +3360,7 @@ msgstr ""
 "\n"
 "Cercare il contatto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3355,40 +3370,41 @@ msgstr ""
 "\n"
 "Non c'è niente da mostrare in questa vista"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adattatore"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Email lavoro"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Email casa"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Altra email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Selezionato"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ha il cursore"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Apri c_ollegamento nel browser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copia posizione collegamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "Invia nuovo _messaggio a..."
 
@@ -3410,7 +3426,7 @@ msgid "map"
 msgstr "mappa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Membri elenco"
 
@@ -3431,25 +3447,23 @@ msgid "Video Chat"
 msgstr "Chat video"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../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-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:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Libero/Occupato"
 
@@ -3471,155 +3485,170 @@ msgid "Web Log"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Compleanno"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Anniversario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Qualifica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Pagina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Successo"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Backend occupato"
 
 # GNOME-2-22
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Repertorio fuori rete"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "La rubrica non esiste"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Nessun contatto \"se stesso\" definito"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permesso negato"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Contatto non trovato"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "ID del contatto esiste già"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Annullato"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Impossibile annullare"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Autenticazione fallita"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Autenticazione richiesta"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS non disponibile"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Origine inesistente"
 
 # GNOME-2-22
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Avvia in modalità fuori rete"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Altro errore"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Versione del server non valida"
 
+# GNOME-2-24
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Metodo di autenticazione non supportato"
+
 # GNOME-2-22
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#, fuzzy
 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 ""
 "Impossibile aprire questa rubrica. È possibile che questa sia non impostata "
 "per l'uso fuori rete, oppure che non sia stata ancora scaricata. Caricare la "
 "rubrica una volta quando connessi, in modo da scaricarne i contenuti"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
-#, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#, 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 ""
 "Impossibile aprire questa rubrica. Controllare che il percorso %s esista e "
 "di avere permessi sufficienti per accedervi."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#, 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 ""
 "Impossibile aprire questa rubrica.  Questo significa che è stato inserito un "
 "URI errato, oppure che il server LDAP non è raggiungibile."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3629,80 +3658,88 @@ msgstr ""
 "Per usare LDAP è necessario installare una versione di Evolution abilitata a "
 "operare con LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, 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 ""
 "Impossibile aprire questa rubrica. Questo significa che è stato inserito un "
 "URI errato, oppure che il server LDAP non è raggiungibile."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+# GNOME-2-24
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Errore dettagliato:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#, 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 ""
 "A questa interrogazione corrispondono più tessere di quante il\n"
 "server sia configurato per restituire o Evolution a visualizzare.\n"
 "Rendere la ricerca più specifica, oppure innalzare il limite di\n"
 "risultati nelle preferenze del server di directory per questa rubrica."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#, 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 ""
 "Il tempo necessario per eseguire questa interrogazione eccede\n"
 "il tempo limite del server o il limite configurato per questa rubrica.\n"
 "Rendere la ricerca più specifica o elevare il limite di tempo del\n"
 "server di directory nelle preferenze di questa rubrica."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Il backend per questa rubrica è incapace di elaborare questa interrogazione."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Il backend per questa rubrica si è rifiutato di eseguire questa "
 "interrogazione."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Questa interrogazione non è stata completata con successo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere l'elenco"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Errore nell'aggiungere il contatto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Errore nel modificare l'elenco"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Errore nel modificare il contatto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Errore nel rimuovere l'elenco"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Errore nel rimuovere il contatto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3717,16 +3754,16 @@ msgstr[1] ""
 "Aprendo %d contatti verranno aperte %d nuove finestre.\n"
 "Mostrare veramente tutti questi contatti?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Non mostrare"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "Mostra _tutti contatti"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3735,72 +3772,72 @@ msgstr ""
 "%s esiste già\n"
 "Sovrascriverlo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contatto"
 msgstr[1] "contatti"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "tessera.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Selezione rubrica"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "elenco"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Sposta contatto su"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Copia contatto su"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Sposta contatti su"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Copia contatti su"
 
 # GNOME-2-22
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "vCard multiple"
 
 # GNOME-2-22
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard per %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Informazioni sul contatto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informazioni sul contatto per %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Interrogazione rubrica..."
 
@@ -3821,50 +3858,50 @@ msgid "Show Compact vCard"
 msgstr "Vista vCard compatta"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Salva nella rubrica"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Vista a tessere"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importazione in corso..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV o Tab di Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importatore CSV e Tab di Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV o Tab di Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importatore CSV e Tab di Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV o Tab di Evolution (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importatore CSV e Tab di Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato dati di scambio LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Importatore LDIF di Evolution"
 
@@ -3917,12 +3954,12 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Intestazione"
 
@@ -4024,8 +4061,8 @@ msgstr "Ombreggiatura"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Dimensione:"
@@ -4043,7 +4080,7 @@ msgid "Top:"
 msgstr "Superiore:"
 
 #: ../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 "Tipo:"
 
@@ -4055,37 +4092,37 @@ msgstr "Larghezza:"
 msgid "_Font..."
 msgstr "_Carattere..."
 
-#: ../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 "Prova dell'editor dello stile di stampa dei contatti"
 
-#: ../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 "Copyright (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 ""
 "Questo dovrebbe controllare il widget dell'editor dello stile di stampa "
 "contatti"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Prova di stampa contatti"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Questo dovrebbe controllare il codice di stampa contatti"
 
-#: ../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 "Impossibile aprire il file"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Impossibile ottenere l'elenco delle rubriche"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4101,7 +4138,7 @@ msgid "OUTPUTFILE"
 msgstr "FILE_OUTPUT"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Elenca cartelle di rubriche locali"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4151,17 +4188,23 @@ msgstr "In modalità normale non è necessaria l'opzione dimensione."
 msgid "Unhandled error"
 msgstr "Errore non gestito"
 
-# GNOME-2-22
+# GNOME-2-24
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
-"«{0}» è una sorgente di calendario in sola lettura. Passare alla vista "
-"calendario ed evidenziare un calendario che possa accettare appuntamenti."
+"'{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}» è un calendario in sola lettura e non può essere modificato. Selezionare un differente calenderio dal riquadro laterale nella vista calendario."
+
+# GNOME-2-24
+#. 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}» è un calendario in sola lettura e non può essere modificato. Selezionare un differente calenderio che possa accettare appuntamenti."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../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."
@@ -4169,7 +4212,7 @@ msgstr ""
 "Aggiungendo all'appuntamento un indice esplicativo, si fornisce ai "
 "destinatari un'idea dell'argomento dell'appuntamento."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -4177,19 +4220,19 @@ msgstr ""
 "Aggiungendo al compito un indice esplicativo, si fornisce ai destinatari "
 "un'idea dell'argomento del compito."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni in questi memo saranno eliminate e non potranno essere "
 "recuperate."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni in questo memo saranno eliminate e non potranno essere "
 "ripristinate."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4197,129 +4240,134 @@ msgstr ""
 "Tutte le informazioni riguardo questi appuntamenti saranno eliminate e non "
 "potranno essere recuperate."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni riguardo questi compiti saranno eliminate e non "
 "potranno essere recuperate."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni riguardo questo appuntamento saranno eliminate e non "
 "potranno essere ripristinate."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni riguardo questa riunione saranno eliminate e non "
 "potranno essere recuperate."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni riguardo questo memo saranno eliminate e non potranno "
 "essere recuperate."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Tutte le informazioni riguardo questo compito saranno eliminate e non "
 "potranno essere recuperate."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Eliminare veramente il compito «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Eliminare veramente l'appuntamento intitolato «{0}?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Eliminare veramente il memo «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Eliminare veramente questi {0} appuntamenti?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Eliminare veramente questi {0} memo?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Eliminare veramente questi {0} compiti?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Eliminare veramente questo appuntamento?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Eliminare veramente questa riunione?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Eliminare veramente questo memo?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Eliminare veramente questo compito?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Salvare veramente il memo senza un indice?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Inviare veramente l'appuntamento senza un indice?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Inviare veramente il compito senza un indice?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "Impossibile creare un nuovo evento"
 
-#: ../calendar/calendar.error.xml.h:27
+# GNOME-2-24
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Impossibile salvare l'evento"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Eliminare il calendario «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Eliminare l'elenco di memo «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Eliminare l'elenco di compiti «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "_Non inviare"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Scaricamento in corso. Salvare questo appuntamento?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Scaricamento in corso. Salvare questo compito?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Impossibile caricare l'editor."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4327,26 +4375,26 @@ msgstr ""
 "Verranno inviati via email degli inviti a tutti i partecipanti, consentendo "
 "loro di accettare questo compito."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Verranno inviati via email degli inviti a tutti i partecipanti, consentendo "
 "loro di dare conferma."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Errore nel caricare il calendario"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Errore nel caricare l'elenco di memo"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Errore nel caricare l'elenco di compiti"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4354,7 +4402,7 @@ msgstr ""
 "Se non si invia una notifica di annullamento, gli altri partecipanti "
 "potrebbero non venire a conoscenza che la riunione è stata annullata."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../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."
@@ -4362,7 +4410,7 @@ msgstr ""
 "Se non si invia una notifica di annullamento, gli altri partecipanti "
 "potrebbero non venire a conoscenza che il memo è stato eliminato."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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."
@@ -4370,7 +4418,7 @@ msgstr ""
 "Se non si invia una notifica di annullamento, gli altri partecipanti "
 "potrebbero non venire a conoscenza che il compito è stato eliminato."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4378,7 +4426,7 @@ msgstr ""
 "Inviando le informazioni di aggiornamento si consente agli altri "
 "partecipanti di mantenere i propri calendari aggiornati."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4386,7 +4434,7 @@ msgstr ""
 "Inviando le informazioni di aggiornamento si consente agli altri "
 "partecipanti di mantenere i propri elenchi di compiti aggiornati."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4394,7 +4442,7 @@ msgstr ""
 " È in corso lo scaricamento di alcuni allegati. Salvando ora l'appuntamento, "
 "si potrebbero perdere tali allegati."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4402,85 +4450,85 @@ msgstr ""
 " È in corso lo scaricamento di alcuni allegati. Salvando ora il compito, si "
 "potrebbero perdere tali allegati."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Alcune funzionalità potrebbero non operare propriamente col server "
 "attualmente in uso."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Il calendario di Evolution è terminato in modo inatteso."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Il memo di Evolution è terminato in modo inatteso."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "I compiti di Evolution sono terminati in modo inatteso."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
-msgstr "Il calendario non è contrassegnato per l'uso fuori rete"
+msgstr "Il calendario non è contrassegnato per l'uso fuori rete."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "L'elenco di memo non è contrassegnato per l'uso fuori rete"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "L'elenco di memo non è contrassegnato per l'uso fuori rete."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
-msgstr "L'elenco di compiti non è contrassegnato per l'uso fuori rete"
+msgstr "L'elenco di compiti non è contrassegnato per l'uso fuori rete."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Questo calendario verrà rimosso in modo definitivo."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Questo elenco di memo verrà rimosso in modo definitivo."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Questo elenco di compiti verrà rimosso in modo definitivo."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Salvare le modifiche apportate a questo appuntamento?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Salvare le modifiche apportate a questo memo?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Salvare le modifiche apportate a questo compito?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Inviare una notifica di annullamento per questo memo?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Inviare a tutti i partecipanti una notifica di annullamento?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Inviare un invito alla riunione a tutti i partecipanti?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Inviare questo compito a tutti i partecipanti?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Inviare ai partecipanti informazioni aggiornate sulla riunione?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "Inviare ai partecipanti informazioni aggiornate sul compito?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4490,112 +4538,112 @@ msgstr ""
 "potrebbero riscontrare dei problemi usando Evolution. Per risultati "
 "ottimali, sarebbe opportuno aggiornare il server ad una versione supportata."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Questo appuntamento è stato cambiato, ma non ancora salvato."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Questo compito è stato cambiato, ma non ancora salvato."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Questo memo è stato cambiato, ma non ancora salvato."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "I propri calendari non saranno disponibili fino al prossimo riavvio di "
 "Evolution."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "I propri memo non saranno disponibili fino al prossimo riavvio di Evolution."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "I propri compiti non saranno disponibili fino al prossimo riavvio di "
 "Evolution."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "Sca_rta modifiche"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "Salva _modifiche"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "In_via"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_Invia notifica"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Dividi eventi multi-giorno:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Impossibile avviare evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco dell'applicazione Calendar del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Impossibile leggere il blocco dell'applicazione Memo del Pilot "
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Impossibile scrivere il blocco dell'applicazione Memo del Pilot "
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Priorità predefinita:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco dell'applicazione ToDo del Pilot "
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Impossibile scrivere il blocco dell'applicazione ToDo del Pilot "
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendario e compiti"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendari"
 
@@ -4636,25 +4684,25 @@ 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-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "Memo"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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: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 "Compiti"
@@ -4672,25 +4720,26 @@ msgstr "Compi_ti"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizio notifica allarme del calendario di Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minuti"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ore"
 msgstr[1] "ore"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Tempo di inizio"
 
@@ -4701,9 +4750,9 @@ msgstr "Appuntamenti"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ubicazione:"
@@ -4713,17 +4762,15 @@ msgid "Snooze _time:"
 msgstr "Tempo _suoneria:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "_Modifica"
 
@@ -4735,32 +4782,32 @@ msgstr "_Suoneria"
 msgid "location of appointment"
 msgstr "ubicazione dell'appuntamento"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Nessun indice disponibile."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Nessuna informazione sull'ubicazione disponibile."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sono presenti %d allarmi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4772,7 +4819,7 @@ msgstr ""
 "di calendario con notifiche via email. Al posto di ciò,\n"
 "Evolution visualizzerà un normale promemoria in dialogo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4789,15 +4836,15 @@ msgstr ""
 "\n"
 "Eseguire veramente questo programma?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "In futuro non chiedere di nuovo su questo programma."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4805,13 +4852,13 @@ msgstr ""
 "Impossibile creare la fabbrica per il servizio di notifica allarme, forse è "
 "già in esecuzione..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "tempo non valido"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4819,8 +4866,8 @@ msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4830,8 +4877,8 @@ msgstr[1] "%d minuti"
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4934,9 +4981,10 @@ msgstr "Unità per nascondere compito"
 msgid "Hide task value"
 msgstr "Valore per nascondere compito"
 
+# GNOME-2-24
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
-msgstr "Posizione pannello orizzontale"
+msgstr "Posizione riquadro orizzontale"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
@@ -5086,12 +5134,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostra il campo di stato nell'editor di evento/compito/riunione"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Mostra riquadro \"Anteprima\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Mostra il riquadro \"Anteprima\"."
 
@@ -5143,7 +5191,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Tempo di esecuzione dell'ultimo allarme, espresso in time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Fuso orario"
 
@@ -5290,66 +5338,66 @@ msgstr "Minuto inizio giornata lavorativa"
 msgid "daylight savings time"
 msgstr "ora legale"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Indice contiene"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Descrizione contiene"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Categoria è"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Commento contiene"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Ubicazione contiene"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Compiti per prossimi 7 giorni"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Compiti attivi"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Compiti scaduti"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Compiti completati"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Compiti con allegati"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Appuntamenti attivi"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Appuntamenti per prossimi 7 giorni"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Stampa"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5359,16 +5407,17 @@ msgstr ""
 "all'intervallo di tempo selezionato. Scegliendo di continuare, non sarà più "
 "possibile ripristinare tali eventi."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Ripulisci eventi precedenti a"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "giorni"
 
@@ -5377,131 +5426,343 @@ msgstr "giorni"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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 "Sul Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Compleanni e anniversari"
 
 #. 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 "Meteo"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Nuovo calendario"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Proprietà"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Aggiornamento dei calendari fallito."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Impossibile aprire il calendario «%s» per creare eventi e appuntamenti"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non c'è alcun calendario disponibile per creare eventi e appuntamenti"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Selettore origine calendario"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: ../calendar/gui/calendar-component.c:1586
+# GNOME-2-24
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: ../calendar/gui/calendar-component.c:1594
+# GNOME-2-24
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "Riunion_e"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crea una nuova richiesta di riunione"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nuovo appuntamento giornaliero"
 
-#: ../calendar/gui/calendar-component.c:1602
+# GNOME-2-24
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "A_ppuntamento intera giornata"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento per l'intera giornata"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nuovo calendario"
 
-#: ../calendar/gui/calendar-component.c:1610
+# GNOME-2-24
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
-msgstr "Calen_dario"
+msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Vista giornaliera"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Vista settimana lavorativa"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Vista settimanale"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Vista mensile"
 
+# GNOME-2-24
+# to check
 #: ../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 "Qualsiasi 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
+msgid "Attachments"
+msgstr "Allegati"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Partecipante"
+
+# GNOME-2-24
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "Affari"
+
+# GNOME-2-24
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "Categoria"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classificazione"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr ""
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidenziale"
+
+#: ../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 "Descrizione"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Descrizione contiene"
 
-#: ../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:22
+msgid "Do Not Exist"
+msgstr "Non esiste"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Esiste"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr ""
+
+#: ../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
+msgid "Holiday"
+msgstr ""
+
+#: ../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
+msgid "Hot Contacts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr ""
+
+# GNOME-2-24
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Prossimi 7 giorni"
+
+#: ../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 "Organizzatore"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr ""
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privato"
+
+#: ../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
+msgid "Public"
+msgstr "Pubblico"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Ricorrenza"
+
+#: ../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:69 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stato"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr ""
+
+#: ../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:361
+msgid "Summary"
+msgstr "Indice"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Indice contiene"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr ""
+
+#: ../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
+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
+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
+msgid "does not contain"
+msgstr "non 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
+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
+msgid "is not"
+msgstr "non è"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Errore durante l'apertura del calendario"
@@ -5514,11 +5775,11 @@ msgstr "Metodo non supportato durante l'apertura del calendario"
 msgid "Permission denied to open the calendar"
 msgstr "Negato il permesso di aprire il calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Modifica allarme"
 
@@ -5551,17 +5812,17 @@ msgid "Mes_sage:"
 msgstr "Mes_saggio:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Emetti un suono"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Visualizza un'allerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Esegui programma"
 
@@ -5574,7 +5835,7 @@ msgid "Send To:"
 msgstr "Invia a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Invia una email"
 
@@ -5629,7 +5890,7 @@ msgstr "minuto/i"
 msgid "start of appointment"
 msgstr "inizio dell'appuntamento"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Azione/Attivatore"
 
@@ -5640,16 +5901,15 @@ msgstr "A_ggiungi"
 #: ../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 "Allarmi"
 
-#: ../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
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggerisce la visualizzazione automatica degli allegati"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Allega file"
 
@@ -5718,8 +5978,8 @@ msgid "Display"
 msgstr "Visualizzazione"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venerdì"
 
@@ -5734,8 +5994,8 @@ msgstr ""
 "Giorni"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Lunedì"
 
@@ -5758,7 +6018,7 @@ msgstr ""
 "Domenica"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
@@ -5768,8 +6028,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -5786,8 +6046,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrare i _numeri di settimana nell'esploratore della data"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -5806,13 +6066,13 @@ msgid "Template:"
 msgstr "Modello:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Giovedì"
 
 #: ../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 "_Fuso orario: "
 
@@ -5821,14 +6081,14 @@ msgid "Time format:"
 msgstr "Formato dell'ora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martedì"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mercoledì"
 
@@ -5911,312 +6171,472 @@ msgstr "_Mer"
 msgid "before every appointment"
 msgstr "prima di ogni appuntamento"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Co_pia il contenuto del calendario localmente per operazioni fuori rete"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Co_pia il contenuto dell'elenco di compiti per operazioni fuori rete"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Co_pia localmente il contenuto dell'elenco di memo per operazioni fuori rete"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "C_olore:"
+# GNOME-2-24
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
+msgstr "Colo_re:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Elenco compiti"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Elenco memo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Proprietà calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Nuovo calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Proprietà elenco compiti"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+# GNOME-2-24
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "Nuovo elenco di compiti"
+
+# GNOME-2-24
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "Proprietà elenco memo"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nuovo elenco memo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Questo evento è stato eliminato."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Questo compito è stato eliminato."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Questo memo è stato eliminato."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Sono stati apportati dei cambiamenti. Ignorare tali cambiamenti e "
 "chiudere l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non sono stati apportati cambiamenti. Chiudere l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Questo evento è stato cambiato."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Questo compito è stato cambiato."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Questo memo è stato cambiato."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s Sono stati apportati dei cambiamenti. Ignorare tali cambiamenti ed "
 "aggiornare l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Non sono stati apportati cambiamenti. Aggiornare l'editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Errore di validazione: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Completato "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Completato "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Scadenza "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Scadenza "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Messaggio allegato - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Messaggio allegato"
 msgstr[1] "%d messaggi allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Sposta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Annulla _trascinamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "allegato"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Impossibile aggiornare l'oggetto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Modifica appuntamento"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Riunione - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appuntamento - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Compito assegnato - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Compito - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Memo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+#, fuzzy
+msgid "No Summary"
+msgstr "Nessun indice"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Fare clic qui per chiudere la finestra corrente"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Copia il testo selezionato negli appunti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Taglia il testo selezionato negli appunti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Fare clic qui per mostrare l'aiuto disponibile"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Incolla il testo dagli appunti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Fare clic qui per salvare la finestra corrente"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Seleziona tutto il testo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "C_lassificazione"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_File"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "A_iuto"
+
+# GNOME-2-22
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+#, fuzzy
+msgid "_Insert"
+msgstr "Inse_risci"
+
+# GNOME-2-22
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "Op_zioni"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "_Visualizza"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Allegato..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Fare clic qui per allegare un file"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Categorie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Commuta la visualizzazione delle categorie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "_Fuso orario"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Commuta la visualizzazione del fuso orario"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Pu_bblico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Classifica come pubblico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Privato"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Classifica come privato"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Confidenziale"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Classifica come confidenziale"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "Campo Ru_olo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Commuta la visualizzazione del campo ruolo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Commuta la visualizzazione del campo RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "Campo _stato"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Commuta la visualizzazione del campo stato"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "Campo _tipo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Commuta la visualizzazione del campo tipo partecipante"
+
+# GNOME-2-24
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "Documenti _recenti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Allega"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> allegato"
 msgstr[1] "<b>%d</b> allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Nascondi _barra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Mostra _barra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../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
 #: ../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 "_Rimuovi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Aggiungi allegato..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Mostra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Premere la barra spaziatrice per commutare la barra degli allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Modifica appuntamento"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Riunione - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appuntamento - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Compito assegnato - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Compito - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Memo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Nessun indice"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "I cambiamenti apportati a questa voce possono essere scartati se arriva un "
 "aggiornamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Impossibile usare la versione corrente!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Impossibile aprire l'origine"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Impossibile aprire la destinazione"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "La destinazione è in sola lettura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Eli_minare questo elemento dalle caselle di posta di tutti i destinatari?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "L'evento non può essere eliminato a causa di un errore di CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Il compito non può essere eliminato a causa di un errore di CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Il memo non può essere eliminato a causa di un errore di CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "La voce non può essere eliminata a causa di un errore di CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "L'evento non può essere eliminato perché ne è stato negato il permesso"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Il compito non può essere eliminato perché ne è stato negato il permesso"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Il memo non può essere eliminato perché ne è stato negato il permesso"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "La voce non può essere eliminata perché ne è stato negato il permesso"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "L'evento non può essere eliminato a causa di un errore"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Il compito non può essere eliminato a causa di un errore"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Il memo non può essere eliminato a causa di un errore"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "La voce non può essere eliminata a causa di un errore"
 
@@ -6225,7 +6645,7 @@ msgid "Contacts..."
 msgstr "Contatti..."
 
 #: ../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 "Delega a:"
 
@@ -6233,136 +6653,183 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire delegato"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Allarmi"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "Fare clic qui per impostare o azzerare gli allarmi per questo evento"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Ricorrenza"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Rendi questo un evento ricorrente"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opzioni di invio"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Inserisce opzioni di invio avanzate"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "E_vento intera giornata"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Commuta la presenza di evento intera giornata"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Mostra ora come occ_upato"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Commuta la visualizzazione del tempo come occupato"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Libero/Occupato"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Interroga le informazioni libero/occupato per i partecipanti"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Appunta_mento"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Ricorrenza"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Questo evento presenta degli allarmi"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganizzatore:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegati"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Partecipa_nti"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Evento senza data di inizio"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Evento senza data di termine"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "La data di inizio è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "La data di termine è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "L'ora di inizio è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "L'ora di termine è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "L'organizzatore selezionato non ha più un account"
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "È richiesto un organizzatore."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "È richiesto almeno un partecipante."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "A_ggiungi "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossibile aprire il calendario «%s»."
 
 # GNOME-2-20
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Si sta agendo per conto di %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d giorno prima dell'appuntamento"
 msgstr[1] "%d giorni prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ora prima dell'appuntamento"
 msgstr[1] "%d ore prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto prima dell'appuntamento"
 msgstr[1] "%d minuti prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personalizza"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Nessuno"
 
@@ -6387,23 +6854,25 @@ msgid "Custom Alarm:"
 msgstr "Allarme personalizzato:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escrizione:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Descrizione evento"
 
-#: ../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 "I_ndice:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Allarme"
 
+#: ../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 "_Descrizione:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Ora:"
@@ -6434,28 +6903,24 @@ msgstr "C_ambia organizzatore"
 msgid "Co_ntacts..."
 msgstr "Co_ntatti..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organizzatore"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizzatore:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Impossibile aprire i memo in «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "A"
 
@@ -6468,64 +6933,60 @@ msgstr "Data di ini_zio:"
 msgid "T_o:"
 msgstr "_A:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descrizione:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Si sta modificando un evento ricorrente. Cosa si vuole modificare?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Si sta delegando un evento ricorrente. Cosa si vuole delegare?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Si sta modificando un compito ricorrente. Cosa si vuole modificare?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Si sta modificando un memo ricorrente. Cosa si vuole modificare?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Solo questa istanza"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Questa istanza e le precedenti"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Questa istanza e quelle future"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Tutte le istanze"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Questo appuntamento contiene ricorrenze che Evolution non può modificare."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "La data di ricorrenza è errata"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "il"
 
@@ -6533,7 +6994,7 @@ msgstr "il"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primo"
 
@@ -6542,7 +7003,7 @@ msgstr "primo"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "secondo"
 
@@ -6550,7 +7011,7 @@ msgstr "secondo"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "terzo"
 
@@ -6558,7 +7019,7 @@ msgstr "terzo"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "quarto"
 
@@ -6566,13 +7027,13 @@ msgstr "quarto"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "ultimo"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Altra data"
 
@@ -6580,7 +7041,7 @@ msgstr "Altra 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1 - 10"
 
@@ -6588,7 +7049,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11 - 20"
 
@@ -6596,45 +7057,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "giorno"
 
 #. 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "il"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ricorrenze"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Aggiungi eccezione"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Impossibile ottenere una seleziona da modificare."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modifica eccezione"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Impossibile ottenere una selezione da eliminare."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Data/Ora"
 
@@ -6685,13 +7146,13 @@ msgstr "settimana/e"
 msgid "year(s)"
 msgstr "anno/i"
 
-#: ../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 "La data di completamento è errata"
 
 # GNOME-2-22
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Pagina web:"
 
@@ -6706,51 +7167,55 @@ msgstr "<span weight=\"bold\">Stato</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:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Completato"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "In corso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "Bassa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "Normale"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non cominciato"
 
@@ -6763,7 +7228,7 @@ msgid "Stat_us:"
 msgstr "Sta_to:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Non definita"
 
@@ -6772,7 +7237,7 @@ msgid "_Date completed:"
 msgstr "Completato in _data:"
 
 #: ../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 "_Priorità:"
 
@@ -6781,26 +7246,39 @@ msgstr "_Priorità:"
 msgid "_Web Page:"
 msgstr "Pagina _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Dettagli di stato"
+
+# GNOME-2-24
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "Fare clic per cambiare o visualizzare i dettagli di stato del compito"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "_Opzioni di invio"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "Compi_to"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Dettagli del compito"
 
 # GNOME-2-22
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zzatore:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "La data di scadenza è errata"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossibile aprire i compiti in «%s»."
@@ -6814,19 +7292,16 @@ msgid "Categor_ies..."
 msgstr "Ca_tegorie..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scrizione:"
+#, fuzzy
+msgid "D_ue date:"
+msgstr "Data di sca_denza:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fuso orario:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "Data di sca_denza:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6834,142 +7309,126 @@ msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d settimana"
 msgstr[1] "%d settimane"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Azione sconosciuta da portare a termine"
 
 #. 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:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prima dell'inizio dell'appuntamento"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s dopo l'inizio dell'appuntamento"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s all'inizio dell'appuntamento"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prima della fine dell'appuntamento"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s dopo la fine dell'appuntamento"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s alla fine dell'appuntamento"
 
 #. 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:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s alle %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:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s per un'attivazione di tipo sconosciuto"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Fare clic qui per aprire %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: ../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
+#: ../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 di inizio:"
 
-#: ../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-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 "Descrizione:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "Pagina Web:"
 
-#: ../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 "Indice:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Data di scadenza:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Priorità:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Pubblico"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privato"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidenziale"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data di termine"
@@ -6979,21 +7438,14 @@ msgstr "Data di termine"
 msgid "Start Date"
 msgstr "Data di inizio"
 
-#: ../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 "Indice"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libero"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Occupato"
 
@@ -7007,200 +7459,229 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../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-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
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Ricorrente"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Selezionare una cartella per salvare gli allegati selezionati..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "immagine_senza_nome.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Sa_lva come..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Imposta come _sfondo"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Salva selezionati"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Nessun indice"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizzatore: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizzatore: %s"
+
+# GNOME-2-24
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Inizio: "
+
+# GNOME-2-24
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Scadenza: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../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:277
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Nuovo _compito"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Apri pagina _web"
 
 # GNOME-2-22
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "S_tampa..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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 "_Taglia"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../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 "_Incolla"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assegna compito"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "I_noltra come iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "Contrassegna come co_mpletato"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Contrassegna compiti selezionati come co_mpletati"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "Contrassegna come inco_mpleto"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Contrassegna compiti selezionati come inco_mpleti"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "Eli_mina compiti selezionati"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Fare clic per aggiungere un compito"
@@ -7223,7 +7704,8 @@ msgid "Due date"
 msgstr "Data scadenza"
 
 #: ../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:372
 msgid "Priority"
 msgstr "Priorità"
 
@@ -7231,128 +7713,109 @@ msgstr "Priorità"
 msgid "Start date"
 msgstr "Data inizio"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stato"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Spostamento voci"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Copia voci"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Nuovo _appuntamento..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Nuovo _evento intera giornata"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nuova _riunione"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "Vista _corrente"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Seleziona _oggi"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Seleziona data..."
 
 # GNOME-2-22
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Sta_mpa..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "_Copia nel calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "_Sposta nel calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delega riunione..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Pianifica riunione..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Inoltra come iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Rispondi a _tutti"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Rendi questa ricorrenza _spostabile"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Elimina _questa ricorrenza"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Elimina _tutte ricorrenze"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizzatore: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizzatore: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Ubicazione: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data e ora: %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, %k.%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"
@@ -7365,7 +7828,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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisioni da %02i minuti"
@@ -7376,46 +7839,34 @@ msgstr "divisioni da %02i minuti"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 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:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "a.m."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "p.m."
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sì (ricorrenza complessa)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Ogni giorno"
 msgstr[1] "Ogni %d giorni"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7423,9 +7874,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Ogni settimana"
 msgstr[1] "Ogni %d settimane"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7433,51 +7882,35 @@ msgstr[0] "Ogni settimana il "
 msgstr[1] "Ogni %d settimane il "
 
 #. 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 " e "
 
-#. 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 "Il giorno %s di "
 
-#. 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 "Il %s %s di "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ogni mese"
 msgstr[1] "ogni %d mesi"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Ogni anno"
 msgstr[1] "Ogni %d anni"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7485,47 +7918,47 @@ msgstr[0] " un totale di %d volta"
 msgstr[1] " un totale di %d volte"
 
 #. 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 ", che finisce di "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Comincia"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Scadenza"
 
-#: ../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 "Informazioni iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Errore 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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 sconosciuta"
 
 #. 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."
@@ -7533,28 +7966,28 @@ msgstr ""
 "<br> Controllate informazioni che seguono, quindi selezionare un'azione dal "
 "menù sottostante."
 
-#: ../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:728
+#: ../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:2034
 msgid "Accepted"
 msgstr "Accettato"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
 #: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Accettato con tentativo"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
+#: ../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:2040
 msgid "Declined"
 msgstr "Declinato"
 
-#: ../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"
@@ -7562,268 +7995,268 @@ msgstr ""
 "La riunione è stata annullata, tuttavia potrebbe essere presente nei propri "
 "calendari"
 
-#: ../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 ""
 "Il compito è stato annullato, tuttavia potrebbe essere presente nei propri "
 "elenchi di compiti"
 
-#: ../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> ha pubblicato informazioni su una riunione."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informazioni sulla riunione"
 
-#: ../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> richiede la presenza di %s ad una riunione."
 
-#: ../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> richiede la tua presenza ad una riunione."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposta di riunione"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> desidera essere aggiunto ad una riunione esistente."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Aggiornamento riunione"
 
-#: ../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> desidera ricevere le ultime informazioni sulla riunione."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Richiesta di aggiornamento sulla riunione"
 
-#: ../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> ha risposto ad una richiesta di riunione."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Risposta ad una riunione"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ha annullato una riunione."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Annullamento riunione"
 
-#: ../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> ha inviato un messaggio incomprensibile."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Messaggio riunione non valido"
 
-#: ../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> ha pubblicato informazioni sui compiti."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informazioni sui compiti"
 
-#: ../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> richiede che %s esegua un compito."
 
-#: ../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> richiede che tu esegua un compito."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Proposta di compito"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> desidera essere aggiunto ad un compito esistente."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Aggiornamento compiti"
 
-#: ../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> desidera ricevere le ultime informazioni sul compito."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Richiesta di aggiornamento compito"
 
-#: ../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> ha risposto all'assegnamento di un compito."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Risposta al compito"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ha annullato un compito."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Annullamento compito"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Messaggio di compito errato"
 
-#: ../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> ha pubblicato informazioni libero/occupato."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Informazioni libero/occupato"
 
-#: ../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> richiede le tue informazioni libero/occupato."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Richiesta libero/occupato"
 
-#: ../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> ha risposto a una richiesta libero/occupato."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Risposta libero/occupato"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio libero/occupato errato"
 
-#: ../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 "Il messaggio non sembra ben impostato"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Il messaggio contiene solo richieste non supportate."
 
-#: ../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 "L'allegato non contiene un messaggio di calendario valido"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "L'allegato non ha alcun elemento di calendario visualizzabile"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'oggetto non è valido e non può essere aggiornato\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Questa risposta non proviene da un partecipante. Aggiungerlo come "
 "partecipante?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante a causa di uno stato non "
 "valido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante poiché la voce non esiste "
 "più"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Voce inviata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "La voce non può essere spedita!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Scegliere un'azione:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Aggiornare"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Accettare"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Accettare con tentativo"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Declinare"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Invia informazioni libero/occupato"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Aggiorna stato risposta"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Invia informazioni recenti"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annulla"
@@ -7852,112 +8285,112 @@ msgstr "Caricamento del calendario..."
 msgid "Server Message:"
 msgstr "Messaggio del server:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Moderatori"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Partecipanti richiesti"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Partecipanti opzionali"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Risorse"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Partecipanti"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Individuale"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Risorse"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Stanza"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Moderatore"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Partecipante richiesto"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Partecipante opzionale"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Non partecipante"
 
-#: ../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 "Richiede azione"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "Tentativo"
 
-#: ../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:737
+#: ../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
 msgid "Delegated"
 msgstr "Delegato"
 
 #. 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 "Partecipante                      "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../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 "In corso"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7965,87 +8398,83 @@ msgstr "%A %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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"
 
 # GNOME-2-22
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Fuori sede"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Partecipa_nti..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_pzioni"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Mostra solo le _ore lavorative"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Mostra _zoom out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "A_ggiorna libero/occupato"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
 # FIXME!!!
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "Tutto il person_ale e le risorse"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Tutto il _personale e una risorsa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Personale _richiesto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Personale richiesto e _una risorsa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Ora di _termine:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Partecipante"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Fare clic qui per aggiungere un partecipante"
@@ -8078,8 +8507,8 @@ msgstr "Eli_mina memo selezionati"
 msgid "Click to add a memo"
 msgstr "Fare clic per aggiungere un memo"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -8088,85 +8517,80 @@ msgstr ""
 "Errore su %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Caricamento memo"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Apertura memo presso %s"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Eliminazione oggetti selezionati..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Caricamento compiti"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura compiti presso %s"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Completamento compiti..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Pulizia"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Selezione fuso orario"
 
 #. 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:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "Aggiornamento interrogazione"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Vista personali_zzata"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Salva vista personalizzata"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Definisci viste..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Caricamento appuntamento presso %s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Caricamento compiti presso %s"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Caricamento memo presso %s"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Pulizia"
 
@@ -8226,57 +8650,57 @@ msgstr "Settembre"
 msgid "_Select Today"
 msgstr "_Seleziona oggi"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "È necessario impostare un organizzatore."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "È richiesto almeno un partecipante"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Informazioni sull'evento"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informazioni sul compito"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Informazioni sul memo"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Informazioni libero/occupato"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informazioni di calendario"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contro-proposta"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informazioni libero/occupato (da %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "È necessario essere un partecipante all'evento."
 
@@ -8315,47 +8739,58 @@ msgstr "Non c'è alcun calendario disponibile per creare dei memo"
 msgid "Memo Source Selector"
 msgstr "Selettore origine memo"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nuovo memo"
 
-#: ../calendar/gui/memos-component.c:1260
+# GNOME-2-24
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crea un nuovo memo"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nuovo memo condiviso"
 
-#: ../calendar/gui/memos-component.c:1268
+# GNOME-2-24
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Memo condi_viso"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crea un nuovo memo condiviso"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nuovo elenco di memo"
 
-#: ../calendar/gui/memos-component.c:1276
+# GNOME-2-24
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "El_enco di memo"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crea un nuovo elenco di memo"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Stampa memo"
 
-#: ../calendar/gui/migration.c:164
+# GNOME-2-24
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Prossimi 7 giorni"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8367,7 +8802,7 @@ msgstr ""
 "\n"
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
-#: ../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"
@@ -8380,27 +8815,27 @@ msgstr ""
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Impossibile migrare le vecchie impostazioni da evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Impossibile migrare il calendario «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossibile migrare i compiti «%s»."
 
 #: ../calendar/gui/migration.c:1227
-#: ../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
+#: ../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 "Note"
 
@@ -8557,58 +8992,53 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Compito"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Indice: %s"
 
 # GNOME-2-22
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Partecipanti: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorità: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentuale completata: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorie: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contatti: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Appuntamenti imminenti"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nuovo elenco di compiti"
@@ -8637,39 +9067,49 @@ msgstr "Non c'è alcun calendario disponibile per creare dei compiti"
 msgid "Task Source Selector"
 msgstr "Selettore origine compiti"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nuovo compito"
 
-#: ../calendar/gui/tasks-component.c:1323
+# GNOME-2-24
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "Compi_to"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crea un nuovo compito"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nuovo compito assegnato"
 
-#: ../calendar/gui/tasks-component.c:1330
+# GNOME-2-24
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Compito assegna_to"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crea un nuovo compito assegnato"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nuovo elenco di compiti"
 
-#: ../calendar/gui/tasks-component.c:1338
+# GNOME-2-24
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "E_lenco di compiti"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crea un nuovo elenco di compiti"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8682,1633 +9122,1848 @@ msgstr ""
 "\n"
 "Cancellare comunque questi compiti?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Non chiedere più in futuro."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Stampa compiti"
 
-#: ../calendar/importers/icalendar-importer.c:79
+# GNOME-2-24
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% completato"
+
+# GNOME-2-24
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Annullato"
+
+# GNOME-2-24
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "In corso"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "è maggiore di"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "è minore di"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Appuntamenti e riunioni"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Apertura calendario"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "File iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Importatore iCalendar di Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Promemoria!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "File vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Importatore vCalendar di Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Eventi del calendario"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importatore intelligente del calendario di 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 "Africa/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Africa/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Africa/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Africa/Algiers"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Africa/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Africa/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/Cairo"
 
-#: ../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 "Africa/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Africa/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Africa/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Africa/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Africa/Tunisi"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "America/Bogotà"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "America/Guadalupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "America/Martinica"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "America/Porto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antartide/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antartide/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antartide/DumontDurville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antartide/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antartide/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antartide/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antartide/Polo_Sud"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antartide/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antartide/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Artide/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Gerusalemme"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarcanda"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantico/Azzorre"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantico/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantico/Canarie"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantico/Capo_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantico/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantico/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantico/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantico/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantico/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantico/Sant'Elena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantico/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Australia"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atene"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europe/Berlino"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Brussels"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublino"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibilterra"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisbona"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londra"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Lussemburgo"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Mosca"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Parigi"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stoccolma"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Vienna"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsavia"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagabria"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zurigo"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indiano/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indiano/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indiano/Natale"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indiano/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indiano/Comorre"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indiano/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indiano/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indiano/Maldive"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indiano/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indiano/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indiano/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacifico/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacifico/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacifico/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacifico/Pasqua"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacifico/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacifico/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacifico/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacifico/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacifico/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacifico/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacifico/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifico/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacifico/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacifico/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacifico/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacifico/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacifico/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacifico/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacifico/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacifico/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacifico/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacifico/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacifico/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacifico/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacifico/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifico/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacifico/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacifico/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacifico/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifico/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacifico/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacifico/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacifico/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacifico/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacifico/Tongatap"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacifico/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacifico/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacifico/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacifico/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Fare clic qui per la rubrica"
+# GNOME-2-24
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Impossibile aprire il file di salvataggio automatico"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Destinazione di pubblicazione"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Impossibile recuperare il messaggio dall'editor"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Scegliere le cartelle su cui pubblicare il messaggio."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Inserire allegato"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Fare clic per selezionare le cartelle su cui pubblicare"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "A_llega"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gla:"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Messaggio senza titolo"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "_Da:"
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "Allega un file"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Rispondi-a:"
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Chiudi"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_A:"
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "Chiude il file corrente"
+
+#: ../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 "S_tampa..."
+
+#: ../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 "Antepri_ma di stampa"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "Salva il file corrente"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "Sa_lva come..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "Salva il file corrente con un nome diverso"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "Salva _bozza"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "Salva come bozza"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "In_via"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "Invia questo messaggio"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "Inserisce le opzioni di invio"
+
+# GNOME-2-24
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "_Nuovo messaggio"
+
+# GNOME-2-24
+# non letterale....
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Apre una finestra per nuovo messaggio"
+
+# GNOME-2-24
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "Codifica caratt_eri"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "_Sicurezza"
+
+# GNOME-2-24
+# reso verbale come altre voci di menù
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "_Cifra con PGP"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "Cifra questo messaggio con PGP"
+
+# GNOME-2-24
+# reso verbale come altre voci di menù
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "_Firma con PGP"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "Firma questo messaggio con la propria chiave PGP"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "_Priorità messaggio"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "Imposta ad alta la priorità del messaggio"
+
+#: ../composer/e-composer-actions.c:584
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "Richi_esta ricevute di lettura"
+
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr ""
+"Ottiene una notifica di consegna quando il proprio messaggio viene letto"
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr "Cifratura _S/MIME"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+"Cifra questo messaggio con il proprio certificato di crittazione S/MIME"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "Firma S/_MIME"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Firma questo messaggio con il proprio certificato di firma S/MIME"
+
+# GNOME-2-22
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "Campo CC_N"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Commuta la visualizzazione del campo «CCN:»"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "Campo _CC"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "Commuta la visualizzazione del campo «CC:»"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "Campo _Da"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Commuta la visualizzazione del selettore «Da:»"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "Campo _Pubblica-su"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Commuta la visualizzazione del campo «Pubblica-su»"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "Campo _Rispondi-a"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Commuta la visualizzazione del campo «Rispondi-a:»"
+
+# GNOME-2-24
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "Campo _Oggetto"
+
+# GNOME-2-24
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Commuta la visualizzazione del campo «Oggetto:»"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "Campo _A"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "Commuta la visualizzazione del campo «A:»"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_CC:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Indicare gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_CCN:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../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"
@@ -10316,31 +10971,67 @@ msgstr ""
 "Indicare gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_Da:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Rispondi-a:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_A:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_CC:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_CCN:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Pubblica su:"
 
 # GNOME-2-22
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "O_ggetto:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "A_llega"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gla:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Inserire allegato"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "Fare clic qui per la rubrica"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Destinazione di pubblicazione"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Scegliere le cartelle su cui pubblicare il messaggio."
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "Fare clic per selezionare le cartelle su cui pubblicare"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "Mostra _barra allegati"
+
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossibile firmare i messaggi in uscita: nessun set di certificati di firma "
 "è impostato per questo account"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10348,42 +11039,23 @@ msgstr ""
 "Impossibile cifrare il messaggio in uscita: nessun set di certificati di "
 "cifratura  è impostato per questo account"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Allegato"
+msgstr[1] "Allegati"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Nascondi _barra allegati"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "Mostra _barra allegati"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Motivo sconosciuto"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Impossibile aprire il file"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Impossibile recuperare il messaggio dall'editor"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Messaggio senza titolo"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Apri file"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Composizione messaggio"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10416,8 +11088,7 @@ msgstr ""
 "Potrebbe essere necessario selezionare differenti opzioni di posta. "
 "Motivazione: {0}. "
 
-#: ../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 "Motivazione: {1}."
 
@@ -10534,24 +11205,29 @@ msgstr "Impossibile allegare il file «{0}» a questo messaggio."
 msgid "You need to configure an account before you can compose mail."
 msgstr "È necessario configurare un'account prima di poter comporre una email."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continua scrittura"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Non recuperare"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Recupera"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Salva messaggio"
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "Salva bozza"
 
 # GNOME-2-22
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution - Posta e calendario"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite groupware"
 
@@ -10570,50 +11246,81 @@ msgstr "tessera indirizzo"
 msgid "calendar information"
 msgstr "informazioni calendario"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Errore di Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Avvertimento di Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Informazione di Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Domanda di Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Errore interno, richiesto errore sconosciuto «%s»"
 
-#: ../e-util/e-print.c:138
+# GNOME-2-24
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Componente"
+
+# GNOME-2-24
+# to check
+#: ../e-util/e-logger.c:157
+#, fuzzy
+msgid "Name of the component being logged"
+msgstr "Nome del componente che si sta per registrare"
+
+#: ../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
+msgid "Enabled"
+msgstr "Abilitato"
+
+# GNOME-2-24
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Indica se il plugin è abilitato"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Si è verificato un errore durante la stampa"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "Il sistema di stampa ha segnalato i seguenti dettagli relativi all'errore:"
 
-#: ../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 ""
 "Il sistema di stampa non ha segnalato alcun dettaglio aggiuntivo relativo "
 "all'errore."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#, fuzzy
+msgid "Because \"{1}\"."
+msgstr "Motivazione: {1}."
+
+# GNOME-2-24
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "Impossibile aprire il file «{0}»."
 
+# GNOME-2-24
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "Impossibile salvare il file «{0}»."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10621,7 +11328,8 @@ msgid "Do you wish to overwrite it?"
 msgstr "Sovrascriverlo?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+#, fuzzy
+msgid "File exists \"{0}\"."
 msgstr "Il file esiste «{0}»."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10632,59 +11340,77 @@ msgstr "Sovrascrivere il file?"
 msgid "_Overwrite"
 msgstr "S_ovrascrivi"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Impossibile aggiornare i permessi della cartella."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportante"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Lavoro"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Personale"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Da fare"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "Più _tardi"
 
 # GNOME-2-22
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Nome etichetta:"
 
 # GNOME-2-22
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Modifica etichetta"
 
 # GNOME-2-22
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Aggiungi etichetta"
 
 # GNOME-2-22
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Il nome dell'etichetta non può essere vuoto."
 
-# GNOME-2-22
+# GNOME-2-24
 # TAG: appare solo in due messaggi (per ora)
 # usato *codice* per evitare confusione con label
 # (in alternativa potrebbe essere *nome convezionale*)
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
-"Esiste già un'etichetta con lo stesso codice. Rinominare la propria "
-"etichetta."
+"Esiste già sul server un'etichetta con lo stesso codice. Rinominare la "
+"propria etichetta."
+
+# GNOME-2-24
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "Errore di GConf: %s"
+
+# GNOME-2-24
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Tutti gli errori successivi saranno mostati solo su terminale."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10802,67 +11528,67 @@ msgstr "%d/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Scegliere una data da confrontare"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
 # GNOME-2-22
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nome della _regola:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Trova gli elementi che soddisfano i seguenti criteri"
 
 # GNOME-2-22
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "A_ggiungi criteri filtro"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Se tutti i criteri sono soddisfatti"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Se qualche criterio è soddisfatto"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Trova elementi:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Tutti i relativi"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Risposte"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Risposte e genitori"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Nessuna risposta o genitore"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_ncludere discussioni"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "In entrata"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "In uscita"
 
@@ -10886,7 +11612,7 @@ msgstr "Manca la data."
 msgid "Missing file name."
 msgstr "Manca il nome file."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Manca il nome."
 
@@ -10962,7 +11688,7 @@ msgstr "nel futuro"
 msgid "months"
 msgstr "mesi"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "secondi"
 
@@ -10974,9 +11700,10 @@ msgstr "l'ora corrente"
 msgid "the time you specify"
 msgstr "la data specificata"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "settimane"
 
@@ -10992,7 +11719,7 @@ msgstr "Aggiungi regola"
 msgid "Edit Rule"
 msgstr "Modifica regola"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nome della regola"
 
@@ -11015,58 +11742,73 @@ msgstr ""
 msgid "Configure your email accounts here"
 msgstr "Configura gli account di posta elettronica"
 
+# GNOME-2-24
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Configura le proprie impostazioni delle connessione di rete"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Posta di 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 "Controllo di configurazione degli account di posta di Evolution."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente della posta di Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Compositore della posta di 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 "Controllo di configurazione del compositore di 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 "Controllo delle preferenze della posta di Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+# GNOME-2-24
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Controllo di configurazione della rete di 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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Posta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "Preferenze di posta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+# GNOME-2-24
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Preferenze di rete"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Posta"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s accordo di licenza"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11079,119 +11821,113 @@ msgstr ""
 "per %s mostrata sotto\n"
 "e spuntare il riquadro per l'accettazione\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Scelta cartella"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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
 msgid "Autogenerated"
 msgstr "Generata autom."
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Domandare per ciascun messaggio"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identità"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Ricezione email"
 
 # GNOME-2-22
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "_Controllare nuovi messaggi ogni"
 
 # GNOME-2-22
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_ti"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Invio email"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predefiniti"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sicurezza"
 
 # GNOME-2-22
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Opzioni ricezione"
 
 # GNOME-2-22
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Controllo nuovi messaggi"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor account"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Assistente agli account di Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Predefinito]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Abilitato"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Nome dell'account"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "Senza nome"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Lingue"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Aggiungi script di sigla"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Sigla/e"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11199,13 +11935,14 @@ msgstr ""
 "Il giorno ${AbbrevWeekdayName}, ${Day}/${Month}/${Year} alle ${24Hour}."
 "${Minute} ${TimeZone}, ${Sender} ha scritto:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "------- Messaggio originale -------"
 
-#: ../mail/em-filter-editor.c:155
+# GNOME-2-24
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
-msgstr "_Regole dei filtri"
+msgstr "R_egole dei filtri"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11220,10 +11957,6 @@ msgstr "Assegna colore"
 msgid "Assign Score"
 msgstr "Assegna punteggio"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Allegati"
-
 # GNOME-2-22
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
@@ -11248,10 +11981,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Completato"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contiene"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copia nella cartella"
@@ -11265,7 +11994,7 @@ msgid "Date sent"
 msgstr "Data invio"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11276,10 +12005,6 @@ msgstr "Elimina"
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "non contiene"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "non termina per"
@@ -11300,10 +12025,6 @@ msgstr "non suona come"
 msgid "does not start with"
 msgstr "non comincia con"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Non esiste"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Bozza"
@@ -11312,10 +12033,6 @@ msgstr "Bozza"
 msgid "ends with"
 msgstr "termina per"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Esiste"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "esiste"
@@ -11328,14 +12045,10 @@ msgstr "Espressione"
 msgid "Follow Up"
 msgstr "Da completare"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "è"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "è dopo di"
@@ -11348,18 +12061,6 @@ msgstr "è prima di"
 msgid "is Flagged"
 msgstr "è contrassegnato"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "è maggiore di"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "è minore di"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "non è"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "non è contrassegnato"
@@ -11374,7 +12075,7 @@ msgstr "non è impostato"
 msgid "is set"
 msgstr "è impostato"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Indesiderata"
@@ -11383,7 +12084,7 @@ msgstr "Indesiderata"
 msgid "Junk Test"
 msgstr "Test indesiderata"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etichetta"
 
@@ -11423,154 +12124,152 @@ msgstr "In pipe al programma"
 msgid "Play Sound"
 msgstr "Riproduci suono"
 
-#. 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:82
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Letto"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Corrispondenza regexp"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "In risposta a"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "ritorna"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "ritorna maggiore di"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "ritorna minore di"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Esegui programma"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Punteggio"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Mittente"
 
 # GNOME-2-22
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:62
 msgid "Set Label"
 msgstr "Imposta etichetta"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Status"
 msgstr "Imposta stato"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:64
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:65
 msgid "sounds like"
 msgstr "suona come"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:66
 msgid "Source Account"
 msgstr "Account origine"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:67
 msgid "Specific header"
 msgstr "Intestazione specifica"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:68
 msgid "starts with"
 msgstr "comincia con"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:70
 msgid "Stop Processing"
 msgstr "Ferma l'elaborazione"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:71 ../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
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:72
 msgid "Unset Status"
 msgstr "Azzera stato"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Quindi"
 
 # GNOME-2-22
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Aggiungi a_zione"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "_Crea cartella di ricerca da ricerca..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Tutti i messaggi"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Messaggi non letti"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Nessuna etichetta"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Messaggi letti"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Messaggi recenti"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Messaggio ultimi 5 giorni"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Messaggi con allegati"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Messaggi importanti"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Messaggi non indesiderati"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Ricerca account"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Ricerca in ogni account"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messaggi non letti:"
@@ -11578,32 +12277,54 @@ msgstr[1] "Messaggi non letti:"
 
 #. 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
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Messaggi in totale:"
 msgstr[1] "Messaggi in totale:"
 
-#: ../mail/em-folder-properties.c:323
+# GNOME-2-24
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Utilizzo della quota (%s):"
+
+# GNOME-2-24
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr "Utilizzo della quota"
+
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "In arrivo"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Proprietà cartella"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<fare clic qui per selezionare una cartella>"
 
 # GNOME-2-22
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nome della cartella:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Cartelle di ricerca"
 
@@ -11613,27 +12334,19 @@ msgstr "Cartelle di ricerca"
 msgid "UNMATCHED"
 msgstr "NESSUNA CORRISPONDENZA"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Bozze"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "In arrivo"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "In uscita"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Inviata"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
@@ -11652,78 +12365,71 @@ msgstr "Caricamento in corso..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
+#: ../mail/em-folder-tree.c:380
+#, fuzzy, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (...)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Albero cartelle di posta"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Spostamento cartella %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copia cartella %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Spostamento messaggi nella cartella %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copia messaggi nella cartella %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Impossibile scaricare i messaggi nell'archivio di primo livello"
 
-#: ../mail/em-folder-tree.c:994 ../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 "_Copia nella cartella"
 
-#: ../mail/em-folder-tree.c:995 ../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 "_Sposta nella cartella"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in «%s» in corso"
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Visualizza"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Apri in nuova _finestra"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Nuova cartella..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Sposta..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "A_ggiorna"
 
@@ -11731,259 +12437,256 @@ msgstr "A_ggiorna"
 #
 # Note: aggiunto posta
 #       svuota nel senso elimina o invia???????????
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "S_vuota posta in uscita"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "S_vuota cestino"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copia di «%s» su «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../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:83
 msgid "Select folder"
 msgstr "Scelta cartella"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opia"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creazione cartella «%s»"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Creazione cartella"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Specificare dove creare la cartella:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Eliminazione email fallita"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Permessi non sufficienti per eliminare questa email."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Rispondi al mittente"
 
-#: ../mail/em-folder-view.c:1337 ../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 "_Inoltra"
 
 #. 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:1341 ../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 "_Modifica come nuovo messaggio..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "S_tampa..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Contrassegna come _letto"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Contrassegna come non _letto"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Contrassegna come _importante"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Contrassegna come non _importante"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Contrassegna come in_desiderata"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Contrassegna come atten_dibile"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Contrassegna per com_pletamento..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Etichetta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Nessuno"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nuova etichetta"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "_Contrassegna come completato"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Pu_lisci contrassegno"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
 # GNOME-2-22
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Cartella di ricerca basata su _oggetto"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Cartella di ricerca basata su _mittente"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Cartella di ricerca basata su _destinatari"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Cartella di ricerca basata su mailing _list"
 
 # GNOME-2-22
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtro basato su o_ggetto"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtro basato su mitte_nte"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtro basato su d_estinatari"
 
 # GNOME-2-22
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtro basato su mailing li_st"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "Predefinito"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Impossibile recuperare il messaggio"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Ricezione messaggio..."
 
 # GNOME-2-20
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "C_hiama..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Crea car_tella di ricerca"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Da questo indirizzo"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_A questo indirizzo"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Fare clic per spedire %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Fare clic per chiamare %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Fare clic per nascondere/mostrare gli indirizzi"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Corrisponde: %d"
 
 # GNOME-2-22
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Tr_ova:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "Pr_ecedente"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "S_uccessivo"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "Distingui M_aiuscole/minuscole"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Non firmato"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11991,11 +12694,11 @@ msgstr ""
 "Questo messaggio non è firmato. Non c'è garanzia che il messaggio sia "
 "autentico."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Firma valida"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12003,11 +12706,11 @@ msgstr ""
 "Questo messaggio è firmato ed è valido. È molto probabile che il messaggio "
 "sia autentico."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Firma non valida"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12015,11 +12718,11 @@ msgstr ""
 "La firma di questo messaggio non può essere verificata. Può essere stata "
 "alterata durante la trasmissione."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma valida, ma non è possibile verificare il mittente"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12027,11 +12730,11 @@ msgstr ""
 "Questo messaggio è firmato con una firma valida, ma non è possibile "
 "verificare chi ha spedito il messaggio."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La firma esiste, ma è necessaria la chiave pubblica"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12039,11 +12742,11 @@ msgstr ""
 "Questo messaggio è firmato con una firma, ma non c'è alcuna chiave pubblica "
 "corrispondente."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Non cifrato"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12051,11 +12754,11 @@ msgstr ""
 "Questo messaggio non è cifrato. Il suo contenuto può essere visualizzato "
 "durante la trasmissione attraverso Internet."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Cifrato, crittografia debole"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12065,11 +12768,11 @@ msgstr ""
 "difficile, ma non impossibile, per un estraneo visualizzarne il contenuto in "
 "un tempo ragionevolmente breve."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Cifrato"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12077,11 +12780,11 @@ msgstr ""
 "Questo messaggio è cifrato. È difficile per un estraneo visualizzarne il "
 "contenuto."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Cifrato, crittografia forte"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12091,96 +12794,92 @@ msgstr ""
 "essere molto difficile per un estraneo visualizzarne il contenuto in un "
 "tempo ragionevole."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visualizza certificato"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Scaduto:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b alle %k.%M"
 
 # GNOME-2-22
 # INLINE
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Visualizza incorporato"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "Adatta alla _larghezza"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Mostra dimensioni _originali"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Allegato"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Salva allegato come"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Selezionare la cartella per salvare tutti gli allegati"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Salva selezionati..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d alle_gato"
 msgstr[1] "%d alle_gati"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "S_alva"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "S_alva tutti"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Nessun allegato"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "_Visualizza non formattato"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "_Nascondi non formattato"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "A_pri con"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2473
+#, fuzzy
 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 ""
 "Questa email è troppo grande per essere gestita, non è possibile "
@@ -12192,202 +12891,200 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Ricezione di «%s»"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Parte esterna al corpo del messaggio sconosciuta."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Parte esterna al corpo del messaggio malformata."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore a file locale (%s) valido al sito \"%s\""
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a file locale (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo «%s»)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formattazione messaggio"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Formattazione del messaggio..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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 "CCN"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Gestore di posta"
 
 # GNOME-2-20
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr "(%a, %H.%M %Z)"
 
 # GNOME-2-20
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr "(%H.%M %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Data"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Newsgroup"
-
 # GNOME-2-20
 #. 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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Questo messaggio è stato inviato da <b>%s</b> per conto di <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "Da"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Rispondi-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
+msgid "Date"
+msgstr "Data"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Newsgroup"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossibile interpretare il messaggio S/MIME: errore sconosciuto"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo di crittografia non supportata per multipart/encrypted"
 
 # GNOME-2-20
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossibile interpretare il messaggio PGP/MIME"
 
 # GNOME-2-20
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossibile interpretare il messaggio PGP/MIME: errore sconosciuto"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Formato firma non supportato"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Errore nel verificare la firma"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Errore sconosciuto nel verificare la firma"
 
 # GNOME-2-20
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Impossibile interpretare il messaggio PGP"
 
 # GNOME-2-20
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Impossibile interpretare il messaggio PGP: errore sconosciuto"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Ogni volta"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Una volta al giorno"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Una volta a settimana"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Una volta al mese"
 
 # GNOME-2-22
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Aggiunta intestazione junk personalizzata"
 
 # GNOME-2-22
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Nome dell'intestazione:"
 
 # GNOME-2-22
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Valore header contiene:"
 
 # GNOME-2-22
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Contiene il valore"
 
 # GNOME-2-22
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Colore"
 
@@ -12395,18 +13092,18 @@ msgstr "Colore"
 # TAG: appare solo in due messaggi (per ora)
 # usato *codice* per evitare confusione con label
 # (in alternativa potrebbe essere *nome convezionale*)
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Codice"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Il plugin %s è disponibile e il binario è installato."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -12414,73 +13111,86 @@ msgstr ""
 "Il plugin %s non è disponibile. Controllare se il pacchetto è installato."
 
 # GNOME-2-20
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Nessun plugin disponibile per posta indesiderata"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Da fare"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Più tardi"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"La posizione e la gerarchia delle cartelle di posta di Evolution è cambiata "
-"dalla versione 1.x.\n"
-"\n"
-"Attendere che Evolution finisca la migrazione delle cartelle..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Impossibile creare la nuova cartella «%s»: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Impossibile copiare la cartella «%s» su «%s»: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Impossibile scansionar le caselle di posta esistenti su «%s»: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"La posizione e la gerarchia delle cartelle di posta di Evolution è cambiata "
+"dalla versione 1.x.\n"
+"\n"
+"Attendere che Evolution finisca la migrazione delle cartelle..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Impossibile aprire vecchi dati POP keep-on-server da «%s»: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Impossibile creare directory dati POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Impossibile copiare dati POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Creazione dello storage di posta locale «%s» fallita: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"La posizione e la gerarchia delle cartelle di posta di Evolution è cambiata "
+"dalla versione 1.x.\n"
+"\n"
+"Attendere che Evolution finisca la migrazione delle cartelle..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Impossibile creare cartelle di posta locali su «%s»: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12488,130 +13198,147 @@ msgstr ""
 "Impossibile leggere le impostazioni dall'installazione precedente di "
 "Evolution; «evolution/config.xmldb» non esiste o è danneggiato."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Rispondi al mittente"
 
-#: ../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 "Rispondi alla _lista"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "A_ggiungi alla rubrica"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Questo archivio non supporta le sottoscrizioni o non sono abilitate."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Iscritto"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Cartella"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Selezionare un server."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Nessun server è stato selezionato"
 
 # GNOME-2-22
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Non mostrare questo messaggio in futuro."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Filtri dei messaggi"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "messaggio"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Salva messaggio..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Aggiungi indirizzo"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Messaggi da %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "C_artelle di ricerca"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Origine cartella di ricerca"
 
+# GNOME-2-24
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Altezza finestra \"Invio e ricezione posta\""
+
+# GNOME-2-24
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Stato massimizzazione finestra \"Invio e ricezione posta\""
+
+# GNOME-2-24
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Larghezza finestra \"Invio e ricezione posta\""
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
-msgstr ""
-"Consente ad Evolution di mostrare parti di testo di dimensione limitata"
+msgstr "Consente a Evolution di mostrare parti di testo di dimensione limitata"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Richiedere sempre ricevuta di lettura"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tempo (in secondi) durante il quale mostrare l'errore nella barra di stato."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Riconoscimento automatico emoticon"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Riconoscimento automatico collegamento"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Controllo posta indesiderata in ingresso"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Colore della citazione"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Colore della citazione."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Altezza predefinita finestra di composizione"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Larghezza predefinita finestra di composizione"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Directory carica/allega del compositore"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprime la visualizzazione degli indirizzi in A/CC/CCN"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12619,76 +13346,109 @@ msgstr ""
 "Comprime la visualizzazione degli indirizzi in A/CC/CCN al numero "
 "specificato nella chiave address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+# GNOME-2-24
+#: ../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 "Controlla quanto frequentemente i cambiamenti locali sono sincronizzati con il server di posta remoto. L'intervallo deve essere almeno 30 secondi."
+
+# GNOME-2-22
+#: ../mail/evolution-mail.schemas.in.h:18
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "Specifica le intestastazioni da controllare per gli indesiderati."
+
+# GNOME-2-22
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Specifica le intestastazioni da controllare per i messaggi indesiderati. Il "
+"formato è nomeintestazione=valore in gconf."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Set di caratteri predefinito per comporre i messaggi"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Set di caratteri predefinito per comporre i messaggi."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Set di caratteri predefinito per mostrare i messaggi"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Set di caratteri predefinito per mostrare i messaggi."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Stile di inoltro predefinito"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Altezza predefinita della finestra di composizione."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Altezza predefinita della finestra del messaggio."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Altezza predefinita del dialogo di sottoscrizione."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Stile della risposta predefinito"
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valore predefinito per stato espanso della discussione"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Larghezza predefinita della finestra di composizione."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Larghezza predefinita della finestra del messaggio."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Larghezza predefinita del dialogo di sottoscrizione"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr "Determina se cercare nella rubrica l'email del mittente"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Determina se cercare nella rubrica l'email del mittente"
+
+# GNOME-2-22
+#: ../mail/evolution-mail.schemas.in.h:35
+#, fuzzy
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Determina se cercare l'email del mittente nella rubrica. Se trovato, non si "
@@ -12697,14 +13457,14 @@ msgstr ""
 "il completamento automatico delle rubriche non locali (come ldap)."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se usare intestazioni personalizzate nel controllare gli "
 "indesiderati"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../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 "
@@ -12715,7 +13475,7 @@ msgstr ""
 "menzionati, migliora la velocità di controllo degli indesiderati."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../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."
@@ -12724,64 +13484,69 @@ msgstr ""
 "e \"Oggetto\" nella colonna \"Messaggi\" della vista verticale."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory per caricare/allegare file al compositore."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directory per il salvataggio dei file che compongono l'email."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+# GNOME-2-24
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "Disabilita o abilita l'elisione dei nomi delle cartelle nell'albero delle cartelle"
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Mostra gli errori di ortografia sulle parole durante la digitazione."
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Svuota cartelle di posta indesiderata all'uscita"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Svuota cartelle cestino all'uscita"
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 "Svuota tutte le cartelle di posta indesiderata all'uscita da Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Svuota tutte le cartelle cestino all'uscita da Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Abilita la modalità cursore visibile, in maniera da visualizzare il cursore "
 "mentre si legge la posta."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Abilita o disabilita la barra spazio magica"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Abilita o disabilita la funzionalità di ricerca durante la digitazione"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Abilitare cartelle di ricerca"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Abilita le cartelle di ricerca all'avvio."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12795,35 +13560,37 @@ msgstr ""
 "automaticamente a quella cartella."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../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 "Abilitare questa chiave per usare il tasto barra spaziatrice per scorrere nell'anteprima del messaggio, nell'elenco dei messaggi e nelle cartelle."
+msgstr ""
+"Abilitare questa chiave per usare il tasto barra spaziatrice per scorrere "
+"nell'anteprima del messaggio, nell'elenco dei messaggi e nelle cartelle."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Abilita la visualizzazione di parti di messaggio di testo di dimensioni "
 "limitate."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Abilita/disabilità modalità cursore visibile"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Altezza del riquadro elenco messaggi"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Altezza del riquadro elenco messaggi."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Nasconde l'anteprima per-cartella e rimuove la selezione"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12831,7 +13598,7 @@ msgstr ""
 "Se un'utente cerca di aprire 10 o più messaggi allo stesso tempo chiedere se "
 "si è sicuri di ciò che si sta facendo."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12839,7 +13606,7 @@ msgstr ""
 "Se il riquadro \"Anteprima\" è attivo, viene mostrato di fianco invece che "
 "verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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 "
@@ -12850,7 +13617,31 @@ msgstr ""
 "corrispondenza con un visualizzatore bonobo nel database dei tipi MIME di "
 "GNOME può usato per visualizzare il contenuto."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+# GNOME-2-24
+#: ../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 "Altezza iniziale della finestra \"Invio e ricezione posta\". Il valore è aggiornato non appena l'utente ridimensiona verticalmente la finestra."
+
+# GNOME-2-24
+#: ../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 "Stato di massimizzazione iniziale della finestra \"Invio e ricezione posta\". Il valore è aggiornato quando l'utente massimizza o demassimizza la finestra. Notare che questo particolare valore non è usato da Evolution, poiché la finestra \"Invio e ricezione posta\" non può essere massimizzata. Questa chiave esiste solo come un dettaglio di implementazione."
+
+# GNOME-2-24
+#: ../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 "Larghezza iniziale della finestra \"Invio e ricezione posta\". Il valore è aggiornato non appena l'utente ridimensiona orizzontalmente la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Abilita/Disabilita il prompt mentre si contrassegnano messaggi multipli."
@@ -12858,47 +13649,53 @@ msgstr ""
 # GNOME-2-22
 #
 # non mi convince affatto...
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../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 "Abilita/Disabilita la funzione per cui prompt ripetuti domandano se è richiesta la sincronizzazione prima di passare in modalità fuori rete"
+msgstr ""
+"Abilita/Disabilita la funzione per cui prompt ripetuti domandano se è "
+"richiesta la sincronizzazione prima di passare in modalità fuori rete"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../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 "Abilita/Disabilita la funzione per cui prompt ripetuti avvisano che l'eliminazione di messaggi da una cartella di ricerca elimina il messaggio in modo permanente, invece di rimuoverlo semplicemente dai risultati della ricerca."
+msgstr ""
+"Abilita/Disabilita la funzione per cui prompt ripetuti avvisano che "
+"l'eliminazione di messaggi da una cartella di ricerca elimina il messaggio "
+"in modo permanente, invece di rimuoverlo semplicemente dai risultati della "
+"ricerca."
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "L'ultima volta che è stata eliminata la posta indesiderata"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "L'ultima volta che è stato svuotato il cestino"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Livello oltre il quale il messaggio dovrebbe essere registrato."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Elenco delle etichette e dei colori associati"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Elenco delle licenze accettate"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Elenco degli account"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12907,11 +13704,16 @@ msgstr ""
 "contiene delle stringhe che identificano le sottodirectory relative a /apps/"
 "evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Elenco delle intestazioni personalizzate e se sono abilitate."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+# GNOME-2-24
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Elenco dei codici di lingua dei dizionari usati per il controllo ortografico."
+
+#: ../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."
@@ -12920,112 +13722,113 @@ msgstr ""
 "contiene delle stringhe del tipo NOME:COLORE, dove COLORE usa la notazione "
 "esadecimale dell'HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Elenco di tipi MIME da controllare per componenti di visualizzazione bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Elenco nomi di protocollo la cui licenza è stata accettata."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Carica le immagini in messaggi HTML attraverso HTTP"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
+#, 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."
+"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 ""
 "Carica le immagini nei messaggi HTML attraverso http(s). Valori possibili "
 "sono: 0 (non carica le immagini dalla rete), 1 (carica le immagini nei "
 "messaggi dai contatti) e 2 (carica sempre le immagini dalla rete)."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Azioni di filtraggio dei log"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Azioni di filtraggio sul file log specificato."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "File di log per controllare le azioni dei filtri"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "File di log per controllare le azioni dei filtri."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Contrassegna come letto dopo un tempo specificato"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Contrassegna come letto dopo un tempo specificato."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Contrassegna le citazioni nell'anteprima del messaggio"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Contrassegna le citazioni nell'anteprima del messaggio."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Altezza predefinita finestra messaggio"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Larghezza predefinita finestra messaggio"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stile di visualizzazione messaggio (\"normal\", \"full headers\", \"source\")"
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Giorni minimi per l'eliminazione della posta indesiderata all'uscita"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Giorni minimi per lo svuotamento del cestino all'uscita"
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Tempo minimo tra le eliminazioni della posta indesiderata all'uscita, in "
 "giorni."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo minimo tra gli svuotamenti del cestino all'uscita, in giorni."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Numero di indirizzi da mostrare in A/CC/CCN"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Segnala se l'oggetto è vuoto"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Avverte l'utente quando si cerca di ripulire una cartella."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
@@ -13033,30 +13836,30 @@ msgstr ""
 "oggetto."
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Chiede conferma per verificare se l'utente vuole andare immediatamente fuori "
 "rete"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Confermare eliminazione messaggi in cartelle di ricerca"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Avverte l'utente quando elimina qualcosa"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Avverte l'utente quando si compila solo il campo CCN"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Avverte l'utente quando cerca di aprire 10 o più messaggi insieme"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
@@ -13064,79 +13867,85 @@ msgstr ""
 "Avverte quando l'utente tenta di inviare messaggi HTML a destinatari che "
 "potrebbero non desiderare ricevere posta in HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Avverte quando l'utente tenta di inviare un messaggio senza destinatari A: o "
 "CC:"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Avverte quando l'utente tenta di inviare HTML non desiderato"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Avverte quando si contrassegnano messaggi multipli"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Riconosce le faccine nel testo e le sostituisce con delle immagini."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Riconosce i collegamenti nel testo e li sostituisce."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Esegue dei controlli sulla posta indesiderata in ingresso."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Directory di salvataggio"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+#, fuzzy
+msgid "Search for the sender photo in local address books"
 msgstr "Cerca la foto del mittente nella rubrica locale"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Invio posta predefinito in HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Invio posta predefinito in HTML."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Colonna indirizzo email del mittente nell'elenco dei messaggi"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "Opzioni _sincronizzazione..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Mostra animazioni"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Mostra le immagini animate come animazioni."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Mostra messaggi eliminati (con una riga sopra) nell'elenco dei messaggi."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Mostra i messaggi eliminati nell'elenco messaggi"
 
 # NEW
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Mostra la foto del mittente"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13144,86 +13953,85 @@ msgstr ""
 "Mostra l'indirizzo email del mittente in una colonna separata nell'elenco "
 "dei messaggi."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostra la foto del mittente nel riquadro di lettura del messaggio."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Specifica le intestastazioni da controllare per gli indesiderati."
+# INLINE
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell check inline"
+msgstr "Controllo ortografico incorporato"
 
-# GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Specifica le intestastazioni da controllare per i messaggi indesiderati. Il "
-"formato è nomeintestazione=valore in gconf."
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Controllo ortografico"
 
 # GNOME-2-22
 # INLINE
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Spell check inline"
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+msgid "Spell checking languages"
 msgstr "Controllo ortografico incorporato"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Altezza predefinita finestra di sottoscrizione"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Larghezza predefinita finestra di sottoscrizione"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Carattere del terminale"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Limite parte di messaggio di testo"
 
 # GNOME-2-20
 # allungato un po'....
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Il plugin preferito per l'hook della posta indesiderata"
 
 # GNOME-2-0
 #
 # un po' adattata
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "L'ultima volta che è stata eliminata la posta indesiderata, in giorni da "
 "epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "L'ultima volta che è stato svuotato il cestino, in giorni da epoch."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Il carattere da terminale per la visualizzazione della posta."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr ""
 "Il carattere a larghezza variabile per la visualizzazione dei messaggi."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 "Questa chiave può avere tre valori possibili: 0 per errori, 1 per "
 "avvertimenti, 2 per messaggi di debug."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -13233,23 +14041,27 @@ msgstr ""
 "ed è specificata in termini di kB."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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 "Questo è il plugin predefinito per la posta indesiderata, anche nel caso ci fossero diversi plugin abilitati. Se il plugin elencato come predefinito è disabilitato, allora si farà ricorso agli altri plugin disponibili."
+msgstr ""
+"Questo è il plugin predefinito per la posta indesiderata, anche nel caso ci "
+"fossero diversi plugin abilitati. Se il plugin elencato come predefinito è "
+"disabilitato, allora si farà ricorso agli altri plugin disponibili."
 
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 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 ""
 "Questa chiave viene letta una volta e azzerata a FALSE dopo la lettura. Ciò "
 "deseleziona le email nell'elenco e rimuove l'anteprima da tale cartella."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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;"
@@ -13261,13 +14073,21 @@ msgstr ""
 "visualizzate. Il formato della struttura è &lt;intestazione abilitata&gt; - "
 "impostata se l'intestazione deve essere mostrata con la posta."
 
+# GNOME-2-24
+#: ../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 "Questa opzione è correlata alla chiave \"lookup_addressbook\" ed è usata per determinare se consultare gli indirizzi solo nella rubrica locale per escludere dai filtri di spam la posta inviata dai contatti noti."
+
 # GNOME-2-20
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr ""
 "Questa opzione vuole essere d'aiuto nel migliorare la velocità del recupero."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../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."
@@ -13276,7 +14096,7 @@ msgstr ""
 "elenco messaggi predefinita, oltre il quale è mostrato un \"...\"."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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."
@@ -13285,7 +14105,7 @@ msgstr ""
 "essere nello stato espanso o contratto. È necessario riavviare Evolution."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
@@ -13295,158 +14115,172 @@ msgstr ""
 "base all'ultimo messaggio in ciascuna discussione invece per la data del "
 "messaggio. È necessario riavviare Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Elenca per discussioni."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Elenca per discussioni"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Elenca per discussioni basate sull'oggetto"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tempo disponibile per contrassegnare il messaggio come letto"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Tempo disponibile per contrassegnar il messaggio come letto."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Stringa UID dell'account predefinito."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+#, fuzzy
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "Colore della sottolineatura per le parole scritte male quando si usa la correzione **inline**."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usa demone e client SpamAssassin"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usa il client e il demone SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Usa caratteri personalizzati"
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Usa caratteri personalizzati per mostrare la posta."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Usa solo test di spam locale."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa solo test di spam locale (senza DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Usa la disposizione fianco-a-fianco o estesa"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Carattere a larghezza variabile"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "La voce di menu Visualizza/CCN è selezionata"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "La voce di Visualizza/CCN è selezionata."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "La voce di menu Visualizza/CC è selezionata"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "La voce di menu Visualizza/CC è selezionata."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "La voce di menu Visualizza/Da è selezionata"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "La voce di menu Visualizza/Da è selezionata."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "La voce di menu Visualizza/Pubblica-su a è selezionata"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "La voce di menu Visualizza/Pubblica-su a è selezionata."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "La voce di menu Visualizza/Rispondi-a è selezionata"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "La voce di menu Visualizza/Rispondi-a è selezionata."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr "Indica se una richiesta di ricezione e lettura viene aggiunta a ogni messaggio in modo predefinito."
+msgstr ""
+"Indica se una richiesta di ricezione e lettura viene aggiunta a ogni "
+"messaggio in modo predefinito."
+
+# GNOME-2-24
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr "Indica se disabilitare la funzione di elisione dei nomi delle cartelle nell'albero delle cartelle."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../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 "Indica se fare ricorso oppure no al raggruppamento in base agli oggetti se i messaggi non contengono le intestazioni In-Risposta-A o Riferimenti."
+msgstr ""
+"Indica se fare ricorso oppure no al raggruppamento in base agli oggetti se i "
+"messaggi non contengono le intestazioni In-Risposta-A o Riferimenti."
 
 # GNOME-2-22
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica se ordinare le discussioni in base all'ultimo messaggio nella "
 "discussione"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Larghezza del riquadro elenco-messaggi"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Larghezza del riquadro elenco-messaggi."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importazione dati Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Importatore Elm di Evolution."
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importa posta da Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Cartella di destinazione:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Seleziona una cartella dentro cui importare"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Mailbox Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importatore per cartelle nel formato Mailbox di Berkeley"
 
@@ -13454,7 +14288,7 @@ msgstr "Importatore per cartelle nel formato Mailbox di Berkeley"
 msgid "Importing mailbox"
 msgstr "Importazione casella di posta"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importazione di «%s»"
@@ -13464,186 +14298,205 @@ msgstr "Importazione di «%s»"
 msgid "Scanning %s"
 msgstr "Scansione di «%s»"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importazione dati Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Importatore Pine di Evolution."
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importa posta da Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Posta 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 "Posta da %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "L'oggetto è %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailing list %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Aggiungi regola di filtro"
 
+# GNOME-2-24
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Modelli"
+
 # GNOME-2-22
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selezionato, "
 msgstr[1] "%d selezionati, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminato"
 msgstr[1] "%d eliminati"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d indesiderato"
 msgstr[1] "%d indesiderati"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d bozza"
 msgstr[1] "%d bozze"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d inviato"
 msgstr[1] "%d inviati"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non inviato"
 msgstr[1] "%d non inviati"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d non letto, "
 msgstr[1] "%d non letti, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d in totale"
 msgstr[1] "%d in totale"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nuovo messaggio di posta"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:924
+#, fuzzy
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Messaggio email"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio di posta"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nuova cartella di posta"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:932
+#, fuzzy
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Cartella di _posta"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Crea una nuova cartella di posta"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Aggiornamento delle impostazioni o cartelle di posta fallito."
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Errore"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Errori"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Avvertimenti e errori"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Debug"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Mesaggi di errore, avvertimento e debug"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Registri di debug"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Mostrare gli _errori nella barra di stato per"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+#, fuzzy
+msgid "second(s)."
 msgstr "secondi."
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Messaggi di registro:"
 
 # GNOME-2-22
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Livello di registro"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Ora"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messaggi"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Chiude questa finestra"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Controlla tipi supportati"
@@ -13658,7 +14511,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL non è supportato in questa compilazione di Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Fotografia mittente</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13745,78 +14599,79 @@ msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Caratteri di stampa</span>"
 
+# GNOME-2-24
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Impostazioni proxy</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informazioni necessarie</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME sicuro (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sicurezza</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Messaggi inviati e bozze</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configurazione server</span>"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo _autenticazione</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestione degli account"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Aggiungi n_uova sigla..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Aggiungi _script"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Firmare _sempre i messaggi in uscita quando si usa questo account"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Ci_frare anche per se stessi quando si inviano messaggi cifrati"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Sempre _copia conforme (CC) a:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Sempre copia conforme _nascosta (CCN) a:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Dare sempre _fiducia alle chiavi nel portachiavi personali nel cifrare"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Ci_frare sempre per se stessi quando si inviano messaggi cifrati"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "Richie_dere sempre ricevute di lettura"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Allega messaggio originale"
-
 # GNOME-2-22
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
@@ -13834,16 +14689,17 @@ msgstr "Baltico (ISO-8859-4)"
 msgid "C_haracter set:"
 msgstr "_Set di caratteri:"
 
-# GNOME-2-22
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "Controllare intestazioni _personalizzate per indesiderata"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Controllare _tipi supportati"
 
 # GNOME-2-22
+#: ../mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Check cu_stom headers for junk"
+msgstr "Controllare intestazioni _personalizzate per indesiderata"
+
+# GNOME-2-22
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Controllare nei _messaggi in ingresso quelli indesiderati"
@@ -13908,21 +14764,24 @@ msgstr "Firmare digitalmente i messaggi in _uscita (predefinito)"
 
 # GNOME-2-22
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
-"_Non contrassegnare i messaggi come indesiderati se il mittente è nella "
-"rubrica"
+"Non formattare il testo contenuto nei messaggi se la _dimensione del testo "
+"eccede"
 
 # GNOME-2-22
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
-"Non formattare il testo contenuto nei messaggi se la _dimensione del testo "
-"eccede"
+"_Non contrassegnare i messaggi come indesiderati se il mittente è nella "
+"rubrica"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "Non citare il messaggio originale"
+#, fuzzy
+msgid "Do not quote"
+msgstr "Non eliminare"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13988,78 +14847,102 @@ msgstr "Nom_e completo:"
 msgid "HTML Messages"
 msgstr "Messaggi HTML"
 
+# GNOME-2-24
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "Proxy H_TTP:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Intestazioni"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "Evidenziare ci_tazioni con"
 
 # GNOME-2-22
 # INLINE
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Incorporato"
 
-# GNOME-2-22
+# GNOME-2-24
 # INLINE
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "Messaggio originale incorporato (stile Outlook)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "Incorporato (stile Outlook)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "kB"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etichette"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Tabella delle lingue"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Configurazione della posta"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "Tabella delle intestazioni di posta"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Posizione casella di posta"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Compositore messaggio"
 
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "Nessun _proxy per:"
+
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Nota: la sottolineatura nel nome dell'etichetta è usata come identificatore "
 "mnemonico nel menù."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: non verrà richiesta una password fino alla prima connessione"
 
-#: ../mail/mail-config.glade.h:107
+# GNOME-2-22
+# evitato di tradurre junk per tenere un po' corto il messaggio...  -Luca
+#: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Questa opzione viene ignorata se è trovata una corrispondenza con le "
+"intestazioni personali."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganizzazione:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:110
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "Pass_word:"
+
+#: ../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."
@@ -14067,7 +14950,7 @@ msgstr ""
 "Inserire una descrizione per questo account nello spazio sottostante.\n"
 "Questo nome verrà usato solo per la visualizzazione."
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -14076,7 +14959,7 @@ msgstr ""
 "non si è sicuri, chiedere all'amministratore di sistema o al provider "
 "Internet."
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -14086,111 +14969,121 @@ msgstr ""
 "i campi \"opzionali\", a meno che non si desideri includere queste "
 "informazioni alle email inviate."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Selezionare una delle seguenti opzioni"
 
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "Porta:"
+
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Segnalare l'invio di _messaggi con solo destinatari CCN"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Cita messaggio originale"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citato"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Ric_ordare la password"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Ris_pondi-a:"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Ricordare la  _password"
 
+# GNOME-2-22
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "Host S_OCKS:"
+
 # GNOME-2-20
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "C_ercare la foto del mittente solo nelle rubriche locali"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_eleziona..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Inviare le _ricevute di messaggio:"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Caratt_ere standard:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Seleziona font a larghezza fissa HTML"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleziona carattere HTML a larghezza fissa per la stampa"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Seleziona carattere HTML a larghezza variabile"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Invio posta"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipo di server:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificato di fir_ma:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Sigla:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Sigle"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabella delle sigle"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Tipo:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14198,7 +15091,7 @@ msgstr ""
 "Questo elenco delle lingue rispecchia solamente le lingue per le quali "
 "risulta installato il dizionario."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14209,16 +15102,7 @@ msgstr ""
 "visivo."
 
 # GNOME-2-22
-# evitato di tradurre junk per tenere un po' corto il messaggio...  -Luca
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Questa opzione viene ignorata se è trovata una corrispondenza con le "
-"intestazioni personali."
-
-# GNOME-2-22
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14226,16 +15110,29 @@ msgstr ""
 "Digitare il nome con cui fare riferimento a questo account.\n"
 "Per esempio: «Lavoro» o «Personale»"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "Nome ut_ente:"
+
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Usare aute_nticazione"
+
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:156 ../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 utente:"
+msgstr "Nome _utente:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "Larghezza _variabile:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14245,108 +15142,141 @@ msgstr ""
 "\n"
 "Fare clic su \"Avanti\" per cominciare."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Aggiungi sigla"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Ca_ricare sempre le immagini da Internet"
 
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "URL di configurazione _automatica del proxy:"
+
 # GNOME-2-20
 #
 # FIXME sottinteso messaggi, da vedere come appare nella UI
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Plugin pre_definito per indesiderati:"
 
-#: ../mail/mail-config.glade.h:157
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "Connessione _diretta a Internet"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Non firmare le richieste di ri_unione (per compatibilità con Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Stile i_noltro:"
 
 # GNOME-2-20
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Tenere la sigla sopra il messaggio originale nel rispondere"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "C_aricare le immagini nei messaggi dai contatti"
 
-#: ../mail/mail-config.glade.h:162
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "Consu_ltare solo le rubriche locali"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Impostare co_me account predefinito"
 
-#: ../mail/mail-config.glade.h:163
+# GNOME-2-24
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "Configurazione _manuale del proxy:"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "Contrassegnare i _messaggi come letti dopo"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Non caricare le immagini dalla rete"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Percorso:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "Confermare l'invio di messaggi _HTML a contatti che non li desiderano"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Confermare l'invio di messaggi senza _oggetto"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Stile _risposta:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
+# GNOME-2-24
+# secure maiuscolo perché è così
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "Proxy _Secure HTTP:"
+
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "S_eleziona..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Mostrare le animazioni delle immagini"
 
 # GNOME-2-22
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrare la foto del mittente nell'anteprima del messaggio"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Limitare le intestazioni A/CC/CCN a"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Usare connessione sicura:"
 
-#: ../mail/mail-config.glade.h:178
+# GNOME-2-24
+# aggiunto impostazioni, riferito a proxy
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "_Usare impostazioni predefinite del sistema"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Usare gli stessi tipi di carattere delle altre applicazioni"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "indirizzi"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "colore"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "descrizione"
 
@@ -14386,43 +15316,43 @@ msgstr "_Distinzione MAIUSCOLE/minuscole"
 msgid "Co_mpleted"
 msgstr "Co_mpletato"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "Tr_ova:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Trova nel messaggio"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Contrassegna per completamento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Sottoscrizione cartella"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Accordo di licenza"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Nessuna selezione"
 
-#: ../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
 msgid "Security Information"
 msgstr "Informazioni di sicurezza"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Cartelle specificate"
 
-#: ../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."
@@ -14430,23 +15360,23 @@ msgstr ""
 "I messaggi selezionati per il completamento sono elencati sotto.\n"
 "Selezionare un'azione di completamento dal menu \"Contrassegno\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "Accetta _licenza"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "Sca_de il:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "C_ontrassegno:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Spuntare _questo per accettare la licenza"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Sto facendo ping a %s"
@@ -14494,99 +15424,105 @@ msgstr "Invio del messaggio %d di %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Invio di %d messaggi su %d fallito"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Annullato."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Completato."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Salvataggio del messaggio nella cartella"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Spostamento messaggi in %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Messaggi inoltrati"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Apertura cartella %s"
 
-#: ../mail/mail-ops.c:1270
+# GNOME-2-24
+#: ../mail/mail-ops.c:1272
 #, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Recupero informazioni di quota per la cartella %s"
+
+#: ../mail/mail-ops.c:1341
+#, c-format, fuzzy
 msgid "Opening store %s"
 msgstr "Apertura store %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Rimozione cartella %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Archiviazione cartella «%s»"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Pulizia e archiviazione account «%s»"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Archiviazione account «%s»"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Aggiornamento cartella"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Pulizia cartella"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Svuotamento cestino in «%s»"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ricezione messaggio %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ricezione di %d messaggio"
 msgstr[1] "Ricezione di %d messaggi"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Salvataggio di %d messaggio"
 msgstr[1] "Salvataggio di %d messaggi"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14595,11 +15531,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Salvataggio allegati"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14608,89 +15544,91 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile scrivere i dati: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparazione dell'account «%s» per fuori rete"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Verifica servizi"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Annullamento..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Invio e ricezione posta"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Annulla _tutto"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "In attesa..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Controllo nuova posta"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Inserire la passphrase per %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Inserire la passphrase"
 
-#: ../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 "Inserire la password per %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Modifica sigla"
+# GNOME-2-24
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Salva e chiudi"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Inserire un nome per questa sigla."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Modifica sigla"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Nome:"
+# GNOME-2-24
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "Nome della _sigla:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14731,27 +15669,26 @@ msgstr "Aggiornamento cartelle di ricerca per «%s:%s»"
 msgid "Updating Search Folders for '%s'"
 msgstr "Aggiornamento cartelle di ricerca per «%s»"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Modifica cartella di ricerca"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nuova cartella di ricerca"
 
 #: ../mail/mail.error.xml.h:1
-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 "Una cartella di nome «{0}» esiste già. Usare un nome differente."
 
 #: ../mail/mail.error.xml.h:2
-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 "Una cartella di nome «{1}» esiste già. Usare un nome differente."
 
 #: ../mail/mail.error.xml.h:3
+#, fuzzy
 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."
@@ -14762,17 +15699,19 @@ msgstr ""
 "accodare il suo contenuto, oppure di uscire."
 
 #: ../mail/mail.error.xml.h:6
+#, fuzzy
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
 "È stata richiesta una notifica di ricezione e lettura per «{1}». Inviare la "
 "notifica di ricezione a {0}?"
 
 #: ../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 "Esiste già una sigla con il nome «{0}». Usare un nome differente."
 
 #: ../mail/mail.error.xml.h:8
@@ -14808,11 +15747,12 @@ msgstr ""
 "Rimuovere in modo permanente tutti i messaggi eliminati in tutte le cartelle"
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"Rimuovere in modo permanente tutti messaggi eliminati nella cartella «{0}»?"
+"Rimuovere in modo permanente tutti i messaggi eliminati in tutte le cartelle"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14827,11 +15767,11 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Spedire veramente un messaggio senza un oggetto?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "Motivazione: {0}."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "Motivazione: {2}."
 
 #: ../mail/mail.error.xml.h:21
@@ -14839,15 +15779,15 @@ msgid "Blank Signature"
 msgstr "Sigla vuota"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Impossibile aggiungere la cartella di ricerca «{0}»."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Impossibile copiare la cartella «{0}» su «{1}»."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "Impossibile creare la cartella «{0}»."
 
 #: ../mail/mail.error.xml.h:25
@@ -14855,54 +15795,55 @@ msgid "Cannot create temporary save directory."
 msgstr "Impossibile creare la directory temporanea per il salvataggio."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Impossibile creare la directory di salvataggio. Motivazione: {1}"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Impossibile eliminare la cartella «{0}»."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossibile eliminare la cartella di sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+#, fuzzy
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Impossibile modificare la cartella di ricerca «{0}» perché questa non esiste."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Impossibile spostare la cartella «{0}» su «{1}»."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Impossibile aprire l'origine «{1}»."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Impossibile aprire l'origine «{2}»."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "Impossibile aprire la destinazione «{2}»."
 
 #: ../mail/mail.error.xml.h:34
+#, fuzzy
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"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 ""
 "Impossibile leggere il file della licenza «{0}» a causa di un problema di "
 "installazione. Non è possibile usare questo fornitore finché non si accetta "
 "la sua licenza."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Impossibile rinominare «{0}» in «{1}»."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Impossibile rinominare o spostare la cartella di sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:37
@@ -14910,18 +15851,22 @@ msgid "Cannot save changes to account."
 msgstr "Impossibile salvare le modifiche al contatto."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Impossibile salvare nella directory «{0}»."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "Impossibile salvare sul file «{0}»."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "Impossibile impostare lo script per la sigla «{0}»."
 
 #: ../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."
@@ -14930,48 +15875,45 @@ msgstr ""
 "password fanno distinzione tra maiuscole e minuscole sono; controllare il "
 "tasto BlocMaiusc."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Impossibile salvare il file della sigla."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
+# GNOME-2-24
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
 msgstr "Eliminare «{0}»?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Eliminare l'account?"
 
-# GNOME-2-22
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+# GNOME-2-24
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Eliminare i messaggi nella cartella di ricerca «{0}»?"
 
 # GNOME-2-22
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Eliminare i messaggi nella cartella di ricerca?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Scartare le modifiche?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Non eli_minare"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Non eliminare"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Non disabilitare"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Eseguire l'operazione anche nelle sottocartelle?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -15082,39 +16024,28 @@ msgid "Mark all messages as read"
 msgstr "Contrassegna tutti i messaggi come letti"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr ""
-"Contrassegnare tutti i messaggi in questa cartella e nelle sottocartelle "
-"come letti?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Cartella mancante"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Nessuna origine selezionata."
 
-# GNOME-2-22
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "_Solo cartella corrente"
-
-#: ../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 ""
 "L'apertura di troppo messaggi in contemporanea potrebbe richiede un tempo "
 "eccessivo."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Verificare le impostazioni dei propri account e provare di nuovo."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Abilitare l'account o inviare usando un altro account."
 
-#: ../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."
@@ -15124,7 +16055,7 @@ msgstr ""
 "d'inserimento."
 
 # GNOME-2-22
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15134,36 +16065,44 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Inserire un nome univoco per identificare questa sigla."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Attendere."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema nel migrare la vecchia cartella di posta «{0}»."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Interrogazione server"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Interrogazione del server per una lista di meccanismi di autenticazione "
 "supportati"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Richiesta risposta di lettura."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Eliminare veramente la cartella «{0}» e tutte le sue sotto-cartelle?"
 
+#: ../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 "Cartelle di ricerca aggiornate automaticamente."
@@ -15210,11 +16149,12 @@ msgstr ""
 "dovrebbe aggiungere almeno un destinatario «A:» o «CC:»."
 
 #: ../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 ""
 "Le seguenti cartelle di ricerca:\n"
@@ -15224,11 +16164,12 @@ msgstr ""
 "Le cartelle di ricerca sono state aggiornate."
 
 #: ../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 ""
 "Le seguenti regole di filtro:\n"
@@ -15351,9 +16292,10 @@ msgstr ""
 "È possibile sia selezionare le cartelle una ad una, sia selezionare tutte le "
 "cartelle locali e/o remote, oppure entrambe."
 
+# GNOME-2-24
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "Il login al server «{0}» come «{0}» è fallito."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "L'accesso al server «{0}» come «{0}» non è riuscito."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15375,35 +16317,23 @@ msgstr "Ri_pulisci"
 msgid "_Open Messages"
 msgstr "_Apri messaggi"
 
-# GNOME-2-22
-#
-# Pulsante, in dialogo contrassegna come letti
-# in cartella corrente e sottocartelle
-#
-#    <big>Mark all messages in this folder and subfolders
-#    as read?</big>
-#
-#    Do you want the operation to be performed
-#    also in the subfolders?
-#
-#    	      (Only on _Current Folder)  (...)
-#
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "_Cartella corrente e sottocartelle"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Non visto"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Risposto"
 
+# GNOME-2-24
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Inoltrato"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi multipli non visti"
@@ -15428,37 +16358,49 @@ msgstr "Più alto"
 msgid "Highest"
 msgstr "Il più alto"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "oggi alle %k.%M"
 
-#: ../mail/message-list.c:1630 ../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 "ieri alle %k.%M"
 
-#: ../mail/message-list.c:1642 ../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 alle %k.%M"
 
-#: ../mail/message-list.c:1650 ../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:1652 ../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"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "Generazione elenco messaggi"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+# GNOME-2-24
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "Non c'è alcun messaggio in questa cartella."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Scadenza"
@@ -15488,39 +16430,39 @@ msgstr "Messaggi inviati"
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Chiamata"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Non inoltrare"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Da completare"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Per informazione"
 
-#: ../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 "Inoltra"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Risposta non necessaria"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Rispondi"
 
-#: ../mail/message-tag-followup.c:84 ../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 "Rispondi a tutti"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Rivedi"
 
@@ -15532,9 +16474,10 @@ msgstr "Corpo contiene"
 msgid "Message contains"
 msgstr "Messaggio contiene"
 
+# GNOME-2-24
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
-msgstr "Destinatari contengono"
+msgstr "Destinatari contiene"
 
 #: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
@@ -15544,9 +16487,15 @@ msgstr "Mittente contiene"
 msgid "Subject contains"
 msgstr "Oggetto contiene"
 
+# GNOME-2-24
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Oggetto o Destinatari contengono"
+
+# GNOME-2-24
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
-msgstr "Oggetto o mittente contengono"
+msgstr "Oggetto o Mittente contengono"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
@@ -15557,15 +16506,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Fornisce le funzionalità di base per rubriche locali."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Abilita il plugin promemoria allegati"
-
-# GNOME-2-22
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Abilita il plugin promemoria allegati."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15574,7 +16514,7 @@ msgstr ""
 "un messaggio"
 
 # GNOME-2-22
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15582,15 +16522,11 @@ msgstr ""
 "Elenco delle prove per il plugin promemoria allegati da cercare nel corpo di "
 "un messaggio."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Parole chiave"
 
-# GNOME-2-22
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "_Avvisare per allegati mancanti"
-
 #: ../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"
@@ -15617,9 +16553,10 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Il messaggio non ha allegati"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Continua scrittura"
+# GNOME-2-24
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "_Modifica messaggio"
 
 # GNOME-2-22
 # INLINE
@@ -15637,27 +16574,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Plugin audio incorporato"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Selezionare il nome del file di backup di Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Riavviare Evolution dopo il backup"
 
-#: ../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 "Selezionare il nome del file di backup di Evolution da ripristinare"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Riavviare Evolution dopo il ripristino"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Ripristina da backup"
 
-#: ../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"
@@ -15669,96 +16606,125 @@ msgstr ""
 "Inoltre vengono ripristinate tutte le impostazioni personali, i filtri di "
 "posta, ecc.."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Ripristinare evolution dal file di backup"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Selezionare un Archivio Evolution da ripristinare:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Scegliere un file da ripristinare"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Backup cartella di Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Ripristina cartella di Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Controlla backup di Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Riavvia Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Con interfaccia utente grafica"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Arresto di Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Backup degli account e delle impostazioni di Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Backup dei dati di Evolution (posta, contatti, calendari, compiti, memo)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Backup completato"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Riavvio di Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Backup dei dati correnti di Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Estrazione dei file dalla copia di sicurezza"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Caricamento delle impostazioni di Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Rimozione dei file di backup temporanei"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../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 "Esecuzione backup nella cartella %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Ripristino dalla cartella %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Backup di Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Ripristino di Evolution"
 
+# GNOME-2-24
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Backup dei dati di Evolution"
+
+# GNOME-2-24
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Attendere mentre Evolution esegue il backup dei propri dati."
+
+# GNOME-2-24
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Ripristino dei dati di Evolution"
+
+# GNOME-2-24
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Attendere mentre Evolution esegue il ripristino dei propri dati."
+
+# GNOME-2-24
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "Ciò potrebbe richiedere del tempo in funzione della quantità di dati nel proprio account."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15794,16 +16760,26 @@ msgstr ""
 "salvate prima di procedere. Per far sì che Evolution venga riavviato "
 "automaticamente dopo il backup, abilitare la casella di spunta."
 
+# GNOME-2-24
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Permessi non sufficienti"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "File backup di Evolution non valido"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Selezionare un file di backup valido da ripristinare."
 
+# GNOME-2-24
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "La cartella selezionata non è scrivibile."
+
 # GNOME-2-20
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15830,65 +16806,80 @@ msgstr "R_ipristina impostazioni..."
 msgid "_Backup Settings..."
 msgstr "_Backup delle impostazioni..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contatti automatici"
 
-# GNOME-2-22
+# GNOME-2-24
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr ""
-"Creare _automaticamente voci nella rubrica quando si risponde ai messaggi"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "Creare _automaticamente voci di rubrica quando si risponde ai messaggi"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Rubrica selezionata per contatti automatici"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Contatti messaggi istantanei"
 
 # GNOME-2-22
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizzare periodicamente informazioni e immagini dei contatti "
 "dall'elenco conoscenti di Pidgin"
 
 # GNOME-2-22
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleziona rubrica per elenco conoscenti di Pidgin"
 
 # GNOME-2-22
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "_Sincronizza ora con elenco conoscenti"
 
-# GNOME-2-22
+# GNOME-2-24
 #: ../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 ""
-"Riempie automaticamente la rubrica con i nome e gli indirizzi email a cui si "
-"risponde. Riempie anche le informazioni dei contatti di Istant Messaging dal "
-"proprio elenco conoscenti."
+msgstr "Riempie automaticamente la propria rubrica con i nomi e gli indirizzi email a cui si risponde. Riempie anche le informazioni dei contatti di messaggistica istantanea dal proprio elenco conoscenti."
 
 #: ../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:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
 # GNOME-2-22
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Convertire il testo dei messaggi in _Unicode"
 
@@ -15909,21 +16900,27 @@ msgstr ""
 msgid "Bogofilter Options"
 msgstr "Opzioni di Bogofilter"
 
+# GNOME-2-24
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Plugin spazzatura Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra i messaggi spazzatura usando Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "Usare _SSL"
 
@@ -15943,18 +16940,20 @@ msgstr "Calendari locali"
 msgid "Provides core functionality for local calendars."
 msgstr "Fornisce le funzionalità di base per calendari locali."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+# GNOME-2-24
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "Aggio_rna:"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "A_ggiornamento:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Connessione _sicura"
 
 # GNOME-2-20
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Nome utente:"
 
@@ -16055,26 +17054,94 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Rendere Evolution il client email predefinito?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Contrassegnare come cartella pre_definita"
+# GNOME-2-24
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr "Contrassegna come rubrica pre_definita"
+
+# GNOME-2-24
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr "Contrassegna come calendario pre_definito"
+
+# GNOME-2-24
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr "Contrassegna come elenco compiti pre_definito"
+
+# GNOME-2-24
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr "Contrassegna come elenco memo pre_definito"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
 msgstr "Sorgenti predefinite"
 
+# GNOME-2-24
 #: ../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 "Fornisce le funzionalità per contrassegnare un calendario o una rubrica come predefinito."
+
+#: ../plugins/email-custom-header/email-custom-header.c:558
+#, fuzzy
+msgid "_Custom Header"
+msgstr "Intestazione personalizzata"
+
+# GNOME-2-24
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Chiave"
+
+# GNOME-2-24
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valori"
+
+# GNOME-2-24
+#. 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 ""
+"Il formato per specificare un valore chiave di intestazione personalizzata è:\n"
+"Nomi dei valori chiave intestazione personalizzata separati da \";\"."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#, fuzzy
+msgid "Email Custom Header"
+msgstr "Intestazioni personalizzate"
+
+# GNOME-2-24
+#. 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 "Aggiunge un'intestazione personalizzata ai messaggi in uscita."
+
+# GNOME-2-24
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Intestazione personalizzata"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+msgid "List of Custom Headers"
+msgstr "Intestazioni personalizzate"
+
+#: ../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 ""
-"Fornisce le funzionalità per contrassegnare un calendario o una rubrica come "
-"predefiniti."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16093,12 +17160,12 @@ msgid "_User:"
 msgstr "_Utente:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Password sicura"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16106,11 +17173,11 @@ msgstr ""
 "Questa opzione permette connessioni al server Exchange usando una "
 "autenticazione con password sicura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Password testo semplice"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16119,12 +17186,12 @@ msgstr ""
 "autenticazione standard con password in testo semplice."
 
 # GNOME-2-22
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Fuori sede"
 
 # GNOME-2-22
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -16133,86 +17200,91 @@ msgstr ""
 "persona da cui si riceve posta mentre si è fuori dalla sede."
 
 # GNOME-2-22
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Sono fuori sede"
 
 # GNOME-2-22
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Sono in sede"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Cambia la password per l'account Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Cambia la password"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gestisce le impostazioni dei delegati per l'account Exchange"
 
 # GNOME-2-20
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Assistente di delegazione"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Varie"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Visualizza la dimensione di tutte le cartelle Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Dimensione cartelle"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Impostazioni Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL O_WA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utentica"
 
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_Posta"
+
 # GNOME-2-22
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipo di _autenticazione"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Verifica _tipi supportati"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 kB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16224,7 +17296,7 @@ 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"
@@ -16232,7 +17304,7 @@ msgstr ""
 "La password attuale non corrisponde alla password esistente per il proprio "
 "account. Inserire la password corretta"
 
-#: ../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 "Le due password non corrispondono. Re-inserire le password."
 
@@ -16253,38 +17325,38 @@ msgid "Your current password has expired. Please change your password now."
 msgstr ""
 "La password attualmente in uso è scaduta. È opportuno cambiarla subito."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "La password in uso scadrà tra %d giorni"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Redattore (lettura, creazione, modifica)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autore (lettura, creazione)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisore (sola lettura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permessi di delega"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permessi per %s"
@@ -16293,7 +17365,7 @@ msgstr "Permessi per %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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -16305,7 +17377,7 @@ msgstr ""
 # NEW
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Sono stati accordati i seguenti permessi sulle mie cartelle:"
 
@@ -16313,7 +17385,7 @@ msgstr "Sono stati accordati i seguenti permessi sulle mie cartelle:"
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Inoltre ti è permesso vedere i miei oggetti privati."
 
@@ -16321,53 +17393,53 @@ msgstr "Inoltre ti è permesso vedere i miei oggetti privati."
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Comunque non ti è permesso vedere i miei oggetti privati."
 
 # NEW
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sei stato scelto come un delegato per %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delega a"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Rimuovere il delegato %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Impossibile accedere ad Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Impossibile trovare se stessi in Active Directory"
 
-#: ../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 "Impossibile trovare il delegato %s in Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Impossibile rimuovere il delegato %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Impossibile aggiornare l'elenco dei delegati."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Impossibile aggiungere il delegato %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Errore nel leggere l'elenco dei delegati."
 
@@ -16416,20 +17488,26 @@ msgstr "Ria_ssumere i permessi"
 msgid "_Tasks:"
 msgstr "Compi_ti:"
 
-#: ../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
 msgid "Permissions..."
 msgstr "Permessi..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Nome della cartella"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Dimensione cartelle"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+# GNOME-2-24
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+msgid "User"
+msgstr "Utente"
+
+#: ../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 "Sottoscrivi cartella di altro utente"
@@ -16438,20 +17516,20 @@ msgstr "Sottoscrivi cartella di altro utente"
 msgid "Exchange Folder Tree"
 msgstr "Albero cartelle Exchange"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "Annulla sottoscrizione cartella..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Annullare veramente la sottoscrizione alla cartella «%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Annullamento sottoscrizione a «%s»"
@@ -16522,15 +17600,18 @@ msgstr "La password in uso scadrà tra 7 giorni..."
 msgid "_Change Password"
 msgstr "_Cambia password"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Permesso negato)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Aggiungi utente:"
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Aggiungi utente"
 
@@ -16649,16 +17730,11 @@ msgstr "_Reattività: "
 msgid "_User"
 msgstr "_Utente"
 
-# GNOME-2-20
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Selezione utente"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Rubrica..."
 
@@ -16671,8 +17747,9 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Sottoscrivi calendario di altro utente"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+#, fuzzy
 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 ""
 "Un plugin per la gestione di una raccolta di funzioni e operazioni "
@@ -16768,10 +17845,14 @@ msgid "Could not update out-of-office state"
 msgstr "Impossibile aggiornare lo stato fuori-sede"
 
 #: ../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 "L'account Exchange è fuori rete."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16798,32 +17879,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Aggiornamento delegati fallito:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "La cartella esiste già"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "La cartella non esiste"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "La cartella è fuori rete"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: ../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 "Il server Global Catalog non è raggiungibile"
 
-#: ../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."
@@ -16831,76 +17912,76 @@ msgstr ""
 "Se OWA è un esecuzione su un percorso diverso, è necessario specificarlo nel "
 "dialogo di configurazione dell'account."
 
-#: ../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 "La casella di posta per {0} non è su questo server."
 
-#: ../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 "Assicurarsi che l'URL sia corretto e provare di nuovo."
 
-#: ../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 "Assicurarsi che il nome del server sia corretto e provare di nuovo."
 
-#: ../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 ""
 "Assicurarsi che il nome utente e la password siano corretti e provare di "
 "nuovo."
 
-#: ../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 "Nessun server Global Catalog configurato per questo account."
 
-#: ../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 "Nessuna casella di posta per l'utente {0} su {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Nessun utente {0}"
 
-#: ../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 "Password cambiata con successo."
 
 # GNOME-2-20
-#: ../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 ""
 "Inserire un ID di delegato oppure deselezionare l'opzione «Invia come "
 "delegato»."
 
-#: ../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 "Assicurarsi che il nome del server Global Catalog sia corretto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Riavviare Evolution affinché le modifiche abbiano effetto"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Selezionare un utente."
 
-#: ../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 "Il server ha rigettato la password perché è troppo semplice."
 
-#: ../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 "L'account Exchange verrà disabilitato all'uscita di Evolution."
 
-#: ../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 "L'account Exchange verrà rimosso all'uscita da Evolution."
 
-#: ../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 "Il server Exchange non è compatibile con Exchange Connector."
 
-#: ../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."
@@ -16908,7 +17989,7 @@ msgstr ""
 "Sul server è in esecuzione Exchange 5.5. Exchange Connector\n"
 "supporta solo Microsoft Exchange 2000 e 2003."
 
-#: ../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"
@@ -16922,63 +18003,64 @@ msgstr ""
 "\n"
 "Oppure, semplicemente, che si è digitata la password sbagliata."
 
-#: ../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 "Provare di nuovo con una password diversa."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Impossibile aggiungere l'utente alla ACL:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Impossibile modificare i delegati."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Errore sconosciuto nel cercare {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tipo sconosciuto"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operazione non supportata"
 
-#: ../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 ""
 "Si è prossimi alla quota a disposizione per la memorizzazione di email su "
 "questo server."
 
 # NEW
-#: ../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 ""
 "Ti è permesso inviare un messaggio per conto di un solo delegante per volta."
 
-#: ../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 "Impossibile rendersi un delegato di se stesso."
 
-#: ../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 ""
 "Si è ecceduta la quota a disposizione per la per la memorizzazione di email "
 "su questo server. "
 
-#: ../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 "È possibile configurare solo un singolo account Exchange."
 
-#: ../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."
@@ -16986,7 +18068,7 @@ msgstr ""
 "La porzione al momento in uso è {0} kB. Provare a liberare dello spazio "
 "eliminando alcune email."
 
-#: ../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."
@@ -16994,7 +18076,7 @@ msgstr ""
 "La porzione al momento in uso è {0} kB. Non sarà possibile inviare o "
 "ricevere email per ora."
 
-#: ../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."
@@ -17002,19 +18084,19 @@ msgstr ""
 "La porzione al momento in uso è {0} kB. Non sarà possibile inviare email "
 "prima di aver liberato dello spazio eliminando alcune email."
 
-#: ../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 "La password è scaduta."
 
-#: ../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 "Non è possibile aggiungere {0} ad una ACL"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} è già un delegato"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} è già nell'elenco."
 
@@ -17026,6 +18108,16 @@ msgstr "Sottoscrivi compiti di altro utente"
 msgid "Check folder permissions"
 msgstr "Verifica permessi della cartella"
 
+# GNOME-2-24
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Editor esterno predefinito"
+
+# GNOME-2-24
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "Il comando predefinoto che deve essere usato come editor."
+
 # GNOME-2-22
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
@@ -17041,9 +18133,32 @@ msgstr ""
 msgid "External Editor"
 msgstr "Editor esterno"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Impossibile creare la directory temporanea per il salvataggio."
+
+# GNOME-2-24
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Editor non lanciabile"
+
+#: ../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 ""
+
 # GNOME-2-22
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
+#, fuzzy
+msgid "Compose in _External Editor"
 msgstr "Componi in editor esterno"
 
 # GNOME-2-22
@@ -17051,18 +18166,32 @@ msgstr "Componi in editor esterno"
 msgid "Compose messages using an external editor"
 msgstr "Compone i messaggi usando un editor esterno"
 
+# GNOME-2-24
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr "Comando da eseguire per lanciare l'editor:"
+
+# GNOME-2-24
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Per Emacs usare \"xemacs\"\n"
+"Per VI usare \"gvim\""
+
 # GNOME-2-20
-#: ../plugins/face/face.c:57
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Selezionare un png (48×48) di dimensione < 700 byte"
 
 # GNOME-2-20
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "File PNG"
 
 # GNOME-2-20
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Faccia"
 
@@ -17103,22 +18232,64 @@ msgid "_Unsubscribe"
 msgstr "_Annulla sottoscrizione"
 
 # GNOME-2-22
-#: ../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
 msgid "Google"
 msgstr "Google"
 
-# GNOME-2-22
+# GNOME-2-24
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Inserire come primo il nome utente."
+
+# GNOME-2-24
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Inserire la password dell'utente %s per accedere all'elenco dei calendari sottoscritti."
+
+# GNOME-2-24
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Impossibile leggere i dati dal server Google.\n"
+"%s"
+
+# GNOME-2-24
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "Cal_endario:"
+
+# GNOME-2-24
+# pulsante
+# FIXME errata capitalizzazione originale
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "_Recupera elenco"
+
+# GNOME-2-24
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Server</b>"
+
+# GNOME-2-24
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Un plugin per impostare calendari google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un plugin per impostare i calendari e i contatti google."
 
 # GNOME-2-22
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Sorgenti Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Elenco"
 
@@ -17163,16 +18334,16 @@ msgstr "Installa la cartella condivisa"
 msgid "Shared Folder Installation"
 msgstr "Installazione cartella condivisa"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Impostazioni posta indesiderata"
 
-#: ../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 "Impostazioni posta indesiderata"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Impostazioni posta indesiderata..."
 
@@ -17198,10 +18369,21 @@ msgid "_Junk List"
 msgstr "Elenco in_desiderata"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Stato messaggio"
+
+#: ../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 "Messaggio revocato con successo"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Revoca email"
 
@@ -17209,12 +18391,6 @@ msgstr "Revoca email"
 msgid "Add Send Options to groupwise messages"
 msgstr "Aggiunge «Opzioni di invio» ai messaggi groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opzioni di invio"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un plugin per le funzionalità negli account GroupWise."
@@ -17223,7 +18399,86 @@ msgstr "Un plugin per le funzionalità negli account GroupWise."
 msgid "Groupwise Features"
 msgstr "Funzionalità Groupwise"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Messaggio revocato con successo"
+
+#: ../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 "Converte il messaggio selezionato in un nuovo compito"
+
+# GNOME-2-24
+#: ../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 "Utente non valido"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Impossibile salvare sul file «{0}»."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Selezione utente"
+
+# NEW
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#, fuzzy
+msgid "You have already given proxy permissions to this user."
+msgstr "Sono stati accordati i seguenti permessi sulle mie cartelle:"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "Una cartella di nome «{0}» esiste già. Usare un nome differente."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "La sigla esiste già"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+#, fuzzy
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr "Una cartella di nome «{0}» esiste già. Usare un nome differente."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "Rendi questo un evento ricorrente"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Salvare le modifiche apportate?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Salvare le modifiche apportate?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Impossibile salvare il file di salvataggio automatico «{0}»."
+
+#: ../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 ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Accetta con riserva"
 
@@ -17242,7 +18497,7 @@ msgid "Con_tacts..."
 msgstr "Con_tatti..."
 
 #: ../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 "Messaggio"
 
@@ -17325,9 +18580,9 @@ msgstr "<b>Nome dell'account</b>"
 msgid "Proxy Login"
 msgstr "Login proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17336,40 +18591,45 @@ msgstr "%sInserire la password per %s (utente %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:509
 msgid "_Proxy Login..."
 msgstr "_Login proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "La scheda Proxy è disponibile solo quando l'account è in rete."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "La scheda Proxy è disponibile solo quando l'account è abilitato."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Utenti"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Inserire gli utenti e impostare i permessi"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "_Nuova cartella condivisa..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+# GNOME-2-24
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Notifica personalizzata"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Aggiungi   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modifica"
 
@@ -17445,11 +18705,11 @@ msgstr "Un plugin per impostare sorgenti di calendario hula."
 msgid "Hula Account Setup"
 msgstr "Impostazione account Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Intestazioni personalizzate"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Intestazioni IMAP"
 
@@ -17504,28 +18764,28 @@ msgstr "Un plugin per le funzionalità negli account IMAP."
 msgid "IMAP Features"
 msgstr "Funzionalità IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Importa nel calendario"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Importa nei compiti"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Importa ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Selezione elenco di compiti"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Selezione calendario"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importa"
 
@@ -17567,14 +18827,15 @@ msgstr ""
 "Non è stato possibile per Evolution trovare un iPod con cui sincronizzarsi. "
 "È possibile che l'iPod non sia connesso al sistema o che non sia acceso."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 # GNOME-2-22
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Sincronizza il compito/memo/calendario/rubrica selezionato con un Apple iPod"
 
@@ -17586,138 +18847,138 @@ msgstr "Sincronizza su iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronizzazione iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Caricamento del calendario «%s» fallito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Un appuntamento nel calendario «%s» è in conflitto con questa riunione"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Trovato l'appuntamento nel calendario «%s»."
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Impossibile trovare alcun calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Impossibile trovare questa riunione in alcun calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Impossibile trovare questo compito in alcun elenco di compiti"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Impossibile trovare questo memo in alcun elenco di memo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Ricerca di una versione esistente di questo appuntamento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Impossibile elaborare la voce"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Impossibile inviare la voce al calendario «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Inviata al calendario «%s» come accettato"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Inviata al calendario «%s» come tentativo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Inviata al calendario «%s» come declinata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Inviata al calendario «%s» come annullata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organizzatore ha rimosso il delegato %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Invia una notifica di annullamento al delegato"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Impossibile inviare una notifica di annullamento al delegato"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante perché lo stato non è "
 "valido!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossibile aggiornare il partecipante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Stato del partecipante aggiornato"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Informazioni sulla riunione inviate"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Informazioni sul compito inviate"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Informazioni sul memo inviate"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Impossibile inviare informazioni sulla riunione, la riunione non esiste"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Impossibile inviare informazioni sul compito, il compito non esiste"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossibile inviare informazioni sul memo, il memo non esiste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Il calendario allegato non è valido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17725,15 +18986,15 @@ msgstr ""
 "Il messaggio dichiara di contenere un calendario, ma il calendario non è un "
 "iCalendar valido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "La voce nel calendario non è valida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17741,11 +19002,11 @@ msgstr ""
 "Il messaggio contiene un calendario ma il calendario non contiene eventi, "
 "compiti o informazioni sulla disponibilità"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Il calendario allegato contiene voci multiple"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17770,220 +19031,220 @@ msgstr "Questo memo è ricorrente"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "Eliminare il messaggio _dopo l'azione"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Ricerca conflitti"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleziona i calendari per cercare gli appuntamenti in conflitto"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Oggi"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Oggi alle %k.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Oggi alle %k.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Oggi alle %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Domani"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Domani alle %k.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Domani alle %k.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Domani alle %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Domani alle %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A alle %k.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A alle %k.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A alle %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A alle %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B alle %k.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B alle %k.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B alle %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:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B alle %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y alle %k.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y alle %k.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y alle %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y alle %l.%M.%S %p"
 
 # NEW
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Rispondere per conto di <b>%s</b>"
 
 # NEW
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Ricevuta per conto di <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> attraverso %s ha pubblicato le seguenti informazioni sulla "
 "riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ha pubblicato se seguenti informazioni sulla riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ha delegato a te la seguente riunione a Voi:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> attraverso %s richiede la Vostra presenza alla seguente riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> richiede la Vostra presenza alla seguente riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> attraverso %s desidera aggiungersi ad una riunione esistente:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desidera aggiungersi ad una riunione esistente:"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17992,7 +19253,7 @@ msgstr ""
 "<b>%s</b> attraverso %s desidera ricevere le ultime informazioni sulla "
 "seguente riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18000,86 +19261,86 @@ msgstr ""
 "<b>%s</b> desidera ricevere le ultime informazioni sulla seguente riunione:"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> attraverso %s ha inviato indietro la seguente risposta di riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ha inviato indietro la seguente risposta di riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> attraverso %s ha annullato la seguente riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ha annullato la seguente riunione."
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> attraverso %s ha proposto le seguenti modifiche di riunione."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ha proposto le seguenti modifiche di riunione."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> attraverso %s ha declinato le seguenti modifiche di riunione:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ha declinato le seguenti modifiche di riunione."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> attraverso %s ha pubblicato il seguente compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ha pubblicato il seguente compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> richiede l'assegnamento di %s al seguente compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> attraverso %s Vi ha assegnato un compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> Vi ha assegnato un compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> attraverso %s desidera aggiungersi ad un compito esistente:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> desidera aggiungersi ad un compito esistente:"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18088,7 +19349,7 @@ msgstr ""
 "<b>%s</b> attraverso %s desidera ricevere le ultime informazioni per il "
 "seguente compito assegnato:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18098,7 +19359,7 @@ msgstr ""
 "assegnato:"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18106,24 +19367,24 @@ msgstr ""
 "<b>%s</b> attraverso %s ha inviato indietro la seguente risposta per il "
 "compito assegnato:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> ha inviato indietro la seguente risposta per il compito assegnato:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> attraverso %s ha annullato il seguente compito assegnato:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ha annullato il seguente compito assegnato:"
 
 # GNOME-2-20
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18131,103 +19392,103 @@ msgstr ""
 "<b>%s</b> attraverso %s ha proposto le seguenti modifiche all'assegnamento "
 "del compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> ha proposto le seguenti modifiche all'assegnamento del compito:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> attraverso %s ha declinato il seguente compito assegnato:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ha declinato il seguente compito assegnato:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> attraverso %s ha pubblicato il seguente memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ha pubblicato il seguente memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> attraverso %s desidera aggiungersi ad un memo esistente:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> desidera aggiungersi ad un memo esistente:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> attraverso %s ha annullato il seguente memo condiviso:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ha annullato il seguente memo condiviso:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Apri calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Rifiuta"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Accetta"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Rifiuta tutti"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Provvisori tutti"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Provvisorio"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Accetta tutti"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Invia informazioni"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "A_ggiorna stato partecipante"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "A_ggiorna"
 
@@ -18339,8 +19600,10 @@ msgstr "Genera un messaggio D-Bus all'arrivo di nuovi messaggi di posta."
 
 # GNOME-2-22
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Se impostata a VERO, allora emette un avviso acustico, altrimenti riproduce "
 "un file audio quando arrivano nuovi messaggi."
@@ -18409,9 +19672,19 @@ msgstr ""
 msgid "Generate a _D-Bus message"
 msgstr "Generare un messaggio _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Notifica posta"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Notifica posta"
+
 # GNOME-2-22
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18427,63 +19700,64 @@ msgstr[1] ""
 "in %s."
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "È stato ricevuto %d nuovo messaggio."
 msgstr[1] "Sono stati ricevuti %d nuovi messaggi."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Nuova email"
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Mostrare l'icona nell'area di _notifica"
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Far lampeggiare l'icona nell'area di notifica"
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Far comparire un _messaggio assieme all'icona"
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Riprodurre un suono all'arrivo di nuovi messaggi"
 
 # GNOME-2-20
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "A_vviso acustico"
 
-# GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:633
+# GNOME-2-24
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
-msgstr "Riproduci _file audio"
+msgstr "Riprod_urre un file audio"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+# GNOME-2-24
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
-msgstr "Specifica nome del _file:"
+msgstr "Specificare il nome _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Selezione file audio"
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Ri_produci"
 
 # GNOME-2-22
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificare _solo i nuovi messaggi in «In arrivo»"
 
@@ -18518,13 +19792,13 @@ msgid "Mail to meeting"
 msgstr "Email in riunione"
 
 # GNOME-2-22
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Impossibile aprire il calendario. %s"
 
 # GNOME-2-22
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18637,9 +19911,10 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Inviare un messaggio email alla mailing list?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18729,6 +20004,43 @@ msgstr "_Sottoscrivi alla lista"
 msgid "_Unsubscribe from List"
 msgstr "__Annullamento sottoscrizione lista"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Spostamento messaggi nella cartella %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 ""
+"In questo modo tutti i messaggi nella cartella selezionata e nelle sue "
+"sottocartelle verranno contrassegnati come letti."
+
+# GNOME-2-22
+#
+# Pulsante, in dialogo contrassegna come letti
+# in cartella corrente e sottocartelle
+#
+#    <big>Mark all messages in this folder and subfolders
+#    as read?</big>
+#
+#    Do you want the operation to be performed
+#    also in the subfolders?
+#
+#    	      (Only on _Current Folder)  (...)
+#
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "_Cartella corrente e sottocartelle"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Cartella corrente"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Contrassegna tutto come letto"
@@ -18776,7 +20088,7 @@ msgstr "Un plugin per gestire l'abilitazione e la disabilitazione dei plugin."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Gestore plugin"
 
@@ -18788,36 +20100,26 @@ msgstr "Abilita e disabilita plugin"
 msgid "_Plugins"
 msgstr "_Plugin"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autore/i"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Descrizione"
+# GNOME-2-22
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Configurazione"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: alcuni cambiamenti non avranno effetto fino al riavvio"
 
 # GNOME-2-22
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Panoramica"
 
-# GNOME-2-22
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configurazione"
-
-# GNOME-2-22
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Non vi è alcuna opzione di configurazione per questo plugin."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -18842,43 +20144,23 @@ msgstr "Modalità testo semplice"
 msgid "Prefer plain-text"
 msgstr "Preferisci il testo semplice"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Mostra HTML se presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Preferisci testo semplice"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Mostra sempre e solo testo semplice"
 
 # GNOME-2-22
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "M_odalità HTML"
 
-# GNOME-2-22
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Fornisce un'opzione per stampare le email dal compositore."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Stampa messaggio"
-
-#: ../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 "Antepri_ma di stampa"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Stampa questo messaggio"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Profiler di Evolution"
@@ -18903,13 +20185,7 @@ msgstr "Posizioni"
 msgid "_Publish Calendar Information"
 msgstr "_Pubblica informazioni calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Inserire la password per `%s'"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Rimuovere veramente questo URL?"
 
@@ -18997,17 +20273,82 @@ msgstr ""
 "iCal\n"
 "Libero/Occupato"
 
+#: ../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 ""
+
 # NEW
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (incorporato)"
 
+# GNOME-2-24
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin non trovato, codice: %d"
+
+# GNOME-2-24
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Creazione pipe non riuscita: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Errore su %s:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Opzioni di invio non disponibili."
+
 # NEW
-#: ../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:865
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Ciò renderà Spamassassin più affidabile, ma anche più lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "I_ncludere controlli remoti"
 
@@ -19038,7 +20379,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:314
 msgid "Save attachments"
 msgstr "Salva allegati"
 
@@ -19050,16 +20391,15 @@ msgstr "Salva allegati..."
 msgid "Save all attachments"
 msgstr "Salva tutti gli allegati"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Selezionare nome base di salvataggio"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Tipo 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:347
 msgid "Save"
 msgstr "Salva"
 
@@ -19067,79 +20407,79 @@ msgstr "Salva"
 #. * 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:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Elenco descrizione"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Elenco categorie"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Elenco commenti"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Creato"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Elenco contatti"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Inizio"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Termine"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "Percentuale completata"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Elenco partecipanti"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modificato"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Opzioni avanzate per il formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Preponi un'intestazione"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Delimitatore di valore:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Delimitatore di record:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Incapsula valori con:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Formato valori separati da virgole (.csv)"
 
@@ -19160,15 +20500,15 @@ msgstr "Salva su _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:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Seleziona file di destinazione"
 
@@ -19196,22 +20536,23 @@ msgid "Show _only this Task List"
 msgstr "Mostra s_olo questo elenco di compiti"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Un plugin che gestisce l'assistente di primo avvio."
+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 "Assistente di primo avvio"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Assistente"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Assistente di configurazione di Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Benvenuti"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19224,36 +20565,37 @@ msgstr ""
 "\n"
 "Fare clic sul pulsante \"Avanti\" per continuare. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importazione dei file"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Selezionare le informazioni che si desidera importare:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Da %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importazione dati."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Attendere"
 
 # GNOME-2-22
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Indica se il raggruppamento dei messaggi debba fare ricorso all'oggetto."
+msgstr ""
+"Indica se il raggruppamento dei messaggi debba fare ricorso all'oggetto."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19265,10 +20607,40 @@ msgstr "Raggruppa i messaggi per oggetto"
 
 # GNOME-2-22
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Fare ricorso a raggruppamento dei messaggi per _oggetto"
 
+# GNOME-2-24
+#: ../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 "Elenco delle coppie parola chiave/valore da sostituire nel corpo di un messaggio per il plugin Modelli."
+
+# GNOME-2-24
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "Nessun titolo"
+
+# GNOME-2-24
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Salva come m_odello"
+
+# GNOME-2-24
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Salva come modello"
+
+# GNOME-2-24
+# oh, lo so che non vuol dire un ca##o, ma 
+# il mio compito è tradurre, no?
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#, fuzzy
+msgid "Drafts based template plugin"
+msgstr "Plugin per bozze basate su modelli"
+
 # GNOME-2-20
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
@@ -19281,6 +20653,33 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "Decoder allegati TNEF"
 
+# GNOME-2-24
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un plugin per impostare i contatti WebDAV."
+
+# GNOME-2-24
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contatti WebDAV"
+
+# GNOME-2-24
+#: ../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 "WebDAV"
+
+# GNOME-2-24
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+# GNOME-2-24
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Evitare IfMatch (necessario per apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Shell di Evolution"
@@ -19297,19 +20696,18 @@ msgstr "Prova di Evolution"
 msgid "Evolution Test component"
 msgstr "Componente di prova di Evolution"
 
-# GNOME-2-22
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Una stringa che descrive le impostazioni attuali della stampante"
+msgid "Authenticate proxy server connections"
+msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "Versione configurazione"
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Riconoscimento automatico collegamento"
 
-# GNOME-2-22
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Decide se eseguire o no il rilevamento del crash."
+msgid "Configuration version"
+msgstr "Versione configurazione"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -19327,45 +20725,112 @@ msgstr "Stato predefinito finestra"
 msgid "Default window width"
 msgstr "Larghezza predefinita finestra"
 
+# GNOME-2-24
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Abilita le impostazioni del proxy quando si accede a HTTP/Secure HTTP attraverso Internet."
+
+# GNOME-2-24
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr "Nome host proxy HTTP"
+
+# GNOME-2-24
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr "Password proxy HTTP"
+
+# GNOME-2-24
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "Porta proxy HTTP"
+
+# GNOME-2-24
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "Nome utente proxy HTTP"
+
+#: ../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 alias del componente da visualizzare per default all’avvio."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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 "Ultima versione aggiornata di configurazione"
 
 # GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Elenco dei percorsi delle cartelle da sincronizzare su disco per l’uso fuori "
 "rete"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../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 ""
+
+# GNOME-2-22
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "Configurazione"
+
+#: ../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 "Il riquadro laterale è visibile"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Omette dialogo avvertimento sviluppo"
 
 # GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "Omette dialogo avvertimento recupero"
-
-# GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Avvia in modalità fuori rete"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "La barra di stato è visibile"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19373,19 +20838,19 @@ msgstr ""
 "La versione di configurazione di Evolution, con livello major/minor/"
 "configurazione (per esempio \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "L'altezza predefinita della finestra principale, in pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "La larghezza predefinita della finestra principale, in pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "La larghezza predefinita del riquadro laterale, in pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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\")."
@@ -19393,7 +20858,37 @@ msgstr ""
 "L'ultima versione aggiornata di configurazione, con livello major/minor/"
 "configurazione (per esempio \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../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 "
@@ -19403,58 +20898,71 @@ msgstr ""
 "\"both\", \"toolbar\". Se impostata a \"toolbar\", lo stile dei pulsanti è "
 "determinato dalle impostazioni di GNOME per le barre strumenti."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 "Barra degli strumenti visibile"
 
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Ultima versione aggiornata di configurazione"
+
+#: ../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 ""
+
 # GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica se Evolution è avviato in modalità fuori rete invece che in modalità "
 "in rete."
 
-# GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr "Indica se eseguire o no il rilevamento dei crash"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Indica se la finestra deve essere massimizzata oppure no."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Indica se il riquadro laterale deve essere visibile."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Indica se la barra di stato deve essere visibile."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Indica se la barra degli strumenti deve essere visibile."
 
 # GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Indica se è omesso il dialogo di avvertimento nelle versioni di sviluppo di Evolution."
-
-# GNOME-2-22
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Indica se è omesso il dialogo di avvertimento nel recupero di Evolution."
+msgstr ""
+"Indica se è omesso il dialogo di avvertimento nelle versioni di sviluppo di "
+"Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Indica se i pulsanti finestra devono essere visibili."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Stile pulsanti finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Pulsanti finestra sono visibili"
 
@@ -19473,17 +20981,15 @@ msgstr ""
 "Fare clic su «OK» per chiudere queste connessioni e passare alla modalità "
 "fuori rete"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Scegliere il tipo di utility di importazione da eseguire:"
 
-#: ../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 ""
 "Scegliere il file che si desidera importare in Evolution e selezionarne il "
 "tipo dall’elenco.\n"
@@ -19491,11 +20997,11 @@ msgstr ""
 "Se non si conosce il tipo, è possibile selezionare \"Automatico\" in modo "
 "che Evolution tenti di riconoscerlo."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Scegliere la destinazione dell’importazione"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -19507,23 +21013,23 @@ msgstr ""
 "Non è stata trovata alcuna impostazione da importare.\n"
 "Per provare ancora fare clic sul pulsante «Indietro».\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Nome _file:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Tipo file:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importa dati e impostazioni da programmi _precedenti"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importa un _singolo file"
 
@@ -19531,54 +21037,34 @@ msgstr "Importa un _singolo file"
 msgid "Evolution Preferences"
 msgstr "Preferenze di Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Nessun nome di cartella specificato."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Il nome della cartella non può contenere il carattere di a capo."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Il nome della cartella non può contenere il carattere \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Il nome della cartella non può contenere il carattere \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' e '..' sono nomi di cartelle riservati."
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 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 "Gli strumenti Pilot di GNOME non sono installati in questo sistema."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Errore nell'eseguire %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy non è installato."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Impossibile eseguire 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:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Responsabile traduzione:\n"
@@ -19593,74 +21079,80 @@ msgstr ""
 "  * tutti i revisori del TP\n"
 "  * Ettore Perazzoli, perso, ma mai dimenticato"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Sito web di Evolution"
 
 # GNOME-2-22
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Errore nell'aprire la pagina web delle FAQ."
 
 # GNOME-2-22
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Lavora in _rete"
 
 # GNOME-2-22
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Lavora fuori _rete"
 
 # GNOME-2-22
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Lavora fuori rete"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution è attualmente in rete. Fare clic su questo pulsante per lavorare "
 "fuori rete."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution sta per passare alla modalità fuori rete."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution è attualmente fuori rete. Fare clic su questo pulsante per "
 "lavorare in rete."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Passa a %s"
 
 # GNOME-2-22
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Errore di sistema sconosciuto."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld kB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare su OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Database di configurazione non trovato"
 
@@ -19670,15 +21162,17 @@ msgstr "Database di configurazione non trovato"
 msgid "New"
 msgstr "Nuovo"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nuova prova"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#, fuzzy
+msgctxt "New"
 msgid "_Test"
 msgstr "_Prova"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Crea un nuovo elemento di prova"
 
@@ -19722,7 +21216,7 @@ msgstr ""
 "l’importazione di file esterni in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19758,7 +21252,7 @@ msgstr ""
 "migliorato\n"
 "grazie al contributo degli utenti.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19766,73 +21260,45 @@ msgstr ""
 "Grazie\n"
 "il team di Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Non ripetere il messaggio in futuro"
 
-# GNOME-2-22
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr "Rilevamento crash di Evolution"
-
-# GNOME-2-22
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "I_gnora"
-
-# GNOME-2-22
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Sembra che Evolutions sia terminato in modo inatteso l'ultima volta che\n"
-"è stato eseguito. Come misura precauzionale, tutti i riquardi di anteprima\n"
-"saranno nascosti. È possibile ripristinare tali pannelli dal menù "
-"Visualizza.\n"
-
-# GNOME-2-22
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "_Non mostrare questo messaggio in futuro."
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Avvia Evolution e attiva il componente specificato"
 
 # GNOME-2-22
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Avvia in modalità in rete"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forza la chiusura di tutti i componenti di Evolution"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza la migrazione da Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Invia l’output di debug di tutti i componenti a un file."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Disabilita il caricamento di qualsiasi plugin."
 
 # NEW
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disabilita il riquadro anteprima di Posta, Contatti e Compiti."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Il client di posta elettronica e PIM Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19979,7 +21445,7 @@ msgstr ""
 "Scegliendo di continuare, potrebbe non essere più possibile accedere ad "
 "alcuni dati precedenti.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19990,7 +21456,7 @@ msgstr ""
 "\n"
 "Modificare le impostazioni di trust:"
 
-#: ../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 "
@@ -20000,7 +21466,7 @@ msgstr ""
 "certificato, allora ti fidi dell'autenticità di questo certificato a meno "
 "che qui non sia altrimenti specificato"
 
-#: ../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 "
@@ -20061,22 +21527,27 @@ msgstr "Indirizzo email"
 msgid "All CA certificate files"
 msgstr "Tutti i file certificato CA"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizzatore certificato: %s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Inserire la password per «%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 "Inserire una nuova password per il database dei certificati"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Inserire una nuova password"
 
 #. 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"
@@ -20085,7 +21556,7 @@ msgstr ""
 "Spedito a:\n"
 "  Soggetto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20094,7 +21565,7 @@ msgstr ""
 "Spedito da:\n"
 "  Soggetto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Seleziona certificato"
 
@@ -20285,7 +21756,7 @@ msgid "_Edit CA Trust"
 msgstr "_Modifica la fiducia nella AC"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Il certificato esiste già"
 
@@ -20453,15 +21924,15 @@ msgstr "ID univoco destinatario"
 msgid "Certificate Signature Value"
 msgstr "Valore firma certificato"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "File delle password PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Inserire la password per il file PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Certificati importati"
 
@@ -20494,8 +21965,7 @@ msgstr "Cop_ia ogni contatto su..."
 msgid "Contact _Preview"
 msgstr "Ante_prima contatto"
 
-#: ../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 "Copia"
@@ -20517,11 +21987,11 @@ msgid "Copy to Folder..."
 msgstr "Copia nella cartella..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+#, fuzzy
+msgid "Create a new address book folder"
 msgstr "Crea una nuova cartella rubrica"
 
-#: ../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 "Taglia"
@@ -20562,8 +22032,7 @@ msgstr "Sposta i contatti della cartella selezionata in un'altra cartella"
 msgid "Move to Folder..."
 msgstr "Sposta nella cartella..."
 
-#: ../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 "Incolla"
@@ -20600,13 +22069,11 @@ msgstr "Salva i contatti selezionati come VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Salva i contatti della cartella selezionata come VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Seleziona tutto"
 
 #: ../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 "Selezion_a tutto"
 
@@ -20675,7 +22142,7 @@ msgstr "S_posta contatto su..."
 msgid "_Move Folder Contacts To"
 msgstr "_Sposta cartella contatti su..."
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nuovo"
 
@@ -20736,7 +22203,7 @@ msgid "Month"
 msgstr "Mese"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Successivo"
 
@@ -20745,7 +22212,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Anteprima del calendario da stampare"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Precedente"
 
@@ -20813,235 +22280,6 @@ msgstr "Settimana lavorativa"
 msgid "_Open Appointment"
 msgstr "_Apri appuntamento"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copia il testo selezionato negli appunti"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Copia la selezione negli appunti"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Taglia il testo selezionato negli appunti"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Taglia la selezione negli appunti"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Incolla dagli appunti"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Incolla il testo dagli appunti"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Seleziona tutto il testo"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Allega"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Fare clic qui per allegare un file"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Fare clic qui per chiudere la finestra corrente"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Fare clic qui per salvare la finestra corrente"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Fare clic qui per mostrare l'aiuto disponibile"
-
-#.
-#. <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 "Chiudi"
-
-# GNOME-2-22
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Inse_risci"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Allegato..."
-
-#: ../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 "_Chiudi"
-
-#: ../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:42
-msgid "_File"
-msgstr "_File"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "A_iuto"
-
-# GNOME-2-22
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "Op_zioni"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Intera giornata"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "E_vento intera giornata"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Classifica come confidenziale"
-
-#: ../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 "Classifica come privato"
-
-#: ../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 "Classifica come pubblico"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Fare clic qui per impostare o azzerare gli allarmi per questo evento"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Inserisce opzioni di invio avanzate"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Rendi questo un evento ricorrente"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_bblico"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Interroga le informazioni libero/occupato per i partecipanti"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo Ru_olo"
-
-# GNOME-2-20
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opzioni di invio"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Mostra ora come occ_upato"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Fuso orario"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Commuta la visualizzazione del campo tipo partecipante"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Commuta la visualizzazione del campo RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Commuta la visualizzazione del campo ruolo"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Commuta la visualizzazione del campo stato"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Commuta la visualizzazione del fuso orario"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Commuta la visualizzazione delle categorie"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Commuta la presenza di evento intera giornata"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Commuta la visualizzazione del tempo come occupato"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Allarmi"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorie"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "C_lassificazione"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidenziale"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Libero/Occupato"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privato"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Ricorrenza"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Campo _stato"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Campo _tipo"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annulla l'operazione di posta in corso"
@@ -21073,7 +22311,6 @@ msgid "Empty _Trash"
 msgstr "S_vuota cestino"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "C_artella"
 
@@ -21304,7 +22541,7 @@ msgstr "Elenca per discussioni"
 msgid "_Group By Threads"
 msgstr "Raggruppa per _discussione"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "Me_ssaggio"
@@ -21642,131 +22879,127 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra un cursore lampeggiante nel corpo del messaggio"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Mostra i messaggi nello stile normale"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Mostra i messaggi con tutti gli header di email"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Mostra il sorgente email grezzo del messaggio"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Annulla l'eliminazione dei messaggi selezionati"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Non _importante"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Rid_uci ingrandimento"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "M_odalità con cursore"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "Pu_lisci contrassegno"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "Eli_mina messaggio"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "Tr_ova nel messaggio..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Contrassegna come co_mpletato"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Vai a"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Importante"
 
 # GNOME-2-22
 # INLINE
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "I_ncorporato"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "In_desiderato"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Carica _immagini"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Sorgente _messaggio"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "Messaggio s_uccessivo"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Dimensione _normale"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "Atten_dibile"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Apri in nuova finestra"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Messaggio _precedente"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citato"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Letto"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Salva messaggio..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Ripristina messaggio"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Non letto"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "In_grandimento"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Aum_enta ingrandimento"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Chiude questa finestra"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Chiudi"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21804,293 +23037,6 @@ msgstr "Visualizza il memo selezionato"
 msgid "_Open Memo"
 msgstr "_Apri memo"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Allega un file"
-
-#.
-#. <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 "Chiude il file corrente"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Elimina tutto tranne la sigla"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Cifra questo messaggio con PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-"Cifra questo messaggio con il proprio certificato di crittazione S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mato"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr ""
-"Ottiene una notifica di consegna quando il proprio messaggio viene letto"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Inserisce le opzioni di invio"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Apre un file"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Cifratura PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Firma PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "_Cifratura PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "_Firma PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "Richi_esta ricevute di lettura"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "Cifratura _S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Cifratura S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "Firma S/_MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Firma S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "In_via"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Salva come"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Salva bozza"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Sa_lva come..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Salva _bozza"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Salva come bozza"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Salva nella cartella..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Salva il file corrente"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Salva il file corrente con un nome diverso"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Salva il messaggio in una cartella specificata"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Invia"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Invia l'email nel formato HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Invia questo messaggio"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Imposta ad alta la priorità del messaggio"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Firma questo messaggio con la propria chiave PGP"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Firma questo messaggio con il proprio certificato di firma S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Commuta la visualizzazione del campo «CCN:»"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Commuta la visualizzazione del campo «CC:»"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Commuta la visualizzazione del selettore «Da:»"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Commuta la visualizzazione del campo «Pubblica-su»"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Commuta la visualizzazione del campo «Rispondi-a:»"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Commuta la visualizzazione del campo «A:»"
-
-# GNOME-2-22
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Campo CC_N"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Campo _CC"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Eli_mina tutto"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Campo _Da"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Apri..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Campo _Pubblica-su"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Priorità messaggio"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Campo _Rispondi-a"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Sicurezza"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Opzioni di invio"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "Campo _A"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Chiudi"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Salva e chiudi"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Salva e _chiudi"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Salva il file corrente e chiudi la finestra"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Aggiunge una cartella all'elenco di cartelle sottoscritte"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Aggiorna elenco"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Aggiorna elenco delle cartelle"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Rimuove la cartella dall'elenco delle cartelle sottoscritte"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Iscrizione"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Annulla iscrizione"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverti selezione"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Fare clic per cambiare/visualizzare i dettagli di stato del compito"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Dettagli stato"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fuso orario"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Dettagli di stato"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copia i compiti selezionati"
@@ -22296,53 +23242,59 @@ msgstr "Mostra/Nasconde il riquadro laterale"
 msgid "View/Hide the Status Bar"
 msgstr "Mostra/Nasconde la barra di stato"
 
+# GNOME-2-22
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "Lavora fuori rete"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Chiudi finestra"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Dimentica password"
 
 # GNOME-2-22
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Domande frequenti"
 
 # GNOME-2-22
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "Na_scondi pulsanti"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Solo _icone"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "Riferimenti _veloci"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Aspetto _selettore"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opzioni _sincronizzazione..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Solo _testo"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Finestra"
 
@@ -22419,11 +23371,11 @@ msgid "With _Status"
 msgstr "Con _stato"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -22440,8 +23392,8 @@ msgid "Select a Time Zone"
 msgstr "Selezionare un fuso orario"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Casella combinata fuso orario"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22453,19 +23405,19 @@ msgstr ""
 "selezionare un fuso orario.\n"
 "Usare il tasto destro per rimpicciolire."
 
-#: ../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 "Collezione"
 
-#: ../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 "Definisci viste per «%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 "Definisci viste"
 
@@ -22475,17 +23427,17 @@ msgid "Define Views for \"%s\""
 msgstr "Definisci viste per «%s»"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabella"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Istanza"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Salva vista attuale"
 
@@ -22499,7 +23451,7 @@ msgstr "_Sostituisci 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:354
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "Vista personalizzata"
 
@@ -22508,44 +23460,44 @@ msgid "Save Custom View"
 msgstr "Salva vista personalizzata"
 
 #: ../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 "Definisci viste..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Vista c_orrente"
 
 # GNOME-2-20
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Seleziona vista: %s"
 
 # NEW
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "La vista corrente è una vista personalizzata"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Salva vista personalizzata..."
 
 # NEW
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Salva attuale vista personalizzata"
 
 # NEW
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Crea o modica nuova viste"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabbrica"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definisci nuova vista"
 
@@ -22561,17 +23513,17 @@ msgstr "Tipo di vista"
 msgid "Type of view:"
 msgstr "Tipo di vista:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra allegati"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossibile allegare il file «%s»: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Impossibile allegare il file «%s»: non è un file regolare"
@@ -22593,33 +23545,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggerisce la visualizzazione automatica degli allegati"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Calendario mensile"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Colore riempimento"
 
 #: ../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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 msgid "GDK fill color"
 msgstr "Colore riempimento GDK"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Riempimento retinato"
 
@@ -22643,30 +23594,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "Larghezza minima"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "Larghezza minima"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Spaziatura"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Adesso"
 
-#: ../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 "La data deve essere nel formato: %s"
@@ -22676,152 +23627,151 @@ msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
 # NEW
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabo"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltico"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europeo centrale"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Cinese"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirillico"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Greco"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../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 "Europeo occidentale"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Europeo occidentale, nuovo"
 
-#: ../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 "Tradizionale"
 
-#: ../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 "Semplificato"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ucraino"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Visuale"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set di caratteri sconosciuto: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Codifica dei caratteri"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Inserire il set di caratteri da usare"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Altro..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Codifica dei c_aratteri"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Data ed ora"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Inserimento di testo per fornire una data"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Fare clic su questo pulsante per mostrare un calendario"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Caselle combinata per selezionare l'orario"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "A_desso"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Oggi"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Valore data non valido"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Valore ora non valido"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Espansa"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Chiedi se l'espansore è espanso"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Testo per l'etichetta dell'espansore"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Usa sottolineatura"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22829,107 +23779,119 @@ msgstr ""
 "Se impostata, una sottolineatura nel testo indica il prossimo carattere che "
 "dovrebbe essere usato per il tasto mnemonico di accelerazione"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Spazio da mettere tra l'etichetta e il figlio"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Widget etichetta"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget per mostrare al posto della solita etichetta espansa"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Dimensione espansore"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Dimensione della freccia espansore"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Spaziatura indicatore"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Spaziatura attorno la freccia dell'espansore"
 
 #. 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:748
+#: ../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 "Ricerca avanzata"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Salva ricerca"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Ricerche"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Ricerche"
 
-#: ../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 "_Salva ricerca..."
 
-#: ../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 "Modifica ric_erche salvate..."
 
-#: ../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 "_Ricerca avanzata..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Tutti gli account"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Account corrente"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Cartella corrente"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Messaggio corrente"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Scegli un'immagine"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mappamondo"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:629
+#, fuzzy
 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 ""
 "Mappa interattiva basata sul mouse per la selezione del fuso orario. Gli "
 "utenti che desiderino usare la tastiera per selezionare il fuso orario "
 "devono agire tramite il riquadro in basso."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+# GNOME-2-22
+# INLINE
+#: ../widgets/misc/e-online-button.c:109
+#, fuzzy
+msgid "Online"
+msgstr "Incorporato"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sincronizza con:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sincronizza Record Privati:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Categorie Sync:"
 
@@ -22946,75 +23908,75 @@ msgid "Column width"
 msgstr "Larghezza colonna"
 
 # GNOME-2-22
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Cerca"
 
 # GNOME-2-22
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Fare clic qui per cambiare il tipo di ricerca"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "Tr_ova ora"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "Pu_lisci"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID voce"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Testo"
 
 #. 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "Most_ra: "
 
 #. 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "C_erca: "
 
 #. 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " i_n "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Riga cursore"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Colonna cursore"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Classificatore"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Modalità selezione"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Modalità cursore"
 
@@ -23042,10 +24004,6 @@ msgstr "<b>Tracciamento stato</b>"
 msgid "A_uto-delete sent item"
 msgstr "Eli_mina automaticamente voci inviate"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classificazione"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Crea una _voce di invio per tenere traccia delle informazioni"
@@ -23126,44 +24084,45 @@ msgstr "_Dopo:"
 msgid "_All information"
 msgstr "_Tutte le informazioni"
 
-#: ../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 "_Ritarda la consegna del messaggio"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Spedito"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Imposta data di scadenza"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Fino a:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "Quando con_veniente"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Quando aperto:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completato)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Fare clic qui per aprire l'URL"
 
@@ -23183,7 +24142,7 @@ msgstr "Categorie _disponibili:"
 msgid "categories"
 msgstr "categorie"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "elenco a comparsa"
 
@@ -23203,23 +24162,23 @@ msgstr "Colonna con focus"
 msgid "Unselected Column"
 msgstr "Colonna deselezionata"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Colonna barrata"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Colonna sottolineata"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Colonna in grassetto"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Colonna colorata"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Colore di sfondo colonna"
 
@@ -23257,7 +24216,7 @@ msgid "A_vailable Fields:"
 msgstr "Campi _disponibili:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Crescente"
 
@@ -23271,7 +24230,7 @@ msgid "Clear _All"
 msgstr "Pulisci _tutto"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Decrescente"
 
@@ -23338,14 +24297,14 @@ msgstr "_Ordina..."
 #: ../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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Codice 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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Intestazione completa"
 
@@ -23365,323 +24324,623 @@ msgstr ""
 "Per aggiungere una colonna alla tabella, trascinarla\n"
 "nella posizione dove si desidera che appaia."
 
-#: ../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 oggetto)"
 msgstr[1] "%s : %s (%d oggetti)"
 
-#: ../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 oggetto)"
 msgstr[1] "%s (%d oggetti)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Colori colonna alternativi"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Disegna griglia orizzontale"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Disegna griglia verticale"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Disegna focus"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Modalità cursore"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modello di selezione"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Lunghezza soglia"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Altezza uniforme riga"
 
-#: ../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 "Congelato"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Personalizza vista corrente"
 
 # GNOME-2-20
 #
 # da verbo a sostantivo
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Ordine _ascendente"
 
 # GNOME-2-20
 #
 # da verbo a sostantivo
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Ordine _discendente"
 
 # GNOME-2-20
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Non ordinato"
 
 # GNOME-2-20
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "_Raggruppa per questo campo"
 
 # GNOME-2-20
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Raggruppa per cas_ella"
 
 # GNOME-2-20
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Rimuovi _questa colonna"
 
 # GNOME-2-20
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "A_ggiungi una colonna..."
 
 # NEW
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "A_llineamento"
 
 # GNOME-2-20
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "A_datta"
 
 # NEW
 #
 # o Formato ..
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "_Formatta colonne..."
 
 # NEW
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "_Personalizza vista corrente..."
 
 # GNOME-2-22
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Ordina per"
 
 # GNOME-2-22
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Personalizzato"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Descrizione tipo di carattere"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Informazioni ordinamento"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Albero"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Intestazione tabella"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modello tabella"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Riga cursore"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Ricerca sempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Usare clic per aggiungere"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Adattatore tabella ETree"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retro Look"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Disegna linee ed espansori +/-."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Metodi di input"
 
 # FIXME processamento non è italiano
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Processamento eventi"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Barrato"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ancora"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Giustificazione"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Larghezza clip"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Altezza clip"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Riempimento rettangolo clip"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "Offset X"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Offset Y"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Larghezza testo"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Altezza testo"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Usa puntini di sospensione"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Puntini di sospensione"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Linea a capo"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Interrompi caratteri"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Linee massime"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Disegna bordi"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Consenti a capo"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Disegna sfondo"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Disegna pulsanti"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Posizione cursore"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Contesto IM"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Gestisci popup"
+
+#~ msgid "_Properties..."
+#~ msgstr "Pr_oprietà..."
+
+# GNOME-2-22
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "«{0}» è una sorgente di calendario in sola lettura. Passare alla vista "
+#~ "calendario ed evidenziare un calendario che possa accettare appuntamenti."
+
+#~ msgid "D_escription:"
+#~ msgstr "D_escrizione:"
+
+#~ msgid "De_scription:"
+#~ msgstr "De_scrizione:"
+
+#~ msgid "Updating query"
+#~ msgstr "Aggiornamento interrogazione"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Appuntamenti imminenti"
+
+#~ msgid "_Save Message"
+#~ msgstr "_Salva messaggio"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#, fuzzy
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr "Permessi non sufficienti per eliminare questa email."
+
+# GNOME-2-20
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr ""
+#~ "Contrassegnare tutti i messaggi in questa cartella e nelle sottocartelle "
+#~ "come letti?"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Eseguire l'operazione anche nelle sottocartelle?"
+
+#, fuzzy
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "Contrassegna _ogni messaggio come letto"
+
+#, fuzzy
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "Un plugin che gestisce l'assistente di primo avvio."
+
+#~ msgid "Startup wizard"
+#~ msgstr "Assistente di primo avvio"
+
+# GNOME-2-22
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Decide se eseguire o no il rilevamento del crash."
+
+# GNOME-2-22
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Omette dialogo avvertimento recupero"
+
+# GNOME-2-22
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Indica se eseguire o no il rilevamento dei crash"
+
+# GNOME-2-22
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Indica se è omesso il dialogo di avvertimento nel recupero di Evolution."
+
+# GNOME-2-22
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Rilevamento crash di Evolution"
+
+# GNOME-2-22
+#~ msgid "Ig_nore"
+#~ msgstr "I_gnora"
+
+# GNOME-2-22
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Sembra che Evolutions sia terminato in modo inatteso l'ultima volta che\n"
+#~ "è stato eseguito. Come misura precauzionale, tutti i riquardi di "
+#~ "anteprima\n"
+#~ "saranno nascosti. È possibile ripristinare tali pannelli dal menù "
+#~ "Visualizza.\n"
+
+# GNOME-2-22
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Non mostrare questo messaggio in futuro."
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Mostra i messaggi nello stile normale"
+
+#~ msgid "Permission Denied."
+#~ msgstr "Permesso negato."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Visualizzazione</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>Informazioni sul server</b>"
+
+#~ msgid "Unknown reason"
+#~ msgstr "Motivo sconosciuto"
+
+#~ msgid "Open File"
+#~ msgstr "Apri file"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Impossibile aprire il file «{0}»."
+
+#~ msgid "Attach original message"
+#~ msgstr "Allega messaggio originale"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "Non citare il messaggio originale"
+
+#~ msgid "Quote original message"
+#~ msgstr "Cita messaggio originale"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Inserire un nome per questa sigla."
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Rimuovere in modo permanente tutti messaggi eliminati nella cartella "
+#~ "«{0}»?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "Eliminare «{0}»?"
+
+# GNOME-2-22
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "Eliminare i messaggi nella cartella di ricerca «{0}»?"
+
+# GNOME-2-22
+#~ msgid "Only on _Current Folder"
+#~ msgstr "_Solo cartella corrente"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Abilita il plugin promemoria allegati"
+
+# GNOME-2-22
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Abilita il plugin promemoria allegati."
+
+# GNOME-2-22
+#~ msgid "Remind _missing attachments"
+#~ msgstr "_Avvisare per allegati mancanti"
+
+#~ msgid "_Refresh:"
+#~ msgstr "Aggio_rna:"
+
+# GNOME-2-22
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Non vi è alcuna opzione di configurazione per questo plugin."
+
+# GNOME-2-22
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "Fornisce un'opzione per stampare le email dal compositore."
+
+#~ msgid "Print Message"
+#~ msgstr "Stampa messaggio"
+
+#~ msgid "Prints the message"
+#~ msgstr "Stampa questo messaggio"
+
+# GNOME-2-22
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Una stringa che descrive le impostazioni attuali della stampante"
+
+#~ msgid "No folder name specified."
+#~ msgstr "Nessun nome di cartella specificato."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Il nome della cartella non può contenere il carattere di a capo."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Il nome della cartella non può contenere il carattere \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Il nome della cartella non può contenere il carattere \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' e '..' sono nomi di cartelle riservati."
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Copia la selezione negli appunti"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Taglia la selezione negli appunti"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "Incolla dagli appunti"
+
+#~ msgid "All Day Event"
+#~ msgstr "Intera giornata"
+
+# GNOME-2-20
+#~ msgid "Send _Options"
+#~ msgstr "_Opzioni di invio"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "Elimina tutto tranne la sigla"
+
+#~ msgid "For_mat"
+#~ msgstr "For_mato"
+
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+
+#~ msgid "Open a file"
+#~ msgstr "Apre un file"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Cifratura PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Firma PGP"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "Cifratura S/MIME"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "Firma S/MIME"
+
+#~ msgid "Save As"
+#~ msgstr "Salva come"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Salva nella cartella..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Salva il messaggio in una cartella specificata"
+
+#~ msgid "Send"
+#~ msgstr "Invia"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Invia l'email nel formato HTML"
+
+#~ msgid "_Delete all"
+#~ msgstr "Eli_mina tutto"
+
+#~ msgid "_Open..."
+#~ msgstr "_Apri..."
+
+#~ msgid "C_lose"
+#~ msgstr "_Chiudi"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Salva e _chiudi"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Salva il file corrente e chiudi la finestra"
+
+#~ msgid "Refresh List"
+#~ msgstr "Aggiorna elenco"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Aggiorna elenco delle cartelle"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Rimuove la cartella dall'elenco delle cartelle sottoscritte"
+
+#~ msgid "Subscribe"
+#~ msgstr "Iscrizione"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Annulla iscrizione"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverti selezione"
+
+#~ msgid "Status Details"
+#~ msgstr "Dettagli stato"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuso orario"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "Casella combinata fuso orario"
diff --git a/po/kn.po b/po/kn.po
index 8c1ba1938b..bcad9e3b45 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,4 +1,4 @@
-# translation of evolution.HEAD.kn.po to Kannada
+# translation of kn.po to Kannada
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
@@ -6,10 +6,10 @@
 # Shankar Prasad <svenkate@redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.kn\n"
+"Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-18 05:19+0000\n"
-"PO-Revision-Date: 2008-08-18 12:44+0530\n"
+"POT-Creation-Date: 2008-08-18 07:19+0000\n"
+"PO-Revision-Date: 2008-08-22 17:29+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -72,15 +72,15 @@ msgstr "ಅದà³� ಮೀಟಿಂಗà³�â€�ಗಳನà³�ನà³� ಹೊಂದಿದà
 #: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "ಕ�ಯಾಲೆಂಡರ� ಘಟನೆ: ಸಾರಾಂಶವ� %s ಆಗಿದೆ."
+msgstr "ಕ�ಯಾಲೆಂಡರ� ಕಾರ�ಯಕ�ರಮ: ಸಾರಾಂಶವ� %s ಆಗಿದೆ."
 
 #: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
-msgstr "ಕ�ಯಾಲೆಂಡರ� ಘಟನೆ: ಇದ� ಯಾವ�ದೆ ಸಾರಾಂಶವನ�ನ� ಹೊಂದಿಲ�ಲ."
+msgstr "ಕ�ಯಾಲೆಂಡರ� ಕಾರ�ಯಕ�ರಮ: ಇದ� ಯಾವ�ದೆ ಸಾರಾಂಶವನ�ನ� ಹೊಂದಿಲ�ಲ."
 
 #: ../a11y/calendar/ea-cal-view-event.c:300
 msgid "calendar view event"
-msgstr "ಕ�ಯಾಲೆಂಡರ� ಘಟನೆಯನ�ನ� ನೋಡ�"
+msgstr "ಕ�ಯಾಲೆಂಡರ� ಕಾರ�ಯಕ�ರಮವನ�ನ� ನೋಡ�"
 
 #: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
@@ -117,8 +117,8 @@ msgstr "ಪ�ರಸ�ತ�ತ ಸಮಯ ಹಾಗ� ವ�ಯಾಪ�ತಿ
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] "ಇದ� %d ಘಟನೆಯನ�ನ� ಹೊಂದಿದೆ."
-msgstr[1] "ಇದ� %d ಘಟನೆಗಳನ�ನ� ಹೊಂದಿದೆ."
+msgstr[0] "ಇದ� %d ಕಾರ�ಯಕ�ರಮವನ�ನ� ಹೊಂದಿದೆ."
+msgstr[1] "ಇದ� %d ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ಹೊಂದಿದೆ."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
@@ -339,7 +339,7 @@ msgstr "ಸಕ�ರಿಯಗೊಳಿಸ�"
 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 ""
+msgstr "'{0}' ಒಂದ� ಓದಲ� ಮಾತ�ರವಾದಂತಹ ವಿಳಾಸಪ�ಸ�ತಕವಾಗಿದ�ದ� ಅದನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ವಂತಿಲ�ಲ. ದಯವಿಟ�ಟ� ಅಂಚಿನಲ�ಲಿರ�ವ ಪಟ�ಟಿಯಲ�ಲಿರ�ವ ಸಂಪರ�ಕಗಳ ನೋಟದಿಂದ ಬೇರೊಂದ� ವಿಳಾಸಪ�ಸ�ತಕವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -414,11 +414,11 @@ msgstr "ಸಂಪರà³�ಕವಿಳಾಸವನà³�ನà³� ಅಳಿಸಿ ಹಾà
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "ಸಮೂಹಕ�ರಮದಲ�ಲಿ ವಿಳಾಸ ಪ�ಸ�ತಕದ ರಚನೆ:"
+msgstr "ಸಮೂಹಕ�ರಮದ ವಿಳಾಸ ಪ�ಸ�ತಕದ ರಚನೆ:"
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP ಪರಿಚಾರಕವ� ಮಾನ�ಯ ಸ�ಕೀಮಾ ಮಾಹಿತಿಯೊಂದಿಗೆ ಪ�ರತ�ಯ�ತ�ತರಿಸಿಲ�ಲ."
+msgstr "LDAP ಪರಿಚಾರಕವ� ಮಾನ�ಯ ಸ�ಕೀಮಾ ಮಾಹಿತಿಯೊಂದಿಗೆ ಮಾರ�ತ�ತರ ನೀಡಿಲ�ಲ."
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Server Version"
@@ -566,7 +566,7 @@ msgstr "ವಿಳಾಸಪà³�ಸà³�ತಕವನà³�ನà³� ಲೋಡà³� ಮಾಡà
 #: ../addressbook/conduit/address-conduit.c:1398
 #: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
-msgstr ""
+msgstr "ಪೈಲಟ�‌ನ ವಿಳಾಸ ಅನ�ವಯ ಬ�ಲಾಕ� ಅನ�ನ� ಓದಲಾಗಿಲ�ಲ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -709,7 +709,7 @@ msgstr "ಬಗೆ(_T):"
 
 #: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
-msgstr "ಅಂತರ�ಜಾಲದ ಹೊರಗಿನ ಕೆಲಸಗಳಿಗಾಗಿ ಪ�ಸ�ತಕದ ವಿಷಯಗಳನ�ನ� ನಕಲಿಸ�(_b)"
+msgstr "ಅಂತರ�ಜಾಲದ ಹೊರಗಿನ ಕೆಲಸಗಳಿಗಾಗಿ ಪ�ಸ�ತಕದ ವಿಷಯಗಳನ�ನ� ಕಾಪಿ ಮಾಡ�(_b)"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
@@ -783,8 +783,8 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolution 1.x ನ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಸಂಪರ�ಕವಿಳಾಸ ಫೋಲ�ಡರ�ಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
-"ಬದಲಾಗಿದೆ.\n"
+"ಇವಲ�ಯೂಶನ� ೧.x ನ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಸಂಪರ�ಕವಿಳಾಸ ಫೋಲ�ಡರ�ಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+"ಬದಲಾಗಿವೆ.\n"
 "\n"
 "ಇವಲ�ಯೂಶನ� ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
@@ -988,7 +988,7 @@ msgstr "ಅನಾಮಧೇಯವಾಗಿ"
 #. 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 ""
+msgstr "ಮಿತಿಯ� ತಲ�ಪ�ವವರೆಗೂ ಈ ಪ�ಸ�ತಕವನ�ನ� ವೀಕ�ಷಿಸ�(_r)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
@@ -2971,7 +2971,7 @@ msgstr "ಮ�ದ�ರಿಸ�(_P)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
-msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕಕ�ಕೆ ನಕಲಿಸ�(_y)..."
+msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕಕ�ಕೆ ಕಾಪಿ ಮಾಡ�(_y)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
@@ -2991,7 +2991,7 @@ msgstr "ಕತ�ತರಿಸ�(_t)"
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
-msgstr "ನಕಲಿಸ�(_C)"
+msgstr "ಕಾಪಿ ಮಾಡ�(_C)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
@@ -3325,7 +3325,7 @@ msgstr "ಕೊಂಡಿಯನà³�ನà³�ನà³� ವೀಕà³�ಷಕದಲà³�ಲಿ à
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
 #: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
-msgstr "ಕೊಂಡಿಯ ತಾಣವನ�ನ� ನಕಲಿಸ� (C)"
+msgstr "ಕೊಂಡಿಯ ತಾಣವನ�ನ� ಕಾಪಿ ಮಾಡ� (C)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
@@ -3334,7 +3334,7 @@ msgstr "ಹೊಸ ಸಂದೇಶವನ�ನ� ಇಲ�ಲಿಗೆ ಕಳ�
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
-msgstr "ಇಮೇಲ� ವಿಳಾಸವನ�ನ� ನಕಲಿಸ�(_E)"
+msgstr "ಇಮೇಲ� ವಿಳಾಸವನ�ನ� ಕಾಪಿ ಮಾಡ�(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:296
 #: ../addressbook/gui/widgets/eab-contact-display.c:370
@@ -3702,7 +3702,7 @@ msgstr "ಸಂಪರà³�ಕವಿಳಾಸವನà³�ನà³� ಇಲà³�ಲಿಗೆ à
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
-msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ನಕಲಿಸ�"
+msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
@@ -3710,7 +3710,7 @@ msgstr "ಸಂಪರà³�ಕವಿಳಾಸವನà³�ನà³� ಇಲà³�ಲಿಗೆ à
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
-msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ನಕಲಿಸ�"
+msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
@@ -4024,7 +4024,7 @@ msgstr "ಪà³�ಸà³�ತಕವನà³�ನà³� ತೆರೆಯà³�ವಲà³�ಲಿ ವà
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "ರೂಢಿಗತ ಔಟ�‌ಪ�ಟ� ಬದಲಿಗೆ ನಿಗದಿತ ಔಟ�‌ಪ�ಟ� ಕಡತವನ�ನ� ಸೂಚಿಸಿ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
@@ -4044,13 +4044,15 @@ msgstr "[vcard|csv]"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
-msgstr ""
+msgstr "ಮೇಳೈಕೆ ಇಲ�ಲದ ಕ�ರಮದಲ�ಲಿ ರಫ�ತ� ಮಾಡ�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
+"ಮೇಳೈಕೆ ಇಲ�ಲದ ಕ�ರಮದಲ�ಲಿರ�ವ ಒಂದ� ಔಟ�‌ಪ�ಟ�‌ ಕಡತದಲ�ಲಿರ�ವ ಕಾರ�ಡ�ಗಳ ಸಂಖ�ಯೆ, ಡೀಫಾಲ�ಟ� ಗಾತ�ರವ� ೧೦೦ "
+"ಆಗಿರ�ತ�ತದೆ."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
@@ -4068,7 +4070,7 @@ msgstr "ಕೇವಲ csv ಅಥವ ವಿಕಾರà³�ಡà³� ವಿನà³�ಯಾà²
 
 #: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "ಎಸಿಂಕ�(async) ಕ�ರಮದಲ�ಲಿ, ಔಟ�‌ಪ�ಟ� ಒಂದ� ಕಡತವಾಗಿರಬೇಕ�."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
@@ -4083,14 +4085,14 @@ msgstr "ನಿಭಾಯಿಸದ ದೋಷ"
 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 ""
+msgstr "'{0}' ಒಂದ� ಓದಲ� ಮಾತ�ರವಾಗಿರ�ವ ಕ�ಯಾಲೆಂಡರ� ಆಗಿದ�ದ� ಅದನ�ನ� ಮಾರ�ಪಡಿಸಲಾಗ�ವ�ದಿಲ�ಲ. ದಯವಿಟ�ಟ� ಅಂಚಿನ ಪಟ�ಟಿಯಲ�ಲಿನ ಕ�ಯಾಲೆಂಡರ� ನೋಟದಿಂದ ಬೇರೊಂದ� ಕ�ಯಾಲೆಂಡರನ�ನ� ಆರಿಸಿ."
 
 #. 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 ""
+msgstr "'{0}' ಒಂದ� ಓದಲ� ಮಾತ�ರವಾಗಿರ�ವ ಕ�ಯಾಲೆಂಡರ� ಆಗಿದ�ದ� ಅದನ�ನ� ಮಾರ�ಪಡಿಸಲಾಗ�ವ�ದಿಲ�ಲ. ದಯವಿಟ�ಟ� ಎಲ�ಲಾ ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�ಗಳನ�ನ� ಅಂಗೀಕರಿಸ�ವ ಬೇರೊಂದ� ಕ�ಯಾಲೆಂಡರನ�ನ� ಆರಿಸಿ."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4128,7 +4130,9 @@ msgstr "ಈ ಕಾರ�ಯಗಳಲ�ಲಿನ ಎಲ�ಲಾ ಮಾಹಿತ
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ನಲ�ಲಿನ ಎಲ�ಲಾ ಮಾಹಿತಿಗಳ� ಅಳಿಸಲಾಗ�ತ�ತದೆ ಹಾಗೂ ಎಂದಿಗೂ ಮರಳಿ ಪಡೆಯಲ� ಆಗ�ವ�ದಿಲ�ಲ."
+msgstr ""
+"ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ನಲ�ಲಿನ ಎಲ�ಲಾ ಮಾಹಿತಿಗಳ� ಅಳಿಸಲಾಗ�ತ�ತದೆ ಹಾಗೂ ಎಂದಿಗೂ ಮರಳಿ ಪಡೆಯಲ� "
+"ಆಗ�ವ�ದಿಲ�ಲ."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this meeting will be deleted and can not be restored."
@@ -4247,7 +4251,7 @@ msgstr ""
 #: ../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:39
@@ -4471,17 +4475,17 @@ msgstr "ಇವಲà³�ಯೂಶನà³�-ದತà³�ತಾಂಶ-ಪರಿಚಾರಕà
 #: ../calendar/conduits/calendar/calendar-conduit.c:1629
 #: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
+msgstr "ಪೈಲಟ�‌ನ ಕ�ಯಾಲೆಂಡರ� ಅನ�ವಯ ಬ�ಲಾಕ� ಅನ�ನ� ಓದಲಾಗಿಲ�ಲ"
 
 #: ../calendar/conduits/memo/memo-conduit.c:914
 #: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
-msgstr ""
+msgstr "ಪೈಲಟ�‌ನ ಮೆಮೊ ಅನ�ವಯ ಬ�ಲಾಕ� ಅನ�ನ� ಓದಲಾಗಿಲ�ಲ"
 
 #: ../calendar/conduits/memo/memo-conduit.c:961
 #: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
-msgstr ""
+msgstr "ಪೈಲಟ�‌ನ ಮೆಮೊ ಅನ�ವಯ ಬ�ಲಾಕ� ಗೆ ಬರೆಯಲಾಗಿಲ�ಲ"
 
 #: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
@@ -4490,12 +4494,12 @@ msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಆದ�ಯತೆಗಳ�:"
 #: ../calendar/conduits/todo/todo-conduit.c:1102
 #: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
+msgstr "ಪೈಲಟ�‌ನ ಮಾಡಬೇಕಿರ�ವ ಅನ�ವಯ ಬ�ಲಾಕ� ಅನ�ನ� ಓದಲಾಗಿಲ�ಲ"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1147
 #: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
-msgstr ""
+msgstr "ಪೈಲಟ�‌ನ ಮಾಡಬೇಕಿರ�ವ ಅನ�ವಯ ಬ�ಲಾಕ� ಗೆ ಬರೆಯಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:2358
@@ -4686,6 +4690,12 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
+"ಒಂದ� ಇವಲ�ಯೂಶನ� ಜ�ಞಾಪನೆಯ� ಟ�ರಿಗರ� ಆಗಲಿದೆ.. ಈ ಜ�ಞಾಪನೆಯ� "
+"ಈ ಕೆಳಗಿನ ಪ�ರೊಗ�ರಾಂ ಅನ�ನ� ಚಲಾಯಿಸ�ವಂತೆ ಸಂರಚಿಸಲಾಗಿದೆ:\n"
+"\n"
+"        %s\n"
+"\n"
+"ಈ ಪ�ರೊಗ�ರಾಂ ಅನ�ನ� ಚಲಾಯಿಸಲ� ನೀವ� ಖಚಿತವೆ?"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
@@ -4699,7 +4709,7 @@ msgstr "Bonobo ಅನ�ನ� ಆರಂಭಿಸಲಾಗಿಲ�ಲ"
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr ""
+msgstr "ಅಲಾರಂ ಸೂಚನಾ ಸೇವೆ ಫ�ಯಾಕ�ಟರಿಯನ�ನ�ರಚಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ, ಬಹ�ಷಃ ಅದ� ಈಗಾಗಲೆ ಚಾಲನೆಯಲ�ಲಿರಬಹ�ದ�..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4756,11 +4766,11 @@ msgstr "ಅಲಾರಂಗಳನà³�ನà³� ಚಲಾಯಿಸಬೇಕಿರà³�à²
 
 #: ../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 ""
+msgstr "ಸಮಯ ಪಟ�ಟಿಯಲ�ಲಿ ಮಾರ�ಕಸ� ಬೇನ�ಸ�� ಗೆರೆಯನ�ನ� ಎಳೆಯಲ� ಬಣ�ಣ(ಖಾಲಿ ಡೀಫಾಲ�ಟನ�ನ� ಸೂಚಿಸ�ತ�ತದೆ)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr ""
+msgstr "ದಿನದ ನೋಟದಲ�ಲಿ ಮಾರ�ಕಸ� ಬೇನ�ಸ�� ಗೆರೆಯನ�ನ� ಎಳೆಯಲ� ಬಣ�ಣ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
@@ -4772,7 +4782,7 @@ msgstr "ಅಳಿಸಿಹಾಕà³�ವà³�ದನà³�ನà³� ಖಚಿತಪಡಿà²
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
+msgstr "ವಾರದ ಯಾವ ದಿನಗಳಿಗೆ ಕೆಲಸವನ�ನ� ಆರಂಭಿಸ�ವ ಹಾಗ� ಮ�ಗಿಸ�ವ ಗಂಟೆಗಳನ�ನ� ಸೂಚಿಸಬೇಕ�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
@@ -4836,7 +4846,7 @@ msgstr "ಕೆಲಸದ ದಿನವ� ಆರಂಭಗೊಳ�ಳ�ವ ಗಂ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
+msgstr "ದಿನ ಹಾಗ� ಕೆಲಸದ ವಾರ ನೋಟಗಳಲ�ಲಿ ತೋರಿಸಲಾಗ�ವ ವಿರಾಮದ ಅವಧಿ, ಸೆಕಂಡ�ಗಳಲ�ಲಿ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
@@ -4852,11 +4862,11 @@ msgstr "ಮಾರ�ಕಸ� ಬೇನ�ಸ�� ಸಾಲ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
-msgstr ""
+msgstr "ಮಾರ�ಕಸ� ಬೇನ�ಸ�� ಗೆರೆಯ ಬಣ�ಣ - ದಿನದ ನೋಟ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
+msgstr "ಮಾರ�ಕಸ� ಬೇನ�ಸ�� ಗೆರೆಯ ಬಣ�ಣ - ಸಮಯ ಪಟ�ಟಿ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
@@ -4868,19 +4878,19 @@ msgstr "ಕೆಲಸದ ದಿನವ� ಅರಂಭಗೊಳ�ಳ�ವ ನಿ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
-msgstr ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಅಡ�ಡ ಫಲಕದ ಸ�ಥಾನ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
-msgstr ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಲಂಬ ಫಲಕದ ಸ�ಥಾನ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
-msgstr ""
+msgstr "ಒಂದ� ಡೀಫಾಲ�ಟ�� ಜ�ಞಾಪನೆಯನ�ನ� ನಿರ�ಧರಿಸ�ವ ಘಟಕಗಳ ಸಂಖ�ಯೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
-msgstr ""
+msgstr "ಕಾರ�ಯಗಳನ�ನ� ಯಾವಾಗ ಅಡಗಿಸಬೇಕ� ಎನ�ನ�ವ�ದನ�ನ� ನಿರ�ಧರಿಸ�ವ ಘಟಕಗಳ ಸಂಖ�ಯೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
@@ -4890,41 +4900,41 @@ msgstr "ಅವಧಿ ಮೀರಿದ ಕಾರ�ಯಗಳ ಬಣ�ಣ"
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
-msgstr ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಇಲ�ಲದಾಗ ದಿನಾಂಕದ ನ�ಯಾವಿಗೇಟರ� ಕ�ಯಾಲೆಂಡರ� ಹಾಗ� ಕಾರ�ಯ ಪಟ�ಟಿಯ ನಡ�ವೆ ಅಡ�ಡ ಫಲಕದ ಸ�ಥಾನ, ಪಿಕ�ಸೆಲ�‌ಗಳಲ�ಲಿ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಇದ�ದಾಗ ನೋಟ ಹಾಗ� ದಿನಾಂಕದ ನ�ಯಾವಿಗೇಟರ� ಕ�ಯಾಲೆಂಡರ� ಮತ�ತ� ಕಾರ�ಯ ಪಟ�ಟಿಯ ನಡ�ವೆ ಅಡ�ಡ ಫಲಕದ ಸ�ಥಾನ, ಪಿಕ�ಸೆಲ�‌ಗಳಲ�ಲಿ."
 
 #: ../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 ""
+msgstr "ಕ�ಯಾಲೆಂಡರ� ಪಟ�ಟಿ ಹಾಗ� ದಿನಾಂಕದ ನ�ಯಾವಿಗೇಟರ� ಕ�ಯಾಲೆಂಡರ� ನಡ�ವೆ ಲಂಬ ಫಲಕದ ಸ�ಥಾನ."
 
 #: ../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 ""
+msgstr "ಕಾರ�ಯ ಪಟ�ಟಿ ಹಾಗ� ಕಾರ�ಯ ಮ�ನ�ನೋಟ ಫಲಕದ ನಡ�ವೆ ಲಂಬ ಫಲಕದ ಸ�ಥಾನ, ಪಿಕ�ಸೆಲ�‌ಗಳಲ�ಲಿ."
 
 #: ../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 ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಇದ�ದಾಗ ನೋಟ ಹಾಗ� ದಿನಾಂಕದ ನ�ಯಾವಿಗೇಟರ� ಕ�ಯಾಲೆಂಡರ� ಮತ�ತ� ಕಾರ�ಯ ಪಟ�ಟಿಯ ನಡ�ವೆ ಲಂಬ ಫಲಕದ ಸ�ಥಾನ, ಪಿಕ�ಸೆಲ�‌ಗಳಲ�ಲಿ."
 
 #: ../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 ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಇಲ�ಲದಾಗ ನೋಟ ಹಾಗ� ದಿನಾಂಕದ ನ�ಯಾವಿಗೇಟರ� ಕ�ಯಾಲೆಂಡರ� ಮತ�ತ� ಕಾರ�ಯ ಪಟ�ಟಿಯ ನಡ�ವೆ ಲಂಬ ಫಲಕದ ಸ�ಥಾನ, ಪಿಕ�ಸೆಲ�‌ಗಳಲ�ಲಿ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
-msgstr ""
+msgstr "ಅಲಾರಂಗಳಿಂದ ಚಲಾಯಿಸಲ�ಪಡಬೇಕಿರ�ವ ಪ�ರೊಗ�ರಾಂಗಳ�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
@@ -4932,27 +4942,27 @@ msgstr "ಕೋಶವನ�ನ� ಅಲಾರಂ ಆಡಿಯೋಗೆ ಉಳಿ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ RSVP ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಪಾತ�ರದ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
-msgstr ""
+msgstr "ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� ಮ�ಗಿಯ�ವ ಸಮಯಗಳನ�ನ� ವಾರ ಹಾಗ� ತಿಂಗಳಿನ ನೋಟದಲ�ಲಿ ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ವರ�ಗಗಳ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
-msgstr ""
+msgstr "ಸೂಚನಾ ಫಲಕದಲ�ಲಿ ಪ�ರದರ�ಶಕ ಅಲಾರಂಗಳನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಸ�ಥಿತಿ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 #: ../mail/evolution-mail.schemas.in.h:124
@@ -4966,11 +4976,11 @@ msgstr "\"ಮ�ನ�ನೋಟ\" ಫಲಕವನ�ನ� ತೋರಿಸ�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಕಾಲವಲಯ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಪ�ರಕಾರದ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
@@ -4995,7 +5005,7 @@ msgstr ""
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
+msgstr "ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ದಿನಾಂಕ ಹಾಗ� ಸಮಯಗಳನ�ನ� ತೋರಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಡೀಫಾಲ�ಟ�� ಕಾಲವಲಯ, ಉದಾ, \"ಅಮೇರಿಕಾ/ನ�ಯೂಯರ�ಕ�\" ನಂತಹ ಅನ�ವಾದಗೊಳ�ಳದ ಓಲ�ಸನ� ಕಾಲವಲಯ ಸ�ಥಳದ ದತ�ತಾಂಶ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
@@ -5003,7 +5013,7 @@ msgstr "ಕಾಲ ವರ�ಗಗಳ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
-msgstr ""
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಅಲಾರಂ ಚಲಾಯಿತಗೊಂಡ ಸಮಯ, time_t ಯಲ�ಲಿ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 #: ../plugins/startup-wizard/startup-wizard.c:107
@@ -5015,6 +5025,8 @@ msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
+"ಕ�ಯಾಲೆಂಡರ� ನೋಟಗಳಲ�ಲಿನ ಕಾರ�ಯಕ�ರಮಗಳ ಪಾರದರ�ಶಕತೆ, ಇದರ ಮೌಲ�ಯವ� ೦ "
+"(ಪಾರದರ�ಶಕ) ಹಾಗ� ೧ರ (ಅಪಾರದರ�ಶಕ) ನಡ�ವೆ ಇರ�ತ�ತದೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
@@ -5042,73 +5054,73 @@ msgstr "ವಾರವ� ಆರಂಭಗೊಳ�ಳ�ವ ವಾರದ ದಿನ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr ""
+msgstr "ಅಲಾರಂಗಳನ�ನ� ತೋರಿಸಲ� ಸೂಚನಾ ಫಲಕವನ�ನ� ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr ""
+msgstr "ಒಂದ� ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� ಅಥವ ಕಾರ�ಯವನ�ನ� ಅಳಿಸ�ವಾಗ ಖಚಿತಪಡಿಸಲ� ಕೇಳಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
+msgstr "ಒಂದ� ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� ಅಥವ ಕಾರ�ಯವನ�ನ� ತೆಗೆದ�ಹಾಕ�ವಾಗ ಖಚಿತಪಡಿಸಲ� ಕೇಳಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
 #: ../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 ""
+msgstr "ಶನಿವಾರ ಹಾಗ� ಭಾನ�ವಾರವನ�ನ� ಒಂದ� ದಿನದ ಜಾಗದಲ�ಲಿ ಸೇರಿಸ�ವಂತೆ ವಾರದ ಕೊನೆಗಳನ�ನ� ತಿಂಗಳ ನೋಟದಲ�ಲಿ ಕ�ಗ�ಗಿಸಬೇಕೆ."
 
 #: ../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 ""
+msgstr "ಕಾರ�ಯಕ�ರಮಗಳ� ಮ�ಗಿಯ�ವ ಸಮಯವನ�ನ� ವಾರ ಹಾಗ� ತಿಂಗಳಿನ ನೋಟದಲ�ಲಿ ತೋರಿಸಬೇಕೆ."
 
 #: ../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 ""
+msgstr "ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ಮಾರ�ಕಸ� ಬೈನ�ಸ� ಗೆರೆಯನ�ನ�(ಈಗಿನ ಸಮಯದಲ�ಲಿರ�ವ ಗೆರೆ) ಎಳೆಯಬೇಕೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
+msgstr "ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯಲ�ಲಿ ಪೂರ�ಣಗೊಂಡ ಕಾರ�ಯಗಳನ�ನ� ಅಡಗಿಸಬೇಕೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
-msgstr ""
+msgstr "ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�ಗಳಿಗೆ ಡೀಫಾಲ�ಟ� ಜ�ಞಾಪನೆಯನ�ನ� ಇರಿಸಬೇಕೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ RSVP ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಬೇಕೆ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ವರ�ಗಗಳ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಬೇಕೆ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಪಾತ�ರದ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಬೇಕೆ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಸ�ಥಿತಿ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಬೇಕೆ"
 
 #: ../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 ""
+msgstr "ಸಮಯವನ�ನ� ಅಪರಾಹ�ನ/ಪೂರ�ವಾಹ�ನ ಮಾದರಿಯಲ�ಲಿ ತೋರಿಸ�ವ ಬದಲಿಗೆ ಇಪ�ಪತ�ನಾಲ�ಕ� ಗಂಟೆಗಳ ಮಾದರಿಯಲ�ಲಿ ತೋರಿಸಬೇಕೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಕಾಲವಲಯ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಬೇಕೆ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮ/ಕಾರ�ಯ/ಮೀಟಿಂಗ� ಸಂಪಾದಕದಲ�ಲಿ ಪ�ರಕಾರದ ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಬೇಕೆ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
-msgstr ""
+msgstr "ದಿನಾಂಕ ನ�ಯಾವಿಗೇಟರಿನಲ�ಲಿ ವಾರದ ಸಂಖ�ಯೆಯನ�ನ� ತೋರಿಸಬೇಕೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ತೋರಿಸ�ವಾಗ ಡೇಲೈಟ�‌ ಉಳಿಕೆಯ ಸಮಯವನ�ನ� ಬಳಸಬೇಕೆ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
@@ -5132,7 +5144,7 @@ msgstr "ಕೆಲಸದ ದಿನ ಆರಂಭಗೊಳ�ಳ�ವ ನಿಮಿ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
-msgstr ""
+msgstr "ಡೇಲೈಟ� ಉಳಿಕೆಯ ಸಮಯ"
 
 #: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
@@ -5177,7 +5189,7 @@ msgstr "ಪೂರ�ಣಗೊಂಡ ಕಾರ�ಯಗಳ�"
 
 #: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
-msgstr ""
+msgstr "ಲಗತ�ತ�ಗಳನ�ನ� ಒಳಗೊಂಡ ಕಾರ�ಯಗಳ�"
 
 #: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
@@ -5198,11 +5210,11 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr ""
+msgstr "ಈ ಕಾರ�ಯವ� ಆರಿಸಲಾದ ಸಮಯಕ�ಕೂ ಮ�ಂಚಿನ ಎಲ�ಲಾ ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ಅಳಿಸಿ ಹಾಕ�ತ�ತದೆ. ನೀವ� ಹಾಗೆ ಮಾಡಿದಲ�ಲಿ, ಈ ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ಮರಳಿ ಪಡೆಯಲ� ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ."
 
 #: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
-msgstr ""
+msgstr "ಇದಕ�ಕಿಂತ ಹಳೆಯ ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ಹೊರದೂಡ�"
 
 #: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
@@ -5243,7 +5255,7 @@ msgstr "ಹೊಸ ಕ�ಯಾಲೆಂಡರ�(_N)"
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
-msgstr "ನಕಲಿಸ�(_C)..."
+msgstr "ಕಾಪಿ ಮಾಡ�(_C)..."
 
 #: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
@@ -5252,15 +5264,15 @@ msgstr "ಕà³�ಯಾಲೆಂಡರà³�ಗಳನà³�ನà³� ನವೀಕರಿಸà³
 #: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮಗಳ� ಹಾಗ� ಮೀಟಿಂಗ�ಗಳನ�ನ� ರಚಿಸಲ� '%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆಯಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮಗಳ� ಹಾಗ� ಮೀಟಿಂಗ�ಗಳನ�ನ� ರಚಿಸಲ� ಯಾವ�ದೆ ಕ�ಯಾಲೆಂಡರ� ಲಭ�ಯವಿಲ�ಲ"
 
 #: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
-msgstr ""
+msgstr "ಕ�ಯಾಲೆಂಡರ� ಮೂಲದ ಆಯ�ಕೆಗಾರ"
 
 #: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
@@ -5290,7 +5302,7 @@ msgstr "ಒಂದ� ಹೊಸ ಮೀಟಿಂಗ� ಮನವಿಯನ�ನ�
 
 #: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
-msgstr ""
+msgstr "ಹೊಸದಾದ ದಿನಪೂರ�ತಿಯ ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�"
 
 #: ../calendar/gui/calendar-component.c:1613
 msgctxt "New"
@@ -5320,7 +5332,7 @@ msgstr "ದಿನದ ನೋಟ"
 
 #: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
-msgstr ""
+msgstr "ಕೆಲಸ ವಾರದ ನೋಟ"
 
 #: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
@@ -5344,7 +5356,7 @@ msgstr "ಲಗತ�ತ�ಗಳ�"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 #: ../calendar/gui/tasktypes.xml.h:7
 msgid "Attendee"
-msgstr "ಭಾಗವಹಿಸ�ವವರ�"
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
 #: ../calendar/gui/tasktypes.xml.h:9
@@ -5363,9 +5375,8 @@ msgstr "ವರ�ಗೀಕರಣ"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
 #: ../calendar/gui/tasktypes.xml.h:12
-#, fuzzy
 msgid "Competition"
-msgstr "ಪೂರ�ಣಗೊಂಡ ದಿನಾಂಕ"
+msgstr "ಸ�ಪರ�ಧೆ"
 
 #: ../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
@@ -5513,7 +5524,7 @@ msgstr "ಒದಗಿಸ�ವವರ�"
 #: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
-msgstr ""
+msgstr "ಸಮಯ ಹಾಗ� ಖರ�ಚ�ವೆಚ�ಚಗಳ�"
 
 #: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
 #: ../calendar/gui/tasktypes.xml.h:45
@@ -5658,7 +5669,7 @@ msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟಿನ ಕೊನೆ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
-msgstr ""
+msgstr "ಪ�ರತಿ ಹೆಚ�ಚ�ವರಿ ಸಮಯ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
@@ -5674,7 +5685,7 @@ msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟಿನ ಆರಂಭ"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
-msgstr ""
+msgstr "ಜಾರಿಗೊಳಿಸ�/ಪ�ರಚೋದಿಸ�"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
@@ -5689,7 +5700,7 @@ msgstr "ಅಲಾರಂಗಳ�"
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
-msgstr ""
+msgstr "ತಾನಾಗಿಯೆ ಲಗತ�ತನ�ನ� ತೋರಿಸಲ� ಸಲಹೆ ಮಾಡ�(_S)"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
@@ -5697,7 +5708,7 @@ msgstr "ಕಡತವನ�ನ�(ಗಳನ�ನ�) ಲಗತ�ತಿಸ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
-msgstr ""
+msgstr "ಅಲಾರಂಗಳಿಗಾಗಿ ಆರಿಸಲಾದ ಕ�ಯಾಲೆಂಡರ�ಗಳ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
@@ -5716,7 +5727,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
+msgstr "<i>%u ಹಾಗ� %d ಇಮೈಲ� ವಿಳಾಸದಲ�ಲಿರ�ವ ಬಳಕೆದಾರ ಹೆಸರ� ಹಾಗ� ತಾಣದ ಹೆಸರಿನಿಂದ ಬದಲಾಯಿಸಲ�ಪಡ�ತ�ತದೆ.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:10
@@ -5743,11 +5754,11 @@ msgstr "<span weight=\"bold\">ಸಮಯ</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ಕೆಲಸದ ವಾರ</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Adjust for daylight sa_ving time"
-msgstr ""
+msgstr "ಡೇಲೈಟ� ಉಳಿಕೆಯ ಸಮಯವನ�ನ� ಸರಿಹೊಂದಿಸ�(_v)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
@@ -5815,15 +5826,15 @@ msgstr "ಶನಿವಾರ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Select the calendars for alarm notification"
-msgstr ""
+msgstr "ಅಲಾರಂ ಸೂಚನೆಗಳಿಂದ ಕ�ಯಾಲೆಂಡರ�ಗಳನ�ನ� ಆರಿಸ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
-msgstr ""
+msgstr "ಒಂದ� ಜ�ಞಾಪನೆಯನ�ನ� ತೋರಿಸ�(_o)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
-msgstr ""
+msgstr "ದಿನಾಂಕ ನ�ಯಾವಿಗೇಟರಿನಲ�ಲಿ ವಾರದ ಸಂಖ�ಯೆಯನ�ನ� ತೋರಿಸ�(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: ../calendar/gui/dialogs/recurrence-page.c:1089
@@ -5894,7 +5905,7 @@ msgstr "ಅಂಶಗಳನ�ನ� ಅಳಿಸ�ವ ಮೊದಲ� ನನ�
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
-msgstr ""
+msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ವಾರದಕೊನೆಯನ�ನ� ಕ�ಗ�ಗಿಸ�(_C)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
@@ -5925,7 +5936,7 @@ msgstr "ಶನಿ(_S)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
-msgstr ""
+msgstr "ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�ಗಳ� ಮ�ಗಿಯ�ವ ಸಮಯಗಳನ�ನ� ವಾರ ಹಾಗ� ತಿಂಗಳ ನೋಟದಲ�ಲಿ ತೋರಿಸ�(_S)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
@@ -5947,15 +5958,15 @@ msgstr "ಪà³�ರತಿ ಅಪಾಯಿಂಟà³�â€�ಮೆಂಟà³�â€�ಗೂ ಮà
 
 #: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
+msgstr "ಆಫ�‌ಲೈನ�‌ ಕೆಲಸಗಳಿಗಾಗಿ ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿರ�ವ�ದನ�ನ� ಸ�ಥಳೀಯವಾಗಿ ಕಾಪಿ ಮಾಡ�(_y)"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
-msgstr ""
+msgstr "ಆಫ�‌ಲೈನ�‌ ಕೆಲಸಗಳಿಗಾಗಿ ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯನ�ನ� ಸ�ಥಳೀಯವಾಗಿ ಕಾಪಿ ಮಾಡ�(_y)"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
-msgstr ""
+msgstr "ಆಫ�‌ಲೈನ�‌ ಕೆಲಸಗಳಿಗಾಗಿ ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ಸ�ಥಳೀಯವಾಗಿ ಕಾಪಿ ಮಾಡ�(_y)"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:343
 msgid "Colo_r:"
@@ -5995,7 +6006,7 @@ msgstr "ಹೊಸ ಮೆಮೊ ಪಟ�ಟಿ"
 
 #: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
-msgstr ""
+msgstr "ಈ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಅಳಿಸಲಾಗಿದೆ."
 
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
@@ -6017,7 +6028,7 @@ msgstr "%s  ನೀವà³� ಯಾವ ಬದಲಾವಣೆಗಳನà³�ನೂ ಮà²
 
 #: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
-msgstr ""
+msgstr "ಈ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಬದಲಾಯಿಸಲಾಗಿದೆ."
 
 #: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
@@ -6042,7 +6053,7 @@ msgstr "%s  ನೀವà³� ಯಾವ ಬದಲಾವಣೆಗಳನà³�ನೂ ಮà²
 #: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
-msgstr ""
+msgstr "ಊರ�ಜಿತಗೊಳಿಕಾ ದೋಷ: %s"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
@@ -6088,18 +6099,18 @@ msgstr "ಜರ�ಗಿಸ�(_M)"
 #: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
-msgstr ""
+msgstr "ಎಳೆಯ�ವ�ದನ�ನ� ರದ�ದ�ಗೊಳಿಸ�(_D)"
 
 #: ../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
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
-msgstr ""
+msgstr "ಲಗತ�ತ�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
-msgstr ""
+msgstr "ಆಬ�ಜೆಕ�ಟನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
@@ -6292,12 +6303,12 @@ msgstr[1] "<b>%d</b> ಲಗತ�ತ�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
-msgstr ""
+msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಯನ�ನ� ಅಡಗಿಸ�(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1915
 #: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
-msgstr ""
+msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2034
 #: ../calendar/gui/dialogs/event-page.c:1871
@@ -6312,22 +6323,22 @@ msgstr "ತೆಗೆದ� ಹಾಕ�(_R)"
 #: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
-msgstr ""
+msgstr "ಲಗತ�ತನ�ನ� ಸೇರಿಸ�(_A)..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:2245
 #: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
-msgstr ""
+msgstr "ಲಗತ�ತನ�ನ� ತೋರಿಸ�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
-msgstr ""
+msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಗೆ ಟಾಗಲ� ಮಾಡಲ� ಸ�ಪೇಸ� ಕೀಲಿಯನ�ನ� ಒತ�ತಿ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2390
 #: ../calendar/gui/dialogs/comp-editor.c:2437
 #: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
+msgstr "ಒಂದ� ಅಪ�ಡೇಟ� ಬಂದಾಗ ಈ ಅಂಶಕ�ಕೆ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ�ನ� ರದ�ದ�ಗೊಳಿಸಲಾಗ�ತ�ತದೆ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
@@ -6343,47 +6354,47 @@ msgstr "ಉದà³�ದೇಶಿತ ಸà³�ಥಳವನà³�ನà³� ತೆರೆಯಲà
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
-msgstr ""
+msgstr "ಉದ�ದೇಶಿತ ಸ�ಥಳವ� ಕೇವಲ ಓದಲ ಮಾತ�ರವಾಗಿದೆ"
 
 #: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
+msgstr "ಈ ಅಂಶವನ�ನ� ಇದನ�ನ� ಪಡೆಯ�ವ ಇನ�ನಿತರರ ಅಂಚೆಪೆಟ�ಟಿಗೆಗಳಿಂದ ಅಳಿಸಿಹಾಕಬೇಕೆ? (_D)"
 
 #: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
-msgstr ""
+msgstr "ಒಂದ� ಕೋರ�ಬಾ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
-msgstr ""
+msgstr "ಒಂದ� ಕೋರ�ಬಾ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಕಾರ�ಯವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
-msgstr ""
+msgstr "ಒಂದ� ಕೋರ�ಬಾ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಮೆಮೊವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
-msgstr ""
+msgstr "ಒಂದ� ಕೋರ�ಬಾ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಅಂಶವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
+msgstr "ಅನ�ಮತಿ ನಿರಾಕರಿಸಲ�ಪಟ�ಟ ಕಾರಣದಿಂದಾಗಿ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
-msgstr "ಕಾರ�ಯವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ �ಕೆಂದರೆ ಅನ�ಮತಿಯನ�ನ� ನಿರಾಕರಿಸಲ�ಪಟ�ಟಿದೆ"
+msgstr "ಅನ�ಮತಿ ನಿರಾಕರಿಸಲ�ಪಟ�ಟ ಕಾರಣದಿಂದಾಗಿ ಕಾರ�ಯವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
-msgstr "ಮೆಮೊವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ �ಕೆಂದರೆ ಅನ�ಮತಿಯನ�ನ� ನಿರಾಕರಿಸಲ�ಪಟ�ಟಿದೆ"
+msgstr "ಅನ�ಮತಿ ನಿರಾಕರಿಸಲ�ಪಟ�ಟ ಕಾರಣದಿಂದಾಗಿ ಮೆಮೊವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
-msgstr ""
+msgstr "ಅನ�ಮತಿ ನಿರಾಕರಿಸಲ�ಪಟ�ಟ ಕಾರಣದಿಂದಾಗಿ ಅಂಶವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
-msgstr ""
+msgstr "ಒಂದ� ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
@@ -6395,7 +6406,7 @@ msgstr "ಒಂದ� ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಮೆಮೊ
 
 #: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
-msgstr ""
+msgstr "ಒಂದ� ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಅಂಶವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
@@ -6430,7 +6441,7 @@ msgstr "ಇದನ�ನ� ಒಂದ� ಪ�ನರಾವರ�ತಿತ ಕಾ
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
-msgstr ""
+msgstr "ಕಳ�ಹಿಸ�ವ ಆಯ�ಕೆಗಳ�"
 
 #: ../calendar/gui/dialogs/event-editor.c:210
 #: ../calendar/gui/dialogs/task-editor.c:123
@@ -6459,7 +6470,7 @@ msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ(_F)"
 
 #: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Query free / busy information for the attendees"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಬಿಡ�ವಾಗಿರ�ವ/ಕಾರ�ಯನಿರತವಾಗಿರ�ವ ಮಾಹಿತಿಗೆ ಮನವಿ ಸಲ�ಲಿಸ�"
 
 #: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
@@ -6468,14 +6479,14 @@ msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_m)"
 #: ../calendar/gui/dialogs/event-page.c:731
 #: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
-msgstr ""
+msgstr "ಈ ಕಾರ�ಯಕ�ರಮವ� ಅಲಾರಂಗಳನ�ನ� ಹೊಂದಿದೆ"
 
 #: ../calendar/gui/dialogs/event-page.c:794
 #: ../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 ""
+msgstr "ಆಯೋಜಕರ�(_g):"
 
 #: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
@@ -6483,15 +6494,15 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_n)"
 
 #: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
-msgstr ""
+msgstr "ಪ�ರಾರಂಭದ ದಿನಾಂಕವನ�ನ� ಹೊಂದಿರದ ಕಾರ�ಯಕ�ರಮ"
 
 #: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
-msgstr ""
+msgstr "ಮ�ಗಿಯ�ವ ದಿನಾಂಕವನ�ನ� ಹೊಂದಿರದ ಕಾರ�ಯಕ�ರಮ"
 
 #: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
@@ -6515,18 +6526,18 @@ msgstr "ಮ�ಕ�ತಾಯ ಸಮಯವ� ತಪ�ಪಾಗಿದೆ"
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
-msgstr ""
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಆಯೋಜಕರ� ಒಂದ� ಖಾತೆಯನ�ನ� ಹೊಂದಿಲ�ಲ."
 
 #: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
-msgstr ""
+msgstr "ಒಬ�ಬ ಆಯೋಜಕನ ಅಗತ�ಯವಿದೆ."
 
 #: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳಲ� ಕನಿಷ�ಟ ಒಬ�ಬನಾದದರೂ ಇರಬೇಕ�."
 
 #: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
@@ -6543,7 +6554,7 @@ msgstr "'%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆಯಲಾಗಿ
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
-msgstr ""
+msgstr "ನೀವ� %s ಪರವಾಗಿ ಕೆಲಸ ಮಾಡ�ತ�ತಿದ�ದೀರಿ"
 
 #: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
@@ -6568,7 +6579,7 @@ msgstr[1] "ಅಪಾಯಿಂಟà³�â€�ಮೆಂಟà³�â€�ಗೆ %d ನಿಮಿà²
 
 #: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
-msgstr ""
+msgstr "ಕಸ�ಟಮೈಸ�"
 
 #. an empty string is the same as 'None'
 #: ../calendar/gui/dialogs/event-page.c:2944
@@ -6602,15 +6613,15 @@ msgstr "ಅಪಾಯಿಂಟà³�â€�ಮೆಂಟà³�â€�ಗೆ 15 ನಿಮಿಷ à
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_s)..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
-msgstr ""
+msgstr "ಕಸ�ಟಮ� ಅಲಾರಂ:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Event Description"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮದ ವಿವರಣೆ"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
@@ -6648,7 +6659,7 @@ msgstr "ವರೆಗೆ"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
-msgstr ""
+msgstr "<b>ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_e)</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "C_hange Organizer"
@@ -6697,7 +6708,7 @@ msgstr "ಸಮೂಹ(_G):"
 #: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
+msgstr "ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ವ ಒಂದ� ಕಾರ�ಯಕ�ರಮವನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ತ�ತಿದ�ದೀರಿ. �ನನ�ನ� ಮಾರ�ಪಡಿಸಲ� ಬಯಸಿದ�ದೀರಿ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
@@ -6707,42 +6718,42 @@ msgstr ""
 #: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
+msgstr "ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ವ ಒಂದ� ಕಾರ�ಯವನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ತ�ತಿದ�ದೀರಿ. �ನನ�ನ� ಮಾರ�ಪಡಿಸಲ� ಬಯಸಿದ�ದೀರಿ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr ""
+msgstr "ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ವ ಒಂದ� ಮೆಮೊವನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ತ�ತಿದ�ದೀರಿ. �ನನ�ನ� ಮಾರ�ಪಡಿಸಲ� ಬಯಸಿದ�ದೀರಿ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
-msgstr ""
+msgstr "ಈ ಸನ�ನಿವೇಶಕ�ಕೆ ಮಾತ�ರ"
 
 #: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
-msgstr ""
+msgstr "ಇದ� ಹಾಗ� ಇದಕ�ಕೂ ಮ�ಂಚಿನ ಸನ�ನಿವೇಶಗಳಿಗೆ"
 
 #: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
-msgstr ""
+msgstr "ಇದ� ಹಾಗ� ಮ�ಂದಿನ ಸನ�ನಿವೇಶಗಳಿಗೆ"
 
 #: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
-msgstr ""
+msgstr "ಎಲ�ಲಾ ಸನ�ನಿವೇಶಗಳಿಗೆ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+msgstr "ಈ ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� ಎವಲ�ಯೂಶನ� ಸಂಪಾದಿಸದೆ ಇರ�ವಂತಹ ಪ�ನರಾವರ�ತನೆಯನ�ನ� ಹೊಂದಿದೆ."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
-msgstr ""
+msgstr "ಪ�ನರಾವರ�ತನೆಯ ದಿನಾಂಕ ಮಾನ�ಯವಾದ�ದಲ�ಲ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
 #: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
-msgstr ""
+msgstr " "
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
@@ -6797,7 +6808,7 @@ msgstr "ಇತರೆ ದಿನಾಂಕ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
-msgstr "1 ರಿಂದ 10 ನೆಯ"
+msgstr "೧ ರಿಂದ ೧೦ ನೆಯ"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -6805,7 +6816,7 @@ msgstr "1 ರಿಂದ 10 ನೆಯ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
-msgstr "11 ರಿಂದ 20 ನೆಯ"
+msgstr "೧೧ ರಿಂದ ೨೦ ನೆಯ"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -6813,7 +6824,7 @@ msgstr "11 ರಿಂದ 20 ನೆಯ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
-msgstr "21 ರಿಂದ 31 ನೆಯ"
+msgstr "೨೧ ರಿಂದ ೩೧ ನೆಯ"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
@@ -6827,27 +6838,27 @@ msgstr "ದಿನ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
-msgstr ""
+msgstr " "
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
-msgstr ""
+msgstr "ಸಂಗತಿಗಳ�"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
-msgstr ""
+msgstr "ವಿನಾಯಿತಿಯನ�ನ� ಸೇರಿಸಿ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
-msgstr ""
+msgstr "ಮಾರ�ಪಡಸಲ� ಯಾವ�ದನ�ನೂ ಆಯ�ಕೆ ಮಾಡಿಲ�ಲ."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
-msgstr ""
+msgstr "ವಿನಾಯಿತಿಯನ�ನ� ಮಾರ�ಪಡಿಸ�"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
-msgstr ""
+msgstr "ಅಳಿಸಲ� �ನ�ನನ�ನೂ ಆಯ�ಕೆ ಮಾಡಲಾಗಿಲ�ಲ."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
@@ -6855,7 +6866,7 @@ msgstr "ದಿನಾಂಕ/ಸಮಯ"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
-msgstr ""
+msgstr "<b>ವಿನಾಯಿತಿಗಳ�</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:3
@@ -6876,7 +6887,7 @@ msgstr "ಪ�ರತಿ"
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
-msgstr ""
+msgstr "ಈ ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ತ�ತದೆ(_u)"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
@@ -7022,7 +7033,7 @@ msgstr "ಕಾರ�ಯ ವಿವರಗಳ�"
 #: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
-msgstr ""
+msgstr "ಆಯೋಜಕರ�(_z):"
 
 #: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
@@ -7035,7 +7046,7 @@ msgstr "ಕಾರà³�ಯಗಳನà³�ನà³� '%s' ನಲà³�ಲಿ ತೆರೆಯà³
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_n)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
@@ -7074,56 +7085,56 @@ msgstr "ಗೊತà³�ತಿರದ ಕೆಲಸವà³� ನಿರà³�ವಹಿಸಲà
 #: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
-msgstr ""
+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
 #, c-format
 msgid "%s %s after the start of the appointment"
-msgstr ""
+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
 #, c-format
 msgid "%s at the start of the appointment"
-msgstr ""
+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
 #, c-format
 msgid "%s %s before the end of the appointment"
-msgstr ""
+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
 #, c-format
 msgid "%s %s after the end of the appointment"
-msgstr ""
+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
 #, c-format
 msgid "%s at the end of the appointment"
-msgstr ""
+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
 #, c-format
 msgid "%s at %s"
-msgstr ""
+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
 #, c-format
 msgid "%s for an unknown trigger type"
-msgstr ""
+msgstr "ಒಂದ� ಗೊತ�ತಿರದ ಪ�ರಚೋದನಾ ಬಗೆಗಾಗಿ %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
 #: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
@@ -7190,7 +7201,7 @@ msgstr "ಆರಂಭ ದಿನಾಂಕ"
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
-msgstr ""
+msgstr "ಬಿಡ�ವ�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:620
@@ -7254,7 +7265,7 @@ msgstr "ಹೀಗೆ ಉಳಿಸ�..."
 
 #: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
-msgstr ""
+msgstr "ಆರಿಸಲಾದ ಲಗತ�ತ�ಗಳನ�ನ� ಉಳಿಸಲ� ಕಡತಕೋಶಗಳನ�ನ� ಆಯ�ಕೆ ಮಾಡ�..."
 
 #: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
@@ -7270,11 +7281,11 @@ msgstr "ಹೀಗೆ ಉಳಿಸ�(_S)..."
 #: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
-msgstr ""
+msgstr "ಹಿನ�ನಲೆಯಾಗಿ ಬಳಸ�(_B)"
 
 #: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
-msgstr ""
+msgstr "ಆರಿಸಲಾಗಿದ�ದನ�ನ� ಉಳಿಸ�(_S)"
 
 #: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
@@ -7355,12 +7366,12 @@ msgstr "100%"
 #: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
-msgstr ""
+msgstr "ಆರಿಸಲಾದ ವಸ�ತ�ಗಳನ�ನ� ಅಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
-msgstr ""
+msgstr "ವಸ�ತ�ಗಳನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
@@ -7404,7 +7415,7 @@ msgstr "ಕಾರ�ಯವನ�ನ� ನಿಯೋಜಿಸ�(_A)"
 #: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
-msgstr ""
+msgstr "�ಕ�ಯಾಲೆಂಡರ� ಆಗಿ ರವಾನಿಸ�(_F)"
 
 #: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
@@ -7460,11 +7471,11 @@ msgstr "ಆರಂಭದ ದಿನಾಂಕ"
 
 #: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
-msgstr ""
+msgstr "ಅಂಶಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
-msgstr ""
+msgstr "ಅಂಶಗಳನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
@@ -7472,7 +7483,7 @@ msgstr "ಹೊಸ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_A)..."
 
 #: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
-msgstr ""
+msgstr "ಹೊಸಾದಾದ ದಿನ ಪೂರ�ತಿ ಕಾರ�ಯಕ�ರಮ(_E)"
 
 #: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
@@ -7481,7 +7492,7 @@ msgstr "ಹೊಸ ಮೀಟಿಂಗ�(_M)"
 #. FIXME: hook in this somehow
 #: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
-msgstr ""
+msgstr "ಪ�ರಸಕ�ತ ನೋಟ(_C)"
 
 #: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
@@ -7497,7 +7508,7 @@ msgstr "ಮ�ದ�ರಿಸ�(_n)..."
 
 #: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
-msgstr "ಕ�ಯಾಲೆಂಡರಿಗೆ ನಕಲಿಸ�(_y)..."
+msgstr "ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಾಪಿ ಮಾಡ�(_y)..."
 
 #: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
@@ -7509,11 +7520,11 @@ msgstr ""
 
 #: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
-msgstr ""
+msgstr "ಮೀಟಿಂಗ� ಅನ�ನ� ನಿಗದಿಪಡಿಸ�(_S)..."
 
 #: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
-msgstr ""
+msgstr "�ಕ�ಯಾಲೆಂಡರ� ಆಗಿ ರವಾನಿಸ�(_F)..."
 
 #: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
@@ -7527,15 +7538,15 @@ msgstr "ಎಲ�ಲರಿಗೂ ಉತ�ತರಿಸ�(_R)"
 
 #: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
-msgstr ""
+msgstr "ಈ ಸಂಗತಿಯನ�ನ� ಸ�ಥಳಾಂತರಗೊಳ�ಳ�ವಂತೆ ಮಾಡ�(_M)"
 
 #: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
-msgstr ""
+msgstr "ಈ ಸಂಗತಿಯನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_O)"
 
 #: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
-msgstr ""
+msgstr "ಎಲ�ಲಾ ಸಂಗತಿಗಳನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_A)"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
@@ -7602,7 +7613,7 @@ msgstr "pm"
 
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
-msgstr ""
+msgstr "ಹೌದ�. (ಸಂಕೀರ�ಣ ಪ�ನರಾವರ�ತನೆ)"
 
 #: ../calendar/gui/e-itip-control.c:782
 #, c-format
@@ -7683,12 +7694,12 @@ msgstr "ಕೊನೆಯ ದಿನಾಂಕ"
 
 #: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
-msgstr ""
+msgstr "�ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿ"
 
 #. Title
 #: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
-msgstr ""
+msgstr "�ಕ�ಯಾಲೆಂಡರ� ದೋಷ"
 
 #: ../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
@@ -7706,7 +7717,7 @@ msgstr "ಒಬ�ಬ ಅಜ�ಞಾತ ವ�ಯಕ�ತಿ"
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
+msgstr "<br> ದಯವಿಟ�ಟ� ಈ ಕೆಳಗಿನ ಅವಲೋಕಿಸಿ ಹಾಗ� ನಂತರ ಇಲ�ಲಿರ�ವ ಮೆನ�ವಿನಿಂದ ಒಂದ� ಕಾರ�ಯವನ�ನ� ಆರಿಸಿ."
 
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
@@ -7733,16 +7744,16 @@ msgstr "ತಿರಸ�ಕರಿಸಲ�ಪಟ�ಟಿದೆ"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
+msgstr "ಈ ಮೀಟಿಂಗ� ರದ�ದ� ಮಾಡಲ�ಪಟ�ಟಿದೆ, ಆದರೆ ಇದ� ನಿಮ�ಮ ಕ�ಯಾಲೆಂಡರ�ಗಳಲ�ಲಿ ಕಂಡ�ಬಂದಿಲ�ಲ."
 
 #: ../calendar/gui/e-itip-control.c:1285
 msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr ""
+msgstr "ಈ ಕಾರ�ಯವ� ರದ�ದ� ಮಾಡಲ�ಪಟ�ಟಿದೆ, ಆದರೆ ಇದ� ನಿಮ�ಮ ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯಲ�ಲಿ ಕಂಡ�ಬಂದಿಲ�ಲ."
 
 #: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�ನ� <b>%s</b> ಪ�ರಕಟಿಸಿದೆ."
+msgstr "ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�ನ� <b>%s</b> ಪ�ರಕಟಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
@@ -7751,68 +7762,68 @@ msgstr "ಮೀಟಿಂಗ� ಮಾಹಿತಿ"
 #: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr ""
+msgstr "<b>%s</b> ಮೀಟಿಂಗಿನಲ�ಲಿ %s ಹಾಜರಿರ�ವಂತೆ ಮನವಿ ಮಾಡಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "ಮೀಟಿಂಗ��ನಲ�ಲಿ ನಿಮ�ಮ ಉಪಸ�ಥಿತಿಗಾಗಿ <b>%s</b> ಮನವಿ ಸಲ�ಲಿಸಿದೆ."
+msgstr "ಮೀಟಿಂಗ��ನಲ�ಲಿ ನಿಮ�ಮ ಹಾಜರಿಗಾಗಿ <b>%s</b> ಮನವಿ ಸಲ�ಲಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
-msgstr ""
+msgstr "ಮೀಟಿಂಗ� ಪ�ರಸ�ತಾವನೆ"
 
 #. 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 ""
+msgstr "ಈಗಿನ ಒಂದ� ಮೀಟಿಂಗ�‌ಗೆ <b>%s</b> ಸೇರ�ಪಡೆಗೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
-msgstr ""
+msgstr "ಮೀಟಿಂಗ� ಅಪ�ಡೇಟ�"
 
 #: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
+msgstr "ಮೀಟಿಂಗ�‌ ಬಗೆಗಿನ <b>%s</b> ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
-msgstr ""
+msgstr "ಮೀಟಿಂಗ� ಅಪ�ಡೇಟ� ಮನವಿ"
 
 #: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
+msgstr "<b>%s</b> ಒಂದ� ಮೀಟಿಂಗ�‌ಗಾಗಿ ಮಾಡಲಾದ ಮನವಿಗೆ ಮಾರ�ತ�ತರಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
-msgstr ""
+msgstr "ಮೀಟಿಂಗ�‌ಗೆ ಮಾರ�ತ�ತರ"
 
 #: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
-msgstr ""
+msgstr "<b>%s</b> ಒಂದ� ಮೀಟಿಂಗ� ಅನ�ನ� ರದ�ದ�ಗೊಳಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
-msgstr ""
+msgstr "ಮೀಟಿಂಗ� ರದ�ದತಿ"
 
 #: ../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 ""
+msgstr "<b>%s</b> ತಿಳಿಯಲಾಗದ ಒಂದ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
-msgstr ""
+msgstr "ಸರಿಯಲ�ಲದ ಮೀಟಿಂಗ� ಸಂದೇಶ"
 
 #: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr ""
+msgstr "<b>%s</b> ಕಾರ�ಯದ ಮಾಹಿತಿಯನ�ನ� ಪ�ರಕಟಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
@@ -7821,49 +7832,49 @@ msgstr "ಕಾರ�ಯದ ಮಾಹಿತಿ"
 #: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr ""
+msgstr "ಒಂದ� ಕಾರ�ಯವನ�ನ� ನಿರ�ವಹಿಸ�ವಂತೆ <b>%s</b> %s ಗೆ ಮನವಿ ಸಲ�ಲಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgstr "ಒಂದ� ಕಾರ�ಯವನ�ನ� ನೀವ� ನಿರ�ವಹಿಸ�ವಂತೆ <b>%s</b> ಮನವಿ ಸಲ�ಲಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
-msgstr ""
+msgstr "ಕಾರ�ಯದ ಪ�ರಸ�ತಾವನೆ"
 
 #. 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 ""
+msgstr "ಈಗಿರ�ವ ಒಂದ� ಕಾರ�ಯಕ�ಕೆ ಸೇರ�ಪಡಣೆಗೊಳ�ಳಲ� <b>%s</b> ಬಯಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
-msgstr ""
+msgstr "ಕಾರ�ಯದ ಅಪ�ಡೇಟ�"
 
 #: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgstr "ಕಾರ�ಯದ ಬಗೆಗಿನ <b>%s</b> ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
-msgstr ""
+msgstr "ಕಾರ�ಯದ ಅಪ�ಡೇಟ� ಮನವಿ"
 
 #: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
+msgstr "<b>%s</b> ಒಂದ� ಕಾರ�ಯನಿಯೋಜನೆಗೆ ಮಾರ�ತ�ತರಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ಕೆ ಮಾರ�ತ�ತರ"
 
 #: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr ""
+msgstr "<b>%s</b> ಕಾರ�ಯವನ�ನ� ರದ�ದ�ಗೊಳಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
@@ -7871,7 +7882,7 @@ msgstr "ಕಾರ�ಯ ರದ�ದತಿ"
 
 #: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
-msgstr ""
+msgstr "ಸರಿಯಲ�ಲದ ಕಾರ�ಯ ಸಂದೇಶ"
 
 #: ../calendar/gui/e-itip-control.c:1513
 #, c-format
@@ -7885,7 +7896,7 @@ msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮಾಹಿತಿ"
 #: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> ವ� ನಿಮ�ಮ ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮಾಹಿತಿಗಾಗಿ ಮನವಿ ಸಲ�ಲಿಸ�ತ�ತದೆ."
+msgstr "<b>%s</b> ವ� ನಿಮ�ಮ ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮಾಹಿತಿಗಾಗಿ ಮನವಿ ಸಲ�ಲಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
@@ -7894,11 +7905,11 @@ msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮನವಿ"
 #: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ಇಂದ ನಿಮ�ಮ ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮನವಿಗೆ ಪ�ರತ�ಯ�ತ�ತರ ಬಂದಿದೆ."
+msgstr "<b>%s</b> ಇಂದ ನಿಮ�ಮ ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮನವಿಗೆ ಮಾರ�ತ�ತರ ಕಳ�ಹಿಸಿದ�ದಾರೆ."
 
 #: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
-msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಪ�ರತ�ಯ�ತ�ತರ"
+msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮಾರ�ತ�ತರ"
 
 #: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
@@ -7914,11 +7925,11 @@ msgstr "ಸಂದೇಶವ� ಕೇವಲ ಬೆಂಬಲವಿಲ�ಲದ ಮ
 
 #: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgstr "ಲಗತ�ತಿಸಲಾಗಿದ�ದ� ಒಂದ� ಮಾನ�ಯವಾದ ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿಯನ�ನ� ಹೊಂದಿಲ�ಲ"
 
 #: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
-msgstr ""
+msgstr "ಲಗತ�ತಿಸಲಾಗಿದ�ದ� ನೋಡಬಹ�ದಾದ ಯಾವ�ದೆ ಕ�ಯಾಲೆಂಡರ� ಅಂಶಗಳನ�ನ� ಹೊಂದಿಲ�ಲ"
 
 #: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
@@ -7930,11 +7941,11 @@ msgstr "ಆಬà³�ಜೆಕà³�ಟà³� ಅಮಾನà³�ಯವಾಗಿದೆ ಹಾà
 
 #: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
+msgstr "ಈ ಮಾರ�ತ�ತರವ� ಈಗಿನ ಒಬ�ಬ ಪಾಲ�ಗೊಳ�ಳ�ವವರಿಂದ ಬಂದಿಲ�ಲ. ಇವರನ�ನ� ಒಬ�ಬ ಪಾಲ�ಗೊಳ�ಳ�ವವರ� ಎಂದ� ಪರಿಗಣಿಸಬೇಕೆ?"
 
 #: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
+msgstr "ಒಂದ� ಅಮಾನ�ಯವಾದ ಸ�ಥಿತಿಯ ಕಾರಣದಿಂದಾಗಿ ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿಲ�ಲ!\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
@@ -7943,7 +7954,7 @@ msgstr "ಪಾಲà³�ಗೊಳà³�ಳà³�ವವರ ಸà³�ಥಿತಿಯà³� ಅಪà
 #: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+msgstr "ಒಂದ� ಅಂಶವ� ಅಸ�ತಿತ�ವದಲ�ಲಿರದ ಕಾರಣದಿಂದಾಗಿ ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿಲ�ಲ!"
 
 #: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
@@ -7981,7 +7992,7 @@ msgstr "ಬಿಡà³�ವà³�/ಕಾರà³�ಯನಿರತ ಮಾಹಿತಿಯನà
 
 #: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
-msgstr ""
+msgstr "ಮಾರ�ತ�ತರಿಸ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡ�"
 
 #: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
@@ -8018,15 +8029,15 @@ msgstr "ಪರಿಚಾರಕ ಸಂದೇಶ:"
 
 #: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
-msgstr ""
+msgstr "ಮ�ಖ�ಯ ವ�ಯಕ�ತಿಗಳ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
-msgstr ""
+msgstr "ಭಾಗವಹಿಸ�ವವರ ಅಗತ�ಯವಿದೆ"
 
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
-msgstr ""
+msgstr "�ಚ�ಛಿಕ ಭಾಗವಹಿಸ�ವವರ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
@@ -8034,13 +8045,13 @@ msgstr "ಸಂಪನ�ಮೂಲಗಳ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
-msgstr ""
+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
 msgid "Individual"
-msgstr ""
+msgstr "ವೈಯಕ�ತಿಕ"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
@@ -8070,25 +8081,25 @@ msgstr "ಖ�ರ�ಚಿ"
 #: ../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
 msgid "Required Participant"
-msgstr ""
+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
 msgid "Optional Participant"
-msgstr ""
+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
 msgid "Non-Participant"
-msgstr ""
+msgstr "ಭಾಗವಹಿಸದೆ ಇರವವರ�"
 
 #: ../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 ""
+msgstr "ಕ�ರಮ ತೆಗೆದ�ಕೊಳ�ಳ�ವ ಅಗತ�ಯವಿದೆ"
 
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
@@ -8106,7 +8117,7 @@ msgstr ""
 #. The extra space is just a hack to occupy more space for Attendee
 #: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
-msgstr "ಭಾಗವಹಿಸ�ವವರ�                          "
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�                          "
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-meeting-list-view.c:533
@@ -8116,7 +8127,7 @@ msgstr "RSVP"
 
 #: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
-msgstr ""
+msgstr "ಪ�ರಕ�ರಿಯೆಯಲ�ಲಿದೆ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -8150,7 +8161,7 @@ msgstr "ಯಾವ�ದೆ ಮಾಹಿತಿ ಇಲ�ಲ"
 
 #: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_t)..."
 
 #: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
@@ -8162,7 +8173,7 @@ msgstr "ಕೆಲಸದ ವೇಳೆಯನ�ನ� ಮಾತ�ರ ತೋರಿ
 
 #: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
-msgstr ""
+msgstr "ಹಿಗ�ಗಿಸಿ ತೋರಿಸ�(_z)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
@@ -8174,7 +8185,7 @@ msgstr "_<<"
 
 #: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
-msgstr ""
+msgstr "ತಾನಾಗಿಯೆ ಆರಿಸ�(_A)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
@@ -8182,11 +8193,11 @@ msgstr ">_>"
 
 #: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
-msgstr ""
+msgstr "ಎಲ�ಲಾ ಜನರ� ಹಾಗ� ಸಂಪನ�ಮೂಲಗಳ�(_A)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
-msgstr ""
+msgstr "ಎಲ�ಲಾ ಜನರ� ಹಾಗ� ಒಂದ� ಸಂಪನ�ಮೂಲ(_p)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
@@ -8194,7 +8205,7 @@ msgstr "ಅಗತ�ಯ ಜನರ�(_R)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
-msgstr ""
+msgstr "ಅಗತ�ಯವಿರ�ವ ಜನರ� ಹಾಗ� ಒಂದ� ಸಂಪನ�ಮೂಲ(_o)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
@@ -8206,7 +8217,7 @@ msgstr "ಮ�ಕ�ತಾಯದ ಸಮಯ(_E):"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
-msgstr ""
+msgstr "ಒಬ�ಬ ಪಾಲ�ಗೊಳ�ಳ�ವವನನ�ನ� ಸೇರಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
@@ -8257,11 +8268,11 @@ msgstr "%s ನಲà³�ಲಿ ಮೆಮೊಗಳನà³�ನà³� ತೆರೆಯಲಾà
 
 #: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
-msgstr ""
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ವಸ�ತ�ಗಳನ�ನ� ಅಳಿಸಲಾಗ�ತ�ತಿದೆ..."
 
 #: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
-msgstr ""
+msgstr "ಕಾರ�ಯಗಳನ�ನ� ಲೋಡ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/e-tasks.c:1053
 #, c-format
@@ -8274,7 +8285,7 @@ msgstr "ಕಾರà³�ಯಗಳನà³�ನà³� ತೆರೆಯಲಾಗà³�ತà³�ತà²
 
 #: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
-msgstr ""
+msgstr "ಅಳಿಸಿ ಹಾಕಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
@@ -8289,15 +8300,15 @@ msgstr "%d %B"
 
 #: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
-msgstr ""
+msgstr "ನನ�ನಿಚ�ಛೆಯ ನೋಟ(_C)"
 
 #: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
-msgstr ""
+msgstr "ನನ�ನಿಚ�ಛೆಯ ನೋಟವನ�ನ� ಉಳಿಸ�(_V)"
 
 #: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
-msgstr ""
+msgstr "ನೋಟಗಳನ�ನ� ವಿವರಿಸ�(_D)..."
 
 #: ../calendar/gui/gnome-cal.c:2791
 #, c-format
@@ -8321,7 +8332,7 @@ msgstr "%s ಅನ�ನ� ತೆರೆಯಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
-msgstr ""
+msgstr "ಹೊರದಬ�ಬಲಾಗ�ತ�ತಿದೆ"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -8382,15 +8393,15 @@ msgstr "ಇಂದಿನ ದಿನಾಂಕವನ�ನ� ಆರಿಸ�(_S)"
 #: ../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 ""
+msgstr "ಒಬ�ಬ ಆಯೋಜಕರನ�ನ� ಹೊಂದಿಸಬೇಕಿದೆ."
 
 #: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳಲ� ಕನಿಷ�ಟ ಒಬ�ಬರ ಅಗತ�ಯವಿದೆ"
 
 #: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮದ ಮಾಹಿತಿ"
 
 #: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
@@ -8414,11 +8425,11 @@ msgstr "ಅಪ�ಡೇಟ� ಆದ"
 
 #: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
-msgstr ""
+msgstr "ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�"
 
 #: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
-msgstr ""
+msgstr "ಪ�ರತಿ-ಯೋಜನೆ"
 
 #: ../calendar/gui/itip-utils.c:762
 #, c-format
@@ -8427,11 +8438,11 @@ msgstr "ಬಿಡà³�ವà³�/ಕಾರà³�ಯನಿರತ ಮಾಹಿತಿ (%s à²
 
 #: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
-msgstr ""
+msgstr "�ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿ"
 
 #: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
-msgstr ""
+msgstr "ನೀವ� ಈ ಕಾರ�ಯಕ�ರಮದಲ�ಲಿ ಪಾಲ�ಗೊಳ�ಳ�ವವರಲ�ಲಿ ಒಬ�ಬರಾಗಿರಲೇ ಬೇಕ�."
 
 #: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
@@ -8458,7 +8469,7 @@ msgstr "ಮೆಮೊಗಳನà³�ನà³� ಅಪà³�ಗà³�ರೇಡà³� ಮಾಡà³�à
 #: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
+msgstr "ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ಹಾಗ� ಮೀಟಿಂಗ�‌ಗಳನ�ನ� ರಚಿಸಲ� '%s' ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ತೆರೆಯಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
@@ -8466,7 +8477,7 @@ msgstr "ಮೆಮೊಗಳನ�ನ� ರಚಿಸಲ� ಯಾವ�ದೆ ಕ
 
 #: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
-msgstr ""
+msgstr "ಮೆಮೊ ಸಂಪನ�ಮೂಲ ಆಯ�ಕೆಗಾರ"
 
 #: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
@@ -8483,7 +8494,7 @@ msgstr "ಒಂದ� ಹೊಸ ಮೆಮೊ"
 
 #: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
-msgstr ""
+msgstr "ಹಂಚಲಾದ ಹೊಸ ಮೆಮೊ"
 
 #: ../calendar/gui/memos-component.c:1269
 msgctxt "New"
@@ -8492,7 +8503,7 @@ msgstr "ಹಂಚಲಾದ ಮೆಮೊ(_S)"
 
 #: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
-msgstr ""
+msgstr "ಹಂಚಲಾದ ಒಂದ� ಹೊಸ ಮೆಮೊವನ�ನ� ರಚಿಸಿ"
 
 #: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
@@ -8505,7 +8516,7 @@ msgstr "ಮೆಮೊ ಪಟ�ಟಿ(_s)"
 
 #: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
-msgstr "ಒಂದ� ಹೊಸ ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ರಚಿಸ�"
+msgstr "ಒಂದ� ಹೊಸ ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ರಚಿಸಿ"
 
 #: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
@@ -8522,6 +8533,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"ಇವಲ�ಯೂಶನ�‌ ೧.x ನಿಂದ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಕಾರ�ಯ ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+"ಬದಲಾಗಿದೆ.\n"
+"\n"
+"ಇವಲ�ಯೂಶನ� ನಿಮ�ಮ ಕೋಶಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
 #: ../calendar/gui/migration.c:161
 msgid ""
@@ -8530,24 +8545,28 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"ಇವಲ�ಯೂಶನ�‌ ೧.x ನಿಂದ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಕ�ಯಾಲೆಂಡರ� ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+"ಬದಲಾಗಿವೆ.\n"
+"\n"
+"ಇವಲ�ಯೂಶನ� ನಿಮ�ಮ ಕೋಶಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
 #. 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 ""
+msgstr "evolution/config.xmldb ಯಿಂದ ಹಳೆಯ ಸಂಯೋಜನೆಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr ""
+msgstr "`%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr ""
+msgstr "`%s' ಕಾರ�ಯಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/migration.c:1227
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
@@ -8724,7 +8743,7 @@ msgstr "ಸಾರಾಂಶ: %s"
 
 #: ../calendar/gui/print.c:2522
 msgid "Attendees: "
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�: "
 
 #: ../calendar/gui/print.c:2562
 #, c-format
@@ -8749,7 +8768,7 @@ msgstr "URL: %s"
 #: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
-msgstr ""
+msgstr "ವರ�ಗಗಳ�: %s"
 
 #: ../calendar/gui/print.c:2627
 msgid "Contacts: "
@@ -8786,7 +8805,7 @@ msgstr "ಕಾರ�ಯಗಳನ�ನ� ರಚಿಸಲ� ಯಾವ�ದೆ
 
 #: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
-msgstr ""
+msgstr "ಕಾರ�ಯ ಆಕರ ಆಯ�ಕೆಗಾರ"
 
 #: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
@@ -8803,7 +8822,7 @@ msgstr "ಒಂದ� ಹೊಸ ಕಾರ�ಯವನ�ನ� ರಚಿಸ�"
 
 #: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
-msgstr ""
+msgstr "ನಿಯೋಜಿಸಲಾದ ಹೊಸ ಕಾರ�ಯ"
 
 #: ../calendar/gui/tasks-component.c:1334
 msgctxt "New"
@@ -8812,7 +8831,7 @@ msgstr "ಕಾರ�ಯವನ�ನ� ನಿಯೋಜಿಸ�(_A)"
 
 #: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
-msgstr ""
+msgstr "ಒಂದ� ನಿಯೋಜಿಸಲಾದ ಹೊಸ ಕಾರ�ಯವನ�ನ� ರಚಿಸ�"
 
 #: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
@@ -8876,31 +8895,31 @@ msgstr "ಕà³�ಯಾಲೆಂಡರನà³�ನà³� ತೆರೆಯಲಾಗà³�ತà³
 
 #: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
-msgstr ""
+msgstr "�ಕ�ಯಾಲೆಂಡರ� ಕಡತಗಳ� (.ics)"
 
 #: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� �ಕ�ಯಾಲೆಂಡರ� ಆಮದ�ಗಾರ"
 
 #: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
-msgstr ""
+msgstr "ಜ�ಞಾಪನೆ!"
 
 #: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
-msgstr ""
+msgstr "ವಿಕ�ಯಾಲೆಂಡರ� ಕಡತಗಳ� (.vcf)"
 
 #: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ವಿಕ�ಯಾಲೆಂಡರ� ಆಮದ�ಗಾರ"
 
 #: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
-msgstr ""
+msgstr "ಕ�ಯಾಲೆಂಡರ� ಕಾರ�ಯಕ�ರಮಗಳ�"
 
 #: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಕ�ಯಾಲೆಂಡರ� ಇಂಟೆಲಿಜೆಂಟ� ಆಮದ�ಗಾರ"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -10438,11 +10457,11 @@ msgstr "ತಾನಾಗಿಯೆ ಉಳಿಸಲà³�ಪಟà³�ಟ ಕಡತವನà
 
 #: ../composer/e-composer-autosave.c:282
 msgid "Unable to retrieve message from editor"
-msgstr ""
+msgstr "ಸಂಪಾದಕದಿಂದ ಸಂದೇಶವನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗಲಿಲ�ಲ"
 
 #: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
-msgstr ""
+msgstr "ಲಗತ�ತನ�ನ� ಸೇರಿಸ�"
 
 #: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
@@ -10716,16 +10735,16 @@ msgstr "ಗೂಢಲಿಪೀಕರಣ"
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ಲಗತ�ತ�"
+msgstr[1] "ಲಗತ�ತ�ಗಳ�"
 
 #: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
-msgstr ""
+msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಯನ�ನ� ಅಡಗಿಸ�(_A)"
 
 #: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
-msgstr ""
+msgstr "ಸಂದೇಶವನ�ನ� ರಚಿಸ�"
 
 #: ../composer/e-msg-composer.c:4055
 msgid ""
@@ -10755,7 +10774,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
-msgstr ""
+msgstr "�ಕೆಂದರೆ &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -10766,7 +10785,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
-msgstr ""
+msgstr "ರಚಿಸ�ವ ವಿಂಡೋವನ�ನ� ನಿರ�ಮಿಸಲಾಗಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
@@ -10774,7 +10793,7 @@ msgstr "ಸಂದೇಶವನ�ನ� ರಚಿಸಲಾಗಲಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr ""
+msgstr "&quot;{0}&quot; ಸಹಿ ಕಡತವನ�ನ� ಓದಲಾಗಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
@@ -10790,7 +10809,7 @@ msgstr "ಸಂದೇಶದೊಂದಿಗೆ ಕಡತಕೋಶಗಳನà³�ನà³
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
-msgstr ""
+msgstr "ಅಪೂರ�ಣ ಸಂದೇಶಗಳನ�ನ� ಮರಳಿ ಪಡೆಯಲ� ನೀವ� ಬಯಸ�ತ�ತಿರೆ?"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
@@ -10814,7 +10833,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
-msgstr ""
+msgstr "ಕಳ�ಹಿಸ�ವ ಆಯ�ಕೆಯ� ಲಭ�ಯವಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -10827,13 +10846,12 @@ msgid ""
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:21
-#, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
-msgstr "ಆವೃತ�ತಿ"
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
@@ -10841,7 +10859,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
-msgstr ""
+msgstr "ಅಪೂರ�ಣಗೊಂಡ ಸಂದೇಶಗಳ� ಕಂಡ�ಬಂದಿವೆ"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
@@ -10853,7 +10871,7 @@ msgstr "ಈ ಸಂದೇಶಕ�ಕೆ `{0}' ಕಡತವನ�ನ� ನೀವ
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
+msgstr "ನೀವ� ಒಂದ� ಮೈಲನ�ನ� ರಚಿಸ�ವ ಮೊದಲ� ಒಂದ� ಖಾತೆಯನ�ನ� ಸಂರಚಿಸ�ವ ಅಗತ�ಯವಿದೆ."
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Continue Editing"
@@ -10861,11 +10879,11 @@ msgstr "ಸಂಪಾದಿಸà³�ವà³�ದನà³�ನà³� ಮà³�ಂದà³�ವರೆà²
 
 #: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
-msgstr ""
+msgstr "ಮರಳಿ ಪಡೆಯ ಬೇಡ(_D)"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
-msgstr ""
+msgstr "ಮರಳಿ ಪಡೆ(_R)"
 
 #: ../composer/mail-composer.error.xml.h:33
 msgid "_Save Draft"
@@ -10873,19 +10891,19 @@ msgstr "ಡ�ರಾಫ�ಟ�� ಅನ�ನ� ಉಳಿಸ�(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ� ಹಾಗ� ಕ�ಯಾಲೆಂಡರ�"
 
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
-msgstr ""
+msgstr "ಗ�ರೂಪ�‌ವೇರ� ಸೂಟ�"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "Manage your email, contacts and schedule"
-msgstr ""
+msgstr "ನಿಮ�ಮ ಇಮೈಲ�‌, ಸಂಪರ�ಕ ವಿಳಾಸಗಳನ�ನ� ಹಾಗ� ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ನಿರ�ವಹಿಸ�"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
-msgstr ""
+msgstr "ವಿಳಾಸದ ಕಾರ�ಡ�"
 
 #: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
@@ -10938,11 +10956,11 @@ msgstr "ಮà³�ದà³�ರಿಸà³�ವಾಗ ಒಂದà³� ದೋಷ ಕಂಡà³� à²
 
 #: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "ಮ�ದ�ರಣಾ ವ�ಯವಸ�ಥೆಯ� ದೋಷದ ಬಗ�ಗೆ ಈ ಕೆಳಗಿನ ವಿವರಗಳನ�ನ� ಒದಗಿಸಿದೆ:"
 
 #: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
-msgstr ""
+msgstr "ಮ�ದ�ರಣಾ ವ�ಯವಸ�ಥೆಯ� ದೋಷದ ಬಗ�ಗೆ ಯಾವ�ದೆ ಹೆಚ�ಚ�ವರಿ ವಿವರಗಳನ�ನ� ಒದಗಿಸಿಲ�ಲ:"
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
@@ -11079,8 +11097,8 @@ msgstr[1] "ಮ�ಂದಿನ %d ಗಂಟೆಗಳ�"
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "೧ ದಿನದ ಹಿಂದೆ"
+msgstr[1] "%d ದಿನಗಳ ಹಿಂದೆ"
 
 #: ../filter/filter-datespec.c:83
 #, c-format
@@ -11128,8 +11146,8 @@ msgstr[1] "%d ವರ�ಷಗಳ ಮೊದಲ�"
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] ""
-msgstr[1] "ಭವಿಷ�ಯದಲ�ಲಿ %d ವರ�ಷಗಳ�"
+msgstr[0] "ಮ�ಂದಿನ ೧ ವರ�ಷ"
+msgstr[1] "ಮ�ಂದಿನ %d ವರ�ಷಗಳ�"
 
 #: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
@@ -11147,7 +11165,7 @@ msgstr "%d-%b-%Y"
 
 #: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
-msgstr ""
+msgstr "ಹೋಲಿಸಲ� ಒಂದ� ಸಮಯವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ"
 
 #: ../filter/filter-file.c:284
 msgid "Choose a file"
@@ -11156,15 +11174,15 @@ msgstr "ಒಂದ� ಕಡತವನ�ನ� ಆರಿಸ�"
 #: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
-msgstr ""
+msgstr "ಪರೀಕ�ಷೆ"
 
 #: ../filter/filter-rule.c:852
 msgid "R_ule name:"
-msgstr ""
+msgstr "ನಿಯಮದ ಹೆಸರ�(_u):"
 
 #: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
-msgstr ""
+msgstr "ಈ ಕೆಳಗಿನದಕ�ಕೆ ತಾಳೆಯಾಗ�ವ ಅಂಶಗಳನ�ನ� ಹ�ಡ�ಕ�"
 
 #: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
@@ -11180,7 +11198,7 @@ msgstr ""
 
 #: ../filter/filter-rule.c:922
 msgid "_Find items:"
-msgstr ""
+msgstr "ಅಂಶಗಳನ�ನ� ಹ�ಡ�ಕ�(_F):"
 
 #: ../filter/filter-rule.c:944
 msgid "All related"
@@ -11188,28 +11206,28 @@ msgstr "ಎಲ�ಲಾ ಸಂಬಂಧಿತ"
 
 #: ../filter/filter-rule.c:944
 msgid "Replies"
-msgstr ""
+msgstr "ಮಾರ�ತ�ತರಗಳ�"
 
 #: ../filter/filter-rule.c:944
 msgid "Replies and parents"
-msgstr ""
+msgstr "ಮಾರ�ತ�ತರ ಹಾಗ� ಮೂಲ"
 
 #: ../filter/filter-rule.c:944
 msgid "No reply or parent"
-msgstr ""
+msgstr "ಯಾವ�ದೆ ಉತ�ತರ ಅಥವ ಮೂಲವಿಲ�ಲ"
 
 #: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
-msgstr ""
+msgstr "ಎಳೆಗಳನ�ನ� ಸೇರಿಸ�(_n)"
 
 #: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
-msgstr ""
+msgstr "ಒಳಬರ�ವ"
 
 #: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
-msgstr ""
+msgstr "ಹೊರಹೋಗ�ವ"
 
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
@@ -11249,7 +11267,7 @@ msgstr "ನೀವ� ಒಂದ� ದಿನಾಂಕವನ�ನ� ಆರಿಸ
 
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
-msgstr ""
+msgstr "ನೀವ� ಈ ಫಿಲ�ಟರಿಗೆ ಹೆಸರನ�ನ� ಒದಗಿಸಬೇಕ�."
 
 #: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
@@ -11257,15 +11275,15 @@ msgstr "ನೀವà³� ಒಂದà³� ಕಡತದ ಹೆಸರನà³�ನà³� ಸೂà²
 
 #: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
-msgstr ""
+msgstr "<b>ಫಿಲ�ಟರ� ನಿಯಮಗಳ�(_F)</b>"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
-msgstr ""
+msgstr "ಇದರೊಂದಿಗೆ ಹೋಲಿಸ�"
 
 #: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "ಈ ಮೈಲ�‌ಗಾಗಿ ಫಿಲ�ಟರ�ಗಳನ�ನ� ತೋರಿಸ�:"
 
 #: ../filter/filter.glade.h:5
 msgid ""
@@ -11287,15 +11305,15 @@ msgstr ""
 
 #: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
-msgstr ""
+msgstr "ಈಗಿನ ಸಮಯಕ�ಕೆ ತಾಳೆಯಾಗ�ವ ಒಂದ� ಸಮಯ"
 
 #: ../filter/filter.glade.h:13
 msgid "ago"
-msgstr ""
+msgstr "ಹಿಂದೆ"
 
 #: ../filter/filter.glade.h:16
 msgid "in the future"
-msgstr ""
+msgstr "ಮ�ಂದೆ"
 
 #: ../filter/filter.glade.h:18
 msgid "months"
@@ -11326,27 +11344,27 @@ msgstr "ವರ�ಷಗಳ�"
 
 #: ../filter/rule-editor.c:380
 msgid "Add Rule"
-msgstr ""
+msgstr "ನಿಯಮವನ�ನ� ಸೇರಿಸ�"
 
 #: ../filter/rule-editor.c:459
 msgid "Edit Rule"
-msgstr ""
+msgstr "ನಿಯಮವನ�ನ� ಸಂಪಾದಿಸ�"
 
 #: ../filter/rule-editor.c:786
 msgid "Rule name"
-msgstr ""
+msgstr "ನಿಯಮವನ�ನ� ಹೆಸರಿಸ�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr ""
+msgstr "ರಚನೆಗಾರನ ಆದ�ಯತೆಗಳ�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
+msgstr "ಸ�ರಕ�ಷತೆ ಹಾಗ� ಸಂದೇಶದ ತೋರ�ಪಡಿಕೆಯಂತಹ ಮೈಲ� ಆದ�ಯತೆಗಳನ�ನ� ಇಲ�ಲಿ ಸಂರಚಿಸಿ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
+msgstr "ಕಾಗ�ಣಿತ ಪರೀಕ�ಷೆ, ಸಹಿಗಳಯ ಹಾಗ� ಸಂದೇಶ ರಚನೆಕಾರನನ�ನ� ಇಲ�ಲಿ ಸಂರಚಿಸಿ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -11362,23 +11380,23 @@ msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ� ಖಾತೆಗಳ ಸಂರಚನಾ ನಿಯಂತ�ರಣ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ� ಘಟಕ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ� ರಚನಾಕಾರ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ� ರಚನಾಕಾರನ ಸಂರಚನಾ ನಿಯಂತ�ರಣ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಮೈಲ� ಆದ�ಯತೆಗಳ ನಿಯಂತ�ರಣ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Evolution Network configuration control"
@@ -11413,7 +11431,7 @@ msgstr "ಮೈಲ�(_M)"
 #: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
-msgstr ""
+msgstr "%s ಲೈಸನ�ಸ� ಅಗ�ರಿಮೆಂಟ�"
 
 #: ../mail/em-account-editor.c:394
 #, c-format
@@ -11423,6 +11441,10 @@ msgid ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 msgstr ""
+"\n"
+"ದಯವಿಟ�ಟ� %s ಗಾಗಿ ಈ ಕೆಳಗೆ ತೋರಿಸಲಾಗ�ತ�ತಿರ�ವ\n"
+"ಲೈಸನ�ಸ� ಅಗ�ರಿಮೆಂಟನ�ನ� ಎಚ�ಚರಿಕೆಯಿಂದ ಓದಿ ನಂತರ\n"
+"ಅದನ�ನ� ಒಪ�ಪಿಕೊಳ�ಳಲ� ಅಲ�ಲಿರ�ವ ಚೆಕ�‌ ಬಾಕ�ಸಿನಲ�ಲಿ ಗ�ರ�ತ� ಹಾಕಿ\n"
 
 #: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
@@ -11432,15 +11454,15 @@ 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:97
 msgid "Autogenerated"
-msgstr ""
+msgstr "ತಾನಾಗಿಯೆ ಉತ�ಪತ�ತಿಯಾದ"
 
 #: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
-msgstr ""
+msgstr "ಪ�ರತಿ ಸಂದೇಕ�ಕೂ ಕೇಳ�"
 
 #: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
-msgstr ""
+msgstr "ಗ�ರ�ತ�"
 
 #: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
@@ -11448,7 +11470,7 @@ msgstr "ಇಮೈಲನà³�ನà³� ಸà³�ವೀಕರಿಸಲಾಗà³�ತà³�ತà²
 
 #: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
-msgstr ""
+msgstr "ಪ�ರತಿ ಹೊಸ ಸಂದೇಶಗಳಿಗೂ ಪರೀಕ�ಷಿಸಿ(_n)"
 
 #: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
@@ -11460,7 +11482,7 @@ msgstr "ಇಮೈಲನà³�ನà³� ಕಳà³�ಹಿಸಲಾಗà³�ತà³�ತಿದà³
 
 #: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
-msgstr ""
+msgstr "ಡೀಫಾಲ�ಟ�ಗಳ�"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
@@ -11471,7 +11493,7 @@ msgstr "ಸ�ರಕ�ಷತೆ"
 #. Most sections for this is auto-generated fromt the camel config
 #: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
-msgstr ""
+msgstr "ಪಡೆಯ�ವ ಆಯ�ಕೆಗಳ�"
 
 #: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
@@ -11483,7 +11505,7 @@ msgstr "ಖಾತೆ ಸಂಪಾದಕ"
 
 #: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
-msgstr ""
+msgstr "ಇವಲ�ಯೂಶನ� ಖಾತೆ ಸಹಾಯಕ"
 
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:429
@@ -11509,7 +11531,7 @@ msgstr "ಭಾಷೆ(ಗಳ�)"
 
 #: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
-msgstr ""
+msgstr "ಸಹಿಯ ಸ�ಕ�ರಿಪ�ಟನ�ನ� ಸೇರಿಸಿ"
 
 #: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
@@ -11521,7 +11543,7 @@ msgstr "-------- ಫಾರà³�ವಾರà³�ಡà³� ಮಾಡಲಾದ ಸಂದೇà
 
 #: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
-msgstr ""
+msgstr "ಯಾರ� ಕಳ�ಹಿಸಿದವರ� ಎಂದ� ತಿಳಿದಿಲ�ಲ"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
@@ -11540,12 +11562,12 @@ msgstr "-----ಮೂಲ ಸಂದೇಶ-----"
 
 #: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
-msgstr ""
+msgstr "ಫಿಲ�ಟರ� ನಿಯಮಗಳ�(_F)"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
-msgstr ""
+msgstr "ಸ�ಕೋರನ�ನ� ಸರಿಹೊಂದಿಸ�"
 
 #: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
@@ -11553,7 +11575,7 @@ msgstr "ಬಣ�ಣವನ�ನ� ಒದಗಿಸಿ"
 
 #: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
-msgstr ""
+msgstr "ಸ�ಕೋರನ�ನ� ನಿಯೋಜಿಸ�"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
@@ -11561,7 +11583,7 @@ msgstr "BCC"
 
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
-msgstr ""
+msgstr "ಬೀಪ�"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "CC"
@@ -11573,7 +11595,7 @@ msgstr "ಪೂರ�ಣಗೊಳಿಸಿದ ದಿನಾಂಕ"
 
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
-msgstr "ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�"
+msgstr "ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
@@ -11597,35 +11619,35 @@ msgstr "ಅಳಿಸಲಾದ"
 
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
-msgstr ""
+msgstr "ಇದರೊಂದಿಗೆ ಅಂತ�ಯಗೊಳ�ಳ�ವ�ದಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
-msgstr ""
+msgstr "ಅಸ�ತಿತ�ವದಲ�ಲಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:19
 msgid "does not return"
-msgstr ""
+msgstr "ಮರಳಿಸ�ವ�ದಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
-msgstr ""
+msgstr "ಹೀಗೆ ಎಂದ� ತೋರ�ತ�ತಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
-msgstr ""
+msgstr "ಇದರಿಂದ ಆರಂಭಗೊಳ�ಳ�ವ�ದಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
-msgstr ""
+msgstr "ಡ�ರಾಪ�ಟ�"
 
 #: ../mail/em-filter-i18n.h:24
 msgid "ends with"
-msgstr ""
+msgstr "ಇದರೊಂದಿಗೆ ಮ�ಗಿಯ�ತ�ತದೆ"
 
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
-msgstr ""
+msgstr "ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ"
 
 #: ../mail/em-filter-i18n.h:27
 msgid "Expression"
@@ -11633,35 +11655,35 @@ msgstr ""
 
 #: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
-msgstr ""
+msgstr "ಗಮನವಿರಿಸ�"
 
 #: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
-msgstr ""
+msgstr "ಪ�ರಮ�ಖ"
 
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
-msgstr ""
+msgstr "ಇದರ ನಂತರ"
 
 #: ../mail/em-filter-i18n.h:32
 msgid "is before"
-msgstr ""
+msgstr "ಇದಕ�ಕೂ ಮೊದಲ�"
 
 #: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
-msgstr ""
+msgstr "ಗ�ರ�ತ� ಹಾಕಲ�ಪಟ�ಟಿದೆ"
 
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
-msgstr ""
+msgstr "ಗ�ರ�ತ� ಹಾಕಲ�ಪಟ�ಟಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:38
 msgid "is not set"
-msgstr ""
+msgstr "ಇದನ�ನ� ಹೊಂದಿಸಲಾಗಿಲ�ಲ"
 
 #: ../mail/em-filter-i18n.h:39
 msgid "is set"
-msgstr ""
+msgstr "ಇದನ�ನ� ಹೊಂದಿಸಲಾಗಿದೆ"
 
 #: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
@@ -11670,7 +11692,7 @@ msgstr "ಜಂಕ�"
 
 #: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
-msgstr ""
+msgstr "ರದ�ದಿ ಪರೀಕ�ಷೆ"
 
 #: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
@@ -11686,7 +11708,7 @@ msgstr "ಎಲ�ಲವನ�ನೂ ತಾಳೆನೋಡ�"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
-msgstr ""
+msgstr "ಸಂದೇಶದ ಮ�ಖ�ಯ ಭಾಗ"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
@@ -11706,33 +11728,33 @@ msgstr "ಫೋಲ�ಡರಿಗೆ ಸ�ಥಳಾಂತರಿಸ�"
 
 #: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
-msgstr ""
+msgstr "ಪ�ರೋಗ�ರಾಂಗೆ ಪೈಪ�"
 
 #: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
-msgstr ""
+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:53 ../mail/message-tag-followup.c:62
 msgid "Read"
-msgstr ""
+msgstr "ಓದ�"
 
 #: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
-msgstr ""
+msgstr "ಪಡೆಯ�ವವರ�"
 
 #: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
-msgstr ""
+msgstr "Regex ತಾಳೆ"
 
 #: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
-msgstr ""
+msgstr "ಇವರಿಗೆ ಉತ�ತರಿಸಲಾಗಿದೆ"
 
 #: ../mail/em-filter-i18n.h:57
 msgid "returns"
-msgstr ""
+msgstr "ಮರಳಲಾದ"
 
 #: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
@@ -11748,7 +11770,7 @@ msgstr "ಪ�ರೊಗ�ರಾಂ ಅನ�ನ� ಚಲಾಯಿಸ�"
 
 #: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
-msgstr ""
+msgstr "ಸ�ಕೋರ�"
 
 #: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
@@ -11756,11 +11778,11 @@ msgstr "ಕಳ�ಹಿಸಿದವರ�"
 
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
-msgstr ""
+msgstr "ಲೇಬಲ� ಅನ�ನ� ಹೊಂದ�"
 
 #: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
-msgstr ""
+msgstr "ಸ�ಥಿತಿಯನ�ನ� ಹೊಂದಿಸ�"
 
 #: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
@@ -11768,7 +11790,7 @@ msgstr "ಗಾತ�ರ (kB)"
 
 #: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
-msgstr ""
+msgstr "ಹೀಗೆಂದ� ತೋರ�ತ�ತದೆ"
 
 #: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
@@ -11776,15 +11798,15 @@ msgstr "ಮೂಲ ಖಾತೆ"
 
 #: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
-msgstr ""
+msgstr "ನಿಗದಿತ ಹೆಡರ�"
 
 #: ../mail/em-filter-i18n.h:69
 msgid "starts with"
-msgstr ""
+msgstr "ಇದರೊಂದಿಗೆ ಆರಂಭಗೊಳ�ಳ�ತ�ತದೆ"
 
 #: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
-msgstr ""
+msgstr "ಸಂಸ�ಕರಿಸ�ವ�ದನ�ನ� ನಿಲ�ಲಿಸ�"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
@@ -11792,24 +11814,24 @@ msgstr ""
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
-msgstr ""
+msgstr "ವಿಷಯ"
 
 #: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
-msgstr ""
+msgstr "ಹೊಂದಿಸಲಾದ ಸ�ಥಿತಿಯನ�ನ� ತೆಗೆ"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:521
 msgid "Then"
-msgstr ""
+msgstr "ನಂತರ"
 
 #: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
-msgstr ""
+msgstr "ಕ�ರಮವನ�ನ� ಸೇರಿಸ�(_t)"
 
 #: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
-msgstr ""
+msgstr "ಹ�ಡ�ಕಲಾಗಿದ�ದರಿಂದ ಕ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ನಿರ�ಮಿಸ� (_r)..."
 
 #: ../mail/em-folder-browser.c:215
 msgid "All Messages"
@@ -11837,7 +11859,7 @@ msgstr "5 ದಿನಗಳ ಹಿಂದಿನ ಸಂದೇಶಗಳ�"
 
 #: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
-msgstr ""
+msgstr "ಲಗತ�ಯಗಳನ�ನ� ಹೊಂದಿದ ಸಂದೇಶಗಳ�"
 
 #: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
@@ -11849,11 +11871,11 @@ msgstr "ಸಂದೇಶವ� ಜಂಕ� ಅಲ�ಲ"
 
 #: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
-msgstr ""
+msgstr "ಖಾತೆಯ ಹ�ಡ�ಕಾಟ"
 
 #: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
-msgstr ""
+msgstr "ಎಲ�ಲಾ ಖಾತೆಯ ಹ�ಡ�ಕಾಟ"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:173
@@ -11904,7 +11926,7 @@ msgstr "ಫೋಲ�ಡರಿನ ಹೆಸರ�(_n):"
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
 #: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
-msgstr ""
+msgstr "ಕಡತಕೋಶಗಳನ�ನ� ಹ�ಡ�ಕ�"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
@@ -11960,7 +11982,7 @@ msgstr "%s ಫೋಲà³�ಡರನà³�ನà³� ಸà³�ಥಳಾಂತರಿಸಲಾà²
 #: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
-msgstr "%s ಫೋಲ�ಡರನ�ನ� ನಕಲಿಸಲಾಗ�ತ�ತಿದೆ"
+msgstr "%s ಫೋಲ�ಡರನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
@@ -11970,7 +11992,7 @@ msgstr "ಸಂದೇಶಗಳನà³�ನà³� %s ಫೋಲà³�ಡರಿಗೆ ಸà³�à
 #: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "ಸಂದೇಶಗಳನ�ನ� %s ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸಲಾಗ�ತ�ತಿದೆ"
+msgstr "ಸಂದೇಶಗಳನ�ನ� %s ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
@@ -11978,7 +12000,7 @@ msgstr ""
 
 #: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
-msgstr "ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�(_C)"
+msgstr "ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�(_C)"
 
 #: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
@@ -11987,7 +12009,7 @@ msgstr "ಫೋಲ�ಡರಿಗೆ ಸ�ಥಳಾಂತರಿಸ�(_M)"
 #: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr ""
+msgstr "\"%s\" ಯಲ�ಲಿ ಕೋಶಗಳನ�ನ� ಶೋಧಿಸಲಾಗ�ತ�ತಿದೆ"
 
 #: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
@@ -12008,20 +12030,20 @@ msgstr "ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�(_R)..."
 
 #: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
-msgstr ""
+msgstr "ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�(_f)"
 
 #: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
-msgstr ""
+msgstr "ಔಟ�‌ಬಾಕ�ಸನ�ನ� ಸ�ವಚ�ಛಗೊಳಿಸ�(_u)"
 
 #: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
-msgstr ""
+msgstr "ಕಸದ ಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡ�(_E)"
 
 #: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "`%s' ಅನ�ನ� `%s' ಗೆ ನಕಲಿಸಲಾಗ�ತ�ತಿದೆ"
+msgstr "`%s' ಅನ�ನ� `%s' ಗೆ ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
@@ -12031,7 +12053,7 @@ msgstr "ಫೋಲ�ಡರನ�ನ� ಆರಿಸ�"
 
 #: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
-msgstr "ನಕಲಿಸ�(_o)"
+msgstr "ಕಾಪಿ ಮಾಡ�(_o)"
 
 #: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
@@ -12061,12 +12083,12 @@ msgstr "ಈ ಮೈಲನà³�ನà³� ಅಳಿಸಲà³� ನಿಮಗೆ ಸಾಕà²
 
 #: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
-msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಪ�ರತ�ಯ�ತ�ತರಿಸ�(_R)"
+msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಮಾರ�ತ�ತರಿಸ�(_R)"
 
 #: ../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 ""
+msgstr "ರವಾನಿಸ�(_F)"
 
 #. 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
@@ -12083,7 +12105,7 @@ msgstr "ಫೋಲ�ಡರಿಗೆ ಸ�ಥಳಾಂತರಿಸ�(_M)..."
 
 #: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
-msgstr "ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�(_M)..."
+msgstr "ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�(_M)..."
 
 #: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
@@ -12095,11 +12117,11 @@ msgstr "ಓದಲಾಗಿಲ�ಲ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�
 
 #: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
-msgstr ""
+msgstr "ಮ�ಖ�ಯವಾದ�ದ� ಎಂದ� ಗ�ರ�ತ�ಹಾಕ�(_I)"
 
 #: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
-msgstr ""
+msgstr "ಮ�ಖ�ಯವಾದ�ದಲ�ಲ ಎಂದ� ಗ�ರ�ತ�ಹಾಕ�(_i)"
 
 #: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
@@ -12111,7 +12133,7 @@ msgstr "ಜಂಕ� ಅಲ�ಲವೆಂದ� ಗ�ರ�ತ� ಹಾಕ�
 
 #: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
-msgstr ""
+msgstr "ಗಮನವಿರಿಸ�ವಂತೆ ಗ�ರ�ತ� ಹಾಕ�(_w)..."
 
 #: ../mail/em-folder-view.c:1354
 msgid "_Label"
@@ -12129,7 +12151,7 @@ msgstr "ಹೊಸ ಲೇಬಲ�(_N)"
 
 #: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
-msgstr ""
+msgstr "ಗ�ರ�ತ� ಹಾಕ�ವಿಕೆಯ� ಪೂರ�ಣಗೊಂಡಿದೆ(_g)"
 
 #: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
@@ -12666,6 +12688,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"ಇವಲ�ಯೂಶನ�‌ ೧.x ನಿಂದ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಅಂಚೆ ಪೆಟ�ಟಿಗೆ ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+"ಬದಲಾಗಿವೆ.\n"
+"\n"
+"ಇವಲ�ಯೂಶನ� ನಿಮ�ಮ ಕೋಶಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
 #: ../mail/em-migrate.c:2069
 #, c-format
@@ -12688,17 +12714,15 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
 #: ../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 ""
-"Evolution 1.x ನ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಸಂಪರ�ಕವಿಳಾಸ ಫೋಲ�ಡರ�ಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
-"ಬದಲಾಗಿದೆ.\n"
+"ಇವಲ�ಯೂಶನ� ೨.೨೪ ನಿಂದ ಈಚೆಗೆ ಇವಲ�ಯೂಶನ��ನ ಅಂಚೆಪೆಟ�ಟಿಗೆ ಕೋಶಗಳ ಸಾರಂಶದ ವಿನ�ಯಾಸವನ�ನ� sqlite ಗೆ ಸ�ಥಳಾಂತರಿಸಲಾಗಿವೆ.\n"
 "\n"
-"ಇವಲ�ಯೂಶನ� ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+"ಇವಲ�ಯೂಶನ� ನಿಮ�ಮ ಕೋಶಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
 #: ../mail/em-migrate.c:2963
 #, c-format
@@ -12713,7 +12737,7 @@ msgstr ""
 
 #: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
-msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಪ�ರತ�ಯ�ತ�ತರಿಸ�(_R)"
+msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಮಾರ�ತ�ತರಿಸ�(_R)"
 
 #: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
@@ -13599,7 +13623,7 @@ msgstr ""
 
 #: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
-msgstr "ಬರ�ಕ�-ಲೇ ಮೈಲ��ಬಾಕ�ಸ� (mbox)"
+msgstr "ಬರ�ಕ�-ಲೇ ಅಂಚೆಪೆಟ�ಟಿಗೆ (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
@@ -13607,7 +13631,7 @@ msgstr ""
 
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
-msgstr "ಮೈಲ��ಬಾಕ�ಸನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
+msgstr "ಅಂಚೆಪೆಟ�ಟಿಗೆಯನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
 #: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
@@ -14538,7 +14562,7 @@ msgstr "ಸಂದೇಶದಲ�ಲಿ ಹ�ಡ�ಕ�"
 
 #: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "ಗಮನವಿರಿಸಲ� ಗ�ರ�ತ�"
 
 #: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
@@ -14651,7 +14675,7 @@ msgstr "%s ಗೆ ಸಂದೇಶಗಳನà³�ನà³� ಸà³�ಥಳಾಂತರಿà
 #: ../mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
-msgstr "%s ಗೆ ಸಂದೇಶಗಳನ�ನ� ನಕಲಿಸಲಾಗ�ತ�ತಿದೆ"
+msgstr "%s ಗೆ ಸಂದೇಶಗಳನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
@@ -14881,15 +14905,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:1
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr ""
-"\"{0}\" ಎಂಬ ಹೆಸರಿನ ಕೋಶವ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� "
-"ಹೆಸರನ�ನ� ಬಳಸಿ."
+msgstr "\"{0}\" ಎಂಬ ಹೆಸರಿನ ಕೋಶವ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಹೆಸರನ�ನ� ಬಳಸಿ."
 
 #: ../mail/mail.error.xml.h:2
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"\"{1}\" ಎಂಬ ಹೆಸರಿನ ಕೋಶವ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� "
-"ಹೆಸರನ�ನ� ಬಳಸಿ."
+msgstr "\"{1}\" ಎಂಬ ಹೆಸರಿನ ಕೋಶವ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಹೆಸರನ�ನ� ಬಳಸಿ."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
@@ -15535,7 +15555,7 @@ msgstr ""
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr ""
+msgstr "ಗಮನವಿರಿಸಲ� ಗ�ರ�ತ�"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -15572,7 +15592,7 @@ msgstr "ಫಾರ�ವಾರ�ಡ�"
 
 #: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
-msgstr "ಯಾವ�ದೆ ಪ�ರತ�ಯ�ತ�ತರದ ಅಗತ�ಯವಿಲ�ಲ"
+msgstr "ಯಾವ�ದೆ ಮಾರ�ತ�ತರದ ಅಗತ�ಯವಿಲ�ಲ"
 
 #: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
@@ -16082,7 +16102,7 @@ msgstr ""
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
-msgstr "ನಕಲಿಸ�ವ ಉಪಕರಣ"
+msgstr "ಕಾಪಿ ಮಾಡ�ವ ಉಪಕರಣ"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16287,7 +16307,7 @@ msgstr "ದೃಢೀಕರಿಸ�(_u)"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
-msgstr "ಮೈಲ�‌ಬಾಕ�ಸ��(_M):"
+msgstr "ಅಂಚೆಪೆಟ�ಟಿಗೆ(_M):"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
@@ -16972,7 +16992,7 @@ msgstr "ಬೇರೊಂದ� ಗ�ಪ�ತಪದದಿಂದ ಪ�ನಃ ಪ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
-msgstr ""
+msgstr "ನಿಲ�ಕಣಾ ನಿಯಂತ�ರಣ ಪಟ�ಟಿಗೆ ಬಳಕೆದಾರನನ�ನ� ಸೇರಿಸಲಾಗಿಲ�ಲ:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
@@ -16989,7 +17009,7 @@ msgstr "ಗೊತ�ತಿರದ ದೋಷ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
-msgstr ""
+msgstr "ಗೊತ�ತಿರದ ಬಗೆ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
@@ -16997,63 +17017,63 @@ msgstr "ಬೆಂಬಲವಿಲ�ಲದ ಕಾರ�ಯಾಚರಣೆ"
 
 #: ../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 ""
+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 ""
+msgstr "ನೀವ� ಒಂದ� ಬಾರಿಗೆ ಕೇವಲ ಒಬ�ಬ ಡೆಲಿಗೇಟರಿನ ಪರವಾಗಿ ಮಾತ�ರ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ� ಅನ�ಮತಿ ಇದೆ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
-msgstr ""
+msgstr "ನಿಮ�ಮನ�ನ� ನೀವ� ಸ�ವತಃ ಡೆಲಿಗೇಟ� ಮಾಡ�ವಂತಿಲ�ಲ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr ""
+msgstr "ಈ ಪರಿಚಾರಕದಲ�ಲಿ ಮೈಲ� ಅನ�ನ� ಶೇಖರಿಸಿಡ�ವ ನಿಮ�ಮ ಕೋಟಾವನ�ನ� ಮೀರಿದ�ದೀರಿ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "ನೀವ� ಕೇವಲ ಒಂದ� ಎಕ�ಸ��ಚೇಂಜ� ಖಾತೆಯನ�ನ� ಸಂರಚಿಸಬಹ�ದಾಗಿದೆ."
 
 #: ../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 ""
+msgstr "ನಿಮ�ಮ ಸದ�ಯದ ಬಳಕೆಯ�: {0} ಕೆಬಿ ಆಗಿದೆ. ನೀವ� ಕೆಲವ� ಮೈಲ�‌ಗಳನ�ನ� ಅಳಿಸಿಹಾಕಿ ಒಂದಿಷ�ಟ� ಜಾಗವನ�ನ� ತೆರವ�ಗೊಳಿಸಲ� ಪ�ರಯತ�ನಿಸಿ."
 
 #: ../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 ""
+msgstr "ನಿಮ�ಮ ಸದ�ಯದ ಬಳಕೆಯ�: {0} ಕೆಬಿ ಆಗಿದೆ. ನೀವ� ಈಗ ಯಾವ�ದೆ ಮೈಲನ�ನ� ಕಳ�ಹಿಸಲ� ಅಥವ ಪಡೆಯಲ� ಸಾಧ�ಯವಿಲ�ಲ."
 
 #: ../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 ""
+msgstr "ನಿಮ�ಮ ಸದ�ಯದ ಬಳಕೆಯ�: {0} ಕೆಬಿ ಆಗಿದೆ. ನೀವ� ಕೆಲವ� ಮೈಲ�‌ಗಳನ�ನ� ಅಳಿಸಿಹಾಕಿ ಒಂದಿಷ�ಟ� ಜಾಗವನ�ನ� ತೆರವ�ಗೊಳಿಸದ ಹೊರತ� ಯಾವ�ದೆ ಮೈಲನ�ನ� ಕಳ�ಹಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
-msgstr ""
+msgstr "ನಿಮ�ಮ ಗ�ಪ�ತಪದದ ವಾಯಿದೆ ಪೂರ�ಣಗೊಂಡಿದೆ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "{0} ಅನ�ನ� ಒಂದ� ನಿಲ�ಕಣಾ ನಿಯಂತ�ರಣ ಪಟ�ಟಿಗೆ ಸೇರಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "{0} ಈಗಾಗಲೆ ಒಬ�ಬ ಡೆಲಿಗೇಟ� ಆಗಿದ�ದಾರೆ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "{0} ಈಗಾಗಲೆ ಪಟ�ಟಿಯಲ�ಲಿದ�ದಾರೆ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "ಇತರೆ ಬಳಕೆದಾರರ ಕೆಲಸಗಳಿಗೆ ಚಂದಾದಾರನಾಗ�"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
@@ -17065,13 +17085,15 @@ msgstr "ಡೀಫಾಲ�ಟ�� ಹೊರಗಿನ ಸಂಪಾದಕ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+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
@@ -17084,19 +17106,19 @@ msgstr "ತಾತà³�ಕಾಲಿಕ ಕಡತವನà³�ನà³� ನಿರà³�ಮಿà
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+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 ""
+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 ""
+msgstr "ನಿಮ�ಮ ಪ�ಲಗ�ಇನ� ಆದ�ಯತೆಗಳಲ�ಲಿ ಹೊಂದಿಸಲಾದ ಹೊರಗಿನ ಸಂಪಾದಕವನ�ನ� ಆರಂಭಿಸಲಾಗ�ವ�ದಿಲ�ಲ. ಬೇರೊಂದ� ಸಂಪಾದಕವನ�ನ� ಸಿದ�ಧಗೊಳಿಸಿ ಪ�ರಯತ�ನಿಸಿ."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17104,21 +17126,23 @@ msgstr "ಹೊರಗಿನ ಸಂಪಾದಕದಲ�ಲಿ ಬರೆ"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
-msgstr ""
+msgstr "ಒಂದ� ಹೊರಗಿನ ಸಂಪಾದಕವನ�ನ� ಬಳಸಿಕೊಂಡ� ಸಂದೇಶಗಳನ�ನ� ರಚಿಸಿ"
 
 #: ../plugins/external-editor/external-editor.c:91
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "ಸಂಪಾದಕವನ�ನ� ಆರಂಭಿಸಲ� ಕಾರ�ಯಗತಗೊಳಿಸಬೇಕಿರ�ವ ಆಜ�ಞೆ: "
 
 #: ../plugins/external-editor/external-editor.c:92
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
+"ಎಮಾಕ�ಸಿಗಾಗಿ \"xemacs\" ಅನ�ನ� ಬಳಸಿ\n"
+"VI ಗೆ \"gvim\" ಅನ�ನ� ಬಳಸಿ"
 
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
-msgstr ""
+msgstr "ಒಂದ� (48*48) png ಗಾತ�ರವನ�ನ� ಆರಿಸ� < 700ಬೈಟ�ಗಳ�"
 
 #: ../plugins/face/face.c:68
 msgid "PNG files"
@@ -17142,7 +17166,7 @@ msgstr "ಚಹರೆ"
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr ""
+msgstr "ಕಡತಕೋಶ \"%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."
@@ -17150,11 +17174,11 @@ msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
-msgstr ""
+msgstr "ಕಡತಕೋಶಗಳಿಗೆ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
-msgstr ""
+msgstr "ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�(_U)"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
@@ -17171,7 +17195,7 @@ msgstr "ದಯವಿಟ�ಟ� ಮೊದಲ� ಬಳಕೆದಾರ ಹೆಸ
 #: ../plugins/google-account-setup/google-source.c:497
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
+msgstr "ಚಂದಾದಾರನಾದ ಕ�ಯಾಲೆಂಡರ�ಗಳ ಪಟ�ಟಿಯನ�ನ� ನಿಲ�ಕಿಸಿಕೊಳ�ಳಲ� ಬಳಕೆದಾರ %s ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸ�."
 
 #: ../plugins/google-account-setup/google-source.c:597
 #, c-format
@@ -17179,6 +17203,8 @@ msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
+"ಗೂಗಲ� ಪರಿಚಾರಕದಿಂದ ಮಾಹಿತಿಯನ�ನ� ಓದಲಾಗಿಲ�ಲ.\n"
+"%s"
 
 #: ../plugins/google-account-setup/google-source.c:747
 msgid "Cal_endar:"
@@ -17195,7 +17221,7 @@ msgstr "<b>ಪರಿಚಾರಕ</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar and contacts."
-msgstr ""
+msgstr "ಗೂಗಲ� ಕ�ಯಾಲೆಂಡರ� ಹಾಗ� ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಸಿದ�ಧಪಡಿಸ�ವ ಒಂದ� ಪ�ಲಗ�ಇನ�."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17203,15 +17229,15 @@ msgstr "ಗೂಗಲ�"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
-msgstr ""
+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 ""
+msgstr "ಗ�ಂಪ�ಆಧರಿತ ಕ�ಯಾಲೆಂಡರ� ಹಾಗ� ಸಂಪರ�ಕ ಮೂಲಗಳನ�ನ� ಸಿದ�ಧಗೊಳಿಸ�ವ ಒಂದ� ಪ�ಲಗ�ಇನ�."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
-msgstr ""
+msgstr "ಗ�ಂಪ�ಆಧರಿತ ಖಾತೆಯ ಸಿದ�ಧಗೊಳಿಕೆ"
 
 #: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
@@ -17227,14 +17253,24 @@ msgid ""
 "Click 'Forward' to install the shared folder\n"
 "\n"
 msgstr ""
+"ಬಳಕೆದಾರ '%s' ನಿಮ�ಮೊಂದಿಗೆ ಒಂದ� ಕಡತಕೋಶವನ�ನ� ಹಂಚಿಕೊಂಡಿದ�ದಾರೆ\n"
+"\n"
+"'%s' ಇಂದ ಬಂದ ಸಂದೇಶ\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"ಹಂಚಲಾದ ಕಡತವನ�ನ� ಅನ�ಸ�ಥಾಪಿಸಲ� 'ಮ�ಂದಕ�ಕೆ' ಅನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ\n"
+"\n"
 
 #: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
-msgstr ""
+msgstr "ಹಂಚಲಾದ ಕಡತಕೋಶವನ�ನ� ಅನ�ಸ�ಥಾಪಿಸ�"
 
 #: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
-msgstr ""
+msgstr "ಹಂಚಲಾದ ಕಡತಕೋಶ ಅನ�ಸ�ಥಾಪನೆ"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
@@ -17278,37 +17314,35 @@ msgstr "ಸಂದೇಶ ಹೆಡರ�"
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
-msgstr ""
+msgstr "ಸಂದೇಶವನ�ನ� ಹಿಂದಕ�ಕೆ ಪಡೆದಾಗ ಅದನ�ನ� ಕಳ�ಹಿಸಲಾದವರ ಅಂಚೆಪೆಟ�ಟಿಗೆಯಿಂದ ತೆಗೆದ� ಹಾಕಲ�ಪಡಬಹ�ದ�. ಹೀಗೆ ಮಾಡಬೇಕೆಂದ� ನೀವ� ಖಚಿತವೆ?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
-msgstr ""
+msgstr "ಸಂದೇಶವನ�ನ� ಯಶಸ�ವಿಯಾಗಿ ಹಿಂದಕ�ಕೆ ಪಡೆಯಲಾಯಿತ�"
 
 #: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
-msgstr ""
+msgstr "ಮೈಲನ�ನ� ಹಿಂಪಡೆ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
-msgstr ""
+msgstr "ಗ�ಂಪ�ಆಧರಿತವಾದ ಸಂದೇಶಗಳಿಗೆ ಕಳ�ಹಿಸವ ಆಯ�ಕೆಯನ�ನ� ಸೇರಿಸಿ"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
+msgstr "ಗ�ಂಪ�ಆಧರಿತವಾದ ಖಾತೆಗಳಲ�ಲಿನ ಸವಲತ�ತ�ಗಳಿಗಾಗಿನ ಒಂದ� ಪ�ಲಗ�ಇನ�."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
-msgstr ""
+msgstr "ಗ�ಂಪ�ಆಧರಿತವಾದ ಸವಲತ�ತ�ಗಳ�"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "ಸಂದೇಶ ಇದನ�ನ� ಹೊಂದಿದೆ"
+msgstr "ಸಂದೇಶವನ�ನ� ಹಿಂಪಡೆಯ�ವಲ�ಲಿ ವಿಫಲತೆ"
 
 #: ../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 "ಆಯ�ದ ಸಂದೇಶಗಳನ�ನ� ಕಾರ�ಯಕ�ಕೆ ಬದಲಾಯಿಸ�"
+msgstr "ಆಯ�ದ ಸಂದೇಶವನ�ನ� ಹಿಂಪಡೆಯಲ� ಪರಿಚಾರಕವ� ಅನ�ಮತಿಸಿಲ�ಲ."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17335,7 +17369,9 @@ 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 "&quot;{0}&quot; ಎಂಬ ಹೆಸರಿನ ಖಾತೆಯ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ನಿಮ�ಮ ಕೋಶ ಟ�ರೀ ಅನ�ನ� ಪರೀಕ�ಷಿಸಿ."
+msgstr ""
+"&quot;{0}&quot; ಎಂಬ ಹೆಸರಿನ ಖಾತೆಯ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ನಿಮ�ಮ ಕೋಶ ಟ�ರೀ "
+"ಅನ�ನ� ಪರೀಕ�ಷಿಸಿ."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 msgid "Account Already Exists"
@@ -17345,7 +17381,9 @@ msgstr "ಖಾತೆಯà³� ಈಗಾಗಲೆ ಅಸà³�ತಿತà³�ವದಲà³�à
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
-msgstr "&quot;{0}&quot; ಆಗಿ ಲಾಗಿನ� ಆಗ�ವಲ�ಲಿ ವಿಫಲಗೊಂಡಿದೆ. ದಯವಿಟ�ಟ� ನಿಮ�ಮ ಇಮೈಲ� ವಿಳಾಸವನ�ನ� ಪರಿಶೀಲಿಸಿ ಹಾಗ� ಮತ�ತೊಮ�ಮೆ ಪ�ರಯತ�ನಿಸಿ."
+msgstr ""
+"&quot;{0}&quot; ಆಗಿ ಲಾಗಿನ� ಆಗ�ವಲ�ಲಿ ವಿಫಲಗೊಂಡಿದೆ. ದಯವಿಟ�ಟ� ನಿಮ�ಮ ಇಮೈಲ� ವಿಳಾಸವನ�ನ� "
+"ಪರಿಶೀಲಿಸಿ ಹಾಗ� ಮತ�ತೊಮ�ಮೆ ಪ�ರಯತ�ನಿಸಿ."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
@@ -17369,7 +17407,7 @@ msgstr "ನೀವ� ಯಾರನ�ನ� ಪಟ�ಟಿಗೆ ಸೇರಿಸ
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
-msgstr ""
+msgstr "ತಾತ�ಕಾಲಿಕವಾಗಿ ಒಪ�ಪಿಕೊ"
 
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
@@ -17390,11 +17428,11 @@ msgstr "ಸಂದೇಶ"
 
 #: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "ಹಂಚಲ�ಪಟ�ಟ ಕಡತಕೋಶ ಸೂಚನೆಗಳ�"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr "ಭಾಗವಹಿಸ� ಎಲ�ಲರೂ ಈ ಕೆಳಗಿನ ಸೂಚನೆಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳ�ತ�ತಾರೆ.\n"
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರೂ ಈ ಕೆಳಗಿನ ಸೂಚನೆಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳ�ತ�ತಾರೆ.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
@@ -17434,15 +17472,15 @@ msgstr "ಖಾಸಗಿ ಎಂದà³� ಗà³�ರà³�ತà³� ಹಾಕಲಾದ ಅà²
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
-msgstr ""
+msgstr "ಜ�ಞಾಪನಾ ಸೂಚನೆಗಳ�"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
-msgstr ""
+msgstr "ನನ�ನ ಅಲಾರಂಗಳಿಗೆ ಚಂದಾದಾರನಾಗಿಸ�(_n)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
-msgstr ""
+msgstr "ನನ�ನ ಸೂಚನೆಗಳಿಗೆ ಚಂದಾದಾರನಾಗಿಸ�(_n)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 msgid "_Write"
@@ -17471,7 +17509,7 @@ msgstr "ಪ�ರಾಕ�ಸಿ ಪ�ರವೇಶ"
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
-msgstr ""
+msgstr "%s %s ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ (ಬಳಕೆದಾರ %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
@@ -17572,7 +17610,7 @@ msgstr "ಸಂದೇಶದ ಸ�ಥಿತಿಯ ಜಾಡನ�ನ� ಹಿಡ
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
-msgstr ""
+msgstr "ಹ�ಲಾ(hula) ಕ�ಯಾಲೆಂಡರ�ಗಳನ�ನ� ಸಿದ�ಧಗೊಳಿಸ�ವ ಒಂದ� ಪ�ಲಗ�ಇನ�."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
@@ -17596,7 +17634,7 @@ msgstr "<b>IMAP ಹೆಡರ�ಗಳ�</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
-msgstr ""
+msgstr "ಮೂಲ ಹಾಗ� ಮೈಲಿಂಗ ಲಿಸ�ಟ� ಹೆಡರ�ಗಳ�(_M)(ಡೀಫಾಲ�ಟ�)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
 msgid "Fetch A_ll Headers"
@@ -17622,6 +17660,8 @@ msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
+"ಮೂಲ ಹೆಡರ�ಗಳ�(_B) - (ವೇಗವಾದ) \n"
+"ಮೈಲಿಂಗ� ಲಿಸ�ಟ�ಗಳ ಆಧರಿತವಾದ ಫಿಲ�ಟರ�ಗಳ� ನಿಮ�ಮಲ�ಲಿರದೆ ಹೋದಲ�ಲಿ ಇದನ�ನ� ಬಳಸಿ"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "A plugin for the features in the IMAP accounts."
@@ -17667,13 +17707,13 @@ msgstr "ICS ಅಟà³�ಯಾಚà³�‌ಮೆಂಟà³�ಗಳನà³�ನà³� ಕà³�ಯà
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:34
 msgid "Hardware Abstraction Layer not loaded"
-msgstr ""
+msgstr "Hardware Abstraction Layer ಲೋಡ� ಆಗಿಲ�ಲ"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:35
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
-msgstr ""
+msgstr "\"hald\" ಸೇವೆಯ ಅಗತ�ಯವಿದೆ ಆದರೆ ಈಗ ಅದ� ಚಾಲನೆಯಲ�ಲಿಲ�ಲ. ದಯವಿಟ�ಟ� ಆ ಸೇವೆಯನ�ನ� ಶಕ�ತಗೊಳಿಸಿ ಹಾಗ� ಈ ಪ�ರೋಗ�ರಾಂ ಅನ�ನ� ಮತ�ತೊಮ�ಮೆ ಚಲಾಯಿಸಿ, ಅಥವ ನಿಮ�ಮ ಗಣಕ ವ�ಯವಸ�ಥಾಪಕರನ�ನ� ಸಂಪರ�ಕಿಸಿ."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
@@ -17683,7 +17723,7 @@ msgstr "ಒಂದà³� à²�ಪಾಡà³�‌ಗಾಗಿ ಹà³�ಡà³�ಕà³�ವಲà³�à
 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 ""
+msgstr "ಮೇಳೈಸಲ� ಇವಲ�ಯೂಶನ�‌ಗೆ ಒಂದ� �ಪಾಡ� ಕಂಡ�ಬಂದಿಲ�ಲ. ಒಂದೋ �ಪಾಡ� ಗಣಕಕ�ಕೆ ಸಂಪರ�ಕಗೊಂಡಿಲ�ಲ ಅಥವ ಅದನ�ನ� ಆನ� ಮಾಡಲಾಗಿಲ�ಲ."
 
 #: ../plugins/ipod-sync/ical-format.c:118
 #: ../plugins/save-calendar/ical-format.c:163
@@ -17692,15 +17732,15 @@ msgstr "�ಕ�ಯಾಲೆಂಡರ� ಫಾರ�ಮಾಟ�(.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr ""
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕಾರ�ಯ/ಮೆಮೊ/ಕ�ಯಾಲೆಂಡರ�/ವಿಳಾಸಪ�ಸ�ತಕವನ�ನ� ಆಪಲ�‌ �ಪಾಡಿನೊಂದಿಗೆ ಮೇಳೈಸ�"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
-msgstr ""
+msgstr "�ಪಾಡಿಗೆ ಮೇಳೈಸ�"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr ""
+msgstr "�ಪಾಡಿಗೆ ಮೇಳೈಸ�ವಿಕೆ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:443
 #: ../plugins/itip-formatter/itip-formatter.c:568
@@ -17711,7 +17751,7 @@ msgstr "'%s' ಕà³�ಯಾಲೆಂಡರನà³�ನà³� ಲೋಡà³� ಮಾಡà³�à²
 #: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
+msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿನ ಒಂದ� ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�‌ ಈ ಮೀಟಿಂಗಿಗೆ ತೊಡಕಾಗ�ತ�ತಿದೆ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
@@ -17755,7 +17795,7 @@ msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಳ�ಹಿಸಿದ�ದ
 #: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "ಕ�ಯಾಲೆಂಡರ� '%s' ಅನ�ನ� ತಾತ�ಕಾಲಿಕ ಎಂದ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
@@ -17770,28 +17810,28 @@ msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಳ�ಹಿಸಿದ�ದ
 #: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "ವ�ಯವಸ�ಥಾಪಕರ� ಪ�ರತಿನಿಧಿ %s ಅನ�ನ� ತೆಗೆದ� ಹಾಕಿದ�ದಾರೆ "
 
 #: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
-msgstr ""
+msgstr "ಡೆಲಿಗೇಟ�‌ಗೆ ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
-msgstr ""
+msgstr "ಡೆಲಿಗೇಟ�‌ಗೆ ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಲಿಲ�ಲ �ಕೆಂದರೆ ಸ�ಥಿತಿಯ� ಅಮಾನ�ಯವಾಗಿದೆ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರನ�ನ� ಅಪ�ಡೇಟ�‌ ಮಾಡಲಾಗಲಿಲ�ಲ. %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿದೆ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
@@ -17827,7 +17867,7 @@ msgstr "ಲಗತà³�ತಿಸಲಾದ ಕà³�ಯಾಲೆಂಡರà³� ಸರಿà
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr ""
+msgstr "ಸಂದೇಶವ� ಒಂದ� ಕ�ಯಾಲೆಂಡರ� ಅನ�ನ� ಹೊಂದಿದೆ ಎಂದ� ಹೇಳ�ತ�ತಿದೆ, ಆದರೆ ಕ�ಯಾಲೆಂಡರ� ಒಂದ� ಮಾನ�ಯವಾದ �ಕ�ಯಾಲೆಂಡರ� ಆಗಿಲ�ಲ."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1417
 #: ../plugins/itip-formatter/itip-formatter.c:1435
@@ -17851,7 +17891,9 @@ msgstr "ಲಗತà³�ತಿಸಲಾದ ಕà³�ಯಾಲೆಂಡರà³� ಅನೇà
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "ಈ ಎಲ�ಲಾ ಅಂಶಗಳನ�ನ� ಸಂಸ�ಕರಿಸಲ�, ಕಡತವನ�ನ� ಉಳಿಸಬೇಕ� ಹಾಗ� ಕ�ಯಾಲೆಂಡರ� ಅನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಬೇಕ�"
+msgstr ""
+"ಈ ಎಲ�ಲಾ ಅಂಶಗಳನ�ನ� ಸಂಸ�ಕರಿಸಲ�, ಕಡತವನ�ನ� ಉಳಿಸಬೇಕ� ಹಾಗ� ಕ�ಯಾಲೆಂಡರ� ಅನ�ನ� ಆಮದ� "
+"ಮಾಡಿಕೊಳ�ಳಬೇಕ�"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
@@ -17869,17 +17911,17 @@ msgstr "ಈ ಮೆಮೊ ಪà³�ನರಾವರà³�ತಿತಗೊಳà³�ಳà³�ತà
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "ಕಾರ�ಯಾಚರಣೆಯ ನಂತರ ಸಂದೇಶವನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_D)"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2393
 #: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
-msgstr ""
+msgstr "ತೊಡಕಿಗಾಗಿ ಹ�ಡ�ಕ�"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
+msgstr "ಮೀಟಿಂಗ�‌ಗಳ ನಡ�ವಿನ ತೊಡಕಿಗಾಗಿ ಹ�ಡ�ಕಲ� ಕ�ಯಾಲೆಂಡರ�ಗಳನ�ನ� ಆರಿಸಿ"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
@@ -18029,7 +18071,7 @@ msgstr "%A, %B %e, %Y %l:%M:%S %p"
 #: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
-msgstr "ದಯವಿಟ�ಟ� <b>%s</b> ಪರವಾಗಿ ಪ�ರತ�ಯ�ತ�ತರಿಸ�"
+msgstr "ದಯವಿಟ�ಟ� <b>%s</b> ಪರವಾಗಿ ಮಾರ�ತ�ತರಿಸ�"
 
 #: ../plugins/itip-formatter/itip-view.c:351
 #: ../plugins/itip-formatter/itip-view.c:439
@@ -18051,7 +18093,7 @@ msgstr "ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�
 #: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr ""
+msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಅನ�ನ� ನಿಮಗೆ ನಿಯೋಜಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
@@ -18078,7 +18120,9 @@ msgstr "ಈಗಿರ�ವ ಒಂದ� ಮೀಟಿಂಗ�‌ಗೆ <b>%s</b>
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr "ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ�‌ನ ಬಗ�ಗೆ <b>%s</b> %s ಮೂಲಕ ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ:"
+msgstr ""
+"ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ�‌ನ ಬಗ�ಗೆ <b>%s</b> %s ಮೂಲಕ ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� "
+"ಬಯಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
@@ -18088,12 +18132,12 @@ msgstr "ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ�‌ನ ಬಗ�ಗೆ <b>%s
 #: ../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> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಹಿಂದಕ�ಕೆ ಕಳ�ಹಿಸಿದ�ದಾರೆ:"
+msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಮಾರ�ತ�ತರವನ�ನ� ಹಿಂದಕ�ಕೆ ಕಳ�ಹಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಹಿಂದಕ�ಕೆ ಕಳ�ಹಿಸಿದ�ದಾರೆ:"
+msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಮಾರ�ತ�ತರವನ�ನ� ಹಿಂದಕ�ಕೆ ಕಳ�ಹಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
@@ -18103,27 +18147,27 @@ msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗನà³
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗನ�ನ� ರದ�ದ� ಮಾಡಿದೆ."
+msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗನ�ನ� ರದ�ದ� ಮಾಡಿದ�ದಾರೆ."
 
 #: ../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> ವ� %s ನ ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಬದಲಾವಣೆಗಳನ�ನ� ಪ�ರಸ�ತಾಪಿಸಿದೆ."
+msgstr "<b>%s</b> ವ� %s ನ ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಬದಲಾವಣೆಗಳನ�ನ� ಪ�ರಸ�ತಾಪಿಸಿದ�ದಾರೆ."
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಬದಲಾವಣೆಗಳನ�ನ� ಪ�ರಸ�ತಾಪಿಸಿದೆ."
+msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಬದಲಾವಣೆಗಳನ�ನ� ಪ�ರಸ�ತಾಪಿಸಿದ�ದಾರೆ."
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ವ� %s ನ ಮೂಲಕ ಈ ಕೆಳಗಿನ ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸಿದೆ:"
+msgstr "<b>%s</b> ವ� %s ನ ಮೂಲಕ ಈ ಕೆಳಗಿನ ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> ವ� ಈ ಕೆಳಗಿನ ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸಿದೆ."
+msgstr "<b>%s</b> ವ� ಈ ಕೆಳಗಿನ ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ."
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
@@ -18138,7 +18182,7 @@ msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಕಾರà³�ಯವನà³�ನà³� ಪà³�à²
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr ""
+msgstr "<b>%s</b> ಈ ಕೆಳಗಿನವರಿಗೆ %s ಕಾರ�ಯವನ�ನ� ನಿಯೋಜಿಸಲ� ಮನವಿ ಮಾಡಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
@@ -18148,7 +18192,7 @@ msgstr "ನಿಮಗೆ <b>%s</b> %s ಮೂಲಕ ಒಂದà³� ಕಾರà³�ಯà²
 #: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> ಇಂದ ನಿಮಗೆ ಒಂದ� ಕಾರ�ಯವನ�ನ� ಸೂಚಿಸಿಲಾಗಿದೆ:"
+msgstr "<b>%s</b> ನಿಮಗೆ ಒಂದ� ಕಾರ�ಯವನ�ನ� ಸೂಚಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
@@ -18165,24 +18209,28 @@ msgstr "<b>%s</b> ಈಗಿರà³�ವ ಒಂದà³� ಕಾರà³�ಯಕà³�ಕೆ à²
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
-msgstr "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯದ ಬಗ�ಗೆ <b>%s</b> %s ಮೂಲಕ ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ:"
+msgstr ""
+"ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯದ ಬಗ�ಗೆ <b>%s</b> %s ಮೂಲಕ ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� "
+"ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯದ ಬಗ�ಗೆ <b>%s</b> ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ:"
+msgstr ""
+"ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯದ ಬಗ�ಗೆ <b>%s</b> ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� "
+"ಬಯಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
+msgstr "<b>%s</b> %s ಮೂಲಕ ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯಗಳ ಮಾರ�ತ�ತರವನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr ""
+msgstr "<b>%s</b> ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯಗಳ ಮಾರ�ತ�ತರವನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
@@ -18197,12 +18245,12 @@ msgstr "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯವ
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
+msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಕಾರ�ಯ ಕಾರ�ಯ ನಿಯೋಜನೆಯ ಬದಲಾವಣೆಗಳನ�ನ� ಮ�ಂದಿಟ�ಟಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
+msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಕಾರ�ಯ ಕಾರ�ಯ ನಿಯೋಜನೆಯ ಬದಲಾವಣೆಗಳನ�ನ� ಮ�ಂದಿಟ�ಟಿದ�ದಾರೆ:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
@@ -18271,14 +18319,14 @@ msgstr "ಎಲ�ಲವನ�ನೂ ತಿರಸ�ಕರಿಸ�(_D)"
 
 #: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
-msgstr ""
+msgstr "ಎಲ�ಲಾ ತಾತ�ಕಾಲಿಕ(_T)"
 
 #: ../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 ""
+msgstr "ತಾತ�ಕಾಲಿಕ(_T)"
 
 #: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
@@ -18292,7 +18340,7 @@ msgstr "ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸ�(_S)"
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
-msgstr ""
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡ�(_U)"
 
 #: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
@@ -18316,11 +18364,11 @@ msgstr "ಟಿಪ�ಪಣಿ:"
 
 #: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
-msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಕಳ�ಹಿಸ�(_r)"
+msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಮಾರ�ತ�ತರವನ�ನ� ಕಳ�ಹಿಸ�(_r)"
 
 #: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
-msgstr "ಅಪ�ಡೇಟ�ಗಳನ�ನ� ಭಾಗವಹಿಸ�ವವರಿಗೆ ಕಳ�ಹಿಸ�(_u)"
+msgstr "ಅಪ�ಡೇಟ�ಗಳನ�ನ� ಪಾಲ�ಗೊಳ�ಳ�ವವರಿಗೆ ಕಳ�ಹಿಸ�(_u)"
 
 #: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
@@ -18351,15 +18399,18 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
 msgstr ""
+"&quot;{0}&quot; ಯ� ಈ ಮೀಟಿಂಗ� ಅನ�ನ� ಡೆಲಿಗೇಟ� ಮಾಡಿದ�ದಾರೆ. ನೀವ� ಡೆಲಿಗೇಟ�"
+"&quot;{1}&quot; ಅನ�ನ� ಸೇರಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#, fuzzy
 msgid "This meeting has been delegated"
 msgstr "ಈ ಮೀಟಿಂಗ� ಅನ�ನ� ಡೆಲಿಗೇಟ� ಮಾಡಲಾಗಿದೆ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "ಈ ಪ�ರತಿಕ�ರಿಯೆಯ� ಈಗಿರ�ವ ಭಾಗವಹಿಸ�ವವರಲ�ಲಿ ಒಬ�ಬರಿಂದ ಬಂದಿಲ�ಲ. ಕಳ�ಹಿಸದವರನ�ನ� ಭಾಗವಹಿಸ�ವವರಲ�ಲಿ ಒಬ�ಬರ� ಎಂದ� ಸೇರಿಸಬೇಕೆ? "
+msgstr ""
+"ಈ ಪ�ರತಿಕ�ರಿಯೆಯ� ಈಗಿರ�ವ ಪಾಲ�ಗೊಳ�ಳ�ವವರಲ�ಲಿ ಒಬ�ಬರಿಂದ ಬಂದಿಲ�ಲ. ಕಳ�ಹಿಸದವರನ�ನ� "
+"ಪಾಲ�ಗೊಳ�ಳ�ವವರಲ�ಲಿ ಒಬ�ಬರ� ಎಂದ� ಸೇರಿಸಬೇಕೆ? "
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -18398,8 +18449,8 @@ msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr ""
-"\"true\" ಆಗಿದ�ದಲ�ಲಿ, ಹೊಸ ಸಂದೇಶಗಳ� ಬಂದಾಗ ಬೀಪ� ಶಬ�ಧವನ�ನ� ಮಾಡ�ತ�ತದೆ, ಇಲ�ಲದೆ ಹೋದಲ�ಲಿ ಬೇರೆ "
-"ಶಬ�ಧ ಕಡತವನ�ನ� ಪ�ಲೇ ಮಾಡ�ತ�ತದೆ."
+"\"true\" ಆಗಿದ�ದಲ�ಲಿ, ಹೊಸ ಸಂದೇಶಗಳ� ಬಂದಾಗ ಬೀಪ� ಶಬ�ಧವನ�ನ� ಮಾಡ�ತ�ತದೆ, ಇಲ�ಲದೆ ಹೋದಲ�ಲಿ "
+"ಬೇರೆ ಶಬ�ಧ ಕಡತವನ�ನ� ಪ�ಲೇ ಮಾಡ�ತ�ತದೆ."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18525,7 +18576,7 @@ msgstr "ಹೊಸ ಸಂದೇಶಗಳ� ಇನ�‌ಬಾಕ�ಸಿಗೆ
 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 ""
+msgstr "ಒಂದ� ಹೊಸ ಸಂದೇಶವ� ಬಂದಾಗ, ಸೂಚನಾ ಸ�ಥಳದಲ�ಲಿ ಒಂದ� ಚಿಹ�ನೆ ಹಾಗ� ಸೂಚನಾ ಸಂದೇಶದ ಮೂಲಕ ಒಂದ� ಡಿ-ಬಸ� ಸಂದೇಶವನ�ನ� ಉತ�ಪಾದಿಸ�ತ�ತದೆ ಅಥವ ಬಳಕೆದಾರರಿಗೆ ಸೂಚಿಸ�ತ�ತದೆ."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -18535,7 +18586,9 @@ msgstr "ಮೈಲ� ಸೂಚನೆ"
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
-msgstr "ಒಂದ� ಮೈಲ�‌ ಸಂದೇಶದಲ�ಲಿರ�ವ ವಿಷಯಗಳಿಂದ ಮೀಟಿಂಗ�‌ಗಳನ�ನ� ರಚಿಸಲ� ಅನ�ವ� ಮಾಡಿಕೊಡ�ವ ಒಂದ� ಪ�ಲಗ�‌ಇನ� ಇದಾಗಿದೆ."
+msgstr ""
+"ಒಂದ� ಮೈಲ�‌ ಸಂದೇಶದಲ�ಲಿರ�ವ ವಿಷಯಗಳಿಂದ ಮೀಟಿಂಗ�‌ಗಳನ�ನ� ರಚಿಸಲ� ಅನ�ವ� ಮಾಡಿಕೊಡ�ವ ಒಂದ� "
+"ಪ�ಲಗ�‌ಇನ� ಇದಾಗಿದೆ."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -18554,13 +18607,17 @@ msgstr "ಕà³�ಯಾಲೆಂಡರನà³�ನà³� ತೆಗೆಯಲಾಗಿಲà³
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
-msgstr "ಆರಿಸಲಾದ ಆಕರವ� ಕೇವಲ ಓದಲ� ಮಾತ�ರವಾಗಿದೆ, ಆದ�ದರಿಂದ ಅಲ�ಲಿ ಒಂದ� ಕಾರ�ಯವನ�ನ� ರಚಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಆಕರವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ."
+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 "ಒಂದ� ಮೈಲ�‌ ಸಂದೇಶದಲ�ಲಿರ�ವ ವಿಷಯಗಳಿಂದ ಕಾರ�ಯಗಳನ�ನ� ರಚಿಸಲ� ಅನ�ವ� ಮಾಡಿಕೊಡ�ವ ಒಂದ� ಪ�ಲಗ�‌ಇನ� ಇದಾಗಿದೆ."
+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
@@ -18598,7 +18655,7 @@ msgstr "ಮೈಲಿಂಗ� ಲಿಸ�ಟ��(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
+msgstr "ಸಾಮಾನ�ಯ ಮೈಲಿಂಗ� ಲಿಸ�ಟ� ಆಜ�ಞೆಗಳಿಗೆ ಕ�ರಿಯೆಗಳನ�ನ� ಒದಗಿಸ� (ಚಂದಾದಾರನಾಗಿಸ�ವಿಕೆ, ಚಂದಾದಾರಿಕೆಯ ರದ�ದ�ಗೊಳಿಕೆ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -18610,7 +18667,7 @@ msgstr "ಲಿಸ�ಟಿಗೆ ಚಂದಾದಾರನಾಗ�(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 msgid "_Un-subscribe to list"
-msgstr ""
+msgstr "ಲಿಸ�ಟಿನ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18624,6 +18681,9 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
+"URL \"{0}\" ಗೆ ಒಂದ� ಇಮೈಲ� ಅನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ವ�ದ�. ನೀವ� ಸ�ವಯಂಚಾಲಿತವಾಗಿ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಬಹ�ದ� ಅಥವ ಮೊದಲ� ಅದನ�ನ� ನೋಡಿ ಹಾಗ� ಬದಲಾಯಿಸಬಹ�ದ�.\n"
+"\n"
+"ನೀವ� ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸದ ಸ�ವಲ�ಪಹೊತ�ತಿನಲ�ಲಿಯೆ ಅದಕ�ಕೆ ಮಾರ�ತ�ತರ ಬರಬೇಕ�."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -18641,7 +18701,9 @@ msgstr "ಕಳ�ಹಿಸಲ� ಅನ�ಮತಿ ಇಲ�ಲ"
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr "ಈ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸಂದೇಶ ಕಳ�ಹಿಸಲ� ಅನ�ಮತಿ ಇಲ�ಲ. ಬಹ�ಷಃ, ಇದ� ಕೇವಲ ಓದಲ� ಮಾತ�ರ ಇರ�ವ ಮೈಲಿಂಗ� ಲಿಸ�ಟ�� ಆಗಿರಬಹ�ದ�. ವಿವರಗಳಿಗಾಗಿ ಲಿಸ�ಟಿನ ಮಾಲಿಕರನ�ನ� ಸಂಪರ�ಕಿಸಿ."
+msgstr ""
+"ಈ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸಂದೇಶ ಕಳ�ಹಿಸಲ� ಅನ�ಮತಿ ಇಲ�ಲ. ಬಹ�ಷಃ, ಇದ� ಕೇವಲ ಓದಲ� ಮಾತ�ರ ಇರ�ವ "
+"ಮೈಲಿಂಗ� ಲಿಸ�ಟ�� ಆಗಿರಬಹ�ದ�. ವಿವರಗಳಿಗಾಗಿ ಲಿಸ�ಟಿನ ಮಾಲಿಕರನ�ನ� ಸಂಪರ�ಕಿಸಿ."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18654,6 +18716,9 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
+"ಕೆಲಸವನ�ನ� ಮಾಡಲಾಗಲಗಲಿಲ�ಲ. ಇದರರ�ಥ ಈ ಕೆಲಸದ ಹೆಡರ� ನಾವ� ಸಂಸ�ಕರಿಸಬಹ�ದಾದಂತಹ ಯಾವ�ದೆ ಕೆಲಸವನ�ನ� ಹೊಂದಿಲ�ಲ.\n"
+"\n"
+"ಹೆಡರ�: {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
@@ -18713,7 +18778,7 @@ msgstr "ಈ ಸಂದೇಶವà³� ಯಾವ ಮೈಲಿಂಗà³� ಲಿಸà³�à²
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr ""
+msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸಂಬಂಧಿಸಿದೆಯೊ ಅದರ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
@@ -18736,6 +18801,8 @@ 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:162
 msgid "Current Folder and _Subfolders"
@@ -18755,7 +18822,7 @@ msgstr "ಸಂದೇಶವನ�ನ� ಓದಲಾಗದೆ ಎಂದ� ಗ�
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
-msgstr ""
+msgstr "ಒಂದ� ಕೋಶದಲ�ಲಿನ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಓದಲ� ಮಾತ�ರ ಎಂದ� ಗ�ರ�ತ�ಹಾಕಲ� ಬಳಸಲಾಗ�ತ�ತದೆ"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -18831,11 +18898,11 @@ 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 ""
+msgstr "ಸರಳ ಪಠ�ಯದ ಕ�ರಮ"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "ಸರಳ-ಪಠ�ಯಕ�ಕೆ ಆದ�ಯತೆ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
@@ -18843,11 +18910,11 @@ msgstr "HTML ಇದ�ದಲ�ಲಿ ಅದನ�ನ� ತೋರಿಸ�"
 
 #: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "PLAIN ಗೆ ಆದ�ಯತೆ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "ಯಾವಗಲೂ PLAIN ಅನ�ನ� ಮಾತ�ರ ತೋರಿಸ�"
 
 #: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
@@ -18859,7 +18926,7 @@ msgstr "ಇವಲ�ಯೂಶನ� ಪ�ರೊಫೈಲರ�"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
-msgstr ""
+msgstr "ಪ�ರೊಫೈಲ� ಮಾಡ�ವ ದತ�ತಾಂಶ ಸಂದರ�ಭಗಳ ದಾಖಲೆಯನ�ನ� ಬರೆದಿಡ�ತ�ತದೆ."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
@@ -19041,7 +19108,9 @@ msgstr "ದೂರಸà³�ಥ ಪರೀಕà³�ಷೆಗಳನà³�ನà³� ಒಳಗೊà
 msgid ""
 "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
-msgstr "ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಬಳಸಿಕೊಂಡ� ಜಂಕ�‌ ಸಂದೇಶಗಳನ�ನ� ಫಿಲ�ಟರ� ಮಾಡ�ತ�ತದೆ. ಈ ಪ�ಲಗ�ಇನ�‌ಗಾಗಿ ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಅನ�ನ� ಅನ�ಸ�ಥಾಪಿಸಬೇಕಾಗ�ತ�ತದೆ. "
+msgstr ""
+"ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಬಳಸಿಕೊಂಡ� ಜಂಕ�‌ ಸಂದೇಶಗಳನ�ನ� ಫಿಲ�ಟರ� ಮಾಡ�ತ�ತದೆ. ಈ ಪ�ಲಗ�ಇನ�‌ಗಾಗಿ ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� "
+"ಅನ�ನ� ಅನ�ಸ�ಥಾಪಿಸಬೇಕಾಗ�ತ�ತದೆ. "
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin junk plugin"
@@ -19071,7 +19140,7 @@ msgstr "ಎಲà³�ಲಾ ಅಟà³�ಯಾಚà³�‌ಮೆಂಟà³�‌ಗಳನà³�à²
 
 #: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
-msgstr ""
+msgstr "ಉಳಿಕೆಯ ಮೂಲ ಹೆಸರನ�ನ� ಆರಿಸಿ"
 
 #: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
@@ -19143,7 +19212,7 @@ msgstr "CSV ಮಾದರಿಗಾಗಿ ಸ�ಧಾರಿತ ಆಯ�ಕೆಗ
 
 #: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
-msgstr ""
+msgstr "ಒಂದ� ಹೆಡರನ�ನ� ಸೇರಿಸಿ"
 
 #: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
@@ -19155,11 +19224,11 @@ msgstr "ರೆಕಾರ�ಡ� ಡಿಲಿಮಿಟರ�:"
 
 #: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
-msgstr ""
+msgstr "ಮೌಲ�ಯಗಳನ�ನ� ಇದರಿಂದ ಆವರಿಕೆ ಮಾಡ�(ಎನ�‌ಕ�ಯಾಪ�ಸ�ಲೇಟ�):"
 
 #: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
-msgstr ""
+msgstr "ವಿರಾಮ ಚಿಹ�ನೆಗಳಿಂದ ಕೂಡಿದ ಮೌಲ�ಯ ವಿನ�ಯಾಸ (.csv)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19271,11 +19340,11 @@ msgstr ""
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr ""
+msgstr "ವಿಷಯ ಎಳೆ(ತ�ರೆಡಿಂಗ�)"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
-msgstr ""
+msgstr "ವಿಷಯಗಳ ಮೇರೆಗೆ ಸಂದೇಶಗಳನ�ನ� ಎಳೆಯನ�ನಾಗಿಸ�(ತ�ರೆಡ�)"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
@@ -19302,7 +19371,7 @@ msgstr "ಮಾದರಿಯಾಗಿ ಆಗಿ ಉಳಿಸ�"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr ""
+msgstr "ಡ�ರಾಫ�ಟ� ಆಧರಿತವಾದ ಮಾದರಿ ಪ�ಲಗ�ಇನ�"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
@@ -19380,7 +19449,7 @@ msgstr "ಪೂರ�ವನಿಯೋಜಿತವಾದ ವಿಂಡೋ ಅಗಲ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
+msgstr "HTTP/ಸ�ರಕ�ಷಿತ HTTP ಯನ�ನ� ಅಂತರ�ಜಾಲದಲ�ಲಿ ನಿಲ�ಕಿಸಿಕೊಳ�ಳ�ವಾಗ ಪ�ರಾಕ�ಸಿ ಸಂಯೋಜನೆಗಳನ�ನ� ಶಕ�ತಗೊಳಿಸ�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
@@ -19400,7 +19469,7 @@ msgstr "HTTP ಪ�ರಾಕ�ಸಿ ಬಳಕೆದಾರಹೆಸರ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
+msgstr "ಆರಂಭಗೊಂಡಾಗ ಡೀಫಾಲ�ಟಾಗಿ ತೋರಿಸಬೇಕಿರ�ವ ಘಟಕದ �ಡಿ ಅಥವ ಅಲಿಯಾಸ�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
@@ -19416,7 +19485,7 @@ msgstr "ಹಿಂದಿನ ಬಾರಿ ನವೀಕರಿಸಲಾದ ಸಂರ
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
+msgstr "ಆಫ�‌ಲೈನ� ಬಳಕೆಗಾಗಿ ಡಿಸ�ಕಿಗೆ ಮೇಳೈಸಬೇಕಿರ�ವ ಕಡತಕೋಶಗಳ ಮಾರ�ಗಗಳ ಪಟ�ಟಿ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
@@ -19424,7 +19493,7 @@ msgstr "ಪ�ರಾಕ�ಸಿಯಲ�ಲದ ಅತಿಥೇಯಗಳ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "HTTP ಪ�ರಾಕ�ಸಿ ಕಾರ�ಯವ� ನಡೆಸ�ವಾಗ ದೃಢೀಕರಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಗ�ಪ�ತಪದ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
@@ -19460,7 +19529,7 @@ msgstr "ಬದಿಯ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
-msgstr ""
+msgstr "ವಿಕಸನಾ ಎಚ�ಚರಿಕೆಯ ಸಂವಾದವನ�ನ� ಉಪೇಕ�ಷಿಸಲಾಗ�ತ�ತಿದೆ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
@@ -19471,11 +19540,10 @@ msgid "Statusbar is visible"
 msgstr "ಸ�ಥಿತಿ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
-#, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "ಆವೃತ�ತಿ"
+msgstr "ಇವಲ�ಯೂಶನ�‌ನ ಸಂರಚನೆಯ ಆವೃತ�ತಿ, ಹಿರಿಯ/ಕಿರಿಯ ಸಂರಚನಾ ಮಟ�ಟದೊಂದಿಗೆ (ಉದಾಹರಣೆಗೆ \"೨.೬.೦\")"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
@@ -19490,41 +19558,40 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "ಬದಿಪಟ�ಟಿಯ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ (ಪಿಕ�ಸೆಲ��ಗಳಲ�ಲಿ)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
-#, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr "ಆವೃತ�ತಿ"
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ನವೀಕರಿಸಲಾದ ಸಂರಚನೆಯನ�ನ� ಹೊಂದಿದ ಇವಲ�ಯೂಶನ�‌ನ ಆವೃತ�ತಿ, ಹಿರಿಯ/ಕಿರಿಯ ಸಂರಚನಾ ಮಟ�ಟದೊಂದಿಗೆ (ಉದಾಹರಣೆಗೆ \"೨.೬.೦\")"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "ಪ�ರಾಕ�ಸಿ HTTP ಮಾಡಲ� ಗಣಕದ ಹೆಸರ�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "ಪ�ರಾಕ�ಸಿ ಸ�ರಕ�ಷಿತ HTTP ಮಾಡಲ� ಗಣಕದ ಹೆಸರ�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
-msgstr ""
+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 ""
+msgstr "ನೀವ� ಪ�ರಾಕ�ಸಿ ಅನ�ನ� ಯಾವ�ದರ ಮೂಲಕ ಮಾಡಬೇಕೊ ಅದ� ಗಣಕದಲ�ಲಿನ ಸಂಪರ�ಕಸ�ಥಾನ \"/apps/evolution/shell/network_config/http_host\" ಯಿಂದ ಸೂಚಿತಗೊಂಡಿದೆ."
 
 #: ../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 ""
+msgstr "ನೀವ� ಪ�ರಾಕ�ಸಿ ಅನ�ನ� ಯಾವ�ದರ ಮೂಲಕ ಮಾಡಬೇಕೊ ಅದ� ಗಣಕದಲ�ಲಿನ ಸಂಪರ�ಕಸ�ಥಾನ \"/apps/evolution/shell/network_config/secure_host\" ಯಿಂದ ಸೂಚಿತಗೊಂಡಿದೆ."
 
 #: ../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 ""
+msgstr "ನೀವ� ಪ�ರಾಕ�ಸಿ ಅನ�ನ� ಯಾವ�ದರ ಮೂಲಕ ಮಾಡಬೇಕೊ ಅದ� ಗಣಕದಲ�ಲಿನ ಸಂಪರ�ಕಸ�ಥಾನ \"/apps/evolution/shell/network_config/socks_host\" ಯಿಂದ ಸೂಚಿತಗೊಂಡಿದೆ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
@@ -19555,7 +19622,7 @@ msgstr "HTTP ಪ�ರಾಕ�ಸಿಯನ�ನ� ಬಳಸ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "HTTP ಪ�ರಾಕ�ಸಿ ಕಾರ�ಯವ� ನಡೆಸ�ವಾಗ ದೃಢೀಕರಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಬಳಕೆದಾರ ಹೆಸರ�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19578,9 +19645,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "ಉಪಕರಣ ಪಟ�ಟಿಯ� ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೆ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-#, fuzzy
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "ಆವೃತ�ತಿ"
+msgstr "ಎವಲ�ಯೂಶನ�‌ನ ವಿಕಸನಾ ಆವೃತ�ತಿಯಲ�ಲಿ ಎಚ�ಚರಿಕಾ ಪೆಟ�ಟಿಗೆಯನ�ನ� ಆಲಕ�ಷಿಸಲಾಗಿತ�ತೆ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
@@ -19608,7 +19674,7 @@ msgstr "ಈ ಸಂಪರà³�ಕಗಳನà³�ನà³� ಅಂತà³�ಯಗೊಳಿಸà
 
 #: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
-msgstr ""
+msgstr "ಚಲಾಯಿಸಲ� ಆಮದ�ಗಾರನನ�ನ� ಆರಿಸಿ:"
 
 #: ../shell/e-shell-importer.c:134
 msgid ""
@@ -19618,9 +19684,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"ಇವಲ�ಯೂಶನ�‌ಗೆ ನೀವ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲ� ಬಯಸ�ವ ಕಡತವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ, ಹಾಗ� ಪಟ�ಟಿಯಿಂದ ಅದ� ಯಾವ ಬಗೆಯ ಕಡತವೆಂದ� ಆರಿಸಿ.\n"
+"ಇವಲ�ಯೂಶನ�‌ಗೆ ನೀವ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲ� ಬಯಸ�ವ ಕಡತವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ, ಹಾಗ� ಪಟ�ಟಿಯಿಂದ ಅದ� "
+"ಯಾವ ಬಗೆಯ ಕಡತವೆಂದ� ಆರಿಸಿ.\n"
 "\n"
-"ನಿಮಗಿದ� ತಿಳಿಯದೆ ಇದಲ�ಲಿ \"ಸ�ವಯಂಚಾಲಿತ\" ಅನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ, ಆಗ ಇವಲ�ಯೂಶನ� ಇದನ�ನ� ನಿರ�ವಹಿಸಲ� ಪ�ರಯತ�ನಿಸ�ತ�ತದೆ."
+"ನಿಮಗಿದ� ತಿಳಿಯದೆ ಇದಲ�ಲಿ \"ಸ�ವಯಂಚಾಲಿತ\" ಅನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ, ಆಗ ಇವಲ�ಯೂಶನ� ಇದನ�ನ� "
+"ನಿರ�ವಹಿಸಲ� ಪ�ರಯತ�ನಿಸ�ತ�ತದೆ."
 
 #: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
@@ -19784,7 +19852,9 @@ msgstr "ಒಂದà³� ಹೊಸ ಪರೀಕà³�ಷಾ ಅಂಶವನà³�ನà³� à²
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "ಇವಲ�ಯೂಶನ�‌ಗೆ ಕಡತವನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳ�ವ�ದನ�ನ� ಆರಂಭಿಸಲ� \"ಆಮದ� ಮಾಡಿಕೊ\"ಅನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ. "
+msgstr ""
+"ಇವಲ�ಯೂಶನ�‌ಗೆ ಕಡತವನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳ�ವ�ದನ�ನ� ಆರಂಭಿಸಲ� \"ಆಮದ� ಮಾಡಿಕೊ\"ಅನ�ನ� "
+"ಕ�ಲಿಕ�ಕಿಸಿ. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -19846,14 +19916,17 @@ msgstr ""
 "ಇವಲ�ಯೂಶನ�‌ನ ಈ ಆವೃತ�ತಿಯ� ಇನ�ನೂ ಸಂಪೂರ�ಣಗೊಂಡಿಲ�ಲ. ಇದ� ಪೂರ�ಣಗೊಳ�ಳ�ವ ಹಂತದಲ�ಲಿದೆಯಾದರೂ,\n"
 "ಕೆಲವ� ಸವಲತ�ತ�ಗಳ� ಇನ�ನೂ ಪೂರ�ಣಗೊಂಡಿಲ�ಲ ಅಥವ ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡ�ವ�ದಿಲ�ಲ.\n"
 "\n"
-"ನಿಮಗೆ ಇವಲ�ಯೂಶನ�‌ನ ಒಂದ� ಸದೃಢ ಆವೃತ�ತಿಯ� ಬೇಕಾದಲ�ಲಿ, ಅನ�ಸ�ಥಾಪಿಸಲಾದ ಆವೃತ�ತಿಯನ�ನ� ತೆಗದ� ಹಾಕಿ\n"
+"ನಿಮಗೆ ಇವಲ�ಯೂಶನ�‌ನ ಒಂದ� ಸದೃಢ ಆವೃತ�ತಿಯ� ಬೇಕಾದಲ�ಲಿ, ಅನ�ಸ�ಥಾಪಿಸಲಾದ ಆವೃತ�ತಿಯನ�ನ� ತೆಗದ� "
+"ಹಾಕಿ\n"
 "ಇದರ ಬದಲಿಗೆ %s ಅನ�ನ� ನೀವ� ಅನ�ಸ�ಥಾಪಿಸಿರೆಂದ� ಆಗ�ರಹಿಸ�ತ�ತೇವೆ .\n"
 "\n"
 "ಇದರಲ�ಲಿ ನಿಮಗೇನಾದರೂ ದೋಷಗಳ� ಕಂಡ�ಬಂದಲ�ಲಿ, ದಯವಿಟ�ಟ� ಅವನ�ನ� bugzilla.gnome.org\n"
-"ನಲ�ಲಿ ವರದಿ ಮಾಡಿ. ಈ ಉತ�ಪನ�ನಕ�ಕೆ ಯಾವ�ದೆ ವಾರಂಟಿಯನ�ನ� ನೀಡಲಾಗ�ವ�ದಿಲ�ಲ ಹಾಗ� ಇದ� ಬಹ�ಬೇಗನೆ \n"
+"ನಲ�ಲಿ ವರದಿ ಮಾಡಿ. ಈ ಉತ�ಪನ�ನಕ�ಕೆ ಯಾವ�ದೆ ವಾರಂಟಿಯನ�ನ� ನೀಡಲಾಗ�ವ�ದಿಲ�ಲ ಹಾಗ� ಇದ� "
+"ಬಹ�ಬೇಗನೆ \n"
 "ಕೋಪಗೊಳ�ಳ�ವವರಿಗೆ ಬಳಸಲ� ಇದ� ತರವಲ�ಲ.\n"
 "\n"
-"ನೀವ� ನಮ�ಮ ಈ ಕಠಿಣ ಪರಿಶ�ರಮದ ಉತ�ಪನ�ನವನ�ನ� ಸಂತೋಷದಿಂದ ಬಳಸ�ತ�ತೀರೆಂದ� ನಂಬಿದ�ದೇವೆ, ಅಲ�ಲದೆ ನಿಮ�ಮ\n"
+"ನೀವ� ನಮ�ಮ ಈ ಕಠಿಣ ಪರಿಶ�ರಮದ ಉತ�ಪನ�ನವನ�ನ� ಸಂತೋಷದಿಂದ ಬಳಸ�ತ�ತೀರೆಂದ� ನಂಬಿದ�ದೇವೆ, ಅಲ�ಲದೆ "
+"ನಿಮ�ಮ\n"
 "ಕೊಡ�ಗೆಗಾಗಿ ಉತ�ಸ�ಕತೆಯಿಂದ ಕಾಯ�ತ�ತಿದ�ದೇವೆ!\n"
 
 #: ../shell/main.c:241
@@ -19894,7 +19967,7 @@ msgstr "ಯಾವà³�ದೆ ಪà³�ಲಗà³�ಿನà³�â€�ಗಳನà³�ನà³� ಲೋà
 
 #: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
+msgstr "ಮೈಲ�, ಸಂಪರ�ಕ ವಿಳಾಸಗಳ� ಹಾಗ� ಕಾರ�ಯಗಳ ಮ�ನ�ನೋಟವನ�ನ� ಅಶಕ�ತಗೊಳಿಸ�."
 
 #: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
@@ -19929,7 +20002,9 @@ msgstr "ಇವಲà³�ಯೂಶನà³� ಆರಂಭಗೊಳà³�ಳà³�ವà³�ದಿà²
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
-msgstr "ನಿಮ�ಮ ಗ�ಪ�ತಪದಗಳನ�ನ� ಮರೆಯ�ವ�ದರಿಂದ ನೆನಪಿಟ�ಟ�ಕೊಂಡ ಎಲ�ಲಾ ಗ�ಪ�ತಪದಗಳ� ಅಳಿಸಿ ಹೋಗ�ತ�ತದೆ. ಮ�ಂದಿನ ಬಾರಿ ಅವ�ಗಳ ಅಗತ�ಯವಿದ�ದಾಗ ನಿಮ�ಮನ�ನ� ಕೇಳಲಾಗ�ವ�ದ�."
+msgstr ""
+"ನಿಮ�ಮ ಗ�ಪ�ತಪದಗಳನ�ನ� ಮರೆಯ�ವ�ದರಿಂದ ನೆನಪಿಟ�ಟ�ಕೊಂಡ ಎಲ�ಲಾ ಗ�ಪ�ತಪದಗಳ� ಅಳಿಸಿ ಹೋಗ�ತ�ತದೆ. "
+"ಮ�ಂದಿನ ಬಾರಿ ಅವ�ಗಳ ಅಗತ�ಯವಿದ�ದಾಗ ನಿಮ�ಮನ�ನ� ಕೇಳಲಾಗ�ವ�ದ�."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -19954,12 +20029,12 @@ msgstr ""
 "&quot;ಇವಲ�ಯೂಶನ�‌&quot; ಕೋಶದಲ�ಲಿರ�ವ ಸಂಪೂರ�ಣ ಮಾಹಿತಿಗಳ� ಈಗ ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� "
 "ಹಾಕಲ�ಪಡಲಿದೆ.\n"
 "\n"
-"ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಅಳಿಸ�ವ ಮೊದಲ� ನಿಮ�ಮ ಎಲ�ಲಾ ಮೈಲ�, ಸಂಪರ�ಕ ವಿಳಾಸ, ಹಾಗ� "
-"ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿಯ� ಇವೆಯೆಂದ� ಮತ�ತ� ಈ ಇವಲ�ಯೂಶನ�‌ನ ಆವೃತ�ತಿಯ� ಸರಿಯಾಗಿ "
-"ಕೆಲಸ ಮಾಡ�ತ�ತಿದೆ ಎಂದ� ಪರಿಶೀಲಿಸಿ.\n"
+"ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಅಳಿಸ�ವ ಮೊದಲ� ನಿಮ�ಮ ಎಲ�ಲಾ ಮೈಲ�, ಸಂಪರ�ಕ ವಿಳಾಸ, ಹಾಗ� ಕ�ಯಾಲೆಂಡರ� "
+"ಮಾಹಿತಿಯ� ಇವೆಯೆಂದ� ಮತ�ತ� ಈ ಇವಲ�ಯೂಶನ�‌ನ ಆವೃತ�ತಿಯ� ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡ�ತ�ತಿದೆ ಎಂದ� "
+"ಪರಿಶೀಲಿಸಿ.\n"
 "\n"
-"ಒಮ�ಮೆ ಅಳಿಸಲಾಯಿತೆಂದರೆ, ನಿಮ�ಮ ಹಸ�ತಕ�ಷೇಪದ ಹೊರತ� ನೀವ� ಇವಲ�ಯೂಶನ�‌ನ ಈ "
-"ಹಿಂದಿನ ಆವೃತ�ತಿಗೆ ಮರಳಲ� ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ.\n"
+"ಒಮ�ಮೆ ಅಳಿಸಲಾಯಿತೆಂದರೆ, ನಿಮ�ಮ ಹಸ�ತಕ�ಷೇಪದ ಹೊರತ� ನೀವ� ಇವಲ�ಯೂಶನ�‌ನ ಈ ಹಿಂದಿನ ಆವೃತ�ತಿಗೆ "
+"ಮರಳಲ� ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ.\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
@@ -19972,9 +20047,10 @@ msgid ""
 msgstr ""
 "ಎಲ�ಯೂಶನ�‌ನ ಈ ಹಿಂದಿನ ಆವೃತ�ತಿಯ� ದತ�ತಾಂಶವನ�ನ� ಬೇರೊಂದ� ಪ�ರತ�ಯೇಕ ಸ�ಥಳದಲ�ಲಿ ಶೇಖರಿಸಿಟ�ಟಿದೆ.\n"
 "\n"
-"ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ತೆಗೆದ� ಹಾಕಲ� ಬಯಸಿದಲ�ಲಿ, &quot;"
-"ಎವಲ�ಯೂಶನ�‌&quot; ಕೋಶದಲ�ಲಿರ�ವ ಎಲ�ಲಾ ಮಾಹಿತಿಗಳ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� ಹಾಕಲ�ಪಡ�ತ�ತವೆ. ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ಇರಿಸಿಕೊಳ�ಳಲ� ಬಯಸಿದಲ�ಲಿ, ನಿಮ�ಮ ಸಮಯದ ಅನೂಕೂಲಕ�ಕೆ ತಕ�ಕಂತೆ ನಂತರ ನೀವೆ ಕೈಯಾರೆ &quot;"
-"ಇವಲ�ಯೂಶನ�‌&quot; ಹೊಂದಿರ� ಮಾಹಿತಿಗಳನ�ನ� ತೆಗೆದ� ಹಾಕಬಹ�ದ�.\n"
+"ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ತೆಗೆದ� ಹಾಕಲ� ಬಯಸಿದಲ�ಲಿ, &quot;ಎವಲ�ಯೂಶನ�‌&quot; ಕೋಶದಲ�ಲಿರ�ವ ಎಲ�ಲಾ "
+"ಮಾಹಿತಿಗಳ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� ಹಾಕಲ�ಪಡ�ತ�ತವೆ. ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ಇರಿಸಿಕೊಳ�ಳಲ� "
+"ಬಯಸಿದಲ�ಲಿ, ನಿಮ�ಮ ಸಮಯದ ಅನೂಕೂಲಕ�ಕೆ ತಕ�ಕಂತೆ ನಂತರ ನೀವೆ ಕೈಯಾರೆ &quot;ಇವಲ�ಯೂಶನ�‌&quot; "
+"ಹೊಂದಿರ� ಮಾಹಿತಿಗಳನ�ನ� ತೆಗೆದ� ಹಾಕಬಹ�ದ�.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19988,9 +20064,11 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"ನಿಮ�ಮಲ�ಲಿನ ಮಾಹಿತಿ ಹಾಗ� ಸಂಯೋಜನೆಗಳನ�ನ� ನವೀಕರಿಸಲ� {0} ವರೆಗೆ ಡಿಸ�ಕ�� ಜಾಗದ ಅಗತ�ಯವಿದೆ, ಆದರೆ ನಿಮ�ಮಲ�ಲಿ ಕೇವಲ {1} ಲಭ�ಯವಿದೆ.\n"
+"ನಿಮ�ಮಲ�ಲಿನ ಮಾಹಿತಿ ಹಾಗ� ಸಂಯೋಜನೆಗಳನ�ನ� ನವೀಕರಿಸಲ� {0} ವರೆಗೆ ಡಿಸ�ಕ�� ಜಾಗದ ಅಗತ�ಯವಿದೆ, "
+"ಆದರೆ ನಿಮ�ಮಲ�ಲಿ ಕೇವಲ {1} ಲಭ�ಯವಿದೆ.\n"
 "\n"
-"ಮ�ಂದ�ವರೆಯ� ಮೊದಲ� ನಿಮ�ಮ ನೆಲೆ ಕಡತ ಕೋಶದಲ�ಲಿ ಒಂದಿಷ�ಟ� ಹೆಚ�ಚಿನ ಜಾಗವನ�ನ� ತೆರವ�ಗೊಳಿಸ�ವ�ದ� ಅಗತ�ಯವಾಗ�ತ�ತದೆ."
+"ಮ�ಂದ�ವರೆಯ� ಮೊದಲ� ನಿಮ�ಮ ನೆಲೆ ಕಡತ ಕೋಶದಲ�ಲಿ ಒಂದಿಷ�ಟ� ಹೆಚ�ಚಿನ ಜಾಗವನ�ನ� "
+"ತೆರವ�ಗೊಳಿಸ�ವ�ದ� ಅಗತ�ಯವಾಗ�ತ�ತದೆ."
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -20037,7 +20115,8 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"ನೀವ� ಮ�ಂದ�ವರೆಯಲ� ಬಯಸಿದಲ�ಲಿ, ನಿಮಗೆ ನಿಮ�ಮ ಕೆಲವ� ಹಳೆಯ ಮಾಹಿತಿಗಳನ�ನ� ನೋಡಲ� ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ.\n"
+"ನೀವ� ಮ�ಂದ�ವರೆಯಲ� ಬಯಸಿದಲ�ಲಿ, ನಿಮಗೆ ನಿಮ�ಮ ಕೆಲವ� ಹಳೆಯ ಮಾಹಿತಿಗಳನ�ನ� ನೋಡಲ� "
+"ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20055,14 +20134,18 @@ msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
-msgstr "ಈ ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಒದಗಿಸಿದ ಪ�ರಮಾಣಪತ�ರ ಅಥಾರಿಟಿಯನ�ನ� ನೀವ� ನಂಬ�ವ�ದರಿಂದ, ಇಲ�ಲಿ ಸೂಚಿಸದ ಹೊರತ� ನೀವ� ಈ ಪ�ರಮಾಣಪತ�ರದ ವಿಶ�ವಾಸಾರ�ಹತೆಯನ�ನ� ನಂಬ�ತ�ತೀರ ಎಂದ� ತಿಳಿಯಲಾಗ�ತ�ತದೆ"
+msgstr ""
+"ಈ ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಒದಗಿಸಿದ ಪ�ರಮಾಣಪತ�ರ ಅಥಾರಿಟಿಯನ�ನ� ನೀವ� ನಂಬ�ವ�ದರಿಂದ, ಇಲ�ಲಿ ಸೂಚಿಸದ "
+"ಹೊರತ� ನೀವ� ಈ ಪ�ರಮಾಣಪತ�ರದ ವಿಶ�ವಾಸಾರ�ಹತೆಯನ�ನ� ನಂಬ�ತ�ತೀರ ಎಂದ� ತಿಳಿಯಲಾಗ�ತ�ತದೆ"
 
 #: ../smime/gui/cert-trust-dialog.c: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 "ಈ ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಒದಗಿಸಿದ ಪ�ರಮಾಣಪತ�ರ ಅಥಾರಿಟಿಯನ�ನ� ನೀವ� ನಂಬದ ಕಾರಣ, ಇಲ�ಲಿ ಸೂಚಿಸದ ಹೊರತ� ನೀವ� ಈ ಪ�ರಮಾಣಪತ�ರದ ವಿಶ�ವಾಸಾರ�ಹತೆಯನ�ನ� ನಂಬ�ವ�ದಿಲ�ಲ ಎಂದ� ತಿಳಿಯಲಾಗ�ತ�ತದೆ"
+msgstr ""
+"ಈ ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಒದಗಿಸಿದ ಪ�ರಮಾಣಪತ�ರ ಅಥಾರಿಟಿಯನ�ನ� ನೀವ� ನಂಬದ ಕಾರಣ, ಇಲ�ಲಿ ಸೂಚಿಸದ "
+"ಹೊರತ� ನೀವ� ಈ ಪ�ರಮಾಣಪತ�ರದ ವಿಶ�ವಾಸಾರ�ಹತೆಯನ�ನ� ನಂಬ�ವ�ದಿಲ�ಲ ಎಂದ� ತಿಳಿಯಲಾಗ�ತ�ತದೆ"
 
 #: ../smime/gui/certificate-manager.c:137
 #: ../smime/gui/certificate-manager.c:380
@@ -20443,7 +20526,7 @@ msgstr "ಸೈನಿಂಗ�"
 
 #: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
-msgstr ""
+msgstr "ನಿರಾಕರಿಸದ"
 
 #: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
@@ -20537,7 +20620,7 @@ msgstr "ಆರಿಸಲಾದ ಫೋಲà³�ಡರಿನ ಗà³�ಣಲಕà³�ಷಣà
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "ಎಲ�ಲಾ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇಲ�ಲಿಗೆ ನಕಲಿಸ�(_p)..."
+msgstr "ಎಲ�ಲಾ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_p)..."
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
@@ -20546,23 +20629,23 @@ msgstr "ಸಂಪರ�ಕವಿಳಾಸದ ಮ�ನ�ನೋಟ(_P)"
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
-msgstr "ನಕಲಿಸ�"
+msgstr "ಕಾಪಿ ಮಾಡ�"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�..."
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಫೋಲ�ಡರಿನಲ�ಲಿನ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�"
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಫೋಲ�ಡರಿನಲ�ಲಿನ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "ಆಯ�ದದ�ದನ�ನ� ನಕಲಿಸ�"
+msgstr "ಆಯ�ದದ�ದನ�ನ� ಕಾಪಿ ಮಾಡ�"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr "ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�..."
+msgstr "ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�..."
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
@@ -20697,11 +20780,11 @@ msgstr "ಕೆಲಸಗಳ�(_A)"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "ಸಂಪರ�ಕ ವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ನಕಲಿಸ�(_C)..."
+msgstr "ಸಂಪರ�ಕ ವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_C)..."
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
-msgstr "ಫೋಲ�ಡರ� ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇಲ�ಲಿಗೆ ನಕಲಿಸ�(_C)"
+msgstr "ಫೋಲ�ಡರ� ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_C)"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
@@ -20863,7 +20946,7 @@ msgstr "ಪ�ರಸಕ�ತ ಮೈಲ� ಕಾರ�ಯವನ�ನ� ರದ
 
 #: ../ui/evolution-mail-global.xml.h:3
 msgid "Copy the selected folder into another folder"
-msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಫೋಲ�ಡರನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ನಕಲಿಸ�"
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಫೋಲ�ಡರನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
@@ -20920,7 +21003,7 @@ msgstr "ಸಂದೇಶ ಮ�ನ�ನೋಟ ವಿಂಡೋವನ�ನ� ತ
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
+msgstr "ದೂರಸ�ಥ ಪರಿಚಾರಕಗಳಿಗೆ ಕಡತಕೋಶಗಳನ�ನ� ಚಂದಾದಾರನಾಗಿಸ� ಅಥವ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�"
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
@@ -20932,7 +21015,7 @@ msgstr "ಸಾಂಪ�ರದಾಯಿಕ ನೋಟ(_C)"
 
 #: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
-msgstr "ಫೋಲ�ಡರನ�ನ� ಇಲ�ಲಿಗೆ ನಕಲಿಸ�(_M)..."
+msgstr "ಫೋಲ�ಡರನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_M)..."
 
 #: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
@@ -20987,7 +21070,7 @@ msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ಎಳೆಗಳನ�ನ� ಅಡಗಿ
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
-msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂದೇಶವನ�ನ�(ಗಳನ�ನ�) ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ನಕಲಿಸ�"
+msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂದೇಶವನ�ನ�(ಗಳನ�ನ�) ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ ಕಾಪಿ ಮಾಡ�"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
@@ -21134,19 +21217,19 @@ msgstr "ಜಂಕ��ಗಾಗಿ ಹ�ಡ�ಕ�(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
-msgstr "ಹೊಸ ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಬರೆ(_N)"
+msgstr "ಹೊಸ ಮಾರ�ತ�ತರವನ�ನ� ಬರೆ(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ� ಸ�ವೀಕರಿಸಿದ ಎಲ�ಲರಿಗೂ ಒಂದ� ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಬರೆ"
+msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ� ಸ�ವೀಕರಿಸಿದ ಎಲ�ಲರಿಗೂ ಒಂದ� ಮಾರ�ತ�ತರವನ�ನ� ಬರೆ"
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "ಆರಿಸಲಾದ ಸಂದೇಶದ ಮೈಲಿಂಗ� ಲಿಸ�ಟ��ಗೆ ಒಂದ� ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಬರೆ"
+msgstr "ಆರಿಸಲಾದ ಸಂದೇಶದ ಮೈಲಿಂಗ� ಲಿಸ�ಟ��ಗೆ ಒಂದ� ಮಾರ�ತ�ತರವನ�ನ� ಬರೆ"
 
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
-msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಿದವರಿಗೆ ಒಂದ� ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಬರೆ"
+msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಿದವರಿಗೆ ಒಂದ� ಮಾರ�ತ�ತರವನ�ನ� ಬರೆ"
 
 #: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
@@ -21338,7 +21421,7 @@ msgstr "ಜಂಕ� ಅಲ�ಲ"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
-msgstr "ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಂಪೋಸ� ಮಾಡಲ� ಒಂದ� ವಿಂಡೋವನ�ನ� ತೆರೆಯಿರಿ"
+msgstr "ಮೈಲ� ಸಂದೇಶವನ�ನ� ರಚಿಸಲ� ಒಂದ� ವಿಂಡೋವನ�ನ� ತೆರೆಯಿರಿ"
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
@@ -21362,7 +21445,7 @@ msgstr "ಫೋಲà³�ಡರಿನಲà³�ಲಿ ಹೊಸ ಸಂದೇಶವನà³�à
 
 #: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
-msgstr "ಒಂದ� ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಹಾಕ�(_y)"
+msgstr "ಒಂದ� ಮಾರ�ತ�ತರವನ�ನ� ಹಾಕ�(_y)"
 
 #: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
@@ -21370,7 +21453,7 @@ msgstr "ಸಾರà³�ವಜನಿಕ ಫೋಲà³�ಡರಿನಲà³�ಲಿ ಒಂà
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
-msgstr "ಸಾರ�ವಜನಿಕ ಫೋಲ�ಡರಿನಲ�ಲಿ ಒಂದ� ಸಂದೇಶಕ�ಕೆ ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಹಾಕ�"
+msgstr "ಸಾರ�ವಜನಿಕ ಫೋಲ�ಡರಿನಲ�ಲಿ ಒಂದ� ಸಂದೇಶಕ�ಕೆ ಮಾರ�ತ�ತರವನ�ನ� ಹಾಕ�"
 
 #: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
@@ -21563,7 +21646,7 @@ msgstr "ಮ�ಖ�ಯ ಉಪಕರಣಪಟ�ಟಿ"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
-msgstr "ಆರಿಸಲಾದ ಮೆಮೋವನ�ನ� ನಕಲಿಸ�"
+msgstr "ಆರಿಸಲಾದ ಮೆಮೋವನ�ನ� ಕಾಪಿ ಮಾಡ�"
 
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
@@ -21595,7 +21678,7 @@ msgstr "ಮೆಮೊವನ�ನ� ತೆರೆ(_O)"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ನಕಲಿಸ�"
+msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ಕಾಪಿ ಮಾಡ�"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
@@ -21823,11 +21906,11 @@ msgstr "ನಿರ�ಗಮಿಸ�(_Q)"
 
 #: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
-msgstr ""
+msgstr "ಸ�ವಿಚರಿನ ಗೋಚರಿಕೆ(_S)"
 
 #: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "ಮೇಳೈಸ�ವ ಆಯ�ಕೆಗಳ�(_S)..."
 
 #: ../ui/evolution.xml.h:54
 msgid "_Text Only"
@@ -21867,7 +21950,7 @@ msgstr "ಕೆಲಸ ವಾರದ ನೋಟ(_W)"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr ""
+msgstr "ಅಗಲವಾದ ನೋಟಕ�ಕೆ ಕಳ�ಹಿಸಿದ ಕಡತಕೋಶವಾಗಿ(_d)"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -21887,7 +21970,7 @@ msgstr "ವಿಷಯಕ�ಕನ�ಗ�ಣವಾಗಿ(_b)"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr ""
+msgstr "ಗಮನವಿರಿಸ�ವ ಗ�ರ�ತಿನ ಆಧಾರದಲ�ಲಿ(_F)"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
@@ -22308,7 +22391,9 @@ msgstr "ಅಡಿಗೆರೆಯನ�ನ� ಬಳಸ�"
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
-msgstr "ಇದನ�ನ� ಸೆಟ� ಮಾಡಿದಲ�ಲಿ, ಅಡಿಗೆರೆಯನ�ನ� ಎಳೆದ ಪಠ�ಯದ ಮ�ಂದಿನ ಅಕ�ಷರವ� ನಿಮೋನಿಕ� ಎಕ�ಸಲರೇಟರ� ಕೀಲಿಗಾಗಿ ಬಳಸಬೇಕ�."
+msgstr ""
+"ಇದನ�ನ� ಸೆಟ� ಮಾಡಿದಲ�ಲಿ, ಅಡಿಗೆರೆಯನ�ನ� ಎಳೆದ ಪಠ�ಯದ ಮ�ಂದಿನ ಅಕ�ಷರವ� ನಿಮೋನಿಕ� ಎಕ�ಸಲರೇಟರ� "
+"ಕೀಲಿಗಾಗಿ ಬಳಸಬೇಕ�."
 
 #: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
@@ -22397,7 +22482,9 @@ msgstr "ಜಾಗತಿಕ ನಕ�ಷೆ"
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
-msgstr "ಸಮಯವನ�ನ�ಆಯ�ಕೆ ಮಾಡಲ� ಮೌಸ�‌ ಆಧರಿತವಾದ ಸಂವಾದಾತ�ಮಕ ಮ�ಯಾಪ� ವಿಜೆಟ�. ಕೀಲಿ ಮಣೆ ಬಳಕೆದಾರರ� ಇದರ ಬದಲಿಗೆ ಕೆಳಗಿರ�ವ ಡ�ರಾಪ�-ಡೌನ� ಕಾಂಬಿನೇಶನ� ಬಾಕ�ಸಿನಿಂದ ಕಾಲವಲಯವನ�ನ� ಆರಿಸಬೇಕ�."
+msgstr ""
+"ಸಮಯವನ�ನ�ಆಯ�ಕೆ ಮಾಡಲ� ಮೌಸ�‌ ಆಧರಿತವಾದ ಸಂವಾದಾತ�ಮಕ ಮ�ಯಾಪ� ವಿಜೆಟ�. ಕೀಲಿ ಮಣೆ ಬಳಕೆದಾರರ� ಇದರ "
+"ಬದಲಿಗೆ ಕೆಳಗಿರ�ವ ಡ�ರಾಪ�-ಡೌನ� ಕಾಂಬಿನೇಶನ� ಬಾಕ�ಸಿನಿಂದ ಕಾಲವಲಯವನ�ನ� ಆರಿಸಬೇಕ�."
 
 #: ../widgets/misc/e-online-button.c:109
 msgid "Online"
@@ -22512,7 +22599,7 @@ msgstr "<b>ತಲ�ಪಿಸ�ವ ಆಯ�ಕೆಗಳ�</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
-msgstr "<b>ಪ�ರತ�ಯ�ತ�ತರಗಳ�</b>"
+msgstr "<b>ಮಾರ�ತ�ತರಗಳ�</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
@@ -22564,7 +22651,7 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
-msgstr "ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಕೋರಲಾಗಿದೆ(_e)"
+msgstr "ಮಾರ�ತ�ತರವನ�ನ� ಕೋರಲಾಗಿದೆ(_e)"
 
 #: ../widgets/misc/e-send-options.glade.h:20
 msgid "Sta_tus Tracking"
diff --git a/po/ko.po b/po/ko.po
index baf4c68730..fb950acfad 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,13 +6,13 @@
 # Changwoo Ryu <cwryu@debian.org>, 2003-2006, 2007, 2008.
 #
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-29 16:31+0900\n"
-"PO-Revision-Date: 2008-07-29 16:31+0900\n"
+"POT-Creation-Date: 2008-09-05 00:48+0900\n"
+"PO-Revision-Date: 2008-09-05 01:57+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
@@ -23,16 +23,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "�볼루션 주소�"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "새 연�처"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "새 연�처 목�"
 
@@ -58,68 +58,68 @@ msgstr "연�처: "
 msgid "evolution minicard"
 msgstr "�볼루션 미니카드"
 
-#: ../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 "반복 있�."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "모임."
 
 # a11y 스트�, event는 행사가 아니� UI �벤트
-#: ../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 "달력 �벤트: 요약� %s."
 
 # a11y 스트�, event는 행사가 아니� UI �벤트
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "달력 �벤트: 요약 없�."
 
 # a11y 스트�, event는 행사가 아니� UI �벤트
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "달력 보기 �벤트"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "�커스 받�"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "새 약�"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "새 하루 종� 행사"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "새 모임"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "오늘로 ��"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "날짜로 ��"
 
-#: ../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 "현재 시간 구간� 보고 선�하는 표"
 
 # a11y 스트�, event는 행사가 아니� UI �벤트
 #. 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[0] "�벤트 %d개 있�."
 # a11y 스트�, event는 행사가 아니� UI �벤트
 #. 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 "�벤트 없�."
 
 #. 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 "근무� 주별 보기: %s. %s"
@@ -143,21 +143,21 @@ msgstr "근무� 주별 보기: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "�별 보기: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "달력 보기, 근무 주 단위"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "달력 보기, � 단위"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%Y년 %b %e� %A"
 
@@ -167,30 +167,30 @@ msgstr "%Y년 %b %e� %A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../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
 msgid "%a %d %b"
 msgstr "%b %e� (%a)"
 
-#: ../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:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%Y년 %b %e� (%a)"
 
-#: ../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:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%Y년 %b %e�"
 
@@ -199,60 +199,60 @@ msgstr "%Y년 %b %e�"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../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
 msgid "%d %b"
 msgstr "%b %d"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "그놈 달력"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "찾기 모�"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "�볼루션 달력 찾기 모�"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "�� 단추"
 
 # a11y 스트�, event는 행사가 아니� UI �벤트
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "여기를 누르면 � 많� �벤트를 찾� 수 있습니다."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "월별 보기: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "주별 보기: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "한 달 단위로 달력 보기"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "주 단위로 달력 보기"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "�업"
 
 #. 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 "하위 창 �업"
 
@@ -264,12 +264,12 @@ msgstr "편집"
 msgid "begin editing this cell"
 msgstr "� 셀 편집 시작"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "토글"
 
 #. 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 "셀 토글"
 
@@ -289,55 +289,55 @@ msgstr "줄�기"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "� 셀� 들어 있는 ETree� 행 줄�기"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "테�블 셀"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c: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 "추가하려면 누르십시오"
 
-#: ../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 "누르기"
 
-#: ../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 "ì •ë ¬"
 
-#: ../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 "%Y년 %B %e�"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "달력: %s�서 %s까지"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "�볼루션 달력 항목"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "콤보 단추"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "기본값 활성화"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "�업 메뉴"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "첨부 모� 토글"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "활성화"
 
@@ -389,7 +389,7 @@ msgid "Could not get schema information for LDAP server."
 msgstr "LDAP 서버�서 스키마 정보를 가져올 수 없습니다."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "주소�� 지울 수 없습니다."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -407,7 +407,7 @@ msgid "Delete address book '{0}'?"
 msgstr "'{0}' 주소�� 지우시겠습니까?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "주소�� �어들�는 � 오류가 발�했습니다."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -420,7 +420,7 @@ msgstr "LDAP 서버�서 ��� 실패했습니다."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "연�처를 지우는 � 실패했습니다"
 
@@ -441,8 +441,8 @@ msgid "Some features may not work properly with your current server"
 msgstr "� 서버�서는 �부 기능� 제대로 �작하지 않� 수� 있습니다"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "�볼루션 주소�� 갑�기 �났습니다."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "�볼루션 주소�� 예�치 못하게 �났습니다."
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid ""
@@ -459,31 +459,31 @@ msgstr ""
 "� 틀렸� 수� 있습니다. 지�하는 찾기 기준� 대해 관리��게 문�하십시오."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "주소�� ��히 지�니다."
+msgid "This address book could not be opened."
+msgstr "� 주소�� 열 수 없습니다."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
-msgstr "주소�� 열 수 없습니다."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+msgid "This address book server does not have any suggested search bases."
 msgstr "제안하신 찾기 기준 중�서 주소� 서버� 아무 것� 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "주소� 서버� 접근할 수 없거나 서버 �름� 잘못 입력했� 거나 네트워� 연결"
 "� �어졌� 것입니다."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "주소�� ��히 지�니다."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "� 서버는 LDAPv3 스키마 정보를 지�하지 않습니다."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "주소�� 열 수 없습니다"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -500,7 +500,7 @@ msgstr "바� 부분� 저장하시겠습니까?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "연�처를 한 주소��서 다른 주소�으로 옮기려고 하지만 �래 주소��서 연�처"
@@ -532,12 +532,12 @@ msgid ""
 msgstr ""
 "�볼루션� 다시 시작할 때 까지는 {0}� 대한 연�처를 사용할 수 없습니다."
 
-#: ../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
 msgid "_Add"
-msgstr "추가(_A)"
+msgstr "�하기(_A)"
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
@@ -555,7 +555,7 @@ msgstr "�기 조정(_R)"
 msgid "_Use as it is"
 msgstr "그대로 사용(_U)"
 
-#. 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."
+#. 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}"
@@ -572,7 +572,7 @@ msgstr "기본 �기화 주소:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "주소�� �어들� 수 없습니다"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -598,10 +598,10 @@ msgstr "여기서 �� 완성� 설정합니다"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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-folder.c:582
 msgid "Contacts"
 msgstr "연�처"
 
@@ -626,7 +626,7 @@ msgid "Evolution Address Book component"
 msgstr "�볼루션 주소� 컴�넌트"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "�볼루션 S/MIME ��서 관리 컨트롤"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -641,13 +641,13 @@ msgstr "여기서 S/MIME ��서를 관리합니다"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../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:196 ../mail/em-folder-tree-model.c:200
+#: ../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:1456
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "� 컴퓨터"
 
@@ -660,10 +660,10 @@ msgstr "� 컴퓨터"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../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:205
+#: ../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 "개�"
@@ -674,94 +674,97 @@ msgstr "개�"
 msgid "On LDAP Servers"
 msgstr "LDAP 서버"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "연�처(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "새로운 연�처를 만듭니다"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "연�처 목�(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "새 연�처 목�� 만듭니다"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "새 주소�"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "주소�(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "새 주소�� 만듭니다"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "주소� 설정 혹� ��를 업그레�드하는 � 실패했습니다."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "베�스"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "종류(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "오프�� 작업� 위해 주소� 내용 로컬� 복사(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "�반"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "주소�"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "서버 정보"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "��"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "�세히"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:965
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "찾는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "다운로드하는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "주소� �성"
@@ -772,10 +775,10 @@ msgid "Migrating..."
 msgstr "옮기는 중..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "`%s' 옮기는 중:"
+msgid "Migrating '%s':"
+msgstr "'%s' 옮기는 중:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -826,70 +829,76 @@ msgstr ""
 "\n"
 "��를 여기� 맞게 변환하는 �안 잠시 기다리십시오..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" �� �름 바꾸기:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "�� �름 바꾸기"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "�� �름� '/'가 들어갈 수 없습니다"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "새 주소�(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
+#: ../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
+#: ../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 "지우기(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
-msgstr "�성(_P)..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "�성(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "연�처 �본 선�"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "�명으로 LDAP 서버 사용"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "��하는 � 실패했습니다.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "%s(사용� %s)� 암호를 입력하십시오"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "암호를 입력하십시오"
 
@@ -987,72 +996,77 @@ msgstr "항�"
 msgid "Anonymously"
 msgstr "�명으로"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "한계치� �달할 때까지 � 주소� 보기(_R)"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "기본"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "고유 �름"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "전�메� 주소"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "�볼루션� � 전�메� 주소를 서버� ��할 때 사용합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "가능한 찾기 기준� 찾기"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "로그�(_G):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:760
 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:23
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "암호화 없�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "한 단계"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "찾기 필터"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "찾기 기준(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "찾기 필터(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "찾기 필터"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1061,7 +1075,7 @@ msgstr ""
 "찾기 필터는 찾기를 수행할 때 찾으려는 오브�트� 종류를 �합니다. 따로 바꾸"
 "지 않으면, 기본값� \"person\"� 오브�트� 대해 찾기를 수행합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1069,7 +1083,7 @@ msgstr ""
 "� 옵션� 켜면 LDAP 서버가 SSL� 지�하는 경우�만 �볼루션�서 그 LDAP 서버"
 "� 연결합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1077,7 +1091,7 @@ msgstr ""
 "� 옵션� 켜면 LDAP 서버가 SSL� 지�하는 경우�만 �볼루션�서 그 LDAP 서버"
 "� 연결합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1086,23 +1100,23 @@ msgstr ""
 "� 옵션� 선�하면 서버�서 SSL� 지�하지 않는다는 �미입니다.  연결� 안전"
 "하지 않� 수� 있고, 보안�� 침투� 취약할 수 있습니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "아래 단계"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "지�하는 찾기 기준"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS 암호화"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1111,7 +1125,7 @@ msgstr ""
 "찾기 기준� 찾기를 시작할 항목� 고유 �름(distinguished name, DN)입니다. 찾"
 "기 기준� 비워�면, 디렉토리 트리� 맨 위부터 찾기 시작합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1122,13 +1136,13 @@ msgstr ""
 "찾기 범위는 찾기 기준 아래� 모든 엔트리� 대해서 찾게 �니다. 찾기 범위가 "
 "\"한 단계\"�면 찾기 기준�서 한 단계 아래� 엔트리만 �함합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP 서버� 완전한 �름입니다. 예를 들어 \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1136,7 +1150,7 @@ msgstr ""
 "다운로드할 항목� 최대 개수입니다. � 숫�를 너무 �게 하면 주소� �작� �"
 "려집니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1145,7 +1159,7 @@ msgstr ""
 "�볼루션�서 ��하는 방법입니다. \"전�메� 주소\"로 설정하면 반드시 LDAP 서"
 "버� �명 접근� 가능해야 합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1153,7 +1167,7 @@ msgstr ""
 "�볼루션 �� 목�� 나타날 � 서버� �름입니다. 표시하는 목�으로만 쓰입니"
 "다. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1162,75 +1176,76 @@ msgstr ""
 "�볼루션�서 연결할 LDAP 서버� �트 번호입니다. 표준 �트 번호� 목�� 여"
 "기 있습니다. 어떤 �트를 지정해야 할 지는 시스템 관리��게 물어보십시오."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "구별�는 �름 (Distinguished Name, DN) 사용해서"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "전�메� 주소 사용해서"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "가능하면 언제나"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "주소� 추가(_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "가능한 찾기 기준 찾기(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "로그� 방법(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "�름(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "�트(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "찾기 범위(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "서버(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "제한시간(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "보안 연결 사용(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "카드"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:401
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "분"
 
@@ -1271,7 +1286,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:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1283,16 +1298,16 @@ msgid "Ca_tegories..."
 msgstr "분류(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "연�처"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "연�처 편집기"
 
@@ -1332,8 +1347,8 @@ msgstr "ì „í™”"
 
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1358,8 +1373,8 @@ msgid "_Birthday:"
 msgstr "��(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "달력(_C):"
@@ -1458,15 +1473,15 @@ 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:293
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../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:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
 #: ../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-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
+#: ../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
 msgid "Editable"
@@ -2442,9 +2457,9 @@ msgstr "�바브웨"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
 #: ../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/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
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
@@ -2457,7 +2472,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL �스턴스 메신저"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "재버"
@@ -2471,7 +2486,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "가�가� 메신저"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2492,78 +2507,78 @@ msgstr "위치"
 msgid "Username"
 msgstr "사용��름"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "집"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "야후"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "가�가�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "그룹와�즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "�본 주소�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "대� 주소�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "새 연�처"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "필수 필드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "바뀜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "연�처 편집 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "� 연�처� 사용할 그림� 선�하십시오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "그림 없�(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2571,23 +2586,23 @@ msgstr ""
 "연�처 ��터가 잘못�었습니다:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'� 잘못� 형�� 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'� 잘못� 형�� 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'�(가) 비어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "연�처가 잘못�었습니다."
 
@@ -2746,7 +2761,7 @@ msgstr "메신저 서비스(_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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "위치(_L):"
@@ -2756,7 +2771,7 @@ msgid "<b>Members</b>"
 msgstr "<b>구성�</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 "연�처 목� 편집기"
 
@@ -2776,25 +2791,25 @@ msgstr "목� �름(_L):"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "메�주소를 입력하거나 연�처를 아래� 목�으로 �어 당기십시오(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "연�처 목� 구성�"
 
-#: ../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 "구성�(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "�"
 
-#: ../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 "새 목�"
 
@@ -2835,15 +2850,16 @@ msgstr ""
 "� ��� � 연�처와 같� �름�나 같� 메� 주소가 �미 들어 있습니다.\n"
 "그래� 연�처를 추가하시겠습니까?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "연�처 합치기"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "합치기(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "연�처 합치기"
+
+#: ../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
@@ -2854,14 +2870,14 @@ msgid "Email"
 msgstr "전�메�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "전�메� 시작"
 
@@ -2881,10 +2897,10 @@ msgid_plural "%d contacts"
 msgstr[0] "연�처 %d개"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "쿼리"
 
@@ -2892,29 +2908,29 @@ msgstr "쿼리"
 msgid "Error getting book view"
 msgstr "주소� 보기를 가져오는 � 오류가 발�했습니다"
 
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../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
 msgid "Model"
 msgstr "모�"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "카드를 바꾸는 � 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "�름 시작"
 
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "소스"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2922,96 +2938,90 @@ msgstr "소스"
 msgid "Type"
 msgstr "형태"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
-#: ../calendar/gui/e-calendar-table.c:1566
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "새 연�처(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "새 연�처 목�(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "vCard로 저장(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "연�처 전달(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "연�처 전달(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "연�처로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "리스트로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "연�처로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "�쇄(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "주소�으로 복사(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "주소�으로 ��(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "잘�내기(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../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 "복사(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "붙여 넣기(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "모든 분류"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "기타 오류"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3035,7 +3045,7 @@ msgstr "�장 전화 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
-msgstr "다시 걸 전화"
+msgstr "받� 전화"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
@@ -3147,7 +3157,7 @@ msgstr "무선"
 #: ../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 "ì—­í• "
 
@@ -3185,13 +3195,13 @@ msgstr "웹 사�트"
 
 #: ../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
+#: ../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-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-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
@@ -3201,12 +3211,12 @@ msgstr "너비"
 
 #: ../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
+#: ../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-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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
@@ -3235,11 +3245,11 @@ msgstr "�스트 모�"
 msgid "Max field name length"
 msgstr "최대 필드 �름 길�"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "열 너비"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3249,7 +3259,7 @@ msgstr ""
 "\n"
 "연�처를 찾는 중입니다..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3263,7 +3273,7 @@ msgstr ""
 "\n"
 "새 연�처를 만드려면 마우스를 �번 누르십시오."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3277,7 +3287,7 @@ msgstr ""
 "\n"
 "새 연�처를 만드려면 마우스를 �번 누르십시오."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3287,7 +3297,7 @@ msgstr ""
 "\n"
 "연�처 찾기."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3298,7 +3308,7 @@ msgstr ""
 "여기�서 볼 수 있는 항목� 없습니다."
 
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "어댑터"
 
@@ -3323,16 +3333,16 @@ msgstr "선��"
 msgid "Has Cursor"
 msgstr "커서가 있는 지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "브�우저�서 �� 열기(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "�� 위치 복사(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "새 메세지 보내기(_S)..."
 
@@ -3377,16 +3387,15 @@ msgstr "화� 대화"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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-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 "달력"
@@ -3394,7 +3403,7 @@ msgstr "달력"
 # free/busy -> 약� 있�/없�, Microsoft Office XP 참고
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "약� 있�/없�"
 
@@ -3416,13 +3425,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:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
 #: ../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:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "기��"
@@ -3495,7 +3504,7 @@ msgstr "프로토콜� 지��지 않습니다"
 #: ../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:635 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "취소함"
 
@@ -3531,39 +3540,46 @@ msgstr "그런 소스가 없습니다"
 msgid "Not available in offline mode"
 msgstr "오프�� 모드�서는 사용할 수 없습니다"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "기타 오류"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "서버 버전� 잘못�었습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "지�하지 않는 �� 방�"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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"
-msgstr ""
-"� 주소�� 열 수 없습니다. � 주소�� 오프���서 사용할 수 있게 표시하지 "
-"않았거나 아� 오프���서 사용할 수 있게 다운로드하지 않� �태입니다. 온�"
-"� 모드�서 주소�� 다시 �어들여서 그 내용� 내려 받으십시오."
+"load the address book once in online mode to download its contents"
+msgstr "� 주소�� 열 수 없습니다. � 주소�� 오프���서 사용할 수 있게 표시하지 않았거나 아� 오프���서 사용할 수 있게 다운로드하지 않� �태입니다. 온�� 모드�서 주소�� 다시 �어들여서 그 내용� 다운로드하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "� 주소�� 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로� 접근할 권한� 있"
 "는 지 확�하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "� 주소�� 열 수 없습니다.  잘못� URI를 입력했거나, 해당 LDAP 서버� 연결"
 "할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3572,76 +3588,80 @@ msgstr ""
 "� �볼루션 버전�는 LDAP 지� 기능� 컴파�하지 않았습니다.  LDAP를 사용하려"
 "면 LDAP를 지�하는 �볼루션� 설치해야 합니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "� 주소�� 열 수 없습니다.  잘못� URI를 입력했거나, 해당 서버� 연결할 수 "
 "없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "�세한 오류 내용:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
-"� 쿼리�, 서버�서 리턴하기로 설정한 것보다 많� 카드가 �치하거나,\n"
+"� 쿼리� 서버�서 리턴하기로 설정한 것보다 많� 카드가 �치하거나,\n"
 "�볼루션�서 표시하�� 설정한 것보다 많� 카드가 �치하였습니다.\n"
 "좀 � 구체�으로 찾거나 주소�� 디렉토리 서버 기본 설정�서 \n"
-"결과� 한계치를 지정해 주십시오."
+"결과� 한계치를 지정하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
-"쿼리� 걸린 시간� 서버� 한계값 혹� � 주소��서 설정한 한계값�\n"
+"쿼리� 걸린 시간� 서버� 한계값�나 � 주소��서 설정한 한계값�\n"
 "넘었습니다.  좀 � 구체�으로 찾거나 주소�� 디렉토리 서버 기본 설정�서\n"
-"결과� 한계치를 지정해 주십시오."
+"결과� 한계값� 지정하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "� 주소�� 벡엔드�서 � 질�를 파싱할 수 없습니다."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
+msgstr "� 주소�� 백엔드�서 � 질�를 파싱할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "� 주소�� 벡엔드�서 � 질�를 수행하길 거부했습니다."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
+msgstr "� 주소�� 백엔드�서 � 질�를 수행하길 거부했습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "� 질�가 성공�으로 �나지 않았습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "목�� 추가하는 중 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "연�처를 추가하는 중 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "목�� 고치는 중 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "연�처를 고치는 중 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "목�� 지우는 중 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "연�처를 지우는 중 오류가 발�했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3653,16 +3673,16 @@ msgstr[0] ""
 "연�처 %d개를 열면 %d개� 새 창� 열게 �니다.\n"
 "정�로 � 연�처를 전부 여시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "표시하지 않기(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "모든 연�처 표시(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3671,71 +3691,71 @@ msgstr ""
 "%s�(가) �미 존재합니다\n"
 "� 파�� �어 쓰시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "연�처"
 
 # 파� �름
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "카드.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "주소� 선�"
 
 # 파� �름
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "목�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "연�처 ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "연�처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "연�처 ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "연�처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "여러 개 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "%s� 대한 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "연�처 정보"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s� 대한 연�처 정보"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:297
 msgid "Querying Address Book..."
 msgstr "주소� 질�중입니다..."
 
@@ -3755,14 +3775,14 @@ msgid "Show Compact vCard"
 msgstr "vCard 간단히 보기"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "주소�� 저장"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "카드: "
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../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
@@ -3770,27 +3790,27 @@ msgstr "카드: "
 msgid "Importing..."
 msgstr "가져오는 중..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 혹� 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 � 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 혹� 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 � TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�볼루션 CSV 혹� TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "�볼루션 CSV � TAB 가져오기"
 
@@ -3851,12 +3871,12 @@ 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:503
+#: ../mail/em-mailer-prefs.c:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "머리�:"
 
@@ -3958,8 +3978,8 @@ msgstr "명암"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1055
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "�기:"
@@ -3977,7 +3997,7 @@ msgid "Top:"
 msgstr "위:"
 
 #: ../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 "형태:"
 
@@ -3989,37 +4009,37 @@ msgstr "너비:"
 msgid "_Font..."
 msgstr "글꼴(_F)..."
 
-#: ../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 "연�처 �쇄 모양새 편집 테스트"
 
 # 테스트 프로그램
-#: ../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 "Copyright (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 "연�처 �쇄 모양새 편집 위젯� 테스트합니다"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "연�처 �쇄 테스트"
 
-#: ../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:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "파�� 열 수 없습니다"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "주소�� 목�� 가져올 수 없습니다"
+msgid "Couldn't get list of address books"
+msgstr "주소�� 목�� 가져올 수 없습니다"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4035,7 +4055,7 @@ msgstr "<출력파�>"
 
 # command line help
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "로컬 주소� �� 목�� 표시합니다"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4182,19 +4202,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "정�로 � 약�� 지우시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "정� � 작업� 지우시겠습니까?"
@@ -4440,11 +4460,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "�볼루션� 다시 시작할 때까지는 작업� 사용할 수 없습니다."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "바� 내용 버리기(_D)"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "저장(_S)"
 
@@ -4453,7 +4473,7 @@ msgid "_Save Changes"
 msgstr "바� 내용 저장(_S)"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../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 "보내기(_S)"
@@ -4510,12 +4530,13 @@ 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:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "달력 � 작업"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "달력"
 
@@ -4557,24 +4578,24 @@ msgstr "메모(_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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../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
 msgid "Memos"
 msgstr "메모"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/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
+#: ../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 "ìž‘ì—…"
@@ -4593,18 +4614,19 @@ msgstr "ìž‘ì—…(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "�볼루션 달력 알림 서비스"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "분"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../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:402
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "시간"
@@ -4620,8 +4642,8 @@ msgstr "약�"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4632,14 +4654,14 @@ msgid "Snooze _time:"
 msgstr "연기할 시간(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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
 #: ../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:41
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "편집(_E)"
@@ -4652,33 +4674,33 @@ msgstr "연기 모드(_S)"
 msgid "location of appointment"
 msgstr "약� 장소"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "요약� 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "설명� 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d개 알림� 있습니다"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
-#: ../mail/mail-component.c:1585
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4691,7 +4713,7 @@ msgstr ""
 "보내는 대신 �반�� 미리 알림 대화 ��를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4708,7 +4730,7 @@ msgstr ""
 "\n"
 "정�로 � 프로그램� 실행하시겠습니까?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "� 메세지를 다시 보지 않습니다."
 
@@ -4724,21 +4746,21 @@ msgstr ""
 "알림 기능 서비스 팩토리를 만들 수 없습니다. 아마� �미 �작하는 것 같습니"
 "다..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "잘못� 시간"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d시간"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4747,8 +4769,8 @@ msgstr[0] "%d분"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4992,12 +5014,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:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"미리 보기\" 창 표시"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"미리 보기\" 창� 표시합니다."
 
@@ -5048,7 +5070,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:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "시간대 "
 
@@ -5178,57 +5200,57 @@ msgstr "근무�� 시작하는 분"
 msgid "daylight savings time"
 msgstr "�광 절약 시간"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "요약� �함"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "설명� �함"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "분류가"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "주�� �함"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "위치� �함"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "맞지 않�"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "앞으로 7� 간� 작업"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "활성화한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "마�� 지난 작업"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "완료한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "첨부가 있는 작업"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "활성화한 약�"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "앞으로 7� 간� 약�"
 
@@ -5259,7 +5281,8 @@ msgstr "다�보다 오래� 행사 지우기:"
 #: ../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:403
+#: ../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 "�"
@@ -5268,57 +5291,49 @@ msgstr "�"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../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:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "웹"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "�� � 기��"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "날씨"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "새 달력(_N)"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "�성(_P)"
-
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "달력� 업그레�드하는 � 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "행사와 모임� 만드는 � '%s' 달력� 열 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 모임� 만드는 � 쓸 수 있는 달력� 없습니다"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "달력 소스 선�"
 
@@ -5327,6 +5342,7 @@ msgid "New appointment"
 msgstr "새 약�"
 
 #: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "약�(_A)"
 
@@ -5339,6 +5355,7 @@ msgid "New meeting"
 msgstr "새 모임"
 
 #: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "모임(_E)"
 
@@ -5351,6 +5368,7 @@ msgid "New all day appointment"
 msgstr "새 하루 종� 약�"
 
 #: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "하루 종� 약�(_P)"
 
@@ -5363,6 +5381,7 @@ msgid "New calendar"
 msgstr "새 달력"
 
 #: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "달력(_N)"
 
@@ -5370,19 +5389,19 @@ msgstr "달력(_N)"
 msgid "Create a new calendar"
 msgstr "새 달력� 만듭니다"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "�별 보기"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "근무� 주별 보기"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "주별 보기"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "월별 보기"
 
@@ -5422,15 +5441,15 @@ msgstr "등급"
 msgid "Competition"
 msgstr "경�"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../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/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "비밀"
 
 #: ../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 "설명"
@@ -5515,20 +5534,20 @@ msgstr "주최�"
 msgid "Phone Calls"
 msgstr "전화 걸기"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../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/memotypes.xml.h:29
 msgid "Private"
 msgstr "개�"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+#: ../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
 msgid "Public"
 msgstr "공개"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "반복"
 
@@ -5616,11 +5635,11 @@ msgstr "달력� 여는 메소드를 지�하지 않습니다"
 msgid "Permission denied to open the calendar"
 msgstr "달력� 열 허가가 거부�었습니다"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발�했습니다"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "알림 편집"
 
@@ -5726,7 +5745,6 @@ msgid "hour(s)"
 msgstr "시간"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "분"
 
@@ -5735,13 +5753,13 @@ msgid "start of appointment"
 msgstr "약� 시작"
 
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "�작/시작 옵션"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
-msgstr "추가(_D)"
+msgstr "�하기(_D)"
 
 # Alarm -> 알림, Microsoft Office XP 참고
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
@@ -5750,12 +5768,12 @@ msgstr "추가(_D)"
 msgid "Alarms"
 msgstr "알림"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "첨부 파�� �� 표시 우선(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "파� 첨부"
 
@@ -5918,7 +5936,7 @@ msgid "Thursday"
 msgstr "목요�"
 
 #: ../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 "시간대(_Z):"
 
@@ -6014,397 +6032,397 @@ msgstr "수(_W)"
 msgid "before every appointment"
 msgstr "전� 미리 알려주기"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "오프�� 작업� 위해 달력 내용� 로컬� 복사(_Y)"
 
-#: ../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 "오프�� 작업� 위해 작업 목� 내용� 로컬� 복사(_Y)"
 
-#: ../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 "오프�� 작업� 위해 메모 목� 내용� 로컬� 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "색(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "작업 목�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "메모 목�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "달력 �성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "작업 목� �성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "새 작업 목�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "메모 목� �성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "새 메모 목�"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "� 행사는 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "� 작업� 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "� 메모는 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  바� 사항� 있습니다. � 바� 사항� 버리고 편집기를 닫으시겠습니까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  바� 사항� 있습니다. 편집기를 닫으시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "� 행사는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "� 작업� 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "� 메모는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  바� 사항� 있습니다. � 바� 사항� 버리고 편집기를 업��트하시겠습니"
 "까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바� 사항� 없습니다. 편집기를 업��트하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr "부터 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (완료� "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "완료� "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (기한 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "첨부한 메시지 - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "첨부한 메세지 %d개"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "��(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "드래그 취소(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../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:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "오브�트를 업��트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "약� 편집"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "모임 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "약� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "할당한 작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "ìž‘ì—… - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "메모 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "요약 없�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "현재 창� 닫으려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "선�한 메세지를 �립보드로 복사합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "선�한 �스트를 �립보드로 잘�냅니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "해당 �움�� 보려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "�립보드�서 �스트를 붙여 넣습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "현재 창� 저장하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "모든 �스트 선�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "파�(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "�움�(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "넣기(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "옵션(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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:54
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "첨부(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "파�� 첨부하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "분류를 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "시간대(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "시간대 항목� 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "공개(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "공개로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "개� 정보(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "개� 정보로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "비밀(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "비밀로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "역할 항목(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "역할 항목� 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "�답바람(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "�답요청 항목� 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "�태 항목(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "�태 항목� 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "종류 항목(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "참�� 종류를 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent Docu_ments"
 msgstr "최근 문서(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b>개 첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "첨부 모� 숨기기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "첨부 모� 보기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "지우기(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "첨부파� 추가(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "첨부 모� 보기"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "스페�스를 눌러 첨부 모�� 토글하십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업��트가 �착하면 � 항목� 대해 바� 사항� 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "현재 버전� 사용할 수 없습니다!"
 
@@ -6420,58 +6438,58 @@ msgstr "받� 곳� 열 수 없습니다"
 msgid "Destination is read only"
 msgstr "받� 곳� �기 전용입니다"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "� 항목� 다른 수신�� 메�함�서� 지움(_D)"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "CORBA 오류때문� � 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "CORBA 오류때문� � 작업� 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "CORBA 오류때문� � 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "CORBA 오류때문� � 항목� 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "권한� 거부�어 � 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "권한� 거부�어 � 작업� 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "권한� 거부�어 � 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "권한� 거부�어 � 항목� 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "오류때문� � 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "오류때문� � 작업� 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "오류때문� � 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "오류때문� � 항목� 지울 수 없습니다"
 
@@ -6480,7 +6498,7 @@ msgid "Contacts..."
 msgstr "연�처..."
 
 #: ../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 "대리�:"
 
@@ -6489,138 +6507,138 @@ msgid "Enter Delegate"
 msgstr "대리�� 입력하십오"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "알림(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "� 행사� 알림� 설정하거나 해제하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "반복(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "반복 행사로 만듭니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "보내기 옵션"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "고급 보내기 옵션 넣기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "하루 종� 행사(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "하루 종� 행사가 있는 지 토글합니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "시간� 약� 있�으로 표시(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "시간� 약� 있�으로 표시할 지 토글합니다"
 
 # free/busy -> 약� 있�/없�, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "약� 있�/없�(_F):"
 
 # free/busy -> 약� 있�/없�, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "참��� 약� 있�/없� 정보를 알아봅니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "약�(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "행사� 알림� 있습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "주최�(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "대리�(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "참��(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "행사� 시작 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "행사� � 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "� 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "시작 시�� 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "� 시�� 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "선�하신 주최�가 �제 계정� 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "주최�가 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "최소한 참��가 한 사람� 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "추가(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' 달력� 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
@@ -6629,13 +6647,13 @@ msgstr "%s �격으로 작업합니다"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "약� %d� 전�"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6643,31 +6661,31 @@ msgstr[0] "약� %d시간 전�"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "약� %d분 전�"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "사용� 지정"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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:943
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "없�"
 
@@ -6698,23 +6716,25 @@ msgid "Custom Alarm:"
 msgstr "사용� 설정 알림:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "설명(_E):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "행사 설명"
 
-#: ../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 "개요(_M):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "알림(_A)"
 
+#: ../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 "설명(_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "시간(_T):"
@@ -6754,7 +6774,7 @@ msgstr "연�처(_N)..."
 msgid "Organizer:"
 msgstr "주최�:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "메모"
 
@@ -6765,7 +6785,7 @@ msgstr "'%s'� 메모를 열 수 없습니다."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "받는 사람"
@@ -6779,10 +6799,6 @@ msgstr "시작 날짜(_R):"
 msgid "T_o:"
 msgstr "받는 사람(_O):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "설명(_D):"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -7013,12 +7029,12 @@ msgstr "주"
 msgid "year(s)"
 msgstr "ë…„"
 
-#: ../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 "완료 날짜가 잘못�었습니다"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "웹 페�지"
 
@@ -7037,17 +7053,17 @@ msgstr "<span weight=\"bold\">�태</span>"
 #: ../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:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:642 ../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:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
 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:559 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "높�"
 
@@ -7057,21 +7073,21 @@ msgstr "높�"
 #: ../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:633 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 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:561 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 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:966 ../calendar/gui/e-calendar-table.c:560
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "보통"
 
@@ -7080,7 +7096,7 @@ msgstr "보통"
 #: ../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:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "시작 안함"
@@ -7094,7 +7110,7 @@ msgid "Stat_us:"
 msgstr "�태(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "정�안�"
 
@@ -7111,25 +7127,24 @@ msgstr "우선순위(_P):"
 msgid "_Web Page:"
 msgstr "웹 페�지(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "�태 �세히(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../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:122
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "보내기 옵션(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "ìž‘ì—…(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "작업 �세히"
 
@@ -7156,17 +7171,13 @@ msgid "Categor_ies..."
 msgstr "분류(_I)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "설명(_S):"
+msgid "D_ue date:"
+msgstr "마� 날짜(_U):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "시간대:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "마� 날짜(_D):"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7243,13 +7254,13 @@ msgid "%s for an unknown trigger type"
 msgstr "알 수 없는 시작 옵션� 대한 %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URL� 열려면 누르십시오"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "제목 없�"
 
@@ -7304,13 +7315,13 @@ msgstr "� 날짜"
 msgid "Start Date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "약� 없�"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "약� 있�"
@@ -7325,7 +7336,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7333,7 +7344,7 @@ msgstr ""
 msgid "Yes"
 msgstr "예"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7341,51 +7352,51 @@ msgid "No"
 msgstr "아니오"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-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:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../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
+#: ../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 "알 수 없�"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "반복�"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "예약�"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "다른 �름으로 저장..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "선�한 첨부를 저장할 �� 선�..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "�름없는_그림.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "다른 �름으로 저장(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "배경 화면으로 설정(_B)"
 
@@ -7393,157 +7404,157 @@ msgstr "배경 화면으로 설정(_B)"
 msgid "_Save Selected"
 msgstr "선�한 것 저장(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "%s�서 열기..."
 
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:338
 msgid "* No Summary *"
 msgstr "* 요약 없� *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:366
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
 #, 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:369
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "주최�: %s"
 
-#: ../calendar/gui/e-calendar-table.c:400
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "Start: "
 msgstr "시작: "
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "Due: "
 msgstr "기한: "
 
-#: ../calendar/gui/e-calendar-table.c:581
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:582
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:583
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:584
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:587
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "선�한 오브�트를 지우는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1155
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "오브�트를 업��트하는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1340
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../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:277
 msgid "Save as..."
 msgstr "다른 �름으로 저장..."
 
-#: ../calendar/gui/e-calendar-table.c:1563
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "새 작업(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "웹 페�지 열기(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1569
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "�쇄(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘�내기(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../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 "붙여 넣기(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선�한 작업� 마친 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "작업 미완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "선�한 작업� 마치지 못한 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "선�한 작업 지우기(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1826
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "작업� 추가하려면 누르십시오"
@@ -7575,109 +7586,109 @@ msgstr "우선순위"
 msgid "Start date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "항목� 옮기는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "항목� 복사하는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "새 약�(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "새 하루 종� 행사(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "새 모임(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "현재 뷰(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "오늘 선�(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "날짜 선�(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "�쇄(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 ��(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "모임 대리(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "모임 �정(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "회신(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "전체� 회신(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "� 경우 옮길 수 있게 만들기(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "� 경우 지우기(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "모든 경우 지우기(_A)"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:115
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %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:118
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7690,7 +7701,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:587
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
@@ -7701,20 +7712,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:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../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
 msgid "%A %d %B"
 msgstr "%B %e� %A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "오후"
 
@@ -7810,12 +7821,12 @@ msgstr "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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "모르는 사람"
 
@@ -7832,12 +7843,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "수�"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "잠정�으로 수�"
 
@@ -7845,7 +7856,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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "거부"
 
@@ -8070,7 +8081,7 @@ msgid "Attendee status updated\n"
 msgstr "참��� �태 업��트�었습니다\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "� 항목� � �� 없기 때문� 참�� �태를 업��트할 수 없습니다"
 
@@ -8091,7 +8102,7 @@ msgid "Update"
 msgstr "업��트"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "수�"
 
@@ -8100,7 +8111,7 @@ msgid "Tentatively accept"
 msgstr "잠정�으로 수�"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "거부"
 
@@ -8170,49 +8181,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:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 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:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../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:967
+#: ../calendar/gui/print.c:983
 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:968
+#: ../calendar/gui/print.c:984
 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:982
+#: ../calendar/gui/print.c:998
 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:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 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:984
+#: ../calendar/gui/print.c:1000
 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:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "불참�"
 
@@ -8231,7 +8242,7 @@ 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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "대리"
 
@@ -8252,7 +8263,7 @@ 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:473
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
 #: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%Y년 %B %e� %A"
@@ -8261,14 +8272,14 @@ msgstr "%Y년 %B %e� %A"
 #. 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-item.c:476
 #: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. 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:480
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -8371,7 +8382,7 @@ msgid "Click to add a memo"
 msgstr "메모를 추가하려면 누르십시오"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8410,54 +8421,50 @@ msgstr "작업� 완료하는 중입니다..."
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 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:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:347 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%B %e�"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "질�를 업��트하는 중입니다"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "사용� 설정 보기(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "사용� 설정 보기 저장(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "보기 지정(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s� 약�� �어들�는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s� 작업� �어들�는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s�서 메모를 �어들�는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -8575,37 +8582,37 @@ msgstr "iCalendar ì •ë³´"
 msgid "You must be an attendee of the event."
 msgstr "� 행사� 참��여야 합니다."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "새 메모 목�(_N)"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d개 메모"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d개 선�"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "메모를 업그레�드하는 � 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "행사와 모임� 만드는 � 쓸 '%s' 메모 목�� 열 수 없습니다"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "메모를 만들 때 쓸 수 있는 달력� 없습니다"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "메모 소스 선�"
 
@@ -8614,6 +8621,7 @@ msgid "New memo"
 msgstr "새 메모"
 
 #: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "메모(_O)"
 
@@ -8626,6 +8634,7 @@ msgid "New shared memo"
 msgstr "새 공유 메모"
 
 #: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "공유 메모(_S)"
 
@@ -8638,6 +8647,7 @@ msgid "New memo list"
 msgstr "새 메모 목�"
 
 #: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "메모 목�(_S)"
 
@@ -8645,12 +8655,12 @@ msgstr "메모 목�(_S)"
 msgid "Create a new memo list"
 msgstr "새 메모 목�� 만듭니다"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "메모 �쇄"
 
 #: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days'"
+msgid "Next 7 Days"
 msgstr "앞으로 7�"
 
 #: ../calendar/gui/migration.c:157
@@ -8694,9 +8704,9 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "`%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 "쪽지"
 
@@ -8853,82 +8863,77 @@ msgstr "금"
 msgid "Sa"
 msgstr "토"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "약�"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "ìž‘ì—…"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "요약: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "참��: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "�태: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "�센트 완료: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "분류: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "연�처:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "예정� 약�"
-
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "새 작업 목�(_N)"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연�처 %d개"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "작업� 업그레�드하는 � 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "행사와 모임� 만드는 � 쓸 '%s' 작업 목�� 열 수 없습니다"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "작업� 만들 때 쓸 수 있는 달력� 없습니다"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "작업 소스 선�"
 
@@ -8936,6 +8941,11 @@ msgstr "작업 소스 선�"
 msgid "New task"
 msgstr "새 작업"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "ìž‘ì—…(_T)"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "새 작업� 만듭니다"
@@ -8945,6 +8955,7 @@ msgid "New assigned task"
 msgstr "새로 할당한 작업"
 
 #: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "할당한 작업(_D)"
 
@@ -8957,6 +8968,7 @@ msgid "New task list"
 msgstr "새 작업 목�"
 
 #: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "작업 목�(_K)"
 
@@ -8976,7 +8988,7 @@ msgstr ""
 "\n"
 "정�로 � 작업들� 지우시겠습니까?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
@@ -9013,7 +9025,7 @@ msgstr "약� � 모임"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "달력� 여는 중입니다"
 
@@ -9048,1534 +9060,1553 @@ msgid "Evolution Calendar intelligent importer"
 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)
+#. *
+#.
+#.
 #. * 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 "아프리카/아비드잔"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "아프리카/아��"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "아프리카/아디스아바바"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "아프리카/알제"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "아프리카/아스마�"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "아프리카/바마코"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "아프리카/방기"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "아프리카/반줄"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "아프리카/비소"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "아프리카/블란티레"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "아프리카/브��빌"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "아프리카/부줌부�"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "아프리카/카�로"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "아프리카/카사블랑카"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "아프리카/세우타"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "아프리카/코나�리"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "아프리카/다카르"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "아프리카/솔로몬제�"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "아프리카/지부티"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "아프리카/�알�"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "아프리카/엘아�운"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "아프리카/프리타운"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "아프리카/가봉"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "아프리카/하�레"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "아프리카/요하네스버그"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "아프리카/캄팔�"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "아프리카/하르툼"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "아프리카/키갈리"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "아프리카/킨사사"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "아프리카/�고스"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "아프리카/리브르빌"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "아프리카/로메"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "아프리카/루안다"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "아프리카/루�바시"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "아프리카/루사카"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "아프리카/��보"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "아프리카/마푸토"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "아프리카/마세루"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "아프리카/옴바바네"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "아프리카/모가디슈"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "아프리카/몬로비아"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "아프리카/나�로비"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "아프리카/��메나"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "아프리카/니아메�"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "아프리카/누악쇼트"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "아프리카/와가�구"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "아프리카/�르토노보"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "아프리카/�투메"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "아프리카/팀부�투"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "아프리카/트리플리"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "아프리카/튀니스"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "아프리카/빈트후�"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "아메리카/��닥�"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "아메리카/앵커러지"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "아메리카/앙귈�"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "아메리카/안티구아"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "아메리카/아�구��나"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "아메리카/아루바"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "아메리카/아순시온"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "아메리카/바베��스"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "아메리카/벨렘"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "아메리카/벨리즈"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "아메리카/보아비스타"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "아메리카/보고타"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "아메리카/보�즈"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "아메리카/부�노스아�레스"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "아메리카/캠브리지베�"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "아메리카/칸쿤"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "아메리카/카�카스"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "아메리카/카타마르카"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "아메리카/카�만"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "아메리카/카�먼제�"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "아메리카/시카고"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "아메리카/치와와"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "아메리카/코르�바"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "아메리카/코스타리카"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "아메리카/쿠�아바"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "아메리카/쿠�카오"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "아메리카/단마�셰�"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "아메리카/�슨"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "아메리카/�슨�릭"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "아메리카/�버"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "아메리카/디트로�트"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "아메리카/�미니카"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "아메리카/�드먼튼"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "아메리카/��루네프"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "아메리카/엘살바�르"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "아메리카/�르탈레�"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "아메리카/글레�스베�"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "아메리카/고드홉"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "아메리카/구스베�"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "아메리카/그랜드트럭"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "아메리카/그레나다"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "아메리카/과�루프"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "아메리카/과테��"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "아메리카/과야킬"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "아메리카/기아나"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "아메리카/헬리팩스"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "아메리카/하바나"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "아메리카/�르모시요"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "아메리카/�디아나/�디아나�리스"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "아메리카/�디애나/녹스"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "아메리카/�디애나/마�고"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "아메리카/�디애나/베베�"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "아메리카/�디아나�리스"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "아메리카/�누빅"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "아메리카/�칼루�트"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "아메리카/�메�카"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "아메리카/후후�"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "아메리카/주노"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "아메리카/켄터키/루�스빌"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "아메리카/켄터키/몬티첼로"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "아메리카/�페즈"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "아메리�/리마"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "아메리카/로스앤젤레스"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "아메리카/루�스빌"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "아메리카/마세�오"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "아메리카/마나구아"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "아메리카/마나우스"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "아메리카/마르티니�"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "아메리카/마�틀란"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "아메리카/멘�사"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "아메리카/메노미니"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "아메리카/메리다"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "아메리카/멕시코시티"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "아메리카/미켈롱"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "아메리카/몬테레�"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "아메리카/몬테비�오"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "아메리카/몬트리얼"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "아메리카/몬트세�트"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "아메리카/나소"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "아메리카/뉴욕"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "아메리카/니피곤"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "아메리카/놈"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "아메리카/노롱야"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "아메리카/노스다코타/중앙"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "아메리카/파나마"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "아메리카/팡니르텅"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "아메리카/파�마리보"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "아메리카/피닉스"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "아메리카/�트아우프린스"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "아메리카/�트오브스페�"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "아메리카/�르토벨로"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "아메리카/푸�르토리코"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "아메리카/레�니리버"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "아메리카/란킨�레트"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "아메리카/레시페"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "아메리카/레지나"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "아메리카/리오브랑코"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "아메리카/로사리오"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "아메리카/산티아고"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "아메리카/산토��고"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "아메리카/�파울로"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "아메리카/스코스바�선드"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "아메리카/쉬프�"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "아메리카/세�트존스"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "아메리카/세�트키츠"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "아메리카/세�트루시아"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "아메리카/세�트토마스"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "아메리카/세�트빈센트"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "아메리카/스위프트커런트"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "아메리카/테구시갈파"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "아메리카/툴레"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "아메리카/��베�"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "아메리카/티후아나"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "아메리카/토르톨�"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "아메리카/밴쿠버"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "아메리카/화�트호스"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "아메리카/위니펙"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "아메리카/야쿠타트"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "아메리카/�로나�프"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "남극대륙/케세�"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "남극/��비스"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "남극/드몬�르빌"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "남극/모슨"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "남극/맥머드"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "남극/팔머"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "남극/극�"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "남극/쇼와"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "남극/보스토�"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "�극/롱�어빈"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "아시아/아�"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "아시아/알마티"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "아시아/암만"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "아시아/아나디르"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "아시아/아�타우"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "아시아/아�토베"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "아시아/아스하바트"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "아시아/바그다드"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "아시아/바레�"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "아시아/바쿠"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "아시아/방콕"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "아시아/베�루트"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "아시아/비슈케�"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "아시아/브루나�"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "아시아/캘커타"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "아시아/초�발산"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "아시아/충칭"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "아시아/콜롬보"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "아시아/다마스커스"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "아시아/다카"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "아시아/딜리"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "아시아/�바�"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "아시아/�샨베"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "아시아/가�"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "아시아/하얼빈"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "아시아/�콩"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "아시아/홉드"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "아시아/�르쿠츠�"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "아시아/�스탄불"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "아시아/�카르타"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "아시아/�야푸�"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "아시아/예루살렘"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "아시아/카불"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "아시아/캄챠카"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "아시아/카�치"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "아시아/카슈가르"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "아시아/카트만�"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "아시아/��스노야르스�"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "아시아/쿠알�룸프르"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "아시아/쿠칭"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "아시아/쿠웨�트"
 
 # 국가 �름 Macao
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "아시아/마카오"
 
 # Macao� 수� Macau
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "아시아/마카우"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "아시아/마가단"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "아시아/마카사"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "아시아/마��"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "아시아/무스카트"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "아시아/니코시아"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "아시아/노보시비르스�"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "아시아/옴스�"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "아시아/오랄"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "아시아/프놈펜"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "아시아/�티아나�"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "아시아/�양"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "아시아/카타르"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "아시아/키지로다"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "아시아/랑군"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "아시아/리야드"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "아시아/사�공"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "아시아/사할린"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "아시아/사마르칸트"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "아시아/서울"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "아시아/�하�"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "아시아/싱가�"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "아시아/타�페�"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "아시아/타슈켄트"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "아시아/트빌리시"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "아시아/테헤란"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "아시아/팀부"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "아시아/�쿄"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "아시아/우중�당"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "아시아/울란바토르"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "아시아/우루무치"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "아시아/비엔티안"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "아시아/블�디보스톡"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "아시아/야쿠츠�"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "아시아/예카테린버그"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "아시아/예레반"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "대서양/아조레스"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "대서양/버뮤다"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "대서양/카나리제�"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "대서양/케�프베르드"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "대서양/페로"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "대서양/잔메�엔"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "대서양/마���"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "대서양/레�캬빅"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "대서양/사우스조지아"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "대서양/세�트헬레나"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "대서양/스탠리"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "오스트레�리아/아들레�드"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "오스트레�리아/브리스베�"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "오스트레�리아/브로��"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "오스트레�리아/다윈"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "오스트레�리아/호바트"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "오스트레�리아/린드만"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "오스트레�리아/로드하우"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "오스트레�리아/멜버른"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "오스트레�리아/�스"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "오스트레�리아/시드니"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "유럽/암스테르담"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "유럽/안��"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "유럽/아테네"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "유럽/벨파스트"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "유럽/벨그�드"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "유럽/베를린"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "유럽/브�티슬�바"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "유럽/브뤼셀"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "유럽/부카레스트"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "유럽/부다페스트"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "유럽/치시나우"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "유럽/코펜하�"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "유럽/�블린"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "유럽/지브롤터"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "유럽/헬싱키"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "유럽/�스탄불"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "유럽/칼리니그�드"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "유럽/키�프"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "유럽/리스본"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "유럽/류블리아나"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "유럽/런�"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "유럽/룩셈부르�"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "유럽/마드리드"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "유럽/몰타"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "유럽/민스�"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "유럽/모나코"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "유럽/모스�바"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "유럽/니코시아"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "유럽/오슬로"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "유럽/파리"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "유럽/프�하"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "유럽/리가"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "유럽/로마"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "유럽/사마�"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "유럽/산마리노"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "유럽/사�예보"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "유럽/심페로�"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "유럽/스코프예"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "유럽/소피아"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "유럽/스톡홀름"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "유럽/탈린"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "유럽/티�나"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "유럽/우즈고로드"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "유럽/파�츠"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "유럽/바티칸"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "유럽/비엔나"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "유럽/빌니우스"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "유럽/바르샤바"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "유럽/�그레브"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "유럽/��로제"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "유럽/쮜리히"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "��양/안타나나리보"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "��양/차고스"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "��양/�리스마스"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "��양/코코스"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "��양/코모로"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "��양/케르구엘렌"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "��양/마헤"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "��양/몰디브"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "��양/마우리티우스"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "��양/마요트"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "��양/레위니옹"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "태�양/아피아"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "태�양/오�랜드"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "태�양/차�"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "태�양/�스터"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "태�양/�파테"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "태�양/엔�버리"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "태�양/파카오�"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "태�양/피지"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "태�양/푸나푸티"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "태�양/갈�파고스"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "태�양/갬비어"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "태�양/과달카날"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "태�양/괌"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "태�양/호놀룰루"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "태�양/키리티마티"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "태�양/키리티마티"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "태�양/코스레"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "태�양/콰잘레�"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "태�양/마주로"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "태�양/마르퀘사스"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "태�양/미드웨�"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "태�양/나우루"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "태�양/니우�"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "태�양/노�"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "태�양/누메아"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "태�양/파고파고"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "태�양/팔�우"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "태�양/피트케언"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "태�양/�나페"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "태�양/�트모레스비"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "태�양/�로통가"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "태�양/사��"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "태�양/타히티"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "태�양/타�와"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "태�양/통가타푸"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "태�양/트럭"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "태�양/웨��"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "태�양/월리스"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "태�양/�"
 
@@ -10595,186 +10626,186 @@ msgstr "첨부 넣기"
 msgid "A_ttach"
 msgstr "첨부(_T)"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "제목 없는 메세지"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "파�� 첨부합니다"
 
-#: ../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 "닫기(_C)"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "현재 파�� 닫습니다"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "�쇄(_P)..."
 
-#: ../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 "�쇄 미리 보기(_V)"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "현재 파�� 저장합니다"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "다른 �름으로 저장(_A)..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "현재 파�� 다른 �름으로 저장합니다"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "임시 보관함� 저장(_D)"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "임시 보관함� 저장"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "보내기(_E)"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "� 메세지를 지금 보냅니다"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "보내기 옵션 넣기"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
 msgstr "새 메세지(_M)"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
 msgstr "새 메세지 창� 엽니다"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "문� �코딩(_E)"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "보안(_S)"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "PGP 암호화(_E)"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "� 메세지를 PGP로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "PGP 서명(_S)"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "� 메세지를 PGP키로 서명합니다"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "메세지 우선순위 높�기(_P)"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "메세지 우선순위를 높입니다"
 
 # read receipt -> 내용 �� 확�, Microsoft Office XP 참고
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "내용 �� 확� 요청(_Q)"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "메세지를 �으면 배달 확� 받기"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 암호화(_C)"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "� 메세지를 S/MIME 암호화 ��서로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 서명(_N)"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "� 메세지를 S/MIME 서명 �명으로 서명합니다"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "숨� 참조 항목(_B)"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "숨� 참조 항목� 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "참조 항목(_C)"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "참조 항목� 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "발신 항목(_F)"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "발신 항목� 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "올리는 곳 항목(_P)"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "올리는 곳 항목� 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "회신 주소 항목(_R)"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "회신 주소 항목� 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:649
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "제목 항목(_S)"
 
-#: ../composer/e-composer-actions.c:651
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "제목 항목� 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "받는 사람 항목(_T)"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "받는 사람 항목� 표시할 지 토글합니다"
 
@@ -10827,21 +10858,21 @@ msgstr "제목(_U):"
 msgid "Si_gnature:"
 msgstr "서명(_G):"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "주소�� 보려면 누르십시오"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "게시물 수신�"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "메세지를 올릴 ��를 선�하십시오."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "게시할 ��를 고를려면 여기를 누르십시오"
 
@@ -10849,18 +10880,18 @@ msgstr "게시할 ��를 고를려면 여기를 누르십시오"
 msgid "Recent _Documents"
 msgstr "최근 문서(_D)"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "첨부 모� 보기(_A)"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "보내는 메세지� 서명할 수 없습니다: 계정� 사�할 때 쓸 ��서를 설정하지 않"
 "았습니다"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10868,22 +10899,22 @@ msgstr ""
 "보내는 메세지를 암호화할 수 없습니다: 계정�서 암호화 ��서를 설정하지 않았"
 "습니다"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "첨부"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "첨부 모� 숨기기(_A)"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "메세지를 작성합니다"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11027,17 +11058,21 @@ msgstr "`{0}' 파�� � 메세지� 첨부할 수 없습니다."
 msgid "You need to configure an account before you can compose mail."
 msgstr "메�� 작성하기 전� 계정� 설정해야 합니다."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "편집 계�(_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "복구하지 않�(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "복구(_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "메세지 저장(_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "임시 저장(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
@@ -11081,17 +11116,17 @@ msgstr "�볼루션 물�"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "내부 오류, 알 수 없는 '%s' 오류가 발�했습니다"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "컴�넌트"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "기� 중� 컴�넌트� �름"
 
 #: ../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/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "사용"
@@ -11100,15 +11135,15 @@ msgstr "사용"
 msgid "Whether the plugin is enabled"
 msgstr "플러그�� 사용하는 지 여부"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "�쇄하는 �중 오류가 발�했습니다"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "�쇄 시스템�서 다�과 같� 오류가 보고�었습니다:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "�쇄 시스템�서 추가 오류 내용� �세히 보고하지 않았습니다."
@@ -11141,6 +11176,10 @@ msgstr "파�� �어쓰시겠습니까?"
 msgid "_Overwrite"
 msgstr "�어 쓰기(_O)"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "�볼루션 �움�� 표시할 수 없습니다."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "중요(_M)"
@@ -11307,56 +11346,56 @@ msgstr "파�� 선�하십시오"
 msgid "Test"
 msgstr "테스트"
 
-#: ../filter/filter-rule.c:851
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "규칙 �름(_U):"
 
-#: ../filter/filter-rule.c:879
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "다� 조건� 만족한 항목� 찾습니다"
 
-#: ../filter/filter-rule.c:913
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "필터 조건 추가(_D)"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "모든 조건� 다 충족� 때"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "어떤 조건��� 충족� 때"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "항목 찾기(_F):"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "관계� 모�"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "답장"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "답장 � 그 �위 메�"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "답장 없거나 �위 메� 없�"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "글타래 �함(_N)"
 
-#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "받는 메�"
 
-#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "보내는 메�"
 
@@ -11470,7 +11509,8 @@ msgstr "지정하는 시�"
 
 #: ../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:404
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "주"
 
@@ -11539,10 +11579,10 @@ msgstr "�볼루션 메� 기본 설정 컨트롤"
 msgid "Evolution Network configuration control"
 msgstr "�볼루션 네트워� 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../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:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:758
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "메�"
@@ -11582,13 +11622,13 @@ msgstr ""
 "아래� 있는 %s� 사용 약관� 잘 �어 보시고\n"
 "��하실 경우 체� 단추� 체�하십시오.\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "��으로 만들기"
 
@@ -11605,42 +11645,42 @@ msgid "Receiving Email"
 msgstr "메� 받기"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "새 메� 확�(_N), 매"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "분(_T)"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "메� 보내기"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "기본값"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "보안"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "새 메� 확�"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "�볼루션 계정 �우미"
 
@@ -11675,18 +11715,18 @@ msgid "Signature(s)"
 msgstr "서명"
 
 # 번역� �합하지 않다.
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "알 수 없는 보낸 �"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11695,7 +11735,7 @@ msgstr ""
 "${TimeZone}, ${Sender} 쓰시길:"
 
 # 번역� �합하지 않다.
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
@@ -11966,9 +12006,9 @@ msgstr "시작함"
 msgid "Stop Processing"
 msgstr "처리 중지"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:318
+#: ../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
 msgid "Subject"
@@ -11979,80 +12019,95 @@ msgid "Unset Status"
 msgstr "�태 설정 없애기"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "그러면"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "�작 추가(_T)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "찾� 결과로 찾기 �� 만들기(_R)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "모든 메세지"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "�지 않� 메세지"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "레�블 없�"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "�� 메세지"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "최근 메세지"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "최근 5�간 메세지"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "첨부가 있는 메세지"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "중요한 메세지"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "정�메� 아닌 메세지"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "계정 찾기"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "모든 계정 찾기"
 
 #. 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] "�지 않� 메세지:"
 
 #. 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] "전체 메세지:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "용량 제한 사용량 (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
-msgstr "용량 제한 사용"
+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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "받� 편지함"
 
-#: ../mail/em-folder-properties.c:385
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "�� �성"
@@ -12085,14 +12140,6 @@ msgstr "해당 없�"
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "받� 편지함"
-
 #: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "보낼 편지함"
@@ -12122,7 +12169,8 @@ msgstr "�어들�는 중..."
 #.
 #: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
 #: ../mail/em-folder-tree.c:741
@@ -12139,12 +12187,12 @@ msgstr "%s ��를 옮기는 중"
 msgid "Copying folder %s"
 msgstr "%s ��를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s ��로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s ��로 복사하는 중입니다"
@@ -12153,15 +12201,15 @@ msgstr "메시지를 %s ��로 복사하는 중입니다"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위� 저장고� 넣� 수 없습니다"
 
-#: ../mail/em-folder-tree.c:1003 ../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 "��로 복사(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../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 "��로 ��(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"� ��를 찾는 중"
@@ -12195,232 +12243,237 @@ msgstr "보낼 편지함 비우기(_U)"
 msgid "_Empty Trash"
 msgstr "휴지통 비우기(_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'�서 `%s' ��로 복사하는 중"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
+#: ../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
 msgid "Select folder"
 msgstr "�� 선�"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "복사(_O)"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' ��를 만드는 중입니다"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "��를 만듭니다"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "�� 만들 곳� 지정하십시오:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "메� 지우기가 실패했습니다"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "� 메�� 지울 권한� 없습니다."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "보낸 사람�게 회신(_R)"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../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 "전달(_F)"
 
 #. 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:1342 ../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 "새 메세지로 편집(_E)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "�살리기(_N)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "��로 ��(_M)..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "��로 복사(_C)..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "�� 것으로 표시(_K)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "�지 않� 것으로 표시(_U)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "중요하지 않� 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "정�메�로 표시(_J)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "정�메�� 아닌 것으로 표시(_N)"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "추가 작업으로 표시(_W)..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "레�블(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "없�(_N)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "새 레�블(_N)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "표시 비우기(_E)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 규칙 만들기(_T)"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "제목� 따른 찾기 ��(_S)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "보낸 사람� 따른 찾기 ��(_N)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "받� 사람� 따른 찾기 ��(_R)"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "메�� 리스트� 대한 찾기 ��(_L)"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "제목� 대한 필터(_J)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "보낸 사람� 대한 필터(_D)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "받� 사람� 대한 필터(_C)"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "메�� 리스트� 대한 필터(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#. 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 "기본값"
 
-#: ../mail/em-folder-view.c:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "메세지를 가져올 수 없습니다"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "메세지를 가져오는 중..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "호출하기(_A)..."
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "찾기 �� 만들기(_S)"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "� 주소�서(_F)"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "� 주소로(_T)"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "메�� %s 주소로 보내려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "%s�게 호출하려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3328
+#: ../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:472
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "�치: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "찾기(_D):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "�전(_P)"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "다�(_N)"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "대소문� 구별(_A)"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "서명 없�"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12428,11 +12481,11 @@ msgstr ""
 "� 메세지�는 서명� 없습니다.  메세지를 보낸 사람� 확실한 지 보장할 수 없습"
 "니다."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "올바른 서명"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12440,11 +12493,11 @@ msgstr ""
 "� 메세지는 서명�었고 서명� 올바릅니다.  메세지를 보낸 사람� 그 사람� 거"
 "� 확실합니다."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "잘못� 서명"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12452,11 +12505,11 @@ msgstr ""
 "� 메세지� 서명� 확�할 수 없습니다. 메�� 전송중� 변경�었� 수 있습니"
 "다."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "올바른 서명�지만, 보낸 사람� 확�할 수 없습니다"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12464,21 +12517,21 @@ msgstr ""
 "� 메세지는 올바른 서명으로 사��었습니다. 하지만 메세지를 보낸 사람� 확�"
 "할 수 없습니다."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "서명� 있지만, 공개키가 필요합니다"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "� 메세지는 서명�어 있지만, 서명� 해당하는 공개 키가 없습니다."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "암호화 안 �"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12486,11 +12539,11 @@ msgstr ""
 "� 메세지는 암호화하지 않았습니다.  �터넷� 통해 전달�는 �안 다른 사람� "
 "� 메세지를 봤� 수 있습니다."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "암호화�, 약함"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12500,11 +12553,11 @@ msgstr ""
 "사람� � 메세지� 내용� 알아 내는 게 어렵긴 하지만, 현실�� 시간 내� 불가"
 "능하지는 않습니다."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "암호화�"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12512,11 +12565,11 @@ msgstr ""
 "메세지가 암호화�어 있습니다.  다른 사람� � 메세지� 내용� 알아 내기는 어"
 "렵습니다."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "암호화�, 강력"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12525,87 +12578,87 @@ msgstr ""
 "메세지가 암호화�어 있지만, 약한 암호화 알고리즘으로 암호화�었습니다.  현실"
 "�� 시간 내� 다른 사람� � 메세지� 내용� 알아 내는 건 매우 어렵습니다."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "��서 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "� ��서는 볼 수 없습니다"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %B %e�, %p %l:%M"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "마� 지남:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y년 %B %e�, %p %l:%M까지"
 
 # FIXME - inline� 나� 번역� 찾아보�
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "���으로 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "너비� 맞추기(_F)"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "�래 �기로 표시(_O)"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "다른 �름으로 첨부 문서 저장"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "모든 첨부를 저장할 �� 선�..."
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "선�한 것 저장(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d개 첨부(_T)"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "저장(_A)"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "모� 저장(_A)"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "첨부 없�"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "�본 보기(_U)"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "�본 �추기(_U)"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "다른 프로그램으로 열기(_P)"
 
-#: ../mail/em-format-html-display.c:2467
+#: ../mail/em-format-html-display.c:2473
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12665,19 +12718,19 @@ msgid "Formatting Message..."
 msgstr "메세지 내용� 표시하는 중입니다..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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 "참조"
 
 #: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../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 "숨� 참조"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "메� 프로그램"
@@ -12700,13 +12753,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "� 메세지는 <b>%s</b>�(가) <b>%s</b> �격으로 보냈습니다."
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:314
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "보낸 사람"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "회신 주소"
@@ -12726,43 +12779,43 @@ msgstr "뉴스그룹"
 msgid "%s attachment"
 msgstr "%s 첨부"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME 메세지를 분�할 수 없습니다: 알 수 없는 오류가 발�했습니다"
 
-#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME 메세지를 분�할 수 없습니다. 소스로 보여�니다."
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted� 지�하지 않는 암호화 방�� 사용했습니다"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME 메세지를 분�할 수 없습니다"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME 메세지를 분�할 수 없습니다: 알 수 없는 오류가 발�했습니다"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "지�하지 않는 서명 형�입니다"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "서명� 확�하는 중 오류가 발�했습니다"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "서명� 확�하는 중 알 수 없는 오류가 발�했습니다"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP 메세지를 분�할 수 없습니다."
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP 메세지를 분�할 수 없습니다: 알 수 없는 오류가 발�했습니다"
 
@@ -12833,11 +12886,6 @@ msgstr "할 �"
 msgid "Later"
 msgstr "나중�"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "'%s' 옮기는 중:"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12910,18 +12958,18 @@ msgstr ""
 "�전� 설치한 �볼루션�서 설정� 잃어들� 수 없습니다. `evolution/config."
 "xmldb'가 없거나 �가졌습니다."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "보낸 ��게 회신(_R)"
 
 # List는 메�� 리스트를 �함.
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "리스트� 회신(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "주소�� 추가(_A)"
 
@@ -12975,11 +13023,11 @@ msgstr "주소 추가"
 msgid "Messages from %s"
 msgstr "%s�서 온 메�"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "�� 찾기(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "�� 소스 찾기"
 
@@ -13053,10 +13101,16 @@ msgstr ""
 "시합니다."
 
 #: ../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 "얼마나 �주 로컬� 변경 사항� �격 메� 서버와 �기화할 지 정합니다. � 간격� 최소한 30초 �� �어야 합니다."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "정� 메�� 검사할 때 사용할 사용� 지정 헤�."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../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\"."
@@ -13064,84 +13118,84 @@ msgstr ""
 "정� 메�� 검사할 때 사용할 사용� 지정 헤�. 목�� � 항목� \"헤��름=값"
 "\" 형�� 문�열입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "메세지를 작성할 기본 문�셋"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "메세지를 작성할 기본 문�셋."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "메세지를 표시할 기본 문�셋"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "메세지를 표시할 기본 문�셋."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "기본 전달 모양새"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "메세지 작성 창� 기본 높�."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "메세지 창� 기본 높�."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "구� 대화 ��� 기본 높�."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "기본 회신 모양새"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "글타래 확장 �태� 대한 기본값"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "메세지 작성 창� 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "메세지 창� 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "구� 대화 ��� 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr "정�메� 필터�할 때 로컬 주소��서만 주소를 찾아 볼 지 결정합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../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:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "주소��서 보낸 사람 전�메�� 찾아볼 지 결정합니다. 주소�� 있는 경우 스"
 "팸 메�� 아니�고 �단합니다. �� 완성 용�로� 주소�� 찾아 봅니다. LDAP"
 "와 같� �격 주소�� �� 완성� 사용할 경우 �릴 수� 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../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:36
+#: ../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 "
@@ -13150,7 +13204,7 @@ msgstr ""
 "정� 메� 검사� 사용� 지정 헤�를 사용할 지 결정합니다. � 옵션� 사용하고 "
 "헤�를 지정하면 정� 메� 검사 기능� ��를 높� 수 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -13158,59 +13212,59 @@ msgstr ""
 "세로 보기� \"메세지\" 열�서 \"보낸 사람\" � \"제목\" 줄� 같� 글꼴� 사용"
 "할 지 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "메세지 작성� 파�� �어들�고 첨부할 때 사용할 디렉토리."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "메� 관련 파�� 저장할 디렉토리."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../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:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "타�프할 때 맞춤법� 틀린 단어� 표시해 �니다."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "�날 때 정�메� ��를 비�니다"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "�날 때 휴지통 ��를 비�니다"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "�볼루션� �날 때 모든 정� 메� ��를 비�니다."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "�볼루션� �날 때 모든 휴지통 ��를 비�니다."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../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:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "만능 스페�스바 사용 여부"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "�스트 입력 미리 찾기 기능 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "찾기 �� 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "시작할 때 찾기 �� 사용."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -13220,7 +13274,7 @@ msgstr ""
 "보조 모�� 찾기 기능� 사용해 �스트를 입력해서 찾기를 시작할 수 있습니다. "
 "��� �름� 입력하면 보조 모�� 있는 해당 ��로 바로 ��합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13228,33 +13282,33 @@ msgstr ""
 "� 기능� 사용하면 스페�스바 키를 �용해 메세지 미리 보기, 메세지 목�, ��"
 "를 스�롤합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "제한� �기만�� �부 �스트를 표시하�� 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "�릿 모드 켜기/�기"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "메세지 목� 창� 높�"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "메세지 목� 창� 높�."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "��별 미리 보기를 �추고 선�� 없앱니다"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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 "사용�가 10개 ��� 메세지를 한번� 열면, 정�로 열 지 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13262,7 +13316,7 @@ msgstr ""
 "\"미리 보기\" 창� 켜져 있는 경우, 창� 위아래가 아니� 옆으로 나란히 표시합"
 "니다."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -13272,7 +13326,7 @@ msgstr ""
 "서 보노보 컴�넌트 뷰어로 매핑�는 (그놈� MIME타입 ��터베�스�서) 뷰어가 "
 "내용� 표시하는 � 사용�니다."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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."
@@ -13280,7 +13334,7 @@ msgstr ""
 "\"메� 보내고 받기\" 창� 최초 높�. 사용�가 세로 방향으로 창 �기를 바꾸면 "
 "� 값� 바�니다."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -13292,7 +13346,7 @@ msgstr ""
 "소할 때마다 � 값� 바�니다. \"메� 보내고 받기\" 창� 최대화할 수 없기 때문"
 "� � 값� 실제로는 사용하지 않습니다. � 키는 내부� 용�로만 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -13300,11 +13354,11 @@ msgstr ""
 "\"메� 보내고 받기\" 창� 최초 너비. 사용�가 가로 방향으로 창 �기를 바꾸면 "
 "� 값� 바�니다."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "여러 개� 메세지� 표시할 때 확� 질문� 할 지 여부를 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -13312,7 +13366,7 @@ msgstr ""
 "오프�� 모드로 들어갈 때 오프�� �기화가 필요한 지 여부를 반복해서 묻는 질"
 "문 기능� �고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -13321,31 +13375,31 @@ msgstr ""
 "찾기 결과�서 지우는 게 아니�, 찾기 ���서 메세지를 지울 경우 메세지를 �"
 "구히 지운다고 반복해서 경고하는 기능� �고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "마지막으로 정� 메�� 비운 시�"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "마지막으로 휴지통� 비운 시�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "어떤 메세지를 기�할 지 단계."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "레�블 � 레�블 색� 목�"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "승�한 약관� 목�"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "계정 목�"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -13353,15 +13407,15 @@ msgstr ""
 "�볼루션� 메� 컴�넌트� 사용할 계정 목�입니다. � 목��는 /apps/"
 "evolution/mail/accounts� �대�� 서브디렉토리� �름� 들어 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "사용� 지정 헤�와 그 헤�를 사용할 지 여부� 목�."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "맞춤법 검사� 사용할 사전� 언어 코드 목�."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -13369,261 +13423,262 @@ msgstr ""
 "�볼루션� 메� 컴�넌트� 사용할 레�블 목�입니다. � 목��는 <�름>:<색> "
 "형�� 문�열� 들어 있습니다. 색� HTML 방� 16진수 �코딩� 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "보노보 컴�넌트 뷰어가 있는 지 검사할 MIME 타입 목�"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "약관� ��한 프로토콜 �름� 목�."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "http로 HTML 메세지� 그림� �어들입니다"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
-"HTTP(S)로 HTML 메세지� 그림� �어들입니다. 사용 가능한 값�: 0 - 네트워��"
-"서 그림� 하나� �어들�지 않습니다. 1 - 보낸 사람� 주소�� 들어 있으면 그"
-"림� �어들입니다. 2 - 항� 네트워��서 그림� �어들입니다."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr "HTTP(S)를 통해 HTML 메세지� 그림� �어들입니다. 사용 가능한 값�: \"0\" - 네트워��서 그림� 하나� �어들�지 않습니다. \"1\" - 보낸 사람� 주소�� 들어 있으면 그림� �어들입니다. \"2\" - 항� 네트워��서 그림� �어들입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "필터 �작 기�"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파�� 대한 필터 �작� 기�합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "필터 �작� 기�할 로그 파�"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "필터 �작� 기�할 로그 파�입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "�정 시간� 지나면 �� 것으로 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "�정 시간� 지나면 �� 것으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "메세지 \"미리 보기\"�서 �용한 부분� 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메세지 \"미리 보기\"�서 �용한 부분� 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "메세지 창 기본 높�"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "메세지 창 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "메세지-표시 모양새 (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "�날 때 정� 메�� 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "�날 때 휴지통� 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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:95
+#: ../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:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "받는 사람/참조/숨� 참조� 표시할 주소� 길�"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "제목� 없으면 물어보기"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../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:99
+#: ../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:100
+#: ../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:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "찾기 ���서 메세지를 지울 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "사용�가 지운 메세지를 비우려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Bcc만 사용했� 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10개 ��� 메세지를 열려고 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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 ""
 "HTML 메세지를 �하지 않는 사람한테 HTML 메�� 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "To나 Cc로 받는 사람� 없는 �태로 메세지를 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�하지 않는 HTML� 보내려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "여러 개 메세지� 표시하려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "�스트 스마�리를 ��하고 그림으로 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "�스트� 들어 있는 ��를 ��하고 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "받� 메�� 대해 정�메� 검사를 실행합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "저장 디렉토리"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "Search for the sender photo in local addressbooks"
-msgstr "로컬 주소��서 보낸 사람� 사진� 찾습니다"
-
 #: ../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 "기본으로 HTML 메� 보내기"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "기본으로 HTML 메�� 보냅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "메세지 목�� 보낸 사람 전�메� 주소 열"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "서버 �기화 주기"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "애니메�션 보기"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "애니메�션� 들어 있는 그림� 애니메�션으로 봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../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:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "메세지 목�� 지워진 메세지를 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "보낸 사람� 사진� 보여�니다"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../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:125
+#: ../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:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "��� 맞춤법 검사"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "맞춤법 검사 색"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "맞춤법 검사 언어"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "구� 대화 �� 기본 높�"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "구� 대화 �� 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "터미� 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "�스트 메세지 최대 �기"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "정� 메� 후�� 대한 기본 플러그�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "마지막으로 정� 메�� 비운 시�, 1970년 1월 1�부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "마지막으로 휴지통� 비운 시�, 1970년 1월 1�부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "메�� 표시할 때 사용할 터미� 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "메�� 표시할 때 사용할 가변� 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../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 "세 가지 값� 가능합니다. 0� 오류, 1� 경고, 2는 디버깅 메세지."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr "세 가지 값� 가능합니다. \"0\"� 오류, \"1\"� 경고, \"2\"는 디버깅 메세지."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13631,7 +13686,7 @@ msgstr ""
 "�볼루션�서 표시할 수 있는 �스트� 최대 �기를 지정합니다. 기본값� 4MB / "
 "4096 KB�고 단위는 KB입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13641,15 +13696,13 @@ msgstr ""
 "다. 기본 목� 플러그�� 사용하지 않는 경우, 사용 가능한 다른 플러그�� 대"
 "신 사용하지 않습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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 ""
-"� 키는 한 번만 �고 �� 다�� 거짓으로 다시 설정�니다. 목�� 메�� 선�"
-"� 지우고 그 ��� 대한 미리 보기를 없앱니다."
+"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:142
+#: ../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;"
@@ -13660,20 +13713,18 @@ msgstr ""
 "리스트가 들어 있습니다. XML 구조� 형�� &lt;header enabled&gt;입니다 - 헤�"
 "를 메� 보기�서 표시하면 enabled로 설정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
-msgstr ""
-"� 옵션� lookup_addressbook 키와 관련 있습니다. � 옵션� 따� 로컬 주소��"
-"서 주소를 찾아 보고, 알려진 사람� 보낸 메�� 정�메� 필터�서 제외합니다."
+msgstr "� 옵션� lookup_addressbook 키와 관련 있습니다. � 옵션� 정�메� 필터�서 알려진 사람� 보낸 메�� 제외할 때, 로컬 주소��서만 주소를 찾아 볼 지 여부를 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../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:145
+#: ../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."
@@ -13681,7 +13732,7 @@ msgstr ""
 "기본 메세지 목� 보기�서 표시할 주소� 길�를 지정합니다. 길�를 넘어가면 "
 "'...'으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13689,7 +13740,7 @@ msgstr ""
 "� 설정� 기본값으로 글타래를 확장 �태로 할 지 축소 �태로 할 지 지정합니"
 "다. �볼루션� 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13698,30 +13749,18 @@ msgstr ""
 "� 설정� 해당 글타래� 최근 메세지를 기준으로 글타래를 정렬할 지 여부를 지정"
 "합니다. �볼루션� 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "연관� 메세지를 글타래로 만듭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "연관� 메세지를 글타래로"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "제목� 따� 메세지 목�� 글타래 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr "서버� 바� 사항� 얼마나 �주 업로드할 지 시간 간격 (초 단위)."
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-"서버� 바� 사항� 얼마나 �주 업로드할 지 시간 간격 (초 단위). � 값� 30초"
-"보다 작으면 안 �니다."
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "메세지를 �� 것으로 표시하는 경과 시간"
@@ -13870,7 +13909,7 @@ msgstr "버�리 메�박스 형� �� 가져오기"
 msgid "Importing mailbox"
 msgstr "메�함 가져오기"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s 가져오는 중입니다"
@@ -13892,27 +13931,27 @@ msgstr "�볼루션 PINE 가져오기"
 msgid "Import mail from Pine."
 msgstr "PINE�서 메�� 가져옵니다."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "%s� 보내는 메�"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "%s�서 온 메�"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "제목� %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 메�� 리스트"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:371
 msgid "Add Filter Rule"
 msgstr "필터 규칙 추가"
 
@@ -13922,134 +13961,136 @@ msgstr "필터 규칙 추가"
 msgid "Templates"
 msgstr "서�"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d개 선�, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d개 지움"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d개 정�"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d개 임시"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d개 보냄"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d개 안 보냄"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d개 안 ��, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "전체 %d개"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "새 메� 메세지"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
-msgstr "메� 만들기(_M)"
+msgstr "메� 메세지(_M)"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "메� 메세지를 새로 작성합니다"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "새 메� ��"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "메� ��(_F)"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "새 메� ��를 만듭니다"
 
-#: ../mail/mail-component.c:1071
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "메� 설정 혹� ��를 업그레�드하는 � 실패했습니다."
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "오류"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "오류"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "경고 � 오류"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "디버깅"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "오류, 경고 � 디버깅 메세지"
 
-#: ../mail/mail-component.c:1713
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "디버깅 기�"
 
-#: ../mail/mail-component.c:1727
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "�태 표시줄�서 오류 표시 시간(_E):"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1743
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "ì´ˆ."
 
-#: ../mail/mail-component.c:1749
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "기� 메세지:"
 
-#: ../mail/mail-component.c:1790
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "기� 단계"
 
-#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "시간"
 
-#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "메세지"
 
-#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "� 창� 닫습니다"
@@ -14307,7 +14348,7 @@ msgid "Do not format messages when text si_ze exceeds"
 msgstr "메세지� �기가 다�� 넘어가면 내용 표시하지 않기(_Z): "
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "보낸 사람� 주소�� 들어 있으면 정�메�로 표시하지 않기(_K)"
 
 #: ../mail/mail-config.glade.h:73
@@ -14511,7 +14552,7 @@ msgid "S_OCKS Host:"
 msgstr "SOCKS 호스트(_O):"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
 msgstr "로컬 주소��서만 보낸 사람� 사진 찾기(_E)"
 
 #: ../mail/mail-config.glade.h:128
@@ -14617,8 +14658,10 @@ msgstr "사용��름(_E):"
 msgid "Use Authe_ntication"
 msgstr "�� 사용(_N)"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:364
+#: ../mail/mail-config.glade.h:156 ../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 "사용��름(_N):"
 
@@ -14673,7 +14716,7 @@ msgid "_Load images in messages from contacts"
 msgstr "주소�� 있는 사람� 보낸 메�� 그림 �어들�기(_L)"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "로컬 주소�만 찾아 보기(_L)"
 
 #: ../mail/mail-config.glade.h:172
@@ -14806,7 +14849,7 @@ msgstr "찾기(_I):"
 msgid "Find in Message"
 msgstr "메세지�서 찾�"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "추가 작업 메세지 플래그"
 
@@ -14859,7 +14902,7 @@ msgid "_Tick this to accept the license agreement"
 msgstr "사용권 약관� ��하시면 여기� 체�하십시오(_T)"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결� 확�하는 중"
@@ -14910,118 +14953,118 @@ msgstr "%2$d개 중�서 %1$d번째 메세지를 보내는 중"
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d개 메세지 중�서 %1$d번째를 보내는 � 실패했습니다"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "취소함."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "완료."
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "메세지를 ��로 저장하는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "메시지들� %s(으)로 옮기는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "메시지들� %s(으)로 복사하는 중"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "전달한 메시지"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ��를 여는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s ��� 용량 제한 정보를 가져오는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "저장고 %s�(를) 여는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s ��를 지우는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s ��를 저장하는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'� 지운 메세지를 비우고 내용� 저장하는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정� 저장하는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "�� 다시 �는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "지운 메세지를 비우는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안� 휴지통� 비우는 중"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "로컬 ��"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "메세지 %s�(를) 가져오는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "메세지 %d개를 가져오는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "메세지 %d개를 저장하는 중"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15031,11 +15074,11 @@ msgstr ""
 " %s"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15044,79 +15087,79 @@ msgstr ""
 "출력 파�� 만들 수 없�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "��터를 쓸 수 없습니다: %s"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s�서 연결 �는 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' 오프�� 계정� 준비 중"
 
 # 주�: 다른 메세지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "서비스 확�중"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "취소하는 중..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "메� 보내고 받기"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "모� 취소(_A)"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "업��트 중..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "새 메� 확�"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s� 암호를 입력하십시오"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "암호 입력"
 
-#: ../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:713
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s� 암호를 입력하십시오"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "암호 입력"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "사용�가 취소한 �작."
 
@@ -15683,8 +15726,6 @@ msgstr ""
 msgid "This signature has been changed, but has not been saved."
 msgstr "서명� 바뀌었지만, 저장하지 않았습니다."
 
-# FIXME - hard to translate UI + string based on English grammar
-# "Mark messages as read after <seconds> seconds"
 #: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
@@ -15779,80 +15820,80 @@ msgstr "비우기(_E)"
 msgid "_Open Messages"
 msgstr "메세지 열기(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "보지않았�"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "봤�"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "�답함"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "전달함"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "여러개� 보지않� 메세지"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "가장 낮�"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "낮�"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "높�"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "가장 높�"
 
 # ???
-#: ../mail/message-list.c:1595 ../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:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 "오늘 %p %l:%M"
 
-#: ../mail/message-list.c:1611 ../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 "어제 %p %l:%M "
 
-#: ../mail/message-list.c:1623 ../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) %p %l:%M"
 
-#: ../mail/message-list.c:1631 ../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 "%b %e� %p %l:%M"
 
-#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y년 %b %e�"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "메세지 목� 작성중"
 
-#: ../mail/message-list.c:4176
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15860,7 +15901,7 @@ msgstr ""
 "찾기 기준� 해당하는 메세지가 없습니다. 찾기->비우기 메뉴 항목으로 찾기를 지"
 "우거나 찾기 기준� 바꾸십시오."
 
-#: ../mail/message-list.c:4178
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
 msgstr "� ���는 메세지가 없습니다."
 
@@ -15951,6 +15992,10 @@ msgid "Subject contains"
 msgstr "제목� �함"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "제목�나 받는 사람� �함"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "제목�나 보낸 사람� �함"
 
@@ -16020,27 +16065,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "오디오 ��� 플러그�"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "�볼루션 백업 파� �름 선�"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "백업한 다�� �볼루션 다시 시작(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "복구할 �볼루션 백업 파� �름 선�"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "복구한 다�� �볼루션 다시 시작(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "백업�서 복구"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16050,116 +16095,116 @@ msgstr ""
 "를 복구하실 수 있습니다. \n"
 "모든 개� 설정 사항, 메� 필터 기능 등� 복구합니다."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "백업 백업 파��서 �볼루션 복구(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "복구할 �볼루션 아카�브를 선�해 주십시오:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "복구할 파�� 선�하십시오"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "�볼루션 디렉토리 백업"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "�볼루션 디렉토리 복구"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "�볼루션 백업 검사"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "�볼루션 다시 시작"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "그래픽 사용� �터페�스 사용"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "�볼루션� 종료하는 중입니다"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "�볼루션 계정 � 설정� 백업하는 중"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "�볼루션 ��터를 백업하는 중 (메�, 연�처, 달력, 작업, 메모)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "백업 완료"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "�볼루션 다시 시작하는 중"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "현재 �볼루션 ��터를 백업"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "백업�서 파�� 추출하는 중"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "�볼루션 설정� �어오는 중"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "임시 백업 파�� 삭제하는 중"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "로컬 소스 확�하는 중"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s ��� 백업하는 중"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s ���서 복구하는 중"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "�볼루션 백업"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "�볼루션 복구"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "�볼루션 ��터를 백업하는 중입니다"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "�볼루션�서 ��터를 백업하는 �안 잠시 기다리십시오."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "�볼루션 ��터를 복구하는 중입니다"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "�볼루션�서 ��터를 복구하는 �안 잠시 기다리십시오."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "� 작업� 계정� ��터 �기� 따� 시간� 걸릴 수� 있습니다."
 
@@ -16205,8 +16250,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "복구할 올바른 백업 파�� 선�하십시오."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "선�한 ���서는 파�� 만들 권한� 없습니다"
+msgid "The selected folder is not writable."
+msgstr "선�한 ��는 �기 전용입니다."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16233,46 +16278,44 @@ msgstr "설정 복구(_E)..."
 msgid "_Backup Settings..."
 msgstr "설정 백업(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�� 연�처"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Auto-create addressbook entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "메세지� 답장하면 ��으로 주소�� 항목 만들기(_A)"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "�� 연�처를 사용할 주소�� 선�하십시오"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "�스턴스 메시지 연�처"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
+#: ../plugins/bbdb/bbdb.c:603
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "피진 친구 목�� 정보 � 그림� �기화"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "피진 친구 목�� 사용할 주소�� 선�하십시오"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "지금 친구 목�과 �기화(_B)"
 
 #: ../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 ""
-"메�� 답장할 때마다 ��으로 �름과 전�메� 주소를 주소�� 넣습니다. � 친"
-"구 목��서 �스턴스 메세지 연�처 정보를 채워 넣습니다."
+msgstr "메세지� 답장할 때마다 ��으로 �름과 전�메� 주소를 주소�� 넣습니다. � 친구 목��서 �스턴스 메세지 연�처 정보를 채워 넣습니다."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16327,17 +16370,18 @@ msgstr "보고필터 정�메� 플러그�"
 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
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../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:357
+#: ../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 "SSL 사용(_S)"
 
@@ -16359,7 +16403,8 @@ msgstr "로컬 달력� 주요 기능� 제공합니다."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:381
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "새로 고침(_F):"
 
@@ -16464,23 +16509,23 @@ 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:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "�볼루션"
 
-#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
 msgstr "기본 주소�으로 표시(_D)"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "기본 달력으로 표시(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "기본 작업 목�으로 표시(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "기본 메모 목�으로 표시(_D)"
 
@@ -16490,19 +16535,19 @@ msgstr "기본 소스"
 
 #: ../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:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "사용� 설정 헤�(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
 msgstr "키"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr "ê°’"
@@ -16530,8 +16575,8 @@ msgid "Custom Header"
 msgstr "사용� 설정 헤�"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
-msgstr "사용� 설정 헤� 목�"
+msgid "List of Custom Headers"
+msgstr "사용� 설정 헤�� 목�"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16643,39 +16688,39 @@ msgstr "�� �기"
 msgid "Exchange Settings"
 msgstr "�스체�지 설정"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "��(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
 msgstr "메�함(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "�� 방법(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "지�하는 방법�지 확�(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16687,13 +16732,13 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "� 암호가 맞지 않습니다. 암호를 다시 입력하십시오."
 
@@ -16713,13 +16758,13 @@ msgstr "새 암호:"
 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:665
 #, 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-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "사용� 설정"
 
@@ -16744,7 +16789,7 @@ msgid "Delegate Permissions"
 msgstr "대리 권한"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s� 대한 권한"
@@ -16785,43 +16830,43 @@ msgstr "하지만 내 개� 항목� 볼 수 없습니다."
 msgid "You have been designated as a delegate for %s"
 msgstr "귀하는 %s� 대리�으로 지정�었습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "대리"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "대리� %s�(를) 지우시겠습니까?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "액티브 디렉토리� 접근할 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "액티브 디렉토리�서 �신� 찾� 수 없습니다"
 
-#: ../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 "액티브 디렉토리�서 %s 대리를 찾� 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "%s 대리를 지울 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "대리 목�� 업��트할 수 없습니다."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "%s 대리를 �할 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "대리 목�� �어들�는 � 오류."
 
@@ -16869,25 +16914,25 @@ msgstr "권한 요약(_S)"
 msgid "_Tasks:"
 msgstr "ìž‘ì—…(_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "권한..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "�� �름"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "�� �기"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "사용�"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "다른 사용�� ��� 구�"
@@ -16896,20 +16941,20 @@ msgstr "다른 사용�� ��� 구�"
 msgid "Exchange Folder Tree"
 msgstr "�스체�지 �� 트리"
 
-#: ../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 "�� 구� 해제..."
 
-#: ../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 "정�로 \"%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 "\"%s\"�서 구� 해제"
@@ -16973,16 +17018,16 @@ msgstr "암호가 7� 안� 만료�니다..."
 msgid "_Change Password"
 msgstr "암호 바꾸기(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(권한� 거부�었습니다.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "사용� 추가:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../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
 msgid "Add User"
@@ -17104,10 +17149,6 @@ msgstr "민� 정�(_S): "
 msgid "_User"
 msgstr "사용�(_U)"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "단추-사용�"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "사용� 선�"
@@ -17269,7 +17310,7 @@ msgid "Folder offline"
 msgstr "�� 오프��"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "�반 오류"
 
@@ -17389,6 +17430,7 @@ msgid "Unknown error looking up {0}"
 msgstr "{0}�(를) 찾아보는 � 알 수 없는 오류"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "알 수 없는 오류."
 
@@ -17510,18 +17552,18 @@ msgstr ""
 "를 설정해 보십시오."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "외부 편집기�서 작성"
+msgid "Compose in _External Editor"
+msgstr "외부 편집기�서 작성(_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "외부 편집기를 사용해 메세지 작성"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "편집기를 실행할 명령어: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17529,15 +17571,15 @@ msgstr ""
 "�맥스� 경우 \"xemacs\"를 사용하고\n"
 "VI는 \"gvim\"� 사용하십시오"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "�기가 700바�트보다 작� (48*48) PNG를 고르십시오"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG 파�"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "얼굴(_F)"
 
@@ -17572,27 +17614,44 @@ msgstr "�� 구� 해제"
 msgid "_Unsubscribe"
 msgstr "구� 중지(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:73
-#: ../plugins/google-account-setup/google-source.c:80
+#: ../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 "구글"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:198
-msgid "<b>Server</b>"
-msgstr "<b>서버</b>"
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "사용� �름� 먼저 입력하십시오."
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-msgid "Username:"
-msgstr "사용� �름:"
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "구�하고 있는 달력 목�� �으려면 %s 사용�� 암호를 입력하십시오."
 
-# FIXME - hard to translate UI + string based on English grammar
-# "Update every" <spinbox> "seconds"
-#: ../plugins/google-account-setup/google-contacts-source.c:230
-msgid "Update every"
-msgstr "업��트 주기: "
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"구글 서버�서 ��터를 �� 수 없습니다.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "달력(_E):"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "목� 가져오기(_L)"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
@@ -17602,7 +17661,7 @@ msgstr "구글 달력 � 연�처를 설정하는 플러그�."
 msgid "Google sources"
 msgstr "구글 소스"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "확�목�"
 
@@ -17647,16 +17706,16 @@ msgstr "공유 �� 설치"
 msgid "Shared Folder Installation"
 msgstr "공유 �� 설치"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "정�메� 설정"
 
-#: ../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 "정�메� 설정"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "정� 메� 설정..."
 
@@ -17754,11 +17813,9 @@ msgstr "계정� �미 있습니다"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
-msgstr ""
-"&quot;{0}&quot; 사용�� 프�시 로그�� 실패했습니다. 전�메� ID를 확�하"
-"고 다시 시�하십시오."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr "&quot;{0}&quot; 사용�� 프�시 로그�� 실패했습니다. 전�메� 주소를 확�하고 다시 시�하십시오."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
@@ -17780,7 +17837,7 @@ msgstr "��를 지정한 &quot;{0}&quot; 사용�와 공유할 수 없습니
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "목�� 추가할 사용� �름� 지정해야 합니다"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "시험 삼아 허용"
 
@@ -17797,7 +17854,7 @@ msgid "Con_tacts..."
 msgstr "연�처(_T)..."
 
 #: ../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 "메세지"
 
@@ -17902,20 +17959,20 @@ msgstr "해당 계정ì�´ 온ë�¼ì�¸ ìƒ�태ì�¼ 경우ì—�만 프ë¡�ì‹œ 탭ì�„ 사ìš
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "해당 계정� 사용할 경우�만 프�시 탭� 사용할 수 있습니다."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "사용�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "사용�를 입력하시고 권한� 설정하십시오"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "새 공유 ��(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "공유"
 
@@ -18069,8 +18126,8 @@ msgstr "작업 목� 선�"
 msgid "Select Calendar"
 msgstr "달력 선�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "가져오기(_I)"
 
@@ -18114,7 +18171,8 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar 형� (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/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
@@ -18125,129 +18183,129 @@ msgstr "아�팟과 �기화"
 msgid "iPod Synchronization"
 msgstr "아�팟 �기화"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' 달력� �어들�는 � 실패했습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' 달력� 들어 있는 약�� � 모임과 충�합니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' 달력� 약�� 발견했습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "달력� 하나� 찾� 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "어� 달력�서� � 모임� 찾� 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "어� 작업 목��서� � 작업� 찾� 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "어� 메모 목��서� � 메모를 찾� 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "� 약�� 현재 버전� 찾는 중입니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "항목� 파싱할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "항목� '%s' 달력� 보낼 수 없습니다.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' 달력� 수���고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' 달력� 미정��고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' 달력� 거절��고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' 달력� 취소�고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "주최�가 대리� %s�(를) 지웠습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "대리��게 취소 공지를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "대리��게 취소 공지를 보낼 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "잘못� �태때문� 참�� �태를 업��트할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "참��를 업��트할 수 없습니다. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "참�� �태를 업��트했습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "모임 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "작업 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "메모 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "모임 정보를 보낼 수 없습니다. 해당 모임� 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "작업 정보를 보낼 수 없습니다. 해당 작업� 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "메모 정보를 보낼 수 없습니다. 해당 메모가 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "첨부한 달력� 잘못�었습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18255,16 +18313,16 @@ msgstr ""
 "메세지� 달력� 들어 있다고 �어 있으나, 그 달력� 올바른 iCalendar가 아닙니"
 "다."
 
-#: ../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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "달력 안� 항목� 올바르지 않습니다"
 
 # free/busy -> 약� 있�/없�, Microsoft Office XP 참고
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18272,325 +18330,325 @@ msgstr ""
 "메세지� 달력� 들어 있으나, 달력� 행사, 작업, 약� 있�/없� 정보가 하나� "
 "들어 있지 않습니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "첨부한 달력� 여러 개� 항목� 들어 있습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "� 항목� 모� 처리하려면, 파�� 저장해서 그 달력� 가져와야 합니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "� 약� 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "� 작업 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "� 메모 반복"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "�용한 다�� 메세지 지우기(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "충� 찾기"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "충�하는 모임� 찾� 달력� 선�하십시오"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "오늘"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "오늘 %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "내�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "내� %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "내� %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%B %e� %A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%B %e� %A, %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:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B %e� %A, %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:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B %e� %A, %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B %e� %A, %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%Y년 %B %e� %A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y년 %B %e� %A, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y년 %B %e� %A, %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:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y년 %B %e� %A, %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y년 %B %e� %A, %p %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "<b>%s</b> �격으로 �답하십시오."
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "<b>%s</b> �격으로 받�"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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>님� %s�(를) 통해 다� 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>님� 다� 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>님� 다� 모임� 위임했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 모임� 참�하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>님� 다� 모임� 참�하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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>님� %s�(를) 통해 기존 모임� 참�하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님� 기존 모임� 참�하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../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 "<b>%s</b>님� %s�(를) 통해 다� 모임� 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b>님� 다� 모임� 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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>님� %s�(를) 통해 다�과 같� 모임 �답� 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b>님� 다�과 같� 모임 �답� 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 모임� 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>님� 다� 모임� 취소했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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>님� %s�(를) 통해 다� 모임 변경� 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b>님� 다� 모임 변경� 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 모임 변경� 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>님� 다� 모임 변경� 거절했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 작업� 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>님� 다� 작업� 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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>님� 다� 작업� %s님� 할당� 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>님� %s�(를) 통해 작업� 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>님� 작업� 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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>님� %s�(를) 통해 기존 작업� 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b>님� 기존 작업� 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18598,7 +18656,7 @@ msgid ""
 msgstr ""
 "<b>%s</b>님� %s�(를) 통해 다� 작업 할당� 최근 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18606,129 +18664,129 @@ msgid ""
 msgstr "<b>%s</b>님� 다� 작업 할당� 최근 정보를 받고 싶어합니다:"
 
 # FIXME: through what?
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 작업 할당 �답� 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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>님� 다� 작업 할당 �답� 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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>님� %s�(를) 통해 다� 할당 작업� 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>님� 다� 할당 작업� 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 작업 할당 변경� 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님� 다� 작업 할당 변경� 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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>님� %s�(를) 통해 다� 작업 할당� 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>님� 다� 작업 할당� 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>님� %s�(를) 통해 다� 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b>님� 다� 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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>님� %s�(를) 통해 기존 메모� 내용� 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b>님� 기존 메모� 내용� 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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>님� %s�(를) 통해 다� 공유 메모를 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>님� 다� 공유 메모를 취소했습니다:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "달력 열기(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "허용(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "모� 거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "모� 잠정�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "ìž ì •ì �(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "모� 허용(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "정보 보내기(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "참�� �태 업��트(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "업��트(_U)"
 
@@ -18831,10 +18889,9 @@ msgstr "새 메세지가 �착하면 D-BUS 메세지가 발�합니다."
 
 #: ../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 ""
-"새 메세지가 �착했� 때 참�면 삑 소리를 내고, 거짓�면 사운드 파�� 재�합"
-"니다."
+"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."
@@ -18876,20 +18933,20 @@ msgstr "아�콘� 깜박� 지 여부."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "받� 편지함 ���만 새 메세지를 알릴 지 여부."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "D-Bus 메세지 보내기(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:361
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "�볼루션 메� 알림"
 
-#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:398
 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:440
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18901,54 +18958,54 @@ msgstr[0] ""
 "새로 %d개� 메세지를 받았습니다.\n"
 "(%s ��)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "새로 %d개� 메세지를 받았습니다."
 
-#: ../plugins/mail-notification/mail-notification.c:457
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "새 메�"
 
-#: ../plugins/mail-notification/mail-notification.c:519
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "알림 �역�서 아�콘 표시(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:522
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "알림 �역�서 아�콘 깜박�기(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:524
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "아�콘과 같� 메세지 �업 표시(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:705
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "새 메세지가 �착하면 사운드 재�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:711
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "삑 소리(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:712
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "사운드 파� 재�(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "파� �름 지정(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:724
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "사운드 파�� 고르십시오"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "재�(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:782
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "받� 편지함� 경우�만 새 메세지 알림(_I)"
 
@@ -18978,12 +19035,12 @@ msgstr "모임으로 변환(_V)"
 msgid "Mail to meeting"
 msgstr "메��서 모임으로"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "달력� 열 수 없습니다. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19173,23 +19230,21 @@ msgstr "리스트� 가입(_S)"
 msgid "_Unsubscribe from List"
 msgstr "리스트�서 탈퇴(_U)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "� ��와 하위 ��� 모든 메세지를 �� 것으로 표시하시겠습니까?"
-
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "하위 ���서� 해당 작업� 수행하시겠습니까?"
+msgid "Also mark messages in subfolders?"
+msgstr "아래 ��� 메세지� 표시하시겠습니까?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-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:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "현재 ��와 하위 ��(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "현재 ��만(_F)"
 
@@ -19235,36 +19290,37 @@ msgstr "어� 플러그�� 사용하고 사용하지 않� 지 관리하는
 
 #. 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 "플러그� 관리�"
 
+# 메뉴 설명, 문장으로 번역
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr "플러그� 사용 여부"
+msgstr "플러그�� 사용하거나 해제합니다"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
 msgstr "플러그�(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "개발�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "설정"
 
-#: ../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 "주�: �부 바� 사항� 다시 시작해야 �용�니다"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "개요"
 
-#: ../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 "플러그�"
 
@@ -19288,19 +19344,19 @@ msgstr "�반 �스트 모드"
 msgid "Prefer plain-text"
 msgstr "�반 �스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "HTML� 있으면 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "�반 �스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "�반 �스트만 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "HTML 모드(_M)"
 
@@ -19666,22 +19722,22 @@ msgid "Show _only this Task List"
 msgstr "� 작업 목�만 표시(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that manages the Startup wizard."
-msgstr "시작 마법사를 관리하는 플러그�."
+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 "시작 마법사"
+msgid "Setup Assistant"
+msgstr "설정 �우미"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "�볼루션 설정 �우미"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "환�합니다"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19694,29 +19750,29 @@ msgstr ""
 "\n"
 "계�하시려면 \"다�\" 단추를 누르십시오. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "파� 가져오기"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "다��서 가져오고 싶� 정보를 선�하십시오:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "%s�서:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "��터를 가져오는 중입니다."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
 
@@ -19735,7 +19791,7 @@ msgid "Thread messages by subject"
 msgstr "제목� 따� 메세지를 글타래로 표시합니다"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "연관� 메세지가 아니��� 제목� 따� 글타래로 만들기(_A)"
 
@@ -19745,7 +19801,7 @@ msgid ""
 "message body."
 msgstr "서� 플러그��서 메세지 본문 대신 사용할 키/값 �� 목�."
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:615
 msgid "No title"
 msgstr "제목 없�"
 
@@ -19769,6 +19825,28 @@ msgstr "YTNEF를 사용해 TNEF 첨부를 디코딩하는 간단한 플러그�
 msgid "TNEF Attachment decoder"
 msgstr "TNEF 첨부 디코�"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV 연�처를 설정하는 플러그�."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV 연�처"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "IfMatch 피하기(_A) (아파치 2.2.8 미만 버전�서 필요)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "�볼루션 쉘"
@@ -19798,98 +19876,92 @@ msgid "Configuration version"
 msgstr "설정 버전"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "�� 종료 검사를 실행할 지 여부를 결정합니다."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "기본 보조 모� 너비"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "기본 창 높�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "기본 창 �태"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "기본 창 너비"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "�터넷� 통해 HTTP � 보안 HTTP를 사용할 때 프�시 설정� 사용합니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP 프�시 호스트 �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP 프�시 암호"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP 프�시 �트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP 프�시 사용� �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 혹� 별명."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
-msgstr ""
-"참�면 프�시 서버� 연결할 때 ��� 필요합니다. 사용� �름과 암호는 \"/"
-"apps/evolution/shell/network_config/authentication_user\"� 정�하고 로컬 컴"
-"퓨터� .gnome2_private/ 안� 저장합니다."
+"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 "참�면 프�시 서버� 연결할 때 ��� 필요합니다. 사용� �름과 암호는 \"/apps/evolution/shell/network_config/authentication_user\" gconf 키�서 정�하고, 암호는 gnome-keyring�나 .gnome2_private/Evolution 암호 파��서 가져옵니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "최근 업그레�드한 설정 버전"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../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:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "프�시 없� 호스트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP 프�시� ��할 때 넘길 암호."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "프�시 설정 모드"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS 프�시 호스트 �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS 프�시 �트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "보안 HTTP 프�시 호스트 �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "보안 HTTP 프�시 �트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -19900,46 +19972,42 @@ msgstr ""
 "\"시스템 설정 사용\", \"프�시 없�\", \"수� 프�시 설정 사용\", \"�� 설"
 "정 URL� 들어 있는 프�시 설정 사용\"입니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "보조 모�� 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "개발 버전 경고 건너 뛰기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "복구 경고 건너 뛰기"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "오프�� 모드�서 시작"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "�태 표시줄� 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../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 ""
 "�볼루션� 설정 버전, major/minor/configuration 단계. (예를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "메� 창� 기본 높�, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "메� 창� 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "보조 모�� 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -19947,19 +20015,19 @@ msgstr ""
 "최근 업그레�드한 �볼루션� 설정 버전, major/minor/configuration 단계. (예"
 "를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP 프�시로 사용할 컴퓨터 �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "보안 HTTP 프�시로 사용할 컴퓨터 �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "SOCKS 프�시로 사용할 컴퓨터 �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -19967,7 +20035,7 @@ msgstr ""
 "프�시로 �용할 \"/apps/evolution/shell/network_config/http_host\"�서 지정"
 "한 컴퓨터� �트."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -19975,7 +20043,7 @@ msgstr ""
 "프�시로 �용할 \"/apps/evolution/shell/network_config/secure_host\"�서 지정"
 "한 컴퓨터� �트."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -19983,7 +20051,7 @@ msgstr ""
 "프�시로 �용할 \"/apps/evolution/shell/network_config/socks_host\"�서 지정"
 "한 컴퓨터� �트."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -19992,7 +20060,7 @@ msgstr ""
 "창 단추� 모양새. \"text\", \"icons\", \"both\", \"toolbar\" 사용 가능. "
 "\"toolbar\"� 경우 그놈 �구 모� 설정� 따�서 단추� 모양새가 결정�니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20004,64 +20072,56 @@ msgstr ""
 "드카드 사용), IP 주소(IPv4와 IPv6 모� 가능), 네트마스�를 사용한 네트워� 주"
 "소(192.168.0.0/24와 같�) 모� 사용할 수 있습니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "�구 모�� 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "프�시 설정 값� 들어 있는 URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "HTTP 프�시 사용"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP 프�시� ��할 때 넘길 사용� �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../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:49
-msgid "Whether crash detection should be done or not"
-msgstr "�� 종료 검사를 해야 할 지 여부"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "창� 최대화할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "보조 모�� 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "�태 표시줄� 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "�구 모�� 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../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:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "�볼루션 복구 대화 ��를 건너 뛸지 여부."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "창 단추를 표시해야 하는 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "창 단추 모양새"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "창 단추 표시할 지 여부"
 
@@ -20077,29 +20137,21 @@ msgstr "사용하고 있는 연결"
 msgid "Click OK to close these connections and go offline"
 msgstr "연결� �고 오프��으로 가려면 확�� 누르십시오"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "실행할 가져오기 종류를 선�하십시오:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../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.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"�볼루션으로 가져 올 파�� 선�하시고, 그 파�� 종류를 목��서 고르십시"
-"오.\n"
-"\n"
-"파� 종류를 모르겠으면 \"��\"� 선�하면, �볼루션�서 ��으로 파� 종류"
-"를 알아내 처리하려고 합니다."
+"of file it is from the list."
+msgstr "�볼루션으로 가져 올 파�� 선�하시고, 그 파�� 종류를 목��서 고르십시오."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "어디로 가져올 지를 고르십시오"
 
-#: ../shell/e-shell-importer.c:147
+#: ../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"
@@ -20110,33 +20162,33 @@ msgstr ""
 "PINE, 넷스케�프, ELM, iCalendar. 가져올 수 있는 설정� 찾� 수\n"
 "없었습니다. 다시 시�하려면 \"뒤로\" 단추를 누르십시오.\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "파� �름(_I):"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "파�� 고르십시오"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "파� 종류(_T):"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "과거� 쓰� 프로그램�서 ��터 � 설정 사항 가져오기(_O)"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "파� 한 개 가져오기(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "�볼루션 기본 설정"
 
 #. 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - �볼루션"
@@ -20177,7 +20229,7 @@ msgstr "FAQ 웹페�지를 여는 중� 오류가 발�했습니다."
 msgid "_Work Online"
 msgstr "온�� 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "오프�� 작업(_W)"
 
@@ -20185,7 +20237,7 @@ msgstr "오프�� 작업(_W)"
 msgid "Work Offline"
 msgstr "오프���서 작업"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20193,11 +20245,11 @@ msgstr ""
 "�볼루션� 현재 온�� �태입니다.\n"
 "오프�� �태로 작업하려면 � 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "�볼루션� 오프�� �태로 가는 중입니다."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20205,51 +20257,52 @@ msgstr ""
 "�볼루션� 현재 오프�� �태입니다.\n"
 "온�� �태로 작업하려면 � 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:780
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "알 수 없는 시스템 오류."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "확�"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "��가 잘못�었습니다"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF� 등�할 수 없습니다"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "설정 ��터베�스를 찾� 수 없습니다"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "새로 만들기"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "새 테스트"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
 msgstr "테스트(_T)"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "새 테스트 항목� 만듭니다"
 
@@ -20292,7 +20345,7 @@ msgstr ""
 "르십시오."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20326,7 +20379,7 @@ msgstr ""
 "우리가 열심히 �한 결과물� 잘 � 주시길 바�니다. 그리고 개발�\n"
 "기여해 주시기를 목� 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20334,66 +20387,43 @@ msgstr ""
 "고맙습니다\n"
 "�볼루션 팀\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "다시 알리지 않기"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "�볼루션 �� 종료 검사"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "무시(_N)"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"�볼루션� 지난 번� 실행할 때 예�치 못하게 �난 것처럼 보입니다.\n"
-"문제 예방� 위해 미리 보기 창� �춥니다. 보기 메뉴�서 미리 보기\n"
-"창� 다시 표시할 수 있습니다.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "� 메세지를 다시 보지 않기(_D)"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "�볼루션 시작할 때 특정 컴�넌트를 활성화합니다"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "온�� 모드�서 시작"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "강제로 모든 �볼루션 컴�넌트를 �냅니다"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 �볼루션 1.4�서 다시 옮겨 옵니다"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴�넌트� 디버깅 출력� 파�로 보냅니다."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "플러그�� 아무것� �어들�지 않습니다."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전�메�, 연�처, 작업� 미리 보기 창� 사용하지 않습니다."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �볼루션 개�정보 관리 � 메� ���언트"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20612,27 +20642,27 @@ msgstr "전�메� 주소"
 msgid "All CA certificate files"
 msgstr "모든 CA ��서 파�"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "��서 보기: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "`%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 "��서 ��터베�스� 새 암호를 입력하십시오"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "새 암호를 입력하십시오"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20641,7 +20671,7 @@ msgstr ""
 "발급 대�:\n"
 "  소유�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20650,7 +20680,7 @@ msgstr ""
 "발급�:\n"
 "  소유�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "��서 선�"
 
@@ -21067,7 +21097,7 @@ msgid "Copy to Folder..."
 msgstr "��로 복사..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "새 주소� ��를 만듭니다"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -21221,7 +21251,7 @@ msgstr "연�처 ��(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "�� 연�처를 ��(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "새로 만들기(_N)"
 
@@ -21605,7 +21635,7 @@ msgstr "연관� 메세지 목�"
 msgid "_Group By Threads"
 msgstr "글타래로 묶�(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "메세지(_M)"
@@ -21949,123 +21979,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "표시하는 메세지� 본문 안� 깜박�는 커서를 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "보통 형�으로 메세지를 보여�니다"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "메�� 모든 헤�와 함께 메세지를 보여�니다"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "메세지� 메� 소스를 보여�니다"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "선�한 메세지를 �살립니다"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "중요하지 않�(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "축소(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "첨부(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "�릿 모드(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "플래그 비우기(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "메세지 지우기(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "메세지�서 찾기(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "플래그 완료(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "��(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "중요(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "�함(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "정�메�(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "그림 �어들�기(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "메세지 �본(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "다� 메세지(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "보통 �기(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "정�메� 아님(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "새 창�서 열기(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "�전 메세지(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "�용(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "�기(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "메세지 저장(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "메세지 �살리기(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "�기 취소(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "확대/축소(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "확대(_Z)"
 
@@ -22302,50 +22328,54 @@ msgid "View/Hide the Status Bar"
 msgstr "�태 표시줄 보기/�추기"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "오프���서 작업(_O)"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "ì •ë³´(_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "창 닫기(_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "기억한 암호 버리기(_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "�주하는 질문(_F)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "단추 �추기(_H)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "아�콘만(_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "짧� 참조 문서(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "�내기(_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "전환버튼 모양(_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "�기화 옵션(_S)..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "�스트만(_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "ì°½(_W)"
 
@@ -22456,7 +22486,7 @@ msgstr ""
 "오른쪽 마우스 단추로 축소합니다."
 
 #: ../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 "모�"
 
@@ -22502,7 +22532,7 @@ msgstr "현재 뷰 바꾸기(_R)"
 
 #. 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 "사용� 보기"
 
@@ -22511,32 +22541,32 @@ msgid "Save Custom View"
 msgstr "사용� 보기 저장"
 
 #: ../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 "보기 지정..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "현재 보기(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
-msgstr "선� 보기: %s"
+msgstr "보기 선�: %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 "사용� 보기 저장..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "현재 사용� 보기 저장"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "보기 만들기 �는 편집"
 
@@ -22564,13 +22594,13 @@ msgstr "뷰 종류:"
 msgid "Attachment Bar"
 msgstr "첨부 모�"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "%s 파�� 첨부할 수 없습니다: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s 파�� 첨부할 수 없습니다: �반 파�� 아닙니다"
@@ -22592,7 +22622,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "첨부 파�� �� 표시 권하기"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1272
 msgid "%B %Y"
 msgstr "%Yë…„ %B"
 
@@ -22641,30 +22671,30 @@ msgstr "Y1"
 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
 msgid "Minimum width"
 msgstr "최소 너비"
 
-#: ../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
 msgid "Minimum Width"
 msgstr "최소 너비"
 
-#: ../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:204
 msgid "Spacing"
 msgstr "공백"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "현재"
 
-#: ../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 "시간� 다�과 같� 형��어야 합니다: %s"
@@ -22673,98 +22703,98 @@ msgstr "시간� 다�과 같� 형��어야 합니다: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�센트 값� 0과 100� �함하여 그 사�어야 합니다."
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "아�어"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "발트어"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "중앙 유럽어"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "중국어"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "키릴어"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "그리스어"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "�본어"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "한국어"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "타�어"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "터키어"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "유니코드"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "서부 유럽어"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "서부 유럽어, 새로운 �코딩"
 
-#: ../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 "번체"
 
-#: ../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 "ê°„ì²´"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "우���나어"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "비주얼"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "알 수 없는 문�셋: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "문� �코딩"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "사용할 문�셋 입력하십시오"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "그 외..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "문� �코딩(_A)"
 
@@ -22835,11 +22865,11 @@ msgstr "레�블 위젯"
 msgid "A widget to display in place of the usual expander label"
 msgstr "�반�� 확장 단추 레�블 대신� 표시할 위젯"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "확장 단추 �기"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "확장 화살표� �기"
 
@@ -22852,61 +22882,61 @@ msgid "Spacing around expander arrow"
 msgstr "확장 화살표 주위� 여백"
 
 #. 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 "고급 찾기"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "찾기 저장"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "찾기(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "찾기"
 
-#: ../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 "찾기 저장(_S)..."
 
-#: ../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 "저장한 찾기 편집(_E)..."
 
-#: ../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 "고급 찾기(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "모든 계정"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "현재 계정"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "현재 ��"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "현재 메세지"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "그림� 고르십시오"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "세계 지�"
 
-#: ../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."
@@ -22914,23 +22944,23 @@ msgstr ""
 "마우스를 �용해 시간대를 선�하는 지� 위젯. 키보드 사용�는 아래� 드롭다운 "
 "콤보 ��를 �용해 시간대를 선�해야 합니다."
 
-#: ../widgets/misc/e-online-button.c:112
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
 msgstr "���"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 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 "다�� �기화:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "개� 정보 �기화:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "�기화 분류:"
 
@@ -22946,53 +22976,53 @@ msgstr "리플로우 모�"
 msgid "Column width"
 msgstr "열 너비"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "찾기"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "찾기 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "찾기(_S)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "비우기(_C)"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "항목 ID"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "보기(_W): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "찾기(_C): "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " 위치(_N) : "
 
@@ -23006,19 +23036,19 @@ msgstr "커서 행"
 msgid "Cursor Column"
 msgstr "커서 열"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "ì •ë ¬"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "선� 모드"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "커서 모드"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "지울 때(_L):"
 
@@ -23150,19 +23180,19 @@ msgid "_When opened:"
 msgstr "ì—´ë©´(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL로 가려면 여기를 누르십시오"
 
@@ -23182,7 +23212,7 @@ msgstr "사용 가능한 분류(_A):"
 msgid "categories"
 msgstr "분류"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "�업 목�"
 
@@ -23359,91 +23389,91 @@ msgstr ""
 "표� 열� 추가하려면, 열� 표시할\n"
 "위치� 열� �어 놓으십시오."
 
-#: ../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개 항목)"
 
-#: ../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개 항목)"
 
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "행� 색 �차"
 
+#: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "가로 격� 그리기"
 
+#: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "세로 격� 그리기"
 
+#: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "�커스 그리기"
 
+#: ../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
 msgid "Cursor mode"
 msgstr "커서 모드"
 
+#: ../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
 msgid "Selection model"
 msgstr "선� 모�"
 
+#: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "길� 한계치"
 
+#: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "행 높� 통�"
 
+#: ../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"
@@ -23511,7 +23541,7 @@ msgid "Font Description"
 msgstr "글꼴 설명"
 
 #: ../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 "ì •ë ¬ ì •ë³´"
 
@@ -23533,8 +23563,8 @@ msgstr "테�블 모�"
 msgid "Cursor row"
 msgstr "커서 행"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "언제나 찾기"
 
@@ -23542,15 +23572,15 @@ msgstr "언제나 찾기"
 msgid "Use click to add"
 msgstr "추가하려면 누르기 사용"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree 테�블 어댑터"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "리트로 모양"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "선과 +/- 확장 버튼� 그립니다."
 
@@ -23658,6 +23688,103 @@ msgstr "입력기 컨�스트"
 msgid "Handle Popup"
 msgstr "�업 처리"
 
+#~ msgid "Migrating `%s':"
+#~ msgstr "`%s' 옮기는 중:"
+
+#~ msgid "_Properties..."
+#~ msgstr "�성(_P)..."
+
+#~ msgid "D_escription:"
+#~ msgstr "설명(_E):"
+
+#~ msgid "De_scription:"
+#~ msgstr "설명(_S):"
+
+#~ msgid "Updating query"
+#~ msgstr "질�를 업��트하는 중입니다"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "예정� 약�"
+
+#~ msgid "_Save Message"
+#~ msgstr "메세지 저장(_S)"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "Time interval, in seconds, how often upload store changes to server."
+#~ msgstr "서버� 바� 사항� 얼마나 �주 업로드할 지 시간 간격 (초 단위)."
+
+#~ msgid ""
+#~ "Time interval, in seconds, how often upload store changes to server. The "
+#~ "actual value cannot be less than 30 seconds."
+#~ msgstr ""
+#~ "서버� 바� 사항� 얼마나 �주 업로드할 지 시간 간격 (초 단위). � 값� 30"
+#~ "초보다 작으면 안 �니다."
+
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr "선�한 ���서는 파�� 만들 권한� 없습니다"
+
+#~ msgid "button-user"
+#~ msgstr "단추-사용�"
+
+#~ msgid "Username:"
+#~ msgstr "사용� �름:"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "Update every" <spinbox> "seconds"
+#~ msgid "Update every"
+#~ msgstr "업��트 주기: "
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "� ��와 하위 ��� 모든 메세지를 �� 것으로 표시하시겠습니까?"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "하위 ���서� 해당 작업� 수행하시겠습니까?"
+
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "모든 메세지를 �� 것으로 표시"
+
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "시작 마법사를 관리하는 플러그�."
+
+#~ msgid "Startup wizard"
+#~ msgstr "시작 마법사"
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "�� 종료 검사를 실행할 지 여부를 결정합니다."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "복구 경고 건너 뛰기"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "�� 종료 검사를 해야 할 지 여부"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "�볼루션 복구 대화 ��를 건너 뛸지 여부."
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "�볼루션 �� 종료 검사"
+
+#~ msgid "Ig_nore"
+#~ msgstr "무시(_N)"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "�볼루션� 지난 번� 실행할 때 예�치 못하게 �난 것처럼 보입니다.\n"
+#~ "문제 예방� 위해 미리 보기 창� �춥니다. 보기 메뉴�서 미리 보기\n"
+#~ "창� 다시 표시할 수 있습니다.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "� 메세지를 다시 보지 않기(_D)"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "보통 형�으로 메세지를 보여�니다"
+
 #~ msgid "Permission Denied."
 #~ msgstr "권한� 거부�었습니다."
 
@@ -23714,9 +23841,6 @@ msgstr "�업 처리"
 #~ msgid "Remind _missing attachments"
 #~ msgstr "첨부 없� 알리기(_M)"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "편집 계�(_C)"
-
 #~ msgid "_Refresh:"
 #~ msgstr "새로 고침(_R):"
 
@@ -23793,9 +23917,6 @@ msgstr "�업 처리"
 #~ msgid "Save As"
 #~ msgstr "다른 �름으로 저장"
 
-#~ msgid "Save Draft"
-#~ msgstr "임시 보관함� 저장"
-
 #~ msgid "Save in folder..."
 #~ msgstr "��로 저장..."
 
@@ -23826,9 +23947,6 @@ msgstr "�업 처리"
 #~ msgid "Save the current file and close the window"
 #~ msgstr "� 파�� 저장하고 창� 닫습니다"
 
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "구� ��� 목�� ��를 �합니다"
-
 #~ msgid "Refresh List"
 #~ msgstr "목� 다시��"
 
diff --git a/po/mk.po b/po/mk.po
index 3fc39397f5..dcfe8cc916 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,7 +1,8 @@
-# translation of mk.po to Macedonian
+# translation of evolution.HEAD.mk.po to Macedonian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003.
 #
+#: ../shell/main.c:683
 # Damjan Georgievski <penguinista@mail.net.mk>, 2003.
 # Marko Ivanoski <marko@programmer.net>, 2003.
 # Ivan Stojmirov <stojmir@linux.net.mk>, 2003.
@@ -13,11 +14,11 @@
 # Arangel Angov <arangel@linux.net.mk>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: mk\n"
+"Project-Id-Version: evolution.HEAD.mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-17 20:15+0000\n"
-"PO-Revision-Date: 2008-02-21 19:05+0100\n"
-"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
+"POT-Creation-Date: 2008-08-15 11:18+0000\n"
+"PO-Revision-Date: 2008-08-21 16:19+0200\n"
+"Last-Translator: Jovan Naumovski <jovan@lugola.net>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,21 +30,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "адре�ар за evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "�ов контакт"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "�ова ли�та на контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -52,7 +53,6 @@ msgstr[1] "тековната папка �о адр�ар %s ги има кар
 msgstr[2] "тековната папка �о адр�ар %s ги има картичките %d"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Отвори"
 
@@ -163,7 +163,7 @@ msgid "calendar view for one or more days"
 msgstr "поглед за календарот за еден или повеќе денови"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -174,20 +174,18 @@ 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:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1358
-#: ../calendar/gui/e-day-view.c:2158
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../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
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -195,10 +193,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -208,17 +206,15 @@ 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:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1362
-#: ../calendar/gui/e-day-view.c:2174
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../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
 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
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Календар за Gnome"
 
@@ -330,34 +326,34 @@ msgstr "Календар: од %s до %s"
 msgid "evolution calendar item"
 msgstr "предмет од календарот на evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Комбо копче"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "�ктивирај го �тандардното"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Скокачко мени"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Пушти лента за приврзоци"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "активирај"
 
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"{0} е извор на календар кој може �амо да �е чита. Префрлете �е на "
-"прегледот на контакти и означете календар кој може да прифаќа �о�таноци."
+"„{0}“ е извор на календар кој може �амо да �е чита. Префрлете �е на прегледот "
+"на контакти и означете календар кој може да прифаќа �о�таноци."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -406,7 +402,7 @@ msgstr "�е можам да го от�транам адре�арот."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Моментално можете да при�тапите �амо до GroupWise адре�ар од Evolution. Ве "
 "молам, и�кори�тете некој друг GroupWise поштен�ки клиент �амо еднаш, за да "
@@ -430,7 +426,7 @@ msgstr "Ð�е уÑ�пеав да Ñ�е автентицирам Ñ�о LDAP Ñ�ервÐ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "�е у�пеав да го избришам контактот"
 
@@ -443,28 +439,24 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP �ерверот одговори �о валидна информација за шемата."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "�едозволен при�тап."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Верзија на �ерверот"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "�екои опции може да не работат правилно �о вашиот тековен �ервер"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "�дре�арот на Evolution неочекувано �е и�клучи."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../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:24
+#: ../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 "
@@ -474,19 +466,19 @@ msgstr ""
 "поддржува оваа функционално�т или пак можеби погрешно е конфигуриран. "
 "Прашајте го вашиот админи�тратор за поддржани бази на пребарување."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Овој адре�ар ќе биде трајно от�транет."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "Овој адре�ар не може да �е отвори."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Овој �ервер за адре�ари ги нема предложените термини за пребарување."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -494,27 +486,27 @@ msgstr ""
 "Овој �ервер на адре�ари може да е недо�тапен или името на �ерверот може да е "
 "погрешно напишано или вашето мрежно поврзување е и�клучено."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Овој �ервер не поддржува LDAPv3 информации за шема."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "�е можам да го отворам адре�арот"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "�е може да �е изврши пребарувањето."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "�е може да �е зачува {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Дали �акате да ги зачувате вашите промени?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -522,7 +514,7 @@ msgstr ""
 "Пробувате да преме�тите контакт од еден адре�ар во друг но тој не може да �е "
 "от�трани од изворот. Дали �акате да зачувате копија наме�то да го преме�тите?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -532,6 +524,10 @@ msgstr ""
 "при употребата на Evolution. �ајдобро е �ерверот да биде надграден до "
 "поддржана верзија"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "�емате доволно перми�ии за да избришете контакт во овој адре�ар."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -568,8 +564,8 @@ msgid "_Use as it is"
 msgstr "_Кори�ти како што е"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../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}"
 
@@ -578,17 +574,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Стандардна адре�а за �инхронизација:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "�е може да �е вчита адре�арот"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "�е може да �е блокот за адре�и на пилот уредот"
 
@@ -610,10 +606,10 @@ msgstr "Конфигурирајте го автокомплетирањето Ð
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -622,7 +618,7 @@ msgid "Evolution Address Book"
 msgstr "�дре�ар на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "Скокачки прозорец за адре�ите на адре�арот на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -638,7 +634,7 @@ msgid "Evolution Address Book component"
 msgstr "Компонента од адре�арот на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "S/Mime контрола за менаџмент на �ертификати на Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -652,13 +648,14 @@ msgstr "Менаџирајте Ñ�о вашите S/MIME Ñ�ертификати Ð
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c: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:305
-#: ../mail/mail-vfolder.c:216
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
 msgid "On This Computer"
 msgstr "�а овој компјутер"
 
@@ -668,23 +665,25 @@ msgstr "�а овој компјутер"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../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 ../mail/em-migrate.c:1056
+#: ../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 "Лично"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "�а LDAP �ервери"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Контакт"
 
@@ -693,6 +692,7 @@ msgid "Create a new contact"
 msgstr "Креирај нов контакт"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Ли�та на контакти"
 
@@ -706,6 +706,7 @@ msgid "New Address Book"
 msgstr "�ов адре�ар"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "�дре_�ар"
 
@@ -717,34 +718,34 @@ msgstr "Креирај нов адре�ар"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�е у�пеа надградувањето на по�тавувањата или папките на адре�арот."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "База"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Копирај ја �одржината на _адре�арот локално за офлајн употреба"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h: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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../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:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Општо"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "�дре�ар"
 
@@ -758,12 +759,12 @@ msgstr "�втентикација"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
 #: ../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 "Детали"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:982
 msgid "Searching"
 msgstr "Пребарувам"
 
@@ -772,30 +773,30 @@ msgid "Downloading"
 msgstr "Преземам"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Свој�тва на адре�арот"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Мигрирам..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Мигрирање на „%s“:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP �ервери"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "По�тавувања за автокомплетирање"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -806,7 +807,7 @@ msgstr ""
 "Evolution 1.x.\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -816,7 +817,7 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -826,7 +827,7 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -836,69 +837,75 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите Pilot Sync податоци..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименувај ја папката „%s“ во:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "Преименувај папка"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "Имињата на папки не може да �одржат „/“"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_�ов адре�ар"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Зачувај како vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1384
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
+#: ../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
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
+#: ../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 "_Избриши"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Свој�тва"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Одбирач на извор на контакти"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "При�тапувам до LDAP �ерверот анонимно"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "�е у�пеав да �е автентицирам.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Вне�и лозинка за %s (кори�ник %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:498
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Вне�ете лозинка"
@@ -977,38 +984,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>�втентикација</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Прикажи</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Преземам</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Пребарувам</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Информации за �ерверот</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Тип:</b> "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Додај адре�ар"
 
-#: ../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:761
 msgid "Always"
 msgstr "Секогаш"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "�нонимно"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../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 "О�новно"
@@ -1034,14 +1038,14 @@ msgid "Lo_gin:"
 msgstr "�а_јава:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "�икогаш"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Без енкрипција"
 
@@ -1053,7 +1057,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL енкрипција"
 
@@ -1121,7 +1125,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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS енкрипција"
 
@@ -1220,8 +1224,8 @@ msgid "_Login method:"
 msgstr "Метод на _најава:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1236,7 +1240,7 @@ msgid "_Search scope:"
 msgstr "_Оп�ег на пребарувањето:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Сервер:"
@@ -1257,9 +1261,10 @@ msgstr "картички"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:715
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "минути"
 
@@ -1300,7 +1305,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1312,16 +1317,16 @@ msgid "Ca_tegories..."
 msgstr "Ка_тегории..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../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:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Уредувач на контакти"
 
@@ -1334,7 +1339,7 @@ msgid "Image"
 msgstr "Слика"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1347,7 +1352,7 @@ msgid "Nic_kname:"
 msgstr "Пре_кар:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1361,11 +1366,11 @@ msgstr "Телефон"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Работа"
 
@@ -1387,8 +1392,8 @@ msgid "_Birthday:"
 msgstr "_Роденден:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Календар:"
@@ -1477,1119 +1482,1121 @@ msgstr "_Каде:"
 msgid "_Zip/Postal Code:"
 msgstr "Поштен�к_и код:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "�дре�а"
 
-#: ../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-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:397
+#: ../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:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Може да �е уредува"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Соединети �мерикан�ки Држави"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "�вгани�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "�лбанија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "�лжир"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "�мерикан�ка Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "�ндора"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "�нгола"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "�нгила"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "�нтартик"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "�нтигва и Барбуда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "�ргентина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Ерменија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "�руба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "�в�тралија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "�в�трија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "�зербејџан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Бахами"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Бахреин"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Барбадо�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Белору�ија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Белгија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Белизе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Бенин"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Бермуди"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Боливија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Бо�на и Херцеговина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Боцвана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Буве о�тров"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Британ�ка територија на Инди�ки океан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Брунеи Дару�алам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Бугарија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Буркина Фа�о"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Камбоџа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Канада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Кејп Верде"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Кајман�ки О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Централна �фрикан�ка Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Чад"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Чиле"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Кина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Божиќни о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Коко�ови о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Колумбија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Комор�ките О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Конго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Конго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Кукови о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Ко�тарика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Брегот на �лоновата ко�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Хрват�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Куба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Кипар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Чешка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Дан�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "�ибути"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Доминика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Доминикан�ка Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Египет"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "Ел Салвадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Екватор�ка Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Еритреа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Е�тонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Етиопија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Фокланд�ки О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Фар�ки О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Фиџи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Фин�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Франција"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Францу�ка Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Францу�ка Полинезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Францу�ки Јужни Територии"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Габон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Гамбија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Грузија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Германија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Гана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Грција"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Гренланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Гренада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Гвадалупе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Гуам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Гверн�и"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Guinea-Bissau"
 msgstr "Гвинеја Би�ао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Гвајана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Хаити"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Хирд и МекДоналд о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Ватикан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Хондура�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Хонк Конг"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Унгарија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "И�ланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Индија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Индонезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Иран"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Ирак"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Ир�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "О�тровот Ман"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Израел"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Италија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Јамајка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Јапонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "�ер�и"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Јордан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Казах�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Кенија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Д�Р Кореја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Кореја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Кувајт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Кирги�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Лао�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Латвија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Либан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Ле�ото"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Либерија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Либија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Лихтенштајн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Литванија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Лук�ембург"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Макао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Македонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Мадага�кар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Малави"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Малезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Малдиви"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Мали"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Малта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Маршал�ки о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Мартиник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Мавританија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Маурициу�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Мајоте"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Мек�ико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Микронезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Молдавија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Монако"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Монголија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Монт�ерат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Мароко"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Бурма"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "�амибија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "�ауру"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "�епал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Холанд�ки �нтили"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "�ова Каледонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "�ов Зеланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "�икарагва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "�игер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "�игерија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "�иуе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "�орфолк о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Северни Маријан�ки О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "�орвешка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Оман"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Паки�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Палау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Пале�тин�ка територија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Панама"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Папуа �ова Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Парагвај"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Перу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Филипини"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Питкаирн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Пол�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Португалија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Порторико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Катар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Реунион"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Романија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Ру�ка Федерација"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Св. Кит и �еви�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Св. Лучија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Св. Вин�ент и Гренадините"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "Сан Марино"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Сао Томе и Принципе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Сауди�ка �рабија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Србија и Црна Гора"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Сејшели"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Сиера Леоне"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Словачка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Словенија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Соломонови о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Сомалија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Јужна �фрика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "О�тровите Јужна �орџија и Јужен Сендвич"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Шпанија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "Св. Елена"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "Св. Пјер и Микелон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Судан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Суринам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Свалбард и Јан Мајен О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Швед�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Швајцарија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Сирија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Таџики�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Танзанија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Тајланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "И�точен Тимор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Того"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Токелау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Тонга"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Тринидад и Тобаго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Туни�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Турција"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Туркмени�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Турк�ки и Каико� О�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Уганда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Украина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Обединети �рап�ки Емирати"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Британ�ка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Мали додатни о�трови на Соединетите Држави"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Уругвај"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Узбенки�тан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Виетнам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Британ�ки Дев�твени о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "�мерикан�ки Дев�твени о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Вали� и Футуна о�трови"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Западна Сахара"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Јемен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Замбија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Име"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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:111
 msgid "Service"
 msgstr "Серви�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Локација"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "Кори�ничко име"
 
-#: ../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:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Дома"
 
-#: ../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:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "Изворен адре�ар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Целен адре�ар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Е нов контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Полиња во кои може да �е пишува"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Потребни полиња"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Променето"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уредувач на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Изберете �лика за овој контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_�ема �лика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2597,47 +2604,47 @@ msgstr ""
 "Податоците на контактот �е невалидни:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ има невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ има невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "�евалиден контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање на контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Измени во цело�т"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Цело�но име:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_пошта:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Одбери �дре�ар"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2646,7 +2653,7 @@ msgstr ""
 "Дали �те �игурен/на дека �акате\n"
 "да ја избришете ли�тата на контакти(%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2654,7 +2661,7 @@ msgstr ""
 "Дали �те �игурни дека �акате\n"
 "да ги избришете овие ли�ти на контакти?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2663,7 +2670,7 @@ msgstr ""
 "Дали �те �игурен/на дека �акате\n"
 "да го избришете контактот(%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2805,12 +2812,17 @@ msgstr "_ВнеÑ�ете адреÑ�а за е-пошта или довлечетÐ
 msgid "Contact List Members"
 msgstr "Членови на ли�та на контакти"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "_Членови"
+
 #: ../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: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/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
 msgid "Book"
 msgstr "�дре�ар"
 
@@ -2818,10 +2830,6 @@ msgstr "�дре�ар"
 msgid "Is New List"
 msgstr "Е нова ли�та"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Членови"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Изменет конткт:"
@@ -2859,40 +2867,40 @@ msgstr ""
 "Името или адре�ата на е-пошта на овој контакт веќе по�тои\n"
 "во оваа папка. Дали �епак �акате да ја додадете?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Спои контакт"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Спои"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Спои контакт"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Е-пошта"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "�дре�ата почнува �о"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Името почнува �о"
+msgid "Name contains"
+msgstr "Името �одржи"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2907,10 +2915,10 @@ msgstr[1] "%d контакти"
 msgstr[2] "%d контакти"
 
 #: ../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-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
 msgid "Query"
 msgstr "Прашалник"
 
@@ -2918,12 +2926,12 @@ msgstr "Прашалник"
 msgid "Error getting book view"
 msgstr "Грешка при добивање на поглед на адре�арот"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../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
 msgid "Model"
 msgstr "Модел"
 
@@ -2931,107 +2939,109 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при измената на картичката"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Името почнува �о"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Извор"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Сними како vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1134
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_�ов контакт..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "�ова _ли�та �о контакти..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Зачувај како vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Препрати контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Препрати контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "И�прати по_рака на контактот"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "И�прати по_рака до ли�та"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "И�прати по_рака до контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Печати"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Копира_ј во адре�ар..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Преме�ти _во адре�ар..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "От_�ечи"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
-#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2062
+#: ../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
 #: ../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 "_Копирај"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "Вм_етни"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Било која категорија"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Друга грешка"
 
@@ -3066,7 +3076,7 @@ msgstr "Телефон во кола"
 
 #: ../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
@@ -3167,9 +3177,9 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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:713
 msgid "Role"
 msgstr "Улога"
 
@@ -3205,38 +3215,38 @@ msgid "Web Site"
 msgstr "Веб �ајт"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../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:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Ширина"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../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:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Ви�ина"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Има фоку�"
 
@@ -3256,11 +3266,21 @@ msgstr "Тек�туален модел"
 msgid "Max field name length"
 msgstr "Мак�имална должина на името на полето"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Ширина на колоната"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Ги барам контактите..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3274,7 +3294,7 @@ msgstr ""
 "\n"
 "или двоен клик овде за �оздавање на нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3288,7 +3308,7 @@ msgstr ""
 "\n"
 "Кликнете двапати за да креирате нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3298,7 +3318,7 @@ msgstr ""
 "\n"
 "Барај го контактот."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3308,40 +3328,41 @@ msgstr ""
 "\n"
 "�ема предмети за прикажување во овој поглед."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "�даптер"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Е-пошта на работа"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Домашна е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Друга е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Одбрано"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Има �трелка"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Отвори ја вр�ката во прели�тувач"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Копирај ја локацијата на вр�ката"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_И�прати нова порака до..."
 
@@ -3363,7 +3384,7 @@ msgid "map"
 msgstr "map"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Членови на ли�та"
 
@@ -3384,15 +3405,14 @@ msgid "Video Chat"
 msgstr "Видео разговор"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../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/publish-calendar/publish-calendar.glade.h:5
@@ -3401,8 +3421,7 @@ msgstr "Календар"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "Слободен/зафатен"
 
@@ -3424,125 +3443,132 @@ msgid "Web Log"
 msgstr "Веб лог"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Годишнина"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Профе�ија"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Домашна �траница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Блог"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "У�пех"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Backend зафатен"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Складиштето е офлајн"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "�дре�арот не по�тои"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Контактот не е пронајден"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Контакт ID-то веќе по�тои"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Протоколот не е поддржан"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2521
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Откажано"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "�е може да �е откаже"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "�втентикацијата не у�пеа"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Потребна е афтентикација"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS не е до�тапно"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "�ема таков извор"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "�е е до�тапно во офлајн режим"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "�евалидна верзија на �ерверот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "�еподдржан метод за автентикација"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3553,7 +3579,7 @@ msgstr ""
 "Вчитајте го повторно адре�арот во онлајн режим за преземање на неговата "
 "�одржина"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3562,7 +3588,7 @@ msgstr ""
 "�е може да �е отвори овој адре�ар.  Проверете дали патеката %s по�тои и дали "
 "имате перми�ии за при�тап."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3570,7 +3596,7 @@ msgstr ""
 "�е може да �е отвори овој адре�ар.  Тоа значи дека или вне�овте погрешен URI "
 "или LDAP �ерверот е недо�тапен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3580,7 +3606,7 @@ msgstr ""
 "кори�тите LDAP во Evolution, мора да ин�талирате Evolution пакет �о LDAP "
 "поддршка."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3588,7 +3614,11 @@ msgstr ""
 "�е можеше да �е отвори овој адре�ар.  Тоа значи дека или �те внеле погрешен "
 "URI, или �ерверот е недо�тапен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "Детали на грешка:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3601,7 +3631,7 @@ msgstr ""
 "или зголемете ги ограничувањата за приказ на резултатите за �ерверот за овој "
 "адре�ар."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3613,45 +3643,45 @@ msgstr ""
 "Пробајте да дадете по�пецифични критериуми за пребарување\n"
 "или зголемете ги лимитите за �ерверот за овој адре�ар."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Си�темот за овој адре�ар не можеше да го пар�ира ова барање."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Си�темот за овој адре�ар нема да го изврши ова барање."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "Овој барање не заврши у�пешно."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "Грешка при додавање на ли�тата"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "Грешка при додавање на контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "Грешка при изменувањето на ли�тата"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "Грешка при изменувањето на контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "Грешка во от�транувањето на ли�тата"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "Грешка во от�транувањето на контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3669,16 +3699,16 @@ msgstr[2] ""
 "Отворањето на %d контакти ќе отвори %d нови прозорци.\n"
 "Дали нави�тина �акате да ги прикажете овие контакти?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "_�е прикажувај"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "Прикажи ги _�ите контакти"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3687,15 +3717,15 @@ msgstr ""
 "%s веќе по�тои\n"
 "Дали �акате да запишам над неа?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
@@ -3703,54 +3733,55 @@ msgstr[1] "контакти"
 msgstr[2] "контакти"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "Одбери адре�ар"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "ли�та"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "Преме�ти го контактот во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "Копирај го контактот во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "Преме�ти ги контактите во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "Копирај ги контактите во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "Повеќе vCаrds"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#, c-format
 msgid "Contact information"
 msgstr "Информации за контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "Информации за контактот за %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Го чекам адре�арот..."
 
@@ -3779,43 +3810,43 @@ msgstr "Зачувај во адре�арот"
 msgid "Card View"
 msgstr "Приказ на картичка"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Увезувам..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV таб увезувач"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV или Tab Увезувач"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution VCard и таб увезувач"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 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:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF увезувач"
 
@@ -3868,11 +3899,11 @@ msgid "Format"
 msgstr "Формат"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../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:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Заглавие"
@@ -3975,7 +4006,7 @@ msgstr "Сенчење"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3994,7 +4025,7 @@ msgid "Top:"
 msgstr "Горе:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Тип:"
 
@@ -4104,13 +4135,22 @@ msgstr "�епозната грешка"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{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}' е календар кој може �амо да �е чита. Ве молам, изберете друг календар од "
+"�транчната лента во прегледот на календари."
+
+#. 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} е извор на календар кој може �амо да �е чита. Префрлете �е на "
-"поглед на календар и означете календар кој може да прифаќа �о�таноци."
+"„{0}“ е извор на календар кој може �амо да �е чита. Префрлете �е на поглед на "
+"календар и означете календар кој може да прифаќа �о�таноци."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../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."
@@ -4118,7 +4158,7 @@ msgstr ""
 "Додавањето на концизна и кратка �одржина на вашето закажување ќе им даде на "
 "примачите идеја за што е вашиот �о�танок."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -4126,19 +4166,19 @@ msgstr ""
 "Додавањето на концизна и кратка �одржина на вашата задача ќе им даде на "
 "примачите идеја за што �е работи."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../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:6
+#: ../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:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4146,124 +4186,131 @@ msgstr ""
 "Сите информации за овие закажувања ќе бидат избришани и нема да може да �е "
 "вратат."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../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:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Дали �те �игурни дека �акате да ја избришете задачата „{0}“ ?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Дали �те �игурни дека �акате да го избришете �о�танокот на�ловен „{0}“'?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Дали �те �игурни дека �акате да го избришете мемоарот „{0}“ ?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Дали �те �игурни дека �акате да ги избришете овие {0} �о�таноци?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Дали �те �игурни дека �акате да ги избришете овие {0} мемоари?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Дали �те �игурни дека �акате да ги избришете овие {0} задачи?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Дали �те �игурни дека �акате да го избришете овој �о�танок?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Дали �те �игурни дека �акате да го избришете овој �о�танок?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
+#, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Дали �те �игурни дека �акате да го избришете овој мемоар?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Дали �и �игурни дека �акате да ја избришете оваа задача?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Дали �те �игурни дека �акате да го и�пратите меморандумот без краток преглед?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Дали �те �игурни дека �акате да го и�пратите �о�танокот без краток преглед?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Дали �те �игурни дека �акате да ја и�пратите задачата без краток преглед?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "�е можам да креирам нов документ"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "�е можам да го зачувам на�танот"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Да го избришам календарот„{0}“?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Да ја избришам мемо ли�тата „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Да ја избришам ли�тата �о задачи „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "_�е и�праќај"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Преземање во тек. Дали �акате да го зачувате �о�танокот?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Преземање во тек. Дали �акате да ја зачувате задачата?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Уредувачот не може да �е вчита."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4271,25 +4318,25 @@ msgstr ""
 "Поканите ќе бидат и�пратени преку пошта на �ите уче�ници и ќе им биде "
 "дозволено да ја прифатат оваа задача."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../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:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Грешка при вчитување на календарот"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Грешка при вчитување на ли�тата �о меморандуми"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Грешка при вчитување на ли�тата �о задачи"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4297,7 +4344,7 @@ msgstr ""
 "�ко не и�пратите изве�тување за отказ, другите уче�ници може да не знаат "
 "дека �о�танокот е откажан."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../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."
@@ -4305,7 +4352,7 @@ msgstr ""
 "�ко не и�пратите изве�тување за откажување, другите уче�ници може да не "
 "знаат дека мемоарот е избришан."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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."
@@ -4313,7 +4360,7 @@ msgstr ""
 "�ко не и�пратите изве�тување за отказ, другите уче�ници може да не знаат "
 "дека задачата е избришана."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4321,7 +4368,7 @@ msgstr ""
 "И�праќањето на ажурирани податоци им дозволува на другите уче�ници да имаат "
 "ажурирани календари."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4329,7 +4376,7 @@ msgstr ""
 "И�праќањето на ажурирани податоци им дозволува на другите уче�ници да имаат "
 "ажурирани ли�ти �о задачи."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4337,7 +4384,7 @@ msgstr ""
 "Има преземено неколку приврзоци. Зачувувањето на закажувањето ќе предизвика "
 "губење на тие приврзоци"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4345,83 +4392,83 @@ msgstr ""
 "Има неколку приврзоци кои �е преземаат. Зачувувањето на задачата ќе "
 "предизвика губиток на тие приврзоци."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "�екои опции може да не работат правилно �о вашиот тековен �ервер."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календарот на Evolution неочекувано откажа."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution меморандумот неочекувано откажа."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Задачите на Evolution неочекувано откажаа."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "Календарот не е означен за офлајн кори�тење"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "Ли�тата �о меморандуми не е означен за офлајн кори�тење"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "Ли�татата �о меморандуми не е означена за офлајн кори�тење."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "Ли�тата �о задачи не е означен за офлајн кори�тење"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Овој календар ќе биде трајно от�транет."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Ли�тата �о меморандуми ќе биде трајно от�транет."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Ли�тата �о задачи ќе биде трајно от�транет."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Дали �акате да ги зачувате промените за овој �о�танок?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Дали �акате да ги зачувате вашите измени на оваа задача?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Дали �акате да ги зачувате вашите измени на оваа задача?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Дали �акате да и�пратите изве�тување за откажување за овој мемоар?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Дали �акате да им и�пратите изве�тување за отказ на �ите уче�ници?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Дали �акате да им и�пратите на уче�ниците покани за �о�танок?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Дали �акате да им ја и�пратите задачава на уче�ниците?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Дали �акате да им и�пратите ажурирани податоци за �о�танок на уче�ниците?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "Дали �акате да има и�пратите ажурирани информации за задачи на уче�ниците?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4431,115 +4478,115 @@ msgstr ""
 "проблеми �о кори�тењето на Evolution. �ајдобро е �ерверот да биде надграден "
 "во поддржана верзија."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Вие направивте измени на овој �о�танок, но �� уште не ги зачувавте."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Вие направивте промени на оваа задача, но �� уште не ги зачувавте."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Вие направивте промени на оваа задача, но �� уште не ги зачувавте."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Вашите календари нема да бидат до�тапни �� додека Evolution не �е ре�тартира."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Вашите меморандуми нема да бидат до�тапни �� додека Evolution не �е "
 "ре�тартира."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Вашите задачи нема да бидат до�тапни �� додека Evolution не �е ре�тартира."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Отфрли ги промените"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Зачувај"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Зачувај ги промените"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "И_�прати изве�тување"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Подели ги повеќедневните на�тани:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "�е може да �е подигне evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "�еможе да го чита блокот на апликацијата за календар на пилот уредот"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "�е можам да го прочитам блокот за апликацијата за меморандуми на пилот уредот"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr ""
 "�е можам да го пишувам на блокот за апликацијата за меморандуми на пилот "
 "уредот"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Стандарден приоритет:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "�е можам да го прочитам блокот за блокот за апликацијата за „ToDo“ на пилот "
 "уредот"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 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:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4580,25 +4627,25 @@ 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:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Меморандуми"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1435
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Задачи"
@@ -4616,27 +4663,28 @@ msgstr "_Задачи"
 msgid "Evolution Calendar alarm notification service"
 msgstr "�ларм-�ерви� за изве�тување од календарот на Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 msgstr[2] "минути"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:396
+#: ../plugins/google-account-setup/google-source.c:716
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "�аати"
 msgstr[1] "�аати"
 msgstr[2] "�аат"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Почетно време"
 
@@ -4647,9 +4695,9 @@ msgstr "Закажувања"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Локација:"
@@ -4659,17 +4707,15 @@ msgid "Snooze _time:"
 msgstr "Време на _дремнување:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "_Уреди"
 
@@ -4681,32 +4727,32 @@ msgstr "_Дремни"
 msgid "location of appointment"
 msgstr "локација на �о�танокот"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "�ема до�тапен краток преглед."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "�ема до�тапен опи�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "�ема до�тапни информации за локација."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Предупредување"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4718,7 +4764,7 @@ msgstr ""
 "конфигуриран да и�прати е-пошта. �аме�то тоа, Evolution ќе прикажува\n"
 "нормален дијалог прозорец за пот�етник."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4735,15 +4781,15 @@ msgstr ""
 "\n"
 "Дали �те �игурни дека �акате да ја извршите ова програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "�е ме прашувај повторно за ова програма."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "�е може да �е иницијализира Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4754,7 +4800,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:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4764,7 +4810,7 @@ msgstr[1] "%d ча�а"
 msgstr[2] "%d ча�а"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4776,7 +4822,7 @@ msgstr[2] "%d минути"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5020,12 +5066,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:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Покажи ја површината „Преглед“"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Покажи ја површината „Преглед“"
 
@@ -5075,7 +5121,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:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Времен�ка зона"
 
@@ -5209,66 +5255,66 @@ msgstr "Почетна минута на работен ден"
 msgid "daylight savings time"
 msgstr "летно �метање на времето"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Кратката �одржина �одржи"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Опи�от �одржи"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Категоријата е"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Коментарот �одржи"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Локацијата �одржи"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "�е�овпаднати"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи од �ледните 7 дена"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "�ктивни задачи"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Пропуштени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Завршени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Задачи �о приврзоци"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "�ктивни закажувања"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Закажувања во �ледните 7 дена"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5277,16 +5323,17 @@ msgstr ""
 "Оваа операција за�екогаш ќе ги избрише �ите на�тани по�тари од избраната "
 "количина време. �ко продолжите, нема да можете да ги обновите овие на�тани."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Уништи на�тани по�тари од"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "денови"
 
@@ -5295,102 +5342,98 @@ msgstr "денови"
 #. 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 "Време"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_�ов Календар"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Копирај..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1136
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Свој�тва"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�адградбата на календарите не у�пеа."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "�е у�пеав да го отворам календарот „%s“ за креирање на�тани и �о�таноци"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "�ема до�тапен календар за креирање на�тани и �о�таноци"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Избирач на извор на календар"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1595
 msgid "New appointment"
 msgstr "�ово закажување"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1596
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Закажување"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1597
 msgid "Create a new appointment"
 msgstr "Креирај ново закажување"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1603
 msgid "New meeting"
 msgstr "�ов �о�танок"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1604
+msgctxt "New"
 msgid "M_eeting"
 msgstr "С_о�танок"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1605
 msgid "Create a new meeting request"
 msgstr "Креирај ново барање за �о�танок"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1611
 msgid "New all day appointment"
 msgstr "�ово целодневно закажување"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1612
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Цело_дневно закажување"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1613
 msgid "Create a new all-day appointment"
 msgstr "Креирај нови целодневни закажувања"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1619
 msgid "New calendar"
 msgstr "�ов календар"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1620
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Create a new calendar"
 msgstr "Креирај нов календар"
 
@@ -5411,32 +5454,236 @@ msgid "Month View"
 msgstr "Поглед на ме�ец"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "Приврзоци"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "По�етител"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Бизни�"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Категорија"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Кла�ификација"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "�атпревар"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Доверливо"
+
+#: ../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
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Опи�"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Опи�от �одржи"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "По�тои"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Омилени"
+
+#: ../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
+msgid "Holiday"
+msgstr "Празник"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "Жешки контакти"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Идеи"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Интернационално"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Клучен муштерија"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Разно"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Следните 7 дена"
+
+#: ../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 "Организатор"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Телефон�ки повици"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Приватно"
+
+#: ../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
+msgid "Public"
+msgstr "Јавно"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "Повторно појавување"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Стату�"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Стратегии"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Кратка �одржина"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Кратката �одржина �одржи"
 
-#: ../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
+msgid "Suppliers"
+msgstr "Добавувачи"
+
+#: ../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 "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+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
+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
+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
+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
+msgid "is not"
+msgstr "не е"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Грешка при отворањето на календарот"
 
-#: ../calendar/gui/comp-editor-factory.c:410
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "Методот не е подржан при отворањето на календарот"
 
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "Одбиена дозволата за отварање на календарот"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "�епозната грешка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Уреди го алармот"
 
@@ -5469,17 +5716,17 @@ msgid "Mes_sage:"
 msgstr "Пор_ака:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Пушти звук"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "Изврши програма"
 
@@ -5492,7 +5739,7 @@ msgid "Send To:"
 msgstr "И�прати на:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "И�прати е-пошта"
 
@@ -5547,7 +5794,7 @@ msgstr "минута/и"
 msgid "start of appointment"
 msgstr "почеток на закажување"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "�кција/�ктивирање"
 
@@ -5558,16 +5805,15 @@ msgstr "Д_одај"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "�ларми"
 
-#: ../calendar/gui/dialogs/cal-attachment-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
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи автомат�ки приказ на приврзок"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Прикачи датотека(и)"
 
@@ -5636,8 +5882,8 @@ msgid "Display"
 msgstr "Прикажи"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Петок"
 
@@ -5652,8 +5898,8 @@ msgstr ""
 "Денови"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -5676,7 +5922,7 @@ msgstr ""
 "�едела"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Избери боја"
 
@@ -5686,8 +5932,8 @@ msgid "S_un"
 msgstr "С_онце"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Сабота"
 
@@ -5704,8 +5950,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Прикажи неделни _броеви во навигаторот за датуми"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "�едела"
 
@@ -5723,13 +5969,13 @@ msgid "Template:"
 msgstr "Мо�тра:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Четврток"
 
 #: ../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 "Времен�ка _зона:"
 
@@ -5738,14 +5984,14 @@ msgid "Time format:"
 msgstr "Формат на време:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -5825,128 +6071,136 @@ msgstr "_Сре"
 msgid "before every appointment"
 msgstr "пред �екое закажување"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Коп_ирај �одржина на календар локално за работење офлајн"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Копир_ај ја ли�тата на задачи локално за офлајн работење"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Копира_ј ја ли�тата на меморандуми локално за офлајн работење"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
 msgstr "Б_оја:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Ли�та на задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Ли�та �о меморандуми"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Свој�тва на календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "�ов календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Свој�тва на ли�та �о задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "�ова ли�та �о задачи"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "Свој�тва на ли�та �о меморандуми"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "�ова ли�та �о меморандуми"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Овој на�тан беше избришан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Ова задача беше избришана."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Овој мемоар беше избришан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  �аправивте измени. Да ги заборавам овие промени и да го затворам "
 "уредувачот?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  �е направивте промени. Да го затворам уредувачот?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Овој на�тан е променет."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Ова задача е променета."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Овој мемоар е променет."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  �аправивте промени. Да ги заборавам промените и да го ажурирам "
 "уредувачот?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  �е направивте промени. Да го ажурирам уредувачот?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Потврдувачка грешка: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2338
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " до "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2342
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (До "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "До "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Прикачена порака - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3040
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5954,29 +6208,211 @@ msgstr[0] "Прикачена е %d порака"
 msgstr[1] "Прикачени пораки - %d"
 msgstr[2] "Прикачени пораки - %d"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2063
+#: ../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
 msgid "_Move"
 msgstr "_Поме�ти"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Откажи _влечење"
 
-#: ../calendar/gui/dialogs/comp-editor.c:669
-#: ../calendar/gui/dialogs/comp-editor.c:2827 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "приврзок"
 
-#: ../calendar/gui/dialogs/comp-editor.c:831
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Објектот не може да �е ажурира"
 
-#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Уреди закажување"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Со�танок - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Закажување - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Доделeна задача - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Задача - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Мемоар - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Без кратка �одржина"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Кликни овде за затворање на тековниот прозорец"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Копирај одбран тек�т во клипбордот"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "От�ечи одбран тек�т во таблата �о и�ечоци"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Кликни овде за помош"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Вметни тек�т од таблата �о и�ечоци"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Кликни овде за зачувување на тековниот прозорец"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Одбери го целиот тек�т"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "К_ла�ификација"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../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
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Помош"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Вметни"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Опции"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Приврзок..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Кликни овде за прикачување датотека"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Категории"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Го менува прикажувањето на категории"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Времен�ка _зона"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Го менува прикажувањето на времен�ката зона"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Јав_но"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Кла�ификувај како јавно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Приватно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Кла�ифицирај како приватно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Доверливо"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Кла�ифицирај како доверливо"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "_Улога поле"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Го менува прикажувањето на полето за улога "
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Го менува прикажувањето на RSVP полето"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Стату�но поле"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Го менува прикажувањето на �тату�ното поле"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Тип поле"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+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"
+msgstr "Скорешни доку_менти"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Прикачи"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5984,153 +6420,114 @@ msgstr[0] "<b>%d</b> приврзок"
 msgstr[1] "<b>%d</b> приврзоци"
 msgstr[2] "<b>%d</b> приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Скриј ја _лентата за приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/comp-editor.c:1564
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Прикажи лента за при_врзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
+#: ../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
 #: ../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:1138
-#: ../composer/e-msg-composer.c:3636
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Додај приврзок..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1588
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Прикажи приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Прити�нете на копчето „space“ за да пуштите/и�клучите лента �о приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-msgid "Edit Appointment"
-msgstr "Уреди закажување"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Meeting - %s"
-msgstr "Со�танок - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Appointment - %s"
-msgstr "Закажување - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2207
-#: ../calendar/gui/dialogs/comp-editor.c:2250
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Доделeна задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2209
-#: ../calendar/gui/dialogs/comp-editor.c:2252
-#, c-format
-msgid "Task - %s"
-msgstr "Задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2212
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#, c-format
-msgid "Memo - %s"
-msgstr "Мемоар - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2223
-#: ../calendar/gui/dialogs/comp-editor.c:2265
-msgid "No summary"
-msgstr "Без кратка �одржина"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2916
-#: ../calendar/gui/dialogs/comp-editor.c:2970
-#: ../calendar/gui/dialogs/comp-editor.c:2994
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Измените направени на овој предмет ќе бидат отфрлени ако при�тигне "
 "ажурирањето"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "�е можам да ја кори�там �егашната верзија!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "�е може да �е отвори изворот"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "�е може да �е отвори де�тинацијата"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Де�тинацијата е �амо за читање"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Да го _избришам овој предмет од поштен�ките �андачиња на �ите други "
 "приматели?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "�а�танот не може да биде избришан поради грешка �о corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задачата не може да биде избришана поради грешка �о corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Мемоарот не може да биде избришан поради грешка �о corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Предметот не може да биде избришан поради грешка �о corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "�а�танот не може да биде избришан затоа што при�табот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задачата не може да биде избришана затоа што при�табот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Мемоарот не може да биде избришан затоа што при�табот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Елементот не може да биде избришан затоа што при�табот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "�а�танот не може да биде избришан поради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Задачата не може да биде избришана поради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Мемоарот не може да биде избришан поради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Предметот не може да биде избришан поради грешка"
 
@@ -6139,7 +6536,7 @@ msgid "Contacts..."
 msgstr "Контакти..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Прене�и на:"
 
@@ -6147,96 +6544,142 @@ msgstr "Прене�и на:"
 msgid "Enter Delegate"
 msgstr "Вне�и прено�"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "_�ларми"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr "Кликни овде за по�тавување аларми за овој на�тан"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "Повто_рно појавување"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "�аправи го овој на�тан повторувачки"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Опции за и�праќање"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "Вне�и напредни опции за и�праќање"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "Цело_дневен на�тан"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "Го менува прикажувањето на целодневен на�тан"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Show Time as _Busy"
+msgstr "Покажи време како _зафатен"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "Го менува прикажувањето на времето како зафатено"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "_Слободна/зафатена"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr "Објави �лободно/зафатено информации за при�утните"
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "Зака_жување"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Повторно појавување"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Овој на�тан има аларми"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Делегати"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "При�_утни"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "�а�тан без почетен датум"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "�а�тан без завршен датум"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Почетната дата е погрешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Крајната дата е погрешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Почетното време е погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Крајното време е прогрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Избраниот организатор повеќе нема �метка."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Потребен е организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Барем еден при�утен е потребен."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Додај "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "�е може да �е отвори календарот „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Делувате во име на %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6244,7 +6687,7 @@ msgstr[0] "%d ден пред �о�танокот"
 msgstr[1] "%d денa пред �о�танокот"
 msgstr[2] "%d денa пред �о�танокот"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6252,7 +6695,7 @@ msgstr[0] "%d ча� пред �о�танокот"
 msgstr[1] "%d ча�а пред �о�танокот"
 msgstr[2] "%d ча�а пред �о�танокот"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6260,25 +6703,25 @@ msgstr[0] "%d минута пред �о�танокот"
 msgstr[1] "%d минути пред �о�танокот"
 msgstr[2] "%d минути пред �о�танокот"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Прилагоди..."
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2006
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../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-signature-combo-box.c:69
 msgid "None"
 msgstr "�ишто"
 
@@ -6303,23 +6746,25 @@ msgid "Custom Alarm:"
 msgstr "Прилагоден аларм:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "О_пи�:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Опи� на на�танот"
 
-#: ../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 "Кр_атка �одржина:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_�ларм"
 
+#: ../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 "_Опи�:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Време:"
@@ -6350,28 +6795,24 @@ msgstr "_Промени организатор"
 msgid "Co_ntacts..."
 msgstr "Ко_нтакти..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Организатор"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2446
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Мемо"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "�е можам да ги отворам меморандумите во „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "До"
 
@@ -6384,59 +6825,59 @@ msgstr "Поч_етeн датум:"
 msgid "T_o:"
 msgstr "Д_о:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Опи�:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Променувате повторувачки на�тан, што �акате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Вие делегирате повторувачки на�тан, што �акате да делегирате?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Вие променувате повторувачка задача, што �акате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Менувате мемоар што �е повторува. Што �акате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Само во овој �лучај"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Овој и идни �лучаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Овој и идни �лучаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Сите �лучаи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Овој �о�танок �одржи повторувања што Evolution не може да ги уреди."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "на"
 
@@ -6444,7 +6885,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "прв"
 
@@ -6453,7 +6894,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "втор"
 
@@ -6461,7 +6902,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "трет"
 
@@ -6469,7 +6910,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "четврт"
 
@@ -6477,13 +6918,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "по�леден"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Друг датум"
 
@@ -6491,7 +6932,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1ви до 10ти"
 
@@ -6499,7 +6940,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11ти до 20ти"
 
@@ -6507,45 +6948,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "�лучувања"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Додај и�клучок"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "�е можам да добијам избор за изменување."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Измени го и�клучокот"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "�е можам да добијам избор за бришење."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -6596,12 +7037,12 @@ msgstr "недела(и)"
 msgid "year(s)"
 msgstr "година/и"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Датата на завршување е погрешна"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Веб �траница"
 
@@ -6616,51 +7057,55 @@ msgstr "<span weight=\"bold\">Стату�</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2518 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Завршено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Ви�око"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2515
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Во тек"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "�и�ко"
 
 #: ../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:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "�ормално"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2512
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "�е започнато"
 
@@ -6673,7 +7118,7 @@ msgid "Stat_us:"
 msgstr "Стат_у�:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "�едефинирано"
 
@@ -6682,7 +7127,7 @@ msgid "_Date completed:"
 msgstr "_Датум на завршување:"
 
 #: ../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 "_Приоритет:"
 
@@ -6690,25 +7135,37 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Веб �траница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:111
+msgid "_Status Details"
+msgstr "Детали за _�тату�от"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "Click to change or view the status details of the task"
+msgstr "Кликнете �мени/погледни �тату�ни детали на задачата"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Опции за и�_праќање"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "Детали за задачата"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Датумот на завршување е погрешен"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "�е може да �е отворат задачите во „%s“."
@@ -6722,19 +7179,15 @@ msgid "Categor_ies..."
 msgstr "Ка_тегории..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "О_пи�:"
+msgid "D_ue date:"
+msgstr "_До датум:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Времен�ка зона:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_До датум:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6743,7 +7196,7 @@ msgstr[1] "%d дена"
 msgstr[2] "%d дена"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -6751,135 +7204,119 @@ msgstr[0] "%d недела"
 msgstr[1] "%d недели"
 msgstr[2] "%d недели"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Ќе �е изврши непознато деј�тво"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат вид на активирање"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3327
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликни за отворање на %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "Без на�лов"
 
-#: ../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
+#: ../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 "Почетeн датум:"
 
-#: ../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-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 "Опи�:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "Веб �траница:"
 
-#: ../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 "Кратка �одржина:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Краен датум:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Стату�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../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:338
-msgid "Public"
-msgstr "Јавно"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Приватно"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Доверливо"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Краен датум"
@@ -6889,21 +7326,14 @@ msgstr "Краен датум"
 msgid "Start Date"
 msgstr "Почетен датум"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Кратка �одржина"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Слободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Зафатено"
 
@@ -6917,199 +7347,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "�е"
 
 #. 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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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-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
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../calendar/gui/e-cal-model.c:967
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "Се повторува"
 
-#: ../calendar/gui/e-cal-model.c:969
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "Доделено"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Зачувај како..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 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:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "�лика_без_на�лов.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
-#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../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:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "По�тави како _позадина"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Зачувај го избраното"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори во %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Организатор: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Старт: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "До: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Бришење на одбраните објекти"
 
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Ги ажурирам објектите"
 
-#: ../calendar/gui/e-calendar-table.c:1136
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
-#: ../composer/e-msg-composer.c:1472
+#: ../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
 msgid "Save as..."
 msgstr "Зачувај како..."
 
-#: ../calendar/gui/e-calendar-table.c:1359
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "�ова _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1363 ../calendar/gui/e-memo-table.c:922
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Отвори ја _веб �траницата"
 
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Печати..."
 
-#: ../calendar/gui/e-calendar-table.c:1369
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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:1371
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Вметни"
 
-#: ../calendar/gui/e-calendar-table.c:1375 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Додели задача"
 
-#: ../calendar/gui/e-calendar-table.c:1376 ../calendar/gui/e-memo-table.c:934
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Препрати како iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1377
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Означи како завршено"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Означи ги одбраните задачи како завршени"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Означи како незавршено"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Означи ја одбраната задача како незавршена"
 
-#: ../calendar/gui/e-calendar-table.c:1385
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Избриши ги одбраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1622
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Кликнете за да додадете задача"
@@ -7132,7 +7588,8 @@ msgid "Due date"
 msgstr "Краен датум"
 
 #: ../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:372
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -7140,112 +7597,93 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Почетен датум"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Стату�"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Поме�тување на предмети"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Копирање предмети"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "�ов _�о�танок..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "�ов целодневен _на�тан"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "�ов _�о�танок"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Моментален поглед"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Избери _дене�"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Избери датум..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Печ_ати..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Ко_пирај во календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Преме�ти во календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Закажи �о�танок..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Закажи �о�танок..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Препрати како iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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:1700
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "�аправи ја ова појава _прено�лива"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Избриши ја оваа _појава"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Избриши ги _�ите појави"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Организатор: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "Организатор: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2475
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Локација: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7273,7 +7711,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:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i делови од минута"
@@ -7284,35 +7722,28 @@ 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:1354
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 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:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. 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:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложено повторување)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7320,11 +7751,6 @@ msgstr[0] "Секој %d ден"
 msgstr[1] "�а �екои %d дена"
 msgstr[2] "�а �екои %d дена"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7333,9 +7759,7 @@ msgstr[0] "Секоја %d недела"
 msgstr[1] "�а �екоја %d недела"
 msgstr[2] "�а �екоја %d недела"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7344,30 +7768,21 @@ msgstr[1] "�а �екоја %d недела во"
 msgstr[2] "�а �екоја %d недела во"
 
 #. 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 " и "
 
-#. 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 ден од "
 
-#. 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 од "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7375,12 +7790,7 @@ msgstr[0] "�екој %d ме�ец"
 msgstr[1] "�екои %d ме�еци"
 msgstr[2] "�екои %d ме�еци"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7388,9 +7798,7 @@ msgstr[0] "Секоја %d година"
 msgstr[1] "�а �екои %d години"
 msgstr[2] "�а �екои %d години"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7399,47 +7807,47 @@ msgstr[1] "вкупно %d"
 msgstr[2] "вкупно %d"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", завршува на "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Почнува"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Завршува"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "До "
 
-#: ../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 "iCalendar информации"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "�епозната лично�т"
 
 #. 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."
@@ -7447,288 +7855,288 @@ msgstr ""
 "<br> Ве молам прегледајте ги �ледните информации, и потоа одберете деј�тво "
 "од менито подолу."
 
-#: ../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:728
-#: ../plugins/itip-formatter/itip-formatter.c:2019
+#: ../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:2034
 msgid "Accepted"
 msgstr "Прифатено"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Пробно прифатено"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2025
+#: ../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:2040
 msgid "Declined"
 msgstr "Одбиено"
 
-#: ../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> ги објави информациите од �о�танокот."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Информации од �о�танокот"
 
-#: ../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> бара при�у�тво на %s на �о�танокот."
 
-#: ../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> бара ваше при�у�тво на �о�танокот."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Предлог за �о�танок"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> �ака да �е додаде на по�тоечки �о�танок."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "�журирање на �о�танок"
 
-#: ../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> �ака да ги добие најновите информации од �о�танокот."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Барање за ажурирање на �о�танок"
 
-#: ../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> одговори на барање за �о�танок."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Одговор на �о�танок"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> откажа �о�танок."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Откажување на �о�танок"
 
-#: ../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> и�прати неја�на порака."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Порака од лош �о�танок"
 
-#: ../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> ги објави информациите за задачата."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Информации за задачата"
 
-#: ../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> бара %s за да изврши задача."
 
-#: ../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> бара вие да извршите задача."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Предлог за задача"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> �ака да �е додаде на по�тоечка задача."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "�журирање на задача"
 
-#: ../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> �ака да ги добие најновите информации за задачата."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Барање за ажурирање на задача"
 
-#: ../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> одговори на доделување на задача."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Одговор на задача"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ја откажа задачата."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Откажување на задачата"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Порака за лоша задача"
 
-#: ../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> објави �лободни/зафатени информации."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Слободни/зафатени информации"
 
-#: ../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> бара �лободни/зафатени информации."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Слободни/зафатени информации"
 
-#: ../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> одговори на �лободни/зафатени информации."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Слободен/зафатен одговор"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Лоша �лободна/зафатена порака"
 
-#: ../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 "Изгледа дека пораката не е �оодветно формулирана"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Пораката �одржи �амо неподржани барања."
 
-#: ../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 "Додатокот не �одржи важечка календар�ка порака"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Додатокот нема видливи календар�ки предмети"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "�журирањето е завршено\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 "Објектот е неважечки и неможе да биде ажуриран\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 "Овој одговор не е од тековен по�етител. Да го додадам како по�етител?"
 
-#: ../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 "Стату�от на по�етителот не може да биде ажуриран заради неважечки �тату�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "�журиран е �тату�от на по�етителот\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Стату�от на по�етителот не  може да биде ажуриран затоа што предметот веќе "
 "не по�тои"
 
-#: ../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 "Предметот е и�пратен!\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 "Предметот не може да биде и�пратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Избери деј�тво:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "�адградба"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Прифати"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Прифати пробно"
 
-#: ../calendar/gui/e-itip-control.c:2331
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "И�прати �лободни/зафатени информации"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "�журирај го �тату�от на одговарачот"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "И�прати најнови информации"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Откажи"
@@ -7757,112 +8165,112 @@ msgstr "Вчитување календар..."
 msgid "Server Message:"
 msgstr "Сервер�ка порака:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Прет�едатели"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Потребни уче�ници"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Дополнителни уче�ници"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ре�ур�и"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "При�утни"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Индивидуално"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Ре�ур�"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Соба"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Стол"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Потребни уче�ници"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Дополнителни уче�ници"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "�е уче�ници"
 
-#: ../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 "Потребно е деј�тво"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "Пробен"
 
-#: ../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:737
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../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
 msgid "Delegated"
 msgstr "Прене�ено"
 
 #. 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:526
+#: ../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 "Во тек"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7870,85 +8278,81 @@ 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "�адвор од канцеларија"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "�ема информации"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "При�ут_ни..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "О_пции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Прикажи _�амо работни ча�ови"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Прикажи _намалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_�журирај �лободно/зафатено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_�втомат�ко одбирање"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Сите луѓе и ре�ур�и"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Сите_луѓе и еден ре�ур�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_Потребни луѓе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Потребни луѓе и _еден ре�ур�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Почетно време:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Време на завршување:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "По�етител"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Кликнете овде за да додадете при�утен"
@@ -7973,16 +8377,16 @@ msgstr "Јазик"
 msgid "Member"
 msgstr "Член"
 
-#: ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "_Избриши ги одбраните меморандуми"
 
-#: ../calendar/gui/e-memo-table.c:1090 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Кликнете за да додадете меморандум"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2867
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2960
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7991,85 +8395,80 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Ги вчитувам меморандумите"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ги отворам меморандумите на %s"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1327
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Ги бришам избраните објекти..."
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Вчитување на задачите"
 
-#: ../calendar/gui/e-tasks.c:1059
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ги отворам задачите на %s"
 
-#: ../calendar/gui/e-tasks.c:1304
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Ги завршувам задачите..."
 
-#: ../calendar/gui/e-tasks.c:1354
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Уништувам"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "Го ажурирам барањето"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Прилагоден поглед"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Зачувај го �оп�твениот поглед"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Дефинирај поглед..."
 
-#: ../calendar/gui/gnome-cal.c:2691
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ги вчитувам �о�таноците на %s"
 
-#: ../calendar/gui/gnome-cal.c:2710
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ги вчитувам задачите на %s"
 
-#: ../calendar/gui/gnome-cal.c:2719
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Ги вчитувам меморандумите на %s"
 
-#: ../calendar/gui/gnome-cal.c:2826
+#: ../calendar/gui/gnome-cal.c:2919
 #, c-format
 msgid "Opening %s"
 msgstr "Отварање на %s"
 
-#: ../calendar/gui/gnome-cal.c:3783
+#: ../calendar/gui/gnome-cal.c:3873
 msgid "Purging"
 msgstr "Чи�тење"
 
@@ -8129,57 +8528,57 @@ msgstr "Септември"
 msgid "_Select Today"
 msgstr "_Избери дене�"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "Организаторот мора да биде по�тавен."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Потребно е да има најмалку еден при�утен"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Информации за на�танот"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Информации за задачата"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Информации за мемоар"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Слободни/зафатени информации"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Календар�ки информации"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "�журирано"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "О�вежи"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Предлог за бројач"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободни/Зафатени информации (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Информации за iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Вие морате да бидете при�утен на на�танот."
 
@@ -8227,6 +8626,7 @@ msgid "New memo"
 msgstr "�ов меморандум"
 
 #: ../calendar/gui/memos-component.c:1260
+msgctxt "New"
 msgid "Mem_o"
 msgstr "Мем_орандум"
 
@@ -8239,6 +8639,7 @@ msgid "New shared memo"
 msgstr "�ов �поделен меморандум"
 
 #: ../calendar/gui/memos-component.c:1268
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Споделен меморандум"
 
@@ -8251,6 +8652,7 @@ msgid "New memo list"
 msgstr "�ова ли�та �о меморандуми"
 
 #: ../calendar/gui/memos-component.c:1276
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "Мемо ли_�та"
 
@@ -8258,11 +8660,15 @@ msgstr "Мемо ли_�та"
 msgid "Create a new memo list"
 msgstr "Креирај нова ли�та �о меморандуми"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Печати меморандуми"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Следните 7 дена"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8274,7 +8680,7 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../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"
@@ -8287,26 +8693,27 @@ msgstr ""
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
 #. 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 "�е може да �е мигрираат �тарите по�тавувања од evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "�е може да �е мигрира календарот „%s“"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "�е може да �е мигрираат задачите „%s“"
 
-#: ../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
+#: ../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
 msgid "Notes"
 msgstr "Белешки"
 
@@ -8463,54 +8870,54 @@ msgstr "Пе"
 msgid "Sa"
 msgstr "Са"
 
-#: ../calendar/gui/print.c:2442
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Закажување"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Задача"
 
-#: ../calendar/gui/print.c:2466
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Кратка �одржина: %s"
 
-#: ../calendar/gui/print.c:2488
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "При�утни: "
 
-#: ../calendar/gui/print.c:2528
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Стату�: %s"
 
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2557
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Проценти завршено: %i"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2582
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Контакти: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2695
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Прет�тојни закажувања"
 
@@ -8543,39 +8950,46 @@ msgstr "Ð�ема доÑ�тапен календар за креирање задÐ
 msgid "Task Source Selector"
 msgstr "Одбирач на извор на задачи"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1324
 msgid "New task"
 msgstr "�ова задача"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1325
+msgctxt "New"
+msgid "_Task"
+msgstr "_Задача"
+
+#: ../calendar/gui/tasks-component.c:1326
 msgid "Create a new task"
 msgstr "Креирај нова задача"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1332
 msgid "New assigned task"
 msgstr "�ова доделена задача"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1333
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "До_делена задача"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Create a new assigned task"
 msgstr "Креирај нова доделена задача"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1340
 msgid "New task list"
 msgstr "�ова ли�та �о задачи"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1341
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Ли�та �о _задачи"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Create a new task list"
 msgstr "Креирај нова ли�та �о задачи"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8587,49 +9001,70 @@ msgstr ""
 "\n"
 "Дали нави�тина да ги избришам овие задачи?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "�е ме прашувај повторно."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Печати задачи"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% завршено"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Откажано"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Во тек"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "е поголемо од"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "е помало од"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Закажувања и �о�таноци"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Отварање на календар"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar датотеки (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Увезувач на Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Пот�етник!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar датотеки (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Увезувач на Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "�а�тани од календарот"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентен увезувач на Evolution Calendar"
 
@@ -10163,56 +10598,213 @@ msgstr "Пацифик/Вали�"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Кликнете овде за додавање од адре�арот"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "�е може да �е отвори датотеката која е автомат�ки зачувана"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Де�тинација на пораката"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "�е може да �е добие пораката од уредувачот"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Одберете папки во кои што ќе �е и�прати пораката."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Вметни приврзок"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Кликнете овде за одбирање папки до кои ќе �е и�праќа"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "П_рикачи"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "По_тпи�:"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Безимена порака"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "О_д:"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Прикачи датотека"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Одговори на:"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "Затвори"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_До:"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Затвори ја тековната датотека"
+
+#: ../composer/e-composer-actions.c:486 ../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 "_Печати..."
+
+#: ../composer/e-composer-actions.c:493 ../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 "Преглед за пе_чатење"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Зачувај ја тековната датотека"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Зачувај _како..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Зачувај ја тековната датотека под друго име"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "Зачувај _�кица"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Зачувај како �кица"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "И_�прати"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "И�прати ја оваа порака"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Вне�ете опции за и�праќање"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "�ова _порака"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Отвори прозорец за нова порака"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "Кодна _�траница"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "_Безбедно�т"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP _енкрипција"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Енкриптирај ја пораката �о PGP"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP _потпи�"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Потпиши ја пораката �о вашиот PGP клуч"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "_По�тави приоритет на пораката"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "По�тави го приоритетот на порака како ви�ок"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "По_барај потврда за читање"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "Означи за земање потврда за до�тава кога вашата порака е прочитана"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME ен_крипција"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Енкриптирајте ја пораката �о вашиот S/MIMЕ �ертификат за енкрипција"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME потп_и�"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Потпишете ја пораката �о вашиот S/MIME потпи� �ертификат"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "Поле за _�лепа копија"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Го менува изборот дали „BCC“ полето �е прикажува"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "Поле за _копија"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Го менува изборот дали „CC“ полето �е прикажува"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "_Од поле"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Го менува изборот дали „Од“ избирачот �е прикажува"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "„_И�прати“ до поле"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Го менува изборот дали „Пишувај“ полето �е прикажува"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "„_Одговори-на“ поле"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Го менува изборот дали „Одговори-на“ полето �е прикажува"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "Поле за _на�лов"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Го менува прикажувањето на полето за на�лов"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "_До поле"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "Го менува изборот дали До полето �е прикажува"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Вне�ете ги примачите на пораката"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Копија:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Вне�ете ги адре�ите кои ќе примат �лепа копија на пораката"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Слепа копија:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../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"
@@ -10220,29 +10812,69 @@ msgstr ""
 "Вне�и ги адре�ите кои ќе примат �лепа копија на пораката без појавување во "
 "ли�тата на примачи на пораката"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "О_д:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Одговори на:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_До:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Копија:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Слепа копија:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_И�прати до:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "Т_ема:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "П_рикачи"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "По_тпи�:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Вметни приврзок"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Кликнете овде за додавање од адре�арот"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Де�тинација на пораката"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Одберете папки во кои што ќе �е и�прати пораката."
+
+#: ../composer/e-composer-post-header.c:171
+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:173 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "Покажи лента за при_врзоци"
+
+#: ../composer/e-msg-composer.c:872
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "�е може да �е потпише појдовната порака: нема по�тавен �ертификат за потпи� "
 "за оваа �метка"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10250,42 +10882,24 @@ msgstr ""
 "�е може да �е енкриптира појдовната порака: нема по�тавен �ертификат за "
 "потпи� на оваа �метка"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Приврзок"
+msgstr[1] "Приврзоци"
+msgstr[2] "Приврзоци"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Скриј ја лентата за при_врзоци"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3881
-msgid "Show _Attachment Bar"
-msgstr "Покажи лента за при_врзоци"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "�епозната причина"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "�е може да �е отвори датотеката"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "�е може да �е добие пораката од уредувачот"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Безимена порака"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Отвори датотека"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
-#: ../composer/e-msg-composer.c:3764
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Пишувај порака"
 
-#: ../composer/e-msg-composer.c:5034
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10317,8 +10931,7 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Поради &quot;{0}&quot;, изгледа да �е одберат различни опции за пошта."
 
-#: ../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 "Поради &quot;{1}&quot;."
 
@@ -10432,23 +11045,27 @@ msgstr "�е можете да ја прикачите датотеката „{
 msgid "You need to configure an account before you can compose mail."
 msgstr "Треба да конфигурирате �метка пред да пишувате пошта."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Продолжи �о уредување"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_�е враќај"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Врати"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Зачувај ја пораката"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Зачувај �кица"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "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:738
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -10464,55 +11081,78 @@ msgstr "картичка �о адре�а"
 msgid "calendar information"
 msgstr "информации за календар"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Грешка �о Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Предупредување на Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Информација за Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Барање од Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Внатрешна грешка, непозната грешка „%s“ побарано"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Компонента"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "Има не компонентата која �е логира"
+
+#: ../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
+msgid "Enabled"
+msgstr "Вклучено"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Дали приклучокот е овозможен"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Се појави грешка при печатењето"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Си�темот за печатење пријави грешка, �о �ледните детали за грешката:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
 msgstr "Си�темот за печатење не пријави никакви додатни детали за грешката."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Поради „{1}“."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "�е може да �е отвори датотеката &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "�е може да �е отвори датотеката „{0}“."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "�е може да �е зачува датотеката &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "�е може да �е зачува датотеката „{0}“."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Дали �акаш да запишете над неа?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "Датотеката веќе по�тои &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
+msgstr "Датотеката веќе по�тои „{0}“."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10522,49 +11162,64 @@ msgstr "Да запишам над датотеката?"
 msgid "_Overwrite"
 msgstr "_Запиши над"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "�е може да �е прикаже помош за Evolution."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "В_ажно"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Работа"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Лично"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "Д_а �е направи"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Подоцна"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Име на ознака:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Уреди ознака"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Додај ознака"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Името на ознаката не може да биде празно."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-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 "Веќе по�тои ознака �о и�тaта етикета. Преименувајте ја Вашата ознака."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf грешка: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Сите понатамошни грешки �е прикажуваат �амо во терминал."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10696,65 +11351,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Одберете време за �поредба"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Одберете датотека"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Те�т"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Име на пр_авило:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "�ајди предмети кои ги задоволуваат �ледниве критериуми"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "До_дај правило за филтер"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "ако �ите критериуми �е задоволени"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "ако било кој критериум е задоволен"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_�ајди предмети:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Сите во вр�ка �о"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Одговори и родители"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Без одговор или родител"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "В_клучи нишки"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Дојдовни"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Појдовни"
 
@@ -10778,7 +11433,7 @@ msgstr "�едо�та�ува датум."
 msgid "Missing file name."
 msgstr "�едо�та�ува име на датотека."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "�едо�та�ува име."
 
@@ -10854,7 +11509,7 @@ msgstr "во иднината"
 msgid "months"
 msgstr "ме�еци"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "�екунди"
 
@@ -10866,9 +11521,10 @@ msgstr "тековното време"
 msgid "the time you specify"
 msgstr "времето кое го назначувате"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "недели"
 
@@ -10884,7 +11540,7 @@ msgstr "Додај правило"
 msgid "Edit Rule"
 msgstr "Измени правило"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Име на правило"
 
@@ -10905,57 +11561,69 @@ msgid "Configure your email accounts here"
 msgstr "Конфигурирајте ги Вашите �метки за е-пошта тука"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Конфигурирајте ги Вашите мрежни по�тавувања тука"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "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 "Контрола на конфигурација за Evolution �метки"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution компонента"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "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 "Контрола на конфигурација за 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 "Контрола на преференци за Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
-#: ../mail/mail-component.c:737
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+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:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Сметки за пошта"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "Преференции за пошта"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Преференции за мрежа"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s договор за лиценца"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10968,115 +11636,109 @@ msgstr ""
 "за %s прикажан подолу\n"
 "и означете го полето за прифаќање\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Одбери папка"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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:97
 msgid "Autogenerated"
 msgstr "�втогенериран"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Прашај за �екоја порака"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Примање на е-пошта"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "�втомат�ки проверувај дали има _нови пораки на �екои"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "мину_ти"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "И�праќање на е-пошта"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Стандардно"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Безбедно�т"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Опции за примање"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Проверувам дали има нови пораки"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Уредувач на �метки"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "��и�тент за Evolution �метки"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Стандардно]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Вклучено"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Име на �метка"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "Безимено"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Јазик"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Додај �крипта за потпи�"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Потпи�(и)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Препратена порака --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "непознат и�праќач"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11084,11 +11746,11 @@ msgstr ""
 "�а ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} во ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} напиша:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "--------Оригинална порака--------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Правила за _филтри"
 
@@ -11105,10 +11767,6 @@ msgstr "Додели боја"
 msgid "Assign Score"
 msgstr "Додели бодови"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Приврзоци"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11125,10 +11783,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Завршено на"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "�одржи"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Копирај во папката"
@@ -11142,7 +11796,7 @@ msgid "Date sent"
 msgstr "Датум на и�праќање"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11153,10 +11807,6 @@ msgstr "Избриши"
 msgid "Deleted"
 msgstr "Избришано"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "не �одржи"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "не завршува �о"
@@ -11177,10 +11827,6 @@ msgstr "не звучи како"
 msgid "does not start with"
 msgstr "не почнува �о"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "�е по�тои"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Шаблон"
@@ -11189,10 +11835,6 @@ msgstr "Шаблон"
 msgid "ends with"
 msgstr "завршува �о"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "По�тои"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "по�тои"
@@ -11205,14 +11847,10 @@ msgstr "Израз"
 msgid "Follow Up"
 msgstr "Следи"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Важно"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "е"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "е по�ле"
@@ -11225,18 +11863,6 @@ msgstr "е пред"
 msgid "is Flagged"
 msgstr "е означена �о знаме"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "е поголемо од"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "е помало од"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "не е"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "не е означена �о знаме"
@@ -11249,7 +11875,7 @@ msgstr "не е по�тавено"
 msgid "is set"
 msgstr "е по�тавено"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Отпад"
@@ -11258,7 +11884,7 @@ msgstr "Отпад"
 msgid "Junk Test"
 msgstr "Те�т на отпад"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Ознака"
 
@@ -11300,7 +11926,7 @@ 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Прочитана"
 
@@ -11372,10 +11998,9 @@ msgstr "почнува �о"
 msgid "Stop Processing"
 msgstr "Пре�тани �о проце�ирање"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11386,11 +12011,11 @@ msgid "Unset Status"
 msgstr "От�трани �тату�"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Потоа"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Додај деј_�тво"
 
@@ -11434,16 +12059,16 @@ msgstr "Важни пораки"
 msgid "Messages Not Junk"
 msgstr "Пораката не е отпад"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1170
 msgid "Account Search"
 msgstr "Барање на �метка"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1223
 msgid "All Account Search"
 msgstr "Барање на �ите �метки"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "�епрочитана порака:"
@@ -11452,32 +12077,46 @@ msgstr[2] "�епрочитани пораки:"
 
 #. 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
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Вкупнo пораки:"
 msgstr[1] "Вкупно пораки:"
 msgstr[2] "Вкупно пораки:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "Употреба на квотата"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Сандаче"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Свој�тва на папката"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<кликни овде за одбирање папка>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "К_реирај"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Име на _папка:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Папки за пребарување"
 
@@ -11486,27 +12125,19 @@ msgstr "Папки за пребарување"
 msgid "UNMATCHED"
 msgstr "�ЕСОВП�Д��ТО"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Скици"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Сандаче"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "За и�праќање"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "И�пратени"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Се вчитува..."
 
@@ -11525,343 +12156,333 @@ msgstr "Се вчитува..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Дрво на папки �о пошта"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Преме�тување на папката %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копирање на папката %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1971
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преме�тувам пораки во папка %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1973
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирам пораки во папка %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�е може да �е о�тават порака(и) во најгорно ниво на �ме�тување"
 
-#: ../mail/em-folder-tree.c:1011 ../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 "Копирај во папка"
 
-#: ../mail/em-folder-tree.c:1012 ../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 "Преме�ти во папка"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Скенирам папки во „%s“"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Поглед"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Отвори во _нов прозорец"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_�ова папка..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Преме�ти..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Преименувај..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "О�_вежи"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Пуш_ти ги пораките кои �е за и�праќање"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_И�празни отпад"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Копирам „%s“ во „%s“"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Одбери папка"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "К_опирај"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Креирам папка „%s“"
 
-#: ../mail/em-folder-utils.c:745
-#: ../plugins/groupwise-features/install-shared.c:164
+#: ../mail/em-folder-utils.c:744
+#: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Креирај папка"
 
-#: ../mail/em-folder-utils.c:745
-#: ../plugins/groupwise-features/install-shared.c:164
+#: ../mail/em-folder-utils.c:744
+#: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "�азначи каде да �е креира папката:"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Бришењето на поштата не у�пеа"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�емате доволно перми�ии за да ја избришете оваа пошта."
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори му на и�праќачот"
 
-#: ../mail/em-folder-view.c:1336 ../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 "_Препрати"
 
 #. 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:1340 ../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 "_Уреди како нова порака..."
 
-#: ../mail/em-folder-view.c:1342
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Печати..."
-
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Врати и_збришано"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Преме�ти во папка..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Копирај во папка..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Означи како _прочитана"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Означи како _непрочитана"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Означи како _важна"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Означи како не_важно"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Означи како _отпад"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Означи дека _не е отпад"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Означи за �ле_дење..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Ознака"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_�ишто"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_�ова ознака"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Зна_мето е завршено"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "И�_чи�ти знаме"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Кре_ирај правило од пораката"
 
 #. 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:1373
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Папка за пребарување од _темата"
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Папка за пребарување од _и�праќачот"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Папка за пребарување од _примачите"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Папка за пребарување од поштен�ката _ли�та"
 
 #. 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:1381
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Филтер на т_ема"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Филтер базиран на  и�п_раќач"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Филтер базиран на при_мачи"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Филтер базиран на п_оштен�ка ли�та"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
+#. 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:301
+#: ../plugins/google-account-setup/google-source.c:586
+#: ../plugins/google-account-setup/google-source.c:772
 msgid "Default"
 msgstr "Стандардно"
 
-#: ../mail/em-folder-view.c:2528
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "�е може да �е преземе пораката"
 
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Примам порака..."
 
-#: ../mail/em-folder-view.c:2806
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "П_овик до..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Креирај _папка за пребарување"
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Од оваа адре�а"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_�а оваа адре�а"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Прити�ни за пошта %s"
 
-#: ../mail/em-folder-view.c:3320
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Прити�ни за повикување на %s"
 
-#: ../mail/em-folder-view.c:3325
+#: ../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:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Совпаѓања: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Про_најди:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Следно"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "Р_азликувај мали-големи букви"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "�епотпишано"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Пораката не е потпишана. �ема гаранција дека оваа порака е автентична."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Важечки потпи�"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 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:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "�еважечки потпи�"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11869,11 +12490,11 @@ msgstr ""
 "Потпи�от на оваа порака не може да �е провери, може да е променет при "
 "прено�от."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Валиден потпи�, но не може да �е провери и�праќачот"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11881,21 +12502,21 @@ msgstr ""
 "Оваа порака е потпишана �о валиден потпи�, но и�праќачот на пораката не може "
 "да �е провери."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Потпи�от по�тои, но потребен е јавен клуч"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "Оваа порака е потпишана �о валиден потпи�, но нема �овпаѓачки јавен клуч."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "�еенкриптирано"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11903,11 +12524,11 @@ msgstr ""
 "Оваа порака не е енкриптирана. �ејзината �одржина може некој да ја види при "
 "прено�от на Интернет."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Слабо енкриптирано"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11917,11 +12538,11 @@ msgstr ""
 "тешко, но не и неможно некој од надворешно�та да ја види �одржината на оваа "
 "порака во догледно време."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Енкриптирано"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11929,11 +12550,11 @@ msgstr ""
 "Оваа порака е енкриптирана. Ќе биде тешко некој од надворешно�та да ја види "
 "�одржината на оваа порака."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Јако енкриптирано"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11942,61 +12563,56 @@ msgstr ""
 "Оваа порака е енкриптирана, �о јак алгоритам за енкрипција. Ќе биде многу "
 "тешко некој од надворешно�та да ја види �одржината во разумно време."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Види �ертификат"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Овој �ертификат не може да �е види"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено на %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Пречекорени:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "�о %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Види внатре"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Скриј"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Собери во ширина"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "_Оригинална големина"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Приврзок"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Зачувај го приврзокот како"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Одберете папка за зачувување на �ите приврзоци"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Зачувај го одбраното..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12004,33 +12620,33 @@ msgstr[0] "%d пр_иврзок"
 msgstr[1] "%d пр_иврзоци"
 msgstr[2] "%d пр_иврзоци"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "З_ачувај"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "З_ачувај ги �ите"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "�ема приврзоци"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Прегледај _неформатирано"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Скриј го _неформатираното"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "О_твори �о"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2468
 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 ""
 "Evolution не може да ја и�црта оваа порака бидејќи е преголема за "
@@ -12042,277 +12658,286 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Преземам „%s“"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "�епознат надворешен дел од телото."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Изобличен надворешен дел од телото."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Покажувач до FTP �ајт (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Покажувач до локална датотека (%s) валидна на �ајтот „%s“"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Покажувач на локална датотека (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Покажувач до оддалечени податоци (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Покажувач до непознати надворешни податоци  („%s“тип)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Форматирање на порака"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Форматирање на порака..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Копија на пораката"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Слепа копија"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "И�праќач"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../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:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Датум"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Оваа порака е и�пратена од <b>%s</b> во име на <b>%s</b>"
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Од"
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 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
+msgid "Date"
+msgstr "Датум"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Ди�ку�иони групи"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s приврзок"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "�е може да �е пар�ира S/MIME пораката: �епозната грешка"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�е може да �е пар�ира MIME пораката. Приказ како извор."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "�еподдржан тип на енкрипција за повеќеделно/енкриптирано"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "�е може да �е пар�ира PGP/MIME пораката"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "�е може да �е пар�ира PGP/MIME пораката: �епозната грешка"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "�еподдржан формат на потпи�"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Грешка при утврдувањето на потпи�от"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "�епозната грешка при проверка на потпи�от"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "�е можам да ја пар�ирам PGP пораката"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "�е може да �е пар�ира PGP/MIME пораката: �епозната грешка"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Секојпат"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Еднаш дневно"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Еднаш неделно"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Еднаш ме�ечно"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Додај �оп�твен хедер за отпад"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Име на хедер:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Вредно�та на хедерот �одржи:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Содржи вредно�т"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Етикета"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Приклучокот %s е недо�тапен, а бинарната датотека е ин�талирана."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Приклучокот %s е недо�тапен. Проверете дали пакетот е ин�талиран."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "�ема приклучок за отпадот"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Да �е направи"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Подоцна"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Локацијата и хиерархијата на Evolution папките �о �андачиња е променета од "
-"Evolution 1.x.\n"
-"\n"
-"Ве молам, почекајте додека Evolution ги мигрира Вашите папки..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "�е може да �е креира нова папка „%s“: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "�е може да �е копира папката „%s“ во „%s“: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "�е може да �е �кенираат по�тоечките �андачиња во „%s“: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Локацијата и хиерархијата на Evolution папките �о �андачиња е променета од "
+"Evolution 1.x.\n"
+"\n"
+"Ве молам, почекајте додека Evolution ги мигрира Вашите папки..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "�е може да �е отворат �тарите POP податоци кои �е чуваат на �ервер „%s“: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "�е може да �е креира POP3 папка за податоци кои �е чуваат на �ерверот „%s“: %"
 "s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "�е може да �е копираат POP3 податоците кои �е чуваат на �ерверот „%s“: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "�е може да �е креира ме�то за �ме�тување локална пошта „%s“: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"Форматот на папките за пошта на Evolution �е промена, откако е заменат �о sqlite од Evolution верзија 2.24.\n"
+"\n"
+"Ве молам, почекајте додека Evolution ги мигрира Вашите папки..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "�е може да �е креираат папки за локална пошта во „%s“: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12320,62 +12945,65 @@ msgstr ""
 "�е може да �е прочитаат по�тавувањата од претходната ин�талација на "
 "Evolution, „evolution/config.xmldb“ не по�тои или е оштетена."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Одговори на и�праќачот"
 
-#: ../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 "Одговори на _ли�тата"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Додај во адре�ар"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ова �ме�тување не поддржува претплати, или тие не �е вклучени."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Претплатено"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Ве молам, одберете �ервер."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "�ема одбрано �ервер"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_�е ја прикажувај повторно оваа порака."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Филтри на порака"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "порака"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Зачувај порака..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Додај адре�а"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Пораки од %s"
@@ -12389,54 +13017,66 @@ msgid "Search Folder source"
 msgstr "Пребарај го изворот на папката"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Ви�ина на прозорецот „И�прати и прими пошта“"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "„И�праќај и примај“ пошта во мак�имизирана �о�тојба на прозорецот"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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 да прикаже дел од тек�т �о ограничена големина"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Секогаш барај потврда за читање"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../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:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "�втомат�ко препознавање на емоции"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "�втомат�ко препознавање на вр�ки"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Провери дали дојдовната пошта е отпад"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Боја на о�ветлување на цитат"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Боја на о�ветлување на цитат."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Стандардна ви�ина на прозорецот за пишување"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Стандардна ширина на прозорецот за пишување"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Директориум за вчитување/прикачување на прозорецот за пишување"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Компре�иран приказ на адре�ите во До/Копија/Слепа копија"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12444,89 +13084,111 @@ msgstr ""
 "Компре�иран приказ на адре�ите во До/Копија/Слепа копија на бројката "
 "одредена во address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 "Контролирај колку че�то локалните промени �е �инхронизираат �о оддалечените �ервери за пошта. Интервалот мора да е најмалку 30 �екунди."
+
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "Стандардно кодирање во кое �е пишуваат пораките"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Стандардно кодирање во кое �е пишуваат пораките."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Стандардно кодирање во кое �е прикажуваат пораките"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Стандардно кодирање во кое �е прикажуваат пораките."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Стандарден �тил на препраќање"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Стандардна ви�ина на прозорецот за пишување."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Стандардна ви�ина на прозорецот за пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Стандардна ви�ина на прозорецот за претплати."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Стандарден �тил на реплицирање"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Стандардна вредно�т за �о�тојбата на проширување на нишката"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Стандардна ширина на прозорецот за пишување."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Стандардна ширина на прозорецот за пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Стандардна ширина на дијалогот за претплати."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr "Одредува дали адре�ата на и�праќачот да �е пребарува во адре�арот, при филтрирање од отпад"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "Одредува дали адре�ата на и�праќачот да �е пребарува во адре�арот"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 msgstr ""
-"Одредува дали да �е провери адре�ата на и�праќачот во адре�арот. �ко "
-"биде пронајдена тогаш не треба да е �пам. Пребарува во адре�арите обележани "
-"за автомат�ко довршување. Може да биде �поро, ако за автомат�ко довршување �е "
+"Одредува дали да �е провери адре�ата на и�праќачот во адре�арот. �ко биде "
+"пронајдена тогаш не треба да е �пам. Пребарува во адре�арите обележани за "
+"автомат�ко довршување. Може да биде �поро, ако за автомат�ко довршување �е "
 "обележат запи�и од далечен адре�ар (пример, ldap)."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../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:30
+#: ../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:31
+#: ../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."
@@ -12534,55 +13196,59 @@ msgstr ""
 "Одредува дали да �е кори�ти и�тиот фонт за линиите „Од“ и „Тема“ во "
 "вертикалниот поглед на колоната „Пораки“."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Директориум за вчитување/прикачување на датотеки во пишувачот на пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Директориум за зачувување на датотеките на �о�тавните компоненти на поштата."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "И�празни ја папката за отпад при излегување"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "И�празни ја папката за ѓубре при излегување"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "И�празни ги �ите папки за отпад при излез на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "И�празни ги �ите папки за ѓубре при излез на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Овозможи caret режим, така да може да ја видите �трелката кога читате пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Овозможи или оневозможи магично Space копче"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Овозможи ја или оневозможи ја карактери�тиката „барај како што пишуваш“"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Овозможи папки за пребарување"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Овозможи папки за пребарување при подигнување."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12594,7 +13260,7 @@ msgstr ""
 "да најдете папка во таа �транична лента �амо �о пишување на името на папката "
 "и изборот автомат�ки �е префрлува на таа папка."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12602,27 +13268,27 @@ msgstr ""
 "Овозможете го ова за да го кори�тите копчето Space за преглед на пораките, "
 "прели�тување на ли�тите �о пораки и папките."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Овозможи и�цртување на дел од тек�тот �о ограничена големина."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Вклучи/и�клучи caret режим"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Ви�ина на површината за ли�та �о пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Ви�ина на површината за ли�та �о пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Го крие прегледот по папка и го от�транува избраното"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12630,7 +13296,7 @@ msgstr ""
 "�ко кори�никот �е обиде да отвори 10 или повеќе пораки и�товремено, прашај "
 "го дали нави�тина �ака да го направи тоа."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12638,7 +13304,7 @@ msgstr ""
 "�ко површината за „Преглед“ е приклучена, тогаш прикажи ја една до друга "
 "наме�то вертикално."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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 "
@@ -12649,11 +13315,40 @@ msgstr ""
 "прегледник на компоненти во базата на mime типови на GNOМЕ може да �е "
 "кори�тат за приказ на �одржина."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 ""
+"Почетна ви�ина на прозорецот „И�прати и прими пошта“. Вредно�та �е ажурира ако "
+"кори�никот ја промени големината на прозорецот вертикално."
+
+#: ../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 ""
+"Иницијалната �о�тојба за мак�имизирање на прозорецот „И�прати или прими пошта“. Оваа "
+"вредно�т �е ажурира кога кори�никот го мак�имизира или одмак�имизира прозорецот. Забележете "
+"дека оваа предно�т не �е кори�ти од Evolution бидејќи прозорецот „И�прати и прими пошта“ не може да "
+"�е мак�имизира. Овој клуч по�тои како детал на имплементација."
+
+#: ../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:55
+#: ../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."
@@ -12661,7 +13356,7 @@ msgstr ""
 "Ја овозможува/оневозможува опцијата каде што �е повторува прашањето дали е "
 "потребна �инхронизација за офлајн."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../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 "
@@ -12671,31 +13366,31 @@ msgstr ""
 "пораки од папка за пребарување трајно ја брише пораката, а не �амо ја "
 "от�транува од резултатите за пребарување."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "По�леден пат кога �е и�празна папката �о отпад"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "По�леден пат кога е и�празнето ѓубрето"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "�иво по�ле кое пораката треба да �е логира."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Ли�та на ознаки и нивните а�оцирани бои"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Ли�та на прифатени пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Ли�та на �метки"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12704,11 +13399,15 @@ msgstr ""
 "�одржи знаковни низи кои именуваат потпапки �лични на /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Ли�та на прилагодени заглавја и дали тие �е вклучени."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Ли�та на кодови на јазици за речници кои ќе �е кори�тат за проверка на правопи�."
+
+#: ../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."
@@ -12717,125 +13416,125 @@ msgstr ""
 "�одржи знаковни низи кои �одржат name:color каде бојата го кори�ти hex "
 "кодирањето на HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Ли�та на имиња на протоколи чии лиценци �е прифатени."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Вчитај пораки за HTML пораки преку http"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../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 ""
-"Вчитај �лики за HTML пораки преку http(s). Можни вредно�ти �е: 0 - никогаш "
-"невчитувај �лики од интернет 1 - Вчитај �лики во поштата од контактите 2 - "
+"Вчитај �лики за HTML пораки преку http(s). Можни вредно�ти �е: „0“ - никогаш "
+"невчитувај �лики од интернет „1“ - Вчитај �лики во поштата од контактите „2“ - "
 "Секогаш вчитувај �лики од интернет."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Води запи� за деј�твата на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Води запи� за деј�твата на филтрите во назначената лог датотека."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Лог датотека за запи� на деј�твата на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Лог датотека за запи� на деј�твата на филтрите."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Означи како видени по одредено време"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Означи како видени по одредено време."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означи цитати во пораката „Преглед“"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означи цитати во пораката „Преглед“."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Стандардна ви�ина на прозорецот �о пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Стандардна ширина на прозорецот за пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Вид на приказ на поракта („нормален“, „цело заглавие“, „извор“)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Минимум денови меѓу празнењето отпад при излез"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Минимум денови меѓу празнењето ѓубре при излез"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Број на адре�и за прикажување во До/Копија/Слепа копија"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Изве�ти кога е без тема"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Прашај пред бришење на пораки од папката за пребарување"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Изве�ти кога кори�никот уништува"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Изве�ти кога кори�никот вне�ува �амо �лепа копија"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Изве�ти кога кори�никот �ака да отвори 10 или повеќе пораки и�товремено"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
@@ -12843,145 +13542,145 @@ msgstr ""
 "Изве�ти кога кори�никот �ака да и�прати HTML пошта на кори�ници кои не "
 "�акаат да примаат HTML пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../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:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Изве�ти кога кори�никот �ака да и�прати не�акан HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Прашај за означување на повеќе пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Препознај �мешковци во тек�т и замени ги �о �лики."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Препознај вр�ки во тек�т и замени ги."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Те�тирај ја доаѓачката пошта дали е отпад."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Зачувај го директориумот"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Барај �лика од и�праќачот во локалните адре�ари"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Стандардно и�праќај HTML пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Стандардно и�праќај HTML пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Прикажи ја е-поштата на и�праќачот во колоната за адре�и во ли�тата на пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Интервал на �инхронизација �о �ерверот"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Покажи анимации"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Покажувај ги анимираните �лики како анимации."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Покажи ги избришаните пораки во ли�тата �о пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Прикажи фотографија од и�праќачот"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../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:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr "Го одредува хедерот за проверување на отпад."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Го одредува хедерот за проверување на отпад. Форматот е headername=вредно�т "
-"во gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "�аправи проверка на правопи�"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "Боја на проверка на правопи�"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "Јазици за проверка на правопи�"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Стандардна ви�ина на дијалог за претплати"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Стандардна ширина на дијалог за претплати"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Терминал фонт"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Лимит на ограничување на дел од тек�тот на пораката"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Стандардниот приклучок за закачување на отпад"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../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:124
+#: ../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:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Терминал фонтот за приказ на пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Променлива ширина на фонт за приказ на пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Ова може да има три можни вредно�ти. 0 за грешки, 1 за предупредувања и 2 за "
+"Ова може да има три можни вредно�ти. „0“ за грешки, „1“ за предупредувања и „2“ за "
 "пораки за дебагирање."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -12990,7 +13689,7 @@ msgstr ""
 "форматиран под evolution. Стандардната големина е 4MB / 4096 KB и �е "
 "одредува во KB."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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 "
@@ -13000,15 +13699,15 @@ msgstr ""
 "�ко �тандардниот приклучок е оневозможен, тогаш тој нема да премине на "
 "другите до�тапни приклучоци."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../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 ""
-"Овој клуч е read only �амо еднаш и потоа �е ре�етира на false. Ова ја "
+"Овој клуч е read only �амо еднаш и потоа �е ре�етира на „false“. Ова ја "
 "и�клучува цела пошта во ли�тата и го от�транува прегледот за таа папка."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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;"
@@ -13019,13 +13718,23 @@ msgstr ""
 "не �е прикажуваат. Форматот на XML �труктурата е &ltч заглавие вклучено^gt; "
 "- по�тави вклучено ако заглавието треба да �е прикжи во приказот на поштата."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Оваа опција е поврзана �о key lookup_addressbook и �е кори�ти за одредување дали "
+"да �е бараат адре�ите во локален адре�ар, �амо да не �е вклучуваат пораките "
+"и�пратени од познатите контакти филтрирани како отпад."
+
+#: ../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:133
+#: ../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."
@@ -13033,7 +13742,7 @@ msgstr ""
 "Ова го по�тавува бројот на адре�и за прикажување во �тандардниот преглед на "
 "пораката, по�ле кој �е прикажуваат „...“"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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."
@@ -13041,7 +13750,7 @@ msgstr ""
 "Ова по�тавување одредува дали нишките �тандардно ќе �е прошират или �пуштат. "
 "За ова Evolution бара ре�тартирање."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
@@ -13051,107 +13760,115 @@ msgstr ""
 "најновата порака во �екоја нишка, наме�то �поред датумот на пораката. "
 "Evolution за ова бара ре�тартирање."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Стави ја ли�тата �о пораки во нишка."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Стави ја ли�тата �о пораки во нишка"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "По�тави нишка за ли�тата �о пораки �поред темата"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Време за означување пораки како видени"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Време за означување пораки како видени."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID �тринг на �тандардната �метка."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "Кори�ти SpamAssassin даемон и клиент"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Кори�ти SpamAssassin даемон и клиент (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Кори�ти прилагодени фонтови"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Кори�ти �оп�твени фонтови за приказ на пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Кори�ти �амо локални �пам те�тови."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Кори�ти ги �амо локалните �пам те�тови (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Кори�ти широк поглед или едно до друго"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Променлива ширина на фонт"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Поглед/Bcc мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Поглед/Bcc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Поглед/Cc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Поглед/Cc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Поглед/Од мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Поглед/Од мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Поглед/Пишувај мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Поглед/Пишувај мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Поглед/Одговори на мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Поглед/Одговори на менито предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../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:161
+#: ../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."
@@ -13159,43 +13876,43 @@ msgstr ""
 "Дали да �е врати на преглед на нишки �поред теми кога пораките не �одржат In-"
 "Reply-To или References заглавја."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../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:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Ширина на панелот за ли�та на пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Ширина на панелот за ли�та на пораки."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Увезување на Elm податоци"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm увезувач"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Увези пошта од Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Де�тинаци�ка папка:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Одбери папка за увезување"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увезувач на формат на папките на Berkeley Mailbox"
 
@@ -13203,7 +13920,7 @@ msgstr "Увезувач на формат на папките на Berkeley Mai
 msgid "Importing mailbox"
 msgstr "Увезувам �андаче"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увезување на „%s“"
@@ -13213,15 +13930,15 @@ msgstr "Увезување на „%s“"
 msgid "Scanning %s"
 msgstr "Скенирам %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Увезување на податоци од „Pine“"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Увезувач од „Pine“за Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Увези пошта од Pine."
 
@@ -13249,7 +13966,13 @@ msgstr "%s поштен�ка ли�та"
 msgid "Add Filter Rule"
 msgstr "Додај правило за филтер"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Мо�три:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13257,7 +13980,7 @@ msgstr[0] "%d одбрана, "
 msgstr[1] "%d одбрани, "
 msgstr[2] "%d одбрани, "
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13265,7 +13988,7 @@ msgstr[0] "%d избришана"
 msgstr[1] "%d избришани"
 msgstr[2] "%d избришани"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13273,7 +13996,7 @@ msgstr[0] "%d отпад"
 msgstr[1] "%d отпад"
 msgstr[2] "%d отпад"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13281,7 +14004,7 @@ msgstr[0] "%d �кица"
 msgstr[1] "%d �кици"
 msgstr[2] "%d �кици"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13289,7 +14012,7 @@ msgstr[0] "%d и�пратена"
 msgstr[1] "%d и�пратени"
 msgstr[2] "%d и�пратени"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13297,7 +14020,7 @@ msgstr[0] "%d неи�пратена"
 msgstr[1] "%d неи�пратени"
 msgstr[2] "%d неи�пратени"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13305,7 +14028,7 @@ msgstr[0] "%d непрочитана, "
 msgstr[1] "%d непрочитани, "
 msgstr[2] "%d непрочитани, "
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13313,83 +14036,92 @@ msgstr[0] "вкупно %d"
 msgstr[1] "вкупно %d"
 msgstr[2] "вкупно %d"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "�ова порака"
 
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порака"
 
-#: ../mail/mail-component.c:892
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Пишувај нова порака"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "�ова папка за пошта"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Папка за _пошта"
 
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Креирај нова папка за пошта"
 
-#: ../mail/mail-component.c:1047
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "�е може да �е надградат по�тавувањата за поштата или папките."
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Грешка"
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Грешки"
 
-#: ../mail/mail-component.c:1517
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Предупредувања и грешки"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Дебагирање"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Грешки, предупредувања и пораки за дебагирање"
 
-#: ../mail/mail-component.c:1628
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Логови за дебагирање"
 
-#: ../mail/mail-component.c:1632
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Покажувај _грешки во �тату�ната лента за"
 
-#: ../mail/mail-component.c:1639
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1745
+msgid "second(s)."
 msgstr "�екунди."
 
-#: ../mail/mail-component.c:1649
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Пораки за логирање:"
 
-#: ../mail/mail-component.c:1701
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "�иво на логирање"
 
-#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Време"
 
-#: ../mail/mail-component.c:1715 ../mail/message-list.c:2403
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Пораки"
 
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Затвори го прозорецов"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "Провери кои �е поддржани типови "
@@ -13403,7 +14135,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL не е поддржан во оваа верзија на Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Фотографија на и�праќач</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13484,73 +14216,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Печатени фонтови</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">По�тавувања за прок�и</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Потребни информации</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Безбедно�т</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">И�пратени и �кици пораки</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Конфигурација на �ервер</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Тип на _автентикација</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Менаџмент на �метки"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Додај _нов потпи�..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Додај _�крипта"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Се_когаш потпишувај појдовни пораки кога �е кори�ти оваа �метка"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Секогаш енкриптирај �а_м кога и�праќам енкриптирана пошта"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Секога_ш прави копија (cc) во:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Секо_гаш прави �лепа копија (bcc) во:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Секог_аш верувај им на клучевите во приврзокот кога енкриптираш"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Секогаш енкриптирај _�ам кога и�праќаш енкриптирана пошта"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "По_барај потврда за читање"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Прикачи оригинална порака"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "�втомат�ки вметни _�лики �о �мешковци"
@@ -13568,13 +14300,13 @@ msgid "C_haracter set:"
 msgstr "Е_нкодирање на знаци:"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "П_ровери �оп�твени хедери за отпад"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Про_вери кои �е поддржани типови"
 
+#: ../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 "Провери дали има отпад во _дојдовната пошта"
@@ -13636,18 +14368,18 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Дигитално _потпиши ги појдовните пораки (�тандардно)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "�е _ги обележувај пораките како отпад ако и�праќачот е во мојот адре�ар"
-
-#: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "�е ја форматирај �одржината на тек�тот во пораките, ако го_лемината на "
 "тек�тот преминува"
 
+#: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "�е _ги обележувај пораките како отпад ако и�праќачот е во мојот адре�ар"
+
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "�е цитирај оригинална порака"
+msgid "Do not quote"
+msgstr "�е цитирај"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13710,70 +14442,86 @@ msgid "HTML Messages"
 msgstr "HTML пораки"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "H_TTP прок�и:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Заглавја"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "О�ветли _цитати �о"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Внатре"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr "Внатрешна оригинална порака (во Outlook �тил)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Ознаки"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Табела �о јазици"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Конфигурација на пошта"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "Табела �о заглавја од пошта"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Локација на �андаче"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Пишувач на пораки"
 
-#: ../mail/mail-config.glade.h:105
+#: ../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:106
+#: ../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:107
+#: ../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 "Ор_ганизација:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../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."
@@ -13781,7 +14529,7 @@ msgstr ""
 "Ве молам, вне�ете опи�но име за оваа �метка во полето подолу.\n"
 "Ова име ќе �е кори�ти �амо за приказ."
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13790,7 +14538,7 @@ msgstr ""
 "�те �игурни, прашајте го Вашиот �и�тем админи�тратор или интернет "
 "провајдерот."
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13800,107 +14548,115 @@ msgstr ""
 "„Додатно“ од подолу не треба да �е пополнат, доколку не �акате информациите "
 "да �е вклучат во Вашите пораки."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Ве молам, одберете од �ледниве опции"
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "Из_ве�ти кога и�праќаш пораки дефинирани �амо �о примачи на „�лепа копија“"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Цитирај оригинална порака"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Запо_мни ја лозинката"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Од_говори на:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Запомни ја _лозинката"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "S_OCKS хо�т:"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "П_обарај фотографија од и�праќачот во локалните адре�ари"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "Одбе_ри..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "И_�прати потврда на порака:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "С_тандарден фонт:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Одберете фик�на ширина на HTML фонт"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Одберете фик�на ширина на HTML фонт за печатење"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Одбери променлива ширина на HTML фонт"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Одбери HTML променлива ширина на HTML фонт за печатење"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "И�праќам пошта"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Папка �о и�_пратени пораки:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Сер_верот бара автентикација"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Тип на �ервер: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Сертификат за по_тпи�:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "По_тпи�:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Потпи�и"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Табела �о потпи�и"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Проверка на правопи�"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Започнете �о _пишување на дното на одговорот"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "Т_ип: "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13908,7 +14664,7 @@ msgstr ""
 "Ли�тата на јазици овде �е одне�ува �амо на јазиците за кои имаш ин�талирано "
 "речник."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13918,11 +14674,7 @@ msgstr ""
 "потпи�. Името кое ќе го назначите ќе �е кори�ти \n"
 "�амо за приказ."
 
-#: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr "Оваа опција ќе биде препишана ако бидат пронајдени �оп�твени хедери за отпад."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13930,16 +14682,26 @@ msgstr ""
 "Вне�ете го името кое ќе �е одне�ува на оваа �метка.\n"
 "�а пример: „Работа“ или „Лично“"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "Кори�ничко _име:"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Кори�ти автен_тикација"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../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:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "П_роменлива ширина:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13949,100 +14711,124 @@ msgstr ""
 "\n"
 "Кликнете „�апред“ за да продолжите."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Додај потпи�"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Секогаш вчитувај �лики од Интернет"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "URL за _автомат�ка конфигурација на прок�и:"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Стандарден приклучок за отпад:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "_Директна вр�ка на Интернет"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "�е п_отпишувај барања за �о�таноци (за Outlook компатибилно�т)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Тип на препраќање:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Чувај го потпи�от над оригиналната порака кога реплицираш"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Вчитај �лики во пошта од контакти"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr "_Барај �амо во локалните адре�ари"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_�аправи ја оваа �метка �тандардна"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "_Рачна конфигурација на прок�и:"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Означи ги пораките како прочитани по�ле"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_�икогаш не вчитувај �лики од Интернет"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Патека:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Изве�ти кога и�праќаш HTML пораки на контакти кои не ги такви пораки"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Изве�ти кога и�праќаш HTML пораки на контакти кои не �акаат такви пораки"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Изве�ти кога и�праќаш пораки �о празна на�ловна линија"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Т_ип на одговор:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "_Безбедно HTTP прок�и:"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "Одбе_ри..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Покажи анимации"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Покажи ја фотографијата на и�праќачот во прегледот на е-поштата"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Смали ги заглавијата До / Копија / Слепа копија до"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Кори�ти безбедна вр�ка:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "Кори�ти _�тандардно"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Кори�ти ги и�тите фонтови како другите апликации"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "адре�и"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "опи�"
 
@@ -14082,43 +14868,43 @@ msgstr "_О�етливо на големина на букви"
 msgid "Co_mpleted"
 msgstr "За_вршено"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "П_ронајди:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Барај во пораката"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "По�тави знаме за �ледење"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Претплати на папки"
 
-#: ../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 "�ишто не е одбрано"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "С_ервер:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Информации за безбедно�т"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Одредени папки"
 
-#: ../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."
@@ -14126,23 +14912,23 @@ msgstr ""
 "Пораките кои ги одбравте за �ледење �е прикажани долу.\n"
 "Одберете акција за �ледење од „Знаме“ менито."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Прифати ја лиценцата"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_До:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Знаме:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Го прифаќам договорот за лиценца"
 
-#: ../mail/mail-folder-cache.c:823
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингувам %s"
@@ -14189,11 +14975,11 @@ msgstr "И�праќам порака %d од %d"
 msgid "Failed to send %d of %d messages"
 msgstr "�е може да �е и�пратат %d од %d пораки"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Откажано."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Завршено."
 
@@ -14211,63 +14997,68 @@ msgstr "Преме�тувам пораки во %s"
 msgid "Copying messages to %s"
 msgstr "Копирам пораки во %s"
 
-#: ../mail/mail-ops.c:1161
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Препратени пораки"
 
-#: ../mail/mail-ops.c:1202
+#: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отворам папка %s"
 
-#: ../mail/mail-ops.c:1267
+#: ../mail/mail-ops.c:1270
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Информации за квотата на папката %s"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Отворам �ме�тување %s"
 
-#: ../mail/mail-ops.c:1338
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "От�транувам папка %s"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сме�тувам папка „%s“"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Уништувам и �ме�тувам �метка „%s“"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Сме�тувам �метка „%s“"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "О�вежувам папка"
 
-#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Уништувам папка"
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празнам ѓубре во „%s“"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Локални папки"
 
-#: ../mail/mail-ops.c:1711
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Примам порака %s"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14275,15 +15066,15 @@ msgstr[0] "Собирам порака %d"
 msgstr[1] "Собирам пораки %d"
 msgstr[2] "Собирам пораки %d"
 
-#: ../mail/mail-ops.c:1903
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Зачувувам %d порака"
 msgstr[1] "Зачувувам %d пораки"
 msgstr[2] "Зачувувам %d пораки"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14292,11 +15083,11 @@ msgstr ""
 "Грешка при зачувување пораки во: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2045
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Зачувувам приврзок"
 
-#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14305,51 +15096,52 @@ msgstr ""
 "�е може да �е креира излезна датотека:%s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2073
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�е може да �е запишат податоците: %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Одврзи �е од %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторно врзи �е на %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Ја подготвувам �метката „%s„ за офлајн работење"
 
-#: ../mail/mail-ops.c:2401
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Проверувам �ерви�"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Откажувам..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "И�прати и прими пошта"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Откажи _��"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Се ажурирам..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: ../mail/mail-send-recv.c:792
+#: ../mail/mail-send-recv.c:799
+#, c-format
 msgid "Checking for new mail"
 msgstr "Проверувам дали има нова пошта"
 
@@ -14376,17 +15168,17 @@ msgstr "Вне�и лозинка"
 msgid "User canceled operation."
 msgstr "Кори�никот ја откажа операцијата."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Уреди го потпи�от"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Зачувај и излези"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Вне�и име за овој потпи�."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Уреди го потпи�от"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Име:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "Име на _потпи�:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14427,25 +15219,25 @@ msgstr "Ги ажурирам папките за пребарување за â€
 msgid "Updating Search Folders for '%s'"
 msgstr "Ги ажурирам папките за пребарување за „%s“"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Уреди ја папката за пребарување"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "�ова папка за пребарување"
 
 #: ../mail/mail.error.xml.h:1
-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 "Папката �о име „{0}“ веќе по�тои. Ве молам, кори�тете друго име."
 
 #: ../mail/mail.error.xml.h:2
-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 "Папката �о име „{1}“ веќе по�тои. Ве молам, кори�тете друго име."
 
 #: ../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."
@@ -14457,16 +15249,16 @@ 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 ""
 "Изве�тување за потврда за читање е побарано за „{1}“. И�прати изве�тување за "
 "потврдата на {0}?"
 
 #: ../mail/mail.error.xml.h:7
 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 "Веќе по�тои потпи� �о име „{0}“. Ве молам, кори�тете друго име."
 
 #: ../mail/mail.error.xml.h:8
@@ -14504,10 +15296,8 @@ msgstr ""
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"Сигурно �акате трајно да ги от�траните �ите избришани пораки во папката "
-"„{1}“?"
+"folder \"{0}\"?"
+msgstr "Дали �игурно �акате трајно да ги от�траните �ите избришани пораки во папката „{0}“?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14522,11 +15312,11 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Дали �игурно �акате да и�пратите порака без тема?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "Поради „{0}“."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "Поради „{2}“."
 
 #: ../mail/mail.error.xml.h:21
@@ -14534,15 +15324,15 @@ msgid "Blank Signature"
 msgstr "Празен потпи�"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "�е можам да ја додадам папката за пребарување „{0}“."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "�е може да �е копира папката „{0}“ во „{1}“"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "�е може да �е копира папката „{0}“ во „{1}“."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "�е може да �е креира папката „{0}“."
 
 #: ../mail/mail.error.xml.h:25
@@ -14550,53 +15340,52 @@ msgid "Cannot create temporary save directory."
 msgstr "�е може да �е креира привремена папка за зачувување."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "�е може да �е креира папка за зачувување, поради „{1}“"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "�е може да �е избрише папката „{0}“"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "�е може да �е избрише папката „{0}“."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "�е може да �е избрише �и�тем�ката папка „{0}“."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "�е можам да ја уредам папката за пребарување „{0}“, бидејќи не по�тои."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "�е може да �е преме�ти папката „{0}“ во „{1}“."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "�е може да �е отвори изворот „{1}“"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "�е може да �е отвори изворот „{2}“."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "�е може да �е отвори целта „{2}“."
 
 #: ../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 ""
 "�е може да �е прочита датотеката �о лиценца „{0}“, поради грешка во "
 "ин�талацијата. �ема да можете да го кори�тите овој провајдер додека не ја "
 "прифатите неговата лиценца."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "�е може да �е преименува „{0}“ во „{1}“."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "�е може да �е преименува или преме�ти �и�тем�ката папка „{0}“."
 
 #: ../mail/mail.error.xml.h:37
@@ -14604,18 +15393,22 @@ msgid "Cannot save changes to account."
 msgstr "�е може да �е зачуваат промените на �метката."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "�е може да �е зачува во папката „{0}“."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "�е може да �е зачува во датотеката „{0}“."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "�е може да �е по�тави �крипта за потпи� „{0}“."
 
 #: ../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."
@@ -14623,46 +15416,42 @@ msgstr ""
 "Проверете дали вашата лозинка е точно напишана. Запомнете дека многу лозинки "
 "�е о�етливи на голема буква; caps lock можеби е вклучен."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "�е може да �е зачува датотеката �о потпи�."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
 msgstr "Да го избришам „{0}“?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Да ја избришам �метката?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Да ги избришам пораките во папката за пребарување &quot;{0}&quot;?"
-
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Да ги избришам пораките во папката за пребарување „{0}“?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Да ги избришам пораките во папката за пребарување?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Да ги отфрлам промените?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "�е б_риши"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "�е бриши"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "�е оневозможувај"
 
-#: ../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 "
@@ -14768,34 +15557,26 @@ msgid "Mark all messages as read"
 msgstr "Означи ги �ите пораки како прочитани"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Да ги означам �ите пораки во �ите потпапки како прочитани?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "�едо�та�ува папка."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "�ема одбрано извори."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Само во _тековната папка"
-
-#: ../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."
@@ -14803,7 +15584,7 @@ msgstr ""
 "Ве молам, вне�ете валидна адре�а во полето До:. Може да барате адре�и за е-"
 "пошта �о кликнување на копчето До: по�ле полето за вне�ување."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14812,34 +15593,42 @@ msgstr ""
 "О�игурајте �е дека �ледните примачи �акаат и можат да примаат HTML пораки:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Ве молам, �оздадете уникатно име да го идентификувате овој потпи�."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Ве молам, почекајте."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблем при мигрирање на папките �о �тара пошта „{0}“."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Пуштам барање до �ерверот"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Барам ли�та од �ерверот за поддржани механизми."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Побарана е потврда за читање."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Да ја избришам папката „{0}“ и �ите нејзини потпапки?"
 
+#: ../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 "Пребарувањето на папките �е ажурира автомат�ки."
@@ -14889,7 +15678,7 @@ 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 ""
 "Следниве папки за пребарување:\n"
@@ -14903,7 +15692,7 @@ 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 ""
 "Следниве филтер правило/а:\n"
@@ -15019,7 +15808,7 @@ msgstr ""
 "�ите далечни папки, или и двете."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Вашето најавување на �ерверот „{0}“ како „{0}“ не у�пеа."
 
 #: ../mail/mail.error.xml.h:135
@@ -15042,22 +15831,22 @@ msgstr "_Уништи"
 msgid "_Open Messages"
 msgstr "_Отвори пораки"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "на тековните папки и _потпапки"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "�евидени"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Видени"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Одговорени"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Препратено"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Повеќе невидени пораки"
@@ -15082,37 +15871,50 @@ msgstr "Пови�око"
 msgid "Highest"
 msgstr "�ајви�око"
 
-#: ../mail/message-list.c:1611 ../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:1618 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Дене� %l:%M %p"
 
-#: ../mail/message-list.c:1627 ../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 "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1639 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1647 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3846
+#. 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
 msgid "Generating message list"
 msgstr "Генерирам ли�та на пораки"
 
+#: ../mail/message-list.c:4223
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"�и една порака не ги задоволува Вашите критериуми. Почнете ново пребарување или "
+"променете ги."
+
+#: ../mail/message-list.c:4225
+msgid "There are no messages in this folder."
+msgstr "�ема пораки во оваа папка."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "До"
@@ -15142,39 +15944,39 @@ msgstr "И�пратени пораки"
 msgid "Size"
 msgstr "Големина"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Јави"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "�е препраќај"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Про�леди"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "За ваша информација"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Препрати"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "�е е потребен одговор"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Одговори на �ите"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Преглед"
 
@@ -15199,6 +16001,10 @@ msgid "Subject contains"
 msgstr "Темата �одржи"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Темата или и�праќачот �одржи"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Тема или и�праќач �одржи"
 
@@ -15211,14 +16017,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Овозможува функционално�т за локални адре�ари."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Вклучи приклучок за пот�етник за приврзоци"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Вклучи приклучок за пот�етник за приврзоци."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15226,7 +16024,7 @@ msgstr ""
 "Ли�та на траги за приклучокот пот�етник за приврзоци кој што го пребарува "
 "телото на пораката"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15234,14 +16032,11 @@ msgstr ""
 "Ли�та на траги за приклучокот пот�етник за приврзоци кој што го пребарува "
 "телото на пораката."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Клучни зборови"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Пот�ети _ако недо�та�ува приврзок"
-
 #: ../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"
@@ -15267,9 +16062,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Пораката нема приврзоци"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Продолжи �о уредување"
+#: ../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 ""
@@ -15283,27 +16078,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Внатрешен аудио додаток"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Одберете име за резервната датотека на Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Ре�тартирај го Evolution по�ле правењето �игурно�на копија"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Одберете го името на резервната датотека за враќање"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "_Ре�тартирај го Evolution по�ле враќањето"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Врати од �игурно�на копија"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15314,97 +16109,121 @@ msgstr ""
 "И�то така, ќе ви бидат вратени �ите Ваши лични по�тавувања, филтри за пошта "
 "итн."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "_Поврати го Evolution од резервна датотека"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Ве молам, одберете архива за Evolution за враќање:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Одберете датотека за враќање"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Evolution папка за бекап"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Evolution папка за враќање"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Провери бекап за Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Ре�тартирај го Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Со графички кори�нички интерфеј�"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Го и�клучувам Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Правам бекам од �метките и по�тавувањата на Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Правам бекап од податоците на Evolution (пошти, контакти, календари, задачи, "
 "меморандуми)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Правењето бекап заврши"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Evolution �е ре�тартира"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "�аправи бекап на тековните податоци на Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Ги отпакувам датотеките од бекапот"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Ги вчитувам по�тавувањата на Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Ги от�транувам привремените бекап датотеки"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "О�игурување на локалните извори"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Правам резерва во папката %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Враќам од папката %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Бекап за Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "�аправи бекап на податоците на Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Ве молам, почекајде додека Evolution прави бекап на Вашите податоци."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Ги враќам податоците на Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Ве молам, почекајте додека Evolution ги враќа Вашите податоци."
+
+#: ../plugins/backup-restore/backup.c:516
+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 "Додаток за правење бекап и враќање на Evolution податоци и по�тавувања."
@@ -15435,14 +16254,22 @@ 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 "�евалидна резервна датотека за Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Ве молам, одберете валидна резервна датотека за Evolution."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15469,37 +16296,35 @@ msgstr "В_рати по�тавувања..."
 msgid "_Backup Settings..."
 msgstr "_Резервни по�тавувања..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�втомат�ки контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "_�втомат�ки креирај запи�и во адре�арот кога одговараш на порака"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изберете адре�ар за автомат�ки контакти"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Контакти за ин�тант пораки"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Повремено �инхронизирај информации и �лики од ли�тата �о пријатели на Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Изберете адре�ар за контактите од Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Синхронизрај �о ли�тата на к_онтакти �ега"
 
@@ -15517,7 +16342,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:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Се �лучи грешка при %s: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Bogofilter проце�от не одговара. Го уништувам..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "Чекањето за Bogofilter е прекинато Го уништувам..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Каналот до Bogofilter не у�пеа. Код на грешката: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Конвертирај го тек�тот од поштата во _уникод"
 
@@ -15538,20 +16384,25 @@ msgid "Bogofilter Options"
 msgstr "Опции за Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter приклучок за отпад"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Филтрирај ги отпадните пораки �о помош на Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Кори�ти _SSL"
 
@@ -15571,17 +16422,18 @@ msgstr "Локални календари"
 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:375
-msgid "_Refresh:"
-msgstr "_О�вежување:"
+#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "О�_вежи:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Безбедно поврзување"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Кори�ничко _име:"
 
@@ -15681,14 +16533,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Дали �акате да го направите Evolution �тандарден клиент за е-пошта?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Означи како �тан_дардна папка"
+msgid "Mark as _default address book"
+msgstr "Означи како �тан_дарден именик"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Означи како �тан_дарден календар"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Означи како �тан_дардна ли�та на задачи"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Означи како �тан_дардна ли�та на меморандуми"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15702,6 +16565,54 @@ msgstr ""
 "Овозможува функционално�т за обележување календар или адре�ар како "
 "�тандарден."
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "_Прилагодени заглавија"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Клуч"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 ""
+"Форматот за прилагодено заглавие �е одредува �о клучот:\n"
+"Имимњата на прилагодените заглавија �е разделуваат �о „;“."
+
+#: ../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 "Отвори папка на друг кори�ник"
@@ -15719,12 +16630,12 @@ msgid "_User:"
 msgstr "_Кори�ник:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Безбедна лозинка"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15732,11 +16643,11 @@ msgstr ""
 "Оваа опција �е поврзува �о Exchange �ерверот кори�тејќи безбедна "
 "автентикација на лозинка (NTLM) ."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Лозинка �о обичен тек�т"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -15744,11 +16655,11 @@ msgstr ""
 "Оваа опција �е поврзвуа �о Exchange �ерверот кори�тејќи �тандардна "
 "автентикација на тек�т лозинка."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "�адвор од канцеларија"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15756,78 +16667,83 @@ msgstr ""
 "Пораката назначена долу автомат�ки ќе �е и�прати на\n"
 "�екоја лично�т која и�праќа пошта до до ва� кога �те надвор од канцеларија."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Ја� �ум надвор од канцеларија"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Ја�у �ум во канцеларија"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Смени ја лозинката за Exchange �метката"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Смени лозинка"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Уреди ги по�тавувања за делегирање за Exchange �метката"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Помагач за делегирање"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Разно"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Види ја големината на �ите Exchange папки"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Големина на папки"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "По�тавувања за Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "�_втентикација"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Поштен�ко �андаче:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Тип на _автентикација"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Про_вери кои �е поддржани типови"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:974
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:976
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
@@ -15843,7 +16759,7 @@ 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:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -15851,7 +16767,7 @@ msgstr ""
 "Тековната лозинка не е и�та �о онаа за вашата �метка. Вне�ете ја точната "
 "лозинка"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Двете лозинки не �е �овпаѓаат. Повторно вне�ете ги лозинките."
 
@@ -15876,33 +16792,33 @@ msgstr "Тековната лозинка е и�течена. Ве молам,
 msgid "Your password will expire in the next %d days"
 msgstr "Вашата лозинка ќе и�тече во �ледните %d дена"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Прилагодено"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Уредувач (читање, креирање, уредување)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "�втор (читање, креирање)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Прегледувач (�амо читање)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Привилегии за делегирање"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Перми�ии за %s"
@@ -15910,7 +16826,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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15920,66 +16836,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Како и да е, немате дозвола да ги гледате моите приватни предмети."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "�азначени �те за делегат на %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Прене�и на:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "От�трани го делегатот %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "�е може да �е при�тапи до Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "�е може да �е пронајдам �ебе �и во активната папка"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "�е може да �е пронајде делегираниот %s во Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "�е може да �е от�трани делегатот %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "�е може да �е ажурира ли�татата на делегати."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "�е може да �е додаде делегатот %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Грешка при читање на ли�тата на делегати."
 
@@ -16027,20 +16943,25 @@ msgstr "_Сумаризирај перми�ии"
 msgid "_Tasks:"
 msgstr "_Задачи:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Перми�ии..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Име на папка"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Големина на папка"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "Кори�ник"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Претплати �е на друга папка"
@@ -16049,20 +16970,20 @@ msgstr "Претплати �е на друга папка"
 msgid "Exchange Folder Tree"
 msgstr "Дрво �о Exchange папки"
 
-#: ../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:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Откажи претплата за папка..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Дали нави�тина да ја откажам претплатата за папката „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Откажи претплата од „%s“"
@@ -16127,15 +17048,18 @@ msgstr "Вашата лозинка ќе и�тече за 7 дена..."
 msgid "_Change Password"
 msgstr "_Смени Лозинка"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(�едозволен при�тап.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Додај кори�ник:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../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
 msgid "Add User"
 msgstr "Додај кори�ник"
 
@@ -16257,11 +17181,11 @@ msgstr "_Кори�ник"
 msgid "button-user"
 msgstr "копче-кори�ник"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Одбери кори�ник"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "�дре�ар..."
 
@@ -16275,11 +17199,9 @@ msgstr "Претплати �е на календар на друг кори�н
 
 #: ../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 ""
-"Додаток кој �е �правува �о колекција на одредени операции и опции на "
-"Exchange �метки."
+msgstr "Приклучок кој �е �правува �о Exchange операции."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16368,10 +17290,14 @@ msgid "Could not update out-of-office state"
 msgstr "�е може да �е ажурира out-of-office �о�тојба"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Evolution бара ре�тартирање за да �е вчита поштен�кото �андаче на кори�никот"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange �метката е офлајн."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16399,32 +17325,32 @@ msgstr ""
 "{0}\n"
 ".."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "�е може да �е ажурира делегирањето:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Папката веќе по�тои"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Папката не по�тои"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Папката е офлајн"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Општа грешка"
 
-#: ../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 "Global Catalog �ерверот не е до�тапен"
 
-#: ../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."
@@ -16432,75 +17358,75 @@ msgstr ""
 "�ко ОWA работи на различна патека, мора да го назначите тоа во дијалогот за "
 "конфигурација на �метката."
 
-#: ../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 "Сандачето за {0} не е на овој �ервер."
 
-#: ../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 "О�игурајте �е дека URL-то е точно и обидете �е повторно."
 
-#: ../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 "�ема конфигурирано Global Catalog �ервер за оваа �метка."
 
-#: ../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 "�ема �андаче за кори�никот {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "�ема таков кори�ник {0}"
 
-#: ../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 ""
 "Ве молам вне�ете го ID-то за делегатот или и�клучете ја опцијата за праќање "
 "како делегат."
 
-#: ../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 "Ве молам, о�игурајте �е дека името на Global Catalog �ерверот е точно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Ве молам ре�тартирајте го Evolution за промените да �тапат во �ила"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Ве молам одберете кори�ник."
 
-#: ../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 "Exchange �метката ќе биде и�клучена кога ќе го и�клучите Evolution"
 
-#: ../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 "Exchange �метката ќе биде от�транета кога ќе го и�клучите Evolution"
 
-#: ../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 "Exchange �ерверот не е компатибилен �о Exchange Connector."
 
-#: ../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."
@@ -16508,7 +17434,7 @@ msgstr ""
 "Овој �ервер работи под Exchange 5.5 Exchange Connector \n"
 "поддржува �амо Microsoft Exchange 2000 и 2003."
 
-#: ../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"
@@ -16522,57 +17448,58 @@ msgstr ""
 "\n"
 "Или можеби �амо погрешно да е вне�ена лозинката."
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "�е може да �е додаде кори�никот за при�тап на контролната ли�та:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "�е може да �е уреди делегирањето."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "�епозната грешка при барање на {0}"
 
-#: ../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:597
 msgid "Unknown error."
 msgstr "�епозната грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "�епознат тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "�еподдржана операција"
 
-#: ../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 "Можете да конфигурирате �амо една Exchange �метка."
 
-#: ../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."
@@ -16580,7 +17507,7 @@ msgstr ""
 "Тековната и�кори�тено�т е: {0} KB. Обидете �е да о�лободите ме�то �о бришење "
 "на пошта."
 
-#: ../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."
@@ -16588,7 +17515,7 @@ msgstr ""
 "Тековната и�кори�тено�т е: {0} KB. Сега не можете да примате и и�праќате "
 "пошта."
 
-#: ../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."
@@ -16596,19 +17523,19 @@ msgstr ""
 "Тековната и�кори�тено�т е: {0}KB. �е можете да примате и и�праќате пошта �� "
 "додека не о�лободите ме�то т.е избришете пораки."
 
-#: ../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 "{0} не може да �е додаде на контролна ли�та за при�тап"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} веќе е делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} веќе е во ли�тата"
 
@@ -16620,6 +17547,14 @@ msgstr "Претплати �е на задачи на друг кори�ник
 msgid "Check folder permissions"
 msgstr "Провери привилегии за папки"
 
+#: ../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 "
@@ -16633,23 +17568,57 @@ msgstr ""
 msgid "External Editor"
 msgstr "�адворешен уредувач"
 
+#: ../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 "Evolution не може да креира привремена датотека за �кладирање на Вашата пошта. Пробајте подоцна."
+
+#: ../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 "Со�тавувај пораки во надворешен уредувач"
+msgid "Compose in _External Editor"
+msgstr "Со�тави во _надворешен уредвач"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Со�тавувај пораки �о кори�тење на надворешен уредувач"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "Команда која ќе �е изврши за пуштање на уредувач на тек�т: "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"За Emacs кори�тете „xemacs“\n"
+"За VI кори�тете „gvim“"
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Изберете (48*48) png �о големина < 700bytes"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG датотеки"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Фаца"
 
@@ -16659,9 +17628,9 @@ msgid ""
 "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 ""
-"Прикажи заглавје �о „фаца“ на појдовните пораки. Првиот пат кори�никот треба да "
-"конфигурира png �лика �о димензии 48*48. Енкодирана е �о base64 и �е чува во "
-"~/.evolution/faces. Ова ќе �е кори�ти во е-поштите кои ќе �е и�праќаат во "
+"Прикажи заглавје �о „фаца“ на појдовните пораки. Првиот пат кори�никот треба "
+"да конфигурира png �лика �о димензии 48*48. Енкодирана е �о base64 и �е чува "
+"во ~/.evolution/faces. Ова ќе �е кори�ти во е-поштите кои ќе �е и�праќаат во "
 "иднина."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
@@ -16687,20 +17656,54 @@ msgstr "Откажи претплата од папките"
 msgid "_Unsubscribe"
 msgstr "_Откажи претплата"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:493
+msgid "Please enter user name first."
+msgstr "Ве молам, прво вне�ете име."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Вне�ете лозикнка за кори�никот %s за при�тап на ли�та на претплатени календари."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"�е можам да читам податоци од Google �ервер.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "Кален_дар:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+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 "<b>Сервер</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Додаток за по�тавување на google календар."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Приклучок за по�тавување на google календар и контакти."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google извори"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Ли�та за проверка"
 
@@ -16712,7 +17715,7 @@ msgstr "Додаток за поÑ�тавуање на групен календÐ
 msgid "Groupwise Account Setup"
 msgstr "По�тавувања за Groupwise �метка"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16737,11 +17740,11 @@ msgstr ""
 "Кликнете „�апред“ за да ја ин�талирате �поделената папка\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Ин�талирај ја �поделената папка"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Ин�талирање на �поделена папка"
 
@@ -16780,10 +17783,22 @@ msgid "_Junk List"
 msgstr "_Ли�та на отпад"
 
 #: ../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 "Пораката у�пешно �е �обра"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Собирам пошта"
 
@@ -16791,12 +17806,6 @@ msgstr "Собирам пошта"
 msgid "Add Send Options to groupwise messages"
 msgstr "Додај опции за и�праќање на groupwise пораки"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Опции за и�праќање"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Додаток за опциите во Groupwise �метки."
@@ -16805,6 +17814,71 @@ msgstr "Додаток за опциите во Groupwise �метки."
 msgid "Groupwise Features"
 msgstr "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 "�евалиден кори�ник"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "�е може да му �е даде прок�и при�тап на кори�никот &quot;{0}&quot;"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+msgid "You have already given proxy permissions to this user."
+msgstr "Веќе имате дадено прок�и перми�ии на овој кори�ник."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "Сметката {0}“ веќе по�тои. Ве молам, проверете го вашето дрво на папки."
+
+#: ../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 "Прок�и најавата како &quot;{0}&quot; беше неу�пешна. Проверете ја Вашата адре�а за е-пошта и обидете �е пак."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "�аправи го овој �о�танок повторувачки"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "Дали �акате да прифатите?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "Мора да одредите кори�ничко име на кое што �акате да ја додадете ли�тата."
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "Делумно прифати"
@@ -16903,9 +17977,9 @@ msgstr "<b>Име на �метка</b>"
 msgid "Proxy Login"
 msgstr "Прок�и најава"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16914,20 +17988,20 @@ msgstr "%sВне�и лозинка за %s (кори�ник %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Прок�и најава..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Прок�и јазичето ќе биде до�тапно �амо кога �метката е вклучена."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Прок�и јазичето ќе биде до�тапно �амо кога �метката е вклучена."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Кори�ници"
 
@@ -16943,11 +18017,15 @@ msgstr "�ова _�поделена папка..."
 msgid "Sharing"
 msgstr "Споделување"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Соп�твено изве�тување"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Додај   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Измени"
 
@@ -17012,11 +18090,11 @@ msgstr "Додаток да прилагоди hula календарÑ�ки изÐ
 msgid "Hula Account Setup"
 msgstr "По�тавување на Hula �метка"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Прилагодени заглавија"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP заглавја"
 
@@ -17070,28 +18148,28 @@ msgstr "Додаток за карактериÑ�тиките во IMAP Ñ�метÐ
 msgid "IMAP Features"
 msgstr "IMAP карактери�тики"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "Увез_и во Календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "Увез_и во задачи"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "Увези ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "Избери ли�та �о задачи"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "Избери календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:262
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Увези"
 
@@ -17129,8 +18207,8 @@ msgstr ""
 "Evolution не најде iPod �о кој ќе �е �инхронизира. Или не е поврзан �о "
 "�и�темот или не е приклучен."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar формат (.ics)"
 
@@ -17146,142 +18224,142 @@ msgstr "Синхронизирај �о iPod"
 msgid "iPod Synchronization"
 msgstr "iPod �инхронизација"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "�е може да �е отвори календарот „%s“."
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "�екој дел во календарот „%s“ има конфликт �о овој �о�танок"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "�ајден е делот во календарот „%s“."
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "�е можам да најдам календари"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "�е можам да го најдам �о�танокот во овој календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "�е можам да ја најдам оваа задача во ли�тата �о задачи"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "�е можам да го најдам овој мемоар во ли�тата �о мемоари"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Пребарувам по�тоечка верзија на ова по�тавување"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "�е може да �е пар�ира предметот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "�е може да �е и�прати предмет во календарот „%s“.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "И�пратено во календарот „%s“ како прифатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "И�пратено во календарот „%s“ како неприфатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "И�пратено во календар „%s“ како неприфатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "И�пратено во календар „%s“ како откажано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организерот го от�трани делегатот %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "И�пратено е изве�тување за отказ на делегатот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "�е можам да и�пратам изве�тување за отказ на делегатот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Стату�от на по�етителот не може да биде ажуриран заради неважечки �тату�!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "�е може да �е ажурира по�етителот. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Стату�от на по�етителот е ажуриран"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Информациите за �о�танокот �е и�пратени"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Информациите за задачата �е и�пратени"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Информациите за мемоарот �е и�пратени"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "�е у�пеав да ги и�пратам информациите за �о�танокот, �о�танокот не по�тои"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "�е можам да најдам информација за задачата, оваа задача не по�тои"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "�е у�пеав да ги и�пратам информациите за мемоарот, мемоарот не по�тои"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Прикачениот календар не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Пораката тврди дека �одржи календар, но календарот не е валиден iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Предметот во календарот не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17289,11 +18367,11 @@ msgstr ""
 "Пораката �одржи календар, но календарот не �одржи на�тани, задачи или "
 "�лободно/зафатено информации"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Прикачениот календар �одржи повеќе предмети"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17301,227 +18379,227 @@ msgstr ""
 "За проце�ирање на �ите предмети, датотеката треба да �е зачува и календарот "
 "да �е увезе"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2133
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Со�танок �е повторува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2136
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Задачата �е повторува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2139
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Мемоарот �е повторува"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2354
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Избриши ја пораката по делувањетп"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2364
-#: ../plugins/itip-formatter/itip-formatter.c:2396
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Пребарување конфликти"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2379
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Одбери ги календарите за барање на конфликтни �о�таноци"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Дене�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Дене� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Дене� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Дене� %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Утре"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Утре %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Утре %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Утре %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Утре %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Ве молам одговорете во име на <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Примено во име на <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> преку %s ги објави �ледниве информации од �о�танокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ги објави �ледниве информации од �о�танокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> го делегираше �ледниов �о�танок за ва�:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> преку %s бара ваше при�у�тво на �ледниов �о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> бара ваше при�у�тво на �ледниов �о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> преку %s �ака да додаде на по�тоечки �о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> �ака да додаде на по�тоечки �о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17530,87 +18608,87 @@ msgstr ""
 "<b>%s</b> �ака преку %s да ги добие најновите информации за �ледниов "
 "�о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> �ака да ги добие најновите информации за �ледниов �о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> преку %s го и�прати назад �ледниов одговор за �о�танокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> го и�прати назад �ледниов одговор за �о�танокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> преку %s го откажа �ледниов �о�танок:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> го откажа �ледниот �о�танок."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> преку %s ги предложи �ледниве промени на �о�танокот."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ги предложи �ледниве промени на �о�танокот."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> преку %s ги отфрли �ледниве промени на �о�танокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ги отфрли �ледниве промени на �о�танокот."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> преку %s ја објави �леднава задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>  ја објави �леднава задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> бара доделување на %s на �леднава задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> преку %s ви додели задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ви додели задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> преку %s �ака да додаде на по�тоечка задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> �ака да додаде на по�тоечка задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17619,134 +18697,134 @@ msgstr ""
 "<b>%s</b> преку %s �ака да ги добие најновите информации за �леднава "
 "доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> �ака да ги добие најновите информации за �леднава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> преку %s го и�прати назад �ледниов одговор за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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>го и�прати назад �ледниов одговор за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> преку %s ја откажа �леднава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ја откажа �леднава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> преку %s ги предложи �ледниве промени за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ги предложи �ледниве промени за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> преку %s ја отфрли �леднава зададена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ја отфрли �леднава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> преку %s го објави �ледниов меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> го објави �ледниов меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> преку %s �ака да додаде на по�тоечки меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> �ака да додаде на по�тоечки меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> преку %s го откажа �ледниов �поделен меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> го откажа �ледниов �поделен меморандум:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Отвори календар"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Одбиј"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Прифати"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "Одбиј _�е"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Сите пробни"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Пробен"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Прифати �е"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_И�прати информации"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_�журирај го �тату�от на одговарачот"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_�адградба"
 
@@ -17849,9 +18927,11 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Генерира D-BUS порака кога при�тигнува нова пошта."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"�ко е штиклирано, тогаш �вирни, инаку ќе �е пушти звучна датотека кога ќе "
+"�ко е „true“, тогаш �вирни, инаку ќе �е пушти звучна датотека кога ќе "
 "при�тигне нова порака."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17900,8 +18980,16 @@ msgstr "Дали да извеÑ�тувам за нови пораки Ñ�амо Ð
 msgid "Generate a _D-Bus message"
 msgstr "Генерирај _D-Bus порака"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Изве�тување за нова порака на Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17919,7 +19007,7 @@ msgstr[2] ""
 "Примивте %d нови пораки\n"
 "во %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -17927,48 +19015,48 @@ msgstr[0] "Примивте %d нова порака."
 msgstr[1] "Примивте %d нови пораки."
 msgstr[2] "Примивте %d нови пораки."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "�ова е-пошта"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Покажи икона во ме�тото за _изве�тување"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "Тр_епкачка икона во ме�тото за изве�тување"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Скокачка _порака заедно �о иконата"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr ")Пушти звучна датотека кога при�тигнува нова пошта"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Бипни"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Пушти _звучна датотека"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "�азначи _име на датотека:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Одберете звучна датотека"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Пу_шти"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Изве�тувај за нови пораки �амо во _�андачето"
 
@@ -18115,7 +19203,7 @@ msgstr "Да ја иÑ�пратам eлектронÑ�ката порака на Ð
 #: ../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 ""
@@ -18196,6 +19284,24 @@ msgstr "_Претплати �е на ли�тата"
 msgid "_Unsubscribe from List"
 msgstr "_Откажи претплата од ли�тата"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Also mark messages in subfolders?"
+msgstr "Да ги означам пораките во потпапките?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+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:162
+msgid "Current Folder and _Subfolders"
+msgstr "Тековната папка и _потпапки"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "Само тековна _папка"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Означи ги �ите како _прочитани"
@@ -18238,7 +19344,7 @@ msgstr "Додаток за тоа кои додатоци �е вклучени
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Менаџер на додатоци"
 
@@ -18250,33 +19356,24 @@ msgstr "Вклучи и и�клучи додатоци"
 msgid "_Plugins"
 msgstr "_Додатоци"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "�втор(и)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Опи�"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Конфигурација"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Забелешка: �екои промени нема да �е применат додека не �е ре�тартира"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Преглед"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Конфигурација"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "�ема опции за конфигурација на овој приклучок."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Додаток"
 
@@ -18301,41 +19398,22 @@ msgstr "Тек�туален режим"
 msgid "Prefer plain-text"
 msgstr "Претпочита обичен тек�т"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Покажи HTML ако е при�утно"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Претпочита тек�т"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Само �екогаш покажи тек�т"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML _режим"
 
-#: ../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 "Печати порака"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Преглед за пе_чатење"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Ја печати оваа порака"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution профил менаџер"
@@ -18360,13 +19438,7 @@ msgstr "Локации"
 msgid "_Publish Calendar Information"
 msgstr "Објави информации за календар"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Вне�и ја лозинката за „%s“"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Сигурно �акате да го избришете овој URL?"
 
@@ -18454,15 +19526,75 @@ msgstr ""
 "iCal\n"
 "Слободен/зафатен"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Те�тови за вчитувачот на Python приклучоци."
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Те�т приклучок за Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Те�т приклучок за вчитувачот за Python - EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Приклучок кој вчитува други приклучоци �о кори�тење на python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Вчитувач за Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (вграден)"
 
-#: ../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:134
+#, 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
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "�е у�пеав да креирам канал: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Грешка по�ле fork: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "Проце�от SpamAssassin не одговара..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "Чекам проце�от на Spamassassin да �е прекине..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "Каналот до SpamAssassin не у�пеа, код на грешка: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin не е до�тапен."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Ова ќе го направи Spamassasin подобар, но побавен"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "Вк_лучи далечни те�тови"
 
@@ -18488,7 +19620,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:314
 msgid "Save attachments"
 msgstr "Зачувај приврзоци"
 
@@ -18500,16 +19632,15 @@ msgstr "Зачувај ги приврзоците..."
 msgid "Save all attachments"
 msgstr "Зачувај ги �ите приврзоци"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Одбери базно име за зачувување"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "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:347
 msgid "Save"
 msgstr "Зачувај"
 
@@ -18517,79 +19648,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Ли�та �о опи�"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Ли�та на категории"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Ли�та на коментари"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Креирано"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Ли�та на контакти"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Старт"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Крај"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "проценти готово."
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL:"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Ли�та на по�етители"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Изменето"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "�апредни опции за CSV форматот"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Вметни заглавие"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Разграничувач на вредно�т:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Разграничувач на запи�и:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Пополни вредно�ти �о:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Формат на вредно�т разделена �о запирка (.csv)"
 
@@ -18610,15 +19741,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:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF формат (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Одбери де�тинаци�ка датотека"
 
@@ -18643,22 +19774,22 @@ msgid "Show _only this Task List"
 msgstr "Покажи �амо ја _оваа ли�та �о задачи"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Додаток кој �е �правува �о почетниот волшебник."
+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 "Волшебник за �тартување"
+msgid "Setup Assistant"
+msgstr "��и�тент за по�тавување"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution а�и�тент за по�тавувања"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Добредојдовте"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18671,28 +19802,29 @@ msgstr ""
 "\n"
 "Кликнете на копчето „�апред“ за да продолжите."
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Увезувам датотеки"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "Ве молам, одберете ги информациите кои �акате да ги увезете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
+#, c-format
 msgid "Importing data."
 msgstr "Увезувам податоци."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Ве молам, почекајте"
 
@@ -18713,6 +19845,28 @@ msgstr "Подреди ги пораките �поред тема"
 msgid "F_all back to threading messages by subject"
 msgstr "В_рати �е на разгранување на пораки �поред тема"
 
+#: ../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:614
+msgid "No title"
+msgstr "Без на�лов"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Зачувај како _�кица"
+
+#: ../plugins/templates/templates.c:745
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Едно�тавен приклучок кој што кори�ти ytnef за декодирање на tnef приврзоци."
@@ -18721,6 +19875,28 @@ msgstr "Едно�тавен приклучок кој што кори�ти ytn
 msgid "TNEF Attachment decoder"
 msgstr "TNEF декодер на приврзоци"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Приклучок за по�тавување на WebDAV контакти."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV контакти"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Избегни ако �е �овпаднат (треба за apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution Shell"
@@ -18738,68 +19914,142 @@ msgid "Evolution Test component"
 msgstr "Evolution те�т компонента"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Опи� на тековните по�тавувања на печатачот."
+msgid "Authenticate proxy server connections"
+msgstr "�втентицирај �ервер�ки прок�и вр�ки"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL за автомат�ко конфигурирање на прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Верзија на конфигурацијата"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Одредува дали да �е изврши враќање од неу�пешна �е�ија или не."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Стандардна ширина на �траничната лента"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Стандардна ви�ина на прозорецот"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Стандардна �о�тојба на прозорецот"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Стандардна ширина на прозорецот"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Ги овозможува по�тавувањата за прок�и при при�тап на HTTP/безбеден HTTP преку Интернет."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "Име на хо�т на HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "Лозинка за HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "Порта на HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "Кори�ничко име на HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID или алија� на компонентата за �тандарден приказ при �тартување."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+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 ""
+"�ко е точно, вр�ките преку прок�и �ервер ќе бараат автентикација. Кори�ничкото име "
+"�е добива од „/apps/evolution/shell/network_config/authentication_user“ клучот во GConf, а лозинката "
+"од gnome-keyring или датотеката �о лозинка ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "По�ледна надградена конфигураци�ка верзија"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Ли�та на патеки за папките кои ќе бидат �инхронизирани на ди�кот за офлајн "
 "кори�тење"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "Хо�тови без прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Лозинка за автентикација при правење на HTTP прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "Конфигурација на режим на прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "Име на хо�т на SOCKS прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "Порта на SOCKS прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "Име на хо�т на безбедно HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "Порта за безбедно HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+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 ""
+"Одберете режим на конфигурација на прок�ито. Поддржани вредно�ти �е 0, 1, 2 и 3 "
+"кои значат „кори�ти �и�тем�ки по�тавувања“. „без прок�и“, „кори�ти рачна конфигурација на прок�и“ "
+"и „кори�ти прок�и конфигурација овозможена во autoconfig url-то“ �оодветно."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Страничната лента е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Пре�кокни го дијалогот за предупредување за развој"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Пре�кокни го дијалогот за предупредување за неу�пешна �е�ија"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Стартувај во офлајн режим"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Лентата за �тату� е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18807,19 +20057,19 @@ msgstr ""
 "Конфигураци�ката верзија на Evolution, �о големо/помало/ниво на "
 "конфигурација."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Стандардна ви�ина за главниот прозорец, во пик�ели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Стандардна ширина за главниот прозорец, во пик�ели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Стандардна ширина на �траничната лента, во пик�ели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18827,7 +20077,43 @@ msgstr ""
 "По�ледната надградена конфигураци�ка верзија на Evolution, �о големо/помало/"
 "ниво на конфигурација"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr "Името на машината преку која �е прави HTTP прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Името на машината преку која �е прави безбедно HTTP прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr "Името на машината преку која �е прави прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Портата на машината �е дефинира �о „/apps/evolution/shell/network_config/"
+"http_host“."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Портата на машината �е дефинира �о „/apps/evolution/shell/network_config/"
+"secure_host“."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Портата на машината дефинирана �о „/apps/evolution/shell/network_config/"
+"socks_host“ преку која правите прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18837,55 +20123,79 @@ msgstr ""
 "„алатник“. �ко „алатник“ е по�тавен, �тилот на копчињата е одреден од GNOME "
 "по�тавувања за алатникот."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+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 ""
+"Овој запи� �одржи ли�та на хо�тови кои �е поврзани директно, наме�то "
+"преку прок�и (ако е активно). Вредно�тите може да бидат имиња на хо�тови, "
+"домени (�о кори�тење на џокери како *.foo.com), IP адре�и на хо�тови (IPv4 и IPv6) "
+"и мрежни адре�и �о нетма�ка (нешто како 192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Лентата �о алатки е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "URL кое овозможува вредно�ти за конфигурација на прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "Кори�ти HTTP прок�и"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "Кори�ничко име кое ќе �е кори�ти за автентикација при HTTP прок�и."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Дали Evolution ќе �тартува во офлајн режим наме�то онлајн."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Дали да �е изврши враќање од неу�пешна �е�ија или не"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Дали прозорецот да биде мак�имизиран."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Дали лентата �о алатки треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Дали лентата за �тату� треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Дали лентата �о алатки треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Дали дијалогот за предупредување во развојните верзии на Evolution е "
 "изо�тавен."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr ""
 "Дали дијалогот за предупредување за враќањето од неу�пешна �е�ија на "
 "Evolution е изо�тавен."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Дали копчињата на прозорците треба да �е видливи."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Стил на копчињата на прозорците"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Копчињата на прозорците �е видливи"
 
@@ -18901,11 +20211,11 @@ msgstr "�ктивни вр�ки"
 msgid "Click OK to close these connections and go offline"
 msgstr "Кликнинете на „Во ред“ за затворање на овие поврзување за да одам офлајн"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Одбери го типот на увезувач за извршување:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\n"
@@ -18919,11 +20229,11 @@ msgstr ""
 "Можете да одберете „�втомат�ки“ ако не знаете и Evolution ќе �е обиде да го "
 "направи."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Одбери де�тинација за ова увезување"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18935,78 +20245,58 @@ msgstr ""
 "за увоз. �ко �акате да �е\n"
 "обидете повторно, кликнете на копчето „�азад“.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "И_ме на датотека:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Одбери датотека"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "Тип на _датотека:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Увези податоци и по�тавувања од _по�тари програми"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Увези _една датотека"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Контрола на параметри за Evolution пошта"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "�ема назначено име на папка."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Името на папката не може да го �одржи знакот Ентер."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Името на папката не може да го �одржи знакот „/“."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Името на папката не може да го �одржи знакот „#“."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "„.“ и „..“ �е резервирани имиња на папки."
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../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:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot алатките изгледа не �е ин�талирани на овој компјутер."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка при извршување на %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy не е ин�талиран."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "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:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Дамјан Георгиев�ки, Марко Ивано�ки, Иван Стојмиров, \n"
@@ -19014,71 +20304,79 @@ msgstr ""
 "Јован �аумов�ки <jovan@lugola.net> 2007,\n"
 "�рангел �нгов <ufo@linux.net.mk> 2007."
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Веб �траницата на Evolution"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Грешка во отворањето на веб �траницата за ЧПП."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Работи онлајн"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Работи офлајн"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Работи офлајн"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution моментно е онлајн. Кликнете на ова копче за работење офлајн."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution моментно е онлајн.\n"
+" Кликнете на ова копче за работење офлајн."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution е во проце� за да оди офлајн."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution моментно е офлајн. Кликнете на ова копче за работење онлајн."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution моментно е офлајн.\n"
+"Кликнете на ова копче за работење онлајн."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Премини на %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "�епозната �и�тем�ка грешка."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Во ред"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "�евалидни аргументи"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "�е може да �е реги�трира на OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Конфигураци�ката база не е најдена"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "�ово"
 
@@ -19087,6 +20385,7 @@ msgid "New Test"
 msgstr "�ов те�т"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "_Те�т"
 
@@ -19133,7 +20432,7 @@ msgstr ""
 "увезување на надворешни датотеки во Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19168,7 +20467,7 @@ msgstr ""
 "Се надеваме дека уживате во резултатите од нашата напорна\n"
 " работа и �о задовол�тво го очекуваме Вашето ми�лење.\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19176,19 +20475,19 @@ msgstr ""
 "Благодариме,\n"
 "Тимот на Evolution\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "�е ми кажувај повторно"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "Детекција на паѓање на Evolution"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "Иг_норирај"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19199,43 +20498,43 @@ msgstr ""
 "Како мерка за претпазливо�т �ите површини за преглед ќе бидат �криени.\n"
 "Можете да ги вратите преку менито „Поглед“.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "_�е ја прикажувај повторно оваа порака"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Стартувај го Evolution �о активирање на одредената компонента"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Стартувај во онлајн режим"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "�а�ила и�клучи ги �ите Evolution компоненти"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "�а�ила ре-мигрирај од Evolution 1.4"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "И�прати го излезот од дебагирањето на �ите компоненти во датотека."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Оневозможи вчитување на било кои додатоци."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "И�клучи го про�торот за преглед на пошта, контакти и задачи."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM и е-пошта клиент"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19378,7 +20677,7 @@ msgstr ""
 "\n"
 "�ко одберете да продолжите, може да немате при�тап до некои �тари податоци.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19389,7 +20688,7 @@ msgstr ""
 " \n"
 " Уредете ги по�тавувањата за доверба:"
 
-#: ../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 "
@@ -19398,7 +20697,7 @@ 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 "
@@ -19455,11 +20754,16 @@ msgstr "�дре�а за е-пошта"
 msgid "All CA certificate files"
 msgstr "Сите CA датотеки �о �ертификати"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Прегледувач на �ертификати: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Вне�и ја лозинката за „%s“"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19470,7 +20774,7 @@ msgid "Enter new password"
 msgstr "Вне�и нова лозинка"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19479,7 +20783,7 @@ msgstr ""
 "Издадено на:\n"
 "  Субјект: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19488,7 +20792,7 @@ msgstr ""
 "Издадено од:\n"
 "  Субјект: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Одбери �ертификат"
 
@@ -19675,7 +20979,7 @@ msgid "_Edit CA Trust"
 msgstr "_Уреди CA доверба"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Сертификатот веќе по�тои"
 
@@ -19883,8 +21187,7 @@ msgstr "Ко_пирај ги �ите контакти во..."
 msgid "Contact _Preview"
 msgstr "_Преглед на контакти"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копирај"
@@ -19909,8 +21212,7 @@ msgstr "Копирај во папка..."
 msgid "Create a new addressbook folder"
 msgstr "Креирај нова папка за адре�арот"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "От�ечи"
@@ -19951,8 +21253,7 @@ msgstr "ПремеÑ�ти ги контактите од избраната паÐ
 msgid "Move to Folder..."
 msgstr "Преме�ти во папка..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вметни"
@@ -19989,13 +21290,11 @@ msgstr "Зачувај одбрани контакти како VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Зачувај ги контактите од избраната папка како VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Одбери ��"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Одбери �_�"
 
@@ -20064,7 +21363,7 @@ msgstr "_Преме�ти го контактот во..."
 msgid "_Move Folder Contacts To"
 msgstr "_Преме�ти ги контактите од папката во"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_�ово"
 
@@ -20125,7 +21424,7 @@ msgid "Month"
 msgstr "Ме�ец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Следно"
 
@@ -20134,7 +21433,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Се прегледува календарот за печатење"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Претходно"
 
@@ -20202,232 +21501,6 @@ msgstr "Работна недела"
 msgid "_Open Appointment"
 msgstr "_Отвори закажување"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Копирај одбран тек�т во клипбордот"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Копирај го избраното во таблата �о и�ечоци"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "От�ечи одбран тек�т во таблата �о и�ечоци"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "От�ечи го избраното во таблата �о и�ечоци"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Вметни од таблата �о и�ечоци"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Вметни тек�т од таблата �о и�ечоци"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Одбери го целиот тек�т"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Прикачи"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Кликни овде за прикачување датотека"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Кликни овде за затворање на тековниот прозорец"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Кликни овде за зачувување на тековниот прозорец"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Кликни овде за помош"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Затвори"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "В_не�и"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Приврзок..."
-
-#: ../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 "Затвори"
-
-#: ../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:42
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Помош"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Опции"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Целодневен на�тан"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Цело_дневен на�тан"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Кла�ифицирај како доверливо"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Кла�ифицирај како приватно"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Кла�ификувај како јавно"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Кликни овде за по�тавување аларми за овој на�тан"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Вне�и напредни опции за и�праќање"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "�аправи го овој на�тан повторувачки"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Јав_но"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Објави �лободно/зафатено информации за при�утните"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "_Улога поле"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Опции за и�праќање"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Покажи време како _зафатен"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Времен�ка _зона"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Го менува прикажувањето полето за тип на при�утни"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Го менува прикажувањето на RSVP полето"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Го менува прикажувањето на полето за улога "
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Го менува прикажувањето на �тату�ното поле"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Го менува прикажувањето на времен�ката зона"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Го менува прикажувањето на категории"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Го менува прикажувањето на целодневен на�тан"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Го менува прикажувањето на времето како зафатено"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_�ларми"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Категории"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "К_ла�ификација"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Доверливо"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Слободна/зафатена"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Приватно"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "Повто_рно појавување"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Стату�но поле"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Тип поле"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Откажи ја тековната операција"
@@ -20457,7 +21530,6 @@ msgid "Empty _Trash"
 msgstr "И�празни _ѓубре"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Папка"
 
@@ -20674,7 +21746,7 @@ msgstr "�ишка на ли�та �о пораки"
 msgid "_Group By Threads"
 msgstr "Групирај �поред _нишки"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Порака"
@@ -21009,129 +22081,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Покажи трепкачка �трелка во телото на прикажаните пораки"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Прикажувај пораки во нормалниот �тил"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Прикажувај пораки �о �ите заглавија"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Прикажи ја изворната �одржина на пораката"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Врати ги избришаните пораки"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "�е_важно"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "�а_мали"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "Прикачено"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Caret режим"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "И�_чи�ти знаме"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Избриши ја пораката"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Барај во пораката..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Зна_мето е завршено"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "Оди на"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "В_натре"
 
-#: ../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 "_Вчитај ги �ликите"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Извор на пораката"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "Следна порака"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_�ормална големина"
 
-#: ../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 "_Отвори во нов прозорец"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Претходна порака"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "Ци_тирано"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Прочитај"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Зачувај ја пораката..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Врати ја пораката"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_�епрочитано"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Зумирај"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Зголеми"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Затвори го прозорецов"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Затвори"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21169,290 +22237,6 @@ msgstr "Погледни го избраниот меморандум"
 msgid "_Open Memo"
 msgstr "_Отвори меморандум"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Прикачи датотека"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Затвори ја тековната датотека"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Избриши ��, о�вен потпи�от"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Енкриптирај ја пораката �о PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Енкриптирајте ја пораката �о вашиот S/MIMЕ �ертификат за енкрипција"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "Фор_мат"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Означи за земање потврда за до�тава кога вашата порака е прочитана"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Вне�ете опции за и�праќање"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Отвори датотека"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP енкрипција"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP потпи�"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP _енкрипција"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP _потпи�"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "По_барај потврда за читање"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME ен_крипција"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME енкрипција"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME потп_и�"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME потпи�"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "И_�прати"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Зачувај како"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Зачувај �кица"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Зачувај _како..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Зачувај _�кица"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Зачувај како �кица"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Зачувај во папка..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Зачувај ја тековната датотека"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Зачувај ја тековната датотека под друго име"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Зачувај ја пораката во назначената папка"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "И�прати"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "И�прати ја пораката во HTML формат"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "И�прати ја оваа порака"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "По�тави го приоритетот на порака како ви�ок"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Потпиши ја пораката �о вашиот PGP клуч"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Потпишете ја пораката �о вашиот S/MIME потпи� �ертификат"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Го менува изборот дали „BCC“ полето �е прикажува"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Го менува изборот дали „CC“ полето �е прикажува"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Го менува изборот дали „Од“ избирачот �е прикажува"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Го менува изборот дали „Пишувај“ полето �е прикажува"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Го менува изборот дали „Одговори-на“ полето �е прикажува"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Го менува изборот дали До полето �е прикажува"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Поле за _�лепа копија"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Поле за _копија"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Избриши ��"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "_Од поле"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Отвори..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "„_И�прати“ до поле"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_По�тави приоритет на пораката"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "„_Одговори-на“ поле"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Безбедно�т"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Опции за и�_праќање"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "_До поле"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "З_атвори"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Зачувај и излези"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Зачувај и _излези"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Зачувај ја тековната датотека и затвори го прозорецот"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Додај папка на ли�тата на претплатени папки"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "О�вежи ли�та"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "О�вежи ја ли�тата на папки"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "От�трани ја папката од ли�тата на претплатени папки"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Претплати ме"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Откажи претплата"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Обратен избор"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Кликнете �мени/погледни �тату�ни детали на задачата"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Детали за �тату�от"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Времен�ка зона"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Детали за _�тату�от"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Копирај ја одбраната задача"
@@ -21648,50 +22432,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Прикажи/Сокри ја Стату�ната Лента"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Работи _офлајн"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_За"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Затвори го прозорецот"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Заборави _лозинки"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Че�то по�тавувани прашања"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Скриј копчиња"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Само _икони"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Брза референца"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Излези"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Изглед на менувач"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Опции за _�инхронизација..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Само тек�т"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Прозорец"
 
@@ -21767,12 +22555,12 @@ msgstr "Со _до датум"
 msgid "With _Status"
 msgstr "Со _�тату�"
 
-#. 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"
 
@@ -21789,8 +22577,8 @@ msgid "Select a Time Zone"
 msgstr "Изберете времен�ка зона"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Комбо поле за ча�овна зона"
+msgid "Timezone drop-down combination box"
+msgstr "Поле за одбирање времен�ка зона"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21802,19 +22590,19 @@ msgstr ""
 "изберете зона.\n"
 "Употребете го де�ното копче за намалување."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 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 "Дефинирај поглед за %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 "Дефинирај поглед"
 
@@ -21824,17 +22612,17 @@ msgid "Define Views for \"%s\""
 msgstr "Дефинирај поглед за  „%s“"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Примерок"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Зачувај го тековниот поглед"
 
@@ -21886,11 +22674,11 @@ msgstr "Зачувај го тековниот прилагоден поглед
 msgid "Create or edit views"
 msgstr "Креирај или уредувај погледи"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Фабрички"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Дефинирај нов поглед"
 
@@ -21906,17 +22694,17 @@ msgstr "Тип на поглед"
 msgid "Type of view:"
 msgstr "Тип на поглед:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Лента за приврзоци"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../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:314 ../widgets/misc/e-attachment.c:531
+#: ../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: не е валидна датотека"
@@ -21938,33 +22726,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Предложи автомат�ки приказ на приврзок"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1724
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Ме�ечен календар"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 msgid "GDK fill color"
 msgstr "Боја на пополнување на ГДК"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Пополни �о и�прекината линија"
 
@@ -21989,29 +22776,29 @@ 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:3062
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Минимална ширина"
 
 #: ../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:3063
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Минимална ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Проред"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Сега"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Времето мора да биде во формат: %s"
@@ -22020,152 +22807,150 @@ msgstr "Времето мора да биде во формат: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Вредно�та на процентот мора да биде меѓу 0 и 100."
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "�рап�ки"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Балтички"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Централно Европ�ки"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Кине�ки"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Кириличен"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Евреј�ки"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Јапон�ки"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Кореј�ки"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Тајланд�ки"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Тур�ки"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Уникод"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Западно Европ�ки"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Западноевроп�ки, нов"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Традиционален"
 
-#: ../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:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Упро�тен"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Украин�ки"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Визуелно"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "�епознато кодирање %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Кодна �траница"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Вне�ете го множе�твото знаци за употреба"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Друго..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "Ко_дна �траница"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Датум и време"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Тек�туален запи� за вне� на датум"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Кликнете на ова копче за приказ на календар"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
 msgstr "Комбо поле за избор на време"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "Се_га"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Дене�"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "�евалидна вредно�т за датум"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "�евалидна вредно�т за време"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Проширено"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Дали проширувачот е отворен"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Тек�т на ознаката на проширувачот"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Кори�ти потцртано"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22173,37 +22958,37 @@ msgstr ""
 "�ко е по�тавено, подвлекувањето во тек�тот значи дека наредниот знак треба "
 "да �е кори�ти за мнемонично копче за брз при�тап"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Ме�то за о�тавање меѓу ознаката и детето"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Графичка контрола за ознака"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Графичка контрола за приказ наме�то ознаката на вообичаениот проширувач"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Големина на проширувачот"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Големина на �трелката на проширувачот"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Ра�тојание на индикатор"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Проред околу �трелката на проширувачот"
 
 #. 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:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "�апредно пребарување"
 
@@ -22248,23 +23033,31 @@ msgstr "Тековна папка"
 msgid "Current Message"
 msgstr "Тековна порака"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Избери �лика"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Мапа на �ветот"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 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:109
+msgid "Online"
+msgstr "Онлајн"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "Со�тојбата на копчето е офлајн"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Синхронизирај �е �о:"
@@ -22289,61 +23082,61 @@ msgstr "Reflow модел"
 msgid "Column width"
 msgstr "Ширина на колоната"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Пребарај"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Кликнете овде за промена на типот на пребарување"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Пребарај"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_�ајди �ега"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_И�чи�ти"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID на предметот"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " в_о "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Ред на покажувачот"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Колона на покажувачот"
@@ -22360,7 +23153,7 @@ msgstr "�ачин на избирање"
 msgid "Cursor Mode"
 msgstr "Режим на работа на покажувачот"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Кога е избри_шано:"
 
@@ -22384,10 +23177,6 @@ msgstr "<b>Следење на �тату�</b>"
 msgid "A_uto-delete sent item"
 msgstr "�_втомат�ки -избришиго  и�пратеиотн предмет"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Кла�ификација"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Креи_рај и�пратен предмет за �ледење информации"
@@ -22468,44 +23257,45 @@ msgstr "_По�ле:"
 msgid "_All information"
 msgstr "_Сите информации"
 
-#: ../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 "__Одложи до�тавување на порака"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_До�тавено"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_По�тави датум на и�текување"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Додека:"
 
-#: ../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 "Кога е отворено:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "кликни овде за одење на url"
 
@@ -22545,23 +23335,23 @@ msgstr "Фоку�ирана колона"
 msgid "Unselected Column"
 msgstr "�е�електирана колона"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Прецртана колона"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Подвлечена колона"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Задебелена колона"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Обоена колона"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Колона �о бг боја"
 
@@ -22599,7 +23389,7 @@ msgid "A_vailable Fields:"
 msgstr "Д_о�тапни полиња:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Ра�течки"
 
@@ -22612,7 +23402,7 @@ msgid "Clear _All"
 msgstr "И�чи�ти _��"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Опаѓачки"
 
@@ -22675,14 +23465,14 @@ 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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Полно заглавие"
 
@@ -22718,290 +23508,290 @@ msgstr[0] "%s (%d предмет)"
 msgstr[1] "%s (%d предмети)"
 msgstr[2] "%s (%d предмети)"
 
-#: ../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:3020 ../widgets/table/e-table-item.c:3021
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "Боење на �о�едните редови �о различни бои"
 
-#: ../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:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "�ацртана хоризонтална мрежа"
 
-#: ../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:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "Вертикална нацртана мрежа"
 
-#: ../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:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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
 msgid "Draw focus"
 msgstr "�ацртај фоку�"
 
-#: ../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:3048 ../widgets/table/e-table-item.c:3049
+#: ../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
 msgid "Cursor mode"
 msgstr "Режим на покажувачот"
 
-#: ../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:3013 ../widgets/table/e-table-item.c:3014
+#: ../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
 msgid "Selection model"
 msgstr "Модел на избирање"
 
-#: ../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:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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
 msgid "Length Threshold"
 msgstr "Праг на должина"
 
-#: ../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:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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
 msgid "Uniform row height"
 msgstr "Еднозначна ви�ина на редови"
 
-#: ../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: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"
 msgstr "Смрзнато"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Промени го тековниот поглед"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Сортирај по _ра�течки редо�лед"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Сортирај по _опаѓачки редо�лед"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Поништи го подредувањето"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Групирај �поред ова _поле"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Групирај �поред _поле"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "От�трани ја оваа _колона"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Додај к_олона..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "П_о�тавено�т"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "�_ајдобро �обрано"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Форматирај ги колони_те..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "По_де�и го тековниот поглед..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Подреди по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Прилагодено"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Опи� на фонтот"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Информации за подредување"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Дрво"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Заглавие на табела"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Модел на табела"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Ред на покажувачот"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Секогаш пребарувај"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Кори�ти кликнување за додавање"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "„ETree“ адаптер на табела"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Ретро изглед"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Цртај линии и +/- проширувачи."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Методи на вне�ување"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Проце�ор на на�тани"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Задебелено"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Прецртано"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Сидро"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Порамнување"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Ширина на клипот"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Ви�ина на клипот"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Клип"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Пополни го правоаголникот на клипот"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X порамнување"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y порамнување"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Ширина на тек�т"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Ви�ина на тек�т"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Кори�ти три точки"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Три точки"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Прено� на линија"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Знаци за нов ред"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Мак�имум линии"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "�ацртај граници"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Дозволи нови линии"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "�ацртај позадина"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "�ацртај копче"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Позиција на покажувачот"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Контек�т на ин�тант пораки"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Справи �е �о �кокачки прозорци"
 
diff --git a/po/nb.po b/po/nb.po
index 652cddc82c..f35d2f481f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance@lyse.net>, 2005.
 #
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 13:33+0200\n"
-"PO-Revision-Date: 2008-08-15 13:44+0200\n"
+"POT-Creation-Date: 2008-08-27 12:56+0200\n"
+"PO-Revision-Date: 2008-08-27 13:07+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -21,16 +21,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "evolution adressebok"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Ny kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
@@ -106,7 +106,7 @@ msgstr "GÃ¥ til i dag"
 msgid "Go to Date"
 msgstr "GÃ¥ til dato"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-day-view-main-item.c:301
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
@@ -150,7 +150,7 @@ msgstr "kalendervisning for en arbeidsuke"
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../a11y/calendar/ea-gnome-calendar.c:186
 #: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
@@ -161,26 +161,26 @@ 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
+#: ../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
 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:762
 #: ../calendar/gui/calendar-component.c:767
 #: ../calendar/gui/calendar-component.c:769
 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:781
 #: ../calendar/gui/calendar-component.c:788
 #: ../calendar/gui/calendar-component.c:794
@@ -193,32 +193,32 @@ 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
+#: ../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
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "søkefelt"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "søkefelt for Evolution kalender"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Hoppeknapp"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
@@ -296,7 +296,7 @@ msgstr "klikk for å legge til"
 msgid "click"
 msgstr "klikk"
 
-#: ../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 "sortere"
 
@@ -314,23 +314,23 @@ msgstr "Kalender (fra %s til %s)"
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Komboknapp"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Bruk forvalg"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Sprettoppmeny"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Slå av/på vedleggsfelt"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "aktiver"
 
@@ -382,7 +382,7 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Kunne ikke fjerne adressebok."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -400,7 +400,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Feil under lasting av adressebok."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -434,7 +434,7 @@ msgid "Some features may not work properly with your current server"
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren "
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution adressebok avsluttet uventet."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -453,31 +453,31 @@ msgstr ""
 "administrator for støttede søkebaser."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Denne adresseboken vil bli slettet for godt."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Denne adresseboken kunne ikke åpnes."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 "Denne adresseboktjeneren har ingen foreslått søkebase."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Adresseboktjeneren din er ikke tilgjengelig eller tjenernavnet er kanskje "
 "stavet feil. Eller så kan nettverkstilkoblingen din være slått av."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Denne adresseboken vil bli slettet for godt."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Kan ikke åpne adressebok"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -494,11 +494,9 @@ msgstr "Vil du lagre dine endringer?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
-"En kontakt prøves å bli flyttet fra en adressebok til en annen men den kan "
-"ikke bli fjernet fra kilden. Vil du lagre en kopi i stedet?"
+msgstr "Du prøver å flytte en kontakt fra en adressebok til en annen men den kan ikke bli fjernet fra kilden. Vil du lagre en kopi i stedet?"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid ""
@@ -551,7 +549,7 @@ msgstr "End_re størrelse"
 msgid "_Use as it is"
 msgstr "Br_uk som den er"
 
-#. 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."
+#. 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}"
@@ -568,7 +566,7 @@ msgstr "Forvalgt synkroniseringsadresse:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Kunne ikke laste adressebok"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -670,39 +668,39 @@ msgstr "Personlig"
 msgid "On LDAP Servers"
 msgstr "PÃ¥ LDAP-tjenere"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
 
@@ -752,7 +750,7 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:982
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Søker"
 
@@ -893,7 +891,7 @@ msgstr "Oppgi passord for %s (bruker %s)"
 
 #: ../addressbook/gui/component/addressbook.c:223
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1249,7 +1247,7 @@ msgstr "kort"
 #: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
 #: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutter"
@@ -3555,9 +3553,9 @@ msgstr "Autentiseringsmetoden er ikke støttet"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 ""
 "Kunne ikke åpne adresseboken. Dette betyr at adresseboken ikke er satt opp "
 "for frakoblet bruk eller at den ikke er lastet ned enda. Last adresseboken i "
@@ -3566,7 +3564,7 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, 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 ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien %s eksisterer "
@@ -3574,8 +3572,8 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
 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 ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at LDAP-tjeneren ikke kan nås."
@@ -3592,8 +3590,8 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:132
 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 ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
@@ -3607,7 +3605,7 @@ 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 ""
 "Det ble flere treff på kort som enten tjeneren er\n"
 "konfigurert til å returnere eller Evolution er konfigurert til å vise.\n"
@@ -3617,9 +3615,9 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:167
 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 ""
 "Tiden for å utføre dette søket overskred tjenergrensen eller grensen\n"
 "du har konfigurert for denne adresseboken. Gjør søket ditt mer\n"
@@ -3627,12 +3625,12 @@ msgstr ""
 "for denne adresseboken."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
+msgid "The backend for this address book was unable to parse this query."
+msgstr "Motoren for denne adresseboken forsto ikke denne spørringen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
+msgid "The backend for this address book refused to perform this query."
+msgstr "Motoren for denne adresseboken nektet å utføre denne spørringen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
@@ -3781,7 +3779,7 @@ msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Lagre i adressebok"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
@@ -4044,8 +4042,8 @@ msgid "Can not open file"
 msgstr "Kan ikke åpne fil"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "Kunne ikke hente en liste med adressebøker"
+msgid "Couldn't get list of address books"
+msgstr "Kunne ikke hente liste med adressebøker"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4060,7 +4058,7 @@ msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Vis lokale adressebokmapper"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4594,8 +4592,8 @@ msgstr "_Notater"
 #: ../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:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Notater"
 
@@ -4640,7 +4638,7 @@ msgstr[1] "minutter"
 #: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
 #: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
@@ -4711,7 +4709,7 @@ msgstr "Du har %d alarmer"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1683
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1579
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -5294,7 +5292,7 @@ msgstr "Slett hendelser eldre enn"
 #: ../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:717
+#: ../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"
@@ -5348,55 +5346,55 @@ msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 msgid "Calendar Source Selector"
 msgstr "Valg av kalenderkilde"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1597
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1605
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1613
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1619
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1621
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -5642,7 +5640,7 @@ msgstr "Metoden er ikke støttet under åpning av kalender"
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -6126,7 +6124,7 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
@@ -6673,7 +6671,7 @@ msgstr "Tilpass"
 #: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ingen"
 
@@ -6763,7 +6761,7 @@ msgstr "Kan ikke åpne notater i «%s»."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Til"
@@ -8056,7 +8054,7 @@ msgid "Update"
 msgstr "Oppdater"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Godta"
 
@@ -8065,7 +8063,7 @@ msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Avslå"
 
@@ -8331,7 +8329,7 @@ msgid "Click to add a memo"
 msgstr "Klikk for å legge til et notat"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2960
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8408,12 +8406,12 @@ msgstr "Laster oppgaver på %s"
 msgid "Loading memos at %s"
 msgstr "Laster notat på %s"
 
-#: ../calendar/gui/gnome-cal.c:2919
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Ã…pner %s"
 
-#: ../calendar/gui/gnome-cal.c:3873
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Sletter"
 
@@ -8562,46 +8560,46 @@ msgstr "Ingen kalender tilgjengelig for opppretting av notater"
 msgid "Memo Source Selector"
 msgstr "Valgt av notatkilde"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nytt notat"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Delt notat"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Notatli_ste"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
@@ -8857,11 +8855,6 @@ msgstr "Kategorier: %s"
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Kommende avtaler"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
@@ -8890,42 +8883,42 @@ msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1326
 msgctxt "New"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1334
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1342
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Oppgave_liste"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
@@ -9009,1532 +9002,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
 #.
+#. *
+#. * 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/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Akkra"
 
-#: ../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/Algier"
 
-#: ../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 "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/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/Djibouti"
 
-#: ../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/Tripoli"
 
-#: ../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/Costa_Rica"
 
-#: ../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/Dominika"
 
-#: ../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/Kapp_det_gode_håp"
 
-#: ../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/Guyana"
 
-#: ../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/Jamaica"
 
-#: ../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/Martinique"
 
-#: ../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 "America/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amerika/Menterrey"
 
-#: ../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/Puerto_Rico"
 
-#: ../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 "Antarktis/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/Sydpolen"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Bakuc"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damaskus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Mucau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Teheran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlanteren/Azorene"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantisk/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlanteren/Kanariøyene"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantisk/Kapp_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlanteren/Færøyene"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanteren/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlanteren/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanteren/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanteren/Syd-Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlanteren/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlanteren/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Aten"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukuresti"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/København"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praha"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanet"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Warshava"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indiske hav/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indiske hav/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indiske hav/Juleøya"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indiske hav/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indiske hav/Komorene"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indiske hav/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indiske hav/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indiske hav/Maldivene"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indiske hav/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indiske hav/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indiske hav/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Stillehavet/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Stillehavet/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Stillehavet/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Stillehavet/Påskeøya"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Stillehavet/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Stillehavet/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Stillehavet/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Stillehavet/Fijiøyene"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Stillehavet/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Stillehavet/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Stillehavet/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Stillehavet/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Stillehavet/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Stillehavet/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Stillehavet/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Stillehavet/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Stillehavet/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Stillehavet/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Stillehavet/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Stillehavet/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Stillehavet/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Stillehavet/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Stillehavet/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Stillehavet/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Stillehavet/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Stillehavet/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Stillehavet/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Stillehavet/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Stillehavet/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Stillehavet/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Stillehavet/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Stillehavet/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Stillehavet/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Stillehavet/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Stillehavet/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Stillehavet/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Stillehavet/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Stillehavet/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
@@ -10784,19 +10796,19 @@ msgstr "Em_ne:"
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
@@ -10804,7 +10816,7 @@ msgstr "Klikk her for å velge mapper å poste til"
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Vis ve_dleggsfelt"
 
@@ -10992,7 +11004,7 @@ msgstr "_Fortsett redigering"
 msgid "_Do not Recover"
 msgstr "Ikke _gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "Gjenopp_rett"
 
@@ -11042,11 +11054,11 @@ msgstr "Evolution spørring"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern feil, ukjent feil «%s» forespurt"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Komponent"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "Navn på komponenten som logges"
 
@@ -11061,15 +11073,15 @@ msgstr "Aktivert"
 msgid "Whether the plugin is enabled"
 msgstr "Om tillegget er aktivert"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "En feil oppsto under utskrift"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Utskriftssystemet rapporterte følgende detaljer om feilen:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
@@ -11451,7 +11463,7 @@ msgstr "tiden du spesifiserer"
 
 #: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "uker"
@@ -11524,8 +11536,8 @@ msgstr "Konfigurasjonskontroll for nettverk i 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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -11566,13 +11578,13 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Velg mappe"
 
 #: ../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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -11657,7 +11669,7 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
@@ -11855,7 +11867,7 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Les"
 
@@ -11927,9 +11939,9 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:71 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:71 ../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:311
+#: ../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
 msgid "Subject"
@@ -11948,51 +11960,51 @@ msgstr "SÃ¥ etter"
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../mail/em-folder-browser.c:1170
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../mail/em-folder-browser.c:1223
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Søk i alle kontoer"
 
@@ -12018,7 +12030,7 @@ msgstr "Bruk av kvote"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
@@ -12175,20 +12187,20 @@ msgid "C_opy"
 msgstr "K_opier"
 
 #: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
 #: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Opprett mappe"
 
 #: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
@@ -12318,9 +12330,9 @@ msgstr "Filter basert på e-_postliste"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "Forvalgt"
 
@@ -12636,19 +12648,19 @@ msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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:209
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
@@ -12671,13 +12683,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Denne meldingen ble sendt av <b>%s</b> på vegne av <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:307
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Svar-til"
@@ -12944,7 +12956,7 @@ msgstr "Legg til adresse"
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Søke_mapper"
 
@@ -13092,21 +13104,21 @@ msgstr "Forvalgt bredde for abonneringsdialogen."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
 "lokale adressebøker"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Bestemmer om avsender skal slås opp i adresseboken. Hvis dette er tilfelle "
@@ -13363,7 +13375,10 @@ 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 "Last bilder for HTML e-poster over http(s). Mulige verdier er: «0» - Aldri last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - Alltid last bilder fra nettet."
+msgstr ""
+"Last bilder for HTML e-poster over http(s). Mulige verdier er: «0» - Aldri "
+"last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - Alltid "
+"last bilder fra nettet."
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
@@ -13505,8 +13520,8 @@ msgid "Save directory"
 msgstr "Lagre katalog"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
-msgstr "Søk etter avsenders bilde i lokale adressebøker"
+msgid "Search for the sender photo in local address books"
+msgstr "Søk etter bilde av avsender i lokale adressebøker"
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
@@ -13606,7 +13621,9 @@ msgstr "Skrift med variabel bredde for meldingsvisning."
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
-msgstr "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for feilsøkingsmeldinger."
+msgstr ""
+"Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
+"feilsøkingsmeldinger."
 
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
@@ -13630,7 +13647,10 @@ msgstr ""
 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 "Denne nøkkelen leses kun en gang og settes til «false» etter at den er lest. Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for den mappen."
+msgstr ""
+"Denne nøkkelen leses kun en gang og settes til «false» etter at den er lest. "
+"Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
+"den mappen."
 
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
@@ -13647,7 +13667,7 @@ msgstr ""
 #: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
@@ -13895,144 +13915,144 @@ msgstr "Legg til filterregel"
 msgid "Templates"
 msgstr "Maler"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:917
+#: ../mail/mail-component.c:924
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:932
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1578
 msgid "Error"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1578
 msgid "Errors"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1579
 msgid "Warnings and Errors"
 msgstr "Advarsler og feil"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1580
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1580
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1707
 msgid "Debug Logs"
 msgstr "Feilsøkingslogger"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1721
 msgid "Show _errors in the status bar for"
 msgstr "Vis f_eil i statuslinjen i"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1745
+#: ../mail/mail-component.c:1737
 msgid "second(s)."
 msgstr "sekund(er)."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1743
 msgid "Log Messages:"
 msgstr "Loggmeldinger:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1784
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1793 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1803 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1812 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
@@ -14287,7 +14307,7 @@ msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ikke formater meldinger når st_ørrelsen overstiger"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uønsket hvis avsender finnes i adresseboken"
 
 #: ../mail/mail-config.glade.h:73
@@ -14496,8 +14516,8 @@ msgid "S_OCKS Host:"
 msgstr "S_OCKS-vert:"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "Kun søk etter bilde av avsender i lokale adressebøker"
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Kun søk etter bilde av avs_ender i lokale adressebøker"
 
 #: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
@@ -14606,7 +14626,7 @@ msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../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:"
@@ -14663,7 +14683,7 @@ msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
 #: ../mail/mail-config.glade.h:172
@@ -14791,7 +14811,7 @@ msgstr "F_inn:"
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -15863,39 +15883,39 @@ msgstr "Sendte meldinger"
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:64 ../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 "Svar til alle"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Gjennomgå"
 
@@ -15996,27 +16016,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Innebygd programtilleg for lyd"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopi for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16026,117 +16046,117 @@ msgstr ""
 "kalendere, oppgaver, notater og adressebøker kan gjenopprettes.\n"
 "Du kan også gjenopprette alle dine personlige innstillinger, filtre etc."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mapper"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mapper"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Sjekk sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Med grafisk brukergrensesnitt"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Sikkerhetskopiering fullført"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Henter ut filer fra sikkerhetskopien"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Fjerner midlertidige sikkerhetskopier"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "Sikrer lokale kilder"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
 
@@ -16223,7 +16243,7 @@ msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:567
-msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
 
 #: ../plugins/bbdb/bbdb.c:573
@@ -16250,7 +16270,7 @@ msgstr "Synkroniser med _vennelisten nå"
 
 #: ../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 ""
@@ -16321,7 +16341,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
 #: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
@@ -16344,7 +16364,7 @@ msgstr "Gir kjernefunksjoner for lokale kalendere."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
 #: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "O_ppdater"
@@ -16453,7 +16473,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16479,7 +16499,7 @@ msgstr "Forvalgte kilder"
 
 #: ../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 ""
 "Gir grunnleggende funksjonalitet for markering av forvalgt kalender eller "
@@ -16681,7 +16701,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16689,7 +16709,7 @@ msgstr ""
 "Det nåværende passordet er ikke likt det eksisterende passordet for din "
 "konto. Skriv inn det riktige passordet"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "De to passordene er ikke like. Skriv inn passordene på nytt."
 
@@ -16865,7 +16885,7 @@ msgstr "_Sammendrag av rettigheter"
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Rettigheter..."
@@ -16879,11 +16899,11 @@ msgid "Folder Size"
 msgstr "Mappestørrelse"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Bruker"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Abonner på annen brukers mappe"
@@ -17266,7 +17286,7 @@ msgid "Folder offline"
 msgstr "Mappen er frakoblet"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -17386,7 +17406,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Ukjent feil ved oppslag av {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -17522,11 +17542,11 @@ msgstr "Skriv i _eksternt redigeringsprogram"
 msgid "Compose messages using an external editor"
 msgstr "Skriv meldinger i et eksternt redigeringsprogram"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Kommando som skal kjøres for å starte redigering: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17534,15 +17554,15 @@ msgstr ""
 "Bruk «xemacs» for Emacs\n"
 "Bruk «gvim» for VI"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Velg et (48*48) png med størrelse < 700 byte"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG-filer"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "A_nsikt"
 
@@ -17586,16 +17606,16 @@ msgstr "_Fjern abonnement"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Vennligst oppgi brukernavn først."
 
-#: ../plugins/google-account-setup/google-source.c:497
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Oppgi passord for %s for å aksessere liste med abonnerte kalendere."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17604,11 +17624,11 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr "Hent _liste"
 
@@ -17781,7 +17801,9 @@ msgstr "Kontoen eksisterer allerede"
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
-msgstr "Proxy-pålogging som &quot;{0}&quot; lykkes ikke. Vennligst sjekk e-postadresse og prøv igjen."
+msgstr ""
+"Proxy-pålogging som &quot;{0}&quot; lykkes ikke. Vennligst sjekk e-"
+"postadresse og prøv igjen."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
@@ -17803,7 +17825,7 @@ msgstr "Du kan ikke dele en mappe med oppgitt bruker &quot;{0}&quot;"
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Du må oppgi et brukernavn du ønsker å legge til på listen"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Godta tentativt"
 
@@ -17924,20 +17946,20 @@ msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Ny _delt mappe..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Deling"
 
@@ -18138,7 +18160,8 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr "Synkroniser valgt oppgave/notat/kalender/adressebok med Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -19015,12 +19038,12 @@ msgstr "Kon_verter til møte"
 msgid "Mail to meeting"
 msgstr "E-post til møte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke åpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19214,21 +19237,23 @@ msgstr "_Abonner på listen"
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "Merk meldinger i undermapper også?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../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 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og undermapper i tillegg?"
+msgstr ""
+"Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
+"undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Kun _denne mappen"
 
@@ -19775,7 +19800,7 @@ msgid "Thread messages by subject"
 msgstr "Vis meldingstråder etter emne"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til tråding av meldinger etter emne"
 
@@ -19862,53 +19887,49 @@ msgid "Configuration version"
 msgstr "Konfigurasjonsversjon"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Bestemmer om gjenoppretting etter krasj skal kjøres eller ikke."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Forvalgt bredde på sidelinje"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Forvalgt vinduhøyde"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Forvalgt vindutilstand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Forvalgt vindubredde"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Aktiverer innstillinger for proxy ved aksess via HTTP/sikker HTTP over "
 "internett."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Vertsnavn for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Passord for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Port for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Brukernavn for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 eller alias for komponenten som skal være forvalgt ved oppstart."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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/"
@@ -19916,46 +19937,46 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgradert konfigurasjonsversjon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stier for mapper som skal bli synkronisert til disk for frakoblet "
 "bruk"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Verter som ikke bruker proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Passord som skal sendes som autentisering ved bruk av HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Konfigurasjonsmodus for proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Vertsnavn for SOCKS-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Port for SOCKS-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Vertsnavn for sikker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Port for sikker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -19963,27 +19984,23 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sidelinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Hopp over varseldialog"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statuslinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19991,19 +20008,19 @@ msgstr ""
 "Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå "
 "(for eksempel «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Forvalgt høyde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Forvalgt bredde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Forvalgt bredde på sidelinjen i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20011,37 +20028,37 @@ msgstr ""
 "Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/"
 "konfigurasjonsnivå (for eksempel «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "Maskinnavn for HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Maskinnavn for HTTPS-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "Maskinnavn for socks-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../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 "
@@ -20051,7 +20068,7 @@ msgstr ""
 "«toolbar» er satt vil stilen på knappene bli bestemt av GNOME «toolbar»-"
 "instillingene."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20059,66 +20076,58 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL som oppgir verdier for konfigurasjon av proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Bruk HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Brukernavn for autentisering med HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Om Evolution skal startes i frakoblet modus i stedet for tilkoblet modus."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Om gjenoppretting etter krasj skal utføres eller ikke"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Om vinduet skal være maksimert."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidelinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Om advarselsdialogen i utviklingsversjoner av Evolution blir hoppet over."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Om varseldialogen for gjenoppretting av Evolution skal hoppes over."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Om vinduknappene skal være synlige."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Knappestil for vindu"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
@@ -20194,7 +20203,7 @@ msgstr "Evolution brukervalg"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20244,7 +20253,7 @@ msgstr "Ar_beid frakoblet"
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20252,11 +20261,11 @@ msgstr ""
 "Evolution er koblet til.\n"
 "Klikk på denne knappen for å arbeide frakoblet."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20264,52 +20273,52 @@ msgstr ""
 "Evolution er frakoblet.\n"
 "Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Ukjent systemfeil."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Ny"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Ny test"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
 msgctxt "New"
 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 "Opprett en ny testoppføring"
 
@@ -20352,7 +20361,7 @@ msgstr ""
 "eksterne filer til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20387,7 +20396,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20395,66 +20404,43 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Gjenoppretting ved krasj"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norer"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution ser ut til å ha avsluttet på en uventet måte sist programmet\n"
-"kjørte. For å være sikker vil alle forhåndsvisningsområder skjules.\n"
-"Du kan gjenopprette forhåndsvisning fra menyen Vis.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "Ikke vis _denne meldingen igjen"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20697,7 +20683,7 @@ msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20706,7 +20692,7 @@ msgstr ""
 "Utstedt til:\n"
 "  Subjekt: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20715,7 +20701,7 @@ msgstr ""
 "Utstedt av:\n"
 "  Subjekt: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
@@ -21132,7 +21118,7 @@ msgid "Copy to Folder..."
 msgstr "Kopier til mappe..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Opprett en ny adressebokmappe"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -22621,13 +22607,13 @@ msgstr "Type visning:"
 msgid "Attachment Bar"
 msgstr "Vedleggsfelt"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke legge ved fil: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
diff --git a/po/nl.po b/po/nl.po
index 7e76b6c3f9..104388e9e3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -52,12 +52,12 @@
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
 # Vincent van Adrighem <adrighem@gnome.org>, 2001, 2003, 2004, 2005, 2006.
 # Reinout van Schouwen <reinouts@gnome.org>, 2007, 2008
-#: ../shell/main.c:694
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-08 15:11+0000\n"
+"POT-Creation-Date: 2008-09-06 16:13+0000\n"
 "PO-Revision-Date: 2008-05-19 02:14+0200\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -68,21 +68,21 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "evolution adresboek"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Nieuw contact"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nieuwe contactenlijst"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -106,65 +106,65 @@ msgid "evolution minicard"
 msgstr "evolution minikaart"
 
 # wekkers/alarmen
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Het heeft alarmeringen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Het herhaalt zich."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Het is een bijeenkomst."
 
-#: ../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 "Agendanotitie: samenvatting is %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 "Agendanotitie: bevat geen samenvatting."
 
 # is dit goed?
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "agendanotitie weergeven"
 
 # aandacht grijpen/betere vertaling?
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Focus grijpen"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nieuwe afspraak"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Nieuwe agendanotitie voor de hele dag"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nieuwe bijeenkomst"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Ga naar vandaag"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Ga naar datum"
 
-#: ../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 "een tabel om de huidige tijdsperiode weer te geven en te selecteren"
 
 #. 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."
@@ -173,14 +173,14 @@ msgstr[1] "Het heeft %d agendanotities."
 
 #. 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 "Het heeft geen agendanotities."
 
 #. 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 "Werkweekweergave: %s. %s"
@@ -188,22 +188,22 @@ msgstr "Werkweekweergave: %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 "Dagweergave: %s. %s"
 
 # agendainformatie
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "agendaweergave voor een werkweek"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "agendaweergave voor één of meer dagen"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -213,30 +213,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:750
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../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: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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -245,63 +245,63 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../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: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:766
 msgid "Gnome Calendar"
 msgstr "Gnome agenda"
 
 # hoofdletter?
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "zoekbalk"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "evolution agenda zoekbalk"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Springknop"
 
 # agendanotities/notities
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Klik hier voor meer notities."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Maandweergave: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Weekweergave: %s. %s"
 
 # agendainformatie/maandagenda
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "agendaweergave voor een maand"
 
 # weekagenda
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "agendaweergave voor één of meer weken"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "popup"
 
 #. 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 "een dochter genereren"
 
@@ -313,13 +313,13 @@ msgstr "bewerken"
 msgid "begin editing this cell"
 msgstr "deze cel bewerken"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "omschakelen"
 
 # omwisselen/omschakelen/schakelen
 #. 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 "de cel omschakelen"
 
@@ -340,47 +340,47 @@ msgstr "opvouwen"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "de rij in de ETree die deze cel bevat opvouwen"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Tabelcel"
 
-#: ../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 "Klik om toe te voegen"
 
-#: ../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 "klikken"
 
-#: ../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 "sorteren"
 
-#: ../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 "Agenda: van %s tot %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "evolution agenda-item"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Combinatieknop"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Standaard activeren"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Popup-menu"
 
@@ -395,11 +395,10 @@ msgstr "activeren"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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}’ is een alleen-lezen adresboekbron. Ga naar adresboekweergave en "
-"selecteer een adresboek dat contacten kan accepteren."
+"‘{0}’ is een alleen-lezen adresboek. Kies een ander adresboek uit de lijst."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -441,17 +440,17 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Kan geen schema informatie verkrijgen voor de LDAP server."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Kan het adresboek niet verwijderen."
 
 #: ../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 ""
-"Momenteel kunt u vanuit Evolution alleen een GroupWise systeem-adresboek "
-"benaderen. Gebruik eerst eenmalig een andere GroupWise mail-client, om uw "
+"Momenteel kunt u vanuit Evolution alleen het algemene GroupWise-adresboek "
+"benaderen. Gebruik eerst eenmalig een andere GroupWise mailclient om uw "
 "GroupWise Frequent Contacts en GroupWise Personal Contacts mappen te krijgen."
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -459,7 +458,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Adresboek '{0}' verwijderen?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Fout bij laden adresboek."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -472,7 +471,7 @@ msgstr "Kon aanmeldingscontrole bij de LDAP server niet uitvoeren."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Verwijderen van contact is mislukt"
 
@@ -495,7 +494,7 @@ msgstr ""
 "Bepaalde functies werken mogelijk niet correct met uw huidige server-versie"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Het Evolution adresboek is plotseling gesloten."
 
 # verkleinen ipv herschalen
@@ -512,38 +511,37 @@ msgid ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
-"Deze LDAP server gebruikt een oudere versie van LDAP, welke geen "
+"Deze LDAP-server gebruikt een oudere versie van LDAP, welke geen "
 "ondersteuning\n"
 "heeft voor deze functionaliteit of verkeerd is geconfigureerd. Vraag uw\n"
-"systeembeheerder voor een ondersteunde zoek basis."
+"systeembeheerder voor een ondersteunde zoekbasis."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Dit adresboek zal definitief worden verwijderd."
+msgid "This address book could not be opened."
+msgstr "Kan adresboek niet openen."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
-msgstr "Dit adresboek kon niet worden geopend."
+msgid "This address book server does not have any suggested search bases."
+msgstr "Deze adresboekserver heeft geen suggestie voor een zoekbasis."
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Deze adresboek server heeft geen suggestie voor een zoek basis."
-
-#: ../addressbook/addressbook.error.xml.h:27
 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 ""
-"Deze adresboek-server kan onbereikbaar zijn of de servernaam kan verkeerd "
-"gespeld zijn of de netwerkverbinding kan verbroken zijn."
+"De adresboekserver is onbereikbaar. Misschien heeft u een tikfout gemaakt in de naam of is er geen netwerkverbinding."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Dit adresboek zal definitief worden verwijderd."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Deze server ondersteunt geen LDAPv3 schema informatie."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
-msgstr "Openen van adresboek is onmogelijk"
+msgid "Unable to open address book"
+msgstr "Kan adresboek niet openen"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
@@ -559,13 +557,10 @@ msgstr "Wilt u de wijzingen opslaan?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
-"U probeerd een contact te verplaatsen van het ene adresboek naar een ander\n"
-"maar het kan niet verwijderd worden uit de bron. Wilt u in plaats van "
-"verplaatsen\n"
-"een kopie bewaren?"
+"U probeert een contact te verplaatsen naar een ander adresboek, maar deze kan niet verwijderd worden. Wilt u in plaats van verplaatsen een kopie maken?"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid ""
@@ -579,8 +574,7 @@ msgstr ""
 "ondersteunde versie."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "U heeft onvoldoende rechten om het contact uit dit adresboek te verwijderen."
 
@@ -599,7 +593,7 @@ msgstr ""
 "Uw contacten voor {0} zullen niet beschikbaar zijn totdat Evolution herstart "
 "is."
 
-#: ../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,9 +616,9 @@ msgstr "He_rschalen"
 msgid "_Use as it is"
 msgstr "_Zo gebruiken"
 
-#. 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:44 ../mail/mail.error.xml.h:147
-#: ../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}"
 
@@ -633,17 +627,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Standaard sync-adres:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
-msgstr "Kon adresboek niet laden"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
+msgstr "Kan adresboek niet laden"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
@@ -670,10 +664,10 @@ msgstr "Automatisch aanvullen hier configureren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Adresboek"
 
@@ -699,8 +693,8 @@ msgstr "Evolution adresboekcomponent"
 
 # vertaling van control hier?
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime certificaatbeheer controle"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/Mime certificaatbeheer"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -715,12 +709,13 @@ msgstr "U kunt uw S/Mime certificaten hier beheren"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1475
+#: ../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
 msgid "On This Computer"
 msgstr "Op deze computer"
 
@@ -734,126 +729,130 @@ msgstr "Op deze computer"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../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 "Persoonlijk"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Op LDAP servers"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Contacten_lijst"
 
 # een nieuwe contactenlijst aanmaken
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Maak een nieuwe contactenlijst"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Nieuw adresboek"
 
 # Controletoets is Shift+Ctrl+B
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "Adres_boek"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Nieuw adresboek aanmaken"
 
 # upgraden/opwaarderen
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Het opwaarderen van adresboek-instellingen of mappen is mislukt."
 
 # ?
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "De i_nhoud van het adresboek lokaal kopiëren voor offline gebruik"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:257 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Algemeen"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Server-informatie"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Aanmeldingscontrole"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
 # zoekende/bezig met zoeken/zoeken...
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Zoeken"
 
 # bezig met downloaden/downloaden...
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Downloaden"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Adresboek eigenschappen"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Bezig met overzetten…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "‘%s’ wordt overgezet:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -906,71 +905,77 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw Pilot Sync-gegevens overzetten…"
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "De \"%s\" map hernoemen naar:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Mapnaam mag het teken: '/' niet bevatten"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Nieuw adresboek"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Opslaan als vCard…"
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../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 "_Verwijderen"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Eigenschappen…"
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Eigenschappen"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Contactenbron-selectie"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonieme verbinding met LDAP server wordt opgezet"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Fout bij het aanmelden.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Voer het wachtwoord in voor %s (gebruiker %s)"
 
 # voer wachtwoord in/geef (het) wachtwoord/wachtwoord invoeren
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Wachtwoord invoeren"
 
@@ -1064,7 +1069,7 @@ msgid "Add Address Book"
 msgstr "Adresboek toevoegen"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Altijd"
 
@@ -1072,75 +1077,80 @@ msgstr "Altijd"
 msgid "Anonymously"
 msgstr "Anoniem"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "Adresboek _ophalen tot aan limiet"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Basis"
 
 # onderscheiden naam?
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Onderscheiden naam"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Zoek ondersteunde zoekbases"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "Aan_melding:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nooit"
 
 #. 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:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Geen versleuteling"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Één"
 
 #. 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:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL-versleuteling"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Zoekfilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Zoek_basis:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Zoekfilter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Zoekfilter"
 
 # wat een technobabble!
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1150,7 +1160,7 @@ msgstr ""
 "zoekopdracht. Indien niet gewijzigd, wordt standaard gezocht naar "
 "objectklassen van het soort \"persoon\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1158,7 +1168,7 @@ msgstr ""
 "Deze optie selecteren betekent dat Evolution alleen verbinding zal maken met "
 "uw LDAP server wanneer deze het SSL-protocol ondersteunt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1166,7 +1176,7 @@ msgstr ""
 "Deze optie selecteren betekent dat Evolution alleen verbinding zal maken met "
 "uw LDAP server wanneer deze het TLS-protocol ondersteunt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1176,23 +1186,23 @@ msgstr ""
 "niet ondersteunt. Dit betekent dat uw verbinding onbeveiligd zal zijn en dat "
 "u veiligheidsrisico's loopt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Ondersteunde zoekbases"
 
 #. 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:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS-versleuteling"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1202,7 +1212,7 @@ msgstr ""
 "Als u dit leeg laat, zal de zoekopdracht starten aan het de basis van de "
 "mappenstructuur."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1214,7 +1224,7 @@ msgstr ""
 "afzoeken. Een zoekdiepte van \"één\" zal slechts één niveau dieper dan uw "
 "zoekbasis gaan."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1222,7 +1232,7 @@ msgstr ""
 "Dit is de volledige naam van uw LDAP-server. Bijvoorbeeld \"ldap.mijnbedrijf."
 "com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1230,7 +1240,7 @@ msgstr ""
 "Dit is het maximum aantal kaarten dat zal worden opgehaald. Als u het te "
 "hoog instelt zal het adresboek traag worden."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1239,7 +1249,7 @@ msgstr ""
 "Dit is de methode die Evolution zal gebruiken om u aan te melden. Als het op "
 "\"E-mailadres\" wordt gezet, is anonieme toegang tot de ldap server vereist."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1247,7 +1257,7 @@ msgstr ""
 "Deze naam wordt gebruikt om deze server in uw mappenlijst weer te geven. De "
 "naam is alleen voor weergave-doeleinden."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1257,75 +1267,76 @@ msgstr ""
 "is een lijst met standaardpoorten gegeven. Vraag aan uw systeembeheerder "
 "welke poort u moet invullen."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Unieke naam (DN) wordt gebruikt"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "E-mail adres wordt gebruikt"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Indien mogelijk"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Adresboek toevoegen"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Zoek ondersteunde zoekbases"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Aanmeldmethode:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Zoek gebied:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Timeout:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Beveiligde verbinding (SSL) gebr_uiken:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kaarten"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minuten"
 
@@ -1367,7 +1378,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Werk</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1379,16 +1390,16 @@ msgid "Ca_tegories..."
 msgstr "Categorieë_n…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../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
 msgid "Contact Editor"
 msgstr "Contacten bewerken"
 
@@ -1402,7 +1413,7 @@ msgid "Image"
 msgstr "Foto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1417,7 +1428,7 @@ msgid "Nic_kname:"
 msgstr "_Roepnaam:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
@@ -1431,11 +1442,11 @@ msgstr "Telefoon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Werk"
 
@@ -1457,8 +1468,8 @@ msgid "_Birthday:"
 msgstr "_Geboortedatum:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Agenda:"
@@ -1550,1123 +1561,1124 @@ msgstr "_Waar:"
 msgid "_Zip/Postal Code:"
 msgstr "Post_code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "Adres"
 
-#: ../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:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Bewerkbaar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Verenigde Staten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algerije"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Amerikaans 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 "Antarctica"
 
-#: ../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 en Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentinië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenië"
 
-#: ../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 "Australië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Oostenrijk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaidjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahama's"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../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 "Wit Rusland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "België"
 
-#: ../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 "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivië"
 
-#: ../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 "Bosnië-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 Eiland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brazilië"
 
-#: ../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 "Brits Indische Oceaan Territorium"
 
-#: ../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 "Bulgarije"
 
-#: ../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 "Cambodja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Kameroen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Kaapverdische Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Kaaimaneilanden"
 
-#: ../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 "Centraal Afrikaanse Republiek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Tsjaad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Kerstmis-Eiland"
 
-#: ../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 "Kokos (Keeling) Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komoren"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../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 "Congo, De democratische republiek van"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cook Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../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:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Ivoorkust"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Kroatië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../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 "Tsjechië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Denemarken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominicaanse Republiek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egypte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../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:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Equatoriaal Guinee"
 
-#: ../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 "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Ethiopië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falkland eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Faroër Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Frankrijk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Frans Guiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Frans Polinesië"
 
-#: ../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 "Frans Zuidelijke Territoriën"
 
-#: ../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 "Georgië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../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 "Griekenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../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 "Guinee"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinee-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haïti"
 
-#: ../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 "Heard en McDonald Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../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: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 "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hongarije"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "IJsland"
 
-#: ../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 "Indonesië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Ierland"
 
-#: ../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 "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japan"
 
-#: ../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 "Jordanië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazachstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea, Democratische republiek van"
 
-#: ../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 "Noord Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Koeweit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirgizië"
 
-#: ../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 "Letland"
 
-#: ../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 "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Litouwen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macaõ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedonië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../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 "Maleisië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Malediven"
 
-#: ../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 "Marshall Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritanië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../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 "Mexico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesië"
 
-#: ../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 "Moldavië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolië"
 
-#: ../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 "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../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 "Namibië"
 
-#: ../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 "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Nederlandse Antillen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nieuw Caledonië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nieuw Zeeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../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 "Nigeria"
 
-#: ../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 "Norfolk Eiland"
 
-#: ../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 "Noordelijke Mariana Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Noorwegen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../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 "Palesteins Territorium"
 
-#: ../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 "Papoea Nieuw Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../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 "Filippijnen"
 
-#: ../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 "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../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:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../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 "Roemenië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Rusland"
 
-#: ../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 "Saint Kitts en 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 "Santa 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 "Saint Vincent en de Grenadines"
 
-#: ../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 en 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 "Saoedi-Arabië"
 
-#: ../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 "Servië en Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: ../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 "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slowakije"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovenië"
 
-#: ../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 Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Zuid-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 "Zuid Georgië en de Zuidelijke Sandwich Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Spanje"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../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:339
+#: ../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:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre en Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Soedan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../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 en Jan Mayen Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Zweden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Zwitserland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Syrië"
 
-#: ../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 "Tadjikistan"
 
-#: ../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 "Tanzania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Oost Timor"
 
-#: ../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 en Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunesië"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turkije"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../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 "Turkse en Caicos Eilanden"
 
-#: ../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 "Oeganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Oekraïne"
 
-#: ../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 "Verenigde Arabische Emiraten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Verenigd Koninkrijk"
 
-#: ../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 "Amerikaanse Kleine Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Oezbekistan"
 
-#: ../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 "Viëtnam"
 
-#: ../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 "Britse Maagdeneilanden"
 
-#: ../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 "Amerikaanse Maagdeneilanden"
 
-#: ../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 en Futuna Eilanden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Westelijke 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
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Naam"
 
-#: ../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 "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
 # Dienst/Service
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Service"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Locatie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Thuis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Overige"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Bron boek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Doel boek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Is nieuw contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Beschrijfbare velden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Vereiste velden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Gewijzigd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contacten-editor - %s"
 
 # foto is beter
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Selecteer een afbeelding voor dit contact"
 
 # foto is beter
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Geen afbeelding"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2674,47 +2686,47 @@ msgstr ""
 "De contact-data is ongeldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' heeft een ongeldige opmaak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' heeft een ongeldige opmaak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is leeg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Ongeldig contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "Volledig be_werken"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Volledige naam"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Adresboek selecteren"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2723,7 +2735,7 @@ msgstr ""
 "Weet u zeker dat u de\n"
 "contactenlijst (%s) wilt verwijderen?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2731,7 +2743,7 @@ msgstr ""
 "Weet u zeker dat u deze\n"
 "contactenlijsten wilt verwijderen?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2740,7 +2752,7 @@ msgstr ""
 "Weet u zeker dat u het\n"
 "contact (%s) wilt verwijderen?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2848,7 +2860,7 @@ msgstr "_IM-dienst:"
 #: ../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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Locatie:"
@@ -2858,7 +2870,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Leden</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 "Contactenlijst bewerken"
 
@@ -2878,25 +2890,25 @@ msgstr "_Lijstnaam:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Leden contactenlijst"
 
-#: ../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 "_Leden"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Boek"
 
-#: ../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 "Is nieuwe lijst"
 
@@ -2937,40 +2949,40 @@ msgstr ""
 "De naam of het e-mailadres van dit contact bestaat reeds\n"
 "in deze map. Wilt u het toch toevoegen?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Contact samenvoegen"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "Sa_menvoegen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Contact samenvoegen"
+
+#: ../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:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:166
-#: ../calendar/gui/cal-search-bar.c:81 ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-mail begint met"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Name begins with"
-msgstr "Naam begint met"
+msgid "Name contains"
+msgstr "Naam bevat"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2984,10 +2996,10 @@ msgstr[0] "%d contact"
 msgstr[1] "%d contacten"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Zoekopdracht"
 
@@ -2995,123 +3007,120 @@ msgstr "Zoekopdracht"
 msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
-#: ../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:3335
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Naam begint met"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Bron"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../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 "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Opslaan als vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Openen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Nieuw contact…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nieuwe _contactenlijst…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "Op_slaan als vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "Contact _doorsturen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "Contacten _doorsturen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Stuur _bericht aan contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Stuur _bericht naar lijst"
 
 # naar/aan
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Stuur _bericht aan contacten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "Af_drukken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Kopiëren naar adresboek…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_Verplaatsen naar adresboek…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2010 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2065
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Plakken"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1523
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "Elke categorie"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Onbekende fout"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3143,7 +3152,7 @@ msgstr "Autotelefoon"
 
 #: ../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:143
+#: ../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
@@ -3246,9 +3255,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../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 "Rol"
 
@@ -3285,38 +3294,38 @@ msgid "Web Site"
 msgstr "Website"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
+#: ../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
 msgid "Width"
 msgstr "Breedte"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
+#: ../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
 msgid "Height"
 msgstr "Hoogte"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Heeft focus"
 
@@ -3336,11 +3345,21 @@ msgstr "Tekstmodel"
 msgid "Max field name length"
 msgstr "Maximale veldnaam lengte"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Kolombreedte"
 
-#: ../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"
+"Zoeken naar contacten…"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3354,7 +3373,7 @@ msgstr ""
 "\n"
 "of dubbelklik hier om een nieuw contact te maken."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3368,7 +3387,7 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw contact te maken."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3378,7 +3397,7 @@ msgstr ""
 "\n"
 "Zoeken naar het contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3388,42 +3407,42 @@ msgstr ""
 "\n"
 "Er zijn geen items om weer te geven."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-mail werk"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "E-mail thuis"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "E-mail overig"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Geselecteerd"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Heeft cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Verwijzing in browser _openen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "Verwijzing _kopiëren"
 
 # verzenden naar...
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Nieuw bericht sturen aan…"
 
@@ -3468,25 +3487,23 @@ msgid "Video Chat"
 msgstr "Video-chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2372
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../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
+#: ../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-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 "Agenda"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Vrij/Bezet"
 
@@ -3509,12 +3526,14 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2360
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Geboortedatum"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2361
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Verjaardag"
 
@@ -3561,7 +3580,7 @@ msgstr "Geen Zelf-contact gedefinieerd"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Bewerking niet toegestaan"
 
@@ -3584,11 +3603,11 @@ msgstr "Protocol niet ondersteund"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Geannuleerd"
 
@@ -3624,41 +3643,51 @@ msgstr "Bron bestaat niet"
 msgid "Not available in offline mode"
 msgstr "Niet beschikbaar indien offline"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Onbekende fout"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Ongeldige serverversie"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Authenticatiemethode niet ondersteund"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 ""
-"Wij konden dit adresboek niet openen. Dit betekent dat het boek niet "
-"aangemerkt voor offline gebruik of nog niet is gedownload voor offline "
-"gebruik. Om de inhoud te downloaden moet u het adresboek voor één keer in "
-"online-modus laden."
+"Kan adresboek niet openen. Dit betekent dat het niet "
+"aangemerkt is voor off-line gebruik of nog niet is gedownload voor off-line "
+"gebruik. Om de inhoud te downloaden moet u het adresboek eenmalig "
+"on-line laden."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
-"Wij konden dit adresboek niet openen.  Controleer of het pad %s bestaat en "
+"Kan adresboek niet openen.  Controleer of het pad %s bestaat en "
 "of u het mag benaderen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
-"Wij konden het adresboek niet openen.  Dit kan komen doordat\n"
-"u een ongeldige URI heeft opgegeven of doordat de LDAP server\n"
+"Kan adresboek niet openen.  Dit kan komen doordat"
+"u een ongeldige URI heeft opgegeven of doordat de LDAP server"
 "onbereikbaar is."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3668,75 +3697,80 @@ msgstr ""
 "meegecompileerd.  Indien u LDAP in Evolution wilt gebruiken moet u een "
 "Evolution-pakket met LDAP-ondersteuning installeren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "Kan het adresboek niet openen.  Dit kan komen doordatu een ongeldige URI "
-"heeft opgegeven of dat de serveronbereikbaar is."
+"heeft opgegeven of dat de server onbereikbaar is."
+
+# niet letterlijk vertaald
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Details:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "Er zijn meer resultaten gevonden dan weergegeven kunnen\n"
 "worden. Probeer uw opdracht specifieker te maken of verhoog\n"
-"de limiet voor resultaten in de voorkeuren van het adresboek."
+"de limiet voor resultaten in de voorkeuren van dit adresboek."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "Deze zoekopdracht duurt langer dan de ingestelde limiet.\n"
 "Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
-"bij de instellingen van de adresboekserver."
+"bij de instellingen van deze adresboekserver."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Het backend van dit adresboek kon uw opdracht niet verwerken."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
+msgstr "Het backend van dit adresboek kan uw opdracht niet verwerken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr "Het backend van dit adresboek weigerde uw zoekopdracht te verwerken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "De zoekopdracht is niet succesvol beeïndigd"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Fout bij toevoegen kaart"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Fout bij aanpassen van kaart"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Fout bij verwijderen kaart"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3751,16 +3785,16 @@ msgstr[1] ""
 "%d contacten weergeven zal %d nieuwe vensters openen.\n"
 "Wilt u deze contacten echt weergeven?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Niet weergeven"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "_Alle contacten weergeven"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3769,71 +3803,71 @@ msgstr ""
 "%s bestaat reeds.\n"
 "Wilt u het overschrijven?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Overschrijven"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacten"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Adresboek selecteren"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "lijst"
 
 # kaart verplaatsen naar
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Verplaats kaart naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Kopieer kaart naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Verplaats kaarten naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Kopieer kaarten naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "Meerdere vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard voor %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Contactinformatie"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contactinformatie voor %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Adresboek wordt benaderd…"
 
@@ -3857,50 +3891,50 @@ msgid "Show Compact vCard"
 msgstr "Compacte vCard tonen"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
-msgstr "Opslaan in het adresboek"
+msgid "Save in address book"
+msgstr "Opslaan in adresboek"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Kaartweergave"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importeren…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV of tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV en tab importeerprogramma"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV of tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV en tab importeerprogramma"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV of tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV en tab importeerprogramma"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 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:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF import assistent"
 
@@ -3953,12 +3987,12 @@ msgid "Format"
 msgstr "Formaat"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Kop"
 
@@ -4060,8 +4094,8 @@ msgstr "Schaduw"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Grootte:"
@@ -4079,7 +4113,7 @@ msgid "Top:"
 msgstr "Bovenzijde:"
 
 #: ../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 "Type:"
 
@@ -4091,54 +4125,54 @@ msgstr "Breedte:"
 msgid "_Font..."
 msgstr "_Lettertype…"
 
-#: ../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 "Contactenlijst printstijl editor test"
 
-#: ../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 "Copyright (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 "Dit zou de print stijl bewerker moeten testen"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Kaart print test"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Dit zou de kaart print code moeten testen"
 
-#: ../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 "Kan bestand niet openen"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "Kon lijst met adresboeken niet verkrijgen"
+msgid "Couldn't get list of address books"
+msgstr "Kan lijst met adresboeken niet verkrijgen"
 
 # het gaat om een adresboek, dus alleen boek is wat raar.
 # eigenlijk: adresboek openen is mislukt
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
-msgstr "kon het adresboek niet openen"
+msgstr "kan het adresboek niet openen"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
-msgstr "Specificeer het uitvoer bestand in plaats van de standaard uitvoer"
+msgstr "Specificeer het uitvoerbestand in plaats van de standaarduitvoer"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
-msgstr "Lijst met lokale adresboek mappen"
+msgid "List local address book folders"
+msgstr "Lijst met lokale adresboekmappen"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
@@ -4190,19 +4224,19 @@ msgstr "Onbekende fout"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{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}’ is een alleen-lezen agendabron. Ga naar agendaweergave en selecteer "
-"een agenda die afspraken kan accepteren."
+"‘{0}’ is een alleen-lezen agenda. Ga naar agendaweergave en "
+"selecteer een andere agenda."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"‘{0}’ is een alleen-lezen agendabron geselecteerd. Ga naar agendaweergave en "
+"‘{0}’ is een alleen-lezen agenda. Ga naar agendaweergave en "
 "selecteer een agenda die afspraken kan accepteren."
 
 # samenvatting/onderwerp
@@ -4304,19 +4338,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Weet u zeker dat u deze afspraak wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Weet u zeker dat u deze bijeenkomst wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Weet u zeker dat u deze memo wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Weet u zeker dat u deze taak wilt verwijderen?"
@@ -4476,12 +4510,12 @@ msgid "The calendar is not marked for offline usage."
 msgstr "De agenda is niet aangemerkt voor offline gebruik."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "De memo's-lijst is niet aangemerkt voor offline gebruik"
+msgid "The memo list is not marked for offline usage."
+msgstr "De memo's-lijst is niet aangemerkt voor off-line gebruik"
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
-msgstr "De takenlijst is niet aangemerkt voor offline gebruik."
+msgstr "De takenlijst is niet aangemerkt voor off-line gebruik."
 
 #: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
@@ -4572,12 +4606,11 @@ msgstr ""
 "Uw taken zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "Wijzigingen verwerpen"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "Op_slaan"
 
@@ -4587,8 +4620,8 @@ msgstr "Wijzigingen op_slaan"
 
 # in outlook wordt de 'e' als sneltoets gebruikt
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:145
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../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 "V_erzenden"
 
@@ -4601,55 +4634,56 @@ msgstr "_Melding versturen"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Meerdaagse agendanotities splitsen:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Kon evolution-data-server niet starten"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon agenda-gegevens niet uit de pilot lezen"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Kon memo-gegevens niet uit de pilot lezen"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Kon memo-gegevens niet naar de pilot schrijven"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Standaardprioriteit:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet naar de pilot schrijven"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Agenda en taken"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Agenda's"
 
@@ -4691,25 +4725,25 @@ msgid "Memo_s"
 msgstr "_Memo's"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1698 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "Memo's"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1570 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../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: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 "Taken"
@@ -4727,26 +4761,27 @@ msgstr "_Taken"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution agenda alarmeringsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
+#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uren"
 
 # uur is beter: 5 uur en 10 minuten
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Begintijd"
 
@@ -4757,9 +4792,9 @@ msgstr "Afspraken"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Locatie:"
@@ -4769,15 +4804,15 @@ msgid "Snooze _time:"
 msgstr "Sluimer_tijd:"
 
 #: ../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:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../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 "Be_werken"
 
@@ -4789,33 +4824,33 @@ msgstr "_Sluimeren"
 msgid "location of appointment"
 msgstr "locatie van de afspraak"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Geen omschrijving beschikbaar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Geen locatieinformatie beschikbaar."
 
 # wekkers/alarmen/alarmeringen
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "U heeft %d alarmeringen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4827,7 +4862,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4844,15 +4879,15 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Kon bonobo niet initialiseren"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4861,13 +4896,13 @@ msgstr ""
 "opgestart…"
 
 # onjuiste/ongeldige
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "ongeldige tijd"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4875,8 +4910,8 @@ msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4887,8 +4922,8 @@ msgstr[1] "%d minuten"
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5147,13 +5182,13 @@ msgstr "Het statusveld tonen in de agendanotitie/taak/bijeenkomst-editor"
 # FIXME: dit moet duidelijker
 # weergavepaneel/voorbeeldpaneel
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Het voorbeeldpaneel tonen"
 
 # BUG, betere vertaling
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Het voorbeeldpaneel tonen."
 
@@ -5205,7 +5240,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Tijd wanneer de laatste alarmering is afgegaan, in time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Tijdzone"
 
@@ -5355,66 +5390,66 @@ msgid "daylight savings time"
 msgstr "zomertijd"
 
 # onderwerp/samevatting
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Samenvatting bevat"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Omschrijving bevat"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Categorie is"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Locatie bevat"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Niet passend"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Taken voor de komende 7 dagen"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Actieve taken"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Verlopen taken"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Afgeronde taken"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Taken met bijlagen"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Actieve afspraken"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Afspraken van de komende 7 dagen"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Afdrukken"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5423,15 +5458,16 @@ msgstr ""
 "Deze bewerking zal alle taken die ouder zijn de gespecificeerde tijd "
 "definitief verwijderen. Als u doorgaat zult u ze niet meer kunnen herstellen."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Verwijderen van items ouder dan"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
+#: ../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 "dagen"
@@ -5441,136 +5477,336 @@ msgstr "dagen"
 #. 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:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
+#: ../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 "Op het web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Verjaardagen & gedenkdagen"
 
 #. 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 "Weer"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Nieuwe agenda"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopiëren…"
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2101
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Eigenschappen"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Bijwerken van agenda's mislukt."
 
 # maken ipv aanmaken hier beter
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kan de agenda '%s' niet openen voor het maken van notities en bijeenkomsten"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Er is geen agenda beschikbaar voor het maken van notities en bijeenkomsten"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Agendabron-selectie"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nieuwe bijeenkomst"
 
 # Combinatietoets is Shift+Ctrl+E
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "Bij_eenkomst"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nieuwe agenda"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "A_genda"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
-msgstr "Maak een nieuwe agenda aan"
+msgstr "Nieuwe agenda aanmaken"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
-msgstr "Dag weergave"
+msgstr "Dagweergave"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
-msgstr "Werkweek weergave"
+msgstr "Werkweekweergave"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
-msgstr "Week weergave"
+msgstr "Weekweergave"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
-msgstr "Maand weergave"
+msgstr "Maandweergave"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Alle velden"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Bijlagen"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Aanwezige"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Bedrijf"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Categorie"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classificatie"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Wedstrijd"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Vertrouwelijk"
+
+#: ../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 "Omschrijving"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Omschrijving bevat"
 
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "bestaat niet"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Bestaat"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favorieten"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Kadootjes"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Doelen"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vakantie"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Vakantiekaartjes"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Veelgebruikte contacten"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideeën"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Internationaal"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Belangrijke klant"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Overig"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "De komende 7 dagen"
+
+#: ../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 "Organisator"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Telefoonlijst"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privé"
+
+#: ../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
+msgid "Public"
+msgstr "Openbaar"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Herhaling"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategieën"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Samenvatting"
+
 # onderwerp/samevatting
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Samenvatting bevat"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Leveranciers"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Tijd &amp; Uitgaven"
+
+#: ../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 "Wachten…"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "bevat"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "is"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "is niet"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Fout bij openen van de agenda"
@@ -5583,11 +5819,11 @@ msgstr "Methode niet ondersteund tijdens het openen van de agenda"
 msgid "Permission denied to open the calendar"
 msgstr "Toegang geweigerd bij openen van de agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Alarmering bewerken"
 
@@ -5621,17 +5857,17 @@ msgid "Mes_sage:"
 msgstr "Be_richt:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Geef een waarschuwing"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Start een programma"
 
@@ -5645,7 +5881,7 @@ msgid "Send To:"
 msgstr "Aan:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Verstuur een bericht"
 
@@ -5701,7 +5937,7 @@ msgstr "minuten"
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Actie/Sensor"
 
@@ -5712,16 +5948,15 @@ msgstr "_Toevoegen"
 #: ../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 "Alarmeringen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Probeer bijlage automatisch weer te geven"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Bestand(en) bijvoegen"
 
@@ -5791,8 +6026,8 @@ msgid "Display"
 msgstr "Weergave"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -5807,8 +6042,8 @@ msgstr ""
 "Dagen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Maandag"
 
@@ -5831,7 +6066,7 @@ msgstr ""
 "Zondag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
@@ -5841,8 +6076,8 @@ msgid "S_un"
 msgstr "_Zon"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -5861,8 +6096,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Week_nummers tonen in datumkiezer"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -5880,13 +6115,13 @@ msgid "Template:"
 msgstr "Sjabloon:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Donderdag"
 
 #: ../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 "Tijd_zone:"
 
@@ -5895,14 +6130,14 @@ msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dinsdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Woensdag"
 
@@ -5981,166 +6216,352 @@ msgid "before every appointment"
 msgstr "voor het begin van elke afspraak"
 
 # steeds dezelfde sneltoets gebruiken?
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "De inhoud van de agenda lokaal _kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "De inhoud van de _takenlijst lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "De inhoud van het _memo's-lijst lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_Kleur:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Takenlijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Memo's-lijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Agenda-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Nieuwe agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Takenlijst-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Nieuwe takenlijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Memolijst-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nieuwe memo's-lijst"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Deze agendanotitie is verwijderd."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Deze taak is verwijderd."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Deze memo is verwijderd."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s U heeft wijzigingen aangebracht. Deze wijzigingen verwerpen en de editor "
 "sluiten?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s U heeft niets gewijzigd. Editor sluiten?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Deze agendanotitie is gewijzigd."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Deze taak is gewijzigd."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Deze memo is gewijzigd."
 
 # weggooien beter dan vergeten
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  U heeft iets gewijzigd. Deze wijzigingen weggooien en de editor sluiten?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s U heeft niet veranderd, de editor verversen?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Verificatiefout: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " tot "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Voltooid"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Voltooid"
 
 # verloopdatum?
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Verloopt "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bijgevoegd bericht - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1724
-#: ../composer/e-msg-composer.c:1943
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Bijgevoegd bericht"
 msgstr[1] "%d bijgevoegde berichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2011
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Verplaatsen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2013
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "_Slepen annuleren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "bijlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Afspraak bewerken"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Bijeenkomst - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Afspraak - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Toegewezen taak - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Taak - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Memo - %s"
+
+# samenvatting/onderwerp
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Geen samenvatting"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Klik hier om het huidige venster te sluiten"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "De geselecteerde tekst naar klembord kopiëren"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "De geselecteerde tekst naar klembord knippen"
+
+# beschikbare niet meevertaald
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Klik hier om de hulp weer te geven"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "De tekst vanaf het klembord plakken"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Klik hier om het huidige venster op te slaan"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Alle tekst selecteren"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Classificatie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Bestand"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Hulp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "I_nvoegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Opties"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "Beel_d"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Bijlage…"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Klik hier om een bestand bij te voegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Categorieën"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Schakelt de weergave van categorieën aan/uit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Tijd_zone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Schakelt de weergave van de tijzone aan/uit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "_Openbaar"
+
+# open/openlijk/publiek/doorzichtig/openbaar
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Markeren als openbaar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Privé"
+
+# Classificeren/aanmerken
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Markeren als privé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Vertrouwelijk"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Markeren als vertrouwelijk"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "_Rol-veld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Schakelt de weergave van het rol-veld aan/uit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Schakelt de weergave van het RSVP-veld aan/uit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Statusveld:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Schakelt de weergave van het status-veld aan/uit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Type-veld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Schakelt weergave van type aanwezige aan/uit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "Recente _documenten"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Bijvoegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6148,18 +6569,18 @@ msgstr[0] "<b>%d</b> bijlage"
 msgstr[1] "<b>%d</b> bijlagen"
 
 # sneltoets moet k zijn
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Bijlagenbal_k verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Bijlagenbal_k tonen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1045
+#: ../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
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6167,137 +6588,97 @@ msgid "_Remove"
 msgstr "_Verwijderen"
 
 # bijlage toevoegen/bestand bijvoegen
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:2037
 #: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Bijlage toevoegen…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Bijlagen tonen"
 
 # te tonen/verbergen | aan/uit te zetten
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Druk op de spatiebalk om de bijlagenbalk te tonen|verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Afspraak bewerken"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Bijeenkomst - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Afspraak - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Toegewezen taak - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Taak - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Memo - %s"
-
-# samenvatting/onderwerp
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "Geen samenvatting"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via e-mail arriveerd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Kan huidige niet gebruiken!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Kan bron niet openen"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Kan doel niet openen"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Doel is alleen lezen"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Dit item _verwijderen uit de postvakken van alle andere geadresseerden?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "De agendanotitie kon niet verwijderd worden door een CORBA-fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "De taak kon niet verwijderd worden door een CORBA-fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "De memo kon niet verwijderd worden door een CORBA-fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Het item kon niet verwijderd worden door een CORBA-fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "De agendanotitie kon niet verwijderd worden omdat dit recht u is ontzegd"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "De taak kon niet verwijderd worden omdat dit recht u is ontzegd"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "De memo kon niet verwijderd worden omdat dit recht u is ontzegd"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Het item kon niet verwijderd worden omdat dit recht u is ontzegd"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "De agendanotitie kon niet verwijderd worden door een fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "De taak kon niet verwijderd worden door een fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "De memo kon niet verwijderd worden door een fout"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Het item kon niet verwijderd worden door een fout"
 
@@ -6307,7 +6688,7 @@ msgid "Contacts..."
 msgstr "Contacten…"
 
 #: ../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 "Overdragen aan:"
 
@@ -6315,23 +6696,76 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarmeringen"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+"Klik hier om alarmeringen voor deze agendanotitie in te stellen of uit te "
+"zetten"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "He_rhaling"
+
+# Maak deze gebeurtenis herhalend/een (zich) herhalende gebeurtenis
+# Deze gebeurtenis herhalen/laten herhalen/laten terugkomen
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Deze agendanotitie herhalen"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Verzendopties"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Extra verzendopties invoegen"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "Agendanotitie voor de hele _dag"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Schakelt het hebben van een agendanotitie voor de hele dag aan/uit"
+
+# bezet mooier dan bezig
+# periode tonen/weergeven als bezet
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "_Tijd tonen als bezet"
+
+# ingeplande tijd
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Schakelt de weergave van tijd die bezet is aan/uit"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "V_rij/Bezet"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Vrij/bezet-informatie van de aanwezigen bevragen"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Afspraak"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Herhaling"
-
 # wekkers/alarmen
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Deze agendanotitie heeft alarmeringen"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:"
@@ -6339,115 +6773,115 @@ msgstr "_Organisator:"
 
 # delegatee: One to whom something is delegated.
 # Meervoud: gedelegeerden (zelfde als delegates)
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Gedelegeerden"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Aan_wezigen"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Agendanotitie zonder begindatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Agendanotitie zonder einddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Einddatum is fout"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Begintijd is ongeldig"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Eindtijd is fout"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "De geselecteerde organisator heeft geen account meer."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Toevoegen"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan de agenda '%s' niet openen."
 
 # u treedt op/u representeert
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "U treedt op namens %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag voor de afspraak"
 msgstr[1] "%d dagen voor de afspraak"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d uur voor de afspraak"
 msgstr[1] "%d uur voor de afspraak"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuut voor de afspraak"
 msgstr[1] "%d minuten voor de afspraak"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Aanpassen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
-#: ../widgets/misc/e-signature-combo-box.c:69
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "Geen"
 
@@ -6473,24 +6907,26 @@ msgid "Custom Alarm:"
 msgstr "Aangepaste alarmering:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Omschrijving:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Agendanotitie omschrijving"
 
-#: ../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 "_Samenvatting:"
 
 # de a wordt gebruikt voor _annuleren, de m bij omschrijving
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "Ala_rm"
 
+#: ../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 "_Omschrijving:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Tijd:"
@@ -6521,29 +6957,25 @@ msgstr "Organisator _wijzigen"
 msgid "Co_ntacts..."
 msgstr "_Contacten…"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisator"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisator:"
 
 # meervoud beter?
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan memo's in '%s' niet openen."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "Aan"
 
@@ -6556,12 +6988,8 @@ msgstr "Be_gindatum:"
 msgid "T_o:"
 msgstr "_Aan:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Omschrijving:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groep:"
@@ -6573,7 +7001,7 @@ msgstr "_Groep:"
 # een .. die herhaaldelijk voorkomt
 # die zich herhaalt
 # terugkerende ...)
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
@@ -6582,7 +7010,7 @@ msgstr ""
 
 # Er wordt hier welke bedoeld ipv wat
 # overdragen/delegeren
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
@@ -6590,7 +7018,7 @@ msgstr ""
 "delegeren?"
 
 # Er wordt hier welke bedoeld ipv wat
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
@@ -6603,46 +7031,46 @@ msgstr ""
 # een .. die herhaaldelijk voorkomt
 # die zich herhaalt
 # terugkerende ...)
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "U bent een zich herhalende memo aan het aanpassen. Welke wilt u aanpassen?"
 
 # alleen deze keer/instantie/(weglaten)
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Alleen deze"
 
 # deze keer en vorige keren/instanties
 # deze, en die in het verleden
 # deze, en alle vorige
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Deze, en alle vorige"
 
 # deze en die in de toekoms/deze en de komende keren/
 # deze en alle komende
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Deze, en alle komende"
 
 # alle instanties/allen/alle keren
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Alle keren"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Herhalingsdatum is ongeldig"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "op"
 
@@ -6650,7 +7078,7 @@ msgstr "op"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "eerste"
 
@@ -6659,7 +7087,7 @@ msgstr "eerste"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "tweede"
 
@@ -6667,7 +7095,7 @@ msgstr "tweede"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "derde"
 
@@ -6675,7 +7103,7 @@ msgstr "derde"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "vierde"
 
@@ -6683,13 +7111,13 @@ msgstr "vierde"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "laatste"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Andere datum"
 
@@ -6697,7 +7125,7 @@ msgstr "Andere 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1e tot de 10e"
 
@@ -6705,7 +7133,7 @@ msgstr "1e tot de 10e"
 #. * 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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11e tot de 20e"
 
@@ -6713,48 +7141,48 @@ msgstr "11e tot de 20e"
 #. * 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21e tot de 31e"
 
 #. 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "op de"
 
 # agendanotities/gebeurtenissen/instanties
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "instanties"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Uitzondering toevoegen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Kon geen selectie verkijgen om aan te passen."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Uitzondering aanpassen"
 
 # vernieuwen/updaten/bijwerken
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Kon geen selectie verkrijgen om te verwijderen."
 
 # hoofdletter bij Tijd mag hier wel.
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/Tijd"
 
@@ -6805,15 +7233,15 @@ msgstr "we(e)k(en)"
 msgid "year(s)"
 msgstr "ja(a)r(en)"
 
-#: ../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 "Voltooiingsdatum is ongeldig"
 
 # webpagina/webstek
 # we moeten maar kijken in hoeverre webstek voeten aan de grond
 # krijgt in het Nederlands.
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Webstek"
 
@@ -6829,51 +7257,55 @@ msgstr "<span weight=\"bold\">Status</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:252
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Voltooid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Hoog"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "In behandeling"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "Laag"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "Normaal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Niet gestart"
 
@@ -6886,7 +7318,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
@@ -6903,27 +7335,39 @@ msgstr "_Prioriteit:"
 msgid "_Web Page:"
 msgstr "_Webstek:"
 
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Statusdetails"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "Klik voor weergave/wijzigen van statusdetails"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "Ver_zendopties"
+
 # taken/taak
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Taak"
 
 # takendetails/taakdetails
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Taakdetails"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "_Organisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Voltooiingsdatum is onjuist"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan taken in '%s' niet openen."
@@ -6937,19 +7381,15 @@ msgid "Categor_ies..."
 msgstr "Categorieë_n…"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Omschrijving:"
+msgid "D_ue date:"
+msgstr "Verloop_datum:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Tijdzone:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "Verloop_datum:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6957,143 +7397,127 @@ msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Opdracht om uit te voeren onbekend"
 
 #. 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:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s voor het begin van de afspraak"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s na het begin van de afspraak"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s bij het begin van de afspraak"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s voor het einde van de afspraak"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s na het einde van de afspraak"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s bij het einde van de afspraak"
 
 #. 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:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s bij %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:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik hier om %s te openen"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../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:857
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../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 "Begindatum:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../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 "Omschrijving:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Webstek:"
 
 # samenvatting/onderwerp
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../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 "Samenvatting:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Verloopdatum:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioriteit:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Openbaar"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privé"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Vertrouwelijk"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Einddatum"
@@ -7103,22 +7527,15 @@ msgstr "Einddatum"
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../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:365
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Vrij"
 
 # bezig/bezet (bezet is mooier) (tino)
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Bezet"
 
@@ -7132,69 +7549,69 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "Nee"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../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
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Opslaan als…"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr ""
 "Selecteer een map waarin de geselecteerde bijlagen in moeten worden "
 "opgeslagen…"
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../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:1367
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Opslaan als…"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Als _achtergrond instellen"
 
@@ -7202,131 +7619,158 @@ msgstr "Als _achtergrond instellen"
 msgid "_Save Selected"
 msgstr "Geselecteerden op_slaan"
 
-#: ../calendar/gui/e-cal-popup.c:439 ../mail/em-popup.c:853
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s…"
 
-#: ../calendar/gui/e-calendar-table.c:382
+# samenvatting/onderwerp
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Geen samenvatting *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Begin: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Verloopdatum: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:679 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:809 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1235 ../calendar/gui/e-memo-table.c:821
+#: ../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:277
 msgid "Save as..."
 msgstr "Opslaan als…"
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Nieuwe _taak"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Open _website"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Af_drukken…"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1674
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "Markeren als voltooid"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "Markeren als _onvoltooid"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Geselecteerde taken als _onvoltooid markeren"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de geselecteerde taken"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
@@ -7349,7 +7793,8 @@ msgid "Due date"
 msgstr "Verloopdatum"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prioriteit"
 
@@ -7357,130 +7802,111 @@ msgstr "Prioriteit"
 msgid "Start date"
 msgstr "Begindatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Verplaatsen van items"
 
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Kopiëren van items"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Nieuwe _afspraak…"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Nieuwe a_gendanotitie voor de hele dag"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nieuwe _bijeenkomst"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Huidige weergave"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "_Selecteer vandaag"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Selecteer dag…"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Af_drukken…"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Naar agenda _kopiëren…"
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Naar agenda _verplaatsen…"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Bijeenkomst delegeren…"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst plannen…"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iCalendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: ../calendar/gui/e-calendar-view.c:1703 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "_Allen beantwoorden"
 
 # instantie/gebeurtenis
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "_Maak deze instantie verplaatsbaar"
 
-#: ../calendar/gui/e-calendar-view.c:1709 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Verwijder deze instantie"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle instanties"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2232
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2236
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2252 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
 
 # hoe laat/tijd/wanneer
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tijd: %s %s"
 
 # liggende streepjes zijn beter leesbaar dan schuine strepen
 #. 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"
@@ -7504,44 +7930,34 @@ msgstr "%02i minuten delingen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:837 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
+#: ../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
 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:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (complexe herhaling)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Elke dag"
 msgstr[1] "Elke %d dagen"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7549,9 +7965,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Iedere week"
 msgstr[1] "Iedere %d weken"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7559,51 +7973,35 @@ msgstr[0] "Iedere week op"
 msgstr[1] "Iedere %d weken op"
 
 #. 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 " en "
 
-#. 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 "De %s dag van "
 
-#. 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 "De %s %s van "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "Iedere maand"
 msgstr[1] "Iedere %d maanden"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Ieder jaar"
 msgstr[1] "Iedere %d jaar"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7611,48 +8009,48 @@ msgstr[0] "in totaal %d keer"
 msgstr[1] "in totaal %d keer"
 
 #. 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 ", eindigend op "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Begint"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Eindigt"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Verloopt"
 
-#: ../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 "iCalendar informatie"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar fout"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "Een onbekend persoon"
 
 # Lees/beschouw/bekijk
 #. 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."
@@ -7660,30 +8058,30 @@ msgstr ""
 "<br> Lees de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../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:2034
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Voorlopig geaccepteerd"
 
 # afgezegd/geweigerd/afgewezen
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../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:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../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:2040
 msgid "Declined"
 msgstr "Afgewezen"
 
 # met punt op het einde
-#: ../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"
@@ -7692,271 +8090,271 @@ msgstr ""
 "vinden."
 
 # met punt op het einde
-#: ../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 ""
 "De taak is geannuleerd, echter zij is niet in uw takenlijsten terug te "
 "vinden."
 
-#: ../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> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
 # bijeenkomstgegevens/bijeenkomstinformatie
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Bijeenkomstinformatie"
 
-#: ../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> verzoekt %s om bij de bijeenkomst aanwezig te zijn."
 
-#: ../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> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Bijeenkomstvoorstel"
 
 # vrij vertaald
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> wil naar een bestaande bijeenkomst komen."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Bijeenkomst update"
 
-#: ../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> wil graag de laatste bijeenkomstgegevens ontvangen."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Bijeenkomst-updateverzoek"
 
-#: ../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> heeft geantwoord op een bijeenkomstverzoek."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Bijeenkomst antwoord"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Bijeenkomst annulering"
 
-#: ../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> heeft een onleesbaar bericht gestuurd."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Fout bijeenkomstbericht"
 
-#: ../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> heeft taakgegevens beschikbaar gemaakt."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Taakinformatie"
 
-#: ../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> verzoekt %s om een taak uit te voeren."
 
-#: ../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> verzoekt u een taak uit te voeren."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Taakvoorstel"
 
 # vrij vertaald
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> wil aan een bestaande taak bijdragen."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Taak-update"
 
-#: ../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> wil graag de laatste taakgegevens ontvangen."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Taak-updateverzoek"
 
-#: ../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> heeft een taakopdracht beantwoord."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Taak-antwoord"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Taak annulering"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Fout taakbericht"
 
-#: ../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> heeft vrij/bezet informatie gepubliceerd."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet informatie"
 
-#: ../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> vraagt om uw beschikbaarheidsinformatie."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet verzoek"
 
-#: ../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> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet antwoord"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Foutief vrij/bezet-bericht"
 
-#: ../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 "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: ../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 "De bijlage bevat geen geldig agendabericht"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen toonbaar agenda-object"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Update voltooid\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is ongeldig en kan niet worden bijgewerkt\n"
 
 # toevoegen als komt/aanwezige/aanwezig
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een geregistreerd staand persoon. Toevoegen als "
 "aanwezige?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Item verzonden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Verversen"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Accepteren"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
 # afzeggen/weigeren/afwijzen
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Afwijzen"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Vrij/bezet-informatie versturen"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Antwoordstatus verversen"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Laatste informatie versturen"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
@@ -7986,113 +8384,113 @@ msgstr "Agenda wordt geladen…"
 msgid "Server Message:"
 msgstr "Servermelding:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Vereiste deelnemers"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Optionele deelnemers"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Hulpbronnen"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Aanwezigen"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Persoon"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Groep"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Hulpbron"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Kamer"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Voorzitter"
 
-#: ../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-store.c:744 ../calendar/gui/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Vereiste deelnemer"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Optionele deelnemer"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Niet-deelnemer"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../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 "Heeft actie nodig"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../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
 msgid "Tentative"
 msgstr "Voorlopig"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../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
 msgid "Delegated"
 msgstr "Overgedragen"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Aanwezige                         "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 # bezig/in uitvoer
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "In uitvoer"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -8100,85 +8498,81 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Afwezig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Aan_wezigen…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_pties"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Alleen kantooruren t_onen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Uitge_zoomd tonen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "Vrij/Bezet _actualiseren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Alle mensen en hulpbronnen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Alle _mensen en één hulpbron"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_Vereiste mensen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Vereiste mensen en één hulpbr_on"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Aanwezige"
-
 # bezoeker/aanwezige/persoon
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
@@ -8213,8 +8607,8 @@ msgstr "_Verwijder de geselecteerde memo's"
 msgid "Click to add a memo"
 msgstr "Klik hier om een memo toe te voegen"
 
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2860
+#: ../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"
@@ -8223,87 +8617,83 @@ msgstr ""
 "Fout bij %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Memo's laden"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Openen van memo's op %s"
 
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd…"
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Taken laden"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Openen van taken op %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Afronden van taken…"
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Schrappen"
 
 # de/een
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Selecteer een tijdzone"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:339 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:825
-msgid "Updating query"
-msgstr "Aanvraag actualiseren"
-
-#: ../calendar/gui/gnome-cal.c:2497
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Aangepaste weergave"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "Aangepaste weergave op_slaan"
 
 # enkelvoud is mooier (voor het label)
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Weergave definiëren…"
 
 # uit/van
-#: ../calendar/gui/gnome-cal.c:2684
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Afspraken laden uit %s"
 
-#: ../calendar/gui/gnome-cal.c:2703
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Taken laden uit %s"
 
-#: ../calendar/gui/gnome-cal.c:2712
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Memo's laden uit %s"
 
-#: ../calendar/gui/gnome-cal.c:2819
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Openen van %s"
 
-#: ../calendar/gui/gnome-cal.c:3776
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Legen"
 
@@ -8363,57 +8753,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Selecteer vandaag"
 
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../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 "Er moet een organisator ingesteld worden."
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Er is minstens één bezoeker nodig"
 
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Agendanotitie-informatie"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Taakinformatie"
 
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Memoinformatie"
 
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet-informatie"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Agenda-informatie"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Vernieuwd"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Verversen"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Tegenvoorstel"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vrij/Bezet-informatie (%s tot %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar-informatie"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
@@ -8455,48 +8845,55 @@ msgstr "Er is geen agenda beschikbaar voor het aanmaken van memo's"
 msgid "Memo Source Selector"
 msgstr "Memo's-bron selectie"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nieuwe memo"
 
 # meervoud beter?
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
-msgstr "Mem_o's"
+msgstr "Mem_o"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Maak een nieuwe memo aan"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nieuwe gedeelde memo"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Gedeelde memo"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Maak een gedeelde memo aan"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nieuwe memo's-lijst"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
-msgstr "Memo's-li_jst"
+msgstr "Memoli_jst"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Een nieuwe memo's-lijst toevoegen"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Memo's afdrukken"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "De komende 7 dagen"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8508,7 +8905,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten…"
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8521,7 +8918,7 @@ msgstr ""
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten…"
 
 #. 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 ""
@@ -8529,21 +8926,21 @@ msgstr ""
 
 # overzetten/migreren
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan de agenda ‘%s’ niet migreren"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan de taken ‘%s’ niet migreren"
 
-#: ../calendar/gui/migration.c:1232
-#: ../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
+#: ../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 "Opmerkingen"
 
@@ -8700,59 +9097,54 @@ msgstr "Vr"
 msgid "Sa"
 msgstr "Za"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Taak"
 
 # samenvatting/onderwerp
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Samenvatting: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Aanwezigen: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
 # urgentie/prioriteit
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteit: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent voltooid: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorieën: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contacten: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Opkomende afspraken"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nieuwe takenlijst"
@@ -8783,39 +9175,47 @@ msgstr "Er is geen agenda beschikbaar voor het aanmaken van taken"
 msgid "Task Source Selector"
 msgstr "Takenbron-selectie"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nieuwe taak"
 
-#: ../calendar/gui/tasks-component.c:1328
+# taken/taak
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Taak"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nieuwe toegewezen taak"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Toegewe_zen taak"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Nieuwe toegewezen taak aanmaken"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nieuwe takenlijst"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Ta_kenlijst"
 
-#: ../calendar/gui/tasks-component.c:1344
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Nieuwe takenlijst toevoegen"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8827,1580 +9227,1620 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Taken afdrukken"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% voltooid"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "In behandeling"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "is groter dan"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Afspraken en bijeenkomsten"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Agenda openen"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar agendabestanden (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar import"
 
 # 1 uitroepteken is voldoende
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Herinnering!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar agendabestanden(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vKalender-import"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Agendanotities"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution agenda, intelligente import"
 
 #.
+#. *
+#. * 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/Azerbeijan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika?Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Algiers"
 
-#: ../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 "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/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/Djibouti"
 
-#: ../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/Tripoli"
 
-#: ../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/Costa_Rica"
 
-#: ../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/Guyana"
 
-#: ../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/Indischa/Indischapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indischa/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indischa/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indischa/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amerika/Indischapolis"
 
-#: ../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/Jamaica"
 
-#: ../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/Martinique"
 
-#: ../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/Puerto_Rico"
 
-#: ../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 "Antarctica/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/Zuidpool"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Wostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Azië/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Azië/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Azië/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Azië/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Azië/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Azië/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Azië/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Azië/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Azië/Bahrein"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Azië/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Azië/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Azië/Beiroet"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Azië/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Azië/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Azië/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Azië/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Azië/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Azië/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Azië/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Azië/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Azië/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Azië/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Azië/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Azië/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Azië/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Azië/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Azië/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Azië/Irkoetsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Azië/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Azië/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Azië/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Azië/Jeruzalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Azië/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Azië/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Azië/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Azië/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Azië/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Azië/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azië/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Azië/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Azië/Koeweit"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Azië/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Azië/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Azië/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Azië/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Azië/Manilla"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Azië/Muscaat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Azië/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Azië/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Azië/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Azië/Oeral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Azië/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Azië/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Azië/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Azië/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Azië/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Azië/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Azië/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Azië/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Azië/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Azië/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Azië/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Azië/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Azië/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Azië/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Azië/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Azië/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Azië/Teheran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Azië/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Azië/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Azië/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Azië/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Azië/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Azië/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Azië/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Azië/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Azië/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Azië/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantisch/Azoren"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantisch/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantisch/Canary"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantisch/Kaapverdische_Eilanden"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantisch/Faroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantisch/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantisch/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantisch/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantisch/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantisch/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantisch/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australië/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australië/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australië/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australië/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australië/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australië/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australië/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australië/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australië/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australië/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Athene"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlijn"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Boekarest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Boedapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanboel"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiëv"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lissabon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londen"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moskou"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Parijs"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praag"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Rome"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stokholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticaan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Wenen"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Warschau"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indisch/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indisch/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indisch/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indisch/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indisch/Komoren"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indisch/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indisch/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indisch/Malediven"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indisch/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indisch/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indisch/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacific/Paaseiland"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalkanaal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
@@ -10412,11 +10852,11 @@ msgstr "Kon autosave-bestand niet openen"
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Bijlage invoegen"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "_Bijlage toevoegen"
 
@@ -10424,196 +10864,187 @@ msgstr "_Bijlage toevoegen"
 msgid "Untitled Message"
 msgstr "Naamloos Bericht"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Bijlage…"
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Een bestand toevoegen als bijlage"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-subscribe.xml.h:9
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "Sl_uiten"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../composer/e-composer-actions.c:473
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Het huidige bestand sluiten"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Af_drukken…"
 
-#: ../composer/e-composer-actions.c:485 ../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 "Afdruk_voorbeeld"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Huidige bestand opslaan"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Opslaan _als…"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Het huidige bestand opslaan onder een andere naam"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "_Klad opslaan"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Als klad opslaan"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "Verz_enden"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Dit bericht versturen"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Ver_zendopties"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Extra verzendopties invoegen"
 
-#: ../composer/e-composer-actions.c:529
+# meervoud is beter hier
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "Nieuw _bericht"
+
+# verzenden naar...
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Nieuw berichtenvenster openen"
+
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "Tekenset_codering"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "Be_veiliging"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "Ver_sleutelen met PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Dit bericht versleutelen met PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "_Ondertekenen met PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Dit bericht ondertekenen met uw PGP-sleutel"
 
 # geef hoge prioriteit/prioriteit instellen/berichtprioriteit instellen
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Prioriteit instellen"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Geef dit bericht een hoge prioriteit"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "_Leesbevestiging vragen"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Ontvang een leesbevestiging wanneer uw bericht wordt gelezen"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "_Versleutelen met S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Dit bericht versleutelen met uw S/MIME versleutelingscertificaat"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Onder_tekening"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Dit bericht ondertekenen met uw S/MIME Ondertekeningscertificaat"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "_Bcc-veld"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Schakel BCC-weergave aan/uit"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "_Cc-veld"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Schakel CC-weergave aan/uit"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "_Van-veld"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Schakel de afzenderkeuze-weergave aan/uit"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "_Post-To Veld"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Of het Post-To veld weergegeven moet worden"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Schakel Antwoordadres-weergave aan/uit"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "_Onderwerp-veld"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Schakelt de weergave van het onderwerpveld aan/uit"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "_Aan-veld"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Schakel de weergave van het Aan-veld aan/uit"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Bijvoegen"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
@@ -10665,28 +11096,24 @@ msgstr "_Onderwerp:"
 msgid "Si_gnature:"
 msgstr "_Handtekening:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Doel van bericht"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Kies een map waar het bericht geplaatst moet worden."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Klik hier om een map te selecteren waarnaar gepost moet worden"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "Recente _documenten"
-
 # sneltoets moet k zijn
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Bijlagenbal_k tonen"
 
@@ -10705,8 +11132,8 @@ msgstr ""
 "Kan uitgaand bericht niet versleutelen: geen versleutelingscertificaat "
 "ingesteld voor dit account"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10719,11 +11146,11 @@ msgid "Hide _Attachment Bar"
 msgstr "Bijlagenbal_k verbergen"
 
 # een nieuw bericht opstellen/stel een nieuw bericht op
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2740
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Stel een nieuw bericht op"
 
-#: ../composer/e-msg-composer.c:4030
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10884,23 +11311,27 @@ msgstr "U kunt het bestand ‘{0}’ niet aan dit bericht toevoegen."
 msgid "You need to configure an account before you can compose mail."
 msgstr "U dient een account in te stellen voordat u post kunt versturen."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Doorgaan met bewerken"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Niet herstellen"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Herstellen"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "Bericht op_slaan"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Klad Opslaan"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-mail en agenda"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Groupware suite"
 
@@ -10917,37 +11348,58 @@ msgstr "adreskaart"
 msgid "calendar information"
 msgstr "agenda-informatie"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution fout"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution waarschuwing"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution informatie"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution zoekopdracht"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interne fout, onbekende fout '%s' gevraagd"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Component"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "Naam van de te loggen component"
+
+# gebruikt/ingeschakeld
+# is tabelkop en geeft vinkjes of een lokatie wel of niet gebruikt wordt
+#: ../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
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Of de plugin gebruikt wordt"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Er is een fout opgetreden bij het afdrukken"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Het afdruksysteem gaf de volgende informatie over de fout:"
 
-#: ../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 "Het afdruksysteem gaf geen aanvullende informatie over de fout."
@@ -10977,54 +11429,59 @@ msgstr "Bestand bestaat ‘{0}’."
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:144
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
-#: ../e-util/e-util-labels.c:45
+# updaten
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Kan hulptekst voor Evolution niet weergeven."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Belangrijk"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Werk"
 
 # Privé hier beter dan Persoonlijk
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Privé"
 
 # te verrichten/taak/te doen/uitvoeren/opdracht
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Te doen"
 
 # Uitstellen/Later
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Later"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "Label_naam:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Label bewerken"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Label toevoegen"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Labelnaam mag niet leeg zijn."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11157,67 +11614,67 @@ msgstr "%d/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Selecteer een tijd om mee te vergelijken"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#: ../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
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "_Regelnaam:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Zoek items die voldoen aan de volgende voorwaarden"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Filtercriteria toevoegen"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Als aan alle voorwaarden is voldaan"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Als aan een van de voorwaarden is voldaan"
 
 # items zoeken/zoek items
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Zoek items:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Alles gerelateerd"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Antwoorden"
 
 # ouders/referenties
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Antwoorden en referenties"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Geen antwoord of referentie"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "_Discussies bijsluiten"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Inkomend"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Uitgaand"
 
@@ -11241,7 +11698,7 @@ msgstr "Datum ontbreekt."
 msgid "Missing file name."
 msgstr "Bestandsnaam ontbreekt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:77
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Naam ontbreekt."
 
@@ -11317,7 +11774,7 @@ msgstr "in de toekomst"
 msgid "months"
 msgstr "maanden"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "seconden"
 
@@ -11329,9 +11786,10 @@ msgstr "de huidige tijd"
 msgid "the time you specify"
 msgstr "de tijd die u specificeert"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "weken"
 
@@ -11347,7 +11805,7 @@ msgstr "Regel Toevoegen"
 msgid "Edit Rule"
 msgstr "Regel bewerken"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Regelnaam"
 
@@ -11404,17 +11862,17 @@ msgstr "Evolution e-mail voorkeuren"
 msgid "Evolution Network configuration control"
 msgstr "Evolution netwerkconfiguratie"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
-#: ../mail/mail-component.c:749
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Post"
 
 # E-mailaccounts / E-mail-accounts / E-mail accounts
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "E-mail accounts"
 
@@ -11432,12 +11890,12 @@ msgstr "Netwerkvoorkeuren"
 msgid "_Mail"
 msgstr "_Post"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s licentieovereenkomst"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11450,112 +11908,104 @@ msgstr ""
 "voor %s zorgvuldig door en vink de optie\n"
 "aan om deze te accepteren\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Map selecteren"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../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
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Voor elk bericht vragen"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identiteit"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "E-mail ontvangen"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Automatisch controleren op _nieuwe post, iedere"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "min_uten"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "E-mail versturen"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Standaardinstellingen"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Beveiliging"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Ontvangstinstellingen"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Controleren op nieuwe e-mail"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Accountbeheer"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Standaard]"
 
-# gebruikt/ingeschakeld
-# is tabelkop en geeft vinkjes of een lokatie wel of niet gebruikt wordt
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:979
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:689
-msgid "Enabled"
-msgstr "Ingeschakeld"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Accountnaam"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:300 ../mail/em-composer-prefs.c:435
-#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
+#: ../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 "Naamloos"
 
 # was eerst Taal / Talen
 # maar dat is niet mooi, gewoon Taal van gemaakt, is duidelijk genoeg
-#: ../mail/em-composer-prefs.c:983
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Taal"
 
-#: ../mail/em-composer-prefs.c:1032
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Handtekening script toevoegen"
 
-#: ../mail/em-composer-prefs.c:1074
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Handtekening(en)"
 
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "------- Doorgestuurd bericht -------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
@@ -11565,7 +12015,7 @@ msgstr "een onbekende afzender"
 #. 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:1801
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11573,11 +12023,11 @@ msgstr ""
 "Op ${WeekdayName} ${Day}-${Month}-${Year} om ${24Hour}:${Minute} uur "
 "[tijdzone ${TimeZone}], schreef ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Oorspronkelijke bericht-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filter regels"
 
@@ -11594,10 +12044,6 @@ msgstr "Geef Kleur"
 msgid "Assign Score"
 msgstr "Geef Score"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Bijlagen"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11614,10 +12060,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Voltooid op"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "bevat"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Naar map kopiëren"
@@ -11631,7 +12073,7 @@ msgid "Date sent"
 msgstr "Verzendingsdatum"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11642,10 +12084,6 @@ msgstr "Verwijderen"
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "bevat niet"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "eindigt niet op"
@@ -11666,10 +12104,6 @@ msgstr "klinkt niet als"
 msgid "does not start with"
 msgstr "begint niet met"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "bestaat niet"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Klad"
@@ -11678,10 +12112,6 @@ msgstr "Klad"
 msgid "ends with"
 msgstr "eindigt op"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Bestaat"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "bestaat"
@@ -11694,14 +12124,10 @@ msgstr "Expressie"
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Belangrijk"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "is"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "is na"
@@ -11714,18 +12140,6 @@ msgstr "is voor"
 msgid "is Flagged"
 msgstr "is gemarkeerd"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "is groter dan"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "is niet"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "is niet gemarkeerd"
@@ -11747,7 +12161,7 @@ msgstr "Spam"
 msgid "Junk Test"
 msgstr "Spamtest"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Label"
 
@@ -11790,7 +12204,7 @@ msgstr "Geluid afspelen"
 
 #. 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:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Gelezen"
 
@@ -11862,9 +12276,9 @@ msgstr "begint met"
 msgid "Stop Processing"
 msgstr "Verwerking stoppen"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11876,11 +12290,11 @@ msgstr "Status herstellen"
 
 # dan op/daarna op
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Daarna"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "A_ctie toevoegen"
 
@@ -11926,18 +12340,18 @@ msgid "Messages Not Junk"
 msgstr "Berichten zijn geen spam"
 
 # Dit is de titel van het scherm bij een zoekopdracht (Wouter Bolsterlee)
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Zoekopdracht in account"
 
 # Dit is de titel van het scherm bij een zoekopdracht (Wouter Bolsterlee)
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Zoekopdracht in alle accounts"
 
 # _o wordt gebruikt voor V_olgende
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ongelezen berichten:"
@@ -11945,37 +12359,53 @@ msgstr[1] "Ongelezen berichten:"
 
 #. 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:182
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totaal aantal berichten:"
 msgstr[1] "Totaal aantal berichten:"
 
-#: ../mail/em-folder-properties.c:198 ../mail/em-folder-properties.c:200
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota-gebruik (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
 msgstr "Quota-gebruik"
 
-#: ../mail/em-folder-properties.c:362
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Map-eigenschappen"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_Aanmaken"
 
 # dit is is het dialoog: Map aanmaken.
 # dit mag een wat langere vertaling zijn.
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Naam van de map:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Zoekmappen"
 
@@ -11984,28 +12414,20 @@ msgstr "Zoekmappen"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Klad"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Inbox"
-
 # postvak uit
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Verzonden"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Laden…"
 
@@ -12024,293 +12446,292 @@ msgstr "Laden…"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Mailmappen-boom"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Verplaatsen van map %s"
 
 # map wordt gekopieerd
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiëren van map %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Berichten worden verplaatst naar map %s"
 
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Berichten worden gekopieerd naar map %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan bericht(en) niet neerzetten in hoogste niveau-opslag"
 
-#: ../mail/em-folder-tree.c:996 ../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 "_Kopiëren naar map"
 
-#: ../mail/em-folder-tree.c:997 ../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 "_Verplaatsen naar map"
 
 # mappen in %s worden gescannd/doorzocht/gelezen
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappen in \"%s\" worden doorzocht"
 
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "Beel_d"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "In _nieuw venster openen"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Nieuwe map…"
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Verplaatsen…"
 
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "He_rnoemen…"
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_Verversen"
 
 # postvak uit
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "_Wachtrij verwerken"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:141
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Prullenbak legen"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiëren van ‘%s’ naar ‘%s’"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../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:83
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Kopiëren"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Aanmaken van map ‘%s’"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Map aanmaken"
 
 # vrij vertaald
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Geef aan waar de map moet komen:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:71
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Verwijderen van mail is mislukt"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "U heeft onvoldoende rechten om deze e-mail te verwijderen."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Afzender beantwoorden"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
-#: ../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 "_Doorsturen"
 
 #. 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:1342 ../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 "Be_werken als nieuw bericht…"
 
 # terugzetten/herstellen
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "Naar map _verplaatsen…"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren…"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Als gelezen mar_keren"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Als o_ngelezen markeren"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Markeren als belan_grijk"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Markeren als _onbelangrijk"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Markeren als _spam"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Markeren als _geen-spam"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Markeren voor vervolg_actie…"
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Label"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Geen"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nieuw label"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Markeren als voltooid"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Markering wissen"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Regel aanmaken van bericht"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Zoekmap gebaseerd op onder_werp"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Zoekmap gebaseerd op af_zender"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Zoekmap gebaseerd op _geadresseerden"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Zoekmap gebaseerd op _mailinglijst"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filter gebaseerd op onder_werp"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filter gebaseerd op af_zender"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filter gebaseerd op _geadresseerden"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filter gebaseerd op _mailinglijst"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. 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 "Standaard"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Ophalen van bericht mislukt"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Ophalen van bericht…"
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Bellen naar…"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "_Zoekmap aanmaken"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "Van dit _adres"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Naar dit adres"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik hier om mail te versturen naar %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Klik om %s te bellen"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Klik om adressen te tonen/verbergen"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Zoekresultaten: %d"
@@ -12319,29 +12740,29 @@ msgstr "Zoekresultaten: %d"
 # [       ]
 # []achteruit []hooflettergevoelig []reguliere expressie
 # [Sluiten][Zoeken]
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Zoeken:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "Vo_rige"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "V_olgende"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Hoofdlettergevoelig"
 
 # Niet ondertekend of positief getal?
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Niet getekend"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12349,11 +12770,11 @@ msgstr ""
 "Dit bericht is niet ondertekend, Er kan niet worden aangetoond dat het "
 "authentiek is."
 
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Geldige handtekening"
 
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12361,11 +12782,11 @@ msgstr ""
 "Dit bericht is geldig en is ondertekend, de afzender van dit bericht is zeer "
 "waarschijnlijk degene die hij claimt te zijn."
 
-#: ../mail/em-format-html-display.c:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ongeldige handtekening"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12373,11 +12794,11 @@ msgstr ""
 "De handtekening van dit bericht kan niet worden geverifieerd, het is "
 "onderweg mogelijk gewijzigd."
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12386,11 +12807,11 @@ msgstr ""
 "het bericht kan niet worden geverifieerd."
 
 # maar publieke sleutel ontbreekt
-#: ../mail/em-format-html-display.c:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Handtekening bestaat, maar publieke sleutel is benodigd"
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12398,11 +12819,11 @@ msgstr ""
 "Dit bericht is ondertekend met een handtekening maar er is geen bijbehorende "
 "publieke sleutel."
 
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Niet versleuteld"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12410,11 +12831,11 @@ msgstr ""
 "Dit bericht is niet versleuteld.  De inhoud van het bericht kan tijdens de "
 "weg die het over het internet aflegt, mogelijk door anderen gelezen worden."
 
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Versleuteld, zwak"
 
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12424,11 +12845,11 @@ msgstr ""
 "Het zal voor een buitenstaander moeilijk zijn, maar niet onmogelijk, om "
 "binnen een redelijke tijd de inhoud van dit bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12436,11 +12857,11 @@ msgstr ""
 "Dit bericht is versleuteld. Het zal voor een buitenstaander moeilijk zijn om "
 "de inhoud van het bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Versleuteld, sterk"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12450,303 +12871,303 @@ msgstr ""
 "voor een buitenstaander zeer moeilijk zijn om binnen een redelijke tijd de "
 "inhoud van het bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:1086 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Certificaat _weergeven"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Dit certificaat is niet weer te geven"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Afgerond op %B %d, %Y, %l:%M %p"
 
 # overtijd
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Te laat:"
 
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "op %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "In bericht weerge_ven"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "Op _breedte passend"
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "_Oorspronkelijke grootte"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Bijlage opslaan als"
 
 # in moeten worden opgeslagen / worden opgeslagen
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Selecteer de map waar de bijlagen moeten worden opgeslagen"
 
 # "selectie opslaan" is in principe fout, maar we kijken aan of het problemen oplevert.
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Selectie opslaan…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d _bijlage"
 msgstr[1] "%d _bijlagen"
 
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "Op_slaan"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "_Alles opslaan"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Geen bijlage"
 
 # view/hide = tonen/verbergen
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "_Ongeformatteerde tonen"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "_Ongeformatteerde verbergen"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "O_penen met"
 
-#: ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2473
 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 ""
 "Evolution kan deze e-mail niet opgemaakt weergeven omdat het te groot is. U "
-"kunt het ongeformatteerd bekijken of met een externe tekst-editor."
+"kunt het onopgemaakt of met een externe tekst-editor bekijken."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Ophalen van ‘%s’"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Onbekend extern-berichtgedeelte."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (‘%s’-type)"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Opmaken van bericht"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Opmaken van bericht…"
 
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../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:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "E-mailprogramma"
 
 # a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../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:1772
+#: ../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:1903
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Dit bericht is verstuurd door <b>%s</b> namens <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "Van"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../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
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
 
-#: ../mail/em-format.c:1156
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kon S/MIME bericht niet inlezen: onbekende fout"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Dit type versleuteling voor multipart/encrypted is niet mogelijk"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Kan PGP/MIME-bericht niet inlezen"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kan PGP/MIME-bericht niet inlezen: onbekende fout"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Handtekening in niet ondersteund formaat"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Fout bij het verifiëren van ondertekening"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Onbekende fout bij het verifiëren van ondertekening"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Kan PGP-bericht niet inlezen"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kan PGP-bericht niet inlezen: onbekende fout"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Elke keer"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Een keer per dag"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Een keer per week"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Een keer per maand"
 
 # aangepaste/zelfgemaakte
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Zelfgemaakte spamberichtkop toevoegen"
 
 # kopregels/berichtkop
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Berichtkop naam:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Berichtkopwaarde bevat:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Bevat waarde"
 
 # Berichtkleur/kleuren
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Kleur"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Label"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin is beschikbaar en programma is geïnstalleerd."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -12754,74 +13175,86 @@ msgstr ""
 "De plugin ‘%s’ is niet beschikbaar. Controleer of het pakket wel "
 "geïnstalleerd is."
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Geen spamplugin beschikbaar"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Te doen"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Later"
 
-#: ../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 ""
-"De locatie en hiërarchie van de Evolution mailbox mappen is gewijzigd sinds "
-"Evolution 1.x.\n"
-"\n"
-"Een ogenblik geduld, uw mappen worden door Evolution gemigreerd…"
-
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kon nieuwe map ‘%s’ niet aanmaken: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kon map ‘%s’ niet kopiëren naar ‘%s’: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kon niet scannen voor bestaande mailboxen op ‘%s’: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c: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 ""
+"De locatie en hiërarchie van de Evolution mailbox mappen is gewijzigd sinds "
+"Evolution 1.x.\n"
+"\n"
+"Een ogenblik geduld, uw mappen worden door Evolution gemigreerd…"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kon oude POP3 op-server-houden data `%s' niet openen: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kon POP3 op-server-houden data-map ‘%s’ niet aanmaken: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kon POP3 op-server-houden data ‘%s’ niet kopiëren: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Aanmaken van locate mail-opslag ‘%s’ mislukt: %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../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 ""
+"De opslagmethode voor samenvattingen van de Evolution mailbox-mappen is gewijzigd naar sqlite sinds "
+"Evolution 2.24.\n"
+"\n"
+"Een ogenblik geduld, uw mappen worden door Evolution gemigreerd…"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kon locale mail-mappen niet maken op ‘%s’: %s"
 
 # 'vorige versie' gebruikt ipv 'vorige installatie'
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12829,44 +13262,46 @@ msgstr ""
 "Niet in staat de instellingen van een vorige versie Evolution te lezen. "
 "‘evolution/config.xmldb’ bestaat niet of is beschadigd."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Afzender beantwoorden"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "_Lijst beantwoorden"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:874
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "Aan adresboek _toevoegen"
 
-#: ../mail/em-subscribe-editor.c:596
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Deze opslag ondersteunt geen abonnementen, of deze mogelijkheid is "
 "uitgeschakeld."
 
-#: ../mail/em-subscribe-editor.c:629
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Map"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Dit bericht niet meer tonen."
 
@@ -12892,11 +13327,11 @@ msgstr "Adres toevoegen"
 msgid "Messages from %s"
 msgstr "Berichten van %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Zoek_mappen"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Zoekmapbron"
 
@@ -12973,10 +13408,17 @@ msgstr ""
 "address_count wordt aangegeven."
 
 #: ../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 ""
+"Bepaalt hoe vaak lokale wijzigingen gesynchroniseerd worden met de server. "
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Zelfgemaakte kopregels voor spam-controle."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../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\"."
@@ -12984,89 +13426,89 @@ msgstr ""
 "Zelfgemaakte kopregels die gebruikt worden bij de controle op spam. De items "
 "in de lijst zijn in de vorm ‘kopregelnaam=waarde’."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Standaard tekenset voor het opstellen van berichten"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Standaard tekenset voor het opstellen van berichten."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Standaard tekenset voor het weergeven van berichten"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Standaard tekenset voor het weergeven van berichten."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Standaard manier van doorsturen"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Standaardhoogte van het venster voor het opstellen van berichten."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Standaardhoogte van het berichtenvenster."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Standaardhoogte van het aanmeldvenster."
 
 # standaard manier van antwoorden/antwoordstijl
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Standaard manier van antwoorden"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Geeft aan of discussies standaard uitgevouwd worden"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Standaardbreedte van het venster voor het opstellen van berichten."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Standaardbreedte van het berichtenvenster."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Standaardbreedte van het aanmeldvenster."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Bepaalt of adressen voor het filteren van spam alleen opgezocht worden in "
 "het lokale adresboek"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "Bepaalt of de e-mail van de afzender opgezocht wordt in het adresboek"
-
 #: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Bepaalt of het adres van de afzender opgezocht wordt in het adresboek"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"Bepaalt of de e-mail van de afzender opgezocht wordt in het adresboek. "
+"Bepaalt of het adres van de afzender opgezocht wordt in het adresboek. "
 "Indien aanwezig zou de e-mail geen spam zijn. Het doorzoekt de adresboeken "
 "die aangevinkt zijn voor automatisch aanvullen. Het kan traag zijn wanneer "
 "adresboeken (zoals ldap) aangevinkt zijn voor automatisch aanvullen."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bepaalt of zelfgemaakte kopregels gebruikt worden voor de controle op spam"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -13076,7 +13518,7 @@ msgstr ""
 "Indien ingeschakeld en de kopregels zijn vermeld, zal het de spamcontrole "
 "versnellen."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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."
@@ -13085,66 +13527,66 @@ msgstr ""
 "‘Onderwerp’ in de kolom ‘Berichten’ in verticale weergave."
 
 # /voor de opsteller/
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Map waar bijlagen/bestanden vandaan worden gehaald. "
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Map waar e-mailcomponenten worden opgeslagen."
 
 # afkappen/verkorten/met ellipsis weergeven
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr "Het met puntjes afkorten van mapnamen in de mappenboom aan/uitzetten"
 
 # fout/foutief/spellingsfouten
 # markeren/aanduiden tijdens het typen
 # Foutgespelde woorden markeren terwijl u typt
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Spellingsfouten aanduiden tijdens het typen."
 
 # spammappen
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Mappen met spam legen bij afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Prullenbakken legen bij afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle mappen met spam legen bij afsluiten van Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle prullenbakken legen bij het afsluiten van Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Cursormodus gebruiken zodat u een cursor ziet bij het lezen van e-mail."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "De magische spatiebalk aan/uitzetten"
 
 # Aanzetten of uitzetten van de typen-terwijl-zoeken functie
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "De functie ‘zoeken-terwijl-u-typt’ aan/uitzetten"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Zoekmappen inschakelen"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Zoekmappen inschakelen bij opstarten."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -13155,7 +13597,7 @@ msgstr ""
 "te typen. Dit is handig om snel naar een map te gaan, door de naam van de "
 "map te typen."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13163,30 +13605,30 @@ msgstr ""
 "Indien ingeschakeld wordt de spatiebalk gebruikt om door de berichten te "
 "schuiven in de voorbeeldweergave, de berichtenlijst en mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Aanvinken om een berichttekstdeel van geringe omvang op te maken."
 
 # cursor modus aan/uit
 # activeren/deactiveren
 # (de)activeren
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Aanzetten/uitzetten cursor mode"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Hoogte van het berichtenlijst paneel"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Hoogte van het berichtenlijst paneel."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Verbergt de voorbeeldweergave per map en maakt de selectie ongedaan"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
@@ -13194,7 +13636,7 @@ msgstr ""
 "Als een gebruiker 10 of meer berichten tegelijkertijd probeert te openen, "
 "vraag de gebruiker dan of hij dat werkelijk wilt doen."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13202,7 +13644,7 @@ msgstr ""
 "Als het ‘Voorbeeld’-paneel zichtbaar is, toon het dan naast elkaar in plaats "
 "van onder elkaar."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -13213,22 +13655,30 @@ msgstr ""
 "componentviewer in Gnome's mime-type database gebruikt worden voor weergave "
 "van de inhoud."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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 "Aanvankelijke hoogte van het venster ‘E-mail versturen & ontvangen’. De waarde wordt bijgewerkt als de gebruiker het venster verticaal herschaalt."
+msgstr ""
+"Aanvankelijke hoogte van het venster ‘E-mail versturen & ontvangen’. De "
+"waarde wordt bijgewerkt als de gebruiker het venster verticaal herschaalt."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "Aanvankelijke maximaliseringstoestand van het venster ‘E-mail versturen & ontvangen’. De waarde wordt bijgewerkt als de gebruiker het venster maximaliseert of hersteld. Merk op dat deze specifieke waarde niet gebruikt wordt door Evolution omdat het venster ‘E-mail versturen & ontvangen’ niet gemaximaliseerd kan worden. Deze sleutel bestaat enkel en alleen als implementatiedetail."
+msgstr ""
+"Aanvankelijke maximaliseringstoestand van het venster ‘E-mail versturen & "
+"ontvangen’. De waarde wordt bijgewerkt als de gebruiker het venster "
+"maximaliseert of hersteld. Merk op dat deze specifieke waarde niet gebruikt "
+"wordt door Evolution omdat het venster ‘E-mail versturen & ontvangen’ niet "
+"gemaximaliseerd kan worden. Deze sleutel bestaat enkel en alleen als "
+"implementatiedetail."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -13236,13 +13686,13 @@ msgstr ""
 "Aanvankelijke breedte van het venster ‘E-mail versturen & ontvangen’. De "
 "waarde wordt bijgewerkt als de gebruiker het venster horizontaal herschaalt."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Bij het markeren van meerdere berichten tegelijk, bevestiging vragen aan/"
 "uitzetten."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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."
@@ -13250,7 +13700,7 @@ msgstr ""
 "Het deactiveert/activeert dialoogvensters die vragen of eerst "
 "gesynchroniseerd moet worden, bij het overgaan naar offline-modus."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -13260,31 +13710,31 @@ msgstr ""
 "van berichten uit de zoekmap resulteert in het verwijderen van de "
 "oorspronkelijke e-mail, en dus niet alleen uit het zoekresultaat."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "De laatste keer dat de spammap geleegd was"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "De laatste keer dat de prullenbak geleegd was"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau waarboven het bericht gelogd moet worden."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lijst met labels en de bijpassende kleuren"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lijst met geaccepteerde licenties"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lijst met accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
@@ -13293,15 +13743,15 @@ msgstr ""
 "bestaat uit tekenreeksen die overeenkomen met subdirectories relatief aan /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lijst van aangepaste koppen en of ze ingeschakeld zijn."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lijst met taalcodes die gebruikt worden voor spellingscontrole."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
@@ -13310,136 +13760,136 @@ msgstr ""
 "lijst bestaat uit tekenreeksen met naam:kleur waarbij kleur in HTML hex-"
 "codering is."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lijst met mime-types die voor bonobo component weergave gecheckt moeten "
 "worden"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lijst met protocolnamen waarvan de licentie geaccepteerd is."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Laad afbeeldingen voor HTML berichten over http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 ""
 "Afbeeldingen voor berichten met HTML-opmaak via http(s) ophalen. De "
-"mogelijkheden zijn: 0 - Nooit afbeeldingen van het internet ophalen. 1 - "
-"Afbeeldingen ophalen als de afzender in het adresboek staat 2 - Altijd "
+"mogelijkheden zijn: \"0\" - Nooit afbeeldingen van het internet ophalen. \"1\" - "
+"Afbeeldingen ophalen als de afzender in het adresboek staat \"2\" - Altijd "
 "afbeeldingen van het internet ophalen."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Filter acties bijhouden"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Filter acties bijhouden in het gespecificeerde log bestand."
 
 # Logbestand waarin filteracties worden gelogt
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Logbestand voor filteracties"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Logbestand voor filteracties"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Markeer als gelezen na een bepaalde timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Markeer als gelezen ne een bepaalde tijd."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markeer citaten in het bericht \"Voorbeeld\""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markeer citaten in het bericht \"Voorbeeld\"."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Standaardhoogte berichtvenster"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Standaardbreedte berichtvenster"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Berichtweergave (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum aantal dagen tussen het legen van de spammap bij het afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Minimum aantal dagen tussen het legen van de prullenbak bij het afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimumtijd tussen het legen van de spammap bij afsluiten, in dagen."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minimumtijd tussen het legen van de prullenbak bij afsluiten, in dagen."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Het aantal adressen dat getoond wordt in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Waarschuwen wanneer geen onderwerp is ingevuld"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Waarschuwen wanneer de gebruiker een map probeert op te ruimen."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Waarschuw wanneer de gebruiker probeert om een bericht zonder onderwerp te "
 "versturen."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Vraag of de gebruiker direct off-line wil gaan"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Waarschuwen wanneer berichten worden verwijderd uit de zoekmap"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Waarschuwen wanneer de gebruiker opruimt"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Waarschuwen wanneer de gebruiker enkel het Bcc-veld invult"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Waarschuwen wanneer de gebruiker 10 of meer berichten tegelijkertijd "
 "probeert te openen."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -13447,75 +13897,79 @@ msgstr ""
 "Waarschuwen wanneer HTML-berichten verstuurd worden naar contacten die dat "
 "niet willen."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Waarschuwen wanneer berichten worden verstuurd zonder Aan of Cc-ontvangers"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Waarschuwen als de gebruiker ongewenste HTML probeert te versturen"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Waarschuwen wanneer er meerder berichten worden gemarkeerd"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Herkennen van smileys in de tekst en deze vervangen door afbeeldingen."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Herkennen en vervangen van links in de text."
 
 # arriverende/binnenkomende/binnengekomen
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Binnengekomen e-mail op spam controleren."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Map opslaan"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-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 "De foto van de afzender opzoeken in lokale adresboeken"
 
 # standaard email als HTML versturen
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Standaard HTML e-mail verzenden"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Standaard HTML e-mail verzenden."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "De kolom met de e-mail van de afzender in de berichtenlijst"
 
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Synchronisatie-interval"
+
 # filmpjes weergeven
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Bewegende afbeeldingen tonen"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Bewegende afbeeldingen tonen als animaties."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Verwijderde berichten (doorgestreept) tonen in de berichtenlijst."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Verwijderde berichten tonen in de berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Foto van afzender weergeven"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13524,70 +13978,70 @@ msgstr ""
 "berichtenlijst."
 
 # pasfoto/gezicht
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "De foto van de afzender tonen in de berichtweergave."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Spellingscontrole in bericht"
 
 # van/voor
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Kleur voor spelfouten"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Spellingscontrole talen"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Standaardhoogte abonneren-dialoog"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Standaardbreedte abonneren-dialoog"
 
 # console ipv terminal?
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminal-lettertype"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Limiet tekstberichtdeel"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "De standaardplugin voor Spamafhandeling"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "De vorige keer dat de spammap werd geleegd, in dagen sinds de epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "De vorige keer dat de prullenbak werd geleegd, in dagen sinds de epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Het terminal-lettertype voor de tekstinhoud van e-mail."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Het lettertype met variabele breedte voor de tekstinhoud van e-mail."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Dit kan drie waardes aannemen: 0 voor fouten, 1 voor waarschuwingen, 2 voor "
+"Dit kan drie waardes aannemen: \"0\" voor fouten, \"1\" voor waarschuwingen, \"2\" voor "
 "debug-berichten."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
@@ -13596,7 +14050,7 @@ msgstr ""
 "bewerkt kan worden. De standaardhoeveelheid is 4MB / 4096KB en wordt "
 "opgegegeven in KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13605,16 +14059,16 @@ msgstr ""
 "Dit is de standaard spamplugin, al zijn er meerdere ingeschakeld. Als de "
 "standaard plugin uitgeschakeld is, wordt er niet overgestapt op een andere."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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 ""
-"Deze sleutel wordt slechts een keer gelezen en na het lezen op onwaar gezet. "
+"Deze sleutel wordt slechts een keer gelezen en na het lezen op \"onwaar\" gezet. "
 "Dit deselecteert de e-mail uit de lijst en verwijdert de voorbeeldweergave "
 "voor die map."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13626,18 +14080,21 @@ msgstr ""
 "XMLstructuur is &lt;header enabled&gt;- stel enabled in als de kop weergeven "
 "moet worden in de mailweergave."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
-msgstr "Deze optie is gerelateerd aan de sleutel lookup_addressbook en wordt gebruikt om te bepalen of adressen alleen opgezocht worden in het lokale adresboek, om mail van bekende contacten uit te sluiten van spamfiltering."
+msgstr ""
+"Deze optie is gerelateerd aan de sleutel lookup_addressbook en wordt "
+"gebruikt om te bepalen of adressen alleen opgezocht worden in het lokale "
+"adresboek, om mail van bekende contacten uit te sluiten van spamfiltering."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Deze optie helpt bij versnellen van ophalen."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
@@ -13645,7 +14102,7 @@ msgstr ""
 "Dit bepaalt hoeveel adressen weergegeven worden in de standaard "
 "berichtenlijst, waarna ‘…’ getoond zal worden."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13653,7 +14110,7 @@ msgstr ""
 "Deze instelling bepaalt of discussies standaard in- of uitgevouwen getoond "
 "moeten worden. Evolution moet hiervoor opnieuw gestart worden."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13664,116 +14121,117 @@ msgstr ""
 "bericht. Evolution moet hiervoor opnieuw gestart worden."
 
 # boomstructuur voor berichtenlijst
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Discussiestructuur tonen in de berichtenlijst."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Discussiestructuur tonen in de berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Discussiestructuur gebaseerd op onderwerp tonen in de berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tijdslimiet voor het markeren van berichten als ‘gelezen’"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Tijdslimiet voor het markeren van berichten als ‘gelezen’."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID tekenreeks van de standaard account."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Kleur van de onderstreping bij foutief gespelde woorden."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamassassin daemon en cliënt gebruiken"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Spamassassin daemon en cliënt gebruiken (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Zelfgekozen lettertypes gebruiken"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Zelfgekozen lettertypes gebruiken voor de berichtinhoud."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Gebruik alleen lokale testen op spam."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Gebruik alleen de lokale testen op spam (geen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Gebruik de ‘naast-elkaar’ ofwel de ‘breedbeeld’ weergave"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Lettertype met variabele breedte"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Beeld/Bcc-menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc-menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Beeld/Cc-menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Beeld/Cc-menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Beeld/Van-menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Beeld/Van-menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Beeld/VerzendNaar-menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Beeld/VerzendNaar-menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Beeld/AntwoordAan-menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Beeld/AntwoordAan-menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Of standaard aan elk bericht een leesbevestiging toegevoegd wordt."
 
 # BUG: whether disable ellipsizing feature
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "Of het afkorten met puntjes van mapnamen in de mappenboom uitgezet wordt."
+msgstr ""
+"Of het afkorten met puntjes van mapnamen in de mappenboom uitgezet wordt."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../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."
@@ -13781,43 +14239,43 @@ msgstr ""
 "Of teruggevallen wordt op discussiestructuur op onderwerp wanneer de "
 "berichten geen kopregels ‘In-Reply-To’ of ‘References’ bevatten."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Of discussies gesorteerd worden op het laatste bericht in de discussie"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Breedte van het berichtenlijstpaneel"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Breedte van het berichtenlijstpaneel."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importeren van Elm informatie"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-import"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "E-mail importeren uit Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Doel map:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Selecteer map waar in geimporteerd moet worden"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley-postbus (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importprogramma voor Berkeley Mailbox-formaat"
 
@@ -13825,7 +14283,7 @@ msgstr "Importprogramma voor Berkeley Mailbox-formaat"
 msgid "Importing mailbox"
 msgstr "Importeren van mailbox"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importeren ‘%s’"
@@ -13835,184 +14293,192 @@ msgstr "Importeren ‘%s’"
 msgid "Scanning %s"
 msgstr "%s wordt doorzocht"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importeren van pine-gegevens"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution pine-import"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "E-mail importeren uit Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Post versturen naar %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 "Post ophalen van %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Onderwerp is %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailinglijst"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Sjablonen"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d geselecteerd, "
 msgstr[1] " %d geselecteerd, "
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d verwijderd"
 msgstr[1] "%d verwijderd"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d spam"
 msgstr[1] "%d spam"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d klad"
 msgstr[1] "%d klad"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verzonden"
 msgstr[1] "%d verzonden"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d niet verzonden"
 msgstr[1] "%d niet verzonden"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ongelezen, "
 msgstr[1] "%d ongelezen, "
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d in totaal"
 msgstr[1] "%d in totaal"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nieuw bericht"
 
 # In menu Nieuw
 # _b wordt gebruikt voor adres_boek
 # _e voor bij_eenkomst
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "Be_richt"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nieuwe berichtenmap"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Berichten_map"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Nieuwe berichtenmap aanmaken"
 
 # upgraden/vernieuwen/bijwerken
-#: ../mail/mail-component.c:1062
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Upgraden van mail-instellingen of mappen is mislukt."
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Fout"
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Fouten"
 
-#: ../mail/mail-component.c:1536
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Waarschuwingen en fouten"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Debug"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Fout-, waarschuwings,- en debug-berichten"
 
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Debug logboeken"
 
-#: ../mail/mail-component.c:1678
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "_Fouten tonen in de statusbalk gedurende"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1694
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "seconde(n)."
 
 # logboekitems
-#: ../mail/mail-component.c:1700
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Logboekberichten:"
 
 # Mate van/niveau/level
-#: ../mail/mail-component.c:1741
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Logboekniveau"
 
-#: ../mail/mail-component.c:1750 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Tijd"
 
-#: ../mail/mail-component.c:1760 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Berichten"
 
-#: ../mail/mail-component.c:1769 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Dit venster sluiten"
@@ -14269,11 +14735,11 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Uitgaande berichten standaard digitaal _ondertekenen"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "_Tekstinhoud niet opmaken indien de hoeveelheid tekst groter is dan"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_Berichten niet markeren als spam als de afzender in mijn adresboek staat"
 
@@ -14417,20 +14883,26 @@ msgstr ""
 "contact maakt"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Deze optie wordt tenietgedaan wanneer standaard spamheaders aangetroffen "
+"zijn."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganisatie:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _sleutel-ID:"
 
 # de W wordt al gebruikt voor _Wekelijks
 # de A voor _Annuleren
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Wa_chtwoord:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -14438,7 +14910,7 @@ msgstr ""
 "Geef een naam aan dit account in de ruimte hieronder.\n"
 "Deze naam zal alleen voor weergave worden gebruikt."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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."
@@ -14447,7 +14919,7 @@ msgstr ""
 "servertype u gebruikt, neem dan contact op met uw systeembeheerder of met uw "
 "internet-provider."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "
@@ -14457,115 +14929,119 @@ msgstr ""
 "\" staan hoeven niet te worden ingevuld, tenzij u wilt dat deze informatie "
 "wordt meegezonden bij de berichten die u verstuurt."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Poort:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Ant_woordadres:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Onthoud _wachtwoord"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "S_OCKS Host:"
 
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "_Zoek in het lokale adresboek naar de foto van de afzender"
-
 #: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Alleen in het lokale adresboek naar de foto van de afzender zoeken"
+
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_electeren…"
 
 # leesbevestiging/ontvangstbevestiging
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "O_ntvangstbevestiging versturen:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "S_tandaardlettertype:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Kies HTML-lettertype met gelijke breedte"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Kies HTML-lettertype met gelijke breedte voor afdrukken"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Kies HTML-lettertype met variabele breedte"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Kies HTML-lettertype met variabele breedte voor afdrukken"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "E-mail versturen"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "_Verzonden berichtenmap:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Server _eist aanmeldingscontrole"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Server-_type: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Handtekenings_certificaat:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Handtekening:"
 
 # enkelvoud is beter.
 # Dit is het tab-label bij voorkeuren->bericht opstellen
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Ondertekening"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Handtekeningentabel"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Spellingscontrole"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Reactie _onderaan mailtje starten"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ype: "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14573,7 +15049,7 @@ msgstr ""
 "De lijst met talen hierboven, geeft enkel aan voor welke talen een "
 "woordenboek beschikbaar is."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14583,14 +15059,7 @@ msgstr ""
 "uw ondertekening. De naam die u hier geeft zal\n"
 "uitsluitend voor weergavedoeleinden gebruikt worden."
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Deze optie wordt tenietgedaan wanneer standaard spamheaders aangetroffen "
-"zijn."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14598,24 +15067,26 @@ msgstr ""
 "Geef de naam die u aan dit account wilt geven.\n"
 "Bijvoorbeeld: ‘Zakelijk’ of ‘Privé’"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "Gebruikers_naam:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
 msgstr "Aanmeldingscontrole gebruiken"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../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 "Gebruikers_naam:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "V_ariabele breedte:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14625,104 +15096,104 @@ msgstr ""
 "\n"
 "Klik op ‘Volgende’ om te beginnen."
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "Handtekening _toevoegen"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Altijd afbeeldingen van het internet ophalen"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
 msgstr "_URL voor automatische proxy-configuratie:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Standaard spamplugin:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte verbinding met het internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Aanvragen voor bijeenkomsten niet ondertekenen (voor Outlook "
 "compatibiliteit)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Doorstuurstijl:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Handtekening boven oorspronkelijke bericht bij antwoorden"
 
 # Afbeeldingen ophalen als de afzender in het adresboek staat
 # Afbeeldingen laden in e-mail van bekenden
 # (let op dat er ook een gconf-sleutel is waar dezelfde termen in voorkomen)
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "Af_beeldingen ophalen als de afzender in het adresboek staat"
 
-#: ../mail/mail-config.glade.h:170
-msgid "_Lookup in local addressbook only"
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
 msgstr "Alleen op_zoeken in lokale adresboek"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Dit instellen als standaardaccount"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "Hand_matige proxy-configuratie:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Berichten als gelezen markeren na "
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Waarschuwen wanneer HTML-berichten worden verzonden naar contacten die dat "
 "niet willen"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Waarschuwen wanneer een bericht wordt verzonden zonder onderwerp"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Antwoordstijl:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Beveiligde HTTP-proxy"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "S_electeren…"
 
 # filmpjes weergeven
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Bewegende afbeeldingen tonen"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto van de afzender in het e-mailvoorbeeldvenster weergeven"
 
@@ -14734,33 +15205,33 @@ msgstr "_Foto van de afzender in het e-mailvoorbeeldvenster weergeven"
 #
 # _Maximum aantal in Aan/Cc/Bcc-velden getoond:
 # Verkort de Aan/CC/BCC velden tot
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Verkort de Aan/CC/BCC-koppen tot "
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "Beveiligde verbinding gebr_uiken:"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "_Systeemstandaarden gebruiken"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als bij andere programma's"
 
 # [vinkje] Shrink To/CC/BCC headers to [tellerknop] addresses
 # dit is het tweede gedeelte van de opgesplitste zin.
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "adressen"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "kleur"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "omschrijving"
 
@@ -14802,44 +15273,44 @@ msgstr "_Hoofdlettergevoelig"
 msgid "Co_mpleted"
 msgstr "_Voltooid"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Zoeken:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Zoeken in bericht"
 
 # aanmerken/vlaggen/markeren
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Markeren voor vervolgactie"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Mapabonnementen"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Overeenkomst"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Niets geselecteerd"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Beveiligingsinformatie"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Specifieke mappen"
 
-#: ../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."
@@ -14847,26 +15318,26 @@ msgstr ""
 "De door u gekozen berichten staan in de lijst hieronder.\n"
 "Kies een vervolgactie uit het \"Vlag\"-menu."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "Overeenkomst _accepteren"
 
 # verloopt/verloopdatum
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Verloopdatum:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Vlag:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Aan_vinken om de licentieovereenkomst te accepteren"
 
 # bezig met %s pingen
 # %s wordt nu gepingd
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingen van %s"
@@ -14913,107 +15384,107 @@ msgstr "Bericht %d van %d wordt verzonden"
 msgid "Failed to send %d of %d messages"
 msgstr "Het verzenden van %d van de %d berichten is mislukt"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Geannuleerd."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Voltooid."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
 # bezig met/van map/map
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Openen van map %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Quota-informatie voor map %s ontvangen"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Openen van opslag %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Verwijderen van map %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Opslaan van map ‘%s’"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Opruimen en opslaan van account ‘%s’"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Opslaan van account ‘%s’"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Verversen van map"
 
-#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Legen van map"
 
 # in/van
 # legen van prullenbak in s
-#: ../mail/mail-ops.c:1701
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van ‘%s’ wordt geleegd"
 
-#: ../mail/mail-ops.c:1702
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: ../mail/mail-ops.c:1783
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ophalen van bericht %s"
 
-#: ../mail/mail-ops.c:1890
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ophalen van %d bericht"
 msgstr[1] "Ophalen van %d berichten"
 
-#: ../mail/mail-ops.c:1975
-#, c-format
+#: ../mail/mail-ops.c:1980
+#, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Opslaan van %d bericht"
 msgstr[1] "Opslaan van %d berichten"
 
-#: ../mail/mail-ops.c:2053
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15022,11 +15493,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2125
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Opslaan van bijlage"
 
-#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15035,79 +15506,79 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
 # bezig met
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig opnieuw te verbinden met %s"
 
-#: ../mail/mail-ops.c:2408
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Voorbereiden van account '%s' voor off-line gebruik"
 
-#: ../mail/mail-ops.c:2494
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Service wordt gecontroleerd"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Annuleren…"
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "E-mail versturen & ontvangen"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "_Alles annuleren"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Aan het actualiseren…"
 
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Aan het wachten…"
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Controleren op nieuwe e-mail"
 
 # voer uw wachtwoordzin in voor/voer wachtwoordzin in voor
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Voer wachtwoordzin in voor %s"
 
 # wachtwoordzin invoeren
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Voer wachtwoordzin in"
 
-#: ../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 "Voer uw wachtwoord in voor %s"
 
 # wachtwoord invoeren
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Gebruiker heeft actie afgebroken."
 
@@ -15115,13 +15586,6 @@ msgstr "Gebruiker heeft actie afgebroken."
 msgid "_Save and Close"
 msgstr "Op_slaan en sluiten"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Bestand"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Handtekening bewerken"
@@ -15172,11 +15636,11 @@ msgstr "Zoekmappen bijwerken voor '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Zoekmappen bijwerken voor '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Zoekmap bewerken"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nieuwe zoekmap"
 
@@ -15197,19 +15661,23 @@ msgid ""
 msgstr ""
 "Er bestaat al een niet-lege map op ‘{1}’.\n"
 "\n"
-"U kunt er voor kiezen deze map te negeren, te overschrijven of de inhoud toe te voegen, of om af te sluiten."
+"U kunt er voor kiezen deze map te negeren, te overschrijven of de inhoud toe "
+"te voegen, of om af te sluiten."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr "Er wordt een leesbevestiging gevraagd voor ‘{1}’. De leesbevestiging sturen naar {0}?"
+msgstr ""
+"Er wordt een leesbevestiging gevraagd voor ‘{1}’. De leesbevestiging sturen "
+"naar {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "Een handtekening met de naam ‘{0}’ bestaat al. Gebruik een andere naam."
+msgstr ""
+"Een handtekening met de naam ‘{0}’ bestaat al. Gebruik een andere naam."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -15250,7 +15718,9 @@ msgstr ""
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "Weet u zeker dat u alle verwijderde berichten uit map ‘{0}’ definitief wilt weggooien?"
+msgstr ""
+"Weet u zeker dat u alle verwijderde berichten uit map ‘{0}’ definitief wilt "
+"weggooien?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15332,7 +15802,9 @@ msgstr "Kan het doel ‘{2}’ niet openen."
 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 "Kan het licentiebestand ‘{0}’ niet lezen, vanwege een installatieprobleem. U kunt deze provider niet gebruiken totdat u haar licentie kunt accepteren."
+msgstr ""
+"Kan het licentiebestand ‘{0}’ niet lezen, vanwege een installatieprobleem. U "
+"kunt deze provider niet gebruiken totdat u haar licentie kunt accepteren."
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -15410,54 +15882,50 @@ msgid "Do not disable"
 msgstr "Niet uitzetten"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Wilt u dat de bewerking ook in de submappen wordt toegepast?"
-
-#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Wilt u de als zodanig aangemerkte mappen lokaal opslaan?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Wilt u alle berichten markeren als gelezen?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
 # wachtwoord invoeren
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Wachtwoord geven."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Fout bij het laden van filterdefinities."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Fout bij het uitvoeren van de bewerking."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Fout tijdens {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Het bestand bestaat, maar kan niet worden overschreven."
 
 # regulier/normaal
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Het bestand bestaat maar is geen normaal bestand."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Indien u doorzet zult u deze berichten niet meer kunnen herstellen."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -15467,13 +15935,13 @@ msgstr ""
 
 # als/indien
 # doorgaat/verdergaat/doorzet
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Indien u verdergaat, zullen alle proxy-accounts definitief worden verwijderd."
 
 # als
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15482,12 +15950,12 @@ msgstr ""
 "en alle proxy-informatie definitief worden verwijderd."
 
 # als
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Indien u verdergaat, zal de account-informatie definitief worden verwijderd."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15495,19 +15963,19 @@ msgstr ""
 "Indien u nu afsluit, zullen deze berichten pas worden verzonden wanneer "
 "Evolution opnieuw wordt opgestart."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Ongeldige authenticatie"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Mailfilters automatisch bijgewerkt."
 
-#: ../mail/mail.error.xml.h:73
+#: ../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 "
@@ -15519,42 +15987,34 @@ msgstr ""
 "toch alle geadresserden in uw bericht tonen.  Om dit te vermijden moet u "
 "tenminste één geadresseerde geven in het veld \"Aan:\" of \"CC:\"."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Alle berichten als gelezen markeren"
 
-#: ../mail/mail.error.xml.h:75
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Alle berichten in deze map en submappen als gelezen markeren?"
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Ontbrekende map."
 
 # gegeven/geselecteerd
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Geen bronnen geselecteerd."
 
-#: ../mail/mail.error.xml.h:79
-msgid "Only on _Current Folder"
-msgstr "Alleen op _huidige map"
-
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Teveel berichten tegelijk openen kan lang duren."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Controleer uw account-instellingen en probeer opnieuw."
 
 # vrij vertaald
 # misschien nog tussenvoegen: probeer _het bericht_ via een ander...
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Activeer dit account of probeer via een ander account te verzenden."
 
-#: ../mail/mail.error.xml.h:83
+#: ../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."
@@ -15562,7 +16022,7 @@ msgstr ""
 "Zet een geldig e-mailadres in het veld \"Aan:\". U kunt zoeken naar een e-"
 "mailadres door te klikken op de knop \"Aan:\" naast het invoerveld."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15573,67 +16033,67 @@ msgstr ""
 "{0}"
 
 # een naam die niet eerder is gebruikt/niet ergens anders is gebruikt
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geef aan deze handtekening een unieke naam."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Een ogenblik geduld."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problemen bij migreren van oude berichtenmap ‘{0}’."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Bevragen van de server"
 
 # bevraagd voor/gevraagd om
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "De server wordt gevraagd om een lijst met ondersteunde "
 "aanmeldingsmechanismen."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Leesbevestiging gevraagd."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "De map ‘{0}’ en alle submappen echt verwijderen?"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
 msgstr "Aanmerken als Spam is mislukt"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
 msgstr "Aanmerken als ‘Niet spam’ is mislukt"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Zoekmappen automatisch bijgewerkt."
 
 # is dit de juiste betekenis?
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Leesbevestiging versturen"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Handtekening bestaat al"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Synchroniseren"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Mappen synchroniseren voor off-line gebruik?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -15641,7 +16101,7 @@ msgstr ""
 "Systeemmappen zijn vereist om Evolution correct te laten functioneren en "
 "kunnen niet hernoemd, verplaatst of verwijderd worden."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15658,7 +16118,7 @@ msgstr ""
 "gehele adreslijst in uw bericht tonen. Om dit te vermijden moet u tenminste "
 "één geadresseerde geven in het veld \"Aan:\" of \"CC:\"."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15672,7 +16132,7 @@ msgstr ""
 "    ‘{1}’\n"
 "en zijn bijgewerkt."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15686,11 +16146,11 @@ msgstr ""
 "    ‘{1}’\n"
 "en zijn bijgewerkt."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "Het script-bestand moet bestaan en uitvoerbaar zijn."
 
-#: ../mail/mail.error.xml.h:115
+#: ../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."
@@ -15699,7 +16159,7 @@ msgstr ""
 "editor om haar expliciet toe te voegen."
 
 # niet actief is/niet is geactiveerd/niet is aangezet
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -15710,13 +16170,13 @@ msgstr ""
 # vrij vertaald, was eerst: omdat u geen geadresseerden heeft opgegeven.
 # maar het is duidelijker als er staat dat het adresveld leeg is.
 # verzendadres/adres
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Dit bericht kan niet worden verzonden omdat u geen adres heeft ingevuld"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -15724,12 +16184,12 @@ msgstr ""
 "Deze server ondersteunt dit type aanmeldingscontrole niet en ondersteunt "
 "mogelijk geheel geen aanmeldingscontrole."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Deze handtekening is gewijzigd, maar nog niet opgeslagen."
 
 # worden aangemerkt/beschouwd/gemarkeerd
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -15737,11 +16197,11 @@ msgstr ""
 "Hiermee zullen alle berichten in de geselecteerde map en haar submappen als "
 "gelezen worden gemarkeerd."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kan geen verbinding krijgen met de GroupWise-server."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -15749,19 +16209,19 @@ msgstr ""
 "Kan de kladmap voor dit account niet openen. In plaats daarvan de systeem-"
 "kladmap gebruiken?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Kon het licentiebestand niet lezen."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "_Standaard gebruiken"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Standaard kladmap gebruiken?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../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"
@@ -15772,28 +16232,28 @@ msgstr ""
 "mappen.\n"
 "Wilt u dit echt doen?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Er staan nog berichten in de wachtrij. Wilt u toch afsluiten?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "U moet deze zoekmap een naam geven."
 
 # opgeven/aangeven/geven
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "U moet een map geven."
 
-#: ../mail/mail.error.xml.h:135
+#: ../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 "
@@ -15804,47 +16264,47 @@ msgstr ""
 "mappen te selecteren, alle mappen op afstand, of beide."
 
 # BUG? twee keer "{0}" in bericht?
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Uw aanmelding bij uw server ‘{0}’ als ‘{0}’ is mislukt."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Bijvoegen"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Veranderingen ongedaan maken"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "_Niet Synchroniseren"
 
 # Opschonen
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Leegmaken"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "Berichten _openen"
 
-#: ../mail/mail.error.xml.h:146
-msgid "on Current Folder and _Subfolders"
-msgstr "op huidige map en _submappen"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Gelezen"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Beantwoord"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Doorgestuurd"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
@@ -15869,46 +16329,49 @@ msgstr "Hoog"
 msgid "Highest"
 msgstr "Hoogste"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Vandaag %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../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 "Gisteren %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3838
+#. 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
 msgid "Generating message list"
 msgstr "Genereren van berichtenlijst"
 
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
-msgstr "Geen enkel mailbericht voldoet aan uw zoekopdracht. Wis de zoekopdracht via het menu Zoeken->Wissen of wijzig de zoekopdracht."
+msgstr ""
+"Geen enkel mailbericht voldoet aan uw zoekopdracht. Wis de zoekopdracht via "
+"het menu Zoeken->Wissen of wijzig de zoekopdracht."
 
-#: ../mail/message-list.c:4103
-msgid "There is currently no message in this folder."
-msgstr "Er is momenteel geen bericht in deze map."
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "Er zijn momenteel geen berichten in deze map."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15939,40 +16402,40 @@ msgstr "Verzonden berichten"
 msgid "Size"
 msgstr "Grootte"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Bellen"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Niet doorsturen"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Vervolg"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Ter informatie"
 
-#: ../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 "Doorsturen"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Geen antwoord nodig"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Beantwoorden"
 
 # allen is korter dan iedereen
-#: ../mail/message-tag-followup.c:84 ../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 "Allen beantwoorden"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Beoordelen"
 
@@ -15997,6 +16460,10 @@ msgid "Subject contains"
 msgstr "Onderwerp bevat"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Onderwerp of afzender bevat"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Onderwerp of afzender bevat"
 
@@ -16008,18 +16475,7 @@ msgstr "Lokale adresboeken"
 msgid "Provides core functionality for local address books."
 msgstr "Levert functionaliteit voor lokale adresboeken."
 
-# of/en (of is beter)
-# activeren/deactiveren
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Bijlageherinneringsplugin activeren"
-
-# activeren.deactiveren/aanzetten.uitzetten
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Bijlageherinneringsplugin activeren."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -16027,7 +16483,7 @@ msgstr ""
 "Lijst met trefwoorden waarmee de bijlageherinneringsplugin de tekstinhoud "
 "van het bericht controleert"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -16035,14 +16491,11 @@ msgstr ""
 "Lijst met trefwoorden waarmee de bijlageherinneringsplugin de tekstinhoud "
 "van het bericht controleert."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Trefwoorden"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Herinneren bij _ontbrekende bijlagen"
-
 #: ../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"
@@ -16069,7 +16522,7 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Bericht heeft geen bijlage"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "Bericht be_werken"
 
@@ -16085,30 +16538,30 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Audio-inline plugin"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Selecteer naam van het Evolution-archief"
 
 # na het maken van de reservekopie/archief
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "Evolution _herstarten na het maken van de reservekopie"
 
-#: ../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 "Selecteer de reservekopie waarmee Evolution hersteld wordt"
 
 # herstelbewerking/operatie
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "Evolution _herstarten na de hersteloperatie"
 
 # reservekopie/archief/backup
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Reservekopie terugzetten"
 
-#: ../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"
@@ -16118,97 +16571,121 @@ msgstr ""
 "mail, agenda's, taken, memo's en adresgegevens herstellen.\n"
 "U kunt hiermee ook uw persoonlijke instellingen en e-mailfilters herstellen."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution _herstellen via een reservekopie"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-archief selecteren voor herstellen:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Kies een bestand om te herstellen"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Backup maken van Evolution-map"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Evolution-map herstellen"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Evolution backup controleren"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Evolution herstarten"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Met grafische bedieningsinterface"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Evolution wordt afgesloten"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolution data en instellingen wegschrijven"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Verwerken van Evolution-data (e-mails, contacten, agenda, taken, memo's)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Backup afgerond"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolution wordt opnieuw gestart"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Backup maken van Evolution-data"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Uitpakken van bestanden uit reservekopie"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Laden van Evolution-instellingen"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Verwijderen van tijdelijke bestanden"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "Bevestigen van lokale bronnen"
+
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backup maken naar de map %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Backup terugzetten van de map %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution backup"
 
 # backup terugzetten/herstellen
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution herstellen"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Backup maken van Evolution-data"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Even geduld a.u.b. Evolution maakt een backup van uw data."
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Backup wordt geladen"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Even geduld a.u.b. Evolution haalt een backup terug."
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "Dit kan even duren en hangt af van de hoeveelheid data in uw account."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -16244,15 +16721,24 @@ msgstr ""
 "Als u wilt dat Evolution weer gestart wordt na de backup, geef dit dan nu "
 "aan."
 
+# Overgedragen/Overdrachtsrechten
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Onvoldoende rechten"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Ongeldig Evolution-backuparchief"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Kies een geldig Evolution-backuparchief voor herstellen."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "De gekozen map is niet beschrijfbaar."
+
+#: ../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 "
@@ -16280,53 +16766,48 @@ msgstr "_Herstellen vanuit backuparchief…"
 msgid "_Backup Settings..."
 msgstr "_Backuparchief aanmaken…"
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische contacten"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "_Automatisch kaarten aanmaken in het adresboek bij het beantwoorden van mail"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Selecteer het adresboek voor automatische contacten"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Contacten voor expresberichten"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr ""
-"Periodiek de contactinformatie en afbeeldingen synchroniseren uit de "
-"buddylijst van Pidgin"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Contactinformatie en afbeeldingen synchroniseren met Pidgin contactenlijst"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Selecteer het adresboek voor de buddylijst van Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Met _buddylijst synchroniseren"
 
 #: ../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 ""
 "Vult uw adresboek automatisch met namen en e-mailadressen wanneer u een e-"
 "mail beantwoordt. Ook wordt IM-contactinformatie aangevuld met de personen "
-"uit uw buddylijsten."
+"uit uw contactenlijst."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16381,17 +16862,18 @@ msgstr "Bogofilter spam-plugin"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Spam filteren met Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "_SSL gebruiken"
 
@@ -16412,17 +16894,18 @@ msgstr "Lokale agenda's"
 msgid "Provides core functionality for local calendars."
 msgstr "Levert functionaliteit voor lokale agenda's."
 
-#: ../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:375
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "_Verversen:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Beveiligde verbinding"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Gebruikers_naam:"
 
@@ -16527,27 +17010,27 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Wilt u dat Evolution uw standaard mailprogramma wordt?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
 # aanduiden/markeren/aanmerken/instellen/aangeven
-#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
 msgstr "Aanmerken als _standaard adresboek"
 
 # aanduiden/markeren/aanmerken/instellen/aangeven
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Aanmerken als _standaard agenda"
 
 # aanduiden/markeren/aanmerken/instellen/aangeven
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Aanmerken als _standaard takenlijst"
 
 # aanduiden/markeren/aanmerken/instellen/aangeven
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Aanmerken als _standaard memolijst"
 
@@ -16557,12 +17040,58 @@ msgstr "Standaardbronnen"
 
 #: ../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 ""
 "Levert functionaliteit voor het markeren van een agenda of adresboek als de "
 "standaard."
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "_Eigen berichtkoppen"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Sleutel"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Waarden"
+
+#. 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 ""
+"De opmaak voor eigen berichtkoppen is:\n"
+"Naam van de kop\";\"Waarde van de kop."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Eigen berichtkoppen"
+
+#. 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 "Eigen berichtkoppen toevoegen aan uitgaande berichten."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Eigen berichtkoppen"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Lijst van aangepaste berichtkoppen"
+
+#: ../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 "Map van andere gebruiker openen"
@@ -16580,12 +17109,12 @@ msgid "_User:"
 msgstr "_Gebruikersnaam:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Beveiligd wachtwoord"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16594,11 +17123,11 @@ msgstr ""
 "van beveiligde wachtwoorden (NTLM)."
 
 # wachtwoord in platte tekst
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "'Platte tekst'-wachtwoord"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16606,11 +17135,11 @@ msgstr ""
 "Met deze optie zal bij het aanmelden bij de Exchange-server het wachtwoord "
 "versturen als platte tekst."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Afwezig"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -16618,86 +17147,91 @@ msgstr ""
 "Het bericht hieronder zal automatisch worden vertuurd naar een ieder\n"
 "die naar u een bericht stuurt wanneer u afwezig bent."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Ik ben op dit moment afwezig"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Ik ben op dit moment aanwezig"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Wachtwoord voor Exchange-account wijzigen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Wachtwoord wijzigen"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Instellingen beheren voor delegeren bij een Exchange-account"
 
 # assistent delegeren/delegeren assistent
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Gemachtigden-assistent"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Overig"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "De grootte van alle Exchangemappen tonen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Mapgrootte"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-instellingen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "Aan_meldingscontrole"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+# mail?
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Postbus:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Type aanmeldingscontrole"
 
 # soorten/types
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Testen op ondersteunde types "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
 # dat soort dingen wilt doen/dat soort bewerkingen wilt uitvoeren
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16709,7 +17243,7 @@ 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"
@@ -16717,7 +17251,7 @@ msgstr ""
 "Het huidige wachtwoord komt niet overeen met het bestaande wachtwoord voor "
 "uw account. Geef het juiste wachtwoord"
 
-#: ../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 ""
 "De twee wachtwoorden zijn niet gelijk.  Voer de wachtwoorden nogmaals in."
@@ -16738,39 +17272,39 @@ msgstr "Nieuw wachtwoord:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Uw huidige wachtwoord is verlopen. Wijzig nu uw wachtwoord."
 
-#: ../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 "Uw wachtwoord zal over %d dagen verlopen"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Aangepast"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (lezen, aanmaken, bewerken)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Auteur (lezen, aanmaken)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Reviewer (alleen-lezen)"
 
 # Overgedragen/Overdrachtsrechten
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Gedelegeerden rechten"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Rechten voor %s"
@@ -16778,7 +17312,7 @@ msgstr "Rechten voor %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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -16789,7 +17323,7 @@ msgstr ""
 # De volgende toegangsrechten op mijn mappen zijn aan u toegekend:
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "U heeft de volgende toegangsrechten op mijn mappen:"
 
@@ -16797,7 +17331,7 @@ msgstr "U heeft de volgende toegangsrechten op mijn mappen:"
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "U mag ook mijn privé-items lezen."
 
@@ -16805,54 +17339,54 @@ msgstr "U mag ook mijn privé-items lezen."
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "U mag echter niet mijn privé-items lezen."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "U bent aangewezen als gemachtigde voor %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Overdragen aan"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "De gedelegeerde %s verwijderen?"
 
 # Active Directory is MS-ism?
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Kon Active Directory niet benaderen"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Kon mijzelf niet vinden in de Active Directory"
 
-#: ../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 "Kon gedelegeerde %s niet vinden in Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Kon gedelegeerde %s niet verwijderen"
 
 # vernieuwen/updaten/bijwerken
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Kon lijst met gedelegeerden niet bijwerken."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Kon gedelegeerde %s niet toevoegen"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Fout bij lezen van gedelegeerdenlijst."
 
@@ -16902,26 +17436,26 @@ msgstr "_Rechten"
 msgid "_Tasks:"
 msgstr "_Taken:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Toegangsrechten…"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Mapnaam"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Mapgrootte"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Gebruiker"
 
 # op map van anderen/andermans map
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../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 "Abonneren op andermans map"
@@ -16931,20 +17465,20 @@ msgid "Exchange Folder Tree"
 msgstr "Exchange mappen-boom"
 
 # mapabonnement opzeggen
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "Abonnement op map opzeggen…"
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Abonnement op map ‘%s’ echt opzeggen?"
 
-#: ../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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Abonnement op map ‘%s’ opzeggen"
@@ -17011,18 +17545,18 @@ msgid "_Change Password"
 msgstr "_Wachtwoord wijzigen"
 
 # punt met opzet weggelaten want dat is niet mooi
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(niet toegestaan)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Gebruiker toevoegen:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../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
 msgid "Add User"
 msgstr "Gebruiker toevoegen"
 
@@ -17144,15 +17678,11 @@ msgstr "_Gevoeligheid: "
 msgid "_User"
 msgstr "_Gebruiker"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "knopgebruiker"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Gebruiker selecteren"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Adresboek…"
 
@@ -17166,11 +17696,10 @@ msgstr "Abonneren op agenda van andere gebruiker"
 
 #: ../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 ""
-"Een plugin met een verzameling van Exchange-account-specifieke bewerkingen "
-"en functies."
+"Een plugin met een verzameling van Exchange-account-specifieke functies."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17261,11 +17790,15 @@ msgid "Could not update out-of-office state"
 msgstr "Kon afwezigheidsstatus niet bijwerken"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Evolution moet opnieuw gestart worden om de mailbox te laden"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange Account is offline."
 
 # BUG: extra spatie op einde?
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -17295,33 +17828,33 @@ msgstr ""
 "{0}\n"
 " "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Kon gedelegeerden niet bijwerken:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Map bestaat al"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Map bestaat niet"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Map is offline"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Generieke fout"
 
 # algemene catalogusserver, maar dit is een Exchange-jargon-term
-#: ../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 "Global Catalog Server is niet bereikbaar"
 
-#: ../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."
@@ -17329,76 +17862,76 @@ msgstr ""
 "Indien OWA op een ander pad draait, moet u dat opgeven in het dialoogvenster "
 "voor accountconfiguratie."
 
-#: ../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 "Postbus voor {0} bevindt zich niet op deze server."
 
-#: ../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 "Controleer de of de URL correct is en probeer opnieuw."
 
-#: ../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 "Controleer of de servernaam juist gespeld is en probeer opnieuw."
 
-#: ../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 ""
 "Controleer of de gebruikersnaam en wachtwoord juist gespeld is en probeer "
 "opnieuw."
 
-#: ../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 "Geen Global Catalog Server geconfigureerd voor dit account."
 
-#: ../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 "Geen postbus voor gebruiker {0} op {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Gebruiker {0} bestaat niet."
 
-#: ../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 "Wachtwoord is gewijzigd."
 
-#: ../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 ""
 "Geef de gegevens van de gemachtigde of verstuur dit bericht niet als "
 "gemachtigde."
 
 # Exchange jargon
-#: ../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 "Controleer of de naam voor de Global Catalog Server correct is."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "De wijzigingen worden actief nadat Evolution opnieuw gestart is"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Selecteer een gebruiker."
 
-#: ../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 "Server accepteert wachtwoord niet omdat het wachtwoord te zwak is."
 
-#: ../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 "Het Exchange-account zal worden uitgezet wanneer u Evolution afsluit"
 
-#: ../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 "De Exchange-server is niet compatibel met Exchange Connector."
 
-#: ../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 "De Exchange server is niet compatibel met Exchange Connector."
 
-#: ../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."
@@ -17406,7 +17939,7 @@ msgstr ""
 "Op de server draait Exchange 5.5. Exchange Connector \n"
 "ondersteunt alleen Microsoft Exchange 2000 en 2003."
 
-#: ../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"
@@ -17420,61 +17953,62 @@ msgstr ""
 "\n"
 "Of u heeft gewoon uw wachtwoord verkeerd ingetypt."
 
-#: ../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 "Probeer opnieuw met een ander wachtwoord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Kan de gebruiker niet aan de 'access control list' toevoegen:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Kon gedelegeerde niet bewerken."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Onbekende fout bij opzoeken van {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Onbekend type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Actie niet mogelijk"
 
 # quotum verbruikt/bereikt
-#: ../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 ""
 "U heeft bijna uw quotum verbruikt voor het opslaan van berichten op deze "
 "server."
 
-#: ../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 "U mag berichten maximaal namens één ander persoon versturen."
 
-#: ../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 "U kunt niet van uzelf uw eigen gedelegeerde maken"
 
-#: ../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 ""
 "U heeft uw quotum overschreden voor het opslaan van berichten op deze server."
 
-#: ../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 "U mag slechts een enkel Exchange account configureren."
 
-#: ../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."
@@ -17483,7 +18017,7 @@ msgstr ""
 "berichten weg te gooien."
 
 # verzenden/versturen
-#: ../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."
@@ -17492,7 +18026,7 @@ msgstr ""
 "ontvangen."
 
 # verzenden/versturen
-#: ../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."
@@ -17500,19 +18034,19 @@ msgstr ""
 "U gebruikt momenteel: {0} KB. U zult geen berichten kunnen verzenden totdat "
 "u wat ruimte vrijmaakt door enkele berichten weg te gooien."
 
-#: ../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 "Uw wachtwoord is verlopen."
 
-#: ../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 "{0} kan niet aan de 'access control list' worden toegevoegd"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} is al een gedelegeerde"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} bevindt zich al in de lijst"
 
@@ -17566,21 +18100,23 @@ msgstr ""
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
-msgstr "De externe editor genoemd in uw plugin-voorkeuren kan niet opgestart worden. Porbeer een andere editor in te stellen."
+msgstr ""
+"De externe editor genoemd in uw plugin-voorkeuren kan niet opgestart worden. "
+"Porbeer een andere editor in te stellen."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Opstellen in externe editor"
+msgid "Compose in _External Editor"
+msgstr "Opstellen in _externe editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Berichten opstellen met een externe editor"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Uit te voeren opdracht om de editor te starten: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17588,16 +18124,16 @@ msgstr ""
 "Voor Emacs gebruik: ‘xemacs’\n"
 "Voor VI gebruik: ‘gvim’"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Selecteer een (48×48) png-bestand kleiner dan 700 bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG-bestanden"
 
 # pasfoto/gezicht
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "Ge_zicht"
 
@@ -17637,13 +18173,49 @@ msgstr "Abonnementen op mappen opzeggen"
 msgid "_Unsubscribe"
 msgstr "Af_melden"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Eerst gebruikersnaam invoeren."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Neem abonnement op deze map"
+
+#: ../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 "_Agenda:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "Ophalen van ‘%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 "<b>Leden</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Een plugin voor het instellen van Google-agenda."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17651,7 +18223,7 @@ msgid "Google sources"
 msgstr "Google-bronnen"
 
 # controlelijst/aftekenlijst
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Aftekenlijst"
 
@@ -17700,16 +18272,16 @@ msgstr "Installeer de gedeelde map"
 msgid "Shared Folder Installation"
 msgstr "Installatie van gedeelde map"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Spaminstellingen"
 
-#: ../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 "Spaminstellingen"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Spaminstellingen…"
 
@@ -17734,15 +18306,26 @@ msgstr "_Gebruiken"
 msgid "_Junk List"
 msgstr "_Spamlijst"
 
+#: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Berichtstatus"
+
+#: ../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 ""
+
 # retract: terugtrekken/intrekken
 # terughalen
 # 'zoiets als, bericht verzenden en dan terugkomen op je besluit
 # en dan het bericht intrekken (besluit terugdraaien)
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Terughalen van bericht is gelukt"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Berichten terughalen"
 
@@ -17750,12 +18333,6 @@ msgstr "Berichten terughalen"
 msgid "Add Send Options to groupwise messages"
 msgstr "Verzendopties bij groupwise-berichten tonen"
 
-#: ../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"
-msgstr "Verzendopties"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Een plugin voor de functies in Groupwise-accounts."
@@ -17774,7 +18351,8 @@ msgstr "Terughalen van bericht is mislukt"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
-msgstr "De server stond niet toe dat het geselecteerde bericht werd teruggehaald."
+msgstr ""
+"De server stond niet toe dat het geselecteerde bericht werd teruggehaald."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17811,9 +18389,10 @@ msgid "Account Already Exists"
 msgstr "Account bestaat al"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
 "Proxy-login als &quot;{0}&quot; is niet gelukt. Controleer e-mail-ID en "
 "probeer opnieuw."
@@ -17824,18 +18403,25 @@ msgid "This is a recurring meeting"
 msgstr "Deze bijeenkomst herhalen"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
+#, fuzzy
+msgid "Would you like to accept it?"
 msgstr "Wat wilt u {0}?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Wilt u de wijzingen opslaan?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "U kunt de map niet delen met de aangegeven gebruiker &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../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 "U moet de gebruikersnaam geven van degene die u aan de lijst wilt toevoegen"
+msgstr ""
+"U moet de gebruikersnaam geven van degene die u aan de lijst wilt toevoegen"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Voorlopig accepteren"
 
@@ -17852,7 +18438,7 @@ msgid "Con_tacts..."
 msgstr "Con_tacten…"
 
 #: ../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 "Bericht"
 
@@ -17936,9 +18522,9 @@ msgstr "<b>Accountnaam</b>"
 msgid "Proxy Login"
 msgstr "Proxy-login"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17947,48 +18533,48 @@ msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %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:509
 msgid "_Proxy Login..."
 msgstr "_Proxy aanmelding…"
 
 # ingesteld/actief gemaakt/geactiveerd/aangezet
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Het tabblad proxy is alleen beschikbaar wanneer het account online is."
 
 # ingesteld/actief gemaakt/geactiveerd/aangezet
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "Het tabblad proxy is alleen beschikbaar wanneer het account is geactiveerd."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Geef de gebruikers en bepaal de rechten"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Nieuwe _gedeelde map…"
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Delen"
 
 # Zelfgemaakte/aangepaste melding/mededeling
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
 msgstr "Aangepaste mededeling"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Toevoegen"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Aanpassen"
 
@@ -18054,12 +18640,12 @@ msgstr "Een plugin voor het instellen van hula-agendabronnen."
 msgid "Hula Account Setup"
 msgstr "Hula-account instellen"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Aangepaste berichtkoppen"
 
 # Koppen/Berichtkop (berichtkop is beter in dit geval)
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP berichtkoppen"
 
@@ -18133,8 +18719,8 @@ msgstr "Takenlijst selecteren"
 msgid "Select Calendar"
 msgstr "Agenda selecteren"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importeren"
 
@@ -18172,13 +18758,15 @@ msgstr ""
 "Evolution kon geen iPod vinden om mee the synchroniseren. Het apparaat is "
 "ofwel niet verbonden met het systeem of het is uitgeschakeld."
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-formaat (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+#, fuzzy
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr "Synchroniseer geselecteerde taak/agenda/adresboek met een Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -18189,8 +18777,8 @@ msgstr "Synchroniseren met iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synchronisatie"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kon de agenda ‘%s’ niet laden"
@@ -18198,124 +18786,124 @@ msgstr "Kon de agenda ‘%s’ niet laden"
 # Deze bijeenkomst conflicteert met een afspraak in de agenda %s/
 # Een afspraak in de agenda %s conflicteert met deze bijeenkomst
 # valt gelijk met/conflicteert met
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Een afspraak in de agenda ‘%s’ valt gelijk met deze bijeenkomst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "De afspraak is gevonden in de agenda ‘%s’"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Kon geen enkele agenda vinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kon deze bijeenkomst in geen enkele agenda terugvinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Kon deze taak in geen enkele takenlijst terugvinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Kon deze memo in geen enkele memolijst terugvinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Zoekende naar een bestaande versie van deze afspraak"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Kan het item niet verwerken"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan item niet naar agenda ‘%s’ versturen. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Verzonden aan agenda ‘%s’ als geaccepteerd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Verzonden aan agenda ‘%s’ als voorlopig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Verzonden aan agenda ‘%s’ als afgewezen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Verzonden aan agenda ‘%s’ als geannuleerd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator heeft de gedelegeerde %s verwijderd "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Een annuleringsbericht is aan de gedelegeerde verstuurd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kon het annuleringsbericht voor de gedelegeerde niet verzenden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Aanwezigheidsstatus kon niet ververst worden omdat de status ongeldig is"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kon aanwezige niet updaten. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Aanwezigheidstatus ververst"
 
 # bijeenkomstinformatie/bijeenkomstgegevens
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Bijeenkomstinformatie verzonden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Taakinformatie verzonden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Memoinformatie verzonden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan bijeenkomstinformatie niet verzenden, de bijeenkomst bestaat niet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan taakinformatie niet verzenden, de taak bestaat niet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan memoinformatie niet verzenden, de memo bestaat niet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "De bijgevoegde agenda is niet geldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18323,15 +18911,15 @@ msgstr ""
 "Het bericht claimt dat het een agenda bevat, maar de agenda is geen geldige "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Het item in de agenda is niet geldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18339,11 +18927,11 @@ msgstr ""
 "Het bericht bevat een agenda, maar de agenda bevat geen aantekenigen, taken "
 "of vrij/bezet-informatie"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "De bijgevoegde agenda bevat meerdere items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18351,232 +18939,232 @@ msgstr ""
 "Om al deze items te verwerken, moet het bestand worden opgeslagen en de "
 "agenda worden geïmporteerd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Deze bijeenkomst herhaalt zich"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Deze taak herhaalt zich"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Deze memo herhaalt zich"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Bericht verwijderen na actie"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Dubbele afspraken zoeken"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 "Selecteer de agenda's waarbinnen naar dubbele afspraken moet worden gezocht"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Vandaag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Vandaag %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Vandaag %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Vandaag %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Reageer namens <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Ontvangen namens <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> heeft via %s de volgende bijeenkomstgegevens beschikbaar gesteld:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> heeft de volgende bijeenkomstgegevens beschikbaar gesteld:"
 
 #   : ipv .
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> heeft de volgende bijeenkomst aan u gedelegeerd:"
 
 # <b>$2%s</b> vraagt u op verzoek van $1%s bij de volgende bijeenkomst aanwezig te zijn:
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> vraagt u via %s bij de volgende bijeenkomst aanwezig te zijn:<"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> verzoekt u bij de volgende bijeenkomst aanwezig te zijn:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> wil via %s graag aan een bestaande bijeenkomst bijdragen:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18585,7 +19173,7 @@ msgstr ""
 "<b>%s</b> via %s wil graag de laatste informatie ontvangen voor de volgende "
 "bijeenkomst:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18593,86 +19181,86 @@ msgstr ""
 "<b>%s</b> wil graag de laatste informatie ontvangen voor de volgende "
 "bijeenkomst:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> via %s heeft het volgende antwoord teruggestuurd:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> heeft het volgende antwoord teruggestuurd:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> heeft via %s de volgende bijeenkomst geannuleerd:"
 
 # ":" ipv "."
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> heeft de volgende bijeenkomst geannuleerd:"
 
 # ":" ipv "."
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> via %s stelt de volgende bijeenkomstwijzigingen voor:"
 
 # ":" ipv "."
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s<b> stelt de volgende bijeenkomstwijzigingen voor:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s<b> heeft via %s de volgende bijeenkomstwijzigingen afgewezen:"
 
 # ":" ipv "."
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s<b> heeft de volgende bijeenkomstwijzigingen afgewezen:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> heeft via %s de volgende taak beschikbaar gesteld:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> heeft de volgende taak beschikbaar gesteld:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> verzoekt dat %s de volgende taak wordt toegewezen:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> heeft via %s u een taak toegewezen:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> heeft u een taak toegewezen:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> wil via %s aan een bestaande taak iets toevoegen:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wil aan een bestaande taak iets toevoegen:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18681,7 +19269,7 @@ msgstr ""
 "<b>%s</b> via %s wil graag de laatste informatie voor de volgende toegewezen "
 "taak ontvangen:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18690,30 +19278,30 @@ msgstr ""
 "<b>%s</b> wil graag de laatste informatie voor de volgende toegewezen taak "
 "ontvangen:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> heeft via %s het volgende antwoord gestuurd:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> heeft het volgende antwoord gestuurd:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> heeft via %s de volgende toegewezen taak geannuleerd:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> heeft de volgende toegewezen taak geannuleerd:"
 
 # bv: a krijgt nu taak T1 en b krijgt taak T2
 # verdelen van taken/toewijzen van taken/taakverdeling
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18722,104 +19310,104 @@ msgstr ""
 
 # bv: a krijgt nu taak T1 en b krijgt taak T2
 # verdelen van taken/toewijzen van taken/taakverdeling
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> stelt de volgende wijzigingen bij de taakverdeling voor:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> heeft via %s de volgende toegewezen taak afgewezen:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> heeft de volgende toegewezen taak afgewezen:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> heeft via %s de volgende memo beschikbaar gesteld:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> heeft de volgende memo beschikbaar gesteld:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> wil via %s graag aan een bestaande memo bijdragen:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wil graag aan een bestaande memo bijdragen:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> heeft via %s de volgende bijeenkomst geannuleerd:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> heeft de volgende gedeelde memo geannuleerd:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "Agenda _openen"
 
 # afzeggen/weigeren/afwijzen
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "Af_wijzen"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Accepteren"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "Alles af_wijzen"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "Alles _voorlopig"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Voorlopig"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "Alles _accepteren"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "Informatie v_erzenden"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Aanwezigheidsstatus bijwerken"
 
 # bijwerken/updaten/verversen
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Bijwerken"
 
@@ -18928,8 +19516,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genereert een D-Busbericht bij binnenkomst van nieuwe e-mail."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Indien ingeschakeld, piepen. Anders een geluidsbestand afspelen bij "
 "binnenkomst van nieuwe berichten."
@@ -18986,9 +19576,19 @@ msgstr "Of alleen melding gemaakt wordt bij nieuwe e-mail in de Inbox."
 msgid "Generate a _D-Bus message"
 msgstr "Een _D-busbericht genereren"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "E-mailmelding"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "E-mailmelding"
+
 # 'ontvangen' kan in principe weggelaten worden
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19003,57 +19603,57 @@ msgstr[1] ""
 "U heeft %d nieuwe berichten ontvangen\n"
 "in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "U heeft %d nieuw bericht ontvangen."
 msgstr[1] "U heeft %d nieuwe berichten ontvangen."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Nieuwe e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Pictogram tonen in het meldingsvak"
 
 # pulseert
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Pictogram in meldingsvak knippert"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Popup-_bericht tegelijk met het pictogram"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
 
 # piepje/piepen
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Piepen"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "_Geluidsbestand afspelen"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Geef _bestandsnaam:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Selecteer een geluidsbestand"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "A_fspelen"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "_Alleen melden bij nieuwe berichten in de Inbox"
 
@@ -19088,12 +19688,12 @@ msgstr "Om_zetten naar bijeenkomst"
 msgid "Mail to meeting"
 msgstr "Van e-mail naar bijeenkomst"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan agenda niet openen. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19209,9 +19809,10 @@ msgid "Send e-mail message to mailing list?"
 msgstr "E-mailbericht aan mailinglijst sturen?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19296,6 +19897,31 @@ msgstr "A_bonneren op lijst"
 msgid "_Unsubscribe from List"
 msgstr "_Abonnement op de lijst opzeggen"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Berichten worden verplaatst naar map %s"
+
+# worden aangemerkt/beschouwd/gemarkeerd
+#: ../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 ""
+"Hiermee zullen alle berichten in de geselecteerde map en haar submappen als "
+"gelezen worden gemarkeerd."
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "op huidige map en _submappen"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Huidige map"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Alles markeren als gelezen"
@@ -19341,7 +19967,7 @@ msgstr ""
 # beheerder
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Pluginbeheer"
 
@@ -19355,33 +19981,24 @@ msgstr "Plugins aan of uitzetten"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Omschrijving"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Configuratie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Merk op: bepaalde wijzigingen zijn pas van kracht na een herstart"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Overzicht"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuratie"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Er is geen configuratieoptie voor deze plugin."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -19410,20 +20027,20 @@ msgstr "Platte tekst modus"
 msgid "Prefer plain-text"
 msgstr "Voorkeur voor gewone tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:158
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "HTML tonen indien aanwezig"
 
-#: ../plugins/prefer-plain/prefer-plain.c:159
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Voorkeur voor gewone tekst"
 
 # ooit eens?
-#: ../plugins/prefer-plain/prefer-plain.c:160
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Alleen gewone tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "HTML-modus"
 
@@ -19544,6 +20161,32 @@ msgstr ""
 "iCal\n"
 "Vrij/Bezet"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telefoon thuis"
+
+#: ../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 "Mono-lader"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (ingebouwd)"
@@ -19618,7 +20261,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:314
 msgid "Save attachments"
 msgstr "Bijlagen opslaan"
 
@@ -19633,16 +20276,15 @@ msgid "Save all attachments"
 msgstr "Alle bijlagen opslaan"
 
 # huh?
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Selecteer opslaan basisnaam"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Opslaan"
 
@@ -19652,82 +20294,82 @@ msgstr "Opslaan"
 #. * 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:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Omschrijvinglijst"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Categorieënlijst"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Commentaarlijst"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Aangemaakt"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Contactenlijst"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Begin"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Eind"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "percentage voltooid"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Aanwezigenlijst"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Aangepast"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Extra opties voor het CSV-formaat"
 
 # bijsluiten/invoegen
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Vooraan een header invoegen"
 
 # letterlijk: waardebegrenser, maar het gaat om het teken
 # waarmee de variabelen worden gescheiden
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Scheidingsteken"
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Einde-regel teken:"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Waarden omringen met:"
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value formaat (.csv)"
 
@@ -19748,15 +20390,15 @@ msgstr "Opslaan op _schijf"
 #. * 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:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF-formaat (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Doelbestand selecteren"
 
@@ -19781,23 +20423,24 @@ msgid "Show _only this Task List"
 msgstr "_Alleen deze takenlijst tonen"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Een plugin die de opstart-assistent verzorgt."
+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 "Opstartassistent"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Assistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution instellingen-assistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Welkom"
 
 # Forward wordt in gtk+ vertaald met Volgende
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19810,29 +20453,29 @@ msgstr ""
 "\n"
 "Klik op ‘Volgende’ om te beginnen."
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Bestanden importeren"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Gegevens importeren."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
 
@@ -19852,10 +20495,38 @@ msgid "Thread messages by subject"
 msgstr "Berichten groeperen op discussie per onderwerp"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Terugvallen naar discussieweergave per _onderwerp"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Lijst met trefwoorden waarmee de bijlageherinneringsplugin de tekstinhoud "
+"van het bericht controleert."
+
+#: ../plugins/templates/templates.c:615
+#, fuzzy
+msgid "No title"
+msgstr "Functie"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Als klad opslaan"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Als klad opslaan"
+
+#: ../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."
 msgstr ""
@@ -19865,6 +20536,31 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "TNEF-bijlagedecoder"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Een plugin voor het instellen van Google-agenda."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Geen contacten"
+
+#: ../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 "Evolution shell"
@@ -19882,145 +20578,145 @@ msgid "Evolution Test component"
 msgstr "Evolution testcomponent"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Een omschrijving van de huidige printerinstellingen."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr "Aanmeldingscontrole op proxy-serververbindingen uitvoeren"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "De URL voor automatische proxy-configuratie"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Configuratieversie"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Bepaalt of crash-detectie uitgevoerd wordt."
-
 # zijpaneel/balk
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Standaardbreedte van zijpaneel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Standaard vensterhoogte"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Standaard vensterstand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Standaard vensterbreedte"
 
 # secure HTTP/beveilighde HTTP
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Activeert de proxy-instellingen bij gebruik van HTTP/Beveilighde HTTP over het internet."
+msgstr ""
+"Activeert de proxy-instellingen bij gebruik van HTTP/Beveilighde HTTP over "
+"het internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP-proxy hostnaam"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP-proxy wachtwoord"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP-proxy poort"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP-proxy gebruikersnaam"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 of alias van het component dat bij het opstarten moet worden weergegeven."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+#, fuzzy
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
-msgstr "Indien ingeschakeld, vereisen verbindingen met de proxy-server aanmeldingscontrole. De combinatie gebruikersnaam/wachtwoord id gedefinieerd in ‘/apps/evolution/shell/network_config/authentication_user’ en het lokaal opgeslagen wachtwoord in ‘.gnome2_private/.’"
+"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 ""
+"Indien ingeschakeld, vereisen verbindingen met de proxy-server "
+"aanmeldingscontrole. De combinatie gebruikersnaam/wachtwoord id gedefinieerd "
+"in ‘/apps/evolution/shell/network_config/authentication_user’ en het lokaal "
+"opgeslagen wachtwoord in ‘.gnome2_private/.’"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Laatst bijgewerkte configuratieversie"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lijst met paden voor de mappen die gesynchroniseerd dienen te worden voor "
 "offline gebruik"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Non-proxy hosts"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Wachtwoord voor de aanmeldingscontrole bij gebruik van HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Proxy configuratiemodus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS-proxyhostnaam"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS-proxypoort"
 
 # secure HTTP/beveilighde HTTP
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Beveiligde HTTP-proxyhostnaam"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Beveiligde HTTP-proxypoort"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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 "Selecteer de proxy-configuratiemodus. Mogelijke waarden zijn  0, 1, 2, en 3 die staan voor ‘systeeminstellingen gebruiken’, ‘geen proxy’, ‘handmatige proxy-configuratie gebruiken’ en ‘proxy-configuratie geleverd door de autoconfiguratie-url’ gebruiken."
+msgstr ""
+"Selecteer de proxy-configuratiemodus. Mogelijke waarden zijn  0, 1, 2, en 3 "
+"die staan voor ‘systeeminstellingen gebruiken’, ‘geen proxy’, ‘handmatige "
+"proxy-configuratie gebruiken’ en ‘proxy-configuratie geleverd door de "
+"autoconfiguratie-url’ gebruiken."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Zijpaneel is zichtbaar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Waarschuwingsdialoog voor instabiele versie overslaan"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Waarschuwingsdialoog voor herstel overslaan"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Beginnen in offline stand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statusbalk is zichtbaar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20028,19 +20724,19 @@ msgstr ""
 "De configuratieversie van Evolution, met major/minor/configuratieniveau "
 "(bijvoorbeeld \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "De standaardhoogte van het hoofdvenster in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "De standaardbreedte van het hoofdvenster in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "De standaardbreedte van het zijpaneel in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../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\")."
@@ -20048,39 +20744,45 @@ msgstr ""
 "De laatst bijgewerkte configuratieversie van Evolution, met major/minor/"
 "configuratieniveau (bijvoorbeeld \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "De naam van de computer die als HTTP-proxy gebruikt wordt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "De naam van de computer die als beveiligde HTTP-proxy gebruikt wordt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "De naam van de computer die als socks-proxy gebruikt wordt."
 
 # waardoor/waarmee u een proxyverbinding maakt/die u als proxy gebruikt
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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 "De poort op de computer gedefinieerd in ‘/apps/evolution/shell/network_config/http_host’ die u als proxy gebruikt."
+msgstr ""
+"De poort op de computer gedefinieerd in ‘/apps/evolution/shell/"
+"network_config/http_host’ die u als proxy gebruikt."
 
 # apparaat/computer
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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 "De poort op de computer gedefinieerd in ‘/apps/evolution/shell/network_config/secure_host’ die u als proxy gebruikt."
+msgstr ""
+"De poort op de computer gedefinieerd in ‘/apps/evolution/shell/"
+"network_config/secure_host’ die u als proxy gebruikt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "De poort op de computer gedefinieerd in ‘/apps/evolution/shell/network_config/socks_host’ die u als proxy gebruikt."
+msgstr ""
+"De poort op de computer gedefinieerd in ‘/apps/evolution/shell/"
+"network_config/socks_host’ die u als proxy gebruikt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20090,77 +20792,72 @@ msgstr ""
 "‘toolbar’. Bij ‘toolbar’ wordt de stijl bepaald door de instelling van Gnome "
 "voor werkbalken."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../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 "Deze sleutel bevat een lijst met hosts waarmee een direkte verbinding gemaakt wordt in plaats van via een proxy (wanneer deze geactiveerd is). De waarden kunnen hostnamen zijn, domeinen (met een jokerteken aan het begin zoals *.foo.com), IP-host-adressen (zowel IPv4 als IPv6) en netwerkadressen met een netmasker (zoiets als: 192.168.0.0/24)"
+msgstr ""
+"Deze sleutel bevat een lijst met hosts waarmee een direkte verbinding "
+"gemaakt wordt in plaats van via een proxy (wanneer deze geactiveerd is). De "
+"waarden kunnen hostnamen zijn, domeinen (met een jokerteken aan het begin "
+"zoals *.foo.com), IP-host-adressen (zowel IPv4 als IPv6) en netwerkadressen "
+"met een netmasker (zoiets als: 192.168.0.0/24)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Werkbalk is zichtbaar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL waar de proxyconfiguratiewaarden gevonden kunnen worden."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "HTTP-proxy gebruiken"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Gebruikersnaam om als aanmeldnaam door te geven bij gebruik van HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Of Evolution opstart in offline-modus in plaats van online-modus."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Of gecontroleerd wordt of er vastlopers zijn geweest"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Of het venster gemaximaliseerd moet zijn."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Of het zijpaneel zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Of de statusbalk zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Of de werkbalk zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Of het waarschuwingsdialoog voor de ontwikkelingsversies van Evolution wordt "
 "overgeslagen."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Of het waarschuwingsdialoog bij het herstellen van Evolution wordt "
-"overgeslagen."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Of de vensterknoppen zichtbaar zijn."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Vensterknoppenstijl"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Vensterknoppen zijn zichtbaar"
 
@@ -20176,17 +20873,15 @@ msgstr "Actieve verbindingen"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Kies welk type importeerfilter u wilt gebruiken:"
 
-#: ../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 ""
 "Kies het bestand dat u wilt importeren in Evolution, en kies het "
 "bijbehorende bestandstype uit de lijst.\n"
@@ -20194,12 +20889,12 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Kies de doel map voor deze import"
 
 # vrij vertaald
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -20211,23 +20906,23 @@ msgstr ""
 "Er zijn echter niets gevonden dat geïmporteerd konden worden.\n"
 "Indien u het nogmaals wilt proberen klikt u op \"Terug\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "B_estandsnaam:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "Bestands_type:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Informatie en instellingen importeren van _oudere programma's"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Een enkel bestand i_mporteren"
 
@@ -20235,29 +20930,9 @@ msgstr "Een enkel bestand i_mporteren"
 msgid "Evolution Preferences"
 msgstr "Evolution voorkeuren"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Geen mapnaam opgegeven."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Mapnaam kan geen enter-teken bevatten."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Mapnaam mag geen \"/\" bevatten."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Mapnaam mag geen \"#\" bevatten."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' en '..' zijn gereserveerde mapnamen."
-
 #. 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:50 ../shell/e-shell-window.c:343
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20282,7 +20957,7 @@ msgstr "Bug-buddy kon niet worden gestart."
 #. 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:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Tino Meinen\n"
@@ -20301,75 +20976,81 @@ msgstr ""
 "Voor rapporteren van fouten in de vertaling:\n"
 "http://nl.gnome.org/"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution website"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Fout bij openen van de FAQ-webpagina."
 
 # De W wordt al gebruikt voor Nieu_w venster
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Online werken"
 
 # De Sneltoets O wordt zo gebruikt voor het schakelen tussen
 #  _Online en _Offline (dat is goed)
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Offline werken"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Werken zonder netwerk"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
 "netwerkverbinding te werken."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is bezig offline te gaan."
 
 # te werken/te gaan werken
 # met een netwerkverbinding/online
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution is nu niet verbonden met het netwerk. Klik op deze knop om online "
 "te gaan werken."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Omschakelen naar %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Onbekende systeemfout."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # Okay/Ok/OK
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
@@ -20379,15 +21060,17 @@ msgstr "Configuratiedatabase niet gevonden"
 msgid "New"
 msgstr "Nieuw"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nieuwe taak"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#, fuzzy
+msgctxt "New"
 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 "Maak een nieuwe test item aan"
 
@@ -20434,7 +21117,7 @@ msgstr ""
 "van externe bestanden in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20471,7 +21154,7 @@ msgstr ""
 "ons\n"
 "harde werk en wachten in spanning op uw bijdrage!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20479,70 +21162,46 @@ msgstr ""
 "Bedankt!\n"
 "Het Evolution team\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Dit bericht niet meer weergeven"
 
-# vastloper
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr "Evolution vastloperdetectie"
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "_Negeren"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution is kennelijk de vorige keer onverwacht afgebroken. Als\n"
-"voorzorgmaatregel wordt het voorbeeldpaneel verborgen gehouden.\n"
-"U kunt het voorbeeldpaneel herstellen via het menu Beeld.\n"
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "_Dit bericht niet meer tonen."
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution met activatie van het gespecificeerde component"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
 # geforceerd laten stoppen/doen stoppen
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle componenten van Evolution geforceerd laten stoppen"
 
 # Geforceerd migreren van Evolution 1.4
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Geforceerd opnieuw migreren vanuit Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Verzend de debug-uitvoer van alle componenten naar een bestand."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Het laden van plugins deactiveren."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Voorbeeldpaneel van Post, Adresboek en Taken uitzetten."
 
 # Personal information manager
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Het Evolution PIM en e-mailprogramma"
 
-#: ../shell/main.c:705
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20690,7 +21349,7 @@ msgstr ""
 "Indien u besluit door te gaan heeft u mogelijk geen toegang meer tot "
 "bepaalde delen van uw oude gegevens.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20701,7 +21360,7 @@ msgstr ""
 "\n"
 "Vertrouwen-instellingen bewerken."
 
-#: ../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 "
@@ -20711,7 +21370,7 @@ msgstr ""
 "uitgegeven, vertrouwt u de geldigheid van dit certificaat; tenzij het hier "
 "anders is aangegeven"
 
-#: ../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 "
@@ -20769,27 +21428,27 @@ msgstr "E-mailadres"
 msgid "All CA certificate files"
 msgstr "Alle CA-certificaten"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certificaat weergave: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Geef uw wachtwoord voor ‘%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 "Geef een nieuw wachtwoord voor de certificaat-database"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Geef een nieuw wachtwoord"
 
 #. 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"
@@ -20798,7 +21457,7 @@ msgstr ""
 "Afgegeven aan:\n"
 "  Onderwerp: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20807,7 +21466,7 @@ msgstr ""
 "Afgegeven door:\n"
 "  Onderwerp:%s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Selecteer certificaat"
 
@@ -20995,7 +21654,7 @@ msgid "_Edit CA Trust"
 msgstr "B_ewerk CA vertrouwen"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certificaat bestaat reeds"
 
@@ -21163,15 +21822,15 @@ msgstr "Unieke ID van de persoon"
 msgid "Certificate Signature Value"
 msgstr "Certificaatondertekeningswaarde"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Bestand wachtwoord"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Voer uw wachtwoord in voor PKCS12 bestand:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Geimporteerd certificaat"
 
@@ -21226,7 +21885,8 @@ msgid "Copy to Folder..."
 msgstr "aar map kopiëren…"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+#, fuzzy
+msgid "Create a new address book folder"
 msgstr "Een nieuwe adresboekmap aanmaken"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -21311,8 +21971,7 @@ msgstr "De contacten in de geselecteerde map opslaan als VCard"
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "_Alles selecteren"
 
@@ -21386,7 +22045,7 @@ msgstr "Contact verplaatsen naar…"
 msgid "_Move Folder Contacts To"
 msgstr "Contacten in map _verplaatsen naar"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nieuw"
 
@@ -21447,7 +22106,7 @@ msgid "Month"
 msgstr "Maand"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Volgende"
 
@@ -21456,7 +22115,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de agenda"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Vorige"
 
@@ -21524,208 +22183,6 @@ msgstr "Werkweek"
 msgid "_Open Appointment"
 msgstr "_Open Afspraak"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Klik hier om een bestand bij te voegen"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klik hier om het huidige venster te sluiten"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klik hier om het huidige venster op te slaan"
-
-# beschikbare niet meevertaald
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Klik hier om de hulp weer te geven"
-
-#.
-#. <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-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Sluiten"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "De geselecteerde tekst naar klembord kopiëren"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "De geselecteerde tekst naar klembord knippen"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nvoegen"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "De tekst vanaf het klembord plakken"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Alle tekst selecteren"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hulp"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opties"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Agendanotitie voor de hele dag"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Agendanotitie voor de hele _dag"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Markeren als vertrouwelijk"
-
-# Classificeren/aanmerken
-#: ../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 "Markeren als privé"
-
-# open/openlijk/publiek/doorzichtig/openbaar
-#: ../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 "Markeren als openbaar"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Klik hier om alarmeringen voor deze agendanotitie in te stellen of uit te "
-"zetten"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Extra verzendopties invoegen"
-
-# Maak deze gebeurtenis herhalend/een (zich) herhalende gebeurtenis
-# Deze gebeurtenis herhalen/laten herhalen/laten terugkomen
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Deze agendanotitie herhalen"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_Openbaar"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Vrij/bezet-informatie van de aanwezigen bevragen"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "_Rol-veld"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Verzend_opties"
-
-# bezet mooier dan bezig
-# periode tonen/weergeven als bezet
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "_Tijd tonen als bezet"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Tijd_zone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Schakelt de weergave van het aanwezigheidstype-veld aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Schakelt de weergave van het RSVP-veld aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Schakelt de weergave van het rol-veld aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Schakelt de weergave van het status-veld aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Schakelt de weergave van de tijzone aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Schakelt de weergave van categorieën aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Schakelt het hebben van een agendanotitie voor de hele dag aan/uit"
-
-# ingeplande tijd
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Schakelt de weergave van tijd die bezet is aan/uit"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmeringen"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorieën"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Classificatie"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Vertrouwelijk"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "V_rij/Bezet"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privé"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "He_rhaling"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Statusveld:"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Type-veld"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Stop de huidige e-mailbewerking"
@@ -21758,7 +22215,6 @@ msgstr "_Prullenbak legen"
 
 # meervoud is beter hier
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Mappen"
 
@@ -21997,7 +22453,7 @@ msgid "_Group By Threads"
 msgstr "_Groeperen op discussie"
 
 # meervoud is beter hier
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "B_erichten"
@@ -22335,132 +22791,132 @@ msgstr "Pagina-instellingen configureren voor de huidige printer"
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Een knipperende cursor tonen in de inhoud van weergegeven berichten"
 
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Berichten weergeven in de normale stijl"
-
 # volledige/complete
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages with all email headers"
 msgstr "Berichten weergeven met de volledige e-mailheader"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Brontekst van het bericht weergeven"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Verwijderen van de geselecteerde berichten ongedaan maken"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_Niet belangrijk"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_Uitzoomen"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Bijgevoegd"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Cursor-modus"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "Markering _wissen"
 
 # de _v wordt gebruikt voor _voorkeuren
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "Berichten verwij_deren"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Zoeken in bericht…"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Markeren als _voltooid"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Ga naar"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Belangrijk"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Ingebonden"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Spam"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Afbeeldingen laden"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Berichtenbron"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "V_olgende bericht"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normale afmeting"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Geen spam"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "In nieuw venster _openen"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Vo_rige bericht"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Lezen"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "Bericht op_slaan…"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "Bericht _terughalen"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "O_ngelezen"
 
 # Menu: _View -> _Zoom -> _Zoom In
 #                          Zoom _Out
 #                         _Normal Sie
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zoomen"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "In_zoomen"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Sluiten"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hoofdwerkbalk"
@@ -22501,81 +22957,6 @@ msgstr "De geselecteerde memo weergeven"
 msgid "_Open Memo"
 msgstr "Memo _openen"
 
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "Sl_uiten"
-
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "Op_maak"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Opslaan en sluiten"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Opslaan en sl_uiten"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Het huidige bestand opslaan en het venster sluiten"
-
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Stuur het bericht in HTML-formaat"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Neem abonnement op deze map"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Lijst Verversen"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Mappenlijst verversen"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Beeindig abonnement op deze map"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Abonneren"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Afmelden"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Selectie in_verteren"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Klik op: de statusdetails van deze taak wijzigen/weergeven"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Statusdetails"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Tijdzone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Statusdetails"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopieer de geselecteerde taken"
@@ -22782,10 +23163,15 @@ msgid "View/Hide the Status Bar"
 msgstr "De statusbalk tonen/verbergen"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "Werken zonder netwerk"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "I_nfo"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "Venster sl_uiten"
 
@@ -22794,39 +23180,39 @@ msgstr "Venster sl_uiten"
 # Nieu_w venster
 # V_ersturen
 # Afdruk_voorbeeld
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Wachtwoorden ver_geten"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Frequently Asked Questions"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Knoppen verbergen"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Alleen _pictogrammen"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Verkorte handleiding"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Wisselaar uiterlijk"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Synchronisatieopties…"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Alleen _tekst"
 
@@ -22837,7 +23223,7 @@ msgstr "Alleen _tekst"
 #                   []Tasks
 # Window is hier dus niet echt 'Venster' maar meer Modus
 # of Evolution-onderdeel/functie-deel
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Onderdeel"
 
@@ -22917,11 +23303,11 @@ msgid "With _Status"
 msgstr "Met _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -22951,19 +23337,19 @@ msgstr ""
 "selecteer een tijdzone.\n"
 "Gebruik de rechter muisknop om uit te zoomen."
 
-#: ../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 "Verzameling"
 
-#: ../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 "Weergaven definiëren voor %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 "Weergaven definiëren"
 
@@ -22980,11 +23366,11 @@ msgid "Table"
 msgstr "Tabel"
 
 # was: Alle keren<
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instantie"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Huidige weergave opslaan"
 
@@ -22998,7 +23384,7 @@ msgstr "Bestaande weergave _vervangen"
 
 #. 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 "_Aangepaste weergave"
 
@@ -23008,40 +23394,40 @@ msgstr "Aangepaste weergave opslaan"
 
 # enkelvoud is mooier (voor het label)
 #: ../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 "Weergave definiëren…"
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "H_uidige weergave"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Selecteer weergave: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Huidige weergave is aangepast"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Aangepaste weergave opslaan…"
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Huidige weergave opslaan"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Nieuwe weergave aanmaken"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabriek"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Nieuwe weergave definiëren"
 
@@ -23057,43 +23443,17 @@ msgstr "Soort weergave"
 msgid "Type of view:"
 msgstr "Soort weergave:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Bijlagenbalk"
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-msgid "Recent Docu_ments"
-msgstr "Recente docu_menten"
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan bestand %s niet bijvoegen: %s"
 
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan bestand %s niet bijvoegen: geen normaal bestand"
@@ -23115,12 +23475,12 @@ msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
 # hier kalender ipv agenda?
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Maandkalender"
 
@@ -23165,31 +23525,31 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "Minimumbreedte"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "Minimumbreedte"
 
 # saptiering
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Ruimtes"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Nu"
 
-#: ../widgets/misc/e-cell-date-edit.c:797
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "De datum moet ingevoerd worden in het formaat: %s"
@@ -23198,153 +23558,153 @@ msgstr "De datum moet ingevoerd worden in het formaat: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Centraal-Europees"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinees"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japans"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thais"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turks"
 
-#: ../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 "Westeuropees"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Westeuropees, Nieuw"
 
-#: ../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 "Traditioneel"
 
-#: ../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 "Gesimplificeerd"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Oekraïens"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Visueel"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Onbekende tekenset: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Tekenset"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Kies de te gebruiken tekenset:"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Overige…"
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "_Tekenset"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Tekstveld voor invoeren datum"
 
 # kalender, geen agenda
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Klik op deze knop om een kalender te tonen"
 
-#: ../widgets/misc/e-dateedit.c:409
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Combinatieveld om de tijd te selecteren"
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "N_u"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Vandaag"
 
 # waarde weggelaten
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Ongeldige datum"
 
 # waarde weggelaten
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Ongeldige tijd"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Uitvouwen"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Of de uitvouwer uitgevouwd moet zijn"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Labeltekst van de uitvouwer"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Gebruik onderstrepen"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -23352,112 +23712,124 @@ msgstr ""
 "Indien ingesteld, geeft een onderstreping in de tekst aan dat het opvolgende "
 "teken gebruikt moet worden voor de sneltoets"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "De ruimte tussen het label en de dochter"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Labelwidget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Een widget dat wordt weergegeven in plaats van het gebruikelijke uitvouwlabel"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Uitvouwer-grootte"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Grootte van de uitvouwpijl"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indicator ruimtes"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Spatiëring rondom uitvouwpijl"
 
 #. 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 "Uitgebreid zoeken"
 
 # bewaren/opslaan
 # bewaren is hier mooier
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Zoekopdracht opslaan"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Zoeken"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Zoekenopdrachten"
 
-#: ../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 "Zoekopdracht _opslaan…"
 
-#: ../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 "Opgeslagen zoekopdrachten be_werken…"
 
-#: ../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 "_Uitgebreid zoeken…"
 
 # E-mailaccounts / E-mail-accounts / E-mail accounts
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Alle accounts"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Huidige account"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Huidige map"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Huidige bericht"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Kies een afbeelding"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Wereldkaart"
 
 # drop-down/afrolveld/valscherm/ combinatieveld/keuzeveld
-#: ../widgets/misc/e-map.c:628
+#: ../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 "Interactieve kaart voor het met de muis selecteren van de tijdzone. Toetsenbordgebruikers moeten de tijdzone kiezen met het drop-down combinatieveld hieronder."
+msgstr ""
+"Interactieve kaart voor het met de muis selecteren van de tijdzone. "
+"Toetsenbordgebruikers moeten de tijdzone kiezen met het drop-down "
+"combinatieveld hieronder."
+
+#: ../widgets/misc/e-online-button.c:109
+#, fuzzy
+msgid "Online"
+msgstr "Ingebonden"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
 
 # synchroniseren is waarschijnlijk te lang?
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sync met:"
 
 # synchroniseren is waarschijnlijk te lang?
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sync persoonlijke records:"
 
 # was: Categorien actualiseren (best mooi maar is het de juiste betekenis?)
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Sync categorieën:"
 
@@ -23473,40 +23845,40 @@ msgstr "Terugvloeimodel"
 msgid "Column width"
 msgstr "Kolombreedte"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Klik hier om het zoektype te wijzigen"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "Nu _zoeken"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Item-ID"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Tekst"
 
 #. 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:1018
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "_Tonen: "
 
@@ -23514,35 +23886,35 @@ msgstr "_Tonen: "
 # Sear_ch: [tekstveld] i_n [Current Folder]
 #. 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:1035
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "_Zoeken naar: "
 
 #. 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:1047
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " i_n "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Cursor rij"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Cursor kolom"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Sorteerder"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Selectiestand"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Cursorstand"
 
@@ -23571,10 +23943,6 @@ msgstr "<b>Status volgen</b>"
 msgid "A_uto-delete sent item"
 msgstr "Verzonden item a_utomatisch verwijderen"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classificatie"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Een 'verzonden' item aanmaken om status te volgen"
@@ -23686,19 +24054,19 @@ msgid "_When opened:"
 msgstr "Bij _openen:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Klik hier om naar de URL te gaan"
 
@@ -23901,95 +24269,95 @@ msgstr ""
 "Om een kolom aan uw tabel toe te voegen, sleept u\n"
 "het naar de plaats waar u het wilt laten verschijnen."
 
-#: ../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 item)"
 msgstr[1] "%s : %s (%d items)"
 
-#: ../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 item)"
 msgstr[1] "%s (%d items)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alternerend gekleurde rijen"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Horizontaal tekenraster"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Verticaal tekenraster"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Aandacht trekken"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Cursorstand"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Selectiestand"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Lengte drempel"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Uniforme rijhoogte"
 
-#: ../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 "Bevroren"
 
@@ -24058,7 +24426,7 @@ msgstr "Lettertype omschrijving"
 
 # Informatie sorteren/sorteringsinformatie
 #: ../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 "Sorteringsinformatie"
 
@@ -24068,37 +24436,37 @@ msgstr "Sorteringsinformatie"
 msgid "Tree"
 msgstr "Boom"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabelkop"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Tabelmodel"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Cursorrij"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Altijd zoeken"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Klik om toe te voegen"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree tabel adaptor"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retro look"
 
 # tekens gebruikt, omdat een + wel een expander is maar een - niet.
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Lijnen en +/- tekens tonen."
 
@@ -24210,6 +24578,189 @@ msgstr "IM Omgeving"
 msgid "Handle Popup"
 msgstr "Sleepbalkpopup"
 
+#~ msgid "_Properties..."
+#~ msgstr "_Eigenschappen…"
+
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "‘{0}’ is een alleen-lezen agendabron. Ga naar agendaweergave en selecteer "
+#~ "een agenda die afspraken kan accepteren."
+
+#~ msgid "D_escription:"
+#~ msgstr "_Omschrijving:"
+
+#~ msgid "De_scription:"
+#~ msgstr "_Omschrijving:"
+
+#~ msgid "Updating query"
+#~ msgstr "Aanvraag actualiseren"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Opkomende afspraken"
+
+#~ msgid "_Save Message"
+#~ msgstr "Bericht op_slaan"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Wilt u dat de bewerking ook in de submappen wordt toegepast?"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "Alle berichten in deze map en submappen als gelezen markeren?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Alleen op _huidige map"
+
+# of/en (of is beter)
+# activeren/deactiveren
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Bijlageherinneringsplugin activeren"
+
+# activeren.deactiveren/aanzetten.uitzetten
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Bijlageherinneringsplugin activeren."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "Herinneren bij _ontbrekende bijlagen"
+
+#~ msgid "button-user"
+#~ msgstr "knopgebruiker"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Er is geen configuratieoptie voor deze plugin."
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "Een plugin die de opstart-assistent verzorgt."
+
+#~ msgid "Startup wizard"
+#~ msgstr "Opstartassistent"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Een omschrijving van de huidige printerinstellingen."
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Bepaalt of crash-detectie uitgevoerd wordt."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Waarschuwingsdialoog voor herstel overslaan"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Of gecontroleerd wordt of er vastlopers zijn geweest"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Of het waarschuwingsdialoog bij het herstellen van Evolution wordt "
+#~ "overgeslagen."
+
+#~ msgid "No folder name specified."
+#~ msgstr "Geen mapnaam opgegeven."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Mapnaam kan geen enter-teken bevatten."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Mapnaam mag geen \"/\" bevatten."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Mapnaam mag geen \"#\" bevatten."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' en '..' zijn gereserveerde mapnamen."
+
+# vastloper
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolution vastloperdetectie"
+
+#~ msgid "Ig_nore"
+#~ msgstr "_Negeren"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution is kennelijk de vorige keer onverwacht afgebroken. Als\n"
+#~ "voorzorgmaatregel wordt het voorbeeldpaneel verborgen gehouden.\n"
+#~ "U kunt het voorbeeldpaneel herstellen via het menu Beeld.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Dit bericht niet meer tonen."
+
+#~ msgid "All Day Event"
+#~ msgstr "Agendanotitie voor de hele dag"
+
+#~ msgid "Send _Options"
+#~ msgstr "Verzend_opties"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Berichten weergeven in de normale stijl"
+
+#~ msgid "C_lose"
+#~ msgstr "Sl_uiten"
+
+#~ msgid "For_mat"
+#~ msgstr "Op_maak"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and Close"
+#~ msgstr "Opslaan en sluiten"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Opslaan en sl_uiten"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Het huidige bestand opslaan en het venster sluiten"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Stuur het bericht in HTML-formaat"
+
+#~ msgid "Refresh List"
+#~ msgstr "Lijst Verversen"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Mappenlijst verversen"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Beeindig abonnement op deze map"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonneren"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Afmelden"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Selectie in_verteren"
+
+#~ msgid "Status Details"
+#~ msgstr "Statusdetails"
+
+#~ msgid "Time Zone"
+#~ msgstr "Tijdzone"
+
+#~ msgid "%u byte"
+#~ msgid_plural "%u bytes"
+#~ msgstr[0] "%u byte"
+#~ msgstr[1] "%u bytes"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Recente docu_menten"
+
 # Operatie niet toegestaan/Toegang geweigerd
 #~ msgid "Permission Denied."
 #~ msgstr "Toegang geweigerd."
@@ -24257,9 +24808,6 @@ msgstr "Sleepbalkpopup"
 #~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
 #~ msgstr "Berichten in zoekmap &quot;{0}&quot; verwijderen?"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "_Doorgaan met bewerken"
-
 #~ msgid "_Refresh:"
 #~ msgstr "_Verversen:"
 
@@ -24305,9 +24853,6 @@ msgstr "Sleepbalkpopup"
 #~ msgid "Save As"
 #~ msgstr "Opslaan als"
 
-#~ msgid "Save Draft"
-#~ msgstr "Klad Opslaan"
-
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "Sla het bericht op in een bepaalde folder"
 
@@ -24513,9 +25058,6 @@ msgstr "Sleepbalkpopup"
 #~ msgid "Download messages for offline"
 #~ msgstr "Berichten ophalen voor off-line gebruik"
 
-#~ msgid "_Phone List"
-#~ msgstr "Telefoonlijst"
-
 #~ msgid "MTWTFSS"
 #~ msgstr "MDWDVZZ"
 
diff --git a/po/nn.po b/po/nn.po
index dba2993380..77185eb58d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3,6 +3,7 @@
 # Copyright (C) 2001-2002 Roy-Magne Mo
 # Copyright (C) 2005 Yahoo Inc!
 #
+#: ../shell/main.c:589
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001-2002.
 # Sigurd Gartmann <sigurdga@europe.yahoo-inc.com>, 2005.
 # Åsmund Skjæveland <aasmunds@ulrik.uio.no>, 2003-2008.
@@ -10,33 +11,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-04 00:59+0100\n"
-"PO-Revision-Date: 2008-03-13 18:08+0100\n"
+"POT-Creation-Date: 2008-08-21 14:56+0200\n"
+"PO-Revision-Date: 2008-08-22 13:07+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "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:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -44,7 +45,6 @@ msgstr[0] "noverande adressebokmappe %s har %d kort"
 msgstr[1] "noverande adressebokmappe %s har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Opna"
 
@@ -154,7 +154,7 @@ msgid "calendar view for one or more days"
 msgstr "kalenderframsyning for ein eller fleire dagar"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%d. %a %b %Y"
 
@@ -165,20 +165,18 @@ msgstr "%d. %a %b %Y"
 #. 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:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../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
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
@@ -186,10 +184,10 @@ msgstr "%d. %a %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -199,17 +197,15 @@ 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:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../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
 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
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -321,34 +317,32 @@ msgstr "Kalender: frå %s til %s"
 msgid "evolution calendar item"
 msgstr "Evolution kalenderelement"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Kombinasjonsknapp"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Bruk standard"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Oppsprettmeny"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Slå av/på vedleggslinje"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "aktiver"
 
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
-"«{0}» er ei skrivebeskytta adressebokkjelde. Byt til kontaktframsyninga og "
-"vel ei adressebok som tek imot kontaktar."
+"'{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}» er ei skrivebeskytta adressebokkjelde, og kan ikkje endrast. Byt til kontaktframsyninga og vel ei anna adressebok."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -396,10 +390,10 @@ msgstr "Klarte ikkje å sletta adresseboka."
 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 ""
-"No kan du berre aksessera GroupWise systemadressebok frå Evolution. Bruk ein "
-"annan GroupWise-klient ein gong, for å få adgang til mappene med GroupWise "
+"No er det berre systemadresseboka i GroupWise du kan aksessera frå Evolution. Bruk ein "
+"annan GroupWise-e-postklient ein gong, for å få tilgang til mappene med GroupWise "
 "ofte brukte kontaktar og GroupWise personlege kontaktar."
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -420,7 +414,7 @@ msgstr "Klarte ikkje å autentisera mot IMAP-tenar."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Klarte ikkje å sletta kontakten"
 
@@ -433,26 +427,22 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tenaren svarte ikkje med gyldig skjemainformasjon."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Nekta tilgang."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Tenarversjon"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "Somme eigenskapar vil kanskje ikkje virka ordentleg med tenaren din"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution-adresseboka har avslutta uventa."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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 "
@@ -462,20 +452,20 @@ msgstr ""
 "funksjonen. Han kan óg vera feil stilt inn. Spør din systemansvarlege om "
 "støtta søkjebasar."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboka vil fjernast for godt."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "Denne adresseboka kan ikkje opnast."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Denne adresseboktenaren har ikkje nokon tilrådd søkjebasis."
 
 # TRN: Feilmeld manglande "be"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -483,28 +473,28 @@ msgstr ""
 "Det er ikkje mogleg å nå fram til denne adresseboktenaren eller så er "
 "tenarnamnet feilstava, eller nettverkstilkoplinga di kan vera nede."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tenaren støttar ikkje LDAPv3-skjemainformasjon."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Kan ikkje utføra søk."
 
 # TRN: Feil plural.
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Kan ikkje lagra {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagra endringane?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -512,7 +502,7 @@ msgstr ""
 "Kontakten du prøver å flytta frå ei adressebok til ei anna kan ikkje "
 "slettast frå kjelda. Vil du kopiera han i staden?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -522,6 +512,10 @@ msgstr ""
 "Evolution. For å få best resultat bør tenaren oppgraderast til ein støtta "
 "versjon"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Du har ikkje løyve til å sletta kontaktar i denne adresseboka."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -558,8 +552,8 @@ msgid "_Use as it is"
 msgstr ""
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../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}"
 
@@ -568,17 +562,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Standard synkroniseringsaddresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Klarte ikkje å lasta adressebok"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lesa addresseblokka i programmet til piloten"
 
@@ -600,10 +594,10 @@ msgstr "Set opp autofullføring her"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
 msgstr "Kontaktar"
 
@@ -612,8 +606,8 @@ msgid "Evolution Address Book"
 msgstr "Evolution adressebok"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Evolution adressebok adresse-sprett-opp-dialog"
+msgid "Evolution Address Book address popup"
+msgstr "Evolution adressebok sprett-opp-dialog for adresse"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -628,8 +622,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution adressebok-komponent"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime styring av sertifikathandsaming"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME styring av sertifikathandsaming"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -643,12 +637,13 @@ msgstr "Hald styr på S/MIME-sertifikata dine her"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../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
 msgid "On This Computer"
 msgstr "PÃ¥ denne datamaskina"
 
@@ -661,80 +656,69 @@ msgstr "PÃ¥ denne datamaskina"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "Personleg"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "PÃ¥ LDAP-tenarar"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Opprett ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Lag ei ny kontaktliste"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Adresse_bok"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Lag ei ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopier _bokinnhald lokalt for å arbeida fråkopla"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../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:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allmennt"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Adressebok"
 
@@ -748,12 +732,12 @@ msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
 #: ../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 "Detaljar"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Søkjer"
 
@@ -762,19 +746,19 @@ msgid "Downloading"
 msgstr "Lastar ned"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Addressebokeigenskapar"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
-msgstr "Overfører ..."
+msgstr "Overfører …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Overfører «%s»:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -795,7 +779,7 @@ msgstr ""
 "Plasseringa til og hierarkiet i Evolution-kontaktmappene har endra seg sidan "
 "Evolution 1.x.\n"
 "\n"
-"Ha tolmod medan Evolution overfører mappene dine ..."
+"Ha tolmod medan Evolution overfører mappene dine …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
@@ -805,7 +789,7 @@ msgid ""
 msgstr ""
 "Formatet på listekontaktar har endra seg.\n"
 "\n"
-"Ha tolmod medan Evolution overfører mappene dine ..."
+"Ha tolmod medan Evolution overfører mappene dine …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
@@ -815,7 +799,7 @@ msgid ""
 msgstr ""
 "MÃ¥ten Evolution lagrar somme telefonnummer har endra seg.\n"
 "\n"
-"Ha tolmod medan Evolution overfører mappene dine ..."
+"Ha tolmod medan Evolution overfører mappene dine …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
@@ -825,72 +809,78 @@ msgid ""
 msgstr ""
 "Evolution sin Palm Sync-endringslogg og kartfiler har endra seg.\n"
 "\n"
-"Ha tolmod medan Evolution overfører PilotSync-dataene dine ..."
+"Ha tolmod medan Evolution overfører PilotSync-dataene dine …"
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på mappa «%s» til:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "Endra namn på mappa"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenamn kan ikkje innehalda teiknet «/»."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
-msgstr "Lagra som VCard ..."
+msgstr "Lagra som VCard …"
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../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 "_Slett"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Eigenskapar ..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Eigenskapar"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Kjeldeveljar for kontaktar"
 
 # TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Skriv passordet til %s (brukar %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Skriv inn passord"
@@ -969,38 +959,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Vis</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Lastar ned</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Søkjer</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Tenarinformasjon</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
-#: ../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:761
 msgid "Always"
 msgstr "Alltid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonymt"
 
+#. 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 "L_es denne adresseboka inntil grensa er nådd"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Enkel"
@@ -1028,14 +1015,14 @@ msgid "Lo_gin:"
 msgstr "Namn å lo_gga på med:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Aldri"
 
 #. 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
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Inga kryptering"
 
@@ -1047,7 +1034,7 @@ msgstr "Eitt"
 #. 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
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -1114,7 +1101,7 @@ msgstr "Støtta søkjebasar"
 #. 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
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
@@ -1161,8 +1148,7 @@ msgid ""
 "server."
 msgstr ""
 "Dette er metoden Evolution vil bruka for å autentisera deg. Legg merke til "
-"at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
-"tenaren."
+"at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-tenaren."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1211,8 +1197,8 @@ msgid "_Login method:"
 msgstr "PÃ¥_loggingsmetode:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1227,7 +1213,7 @@ msgid "_Search scope:"
 msgstr "Sø_keområde:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "Te_nar:"
@@ -1248,9 +1234,10 @@ msgstr "kort"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutt"
 
@@ -1291,7 +1278,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1300,32 +1287,32 @@ msgstr "AIM"
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ka_tegoriar ..."
+msgstr "Ka_tegoriar …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../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:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "Fullt _namn ..."
+msgstr "Fullt _namn …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Bilete"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1338,7 +1325,7 @@ msgid "Nic_kname:"
 msgstr "_Kallenamn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
@@ -1352,11 +1339,11 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1378,8 +1365,8 @@ msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
@@ -1469,1129 +1456,1131 @@ msgstr "_Lagrast kor:"
 msgid "_Zip/Postal Code:"
 msgstr "Post_nummer:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresse"
 
-#: ../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-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:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Kan redigerast"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "USA"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algerie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Austerrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Aserbadsjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Kviterussland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasil"
 
 # TRN: Det finst visst inga offisiell omsetjing for dette.
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Britisk indisk sjøterritorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 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:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Kambodsja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Canada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Caymanøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Tsjad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Kina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komorane"
 
 # TRN: Er dette Kongo-Brazaville (Congo), cg, eller Kongo (The Democratic republic of the Congo) cd?
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Kongo-Brazaville"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Cookøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeinskysten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Tjekkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandsøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Færøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Frankrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
 # TRN: Inga offisiell omsetjing
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Franske sørlege territorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Hellas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grønland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 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:222
+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:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
 # TRN: Inga offisiell omsetjing
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Heard- og McDonald-øyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Nord-Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Sør-Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldivane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Marshalløyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Dei nederlandske antillane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Noreg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
 # TRN: Ikkje ei offisiell omsetjing
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palestinske territorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Fillipinane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
 # TRN: Aksentar.
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "St. Kitts og Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "St. Lucia"
 
 # TRN: Feil i original streng
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "St. Vincent og Grenadinane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
 # TRN: Legg til tødlar og slikt.
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "São Tomé og Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbia og Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychellane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 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:324
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Salomonøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
 # TRN: Ikkje offisiell omsetjing
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sør-Georgia og dei sørlege Sandwich-øyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Spania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Aust-Timor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks- og Caicosøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ukrainia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Dei sameinte arabiske emirata"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Sameinte statars Minor Outlying Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Jomfruøyane (Storbritannia)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyane (USA)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futunaøyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Namn"
 
 # TRN: «Send» betre enn «post»?
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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:111
 msgid "Service"
 msgstr "Teneste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Stad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: ../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:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Heim"
 
-#: ../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:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Anna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "Kjeldebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "MÃ¥lbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "PÃ¥kravde felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Endra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Vel eit bilete til denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Ikkje noko bilete"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2599,47 +2588,47 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tomt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Ny kontakt - raskt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Fullt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Vel adressebok"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2648,7 +2637,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "sletta kontaktlista (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2656,7 +2645,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "sletta desse kontaktlistene?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2665,7 +2654,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "sletta kontakten (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2789,7 +2778,7 @@ msgstr "Endra kontaktar"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Select..."
-msgstr "Vel ..."
+msgstr "Vel …"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
@@ -2807,12 +2796,17 @@ msgstr "_Skriv ei e-post-adresse eller dra ein kontakt til lista under:"
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmar"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "_Medlemmar"
+
 #: ../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:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../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
 msgid "Book"
 msgstr "Bok"
 
@@ -2820,10 +2814,6 @@ msgstr "Bok"
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Medlemmar"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Endra kontakt:"
@@ -2861,40 +2851,40 @@ msgstr ""
 "Namnet eller e-post-adressa til denne kontakten finst\n"
 "alt i denne mappa. Vil du leggja han til likevel?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Slå ihop kontakt"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Slå ihop"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Slå ihop kontakt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Namnet byrjar med"
+msgid "Name contains"
+msgstr "Namnet inneheld"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2909,9 +2899,9 @@ msgstr[1] "%d kontaktar"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Spør"
 
@@ -2922,9 +2912,9 @@ msgstr "Feil ved henting av bokframsyning"
 #: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../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
 msgid "Model"
 msgstr "Modell"
 
@@ -2932,107 +2922,109 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil under endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Namnet byrjar med"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Kjelde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
-msgstr "Lagra som VCard ..."
+msgstr "Lagra som VCard …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Opna"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
-msgstr "_Ny kontakt ..."
+msgstr "_Ny kontakt …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
-msgstr "Ny kontakt_liste ..."
+msgstr "Ny kontakt_liste …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
-msgstr "Lagra _som VCard ..."
+msgstr "Lagra _som VCard …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Vidaresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Vidaresend kontaktar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Send _melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Send _melding til liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Send _melding til kontaktar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
-msgstr "Ko_pier til adressebok ..."
+msgstr "Ko_pier til adressebok …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
-msgstr "Fl_ytt til adressebok ..."
+msgstr "Fl_ytt til adressebok …"
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../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
 #: ../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 "_Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Lim inn"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Einkvar kategori"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Anna feil"
 
@@ -3067,7 +3059,7 @@ msgstr "Biltelefon"
 
 #: ../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
@@ -3168,9 +3160,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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:713
 msgid "Role"
 msgstr "Rolle"
 
@@ -3207,38 +3199,38 @@ msgid "Web Site"
 msgstr "Nettstad"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Breidd"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Høgd"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Har fokus"
 
@@ -3258,11 +3250,22 @@ msgstr "Tekstmodell"
 msgid "Max field name length"
 msgstr "Største lengd på feltnamn"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Kolonnebreidd"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+# TRN: Sentence splicing
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Søkjer etter kontaktane …"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3279,7 @@ msgstr ""
 "\n"
 "Eller dobbelklikk her for å laga ein ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3291,7 +3294,7 @@ msgstr ""
 "Dobbelklikk her for å laga ein ny kontakt."
 
 # TRN: Sentence splicing
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3301,7 +3304,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3311,42 +3314,43 @@ msgstr ""
 "\n"
 "Det er ingen oppføringar i denne framsyninga."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-post arbeid"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "E-post heime"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Annan e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Vald"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkje i nettlesar"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkjeadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
-msgstr "_Send melding til ..."
+msgstr "_Send melding til …"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
@@ -3366,7 +3370,7 @@ msgid "map"
 msgstr "kart"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Listemedlemmar"
 
@@ -3387,15 +3391,14 @@ msgid "Video Chat"
 msgstr "Videosamtale"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../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/publish-calendar/publish-calendar.glade.h:5
@@ -3404,8 +3407,7 @@ msgstr "Kalender"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "Ledig/oppteken"
 
@@ -3427,125 +3429,132 @@ msgid "Web Log"
 msgstr "Vevlogg"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Jobbtittel:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Heimeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Vevlogg"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Vellukka"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Motoren er oppteken"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Fråkopla lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Adresseboka finst ikkje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Ingen sjølvkontakt definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Fann ikkje kontakt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID finst frå før"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Avbroten"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Klarte ikkje avbryta"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Treng autentisering"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS er ikkje tilgjengeleg"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Ikkje noko slik kjelde"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Ikkje tilgjengeleg i fråkopla modus"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Ugyldig versjon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Ikkje støtta autentiseringsmetode"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3556,7 +3565,7 @@ msgstr ""
 "Last adresseboka ein gong i tilkopla modus for å sjå på innhaldet."
 
 # TRN. «Aksessera». Blæ.
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3565,7 +3574,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Sjå til at stien %s finst og at du har "
 "løyve til å henta han."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3573,7 +3582,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
 "ugyldig adresse, eller at LDAP-tenaren ikkje kan nåast."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3583,7 +3592,7 @@ msgstr ""
 "ynsjer å bruka LDAP i Evolution, må du installera ein variant med LDAP-"
 "støtte."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3591,7 +3600,11 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
 "ugyldig adresse, eller at tenaren ikkje kan nåast."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "Detaljert feil:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3603,7 +3616,7 @@ msgstr ""
 "til å visa. Gjer søket ditt meir spesifikt eller hev\n"
 "resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3615,45 +3628,45 @@ msgstr ""
 "auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
 "for denne adresseboka."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Motoren til denne adresseboka kunne ikkje tolka denne spørjinga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Motoren til denne adresseboka nekta å utføra denne spørjinga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "Spørjinga avslutta ikkje vellukka."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "Feil når kontakt vart lagt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "Feil ved endring av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "Feil ved fjerning av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3668,16 +3681,16 @@ msgstr[1] ""
 "Å opna %d kontaktar vil óg opna %d nye vindauge på skjermen.\n"
 "Vil du verkeleg visa alle desse kontaktane?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "Ikkje _vis"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontaktane"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3686,72 +3699,72 @@ msgstr ""
 "«%s» finst frå før.\n"
 "Vil du skriva over?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 msgid "Overwrite"
 msgstr "Skriv over"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontaktar"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "Vel adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "Kopiér kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "Kopiér kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "Fleire vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
-msgstr "Spør adresseboka ..."
+msgstr "Spør adresseboka …"
 
 # TRN: Sentence splicing
 #: ../addressbook/gui/widgets/eab-vcard-control.c:143
@@ -3778,45 +3791,45 @@ msgstr "Lagra i addressebok"
 msgid "Card View"
 msgstr "Kort-framframsyning"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "Importerer ..."
+msgstr "Importerer …"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
 # TRN: Feilmeld nær-identiske strengar
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV- og Tab-importør"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV- og Tab-importør"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
 # TRN: Feilmeld nær-identiske strengar
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- og Tab-importør"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 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:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF-importør"
 
@@ -3855,7 +3868,7 @@ msgstr "MÃ¥l:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "_Skrifttype ..."
+msgstr "_Skrifttype …"
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3870,11 +3883,11 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../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:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Topptekst"
@@ -3977,7 +3990,7 @@ msgstr "Skuggelegging"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3996,7 +4009,7 @@ msgid "Top:"
 msgstr "Topp:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Type:"
 
@@ -4006,7 +4019,7 @@ msgstr "Breidd:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "_Skrifttype ..."
+msgstr "_Skrifttype …"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
@@ -4100,13 +4113,20 @@ msgstr "Ikkje handsama feil"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{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}» er ein skrivebeskytta kalender og kan ikkje endrast. Vel ein annan kalender frå sidestolpen i kalendervisinga."
+
+#. 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}» ei skrivebeskytta kalendarkjelde. Byt til kalenderframsyninga og vel "
+"«{0}» ein skrivebeskytta kalender. Byt til kalenderframsyninga og vel "
 "ein kalender som tek imot avtalar."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../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."
@@ -4114,25 +4134,25 @@ msgstr ""
 "Eit meiningsfullt samandrag vil fortelja mottakarane kva avtalen din handlar "
 "om."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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 "Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "All informasjonen i desse notata vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "All informasjonen i dette notatet vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4140,153 +4160,157 @@ msgstr ""
 "All informasjonen om desse avtalane vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om desse oppgåvene vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne avtalen vil verta sletta og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om dette møtet vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "All informasjonen i dette notatet vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne oppgåva vil verta sletta og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Er du sikker på at du vil sletta oppgåva «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil sletta avtalen «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Er du sikker på at du vil sletta notatet «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil sletta desse {0} avtalane?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Er du sikker på at du vil sletta desse {0} notata?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil sletta desse {0} oppgåvene?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil sletta denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil sletta dette møtet?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Er du sikker på at du vil sletta dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil sletta denne oppgåva?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Er du sikker på at du vil senda notatet utan samandrag?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Er du sikker på at du vil senda avtalen utan samandrag?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Er du sikker på at du vil senda oppgåva utan samandrag?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "Klarte ikkje å laga ei ny hending"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Klarte ikkje lagra hendinga"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Sletta kalenderen «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Sletta oppgåvelista «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Sletta oppgåvelista «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "I_kkje send"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Lastar ned. Vil du lagra avtalen?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Lastar ned. Vil du lagra oppgåva?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Redigeringsprogram kunne ikkje opnast."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
-"Invitasjonar vil verta sendte til alle deltakarane per e-post, og gje dei "
+"Invitasjonar vil verta sende til alle deltakarane per e-post, og gje dei "
 "høve til å godta denne oppgåva."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-post-invitasjonar vil verta sendt til alle deltakarane, som óg vil verta "
 "bedne om å svara."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Feil under opning av kalenderen"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Feil under opning av notatliste"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Feil under opning av oppgåveliste"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4294,7 +4318,7 @@ msgstr ""
 "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
 "deltakarane veit at møtet er avlyst."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../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."
@@ -4302,7 +4326,7 @@ msgstr ""
 "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
 "deltakarane veit at notatet er sletta."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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."
@@ -4310,7 +4334,7 @@ msgstr ""
 "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
 "deltakarane veit at oppgåva er sletta."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4318,7 +4342,7 @@ msgstr ""
 "Å senda oppdatert møteinformasjon gjer det mogleg for andre deltakarar å "
 "halda kalenderane sine oppdaterte."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4326,7 +4350,7 @@ msgstr ""
 "Ã… senda oppdatert informasjon til dei andre deltakarane let dei halda "
 "oppgåvelistene sine oppdaterte."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4334,7 +4358,7 @@ msgstr ""
 "Somme vedlegg vert lasta ned. Dersom du lagrar denne avtalen vil du mista "
 "desse vedlegga."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4342,83 +4366,83 @@ msgstr ""
 "Somme vedlegg vert lasta ned. Dersom du lagrar denne oppgåva vil du mista "
 "desse vedlegga."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "Somme funksjonar vil kanskje ikkje virka med den noverande tenaren."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalenderen har avslutta uventa."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notatet har avslutta uventa."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution si oppgåvehandsaming har avslutta uventa."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikkje merka for fråkopla bruk"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "Oppgåvelista er ikkje merka for fråkopla bruk"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "Notatlista er ikkje merka for fråkopla bruk."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
-msgstr "Oppgåvelista er ikkje merka for fråkopla bruk"
+msgstr "Oppgåvelista er ikkje merka for fråkopla bruk."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil fjernast for godt."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlista vil fjernast for godt."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgåvelista vil fjernast for godt."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagra endringane i denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagra endringane i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagra endringane i denne oppgåva?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vil du senda eit avlysingsvarsel for dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du senda melding om avlysing til alle deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du senda ein møteinvitasjon til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du senda denne oppgåva til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du senda oppdatert møteinformasjon til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du senda oppdatert oppgåveinformasjon til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4428,111 +4452,111 @@ msgstr ""
 "bruka Evolution. For å få gode resultat bør tenaren oppgraderast til ein "
 "støtta versjon."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endra denne avtalen, men ikkje lagra endringane."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endra denne oppgåva, men ikkje lagra endringane."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endra dette notatet, men ikkje lagra endringane."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderane dine vil ikkje vera tilgjengelege før Evolution vert starta på "
 "nytt."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Notata dine vil ikkje vera tilgjengelege før Evolution vert starta på nytt."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgåvene dine vil ikkje vera tilgjengelege før Evolution vert starta på "
 "nytt."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Forkast endringane"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Lagra"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Lagra endringane"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "_Send"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_Send varsel"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendingar som går over fleire dagar:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Klarte ikkje å starta evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kan ikkje lesa kalenderprogramblokka på kalenderen"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunne ikkje lesa notat-programblokka i piloten"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunne ikkje skriva notat-programblokka i piloten"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Standard prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikkje lesa oppgåveliste-programblokka i piloten"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikkje skriva oppgåveliste-programblokka i piloten"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgåver"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalendrar"
 
@@ -4573,25 +4597,25 @@ msgid "Memo_s"
 msgstr "Not_at"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notat"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Oppgåver"
@@ -4610,25 +4634,26 @@ msgstr "_Oppgåver"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution kalender alarmpåminningsteneste"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutt"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Start-tid"
 
@@ -4639,9 +4664,9 @@ msgstr "Avtalar"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Stad:"
@@ -4651,17 +4676,15 @@ msgid "Snooze _time:"
 msgstr "Tid alarmen skal utsetjast:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "R_edigér"
 
@@ -4673,32 +4696,32 @@ msgstr "Utse_tt"
 msgid "location of appointment"
 msgstr "stad for avtale"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Inga skildring tilgjengeleg."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Ingen informasjon om stad tilgjengeleg"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarmar"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "Ã…tvaring"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4710,7 +4733,7 @@ msgstr ""
 "senda ein e-post. Evolution vil visa ein normal\n"
 "påminnar-dialogboks i staden."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4727,15 +4750,15 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køyra dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør om dette programmet fleire gongar."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Klarte ikkje å starta Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4746,7 +4769,7 @@ msgid "invalid time"
 msgstr "ugyldig tid"
 
 #. 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/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4755,7 +4778,7 @@ msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
 #. 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/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4766,7 +4789,7 @@ msgstr[1] "%d minutt"
 #. 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/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5008,12 +5031,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Vis statusfeltet i hending/oppgåve/møte-redigeringa."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Vis «Førehandsvis»-ramma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Vis «Førehandsvis»-ramma."
 
@@ -5063,7 +5086,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Tida alarmen vart køyrt sist"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Tidssone"
 
@@ -5197,66 +5220,66 @@ msgstr "Timen arbeidsdagen byrjar på"
 msgid "daylight savings time"
 msgstr "sommartid/vintertid"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Kategori er"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Stad inneheld"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
-msgstr ""
+msgstr "Oppgåver dei neste sju dagane"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Aktive oppgåver"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Utgåtte oppgåver"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Ferdige oppgåver"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Oppgåver med vedlegg"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Aktive avtalar"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Avtalar dei neste sju dagane"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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 "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5266,16 +5289,17 @@ msgstr ""
 "tidslengda. Dersom du held fram, vil du ikkje kunna gjenoppretta desse "
 "hendingane."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "dagar"
 
@@ -5284,102 +5308,78 @@ msgstr "dagar"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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 "PÃ¥ veven"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdagar og bryllupsdagar"
 
 #. 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 "Vér"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
-msgstr "_Kopier ..."
+msgstr "_Kopier …"
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Eigenskapar"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Klarte ikkje å oppgradera kalenderane."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikkje opna kalenderen «%s» for å laga hendingar og møter"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender tilgjengeleg for å laga hendingar og møter"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Kjelde for kalenderveljar"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "A_vtale"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "Møt_e"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Lag ein ny møteførespurnad"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Ny avtale for heile dagen"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "Avtale for heile _dagen"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale for heile dagen"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "Kale_nder"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Lag ein ny kalender"
 
@@ -5400,15 +5400,223 @@ msgid "Month View"
 msgstr "MÃ¥nadsframsyning"
 
 #: ../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 "Felt"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Vedlegg"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Deltakar"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "Firmafaks"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Kategori"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Klassifisering"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Fullføringsdato"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Konfidensiell"
+
+#: ../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
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Skildring"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Skildringa inneheld"
 
-#: ../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:22
+msgid "Do Not Exist"
+msgstr "Finst ikkje"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Finst"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favorittar"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "GÃ¥ver"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "MÃ¥l"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Ferie"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Feriekort"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "Kontaktar"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Idear"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Internasjonal"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Nøkkelkunde"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Ymse"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Dei neste sju dagane"
+
+#: ../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 "Organisator"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Telefonsamtalar"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privat"
+
+#: ../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
+msgid "Public"
+msgstr "Offentleg"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "Repetering"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategiar"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Samandrag"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Samandraget inneheld"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Leverandørar"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Tid og utgifter"
+
+#: ../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 "Ventar"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "inneheld"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "inneheld ikkje"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "er lik"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "er ikkje"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Feil under opning av kalenderen"
@@ -5421,11 +5629,11 @@ msgstr "Metoden er ikkje støtta når kalenderen vert opna"
 msgid "Permission denied to open the calendar"
 msgstr "Nekta tilgang til å opna kalenderen"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Rediger alarm"
 
@@ -5458,17 +5666,17 @@ msgid "Mes_sage:"
 msgstr "M_elding:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Opna eit varslingsvindauge"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Køyr eit program"
 
@@ -5481,7 +5689,7 @@ msgid "Send To:"
 msgstr "Send til:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Send ein e-post"
 
@@ -5537,7 +5745,7 @@ msgstr "minutt"
 msgid "start of appointment"
 msgstr "byrjing på avtale"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Handling/Utløysar"
 
@@ -5548,16 +5756,15 @@ msgstr "Le_gg til"
 #: ../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 "Alarmar"
 
-#: ../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
 msgid "_Suggest automatic display of attachment"
 msgstr "_Foreslå automatisk framsyning av vedlegget"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Legg ved filer"
 
@@ -5624,8 +5831,8 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Fredag"
 
@@ -5640,8 +5847,8 @@ msgstr ""
 "Dagar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "MÃ¥ndag"
 
@@ -5664,7 +5871,7 @@ msgstr ""
 "Sundag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
@@ -5674,8 +5881,8 @@ msgid "S_un"
 msgstr "Su_n"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -5692,8 +5899,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigatøren"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -5711,13 +5918,13 @@ msgid "Template:"
 msgstr "Mal:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
 
 #: ../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 "Tid_ssone:"
 
@@ -5726,14 +5933,14 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tysdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -5811,315 +6018,466 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "K_opier kalenderinnhaldet lokalt for å arbeida fråkopla"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "K_opier oppgåvelisteinnhaldet lokalt for å arbeida fråkopla"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "K_opier notatlisteinnhaldet lokalt for å arbeida fråkopla"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "F_arge:"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "Fa_rge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Oppgåveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Kalendereigenskapar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Oppgåvelisteeigenskapar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "Ny oppgåveliste"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "Eigenskapar for notatliste"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Denne hendinga er sletta."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Denn oppgåva har vorte sletta."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Dette notatet er sletta."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Vil du forkasta desse endringane og gå ut av "
 "redigering?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. GÃ¥ ut av redigering?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Hendinga er endra."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Oppgåva er endra."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Dette notatet er endra."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Ferdig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldingar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../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
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Avbryt _dra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Redigér avtale"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Møte - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tildelt oppgåve - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgåve - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Notat – %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Ikkje noko samandrag"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Klikk her for å lukka dette vindauget"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Kopier den merka teksten til utklippstavla"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Klipp ut merka tekst og legg på utklippstavla"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Klikk her for å sjå den tilgjengelege hjelpeteksten"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Lim inn tekst frå utklippstavla"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Klikk her for å lagra dette vindauget"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Merk all tekst"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Klassifisering"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "Set _inn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Val"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "_Vis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Vedlegg …"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Klikk her for å leggja ved ei fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Kategoriar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Avgjer om kategoriar vert viste"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Tids_sone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Avgjer om tidssonen vert vist"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Off_entleg"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Klassifiser som offentleg"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Merk som privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Konfidensiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Merk som konfidensiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "R_ollefelt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Avgjer om rollefeltet vert vist"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_SU"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Avgjer om be-om-svar-feltet vert vist"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Statusfelt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Avgjer om statusfeltet vert vist"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Typefelt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Avgjer om deltakartypefeltet vert vist"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Nyleg brukte doku_ment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Legg ved"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fil lagt ved"
 msgstr[1] "<b>%d</b> filer lagt ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "G_øym vedleggslinja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Vi_s vedleggslinja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../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
 #: ../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 "Fje_rn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
-msgstr "_Legg ved ..."
+msgstr "_Legg ved …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Trykk mellomrom for å slå av/på vedleggslinje."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Redigér avtale"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Møte - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tildelt oppgåve - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgåve - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Notat – %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Ikkje noko samandrag"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringar som vert gjort i denne oppføringa kan verta forkasta dersom det "
 "kjem ei oppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Kan ikkje bruka noverande versjon!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Klarte ikkje opna kjelde"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Klarte ikkje opna mål"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "MÃ¥let er skrivebeskytta"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Sletta dette elementet frå alle dei andre mottakarane sine postkassar?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Noatet kunne ikkje slettast på grunn av ein CORBA-feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendinga kan ikkje slettast fordi tilgang vert nekta"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgåva kan ikkje slettast fordi tilgang vert nekta"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Notatet kunne ikkje slettast fordi tilgang vart nekta"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Notatet kunne ikkje slettast på grunn av ein feil"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein feil"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
-msgstr "Kontaktar ..."
+msgstr "Kontaktar …"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Delegér til:"
 
@@ -6127,135 +6485,181 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "_Alarmar"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klikk her for å setja eller fjerna alarmar på denne hendinga"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "_Repetering"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "Gjer denne hendinga gjentakande"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Sendingsval"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "Sett inn avanserte sendingsval"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "Varer heile _dagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "Avgjer om denne hendinga varer heile dagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Show Time as _Busy"
+msgstr "Vis tida som _oppteken"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "Avgjer om tida skal visast som oppteken"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "_Ledig/Oppteken"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr "Spør etter ledig/oppteken-informasjon for deltakarane"
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "A_vtale"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Repetering"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Denne hendinga har alarmar"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Utsendingar"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "_Deltakarar"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Hending utan startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Hending utan sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Legg til:"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan ikkje opna kalenderen «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
-msgstr ""
+msgstr "Du handlar på vegner av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dagar før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timar før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutt før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Tilpass"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Ingen"
 
@@ -6273,30 +6677,32 @@ msgstr "15 minutt før avtalen"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
-msgstr "_Deltakarar ..."
+msgstr "_Deltakarar …"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Sjølvvald alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "S_kildring:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Hendingsskildring"
 
-#: ../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 "Sa_mandrag:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarm"
 
+#: ../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 "_Skildring:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Tid:"
@@ -6325,30 +6731,26 @@ msgstr "Endra or_ganisator"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
-msgstr "Ko_ntaktar ..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisator"
+msgstr "Ko_ntaktar …"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Klarte ikkje å opna notat i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Til"
 
@@ -6361,63 +6763,59 @@ msgstr "Sta_rt-dato:"
 msgid "T_o:"
 msgstr "_Til:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Skildring:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du endrar ei hending som skjer fleire gongar. Kva vil du endra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Du delegerer ei hending som skjer fleire gongar. Kva vil du delegere?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Du endrar eit repeterande notat. Kva vil du endra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Berre denne instansen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Denne og tidlegare instansar"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Denne og framtidige instansar"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Alle instansane"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Datoen dette skal skje igjen er ikkje gyldig"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "på"
 
@@ -6425,7 +6823,7 @@ msgstr "på"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "fyrste"
 
@@ -6434,7 +6832,7 @@ msgstr "fyrste"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "sekund"
 
@@ -6442,7 +6840,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tredje"
 
@@ -6450,7 +6848,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "fjerde"
 
@@ -6458,13 +6856,13 @@ msgstr "fjerde"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "siste"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Annan dato"
 
@@ -6472,7 +6870,7 @@ msgstr "Annan dato"
 #. * 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1. til 10."
 
@@ -6480,7 +6878,7 @@ msgstr "1. til 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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11. til 20."
 
@@ -6488,45 +6886,45 @@ msgstr "11. til 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21. til 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "tilfelle"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
-msgstr "Legg til unnatak"
+msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
-msgstr ""
+msgstr "Fann ikkje noko utval å endra."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
-msgstr ""
+msgstr "Endra unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
-msgstr ""
+msgstr "Fann ikkje noko utval å sletta."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6577,12 +6975,12 @@ msgstr "veke(r)"
 msgid "year(s)"
 msgstr "Ã¥r"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -6597,51 +6995,55 @@ msgstr "<span weight=\"bold\">Status</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:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "Ferdig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "Høg"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "Vanleg"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Ikkje starta"
 
@@ -6654,7 +7056,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -6663,7 +7065,7 @@ msgid "_Date completed:"
 msgstr "_Dato ferdig:"
 
 #: ../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 "_Prioritet:"
 
@@ -6671,51 +7073,59 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Nettsideaddresse:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:111
+msgid "_Status Details"
+msgstr "_Statusdetaljar"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "Click to change or view the status details of the task"
+msgstr "Klikk for å endra eller visa statusdetaljane til oppgåva"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "_Sendingsval"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "Detaljar om oppgåve"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ikkje i stand å opna oppgåver i «%s»."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
-msgstr "_Deltakarar ..."
+msgstr "_Deltakarar …"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
-msgstr "Kategor_iar ..."
+msgstr "Kategor_iar …"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Skildring:"
+msgid "D_ue date:"
+msgstr "Forfalls_dato:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Tidssone:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "Forfalls_dato:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6723,142 +7133,126 @@ 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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d veke"
 msgstr[1] "%d veker"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Ukjend handling som skal utførast"
 
 #. 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:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før byrjing på avtalen"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter byrjinga på avtalen"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved byrjinga av avtalen"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen er slutt"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter at avtalen er slutt"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved slutten av avtalen"
 
 #. 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:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjend utløysartype"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å opna %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: ../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
+#: ../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 "Startdato:"
 
-#: ../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-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 "Skildring:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: ../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 "Samandrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Forfallsdato:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Offentleg"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privat"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Konfidensiell"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Sluttdato"
@@ -6868,21 +7262,14 @@ msgstr "Sluttdato"
 msgid "Start Date"
 msgstr "Start-dato"
 
-#: ../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 "Samandrag"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Oppteke"
 
@@ -6896,199 +7283,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "Nei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../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-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
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "Repeterande"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
-msgstr "Lagra som ..."
+msgstr "Lagra som …"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
-msgstr "Vel mappe å lagra utvalde vedlegg i..."
+msgstr "Vel mappe å lagra utvalde vedlegg i …"
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilete_utan_namn.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
-msgstr "_Lagra som ..."
+msgstr "_Lagra som …"
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Bruk til _bakgrunn"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Lagra valde"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
-msgstr "Opna i %s ..."
+msgstr "Opna i %s …"
+
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Ikkje noko samandrag *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %s <%s>"
 
-#: ../calendar/gui/e-calendar-table.c:382
+#. 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Start: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Frist:"
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../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
 msgid "Save as..."
-msgstr "Lagra som ..."
+msgstr "Lagra som …"
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Ny _oppgåve"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
-msgstr "S_kriv ut ..."
+msgstr "S_kriv ut …"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Merk som uferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merk valde oppgåver som uferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Trykk her for å leggja til ei oppgåve"
@@ -7111,7 +7524,8 @@ msgid "Due date"
 msgstr "Forfallsdato"
 
 #: ../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:372
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -7119,112 +7533,93 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Flyttar meldingar"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Kopierer element"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
-msgstr "Ny _avtale ..."
+msgstr "Ny _avtale …"
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nytt _møte"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Aktiv framsyning"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Vel _i dag"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
-msgstr "_Vel dato ..."
+msgstr "_Vel dato …"
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
-msgstr "S_kriv ut ..."
+msgstr "S_kriv ut …"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
-msgstr "Kopi_er til kalender ..."
+msgstr "Kopi_er til kalender …"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
-msgstr "Flytt til _kalender ..."
+msgstr "Flytt til _kalender …"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
-msgstr "_Deleger møte ..."
+msgstr "_Deleger møte …"
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
-msgstr "_Set opp møte ..."
+msgstr "_Set opp møte …"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
-msgstr "_Send vidare som iCalendar ..."
+msgstr "_Send vidare som iCalendar …"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Svar til _alle"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Gjer denne førekomsten _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7253,7 +7648,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:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutt oppdeling"
@@ -7264,46 +7659,34 @@ msgstr "%02i minutt oppdeling"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 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:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Komplisert gjentaking.)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Kvar dag"
 msgstr[1] "Kvar %d. dag"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7312,9 +7695,7 @@ msgstr[0] "Kvar veke"
 msgstr[1] "Kvar %d. veke"
 
 # TRN: sentence splicing
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7322,52 +7703,36 @@ msgstr[0] "Kvar veke på "
 msgstr[1] "Kvar %d. veke på "
 
 #. 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 " og "
 
 # TRN: Sentence splicing
-#. 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 "Den %s dagen i "
 
-#. 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 "Den %s %s i "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kvar månad"
 msgstr[1] "kvar %d. månad"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Kvart år"
 msgstr[1] "Kvart %d. år"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7375,47 +7740,47 @@ msgstr[0] " til saman %d gong"
 msgstr[1] " til saman %d gongar"
 
 #. 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 ", sluttar på"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Startar"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Sluttar"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Frist"
 
-#: ../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 "iCalendar-informasjon"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "Ein ukjend person"
 
 #. 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."
@@ -7423,288 +7788,288 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: ../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:728
+#: ../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:2034
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
 #: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
+#: ../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:2040
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../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 "Møtet er avlyst, men det var ikkje ført opp i kalenderane dine"
 
-#: ../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 "Oppgåva er avlyst, men ho var ikkje ført opp i oppgåvelistene dine"
 
-#: ../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> har publisert møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: ../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> ber om at %s er til stades på eit møte."
 
-#: ../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> spør etter deg for å stille opp på eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> ynskjer å vera med på eit eksisterande møte."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: ../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> ber om å få den nyaste møteinformasjonen."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: ../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> har svart på ein førespurnad om eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> har avlyst eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Møteavlysing"
 
-#: ../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> har sendt ei uforståeleg melding."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: ../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> har publisert informasjon om ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: ../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> ber om at %s utfører ei oppgåve."
 
-#: ../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> ber om at du utfører ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> ynskjer å vera med på ei eksisterande oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: ../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> ber om å få den nyaste oppgåveinformasjonen."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: ../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> har svart på ei  oppgåvetildeling."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> har avlyst ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Oppgåveavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: ../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> har publisert ledig/oppteken-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: ../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> spør etter ledig/oppteken-informasjonen din."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Ledig/oppteken-førespurnad"
 
-#: ../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> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Ledig/oppteken svar"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: ../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 "Meldinga ser ikkje ut til å vera rett forma"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingar inneheld berre førespurnader som ikkje er støtta."
 
-#: ../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 "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7727,118 +8092,118 @@ msgstr "Lastar kalender"
 
 #: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
-msgstr "Lastar melding ..."
+msgstr "Lastar melding …"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Tenarmelding:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Møteleiarar"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Deltakarar som må vera med"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ressursar"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Deltakarar"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Rom"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Møteleiar"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Deltakar som må vera med"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Valfri deltakar"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
-#: ../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 "Krev handling"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: ../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:737
+#: ../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
 msgid "Delegated"
 msgstr "Delegert"
 
 #. 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 "Deltakar                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../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 "Under prossering"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B, %Y"
 
@@ -7846,85 +8211,81 @@ msgstr "%A, %d. %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:481
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
-msgstr "_Deltakarar ..."
+msgstr "_Deltakarar …"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_Val"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Vis berre _arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Vis _forminska"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/oppteken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Alle personar og ressursar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Alle _pesonar og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_PÃ¥kravde deltakarar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "PÃ¥kravde folk _og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Slutt-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Deltakar"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Klikke her for å leggja til ein deltakar"
@@ -7957,8 +8318,8 @@ msgstr "Slett _valde notat"
 msgid "Click to add a memo"
 msgstr "Trykk her for å leggja til eit notat"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7967,85 +8328,80 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Lastar notat"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opnar notat på %s"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
-msgstr "Slettar valde objekt ..."
+msgstr "Slettar valde objekt …"
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Lastar oppgåver"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opnar oppgåver på %s"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
-msgstr "Fullfører oppgåver ..."
+msgstr "Fullfører oppgåver …"
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Tømer"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Vel ei tidssone"
 
 #. 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:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "Oppdaterar spørjing"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Tilpassa framsyning"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Lagra sjølvvalt framsyning"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
-msgstr "_Definer framsyningar ..."
+msgstr "_Definer framsyningar …"
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Lastar avtalar til %s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Lastar oppgåver til %s"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Lastar notat frå %s"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -8105,57 +8461,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vel i dag"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "Det må vera ein organisator."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Det må vera minst ein deltakar"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Informasjon om hending"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informasjon om oppgåve"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Notatinformasjon"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Motframlegg"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/oppteken-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Du må delta på denne hendinga."
 
@@ -8194,47 +8550,39 @@ msgstr "Ingen kalender tilgjengeleg for å laga notat"
 msgid "Memo Source Selector"
 msgstr "Notatkildeveljar"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nytt notat"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "N_otat"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Lag eit nytt notat"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Delt notat"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Lag eit nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Notatl_iste"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Lag ei ny notatliste"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Skriv ut notat"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Dei neste sju dagane"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8244,9 +8592,9 @@ msgstr ""
 "Plasseringa til og hierarkiet i Evolution-oppgåvemappene har endra seg sidan "
 "Evolution 1.x.\n"
 "\n"
-"Ha tolmod medan Evolution overfører mappene dine ..."
+"Ha tolmod medan Evolution overfører mappene dine …"
 
-#: ../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"
@@ -8256,30 +8604,30 @@ msgstr ""
 "Plasseringa til og hierarkiet i Evolution-kalendermappene har endra seg "
 "sidan Evolution 1.x.\n"
 "\n"
-"Ha tolmod medan Evolution overfører mappene dine ..."
+"Ha tolmod medan Evolution overfører mappene dine …"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Klarte ikkje overføra gamle innstillingar frå evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikkje overføra kalenderen «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ikkje i stand å overføra oppgåvene «%s»"
 
 #: ../calendar/gui/migration.c:1227
-#: ../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
+#: ../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
 msgid "Notes"
 msgstr "Merknader"
 
@@ -8436,54 +8784,54 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lau"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Oppgåve"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Samandrag: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Deltakarar: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Komande avtalar"
 
@@ -8515,39 +8863,31 @@ msgstr "Ingen kalender tilgjengeleg for å laga oppgåver"
 msgid "Task Source Selector"
 msgstr "Oppgåvekildeveljar"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Lag ei ny oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nytildelt oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1330
-msgid "Assigne_d Task"
-msgstr "Til_delt oppgåve"
-
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Lag ei ny tildelt oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Ny oppgåveliste"
 
-#: ../calendar/gui/tasks-component.c:1338
-msgid "Tas_k list"
-msgstr "Oppgåvel_iste"
-
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Lag ei ny oppgåveliste"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8559,49 +8899,70 @@ msgstr ""
 "\n"
 "Vil du sletta desse oppgåvene?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Skriv ut oppgåver"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% ferdig"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Avbroten"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Under arbeid"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "er større enn"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Opnar kalender"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "PÃ¥minning!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Kalenderhending"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
@@ -10135,56 +10496,215 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Klikk her for adresseboka"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Klarte ikkje opna autolagringsfil"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "MÃ¥l for posten"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Klarte ikkje henta meldinga frå redigeringa"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Vel mapper å posta meldinga i."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Sett inn vedlegg"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Klikk her for å velja mapper å posta til"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "Legg _ved"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "_Signatur:"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Melding utan namn"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "_Frå:"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Legg ved fil"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Svar-til:"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "L_ukk"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_Til:"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Lukk aktiv fil"
+
+#: ../composer/e-composer-actions.c:486 ../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 "S_kriv ut"
+
+#: ../composer/e-composer-actions.c:493 ../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 "Førehands_framsyning av utskrift"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Lagra aktiv fil"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "L_agra som …"
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Lagra fila med eit anna namn"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "Lagra _kladd"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Lagra  som kladd"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "S_end"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Send meldinga"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Sett inn sendingsval"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Ny _melding"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Opna vindauge for ny melding"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "T_eiknkoding"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "_Tryggleik"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP-krypt_er"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Kryptér denne meldinga med PGP"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP-_signer"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Signer denne meldinga med din PGP-nøkkel"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "_Prioriter melding"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Sett meldingsprioriteten høg"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "_Be om stadfesting på at meldinga er lesen"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "Få leveringskvittering når meldinga vert lesen"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME-kr_ypter"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Kryptér denne meldinga med ditt S/MIME-krypteringssertifikat"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME-sig_ner"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signér denne meldinga med S/MIME-signatursertifikatet ditt"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "_Bcc-felt"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Avgjer om BCC-feltet vert vist"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "_Cc-felt"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Avgjer om CC-feltet vert vist"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "_Frå-felt"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Avgjer om Frå-veljaren vert vist"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "_Post-til-felt"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Avgjer om Post-til-feltet vert vist"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "_Svar-til-felt"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Avgjer om Svar-til-feltet vert vist"
+
+#: ../composer/e-composer-actions.c:649
+#, fuzzy
+msgid "_Subject Field"
+msgstr "_Cc-felt"
+
+#: ../composer/e-composer-actions.c:651
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Avgjer om statusfeltet vert vist"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "_Til-felt"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "Avgjer om To-feltet vert vist"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakarane til meldinga"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Cc:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som vil få ein kopi av meldinga"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../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"
@@ -10192,29 +10712,70 @@ msgstr ""
 "Skriv inn adressene som vil få ein kopi av meldinga utan å visast i lista "
 "over mottakarar"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_Frå:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Svar-til:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_Til:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "_Emne:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "Legg _ved"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "_Signatur:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Sett inn vedlegg"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Klikk her for adresseboka"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "MÃ¥l for posten"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Vel mapper å posta meldinga i."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Klikk her for å velja mapper å posta til"
+
+#: ../composer/e-composer-private.c:65
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "prosent ferdig"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "Vi_s vedleggslinja"
+
+#: ../composer/e-msg-composer.c:872
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikkje signera utgåande melding. Ingen signeringssertifikat til denne "
 "kontoen"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10222,42 +10783,24 @@ msgstr ""
 "Kan ikkje kryptera utgåande melding. Det er ikkje valt noko "
 "krypteringssertifikat til denne kontoen"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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
+#: ../mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Vedlegg"
+msgstr[1] "Vedlegg"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "G_øym vedleggslinja"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "Vi_s vedleggslinja"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Ukjend grunn"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Klarte ikkje opna fil"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Klarte ikkje henta meldinga frå redigeringa"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Melding utan namn"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Opna fil"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Skriv ei melding"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10271,7 +10814,7 @@ msgid ""
 "the mail to be sent without those pending attachments "
 msgstr ""
 " Somme vedlegg vert lasta ned. Ã… senda e-posten no vil gjera at dei "
-"vedleggja ikkje vil verta sendte med."
+"vedleggja ikkje vil verta sende med."
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -10289,8 +10832,7 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Fordi «{0}», må du kanskje gjera andre brukarval for e-post."
 
-#: ../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 "Fordi «{1}»."
 
@@ -10401,23 +10943,28 @@ msgstr "Du kan ikkje leggja fila {0} ved denne meldinga."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må setja opp ein konto før du kan skriva e-post."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Hald fram med å redigera"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Ikkje gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Lagra melding"
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "Lagra kladd"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../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:738
 msgid "Groupware Suite"
 msgstr "Gruppevarepakke"
 
@@ -10433,46 +10980,74 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution-Ã¥tvaring"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution informasjon"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution spørjing"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern feil, bedt om ukjend feil «%s»"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+#, fuzzy
+msgid "Component"
+msgstr "Ferdig"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../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
+msgid "Enabled"
+msgstr "PÃ¥"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Om utvidaren er utvida eller ikkje"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Ein feil oppstod under utskrift"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
 msgstr ""
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#, fuzzy
+msgid "Because \"{1}\"."
+msgstr "Fordi «{1}»."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Klarte ikkje å opna fila «{0}»."
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Kan ikkje opna fila"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
 msgstr "Klarte ikkje å lagra fila «{0}»."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10480,7 +11055,8 @@ msgid "Do you wish to overwrite it?"
 msgstr "Vil du skriva over henne?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+#, fuzzy
+msgid "File exists \"{0}\"."
 msgstr "Fila finst «{0}»."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10491,48 +11067,64 @@ msgstr "Skriv over fil?"
 msgid "_Overwrite"
 msgstr "Skriv _over"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Klarte ikkje oppdatere mappetilgang."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Viktig"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Arbeid"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Personleg"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Hugseliste"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Seinare"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "Merkelapp_namn:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Rediger merkelapp"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Legg til merkelapp"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Merkelappnamnet kan ikkje vera tomt."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../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 "Valideringsfeil: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
 msgstr ""
 
 #: ../filter/filter-datespec.c:80
@@ -10651,65 +11243,65 @@ msgstr "%d. %b %Y"
 msgid "Select a time to compare against"
 msgstr "Vel ei tid å samanlikna med"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Vel ei fil"
 
-#: ../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
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "R_egelnamn:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Finn element som høver med desse kriteria"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "L_egg til filterregel"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "dersom alle krava er oppfylte"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "dersom nokon av krava er oppfylte"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Finn element:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Alle tilhøyrande"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Svar og foreldre"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Ingen svar eller foreldre"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "T_a med trådar"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Innkomande"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Utgåande"
 
@@ -10733,7 +11325,7 @@ msgstr "Dato manglar."
 msgid "Missing file name."
 msgstr "Filnamn manglar."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Manglar namn."
 
@@ -10809,7 +11401,7 @@ msgstr ""
 msgid "months"
 msgstr "månader"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "sekund"
 
@@ -10821,9 +11413,10 @@ msgstr "tid no"
 msgid "the time you specify"
 msgstr "ei tid du oppgjev"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "veker"
 
@@ -10839,7 +11432,7 @@ msgstr "Legg til regel"
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -10860,57 +11453,72 @@ msgid "Configure your email accounts here"
 msgstr "Set opp e-postkontoar"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "Set opp e-postkontoar"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolution e-post"
 
-#: ../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 "Evolution oppsettkontroll for e-postkontoar"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution e-postkomponent"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolution e-postredigering"
 
-#: ../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 "Evolution oppsettkontroll for e-postredigering"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-postinnstillingskontroll"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "Oppsettkontroll for Evolution kalender"
+
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "E-postkontoar"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "E-postinnstillingar"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+#, fuzzy
+msgid "Network Preferences"
+msgstr "Redigeringsinstillingar"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s lisensavtale"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10923,116 +11531,110 @@ msgstr ""
 "for %s, vist under.\n"
 "Kryss av i boksen for å godta lisensen.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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:97
 msgid "Autogenerated"
 msgstr "Laga automatisk"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Spør for kvar einaste melding"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Mottak av e-post"
 
 # TRN: Kva betyr dette?
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Sjå automatisk etter _nye meldinga kvar(t)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tt"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Sending av e-post"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Standard"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Tryggleik"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Mottaksval"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldingar"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "PÃ¥"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "Namnlaus"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Språk"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Legg til signaturskript"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Vidaresendt melding --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
 #. 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:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11040,11 +11642,11 @@ msgstr ""
 "${AbbrevWeekdayName} den ${Day}.${Month}.${Year} klokka ${24Hour}:${Minute} "
 "(${TimeZone}) skreiv ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Opprinneleg melding --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filterreglar"
 
@@ -11061,10 +11663,6 @@ msgstr "Tildel farge"
 msgid "Assign Score"
 msgstr "Tildel poeng"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Vedlegg"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr ""
@@ -11081,10 +11679,6 @@ msgstr ""
 msgid "Completed On"
 msgstr "Ferdig"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "inneheld"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
@@ -11098,7 +11692,7 @@ msgid "Date sent"
 msgstr "Dato sendt"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11109,10 +11703,6 @@ msgstr "Slett"
 msgid "Deleted"
 msgstr "Sletta"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "inneheld ikkje"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "sluttar ikkje med"
@@ -11133,10 +11723,6 @@ msgstr "høyres ikkje ut som"
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Finst ikkje"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Kladd"
@@ -11145,10 +11731,6 @@ msgstr "Kladd"
 msgid "ends with"
 msgstr "sluttar med"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Finst"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "finst"
@@ -11161,14 +11743,10 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Viktig"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "er lik"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "er etter"
@@ -11181,18 +11759,6 @@ msgstr "er før"
 msgid "is Flagged"
 msgstr "er flagga"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "er større enn"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "er ikkje"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "er ikkje flagga"
@@ -11205,7 +11771,7 @@ msgstr "er ikkje sett"
 msgid "is set"
 msgstr "er sett"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Skrot"
@@ -11214,7 +11780,7 @@ msgstr "Skrot"
 msgid "Junk Test"
 msgstr "Skrottest"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Merkelapp"
 
@@ -11256,7 +11822,7 @@ msgstr "Spel lyd"
 
 #. 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:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Lesen"
 
@@ -11329,10 +11895,9 @@ msgstr "byrjar med"
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11343,64 +11908,64 @@ msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "SÃ¥ etter"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Legg til han_dling"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
-msgstr "Lag _søkjemappe frå søk ..."
+msgstr "Lag _søkjemappe frå søk …"
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Alle meldingane"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Ulesne melding"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Ingen merkelapp"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "_Lesne meldingar"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Nylege meldingar"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Meldingane frå dei siste fem dagane"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Meldingar med vedlegg"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "_Viktige meldingar"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Meldingane er ikkje skrot"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Søk i denne kontoen"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Søk i alle kontoane"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ulesen melding:"
@@ -11408,31 +11973,46 @@ msgstr[1] "Ulesne meldingar:"
 
 #. 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
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Tal på meldingar:"
 msgstr[1] "Tal på meldingar:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#, fuzzy
+msgid "Quota usage"
+msgstr "Tal på meldingar:"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../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
+msgid "Inbox"
+msgstr "Innboks"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Mappeeigenskapar"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velja mappe>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "L_ag"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Søk i mapper"
 
@@ -11441,362 +12021,323 @@ msgstr "Søk i mapper"
 msgid "UNMATCHED"
 msgstr "INGEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Kladd"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Innboks"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
-msgstr "Lastar ..."
+msgstr "Lastar …"
 
-#. 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:372
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "E-postmappetre"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flyttar mappa %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappa %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meldingar til mappa %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldingar til mappa %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikkje sleppa meldingar i topplageret"
 
-#: ../mail/em-folder-tree.c:1011 ../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 "_Kopiér til mappe"
 
-#: ../mail/em-folder-tree.c:1012 ../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 "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Vis"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
-msgstr "_Ny mappe ..."
+msgstr "_Ny mappe …"
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
-msgstr "_Flytt ..."
+msgstr "_Flytt …"
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
-msgstr "_Gje nytt namn ..."
+msgstr "_Gje nytt namn …"
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Tøm _utboks"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tøm papirkorga"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagar mappa «%s»"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: ../mail/em-folder-view.c:1337 ../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 "_Vidaresend"
 
 #. 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:1341 ../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 "R_ediger som ny melding .."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "S_kriv ut"
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
-msgstr "Flytt til _mappe ..."
+msgstr "Flytt til _mappe …"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
-msgstr "_Kopier til mappe ..."
+msgstr "_Kopier til mappe …"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Merk som _ulesen"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marker som ikkje vi_ktig"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marker som _skrot"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Marker som _ikkje skrot"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
-msgstr "Marker for _oppfølging..."
+msgstr "Marker for _oppfølging …"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Merkelapp"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Ny merkelapp"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Søkjemappe etter _emne"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Søkjemappe etter av_sendar"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Søkjemappe etter _mottakar"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Søkjemappe etter e-post_liste"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtrér på avsen_dar"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "Forvald"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Kunne ikkje henta melding"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
-msgstr "Hentar melding ..."
+msgstr "Hentar melding …"
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Lag ny _søkjemappe"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Frå denne adressa"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Til denne adressa"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å senda e-post til %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å senda ringa til %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å gøyma/visa adresser"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Stemmer med: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Fi_nn:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Førre"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Skil mellom store og små bokstavar"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Ikkje signert"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11804,11 +12345,11 @@ msgstr ""
 "Denne meldinga er ikkje signert. Det er ikkje mogleg å vita om meldinga er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11816,11 +12357,11 @@ msgstr ""
 "Denne meldinga er signert og gyldig. Det er svært sannsynleg at meldinga er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11828,11 +12369,11 @@ msgstr ""
 "Signaturen på denne meldinga kan ikkje stadfestast. Det er mogleg at ho har "
 "vorte tukla med undervegs."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikkje stadfesta avsendar"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11840,11 +12381,11 @@ msgstr ""
 "Denne meldinga er signert med ein gyldig signatur, men avsendaren kan ikkje "
 "stadfestast."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11852,11 +12393,11 @@ msgstr ""
 "Denne meldinga er signert med ein signatur, men det er ikkje nokon "
 "tilsvarande offentleg nøkkel."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11864,11 +12405,11 @@ msgstr ""
 "Denne meldinga er ikkje kryptert. Innhaldet vil vera synleg når ho vert "
 "sendt over internett."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11878,11 +12419,11 @@ msgstr ""
 "vanskeleg, men ikkje umogleg, for ein uvedkommande å bryta krypteringa og "
 "lesa meldinga på relativt kort tid."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11890,11 +12431,11 @@ msgstr ""
 "Denne meldinga er kryptert. Det er svært vanskeleg for ein uvedkommande å "
 "bryta krypteringa og lesa meldinga."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterkt"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11904,94 +12445,89 @@ msgstr ""
 "vanskeleg for ein uvedkommande å bryta krypteringa og lesa meldinga på "
 "relativt kort tid."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet er ikkje mogleg å visa"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fullført %d. %B %Y klokka %H.%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Over tida:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "innan %d. %B %Y klokka %H.%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Vis innvevd"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Gøym"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Tilpass til breidd"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Bruk _opprinneleg storleik"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Vedlegg"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Lagra vedlegg som"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Vel mappe å lagra alle vedlegga i"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
-msgstr "_Lagra valde ..."
+msgstr "_Lagra valde …"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d _vedlegg"
 msgstr[1] "%d _vedlegg"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "L_agra"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Lagra _alle"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Inga vedlegg"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "O_pna med"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2468
 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 ""
 
@@ -12000,277 +12536,288 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Hentar «%s»"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Ukjend eksterndel."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Misdanna eksterndel."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peikar til FTP-nettstad (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peikar til lokal fil (%s) gyldig på nettstaden (%s)"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peikar til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peikar til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peikar til ukjende eksterne data (type «%s»)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formaterer melding"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
-msgstr "Formaterer melding ..."
+msgstr "Formaterer melding …"
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Bcc:"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr "(%a %H.%M %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr "(%H.%M %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Dato"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Diskusjonsgrupper"
-
 #. 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:1866
+#: ../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:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Frå"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Svar-til"
 
+#: ../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
+msgid "Date"
+msgstr "Dato"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Diskusjonsgrupper"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikkje tolka S/MIME-meldinga: Ukjend feil"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Klarte ikkje tolka MIME-meldinge. Viser som råtekst."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstypen er ikkje støtta i multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Klarte ikkje tolka PGP/MIME-meldinga"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Klarte ikkje tolka PGP/MIME-meldinga: Ukjend feil"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Ikkje støtta signaturformat"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Feil under stadfesting av signatur"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Ukjend feil under stadfesting av signatur"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Klarte ikkje tolka PGP-meldinga"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunne ikkje tolka PGP-meldinga: Ukjend feil"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Kvar gong"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Ein gong om dagen"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Ein gong i veka"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Ein gong i månaden"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Merke"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr ""
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Hugseliste"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Seinare"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Plasseringa til og hierarkiet i Evolution-postboksmappene har endra seg "
-"sidan Evolution 1.x.\n"
-"\n"
-"Ha tolmod medan Evolution overfører mappene dine ..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Klarte ikkje laga mappa «%s»: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Klarte ikkje kopiera mappa «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Klarte ikkje å leita etter eksisterande postboksar på «%s»: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Plasseringa til og hierarkiet i Evolution-postboksmappene har endra seg "
+"sidan Evolution 1.x.\n"
+"\n"
+"Ha tolmod medan Evolution overfører mappene dine …"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Klarte ikkje å opna gamle data lagra på POP-tenaren «%s»: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
-"Klarte ikkje å laga katalog til å ha data liggjande i på POP-katalogen «%s»: "
-"%s"
+"Klarte ikkje å laga katalog til å ha data liggjande i på POP-katalogen «%s»: %"
+"s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Klarte ikkje kopiera data lagra på POP3-tenar (%s): %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikkje å laga lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"Plasseringa til og hierarkiet i Evolution-postboksmappene har endra seg "
+"sidan Evolution 1.x.\n"
+"\n"
+"Ha tolmod medan Evolution overfører mappene dine …"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Klarte ikkje å laga lokale e-postmapper på «%s»: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12278,62 +12825,65 @@ msgstr ""
 "Klarte ikkje å lesa innstillingane til tidlegare installasjon av Evolution. "
 "«evolution/config.xmldb» finst ikkje eller er uleseleg."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: ../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 "Svar til _liste"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "Legg til _adressebok"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Dette lageret støttar ikkje abonnement, eller dei er slått av."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "Ikkje vis _denne meldinga att."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Meldingsfilter"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "melding"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
-msgstr "Lagra melding ..."
+msgstr "Lagra melding …"
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldingar frå %s"
@@ -12347,116 +12897,153 @@ msgid "Search Folder source"
 msgstr "Søkjemappekjelde"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Send og motta e-post"
+
+#: ../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 "Send og motta e-post"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../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:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Kjenn att smilefjes automatisk"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Kjenn att lenkjer automatisk"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Kontroller om ny e-post er skrot"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Farge å merka sitering med"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Farge å merka sitering med."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Standardhøgde på redigeringssvindauget"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Standardbreidde på redigeringssvindauget"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "Komprimer adresser i Til/Cc/Bcc til talet oppgjeve i address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "Sjå etter skrot i _inngåande post"
+
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "Standardteiknsett å bruka til å skriva meldingar"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Standardteiknsett å bruka til å skriva meldingar."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Standardteiknsett å bruka til å visa meldingar"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Standardteiknsett å bruka til å visa meldingar."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Standard vidaresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Standardhøgde på redigeringsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Standardhøgde på meldingsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Standardhøgde på abonneringsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Standard svarstil"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Standardbreidde på redigeringsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Standardbreidde på meldingsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Standardbreidde på abonneringsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12464,72 +13051,76 @@ msgid ""
 "autocompletion."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../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:30
+#: ../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:31
+#: ../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:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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 "Marker skrivefeil etterkvart som du skriv."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Tøm skrotmapper ved slutt"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkorga ved slutt"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tøm alle skrotpostmappene når Evolution avsluttar."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkorgene når Evolution avsluttar."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Bruk markørmodus, slik at du ser ein markør når du les e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Slå av eller på magisk mellomrom"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Slå av eller på sanntidssøk"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Bruk søkemapper"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12540,33 +13131,33 @@ msgstr ""
 "skriva inn tekst. Dette gjer det lett å finna ei mappe frå sidestolpen ved å "
 "skriva namnet på mappa. Mappeframsyninga vil då gå til den mappa automatisk."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../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:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Slå av/på markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Høgda på meldingslisteramma"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Høgda på meldingslisteramma."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12574,13 +13165,13 @@ msgstr ""
 "Dersom brukaren prøver å opna 10 eller fleire meldingar, spør om han/ho "
 "verkeleg vil gjera det."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "Dersom «førehandsvis»-feltet er på, vis side-ved-side i staden for loddrett."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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 "
@@ -12591,48 +13182,69 @@ msgstr ""
 "Bonobo-komponent-framsynar i GNOME sin MIME-type-database brukast til å visa "
 "innhaldet."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 "Slår av/på varsling under merking av fleire meldingar."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../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:56
+#: ../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:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Sist gong skrotmappene vart tømde"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Sist gong papirkorga vart tømt"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Liste over merkelappar og fargane deira"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Liste over godtekne lisensar"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Liste over kontoar"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12640,11 +13252,15 @@ msgstr ""
 "Liste over kontoar som e-post-delen av Evolution veit om. Lista inneheld "
 "strengar som oppgjev underkatalogar til /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over sjølvvalde meldingshovudlinjer og om dei er i bruk."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../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."
@@ -12652,284 +13268,290 @@ msgstr ""
 "Liste over merkelappar e-post-delen av Evolution veit om. Lista inneheld "
 "strengar som inneheld «name:color» der fargen brukar HTML hex-koding."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnamn der lisensen er godteken."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Last ned bilete til HTML-meldingar over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
+#, 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."
+"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 ""
 "Last ned bilete til HTML-meldingar over http(s). Moglege verdiar er: 0 - "
 "Aldri last ned bilete over nettet, 1 - Last ned bileta viss sendaren er i "
 "adresseboka, 2 - Alltid last ned bilete over nettet."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlingar"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Loggfør filterhandlingar til den oppgjevne loggfila."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Loggfør filterhandlingar til denne fila"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Loggfør filterhandlingar til denne fila."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marker som lesen etter ei gitt tid"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som lesen etter ei gitt tid."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitering i førehandframsyningsramma"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitering i førehandframsyningsramma."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Standardhøgde på meldingsvindauget"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Standardbreidde på meldingsvindauget"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Korleis meldingar vert viste («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minste tal på dagar mellom kvar gong skrotposten vert sletta når du avsluttar"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tid mellom kvar gong skrotposten vert sletta når du avsluttar, i "
 "dagar."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Tal på adresser å visa i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Sei ifrå når emnefeltet er tomt"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Sei ifrå når brukaren tømmer ei av mappe."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Spør brukaren når han prøver å senda ei melding utan emne."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Spør når brukaren fjernar sletta meldingar"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Spør når brukaren berre sender til Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Spør når brukaren prøver å opne ti eller fleire meldingar på ein gong"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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 "Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når brukaren sender ei melding som ikkje har mottakarar i To:- eller "
 "Cc:-felta."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når brukaren prøver å senda uynskt HTML-e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Spør når brukaren merkar fleire meldingar"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Kjenn att smilefjes i teksten, og byt dei ut med bilete."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Kjenn att lenkjer i teksten, og byt dei ut."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Kontroller om ny e-post er skrotpost."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Send e-post i HTML-format som standard"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Send e-post i HTML-format som standard."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "_Synkroniseringsinnstillingar …"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Vis animasjonar"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilete som animasjonar."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis sletta meldingar (gjennomstreka) i meldingslista."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Vis sletta meldingar i meldingslista"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis e-post-adressa til avsendar i ei eiga kolonna i meldingslista."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell check inline"
+msgstr "Stavekontroller etterkvart"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Spell check inline"
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+msgid "Spell checking languages"
 msgstr "Stavekontroller etterkvart"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Standardhøgde på abonneringsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Standardbreidde på abonneringsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminalskrifttype"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Tida skrotposten vart sletta sist, i dagar sidan epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Tida papirkorga vart tømt sist, i dagar sidan epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Terminalskrifttypen brukt til å visa e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Skrifttype med variabel breidde brukt til å visa e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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:130
+#: ../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:131
+#: ../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;"
@@ -12941,132 +13563,147 @@ msgstr ""
 "strukturen er &lt;header enabled&gt;: slår på dersom meldingshovudlinja skal "
 "visast i e-post-framsyninga."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 addressbook 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:133
+#: ../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 ""
 "Dette set talet på adresser å visa i den vanlege meldingslisteframsyninga. "
-"Etter dette vert «...» vist."
+"Etter dette vert « …» vist."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Vis tråda meldingsliste."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Vis tråda meldingsliste"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Sorter meldingslista i trådar etter emne"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tid å venta før melding er lesen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Tid å venta før melding er lesen."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID-streng til standardkontoen."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "Bruk SpamAssassin-nissen og -klienten"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin-nissen og -klienten (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Bruk sjølvvalde skrifttypar"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk sjølvvalde skrifttypar til å visa e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Bruk berre lokale skrot-testar."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk berre lokale skrot-testar (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Bruk side-ved-side- eller brei utforming"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Skrifttype med variabel breidde"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Vis/Bcc-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Vis/Bcc-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Vis/Cc-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Vis/Cc-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Vis/Frå-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Vis/Frå-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Vis/Post til-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Vis/Post til-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vis/Svar til-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vis/Svar til-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../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:161
+#: ../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."
@@ -13074,43 +13711,43 @@ msgstr ""
 "Om meldingslista skal trådast etter emne når meldingane ikkje inneheld In-"
 "Reply-To eller References i meldingshovudet."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../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:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Høgda på meldingslistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Høgda på meldingslistefeltet."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importerer Elm-data"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-importerar"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importerer e-post frå Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "MÃ¥lmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Vel mappe å importera til"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley-e-postboks (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importerer Berkeley-e-postmapper (mbox)"
 
@@ -13118,7 +13755,7 @@ msgstr "Importerer Berkeley-e-postmapper (mbox)"
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
@@ -13128,15 +13765,15 @@ msgstr "Importerer «%s»"
 msgid "Scanning %s"
 msgstr "Søkjer gjennom %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importerer Pine-data"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-importerar"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importer e-post frå Pine."
 
@@ -13164,139 +13801,146 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Mal:"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d vald, "
 msgstr[1] "%d valde, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d sletta"
 msgstr[1] "%d sletta"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d skrot"
 msgstr[1] "%d skrot"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d utkast"
 msgstr[1] "%d utkast"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
-msgstr[1] "%d sendte"
+msgstr[1] "%d sende"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
-msgstr[1] "%d usendte"
+msgstr[1] "%d usende"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulesen, "
 msgstr[1] "%d ulesne, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d samanlagt"
 msgstr[1] "%d samanlagt"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: ../mail/mail-component.c:897
-msgid "_Mail Message"
-msgstr "_E-post"
-
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Ny e-post-mappe"
 
-#: ../mail/mail-component.c:905
-msgid "Mail _Folder"
-msgstr "E-post-_mappe"
-
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Lag ny e-post-mappe"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Klarte ikkje å oppgradera e-post-innstillingane eller mappene."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr ""
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr ""
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "Søk etter feil"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr ""
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "Feilsøkingsloggar"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1736
 msgid "Show _errors in the status bar for"
 msgstr ""
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1752
+#, fuzzy
+msgid "second(s)."
 msgstr "sekund."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "Loggmeldingar:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr ""
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldingar"
 
+#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Lukk vindauge"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
@@ -13310,7 +13954,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL er ikkje støtta i denne varianten av Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Bilete av avsendar</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13391,75 +14036,76 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Typesnitt i utskrift</span>"
 
 #: ../mail/mail-config.glade.h:27
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Status</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">PÃ¥kravd informasjon</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Tryggleik</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Utkast og sendte meldingar</span>"
+msgstr "<span weight=\"bold\">Utkast og sende meldingar</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tenaroppsett</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">_Autentiseringstype</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontostyring"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "_Legg til ny signatur ..."
+msgstr "_Legg til ny signatur …"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Signer alle utgåande meldingar frå denne kontoen"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Krypter óg til meg sjølv når eg sender kryptert e-post"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alltid _send kopi (Cc:) til:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid send _blinkopi (Bcc:) til:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "S_tol alltid på nøklar i nøkkelringen min ved kryptering"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg sjølv når eg sender e-post"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "Alltid be om _lesekvittering"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Legg ved opprinneleg melding"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "Sett inn _smilefjesbilete automatisk"
@@ -13477,14 +14123,14 @@ msgid "C_haracter set:"
 msgstr "T_eiknsett:"
 
 #: ../mail/mail-config.glade.h:50
-#, fuzzy
-msgid "C_heck custom headers for junk"
-msgstr "Sjå etter skrot i _inngåande post"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
 
+#: ../mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Check cu_stom headers for junk"
+msgstr "Sjå etter skrot i _inngåande post"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Sjå etter skrot i _inngåande post"
@@ -13546,16 +14192,17 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer utgåande meldingar _digitalt (som standard)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "Ikkje siter opprinneleg melding"
+#, fuzzy
+msgid "Do not quote"
+msgstr "Ikkje slett"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13618,54 +14265,63 @@ msgid "HTML Messages"
 msgstr "HTML-meldingar"
 
 #: ../mail/mail-config.glade.h:91
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "_Postboks:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Meldingshovud"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Innvevd"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Merkelappar"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "E-posthovud-tabell"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:105
+#: ../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:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13673,15 +14329,24 @@ msgstr ""
 "Merk at du vil ikkje verta spurd om passordet før du koplar deg på for "
 "fyrste gong"
 
-#: ../mail/mail-config.glade.h:107
+#: ../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_sasjon:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Pass_word:"
+msgstr "_Passord:"
+
+#: ../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."
@@ -13689,7 +14354,7 @@ msgstr ""
 "Skriv eit skildrande namn på denne kontoen i linja under.\n"
 "Dette namnet vert berre brukt til å visa på skjermen."
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13697,7 +14362,7 @@ msgstr ""
 "Skriv inn informasjon om korleis du vil senda e-post. Dersom du ikkje er "
 "sikker, bør du spørja systemansvarleg eller internettleverandøren din."
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13706,113 +14371,122 @@ msgstr ""
 "Skriv namnet og e-post-adressa di under. Dei valfrie felta treng du ikkje "
 "fylla inn viss du ikkje vil ha med denne informasjonen i e-post du sender."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Vel frå desse vala"
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Siter opprinneleg melding"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Hu_gs passordet"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Hugs _passordet"
 
-#: ../mail/mail-config.glade.h:122
+#: ../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 addressbooks"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
-msgstr "_Vel..."
+msgstr "_Vel …"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Send meldingskvitteringar:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "S_tandard skrifttype:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Vel skrifttype med fast breidde, til HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Vel skrifttype med fast breidde, til utskrift av HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Vel skrifttype med variabel breidde, til HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Vel skrifttype med variabel breidde, til utskrift av HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Senda e-post"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
-msgstr "Mappe til sendte _meldingar:"
+msgstr "Mappe til sende _meldingar:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Tenar_type: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Si_gneringssertifikat:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signaturar"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Signaturtabell"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Denne lista av språk inneheld berre språk du har installert ordliste til."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13822,11 +14496,7 @@ msgstr ""
 "signaturen din. Namnet du oppgjev vil berre\n"
 "verta brukt til å kjenna att skriptet i Evolution. "
 
-#: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13834,16 +14504,28 @@ msgstr ""
 "Skriv eit namn du vil bruka til å referera til denne kontoen.\n"
 "Til dømes: «Arbeid» og «Personleg»"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+#, fuzzy
+msgid "Us_ername:"
+msgstr "Br_ukarnamn:"
+
+#: ../mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "Autentisering"
+
+#: ../mail/mail-config.glade.h:156 ../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 "Br_ukarnamn:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13853,100 +14535,129 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å byrja. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "Le_gg til signatur"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Last _alltid bilete frå nettet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Automatic proxy configuration URL:"
+msgstr "Kjenn att lenkjer automatisk"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilete i e-post frå kontaktar"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "List opp lokale adressebokmapper"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "Oppsett for post"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lesne etter"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "Last aldri bilete frå _nettet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
-msgstr "_Vel ..."
+msgstr "_Vel …"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Vi_s animasjonar"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilete av avsendar i førehandsvisinga av meldinga"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Krymp Til/Cc/Bcc-hovud til"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "Br_uk trygg tilkopling:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Bruk stan_dard"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk dei same skrifttypane som andre program"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "skildring"
 
@@ -13986,43 +14697,43 @@ msgstr "_Skil mellom små og store bokstavar"
 msgid "Co_mpleted"
 msgstr "F_erdig"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Finn:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Merk med Skal følgjast opp"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Mappeabonnement"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ingen valde"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "T_enar:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Tryggleiksinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Bestemte mapper"
 
-#: ../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."
@@ -14030,23 +14741,23 @@ msgstr ""
 "Meldingane du har valt å følgja opp er lista opp under.\n"
 "Vel ei oppfølgingshandling frå «flagg»-menyen."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Godta lisens"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Ferdig innan:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensavtalen"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14093,11 +14804,11 @@ msgstr "Sender melding %d av %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Klarte ikkje senda %d av %d meldingar"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Avbroten."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Ferdig."
 
@@ -14125,67 +14836,72 @@ msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Kontaktinformasjon for %s"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrar kontoen «%s»"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar kontoen «%s»"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mottek %d melding"
 msgstr[1] "Mottek %d meldingar"
 
-#: ../mail/mail-ops.c:1906
-#, c-format
+#: ../mail/mail-ops.c:1978
+#, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Lagrar %d melding"
 msgstr[1] "Lagrar %d meldingar"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14194,11 +14910,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14207,51 +14923,51 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skriva data: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
-msgstr "Avbryt ..."
+msgstr "Avbryt …"
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
-msgstr "Oppdaterar ..."
+msgstr "Oppdaterar …"
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
-msgstr "Ventar ..."
+msgstr "Ventar …"
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
@@ -14279,17 +14995,20 @@ msgstr "Tast inn passord"
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Rediger signatur"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Lagra og lukk"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Gje signaturen eit namn."
+#: ../mail/mail-signature-editor.c:355
+#, fuzzy
+msgid "Edit Signature"
+msgstr "Rediger signatur"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Namn:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "Signaturtabell"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14300,8 +15019,8 @@ msgstr "Klarte ikkje laga katalogen for innkomande e-post «%s»: %s"
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
-"Prøver å bruka movemail til å flytta post frå ei kjelde «%s» som ikkje er "
-"ein UNIX mbox "
+"Prøver å bruka movemail til å flytta post frå ei kjelde «%s» som ikkje er ein "
+"UNIX mbox "
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14332,25 +15051,28 @@ msgstr "Oppdaterer søkjemapper for «%s:%s»"
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkjemapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Redigér søkjemappe"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Ny søkjemappe"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
+#, fuzzy
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Ei mappe som heiter «{0}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «{1}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:3
+#, fuzzy
 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."
@@ -14361,15 +15083,17 @@ msgstr ""
 "avslutta."
 
 #: ../mail/mail.error.xml.h:6
+#, fuzzy
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
 
 #: ../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 "Ein signatur som heiter «{0}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:8
@@ -14405,12 +15129,13 @@ msgstr ""
 "godt?"
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"Er du sikker på at du vil fjerna alle dei sletta meldingane i mappa «{0}» "
-"for godt?"
+"Er du sikker på at du vil fjerna dei sletta meldingane i alle mappene for "
+"godt?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14425,11 +15150,13 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil senda meldinga utan emne?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+#, fuzzy
+msgid "Because \"{0}\"."
 msgstr "Fordi «{0}»."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+#, fuzzy
+msgid "Because \"{2}\"."
 msgstr "Fordi «{2}»."
 
 #: ../mail/mail.error.xml.h:21
@@ -14437,15 +15164,18 @@ msgid "Blank Signature"
 msgstr "Tom signatur"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Kan ikkje leggja til søkjemappa «{0}»."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikkje kopiera mappa «{0}» til «{1}»."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikkje laga mappa «{0}»."
 
 #: ../mail/mail.error.xml.h:25
@@ -14453,52 +15183,62 @@ msgid "Cannot create temporary save directory."
 msgstr "Klarte ikkje å laga mellombels katalog."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikkje laga katalogen, fordi «{0}»"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Kan ikkje sletta mappa «{0}»."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikkje sletta systemmappa «{0}»."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+#, fuzzy
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Kan ikkje redigera den søkjemappa «{0}», sia ho ikkje finst."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikkje flytta mappa «{0}» til «{1}»."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+#, fuzzy
+msgid "Cannot open source \"{1}\""
 msgstr "Klarte ikkje opna kjelda «{1}»"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
 msgstr "Klarte ikkje opna kjelda «{2}»."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikkje opna målet «{2}»."
 
 #: ../mail/mail.error.xml.h:34
+#, fuzzy
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"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 ""
 "Kan ikkje lesa lisensfila «{0}» på grunn av eit installasjonsproblem. Du kan "
 "ikkje bruka denne leverandøren før du godtek lisensen."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikkje gje «{0}» det nye namnet «{1}»."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikkje byta namn på eller flytta systemmappa «{0}»."
 
 #: ../mail/mail.error.xml.h:37
@@ -14506,18 +15246,26 @@ msgid "Cannot save changes to account."
 msgstr "Kan ikkje lagra endringane i kontoen."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikkje lagra i katalogen «{0}»."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
 msgstr "Kan ikkje lagra i fila «{0}»."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
 msgstr "Kan ikkje velja signaturskriptet «{0}»."
 
 #: ../mail/mail.error.xml.h:41
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "Sjå etter _skrot"
+
+#: ../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."
@@ -14525,46 +15273,44 @@ msgstr ""
 "Kontroller at passordet ditt er skrive rett. Hugs at mange passord ser "
 "skilnad på store og små bokstavar. Sjå etter om Caps Lock er på."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Kan ikkje lagra signaturfila."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Sletta «{0}»?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Sletta kontoen?"
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Sletta: "
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr ""
+msgid "Delete account?"
+msgstr "Sletta kontoen?"
 
 #: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Kopier dei valde meldingane til ei anna mappe"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Forkasta endringar?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ikkje _slett"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ikkje slett"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Ikkje skru av"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Vil du at operasjonen også skal utførast i undermappene?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14639,7 +15385,7 @@ msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
-"Dersom du avsluttar, vil ikkje desse meldingane verta sendte før Evolution "
+"Dersom du avsluttar, vil ikkje desse meldingane verta sende før Evolution "
 "vert starta att."
 
 #: ../mail/mail.error.xml.h:68
@@ -14671,42 +15417,34 @@ msgid "Mark all messages as read"
 msgstr "Merk alle meldingar som lesne"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Merka alle meldingar i denne mappa og undermappene som lesne?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Manglande mappe."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Ingen kjelder valde."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Berre _denne mappa"
-
-#: ../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 "Å opne for mange meldingar på ein gong kan ta lang tid."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Kontroller innstillingane dine og prøv igjen."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Slå på denne kontoen eller bruk ein annan konto til å senda med."
 
-#: ../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 ""
-"Skriv inn ei gyldig e-post-adresse i «Til:»-feltet. Du kan søkja etter e-"
-"post-adresser ved å klikka på «Til:»-knappen til venstre for mottakarfeltet."
+"Skriv inn ei gyldig e-post-adresse i «Til:»-feltet. Du kan søkja etter e-post-"
+"adresser ved å klikka på «Til:»-knappen til venstre for mottakarfeltet."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14716,34 +15454,45 @@ msgstr ""
 "faktisk vil ha slik post:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Gje signaturen eit namn."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Vent litt."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+#, fuzzy
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem under migrering av gamal e-post-mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Spør tenar"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tenar om ei liste av støtta autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Lesekvitteringar etterspurd."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Verkeleg sletta mappa «{0}» og alle undermappene?"
 
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Importer fil"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Søkjemapper vert oppdatert automatisk."
@@ -14789,11 +15538,12 @@ msgstr ""
 "minst ein Til:- eller Cc:-mottakar. "
 
 #: ../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 ""
 "Desse søkjemappene:\n"
@@ -14803,11 +15553,12 @@ msgstr ""
 "som er fjerna. Mappene er oppdaterte."
 
 #: ../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 ""
 "Desse filterrreglane:\n"
@@ -14893,7 +15644,7 @@ msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 
 #: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har usendte meldingar. Vil du avslutta likevel?"
+msgstr "Du har usende meldingar. Vil du avslutta likevel?"
 
 #: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
@@ -14918,7 +15669,8 @@ msgstr ""
 "eksterne mapper, eller begge delar."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Innlogginga på tenaren «{0}» som «{0}» feila."
 
 #: ../mail/mail.error.xml.h:135
@@ -14941,22 +15693,23 @@ msgstr "_Tøm"
 msgid "_Open Messages"
 msgstr "_Opna meldingar"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "denne mappa og _undermapper"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Svara"
 
+#: ../mail/message-list.c:1055
+#, fuzzy
+msgid "Forwarded"
+msgstr "Vidaresend"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
@@ -14981,37 +15734,52 @@ msgstr "Høgare"
 msgid "Highest"
 msgstr "Høgast"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "I dag, %l:%M:%p"
 
-#: ../mail/message-list.c:1630 ../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 "I går, %l:%M:%p"
 
-#: ../mail/message-list.c:1642 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../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"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
+#: ../mail/message-list.c:4223
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4225
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"Det er ingen oppføringar i denne framsyninga."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Ferdig innan"
@@ -15034,46 +15802,46 @@ msgstr "Mottatt"
 
 #: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr "Sendte meldingar"
+msgstr "Sende meldingar"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Storleik"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Ring til"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Ikkje send vidare"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Til informasjon"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vidaresend"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Svar trengst ikkje"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Sjå gjennom"
 
@@ -15098,6 +15866,11 @@ msgid "Subject contains"
 msgstr "Emne inneheld"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Emne eller avsendar inneheld"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Emne eller avsendar inneheld"
 
@@ -15110,14 +15883,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Leverer grunnleggjande funksjonar for lokale adressebøker."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Bruk vedleggspåminning-tillegg"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Bruk vedleggspåminning-tillegg."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15125,7 +15890,7 @@ msgstr ""
 "Liste med hint om ting som vedleggspåminnaren skal sjå etter i "
 "meldingskroppen"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
@@ -15133,14 +15898,11 @@ msgstr ""
 "Liste med hint om ting som vedleggspåminnaren skal sjå etter i "
 "meldingskroppen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Minn på ved _manglande vedlegg"
-
 #: ../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"
@@ -15162,9 +15924,10 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Meldinga har ingen vedlegg"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Hald fram med å redigera"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#, fuzzy
+msgid "_Edit Message"
+msgstr "R_edigér melding"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15178,122 +15941,148 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Innskoten lyd-tillegg"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Vel namn på tryggleikskopifila for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Start Evolution på nytt etter tryggleikskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Vel tryggleiksfil for Evolution som skal gjenopprettast"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "_Start Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Gjenopprett frå tryggleikskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 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:264
 msgid "_Restore Evolution from the backup file"
 msgstr "_Gjenopprett Evolution frå tryggleikskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Vel Evolution-arkiv som skal gjenopprettast:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Vel ei fil å gjenoppretta"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Tryggleikskopiér Evolution-mappa"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mappa"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Kontroller tryggleikskopi for Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Avsluttar Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiérer Evolution-kontoar og innstillingar"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Tryggleikskopiering ferdig"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Startar Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Tryggleikskopiér Evolution-data"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Lastar innstillingane til Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Tek tryggleikskopi av mappa %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenopprettar frå mappa %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Evolution tryggleikskopi"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Tryggleikskopiér Evolution-data"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Startar Evolution på nytt"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+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 ""
@@ -15328,14 +16117,24 @@ msgstr ""
 "det."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Delegattilgjenge"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr ""
 
-#: ../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 "Kopier valt mappe til ei anna mappe"
+
+#: ../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 "
@@ -15350,43 +16149,43 @@ msgstr "Sikkerhetskopiér og gjenopprett Evolution-data og innstillingar"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
-msgstr "Gj_enopprettingsinnstillingar ..."
+msgstr "Gj_enopprettingsinnstillingar …"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
-msgstr "Val for _tryggleiksskopiering ..."
+msgstr "Val for _tryggleiksskopiering …"
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontaktar"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "Legg _automatisk oppføringar til i adresseboka når du svarar på meldingar"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vel adressebok for automatiske kontaktar"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Lynmelding-kontaktar"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synkroniser kontaktinformasjon og bilete frå kameratlista i Pidgin jamnleg"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Vel adressebok for Pidgin-venneliste"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisér med kontaktliste no"
 
@@ -15404,7 +16203,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:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Ein feil oppstod under utskrift"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr ""
 
@@ -15423,20 +16243,25 @@ msgid "Bogofilter Options"
 msgstr ""
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr ""
+
+#: ../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
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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 "_Adresse:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../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 "Bruk _SSL"
 
@@ -15456,17 +16281,19 @@ msgstr "Lokale kalendrar"
 msgid "Provides core functionality for local calendars."
 msgstr "Gjer kjernefunksjonalitet for lokale kalendrar."
 
-#: ../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:375
-msgid "_Refresh:"
-msgstr "_Oppdater:"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "O_ppdater"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Trygg tilkopling"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Brukarna_mn:"
 
@@ -15567,13 +16394,28 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vil du gjera Evolution til standard e-postlesar?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "Merk som _standardmappe"
+
+#: ../plugins/default-source/default-source.c:102
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "Merk som _standardmappe"
+
+#: ../plugins/default-source/default-source.c:103
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "Merk som _standardmappe"
+
+#: ../plugins/default-source/default-source.c:104
+#, fuzzy
+msgid "Mark as _default memo list"
 msgstr "Merk som _standardmappe"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
@@ -15588,6 +16430,53 @@ msgstr ""
 "Leverer funksjonar for å gjera ein kalender eller ei adressebok til standard "
 "kalender/bok."
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+#, fuzzy
+msgid "_Custom Header"
+msgstr "Tilpassa framsyning"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+#, fuzzy
+msgid "Key"
+msgstr "Kenya"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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
+#, fuzzy
+msgid "Custom Header"
+msgstr "Sjølvvalt _melding"
+
+#: ../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 "Opne annan brukars mappe"
@@ -15605,12 +16494,12 @@ msgid "_User:"
 msgstr "_Brukarnamn:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Sikker passord"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15618,11 +16507,11 @@ msgstr ""
 "Dette valet vil kopla til Exchange-tenaren med sikkerpassord-autentisering "
 "(NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Reintekstpassord"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -15630,11 +16519,11 @@ msgstr ""
 "Dette valet vil kopla til Exchange-tenaren med klartekstpassord-"
 "autentisering."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Ute av kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15642,77 +16531,82 @@ msgstr ""
 "Meldinga under vil automatisk verta sendt til alle som \n"
 "sender e-post til deg medan du ikkje er på kontoret."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Eg er ikkje på kontoret no"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Eg er på kontoret no"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Byt passordet på Exchange-kontoen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Byt passord"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Handsama delegat-innstillingane for Exchange-konto"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegeringsassistent"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Ymse"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Vis storleiken til alle Exchange-mappene"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Mappestorleik"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-innstillingar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA-adresse:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utentiser"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_E-post"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr " _Søk etter støtta typar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KiB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15730,7 +16624,7 @@ 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:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -15738,7 +16632,7 @@ msgstr ""
 "Dette passordet er ikkje det same som noverande passord for kontoen din. "
 "Skriv inn det rette passordet."
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Dei to passorda er ikkje like. Skriv dei inn på nytt."
 
@@ -15763,33 +16657,33 @@ msgstr "Ditt noverande passord har gått ut. Byt passordet ditt no."
 msgid "Your password will expire in the next %d days"
 msgstr "Passordet ditt går ut om %d dagar"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Tilpassa"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Redaktør (lesa, laga, redigera)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Forfattar (lesa, laga)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Gjennomlesar (berre lesa)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegattilgjenge"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Løyve for %s"
@@ -15797,7 +16691,7 @@ msgstr "Løyve for %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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15805,66 +16699,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, 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:415
 msgid "Delegate To"
 msgstr "Delegér til"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Fjerna delegaten %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Klarte ikkje å kopla til Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Klarte ikkje å finna seg sjølve i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Klarte ikke finna delegaten %s i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Klarte ikkje å fjerna delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Klarte ikkje å oppdatera lista over delegatar."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Klarte ikkje å legga til delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Feil ved lesing av delegatliste."
 
@@ -15912,20 +16806,26 @@ msgstr ""
 msgid "_Tasks:"
 msgstr "_Oppgåver:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
-msgstr "Løyve ..."
+msgstr "Løyve …"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Mappenamn"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Mappestorleik"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#, fuzzy
+msgid "User"
+msgstr "Br_ukar"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Tinga annan brukar si mappe"
@@ -15934,20 +16834,20 @@ msgstr "Tinga annan brukar si mappe"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-mappetre"
 
-#: ../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:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
-msgstr "Slutt å tinga mappe ..."
+msgstr "Slutt å tinga mappe …"
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Verkeleg slutta å tinga mappa «%s»?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Slutta å tinga «%s»"
@@ -16002,25 +16902,28 @@ msgstr "Endra status"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "Varsel om gamalt passord ..."
+msgstr "Varsel om gamalt passord …"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "Passordet ditt vil gå ut om 7 dagar ..."
+msgstr "Passordet ditt vil gå ut om 7 dagar …"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
 msgstr "_Byt passord"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Nekta tilgang.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Legg til brukar:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../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
 msgid "Add User"
 msgstr "Legg til brukar"
 
@@ -16143,13 +17046,13 @@ msgstr "Br_ukar"
 msgid "button-user"
 msgstr "button-user"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Vel brukar"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
-msgstr "Adressebok ..."
+msgstr "Adressebok …"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -16160,8 +17063,9 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Abonner på annan brukars kalender"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+#, fuzzy
 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 ""
 "Eit tilleggsprogram som handsamar ei samling av Exchange-konto-spesifikke "
@@ -16255,10 +17159,14 @@ msgid "Could not update out-of-office state"
 msgstr "Klarte ikkje oppdatere ute-av-kontoret-tilstand"
 
 #: ../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 "Exchange-konto er fråkopla."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16285,102 +17193,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Klarte ikke å oppdatere delegatar:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Mappa finst frå før"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Mappa finst ikkje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Mappe fråkopla"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: ../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 "Kan ikkje nå global katalogtenar"
 
-#: ../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 "Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
 
-#: ../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 "E-postboks for {0} er ikkje på denne tenaren."
 
-#: ../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 "Sjå til at adressa er rett, og prøv att."
 
-#: ../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 "Sjå til at tjenarnamnet er stava rett, og prøv att."
 
-#: ../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 "Sjå til at brukarnamnet og passordet er rett, og prøv att."
 
-#: ../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 "Det er ikkje stilt inn nokon global katalogtenar for denne kontoen."
 
-#: ../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 "Inga e-postboks for brukar {0} på {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Brukaren {0} finst ikkje"
 
-#: ../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 "Passord endra."
 
-#: ../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 "Kontroller at namnet på den globale katalogtenaren er rett."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Start Evolution på nytt for å la endringane tre i kraft."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Vel ein brukar."
 
-#: ../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 "Tenaren avslo passordet fordi det er for veikt."
 
-#: ../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 "Exchange-kontoen vil verte avslått når du avsluttar Evolution"
 
-#: ../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 "Exchange-kontoen vil verte fjerna når du avsluttar Evolution"
 
-#: ../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 "Exchange-tenaren er ikkje kompatibel med Exchange Connector."
 
-#: ../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."
@@ -16388,7 +17296,7 @@ msgstr ""
 "Tenaren køyrer Exchange 5.5. Exchange Connector\n"
 "støttar berre Microsoft Exchange 2000 og 2003."
 
-#: ../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"
@@ -16402,57 +17310,58 @@ msgstr ""
 "\n"
 "Eller du har kanskje skrive passordet feil."
 
-#: ../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 "Prøv på nytt med et anna passord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Kan ikkje leggja brukar til tilgangslista:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Kan ikkje redigere deligatar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Ukjend feil under leiting etter {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Ukjend feil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Ukjend type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Ikkje støtta operasjon"
 
-#: ../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 "Du er nær grensa for kor mykje e-post du kan lagra på tenaren."
 
-#: ../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 "Du kan ikkje gjera deg sjølv til din eigen delegat"
 
-#: ../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 "Du har gått over grensa for e-postlagring på denne tenaren."
 
-#: ../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 "Du kan berre setja opp ein Exchange-konto."
 
-#: ../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."
@@ -16460,13 +17369,13 @@ msgstr ""
 "Noverande bruk er: {0} kiB. Prøv å sletta nokre e-postar for å gjera plass "
 "til fleire."
 
-#: ../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 "Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h: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."
@@ -16474,19 +17383,19 @@ msgstr ""
 "Noverande bruk er: {0} kiB. Du kan ikkje senda mer e-post før du har rydda "
 "meir plass."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Passordet ditt har gått ut."
 
-#: ../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 "{0} kan ikkje verte lagt i tilgjengelista"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} er allereie ein delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} er allereie i lista"
 
@@ -16498,6 +17407,15 @@ msgstr "Abonner på annan brukars oppgåver"
 msgid "Check folder permissions"
 msgstr "Kontrollerer mappetilgang"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Eksternt redigeringsprogram"
+
+#: ../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 "
@@ -16509,23 +17427,55 @@ msgstr ""
 msgid "External Editor"
 msgstr "Eksternt redigeringsprogram"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Klarte ikkje å laga mellombels katalog."
+
+#: ../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"
+#, fuzzy
+msgid "Compose in _External Editor"
 msgstr "Skriv melding i eksternt redigeringsprogram"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr ""
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr ""
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr ""
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "A_nsikt"
 
@@ -16557,20 +17507,57 @@ msgstr "Slutt å tinge mapper"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnment"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+#, fuzzy
+msgid "Please enter user name first."
+msgstr "Vel eit anna namn."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Legg til mappe til liste over abonnerte mapper"
+
+#: ../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 "_Kalender:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "Hentar «%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 "<b>Medlemmer</b> "
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Eit tillegg for å setja opp Google-kalender."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-kjelder"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Sjekkliste"
 
@@ -16616,7 +17603,7 @@ msgstr "Skrotpostinnstillingar"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
-msgstr "Junk Mail Settings..."
+msgstr ""
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
@@ -16640,10 +17627,21 @@ msgid "_Junk List"
 msgstr "_Skrotliste"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Meldingsstatus"
+
+#: ../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 "Melding trekt tilbake"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Trekk tilbake e-post"
 
@@ -16651,12 +17649,6 @@ msgstr "Trekk tilbake e-post"
 msgid "Add Send Options to groupwise messages"
 msgstr "Legg til val om sending til GroupWise-meldingar"
 
-#: ../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"
-msgstr "Sendingsval"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Eit tillegg for funksjonar i GroupWise-kontoar."
@@ -16665,6 +17657,82 @@ msgstr "Eit tillegg for funksjonar i GroupWise-kontoar."
 msgid "Groupwise Features"
 msgstr "GroupWise-funksjonar"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Melding trekt tilbake"
+
+#: ../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 "Gjer om den valde meldinga til ei ny oppgåve"
+
+#: ../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 "Ugyldig signatur"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Kan ikkje lagra i fila «{0}»."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Vel brukar"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "Ei mappe som heiter «{0}» finst frå før. Bruk eit anna namn."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "Sertifikatet finst frå før"
+
+#: ../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 "Gjer denne hendinga gjentakande"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Vil du lagra endringane?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Vil du lagra endringane?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Klarte ikkje lagra til autolagringsfila «{0}»."
+
+#: ../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 ""
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "Mellombels godkjenning"
@@ -16679,7 +17747,7 @@ msgstr "_Tilpass varsel"
 
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Con_tacts..."
-msgstr "Kon_taktar ..."
+msgstr "Kon_taktar …"
 
 #: ../plugins/groupwise-features/properties.glade.h:5
 #: ../widgets/table/e-table-click-to-add.c:517
@@ -16700,7 +17768,7 @@ msgstr "_Ikkje delt"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
-msgstr "_Delt med ..."
+msgstr "_Delt med …"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -16763,9 +17831,9 @@ msgstr "<b>Kontonamn</b>"
 msgid "Proxy Login"
 msgstr "Mellomtenarinnlogging"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16774,20 +17842,20 @@ msgstr "%sSkriv passordet til %s (brukar %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:509
 msgid "_Proxy Login..."
 msgstr "_Mellomtenarinnlogging"
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Mellomtenar-fana vil berre vera tilgjengeleg når kontoen er tilkopla."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Mellomtenar-fana vil berre vera tilgjengeleg når kontoen er slått på."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Brukarar"
 
@@ -16797,17 +17865,22 @@ msgstr "Skriv inn brukarar og sett tilgjenge"
 
 #: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
-msgstr "Ny _delt mappe..."
+msgstr "Ny _delt mappe …"
 
 #: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Deling"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+#, fuzzy
+msgid "Custom Notification"
+msgstr "Justering"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Legg til   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Endra"
 
@@ -16862,7 +17935,7 @@ msgstr "Ikkje levert: "
 
 #: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
-msgstr "Spor meldingsstatus..."
+msgstr "Spor meldingsstatus …"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
@@ -16872,11 +17945,11 @@ msgstr "Eit tillegg for å setja opp Hula-kalenderkjelder."
 msgid "Hula Account Setup"
 msgstr "Hula-kontooppsett"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshovud"
 
@@ -16923,28 +17996,28 @@ msgstr ""
 msgid "IMAP Features"
 msgstr ""
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "_Importer til kalender"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "_Importer til oppgåver"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "Importer ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "Vel oppgåveliste"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "Vel kalender"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Importér"
 
@@ -16977,8 +18050,8 @@ msgid ""
 "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:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
@@ -16994,128 +18067,128 @@ msgstr "_Synkroniser med iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronisering"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Klarte ikkje å lasta kalenderen «%s»."
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein avtale i kalenderen «%s» kolliderer med dette møtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fann avtalen i kalenderen «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Klarte ikkje å finna nokon kalenderar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Fann ikkje møtet i nokon kalenderar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Fann ikkje oppgåva i nokon oppgåvelister"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Fann ikkje notatet i nokon notatlister"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter ein eksisterande versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Klarte ikkje å tolka element"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan ikkje senda oppføring til kalenderen «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som akseptert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatoren har fjerna delegaten %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
-msgstr "Sendte eit avlysingsvarsel til delegaten"
+msgstr "Sende eit avlysingsvarsel til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Klarte ikkje å senda avlysingsvarselet til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakarstatusen kan ikkje oppdaterast fordi han er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikkje oppdatere deltakar. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Deltakarstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Møteinformasjon sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Informasjon om oppgåve sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Kalenderen som er lagt ved er ikkje gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17123,15 +18196,15 @@ msgstr ""
 "Meldinga seier ho inneheld ein kalender, men kalenderen er ikkje ein gyldig "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringa i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17139,11 +18212,11 @@ msgstr ""
 "Meldinga inneheld ein kalender, men kalenderen inneheld ingen hendingar, "
 "oppgåver eller ledig/oppteken-informasjon."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Kalenderen som er lagt ved inneheld fleire oppføringar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17163,300 +18236,300 @@ msgstr "Dette notatet gjentek seg"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Slett meldinga etter handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Konfliktsøk"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vel kalendrar å søkje i etter møtekonfliktar"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "I dag, %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "I dag, %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "I dag, %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "I morgon"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "I morgon %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgon %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgon, %l.%M.%p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgon, %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B, %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B, %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B, %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y, %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y, %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e. %B %Y, %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e. %B %Y, %H.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> gjennom %s har publisert møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publisert møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> har delegert dette møtet til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> gjennom %s vil ha deg til å stille i møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> vil ha deg til å stille i møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> gjennom %s ber om å leggja til eit eksisterande møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ber om å leggja til eit eksisterande møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b> gjennom %s ber om å få den nyaste møteinformasjonen om:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen om:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> gjennom %s har sendt et svar om møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> har sendt et svar om møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> gjennom %s har avlyst dette møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> har avlyst dette møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> gjennom %s har foreslått desse endringane."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> har forespurt møteenrdingar:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> gjennom %s har forespurt møteendringar:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> har avslått møteendringane:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> gjennom %s har publisert oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> har publisert oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> ber om at %s er med på oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> gjennom %s har lagt deg til ei oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> har lagt deg til ei oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> gjennom %s ynskjer å leggja til ei eksisterande oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ynskjer å leggja til ei eksisterande oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17465,134 +18538,134 @@ msgstr ""
 "<b>%s</b> gjennom %s ber om å få den nyaste informasjonen om denne tildelte "
 "oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen om:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> gjennom %s har sendt tilbake eit svar til ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> har sendt tilbake eit svar til ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> gjennom %s har avlyst ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> har avlyst ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> gjennom %s har føreslått desse endringane i oppgåvetildelinga:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har føreslått desse endringane i oppgåvetildelinga:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> gjennom %s har avslått tilordna oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslått ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> gjennom %s har publisert dette notatet:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> har publisert dette notatet:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> gjennom %s ber om å leggja til i eit eksisterande notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ber om å leggja til i eit eksisterande notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> gjennom %s har kansellert dette delte notatet:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har kansellert dette delte notatet:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Opna kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Avslå"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Godta"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Avslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Tentativt alle"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Tentativt"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Godta alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Oppdater deltakarstatus"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Oppdater"
 
@@ -17693,8 +18766,11 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Lagar ei D-Bus-melding når nye meldingar kjem."
 
 #: ../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 ""
+#, fuzzy
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "Om ei lydfil skal spelast når det kjem nye meldingar."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17740,8 +18816,18 @@ msgstr ""
 msgid "Generate a _D-Bus message"
 msgstr ""
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Varsling om ny e-post"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Varsling om ny e-post"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17752,55 +18838,55 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i _varslingstrauet"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "B_linkande ikon i varslingstrauet"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding saman med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "S_pel lydfil når det kjem nye meldingar"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Vel ly_dfil"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Oppgje _filnamn:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Vel lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Sp_el"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
@@ -17881,7 +18967,7 @@ msgstr "E-post_liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "Vanlege kommandoar for e-postlister (tinga, sei opp tinging, ...)."
+msgstr "Vanlege kommandoar for e-postlister (tinga, sei opp tinging, …)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -17937,9 +19023,10 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Send _melding til liste?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18020,6 +19107,30 @@ msgstr "_Tinga liste"
 msgid "_Unsubscribe from List"
 msgstr "_Slutt å tinga lista"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Flyttar meldingar til mappa %s"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, 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 ""
+"Dette vil merka alle meldingar som lesne i den valde mappa og alle "
+"undermappene."
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "denne mappa og _undermapper"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Denne mappa"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Merk alle som lesne"
@@ -18062,7 +19173,7 @@ msgstr "Eit tillegg for Ã¥ handsama kva for nokre tillegg som er slÃ¥tt av og pÃ
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Hansamar for programtillegg"
 
@@ -18074,33 +19185,24 @@ msgstr "Slå av og på programtillegg"
 msgid "_Plugins"
 msgstr "_Programtillegg"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Forfattar(ar)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Skildring"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Oppsett"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Merk: Nokre endringar vil ikkje hende før programmet startes på nytt"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Oversyn"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Oppsett"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr ""
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Programtillegg"
 
@@ -18125,41 +19227,22 @@ msgstr "Reintekstmodus"
 msgid "Prefer plain-text"
 msgstr "Føretrekk rein tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Vis HTML når det finst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Føretrekk PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Vis berre PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Gjev eit val om å skriva ut frå redigeringa."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Skriv ut melding"
-
-#: ../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 "Førehands_framsyning av utskrift"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Skriv ut meldinga"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution-profilering"
@@ -18184,13 +19267,7 @@ msgstr "Stader"
 msgid "_Publish Calendar Information"
 msgstr "Publiser kalenderinformasjon"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Skriv passordet til «%s»"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Er du sikker på at du vil fjerna denne adressa?"
 
@@ -18278,15 +19355,80 @@ msgstr ""
 "iCal\n"
 "Ledig/oppteken"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Heimetelefon"
+
+#: ../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 "Mono"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (innebygd)"
 
-#: ../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:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin skrottillegg"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Klarte ikkje å laga lokalt e-postlager «%s»: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Feil på %s:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Handlinga er ikkje tilgjengeleg"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gjera SpamAssassin meir påliteleg, men tregare"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "Ta _med eksterne testar"
 
@@ -18312,28 +19454,27 @@ msgstr "Eit tillegg for å lagra alle vedlegg eller meldingsdelar på ein gong."
 
 #. 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:314
 msgid "Save attachments"
 msgstr "Lagra vedlegg"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments..."
-msgstr "Lagra vedlegg ..."
+msgstr "Lagra vedlegg …"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Lagra alle vedlegg"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Vel felles lagringsnamn"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../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:347
 msgid "Save"
 msgstr "Lagra"
 
@@ -18341,79 +19482,79 @@ msgstr "Lagra"
 #. * 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:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Skildringsliste"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Kategoriliste"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Merknadsliste"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Laga"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "prosent ferdig"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "Adresse"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Deltakarliste"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Endra"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Avanserte innstillingar for CSV-formatet"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Legg til eit hovud i starten"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Skiljeteikn:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Skiljeteikn:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Pakk inn verdiar med:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaskild verdiformat (.csv)"
 
@@ -18434,15 +19575,15 @@ msgstr "Lagra til _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:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Vel målfil"
 
@@ -18467,22 +19608,23 @@ msgid "Show _only this Task List"
 msgstr "Vis _berre denne oppgåvelista"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Eit tillegg som handsamar oppstartsrettleiaren."
+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 "Oppstartsvegvisar"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Assistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution oppsettassistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Velkomen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18494,29 +19636,29 @@ msgstr ""
 "\n"
 "Klikk på «Framover» for å gå vidare. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importerer filer"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil importere:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "Frå %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "Importerer data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Vent litt"
 
@@ -18537,6 +19679,34 @@ msgstr "Sorter meldingslista i trådar etter emne"
 msgid "F_all back to threading messages by subject"
 msgstr "Bruk e_mnefeltet til tråding når annan informasjon ikkje finst"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Liste med hint om ting som vedleggspåminnaren skal sjå etter i "
+"meldingskroppen."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "Jobbtittel:"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Send som delegat"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Lagra  som kladd"
+
+#: ../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."
 msgstr "Eit enkelt tillegg som brukar ytnef til å dekoda tnef-vedlegg."
@@ -18545,6 +19715,31 @@ msgstr "Eit enkelt tillegg som brukar ytnef til å dekoda tnef-vedlegg."
 msgid "TNEF Attachment decoder"
 msgstr "Dekoding av TNEF-vedlegg"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Eit tillegg for å setja opp Google-kalender."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Ingen kontaktar"
+
+#: ../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 "_Adresse:"
+
+#: ../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 "Evolution skal"
@@ -18562,16 +19757,17 @@ msgid "Evolution Test component"
 msgstr "Evolution testkomponent"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Skildring av dei noverande skrivarinnstillingane."
+msgid "Authenticate proxy server connections"
+msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "Oppsettversjon"
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Kjenn att lenkjer automatisk"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr ""
+msgid "Configuration version"
+msgstr "Oppsettversjon"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18590,58 +19786,120 @@ msgid "Default window width"
 msgstr "Standard breidde på vindauget"
 
 #: ../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 "Skriv inn passord"
+
+#: ../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 eller alias til komponenten som vert vist som standard ved oppstart."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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 "Sist oppgraderte versjon av oppsettet"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stiar til mapper som skal synkroniserast til disk for fråkopla "
 "bruk"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../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 "Oppsett"
+
+#: ../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 "Sidestolpen er synleg"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Om utviklarversjonsvindauget skal hoppast over"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Start i fråkopla modus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statuslinja er synleg"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../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 "Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Standardhøgde på hovudvindauget, i biletepunkt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Standardbreidde på hovudvindauget, i bildepunkt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Standard breidde på sidefeltet, i bildepunkt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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\")."
@@ -18649,60 +19907,103 @@ msgstr ""
 "Den sist oppgraderte oppsettsversjonen av Evolution, med stor/liten/"
 "oppsettnivå (t.d. «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../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 ""
-"Stil på vindaugeknappane. Kan vera «text», «icons»,«both» eller «toolbar». "
-"Når «toolbar» er valt vert stilen styrt av GNOME si verktøylinjeinnstilling."
+"Stil på vindaugeknappane. Kan vera «text», «icons»,«both» eller «toolbar». Når "
+"«toolbar» er valt vert stilen styrt av GNOME si verktøylinjeinnstilling."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 "Verktøylinja er synleg"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Sist oppgraderte versjon av oppsettet"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Om vindauget skal vera maksimert."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidestolpen skal vera synleg."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinja skal vera synleg."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinja skal vera synleg."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Om åtvaringsvindauget utviklarversjonane av Evolution skal droppast."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Om vindaugeknappane skal vera synlege."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Vindaugeknappstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Vindaugeknappane er synlege"
 
@@ -18718,11 +20019,11 @@ msgstr "Aktive tilkoplingar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å late att desse tilknytningane og for å kople av"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Vel importerar som skal køyrast:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\n"
@@ -18736,11 +20037,11 @@ msgstr ""
 "Du kan velja «Automatisk» dersom du ikkje veit. Då vil Evolution prøva å "
 "finna ut kva slags fil det er sjølv."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Vel målet for denne importen"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18752,78 +20053,58 @@ msgstr ""
 "som kan importerast vart ikkje funne. Klikk på «Tilbake»-knappen\n"
 "dersom du vil prøva igjen.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "F_ilnamn:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Importér data _og innstillingar frå eldre program"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Importer ei ein_skild fil"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Brukarval i Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Ingen mappenamn spesifisert."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Mappenamn kan ikkje innehalda linjeskift."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Mappenamn kan ikkje innehalda teiknet «/»."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Mappenamn kan ikkje innehalda teiknet «#»."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "«.» og «..» er resverte mappenamn."
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 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 "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil ved køyring av %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy er ikkje installert."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kan ikkje køyrast."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Åsmund Skjæveland <aasmunds@fys.uio.no> 2003-2006\n"
@@ -18832,65 +20113,71 @@ msgstr ""
 "\n"
 "Send feilmeldingar og kommentarar til <i18n-nn@lister.ping.uio.no>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution-nettstad"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr "Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution held på å kopla frå."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr "Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Byt til %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Ukjend systemfeil."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KiB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Ugyldige argument"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Kan ikkje registrera i OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
@@ -18900,15 +20187,11 @@ msgstr "Oppsettsdatabasen ikkje funnen"
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Ny 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 "Lag eit nytt testelement"
 
@@ -18951,7 +20234,7 @@ msgstr ""
 "med å importera filer frå andre program til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18988,7 +20271,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18996,63 +20279,43 @@ msgstr ""
 "Takk frå\n"
 "Evolution-laget\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: ../shell/main.c:309
-msgid "Evolution Crash Detection"
-msgstr ""
-
-#: ../shell/main.c:311
-msgid "Ig_nore"
-msgstr "Ig_norer"
-
-#: ../shell/main.c:326
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-
-#: ../shell/main.c:337
-msgid "_Do not show this message again"
-msgstr "Ikkje vis _denne meldinga att"
-
-#: ../shell/main.c:569
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution, og start opp den oppgjevne delen"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tving ny migrering frå Evolution 1.4"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Kopla frå lasting av tillegg."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:617
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "Evolution personleg informasjonshandsamar og e-postkomponent"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19124,9 +20387,9 @@ msgid ""
 msgstr ""
 "Den førre versjonen av Evolution lagra data ein annan stad.\n"
 "\n"
-"Dersom du vel å fjerna gamle data, vil alt som ligg i mappa «evolution» "
-"verta fjerna for godt. Dersom du vel å ta vare på dette, kan du fjerna "
-"innhaldet i katalogen «evolution» når du sjølv har lyst.\n"
+"Dersom du vel å fjerna gamle data, vil alt som ligg i mappa «evolution» verta "
+"fjerna for godt. Dersom du vel å ta vare på dette, kan du fjerna innhaldet i "
+"katalogen «evolution» når du sjølv har lyst.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19194,7 +20457,7 @@ msgstr ""
 "Dersom du vel å halda fram, kan det henda at du ikkje vil få tilgang til "
 "somme gamla data.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19205,7 +20468,7 @@ msgstr ""
 "\n"
 "Rediger tillitsinnstillingar:"
 
-#: ../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 "
@@ -19215,7 +20478,7 @@ msgstr ""
 "så stolar du automatisk på at dette sertifikatet er autentisk med mindre du "
 "seier noko anna her"
 
-#: ../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 "
@@ -19229,7 +20492,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:380
 #: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
-msgstr "Vel eit sertifikat å importera..."
+msgstr "Vel eit sertifikat å importera …"
 
 #: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
@@ -19273,11 +20536,16 @@ msgstr "E-postadresse"
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfilene"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatframvisar: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Skriv passordet til «%s»"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19288,7 +20556,7 @@ msgid "Enter new password"
 msgstr "Skriv nytt passord"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19297,7 +20565,7 @@ msgstr ""
 "Utferda til:\n"
 "  Entitet: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19306,7 +20574,7 @@ msgstr ""
 "Utferda av:\n"
 "  Entitet: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Vel sertifikat"
 
@@ -19491,7 +20759,7 @@ msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til sertifiseringsinstans"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Sertifikatet finst frå før"
 
@@ -19693,21 +20961,20 @@ msgstr "Endra eigenskapane til den valde mappa"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "Kopiér alle kontaktane til ..."
+msgstr "Kopiér alle kontaktane til …"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "F_ørehandsframsyning av kontakt"
 
-#: ../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 "Kopier"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Kopier valde kontaktar til ei anna mappe ..."
+msgstr "Kopier valde kontaktar til ei anna mappe …"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -19719,14 +20986,13 @@ msgstr "Kopier utval"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr "Kopier til mappe ..."
+msgstr "Kopier til mappe …"
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
 msgstr "Lag ei ny adressebokmappe"
 
-#: ../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 "Klipp ut"
@@ -19753,11 +21019,11 @@ msgstr "Vidaresend kontakt"
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "Fl_ytt alle kontaktane til ..."
+msgstr "Fl_ytt alle kontaktane til …"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Flytt valde kontaktar til ei anna mappe..."
+msgstr "Flytt valde kontaktar til ei anna mappe …"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -19765,10 +21031,9 @@ msgstr "Flytt kontaktane i den valde mappa til ei anna mappe"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
-msgstr "Flytt til mappe ..."
+msgstr "Flytt til mappe …"
 
-#: ../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 "Lim inn"
@@ -19795,7 +21060,7 @@ msgstr "L_agra adresseboka som VCard"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
-msgstr "Lagra som VCard ..."
+msgstr "Lagra som VCard …"
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
@@ -19805,13 +21070,11 @@ msgstr "Lagra dei valde kontaktane som eit VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Lagra kontaktane i den valde mappa som eit VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Vel alle"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vel _alt"
 
@@ -19858,11 +21121,11 @@ msgstr "H_andlingar"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "_Kopiér kontakt til ..."
+msgstr "_Kopiér kontakt til …"
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
-msgstr "_Kopier mappekontaktar til..."
+msgstr "_Kopier mappekontaktar til …"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
@@ -19870,17 +21133,17 @@ msgstr "_Slett kontakt"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
-msgstr "_Vidaresend kontakt ..."
+msgstr "_Vidaresend kontakt …"
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "_Flytt kontakt til ..."
+msgstr "_Flytt kontakt til …"
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
 msgstr "_Flytt mappekontaktar til"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Ny"
 
@@ -19890,7 +21153,7 @@ msgstr "_Gje nytt namn"
 
 #: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
-msgstr "Lagra kontakt _som VCard ..."
+msgstr "Lagra kontakt _som VCard …"
 
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
@@ -19898,7 +21161,7 @@ msgstr "Lagra mappekontaktane _som VCard"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
-msgstr "_Send melding til kontakt ..."
+msgstr "_Send melding til kontakt …"
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -19941,7 +21204,7 @@ msgid "Month"
 msgstr "MÃ¥nad"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Neste"
 
@@ -19950,7 +21213,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Førehandsvisar kalenderen som skal skrivast ut"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Førre"
 
@@ -20018,232 +21281,6 @@ msgstr "Arbeidsveke"
 msgid "_Open Appointment"
 msgstr "_Opna avtale"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopier den merka teksten til utklippstavla"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Kopiér den merka teksten til utklippstavla"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Klipp ut merka tekst og legg på utklippstavla"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Klipp ut merka tekst og legg på utklippstavla"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Lim inn frå utklippstavla"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Lim inn tekst frå utklippstavla"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Merk all tekst"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Legg ved"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Klikk her for å leggja ved ei fil"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klikk her for å lukka dette vindauget"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klikk her for å lagra dette vindauget"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Klikk her for å sjå den tilgjengelege hjelpeteksten"
-
-#.
-#. <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 "Lukk"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Set _inn"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Vedlegg ..."
-
-#: ../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 "L_ukk"
-
-#: ../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:42
-msgid "_File"
-msgstr "_Fil"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Val"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Varer heile dagen"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Varer heile _dagen"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Klassifiser som konfidensiell"
-
-#: ../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 "Klassifiser som privat"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Klassifiser som offentleg"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klikk her for å setja eller fjerna alarmar på denne hendinga"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Sett inn avanserte sendingsval"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Gjer denne hendinga gjentakande"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Off_entleg"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Spør etter ledig/oppteken-informasjon for deltakarane"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_ollefelt"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Sendings_val"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Vis tida som _oppteken"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Tids_sone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Avgjer om deltakartypefeltet vert vist"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Avgjer om be-om-svar-feltet vert vist"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Avgjer om rollefeltet vert vist"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Avgjer om statusfeltet vert vist"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Avgjer om tidssonen vert vist"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Avgjer om kategoriar vert viste"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Avgjer om denne hendinga varer heile dagen"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Avgjer om tida skal visast som oppteken"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmar"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategoriar"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Klassifisering"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Ledig/Oppteken"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_SU"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Repetering"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Statusfelt"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Typefelt"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt den aktive e-post-operasjonen"
@@ -20273,7 +21310,6 @@ msgid "Empty _Trash"
 msgstr "Tøm _papirkorga"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "M_apper"
 
@@ -20320,7 +21356,7 @@ msgstr "_Klassisk utsjånad"
 
 #: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
-msgstr "_Kopier mappe til..."
+msgstr "_Kopier mappe til …"
 
 #: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
@@ -20336,11 +21372,11 @@ msgstr "_Meldingsfilter"
 
 #: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
-msgstr "_Flytt mappe til..."
+msgstr "_Flytt mappe til …"
 
 #: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
-msgstr "_Ny..."
+msgstr "_Ny …"
 
 #: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
@@ -20432,7 +21468,7 @@ msgstr "Fjern denne mappa for godt"
 
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
-msgstr "Opp_dater ..."
+msgstr "Opp_dater …"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
@@ -20490,7 +21526,7 @@ msgstr "Tråda meldingsliste"
 msgid "_Group By Threads"
 msgstr "_Grupper etter trådar"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_Melding"
@@ -20618,23 +21654,23 @@ msgstr "Vis den førre uleste meldinga"
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
-msgstr "_Vidaresend som ..."
+msgstr "_Vidaresend som …"
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "Filtrer på e-post-_liste ..."
+msgstr "Filtrer på e-post-_liste …"
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
-msgstr "Filtrer på avse_ndar ..."
+msgstr "Filtrer på avse_ndar …"
 
 #: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
-msgstr "Filtrer på _mottakarar ..."
+msgstr "Filtrer på _mottakarar …"
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
-msgstr "Filtrer på _emne ..."
+msgstr "Filtrer på _emne …"
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
@@ -20646,7 +21682,7 @@ msgstr "Valde meldingar skal følgjast opp"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
-msgstr "Følg _opp ..."
+msgstr "Følg _opp …"
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -20790,19 +21826,19 @@ msgstr "Lagra dei valde meldingane som tekstfil"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "Søkjemappe frå e-postliste..."
+msgstr "Søkjemappe frå e-postliste …"
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipien_ts..."
-msgstr "Søkjemappe frå _mottakarar ..."
+msgstr "Søkjemappe frå _mottakarar …"
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
-msgstr "Søkjemappe frå _emne..."
+msgstr "Søkjemappe frå _emne …"
 
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "Søkjemappe frå _avsendar..."
+msgstr "Søkjemappe frå _avsendar …"
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
@@ -20825,129 +21861,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis ein blinkande markør i kroppen på dei viste meldingane"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Vis meldingane på normal måte"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Vis meldingane med alle meldingshovuda"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Vis den rå kjeldekoda til meldinga"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Gjenopprett dei valde meldingane"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_Uviktig"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "Vedl_agt"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Markørmodus"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Fjern merke"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Sletta melding"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
-msgstr "_Finn i melding..."
+msgstr "_Finn i melding …"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_Merk som ferdig"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_GÃ¥ til"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Viktig"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Innvevd"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Skrot"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Last bilete"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Meldingskjeldekode"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Vanleg storleik"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Ikkje skrot"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Opna i nytt vindauge"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Førre melding"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Sitert"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Les"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "_Lagra melding..."
+msgstr "_Lagra melding …"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Ulesen"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Zoom _inn"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Lukk vindauge"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Lukk"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -20985,290 +22017,6 @@ msgstr "Vis valt notat"
 msgid "_Open Memo"
 msgstr "_Opna notat"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Legg ved fil"
-
-#.
-#. <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 "Lukk aktiv fil"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Slett alt utanom signatur"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Kryptér denne meldinga med PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Kryptér denne meldinga med ditt S/MIME-krypteringssertifikat"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "Form_at"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Få leveringskvittering når meldinga vert lesen"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Sett inn sendingsval"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Opna ei fil"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP-kryptér"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP-signér"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP-krypt_er"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP-_signer"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "Sp_ør etter kvitteringar for lesne meldingar"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME-kr_ypter"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME-kryptér"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME-sig_ner"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME-signér"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "S_end"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Lagra som"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Lagra kladd"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "L_agra som ..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Lagra _kladd"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Lagra  som kladd"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Lagra i mappe ..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Lagra aktiv fil"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Lagra fila med eit anna namn"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Lagra meldinga i spesifisert mappe"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Send"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Send meldinga i HTML-format"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Send meldinga"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Sett meldingsprioriteten høg"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Signer denne meldinga med din PGP-nøkkel"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Signér denne meldinga med S/MIME-signatursertifikatet ditt"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Avgjer om BCC-feltet vert vist"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Avgjer om CC-feltet vert vist"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Avgjer om Frå-veljaren vert vist"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Avgjer om Post-til-feltet vert vist"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Avgjer om Svar-til-feltet vert vist"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Avgjer om To-feltet vert vist"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Bcc-felt"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Cc-felt"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "S_lett alle"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "_Frå-felt"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Opna ..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "_Post-til-felt"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Prioriter melding"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "_Svar-til-felt"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Tryggleik"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Sendingsval"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "_Til-felt"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Lukk"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Lagra og lukk"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Lagra og _lukk"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Lagra aktiv fil og lukk vindauget"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Legg til mappe til liste over abonnerte mapper"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Frisk opp liste"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Frisk opp liste over mapper"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappa frå lista over abonnerte mapper"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Abonnér"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Stopp abonnement"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Omvend valet"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Klikk endra / vis statusdetaljane for oppgåva"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Statusdetaljar"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Tidssone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Statusdetaljar"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopier valde oppgåver"
@@ -21323,7 +22071,7 @@ msgstr "_Opna oppgåve"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
-msgstr "Om Evolution ..."
+msgstr "Om Evolution …"
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -21372,7 +22120,7 @@ msgstr "Gøym vindaugeknappar"
 
 #: ../ui/evolution.xml.h:14
 msgid "I_mport..."
-msgstr "_Importér ..."
+msgstr "_Importér …"
 
 #: ../ui/evolution.xml.h:15
 msgid "Icons _and Text"
@@ -21396,7 +22144,7 @@ msgstr ""
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
-msgstr "Side_oppsett ..."
+msgstr "Side_oppsett …"
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -21464,53 +22212,58 @@ msgid "View/Hide the Status Bar"
 msgstr "Vis/gøym statuslinja"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "Arbeid fråkopla"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Om"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Lukk vindauge"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Gløym passord"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr ""
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Hide Buttons"
 msgstr "_Høym knappar"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Icons Only"
 msgstr "Berre _ikon"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Snøggreferanse"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Ut_sjånad på vekslar"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr "_Synkroniseringsinnstillingar..."
+msgstr "_Synkroniseringsinnstillingar …"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Text Only"
 msgstr "_Rein tekst"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Vindauge"
 
@@ -21587,11 +22340,11 @@ msgid "With _Status"
 msgstr "Med _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21608,8 +22361,8 @@ msgid "Select a Time Zone"
 msgstr "Vel ei tidssone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Tidssoneveljar"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21621,19 +22374,19 @@ msgstr ""
 "tidssone.\n"
 "Bruk høgre museknapp for å forminska."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Samling"
 
-#: ../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 "Definer framsyningar for %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 "Definer framsyningar"
 
@@ -21643,17 +22396,17 @@ msgid "Define Views for \"%s\""
 msgstr "Definer framsyningar for «%s»"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instans"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Lagra aktiv framsyning"
 
@@ -21678,7 +22431,7 @@ msgstr "Lagra sjølvvalt framsyning"
 #: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
-msgstr "Definer framsyningar ..."
+msgstr "Definer framsyningar …"
 
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "C_urrent View"
@@ -21695,7 +22448,7 @@ msgstr ""
 
 #: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
-msgstr "Lagra tilpassa framsyning ..."
+msgstr "Lagra tilpassa framsyning …"
 
 #: ../widgets/menus/gal-view-menus.c:369
 #, fuzzy
@@ -21707,11 +22460,11 @@ msgstr "Lagra aktiv framsyning"
 msgid "Create or edit views"
 msgstr "_Lag ei ny framsyning"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrikk"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definer ny framsyning"
 
@@ -21727,17 +22480,17 @@ msgstr "Type framsyning"
 msgid "Type of view:"
 msgstr "Type framsyning:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Vedleggslinje"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../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 ikkje leggja ved fila «%s»: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../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 ikkje leggja ved fila «%s»: Ikkje ei vanleg fil"
@@ -21759,33 +22512,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk framsyning av vedlegget"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 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:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Fyllfarge"
 
 #: ../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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 msgid "GDK fill color"
 msgstr "GDK-fyllfarge"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Fyllstipling"
 
@@ -21810,29 +22562,29 @@ 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:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Minste breidd"
 
 #: ../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:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Minste breidde"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "No"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tida må vera på format: %s"
@@ -21841,155 +22593,154 @@ msgstr "Tida må vera på format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må vera mellom 0 og 100, inklusive"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 #, fuzzy
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Sentraleuropeisk"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Vesteuropeisk"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Vesteuropeisk, ny"
 
-#: ../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:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: ../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:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Forenkla"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjend teiknsett: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Teiknkoding"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Oppgi teiknsett"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
-msgstr "Andre ..."
+msgstr "Andre …"
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "_Teiknkoding"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Tekstfelt til å skriva dato i"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å visa ein kalender"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks til å velja tid med"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_No"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_I dag"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 #, fuzzy
 msgid "Invalid Date Value"
 msgstr "Ugyldig signatur"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 #, fuzzy
 msgid "Invalid Time Value"
 msgstr "Ugyldig signatur"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Utvida"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Om utvidaren er utvida eller ikkje"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Tekst på merkelappen til utvidaren"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Bruk understreking"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -21997,37 +22748,37 @@ msgstr ""
 "Dersom denne er satt, skal ei understreking i teksten visa at det neste "
 "teiknet skal brukast som snøggtast"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Ekstra mellomrom å setja mellom barnet og merkelappen"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Merkelapp-skjermelement"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Eit skjermelement å visa i staden for den vanlege utvidarmerkelappen"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Storleik på utvidar"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Storleiken på utvidarpil"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Mellomrom rundt indikator"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Plass rundt utvidarpila"
 
 #. 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:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -22046,15 +22797,15 @@ msgstr "Søk"
 
 #: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
-msgstr "_Lagra søk ..."
+msgstr "_Lagra søk …"
 
 #: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
-msgstr "Redigér lagra søk ..."
+msgstr "Redigér lagra søk …"
 
 #: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
-msgstr "_Avansert søk..."
+msgstr "_Avansert søk …"
 
 #: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
@@ -22072,22 +22823,32 @@ msgstr "Denne mappa"
 msgid "Current Message"
 msgstr "Denne meldinga"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Vel bilete"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Verdskart"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
 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 ""
 "Musstyrt interaktivt kartelement til å velja tidssone med. Tastaturbrukarar "
 "bør velja tidssone frå kombinasjonsboksen under i staden."
 
+#: ../widgets/misc/e-online-button.c:109
+#, fuzzy
+msgid "Online"
+msgstr "Innvevd"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkroniser med:"
@@ -22112,63 +22873,63 @@ msgstr "Omflytmodell"
 msgid "Column width"
 msgstr "Kolonnebreidd"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 #, fuzzy
 msgid "Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 #, fuzzy
 msgid "Click here to change the search type"
 msgstr "Klikk her for å leggja ved ei fil"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Element-ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Tekst"
 
 #. 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "_Vis: "
 
 #. 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " i "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Markørrad"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Markørkolonne"
@@ -22185,7 +22946,7 @@ msgstr "Merkingsmodus"
 msgid "Cursor Mode"
 msgstr "Markørmodus"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "NÃ¥r sletta:"
 
@@ -22209,10 +22970,6 @@ msgstr "<b>Statussporing</b>"
 msgid "A_uto-delete sent item"
 msgstr "Slett sendt element automatisk"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klassifisering"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Lag eit sendt element for å spora informasjon"
@@ -22293,50 +23050,51 @@ msgstr "_Etter:"
 msgid "_All information"
 msgstr "_All informasjon"
 
-#: ../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 "_Utsett meldingslevering"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Levert"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Sett dato den går ut"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Inntil:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "_NÃ¥r det passar"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "NÃ¥r _opna:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:255
 #, c-format
 msgid "%s (...)"
-msgstr "%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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% ferdig)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "klikk her for å gå til adresse"
 
 #: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
-msgstr "Rediger hovudkategoriliste ..."
+msgstr "Rediger hovudkategoriliste …"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
@@ -22370,23 +23128,23 @@ msgstr "Fokusert kolonne"
 msgid "Unselected Column"
 msgstr "Ikkje valt kolonne"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Gjennomstreka kolonne"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Understreka kolonne"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Feit kolonne"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Fargekolonne"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Bakgrunnsfargekolonne"
 
@@ -22424,7 +23182,7 @@ msgid "A_vailable Fields:"
 msgstr "_Tilgjengelege felt"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Stigande"
 
@@ -22438,7 +23196,7 @@ msgid "Clear _All"
 msgstr "Fjern alt"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Synkande"
 
@@ -22483,11 +23241,11 @@ msgstr "Deretter etter"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
-msgstr "_Felt som vert viste ..."
+msgstr "_Felt som vert viste …"
 
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
-msgstr "_Grupper etter..."
+msgstr "_Grupper etter …"
 
 #: ../widgets/table/e-table-config.glade.h:22
 #, fuzzy
@@ -22500,25 +23258,25 @@ msgstr "_Vis desse felta i rekkefølgje:"
 
 #: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
-msgstr "_Sortér..."
+msgstr "_Sortér …"
 
 #: ../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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Dra-og-slepp-kode"
 
 #: ../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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Fullt hovud"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
-msgstr "Legg til kolonne ..."
+msgstr "Legg til kolonne …"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -22546,304 +23304,304 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d element)"
 msgstr[1] "%s (%d element)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "Vekslande radfargar"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "Vassrett teiknerutenett"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "Loddrett teiknerutenett"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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
 msgid "Draw focus"
 msgstr "Teiknefokus"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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
 msgid "Cursor mode"
 msgstr "Markørmodus"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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
 msgid "Selection model"
 msgstr "Veljemodell"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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
 msgid "Length Threshold"
 msgstr "Lengdeterskel"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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
 msgid "Uniform row height"
 msgstr "Jamn radhøgde"
 
-#: ../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: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"
 msgstr "Frosen"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 #, fuzzy
 msgid "Sort _Ascending"
 msgstr "Sorter stigande"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 #, fuzzy
 msgid "Sort _Descending"
 msgstr "Sorter synkande"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 #, fuzzy
 msgid "_Unsort"
 msgstr "Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 #, fuzzy
 msgid "Group By This _Field"
 msgstr "Grupper etter dette feltet"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 #, fuzzy
 msgid "Group By _Box"
 msgstr "Grupper etter boks"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 #, fuzzy
 msgid "Remove This _Column"
 msgstr "Fjern denne kolonna"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 #, fuzzy
 msgid "Add a C_olumn..."
-msgstr "Legg til kolonne ..."
+msgstr "Legg til kolonne …"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 #, fuzzy
 msgid "A_lignment"
 msgstr "Justering"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 #, fuzzy
 msgid "B_est Fit"
 msgstr "Beste tilpassing"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 #, fuzzy
 msgid "Format Column_s..."
-msgstr "Formater kolonner ..."
+msgstr "Formater kolonner …"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 #, fuzzy
 msgid "Custo_mize Current View..."
-msgstr "Tilpass gjeldande visning ..."
+msgstr "Tilpass gjeldande visning …"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 #, fuzzy
 msgid "_Sort By"
 msgstr "Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 #, fuzzy
 msgid "_Custom"
 msgstr "Tilpassa"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 #, fuzzy
 msgid "Font Description"
 msgstr "Hendingsskildring"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Sorteringsinfo"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Tre"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabelloverskrift"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Tabellmodell"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Markørrad"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Alltid søk"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Bruk klikk for å leggja til"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree tabelltilpassar"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retro-utsjånad"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Teikn linjer og «+»- og «-»-utvidarar."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Inndatametodar"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Hendingsprosessor"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Feit"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Gjennomstreka"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Justering"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Breidde på utklipp"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Høgde på utklipp"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Utklipp"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Fylt utklippsrektangel"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X-forskyving"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y-forskyving"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Tekstbreidde"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Teksthøgde"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Bruk ellipse"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Ellipse"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Bryteteikn"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Største tal på linjer"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Teikn rammer"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Tillat linjeskift"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Teikn bakgrunn"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Teikn knapp"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Markørplassering"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Inndatametode-kontekst"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Oppsprett med handtak"
 
diff --git a/po/pa.po b/po/pa.po
index 77cd8429e0..76f2162921 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -16,36 +16,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-23 20:44+0000\n"
-"PO-Revision-Date: 2008-03-03 21:46+0530\n"
-"Last-Translator: Amanpreet Singh Alam <apreet.alam@gmail.com>\n"
+"POT-Creation-Date: 2008-08-22 14:14+0000\n"
+"PO-Revision-Date: 2008-08-26 07:49+0530\n"
+"Last-Translator: Amanpreet Singh Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@list.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: LoKalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"\n"
-"\n"
-"\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "ਈਵੇਲੂਸ਼ਨ �ਡਰੈੱਸ-ਬ�ੱਕ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -53,7 +50,6 @@ msgstr[0] "ਮੌਜੂਦਾ �ਡਰੈੱਸ-ਬ�ੱਕ ਫੋਲਡਰ %s
 msgstr[1] "ਮੌਜੂਦਾ �ਡਰੈੱਸ-ਬ�ੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "ਖੋਲ�ਹੋ"
 
@@ -125,7 +121,8 @@ msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਸੀਮਾ ਵੇਖਣ ਅਤੇ ਚà
 
 #. 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:151
+#: ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -134,7 +131,8 @@ msgstr[1] "ਇਸ ਵਿੱਚ %d ਘਟਨਾਵਾਂ ਹਨ।"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "ਇਸ ਵਿੱਚ ਕੋਈ ਘਟਨਾ ਨਹੀਂ ਹੈ।"
 
@@ -163,7 +161,7 @@ msgid "calendar view for one or more days"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -174,20 +172,19 @@ 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:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2158
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../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
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -195,10 +192,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -208,17 +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:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2174
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../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
 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
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ"
 
@@ -330,40 +326,34 @@ msgstr "ਕੈਲੰਡਰ: %s ਤੋਂ %s ਤੱਕ"
 msgid "evolution calendar item"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਇਕਾਈ"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "ਕੰਬੋ ਬਟਨ"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "ਡਿਫਾਲਟ �ਕਟੀਵੇਟ"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "ਪੋਪਅੱਪ ਮੇਨੂ"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "ਅਟੈਚਮਿੰਟ ਬਾਰ ਬਦਲੋ"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "�ਕਟੀਵੇਟ"
 
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr "'{0}' ਕੇਵਲ ਪੜ�ਹਨ ਲਈ �ਡਰੈੱਸ ਬ�ੱਕ ਸਰੋਤ ਹੈ। ਸੰਪਰਕ �ਲਕ ਲਈ ਸਵਿੱਚ ਕਰਕੇ ਇੱਕ �ਡਰੈੱਸ ਬ�ੱਕ ਹਾਈਲਾਈਟ ਕਰੋ,    ਜੋ ਕਿ ਸੰਪਰਕ ਮਨਜ਼ੂਰ ਕਰ ਸਕੇ।"
+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}' ਕੇਵਲ ਪੜ�ਹਨ ਲਈ �ਡਰੈੱਸ ਬ�ੱਕ ਸਰੋਤ ਹੈ ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਸੰਪਰਕ �ਲਕ ਵਿੱਚ ਬਾਹੀ ਰਾਹੀਂ ਹੋਰ �ਡਰੈੱਸ-ਬ�ੱਕ ਚ�ਣੋ ਜੀ।"
 
 #: ../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 ""
-"ਇਸ �ਡਰੈੱਸ ਨਾਲ ਇੱਕ ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤ�ਸੀਂ ਇਸੇ �ਡਰੈੱਸ ਨਾਲ ਨਵਾਂ ਕਾਰਡ ਕਿਸੇ ਤਰਾਂ ਵੀ "
-"ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "ਇਸ �ਡਰੈੱਸ ਨਾਲ ਇੱਕ ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤ�ਸੀਂ ਇਸੇ �ਡਰੈੱਸ ਨਾਲ ਨਵਾਂ ਕਾਰਡ ਕਿਸੇ ਤਰਾਂ ਵੀ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -382,13 +372,8 @@ msgid "Category editor not available."
 msgstr "ਕੈਟਾਗਰੀ �ਡੀਟਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
 #: ../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 ""
-"ਜਾਂਚ ਕਰੋ ਤ�ਹਾਡਾ ਪਾਸਵਰਡ ਠੀਕ ਤਰਾਂ ਲਿਖਿਆ ਗਿਆ ਹੈ ਅਤੇ ਤ�ਸੀਂ ਲਾਗਆਨ ਲਈ ਸਹਾਇਕ ਢੰਗ ਚ�ਣਿਆ ਹੈ, ਯਾਦ "
-"ਰੱਖੋ ਕਿ ਅਕਸਰ ਪਾਸਵਰਡ ਅੱਖਰ ਆਕਾਰ ਤੇ ਅਧਾਰਿਤ ਹ�ੰਦੇ ਹਨ;ਤ�ਹਾਡਾ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ।"
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "ਜਾਂਚ ਕਰੋ ਤ�ਹਾਡਾ ਪਾਸਵਰਡ ਠੀਕ ਤਰਾਂ ਲਿਖਿਆ ਗਿਆ ਹੈ ਅਤੇ ਤ�ਸੀਂ ਲਾਗਆਨ ਲਈ ਸਹਾਇਕ ਢੰਗ ਚ�ਣਿਆ ਹੈ, ਯਾਦ ਰੱਖੋ ਕਿ ਅਕਸਰ ਪਾਸਵਰਡ ਅੱਖਰ ਆਕਾਰ ਤੇ ਅਧਾਰਿਤ ਹ�ੰਦੇ ਹਨ;ਤ�ਹਾਡਾ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -399,14 +384,9 @@ msgid "Could not remove addressbook."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਹਟਾਉਣ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../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 ""
-"ਇਸ ਸਮੇਂ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰ�ੱਪਵਾਇਜ਼ ਸਿਸਟਮ �ਡਰੈੱਸ-ਬ�ੱਕ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ "
-"ਕੋਈ ਹੋਰ ਗਰ�ੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤ�ਸੀਂ ਗਰ�ੱਪਵਾਇਜ਼ ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ ਅਤੇ "
-"ਗਰ�ੱਪਵਾਇਜ਼ ਨਿੱਜੀ ਸੰਪਰਕ ਫੋਲਡਰ ਪ�ਰਾਪਤ ਕਰ ਸਕੋ।"
+#, fuzzy
+msgid "Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr "ਇਸ ਸਮੇਂ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰ�ੱਪਵਾਇਜ਼ ਸਿਸਟਮ �ਡਰੈੱਸ-ਬ�ੱਕ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਹੋਰ ਗਰ�ੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤ�ਸੀਂ ਗਰ�ੱਪਵਾਇਜ਼ ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ ਅਤੇ ਗਰ�ੱਪਵਾਇਜ਼ ਨਿੱਜੀ ਸੰਪਰਕ ਫੋਲਡਰ ਪ�ਰਾਪਤ ਕਰ ਸਕੋ।"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -426,7 +406,7 @@ msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹੋਣ ਵਿੱ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
@@ -439,101 +419,85 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ਸਰਵਰ ਤੋਂ ਸਕੀਮਾ ਜਾਣਾਕਾਰੀ ਪ�ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।"
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "ਸਰਵਰ ਵਰਜਨ"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "ਤ�ਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕ�� ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਨ"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ਈਵੇਲੂਸ਼ਨ �ਡਰੈੱਸ-ਬ�ੱਕ ਗਲਤ ਢੰਗ ਨਾਲ ਬੰਦ ਹੋ ਗਈ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../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:24
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"ਇਹ LDAP ਸਰਵਰ LDAP ਦਾ ਪ�ਰਾਣਾ ਵਰਜਨ ਵਰਤ ਰਿਹਾ ਹੈ, ਜੋ ਕਿ ਇਹ ਕਾਰਵਾਈ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ "
-"ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ, ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਮੱਦਦ ਲਈ ਸੰਪਰਕ ਕਰੋ।"
+#: ../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 "ਇਹ LDAP ਸਰਵਰ LDAP ਦਾ ਪ�ਰਾਣਾ ਵਰਜਨ ਵਰਤ ਰਿਹਾ ਹੈ, ਜੋ ਕਿ ਇਹ ਕਾਰਵਾਈ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ, ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਮੱਦਦ ਲਈ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "ਇਸ �ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "ਇਸ �ਡਰੈੱਸ-ਬ�ੱਕ ਸਰਵਰ ਲਈ ਕੋਈ ਖੋਜ ਅਧਾਰ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:28
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਸਰਵਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ ਜਾਂ ਸਰਵਰ ਨਾਂ ਗਲਤ ਹੈ ਜਾਂ ਤ�ਹਾਡਾ ਨੈੱਟਵਰਕ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ਇਹ ਸਰਵਰ LDAPv3 ਸਕੀਮਾ ਜਾਣਕਾਰੀ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
 #  addressbook:load-error title
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "ਖੋਜ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} ਸੰਭਾਲਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹ�ੰਦੇ ਹੋ?"
 
+#: ../addressbook/addressbook.error.xml.h:33
+msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "ਤ�ਸੀਂ ਆਪਣੇ ਇੱਕ ਸੰਪਰਕ ਨੂੰ ਇੱਕ ਕਿਤਾਬ ਤੋਂ ਦੂਜੀ ਵਿੱਚ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਪਰ ਇਹ ਸੰਭਵ ਨਹੀਂ ਹੈ, ਕੀ ਤ�ਸੀਂ ਇਸ ਦੀ ਬਜਾ� ਇਸ ਦੀ ਨਕਲ ਭੇਜਣਾ ਚਾਹੋਗੇ?"
+
 #: ../addressbook/addressbook.error.xml.h:34
-msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"ਤ�ਸੀਂ ਆਪਣੇ ਇੱਕ ਸੰਪਰਕ ਨੂੰ ਇੱਕ ਕਿਤਾਬ ਤੋਂ ਦੂਜੀ ਵਿੱਚ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਪਰ ਇਹ ਸੰਭਵ ਨਹੀਂ ਹੈ, "
-"ਕੀ ਤ�ਸੀਂ ਇਸ ਦੀ ਬਜਾ� ਇਸ ਦੀ ਨਕਲ ਭੇਜਣਾ ਚਾਹੋਗੇ?"
+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:35
-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 ""
-"ਤ�ਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰ�ੱਪਵਾਈਜ ਸਰਵਰ ਨਾਲ ਜ�ੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ "
-"ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
+#, fuzzy
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤ�ਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "ਤ�ਸੀਂ ਆਪਣੇ ਸੰਪਰਕ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ, ਕੀ ਤ�ਸੀਂ ਇਹਨਾਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੋਗੇ?"
 
 #: ../addressbook/addressbook.error.xml.h:37
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡੇ ਸੰਪਰਕ {0} ਲਈ ਉਦੋਂ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਮ�ੜ ਚਾਲੂ ਨਹੀਂ ਹ�ੰਦਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -570,7 +534,8 @@ msgstr "ਇਹ ਇੰ� ਹੀ ਵਰਤੋਂ(_U)"
 #  mail:filter-load-error secondary
 #. 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:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -579,17 +544,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "ਡਿਫਾਲਟ ਸਮਕਾਲੀ �ਡਰੈੱਸ:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "ਪਾਇਲਟ ਦਾ �ਡਰੈੱਸ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
 
@@ -611,10 +576,11 @@ msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਓ"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
@@ -623,7 +589,8 @@ msgid "Evolution Address Book"
 msgstr "ਈਵੇਲੂਸ਼ਨ �ਡਰੈੱਸ-ਬ�ੱਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address popup"
 msgstr "ਈਵੇਲੂਸ਼ਨ �ਡਰੈੱਸ-ਬ�ੱਕ �ਡਰੈੱਸ ਪੋਪਅੱਪ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -639,7 +606,8 @@ msgid "Evolution Address Book component"
 msgstr "ਈਵੇਲੂਸ਼ਨ �ਡਰੈੱਸ-ਬ�ੱਕ ਭਾਗ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "ਈਵੇਲੂਸ਼ਨ S/Mime ਸਰਟੀਫਿਕੇਟ ਪ�ਰਬੰਧਕ ਕੰਟਰੋਲ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -654,12 +622,18 @@ msgstr "ਆਪਣੇ S/MIME ਸਰਟੀਫਿਕੇਟ ਇਥੇ ਰੱਖੋ"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
+#: ../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
 msgid "On This Computer"
 msgstr "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
 
@@ -672,80 +646,93 @@ msgstr "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "ਨਿੱਜੀ"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+#, fuzzy
+msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰਕ(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+#, fuzzy
+msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "ਨਵੀਂ �ਡਰੈੱਸ-ਬ�ੱਕ"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+#, fuzzy
+msgctxt "New"
 msgid "Address _Book"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "ਇੱਕ ਸ�ਨੇਹਾ ਕਿਤਾਬ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਰੱਖਣ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "ਬੇਸ"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "ਕਿਸਮ(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "ਆਫਲਾਈਨ ਓਪਰੇਸ਼ਨ ਲਈ ਬ�ੱਕ ਸਮੱਗਰੀ ਕਾਪੀ ਕਰੋ(_b)"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../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:280
+#: ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "�ਡਰੈੱਸ ਬ�ੱਕ"
 
@@ -759,12 +746,12 @@ msgstr "ਪ�ਰਮਾਣਿਕਤਾ"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
 #: ../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 "ਵੇਰਵਾ"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
 
@@ -773,19 +760,21 @@ msgid "Downloading"
 msgstr "ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "ਤਬਦੀਲ ਹੋ ਰਿਹਾ ਹੈ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
-#, c-format
-msgid "Migrating `%s':"
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
 msgstr "`%s' ਨੂੰ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -798,8 +787,7 @@ msgstr "ਆਟੋ-ਪੂਰਤੀ ਸੈਟਿੰਗ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -837,69 +825,83 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "ਫੋਲਡਰ \"%s\" ਦਾ ਨਾਂ ਬਦਲੋ:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਬਦਲੋ"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "ਨਵੀਂ �ਡਰੈੱਸ-ਬ�ੱਕ(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1385
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
-#: ../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
+#: ../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
+#: ../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 "ਹਟਾਓ(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "ਵਿਸ਼ੇਸਤਾ(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "ਸੰਪਰਕ ਸਰੋਤ ਚੋਣਕਾਰੀ"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨੂੰ ਖੋਲ�ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "ਪ�ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ।\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਯੂਜ਼ਰ %s) ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਭਰੋ"
@@ -917,21 +919,15 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "ਮ�ਕੰਮਲ URI ਲਿਸਟ ਲਈ EFolderList XML ਹੈ।"
 
 #: ../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 ""
-"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕਾਰਡ ਅਤੇ ਲਿਸਟ �ਲਕ ਅਤੇ ਦਿੱਖ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ, (ਪਿਕਸਲ "
-"ਵਿੱਚ)।"
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕਾਰਡ ਅਤੇ ਲਿਸਟ �ਲਕ ਅਤੇ ਦਿੱਖ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ, (ਪਿਕਸਲ ਵਿੱਚ)।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "�ਲਕ ਪੈਨ ਵੇਖਾਓ"
 
 #: ../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."
+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
@@ -976,38 +972,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>ਪ�ਰਮਾਣਕਿਤਾ</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>ਡਿਸਪਲੇਅ</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>ਖੋਜ ਹੋ ਰਹੀ ਹੈ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>ਸਰਵਰ ਜਾਣਕਾਰੀ</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>ਕਿਸਮ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਸ਼ਾਮਿਲ"
 
-#: ../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:761
 msgid "Always"
 msgstr "ਹਮੇਸ਼ਾ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "ਅਣਜਾਣ"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "ਇਹ ਕਿਤਾਬ ਸੀਮਾ ਅੱਪੜ ਤੱਕ ਵੇਖੋ(_r)"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "ਬੇਸਿਕ"
@@ -1033,14 +1026,14 @@ msgid "Lo_gin:"
 msgstr "ਲਾਗਇਨ(_g):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "ਕੋਈ ਇੰਕ�ਰਿਪਸ਼ਨ ਨਹੀਂ"
 
@@ -1052,7 +1045,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL ਇੰਕ�ਰਿਪਸ਼ਨ"
 
@@ -1073,38 +1066,20 @@ msgid "Search filter"
 msgstr "ਖੋਜ ਫਿਲਟਰ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਆਈਟਮਾਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ "
-"ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
+msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
+msgstr "ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਆਈਟਮਾਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜ�ੜੇਗਾ, ਜੇਕਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
-"SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜ�ੜੇਗਾ, ਜੇਕਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ 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 ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜ�ੜੇਗਾ, ਜੇਕਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
-"TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜ�ੜੇਗਾ, ਜੇਕਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ 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 ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤ�ਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤ�ਹਾਡਾ "
-"ਕ�ਨੈਕਸ਼ਨ ਅਣ-ਸ�ਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤ�ਸੀਂ ਸ�ਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤ�ਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤ�ਹਾਡਾ ਕ�ਨੈਕਸ਼ਨ ਅਣ-ਸ�ਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤ�ਸੀਂ ਸ�ਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1118,69 +1093,37 @@ 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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS ਇੰਕ�ਰਿਪਸ਼ਨ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"ਖੋਜ ਆਧਾਰ ਇੰਦਰਾਜ਼ ਦਾ ਵੱਖਰਾ ਨਾਂ (DN) ਹ�ੰਦਾ ਹੈ, ਜਿਥੋਂ ਕਿ ਤ�ਸੀਂ ਖੋਜ ਸ਼�ਰੂ ਕਰਦੇ ਹੋ। ਜੇਕਰ ਤ�ਸੀਂ ਇਸ ਨੂੰ "
-"ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਡਾਇਰੈਕਟਰੀ ਤੋਂ ਸ਼�ਰੂ ਹੋ ਜਾਵੇਗੀ।"
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "ਖੋਜ ਆਧਾਰ ਇੰਦਰਾਜ਼ ਦਾ ਵੱਖਰਾ ਨਾਂ (DN) ਹ�ੰਦਾ ਹੈ, ਜਿਥੋਂ ਕਿ ਤ�ਸੀਂ ਖੋਜ ਸ਼�ਰੂ ਕਰਦੇ ਹੋ। ਜੇਕਰ ਤ�ਸੀਂ ਇਸ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਡਾਇਰੈਕਟਰੀ ਤੋਂ ਸ਼�ਰੂ ਹੋ ਜਾਵੇਗੀ।"
 
 #: ../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 ""
-"ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। "
-"\"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ "
-"ਤ�ਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। \"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ ਤ�ਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "ਇਹ ਤ�ਹਾਡੇ LDAP ਸਰਵਰ ਦਾ ਪੂਰਾ ਨਾਂ ਹੈ। ਉਦਾਹਰਨ ਲਈ \"ldap.mycompany.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 ""
-"ਇਹ ਅਧਿਕਤਮ ਇੰਦਰਾਜ਼ ਹਨ, ਜੋ ਕਿ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ। ਇਹ ਨੂੰ ਵਧੇਰੇ ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ "
-"ਤ�ਹਾਡੀ �ਡਰੈੱਸ-ਬ�ੱਕ ਹੌਲੀ ਹੋ ਜਾਵੇਗੀ।"
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "ਇਹ ਅਧਿਕਤਮ ਇੰਦਰਾਜ਼ ਹਨ, ਜੋ ਕਿ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ। ਇਹ ਨੂੰ ਵਧੇਰੇ ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤ�ਹਾਡੀ �ਡਰੈੱਸ-ਬ�ੱਕ ਹੌਲੀ ਹੋ ਜਾਵੇਗੀ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"ਇਹ ਪ�ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"Email Address\" "
-"ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤ�ਹਾਡੇ ldap ਸਰਵਰ ਲਈ ਬੇਪਛਾਣ ਪਹ�ੰਚ ਲੋੜੀਦੀ ਹੋਵੇਗੀ।"
+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 "ਇਹ ਪ�ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"Email Address\" ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤ�ਹਾਡੇ 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 ""
-"ਇਹ ਇਸ ਸਰਵਰ ਦਾ ਨਾਂ ਹੈ, ਜੋ ਕਿ ਤ�ਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਲਿਸਟ ਵਿੱਚ ਵਿਖਾਈ ਦੇ ਰਿਹਾ ਹੈ। ਇਹ ਸਿਰਫ "
-"ਵੇਖਣ ਲਈ ਹੈ।"
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "ਇਹ ਇਸ ਸਰਵਰ ਦਾ ਨਾਂ ਹੈ, ਜੋ ਕਿ ਤ�ਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਲਿਸਟ ਵਿੱਚ ਵਿਖਾਈ ਦੇ ਰਿਹਾ ਹੈ। ਇਹ ਸਿਰਫ ਵੇਖਣ ਲਈ ਹੈ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜ�ੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ "
-"ਦੀ ਲਿਸਟ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ�ਰਬੰਧਕ ਨੂੰ ਪ�ੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜ�ੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ ਦੀ ਲਿਸਟ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ�ਰਬੰਧਕ ਨੂੰ ਪ�ੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1211,8 +1154,8 @@ msgid "_Login method:"
 msgstr "ਲਾਗਇਨ ਢੰਗ(_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1227,7 +1170,7 @@ msgid "_Search scope:"
 msgstr "ਖੋਜ ਸੀਮਾ(_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
@@ -1247,10 +1190,12 @@ msgstr "ਕਾਰਡ"
 #: ../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:288
+#: ../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:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
@@ -1291,7 +1236,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1303,16 +1248,16 @@ msgid "Ca_tegories..."
 msgstr "ਕੈਟਾਗਰੀ(_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../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:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ"
 
@@ -1325,7 +1270,7 @@ msgid "Image"
 msgstr "ਚਿੱਤਰ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN ਮੈਸਜ਼ਰ"
 
@@ -1338,7 +1283,7 @@ msgid "Nic_kname:"
 msgstr "ਆਮ ਨਾਂ(_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "ਨੋਵਲ ਗਰ�ੱਪਵਾਇਜ਼"
 
@@ -1352,11 +1297,11 @@ msgstr "ਟੈਲੀਫੋਨ"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "ਕੰਮ"
 
@@ -1378,8 +1323,8 @@ msgid "_Birthday:"
 msgstr "ਜਨਮ-ਦਿਨ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
@@ -1468,1119 +1413,1124 @@ msgstr "ਕਿੱਥੇ(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "ਜਿਪ/ਡਾਕ ਕੋਡ(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "�ਡਰੈੱਸ"
 
-#: ../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-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:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../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:1835 ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1836
 #: ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "ਸੋਧਯੋਗ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "ਅਮਰੀਕਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "ਅਫਗਾਨਿਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "ਅਲਬੀਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "ਅਲਜੀਰੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "ਅਮਰੀਕੀ ਸਾਮੋਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "ਅਡੂਰਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "ਅੰਗੋਲਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "ਅੰਗੂਲੀਆਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "ਅੰਟਾਰਿਕਟਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "�ਟੀਗ�ਆ ਤੇ ਬਾਰਬ�ਡਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "ਅਰਜਨਟੀਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "ਅਰਮੀਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "ਅਰੂਬਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "ਆਸਟਰੇਲੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "ਆਸਟਰੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "ਅਜ਼ਰਬਾਈਜਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "ਬਾਹਾਮਾਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "ਬਹਿਰਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "ਬੰਗਲਾਦੇਸ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "ਬਾਰਬਾਡਾਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "ਬੇਲਾਰੂਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "ਬੈਲਜੀਅਮ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "ਬੀਲੀਜ਼ੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "ਬੀਨਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "ਬਾਰਾਮੂਡਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "ਭ�ਟਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "ਬੋਲੋਵੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "ਬੋਸੋਨੀਆ ਤੇ ਹਰਜ਼ੀਨਗੋਵੀਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "ਬੂਟਸਵਾਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "ਬੂਟਵਟ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "ਬਰਾਜ਼ੀਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "ਬਰਤਾਨੀਆ ਭਾਰਤੀ ਸਮ�ੰਦਰੀ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "ਬਰੂਨਈ ਡਾਰੂਸ਼ਲਾਮ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "ਬ�ਲਗਾਰੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "ਬੂਪਕੀਨਾ ਫਾਸੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "ਬੂਰੂਮਾਡੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "ਕੋਲੰਬੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "ਕੈਮਰੂਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "ਕੈਨੇਡਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "ਕੇਪ ਵਾਰਡੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "ਕਾਯਮਨ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "ਕੇਦਰੀ ਅਫਰੀਕਾ ਗਣਰਾਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "ਚੰਦ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "ਚਿੱਲੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "ਚੀਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "ਕ�ਰਿਸਮਿਸ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "ਕੋਕੋਸ(ਕਿਲਿੰਗ) ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "ਕੋਲੰਬੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "ਕੋਮੋਰਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "ਕਾਂਗੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "ਕਾਂਗੋ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "ਕ�ੱਕ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "ਕਾਸਟ ਰੀਕਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "ਕੋਟੀ ਡੀਵੋਰਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "ਕਰੋਟੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "ਕਿਊਬਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "ਕਿਊਰੂਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "ਚੈਕ ਗਣਰਾਜ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "ਡੈਨਮਾਰਕ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "ਡਜੀਬੂਟੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "ਡੋਮੀਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "ਡੋਮੀਨੀਆਨ ਗਣਰਾਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "�ਕਵੇਡਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "ਮਿਸਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "ਈਲ ਸਾਲੇਵਡੋਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "ਭੂ-ਖੰਡੀ ਗ�ਆਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "ਈਰਟੀਰਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "ਈਸਟੋਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "ਈਥੋਪਈਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "ਫਾਕਲੈਡ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "ਫਾਰੀਓ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "ਫਿਜ਼ੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "ਫਿਨਲੈਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "ਫਰਾਂਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "ਫਰੇਚ ਗ�ਆਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "ਫਰੈਂਚ ਪੋਲੀਸੇਲੇਵੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "ਫਰੈਂਚ ਦੱਖਣੀ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "ਗਾਬੋਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "ਗਾਬੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "ਜਾਰਜੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "ਜਰਮਨੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "ਗਾਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "ਗੀਬਰਾਲਟਾਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "ਗਰੀਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "ਗਰੀਨਲੈਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "ਗਰੀਨਾਡਾਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "ਗ�ਆਡੀਲੂਪੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "ਗ�ਆਮ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "ਗੂਆਟੇਮਾਲਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "ਗੂਈਮਸੀਯਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "ਗੂਈਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#, fuzzy
+msgid "Guinea-Bissau"
 msgstr "ਗੂਈਨੀਆ-ਬੀਸਓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "ਗ�ਆਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "ਹਾਈਟੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "ਹਾਰਡ ਤੇ ਮੈਕਡਾਨਲਡ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "ਹੋਲੀ ਸੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "ਹਾਨਡੂਰਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "ਹਾਂਗ ਕਾਂਗ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "ਹੰਗਰੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "ਆਈਸਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "ਭਾਰਤ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "ਇੰਡੋਨੇਸੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "ਈਰਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "ਇਰਾਕ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "ਆਇਰਲੈਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "ਇਸਲੀ ਆਫ ਮੈਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "ਇਜ਼ਾਰਾਈਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "ਇਟਲੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "ਜੈਮਾਈਕਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "ਜਾਪਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "ਜ਼ੇਰਸਈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ਜਾਰਡਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "ਕਜ਼ਾਕਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "ਕੀਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "ਕੀਰੀਬਾਟੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "ਕੋਰੀਆ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "ਕੋਰੀਆ ਗਣਰਾਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "ਕ�ਵੈਤ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "ਕਿਰਗਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "ਲਿਉਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "ਲਾਟੀਵਾਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "ਲੀਬਨਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "ਲੀਸੋਥੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "ਲੀਬਾਰੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "ਲੀਬੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "ਲੀਚਟੀਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "ਲੀਥੂਆਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "ਲ਼ਕਸ਼ਬਰਗ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "ਮੈਕਸੀਕੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "ਮੈਕਡੋਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "ਮੈਡਾਗਾਸਕਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "ਮਾਲਾਵੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "ਮਲੇਸੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "ਮਾਲਦੀਪ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "ਮਾਲੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "ਮਾਲਟਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "ਮਾਰਸ਼ਲ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "ਮਾਰਟੀਨੀਕਿਊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "ਮਾਓਰੀਟਆਨਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "ਮਾਓਟੀਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "ਮਾਈਟੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "ਮੈਕਸੀਕੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "ਮਾਕਰੋਨੀਸ਼ੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "ਮੋਲਡੋਵਾ ਗਣਰਾਜ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "ਮੋਨਸ਼ੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "ਮੰਗੋਲੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "ਮੋਨਟਸ਼ਟੀਟ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "ਮੋਰੋਸ਼ਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "ਮੋਜ਼ਾਮਬੀਕਿਉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "ਮਿਆਮਾਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "ਨੀਮੀਬੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "ਨੀਓਰੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "ਨੇਪਾਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "ਨੀਦਰਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "ਨੀਦਰਲੈਂਡ �ਟੀਲਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "ਨਵਾਂ ਕਾਲੀਡੋਨੀਆਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "ਨਿਊਜੀਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "ਨਿਕਾਰਗ�ਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "ਨੀਜ਼ਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "ਨੀਜ਼ੀਰਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "ਨੀਊਈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "ਨੋਰਫੋਕ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "ਉੱਤਰੀ ਮਰੀਵੀਆਨਾ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "ਨਾਰਵੇ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "ਓਮਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "ਪਾਕਿਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "ਪਾਲਾਊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "ਫਿਲੀਸਤੀਨ ਭਾਗ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "ਪੈਨਾਮਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "ਪਾਪੂਆ ਨਵਾਂ ਗੂਈਨਿਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "ਪੇਰੂਗਵੇ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "ਪੇਰੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "ਫਿਲਿਪੀਨੀਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "ਪਿਟਸਾਰਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "ਪੋਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "ਪ�ਰਤਗਾਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "ਪ�ਈਰਟੋ ਰੀਸੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "ਕਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "ਰੀਯ�ਨੀਅਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "ਰੋਮਾਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "ਰੂਸੀ ਗਣਰਾਜ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "ਰਵਾਂਡਾਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "ਸੇਂਟ ਕਿੱਟਸ �ਂਡ ਨੀਵਿਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "ਸੇਂਟ ਲੂਸੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "ਸੇਂਟ ਵੀਨਸੈਂਟ �ਂਡ ਦੀ ਗਰੀਨਾ-ਡੀਨਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "ਸਾਮੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "ਸਾਨ ਮਾਰੀਨੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "ਸਾਓ ਟੋਮੀ �ਂਡ ਪ�ਰਿੰਸਪੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "ਸਾਊਦੀ ਅਰਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "ਸੈਨੇਗਾਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "ਸਰਬੀਆ �ਂਡ ਮੋਨਟੀਓਗਰੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "ਸੀਆਚਿਲਸ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "ਸੀਈਰਆ ਲਿ�ਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "ਸਿੰਘਾਪ�ਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "ਸਲੋਵਾਕੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "ਸਲੋਵੀਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "ਸੋਲੋਮੋਨ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "ਸੋਮਾਲੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "ਦੱਖਣੀ ਅਫਰੀਕਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "ਦੱਖਣੀ ਜਾਰਜੀਆਂ ਤੇ ਦੱਖਣੀ ਸੈਡਵਿੱਚ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "ਸਪੇਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "ਸ�ਰੀਲੰਕਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "ਸੇਂਟ ਹੀਲੀਨਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "ਸੇਂਟ ਪੀਰੀਅਰ ਤੇ ਮੀਕਿਉਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "ਸੂਡਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "ਸੂਰੀਨਾਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "ਸਵਾਲਬਰਡ ਕੇ ਜਾਨ ਮਾਈਯਾਮ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "ਸਵਾਜ਼ੀਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "ਸਵੀਡਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "ਸਵਿਟਰਜ਼ਰਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "ਸੀਰੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "ਤਾਈਵਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "ਤਜ਼ਾਕਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "ਤਨਜਾਨੀਆਂ, ਗਣਰਾਜ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "ਥਾਈਲੈਂਡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "ਟੀਮ�ਰ-ਲੀਸਟੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "ਟੂਗੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "ਟੂਕੀਲਾਊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "ਟੂਨਗਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "ਟਰੀਨੀਡ ਤੇ ਟੋਬਾਗੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "ਟ�ਨੀਸ਼ੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "ਤ�ਰਕੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "ਤ�ਰਕਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "ਤ�ਰਕ ਤੇ ਕਾਸਕੋਸ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "ਟੂਵਾਲੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "ਯੂਗਾਂਡਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "ਯੂਕਰੇਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "ਸੰਯ�ਕਤ ਰਾਜ ਅਮੀਰਾਤ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "ਬਰਤਾਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "ਅਮਰੀਕਾ ਦੇ ਛੋਟੇ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "ਉਰੂਗਵੇ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "ਉਜ਼ੇਬਕਸਤਾਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "ਵਾਨੂਟੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "ਵੈਨੂਜੇ�ਲਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "ਵੀਅਤਨਾਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "ਵਿਰਗਿਨ ਟਾਪੂ ਬਰਤਾਨੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "ਵਿਰਗਿਨ ਟਾਪੂ, ਅਮਰੀਕਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "ਵਾਲਿਸ਼ ਤੇ ਫੂਟੂਨਾ ਟਾਪੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "ਦੱਖਣੀ ਸਹਾਰਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "ਯਮਨ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "ਜੈਂਬੀਆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "ਜਿੰਬਾਬਾਵੇ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL ਮੌਕਾ ਸ�ਨੇਹਾਕਾਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "ਜਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "ਯਾਹੂ ਸ�ਨੇਹੇਦਾਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "ਗਡੂ-ਗਡੂ ਸ�ਨੇਹੇਦਾਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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:111
 msgid "Service"
 msgstr "ਸੇਵਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ"
 
-#: ../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:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ਘਰ"
 
-#: ../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:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "ਯਾਹੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "ਗਡੂ-ਗਡੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "ਗਰ�ੱਪਵਾਈਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "ਸਰੋਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "ਨਿਯਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "ਲਿਖਣਯੋਗ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "ਲੋੜੀਦੇ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "ਤਬਦੀਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚ�ਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2588,47 +2538,47 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ਇੱਕ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ਖਾਲੀ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰਕ ਤੇਜ਼-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "ਪੂਰਾ ਸੋਧੋ(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "ਪੂਰਾ ਨਾਂ(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "ਈ-ਮੇਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਚ�ਣੋ(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2637,7 +2587,7 @@ msgstr ""
 "ਕੀ ਤ�ਸੀਂ ਸੰਪਰਕ ਲਿਸਟ (%s)\n"
 "ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2645,7 +2595,7 @@ msgstr ""
 "ਕੀ ਤ�ਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟਾਂ\n"
 "ਹਟਾਉਣੀਆਂ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2654,7 +2604,7 @@ msgstr ""
 "ਕੀ ਤ�ਸੀਂ ਸੰਪਰਕ (%s) ਨੂੰ\n"
 "ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2796,12 +2746,17 @@ msgstr "ਲਿਸਟ ਵਿੱਚ ਹੇਠਾਂ ਸੰਪਰਕ ਤੋਂ ਈ-
 msgid "Contact List Members"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਮੈਂਬਰ"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "ਮੈਂਬਰ(_M)"
+
 #: ../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:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../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
 msgid "Book"
 msgstr "ਕਿਤਾਬ"
 
@@ -2809,10 +2764,6 @@ msgstr "ਕਿਤਾਬ"
 msgid "Is New List"
 msgstr "ਨਵੀਂ ਲਿਸਟ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "ਮੈਂਬਰ(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "ਬਦਲਿਆ ਸੰਪਰਕ:"
@@ -2827,12 +2778,8 @@ msgid "Duplicate Contact Detected"
 msgstr "ਡ�ਪਲੀਕੇਟ ਸੰਪਰਕ ਹਟਾਓ"
 
 #: ../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 ""
-"ਸੰਪਰਕ ਦਾ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤ�ਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ "
-"ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+msgstr "ਸੰਪਰਕ ਦਾ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤ�ਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2850,40 +2797,44 @@ msgstr ""
 "ਸੰਪਰਕ ਦਾ ਤਬਦੀਲ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ\n"
 "ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤ�ਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "ਸੰਪਰਕ ਮਿਲਾਨ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "ਸੰਪਰਕ ਮਿਲਾਨ"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ਈ-ਮੇਲ"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76
+#: ../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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "ਈ-ਮੇਲ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "ਇਸ ਨਾਲ ਸ਼�ਰੂ ਹ�ੰਦੇ ਨਾਂ"
+#, fuzzy
+msgid "Name contains"
+msgstr "ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2898,9 +2849,9 @@ msgstr[1] "%d ਸੰਪਰਕ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "ਕਿਊਰੀ"
 
@@ -2911,9 +2862,10 @@ msgstr "ਬ�ੱਕ �ਲਕ ਲੈਣ ਵਿੱਚ ਗਲਤੀ"
 #: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
+#: ../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
 msgid "Model"
 msgstr "ਮਾਡਲ"
 
@@ -2921,107 +2873,116 @@ msgstr "ਮਾਡਲ"
 msgid "Error modifying card"
 msgstr "ਸੋਧਿਆ ਕਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "ਇਸ ਨਾਲ ਸ਼�ਰੂ ਹ�ੰਦੇ ਨਾਂ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "ਕਿਸਮ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "vCard ਇੰ� ਸੰਭਾਲੋ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ਖੋਲ�ਹੋ(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)...."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸ�ਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "ਲਿਸਟ ਨੂੰ ਸ�ਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸ�ਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "ਪਰਿੰਟ ਕਰੋ(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "ਕੱਟੋ(_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
-#: ../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
+#: ../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
+#: ../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 "ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "ਚੇਪੋ(_a)"
 
 #. 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:625
+#: ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "ਕੋਈ ਕੈਟਾਗਰੀ"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "ਹੋਰ ਗਲਤੀ"
 
@@ -3056,7 +3017,7 @@ msgstr "ਕਾਰ ਫੋਨ"
 
 #: ../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
@@ -3157,9 +3118,9 @@ msgid "Radio"
 msgstr "ਰੇਡੀਓ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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:713
 msgid "Role"
 msgstr "ਰੋਲ"
 
@@ -3195,38 +3156,46 @@ msgid "Web Site"
 msgstr "ਵੈਬ ਸਾਇਟ"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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/text/e-text.c:3729
+#: ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "ਚੌੜਾਈ"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "ਉਚਾਈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "ਕੇਂਦਰਿਤ ਹੈ"
 
@@ -3246,11 +3215,22 @@ msgstr "ਟੈਕਸਟ ਮਾਡਲ"
 msgid "Max field name length"
 msgstr "ਨਾਂ ਦੀ ਅਧਿਕਤਮ ਲੰਬਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"ਸੰਪਰਕ ਦੀ ਖੋਜ।"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3264,7 +3244,7 @@ msgstr ""
 "\n"
 "ਜਾਂ ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3278,7 +3258,7 @@ msgstr ""
 "\n"
 "ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3288,7 +3268,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰਕ ਦੀ ਖੋਜ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3298,40 +3278,43 @@ msgstr ""
 "\n"
 "ਇਸ �ਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਲਿਸਟ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "�ਡਪਟਰ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "ਕੰਮਕਾਜੀ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "ਘਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "ਹੋਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "ਚ�ਣਿਆ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "ਕਰਸਰ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "ਹਮੇਸ਼ਾ �ਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲ�ਹੋ(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "ਲਿੰਕ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "ਇਸ ਨੂੰ ਨਵਾਂ ਸ�ਨੇਹਾ ਭੇਜੋ(_S)..."
 
@@ -3353,7 +3336,7 @@ msgid "map"
 msgstr "ਨਕਸ਼ਾ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "ਲਿਸਟ ਮੈਂਬਰ"
 
@@ -3374,15 +3357,14 @@ msgid "Video Chat"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../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/publish-calendar/publish-calendar.glade.h:5
@@ -3391,8 +3373,7 @@ msgstr "ਕੈਲੰਡਰ"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ"
 
@@ -3414,169 +3395,164 @@ msgid "Web Log"
 msgstr "ਵੈਬ ਲਾਗ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "ਵਰ�ਹੇ ਗੰਢ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "ਕੰਮ ਟਾਇਟਲ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "ਮ�ੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "ਸਫਲਤਾ"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "ਪਿੱਛਾ ਰ��ਿਆ"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "ਰਿਪੋਸਟਰੀ ਬੰਦ ਹੈ"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "ਸਬੰਧ ਨਹੀ ਲੱਭਾ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "ਸੰਪਰਕ ID ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "ਪ�ਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643
+#: ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "ਪ�ਰਮਾਣਕਿਤਾ ਅਸਫਲ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "ਪ�ਰਮਾਣਕਿਤਾ ਲਾਜ਼ਮੀ ਹੈ"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS ਉਪਲੱਬਧ ਨਹੀ ਹੈ"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "ਇੰ� ਦਾ ਕੋਈ ਸਰੋਤ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "ਗਲਤ ਸਰਵਰ ਵਰਜਨ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
-msgid ""
-"We were unable to open this addressbook. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
-msgstr ""
-"ਅਸੀਂ ਇਹ �ਡਰੈੱਸ-ਬ�ੱਕ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ ਰਹੇ ਹਾਂ। ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਇਹ ਕਿਤਾਬ ਆਫਲਾਇਨ ਵਰਤੋਂ "
-"ਲਈ ਤਿਆਰ ਨਾ ਕੀਤੀ ਗਈ ਹੋਵੇ ਜਾਂ ਹਾਲੇ ਡਾਊਨਲੋਡ ਨਾ ਹੋਈ ਹੋਵੇ। ਕਿਰਪਾ ਕਰਕੇ ਆਨਲਾਇਨ ਢੰਗ ਨਾਲ ਚਾਲੂ ਹੋਣ "
-"ਉਪਰੰਤ �ਡਰੈੱਸ-ਬ�ੱਕ ਡਾਊਨਲੋਡ ਕਰੋ ਤਾਂ ਇਸ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਸਕੇ"
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+msgstr "ਅਸੀਂ ਇਹ �ਡਰੈੱਸ-ਬ�ੱਕ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ ਰਹੇ ਹਾਂ। ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਇਹ ਕਿਤਾਬ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਤਿਆਰ ਨਾ ਕੀਤੀ ਗਈ ਹੋਵੇ ਜਾਂ ਹਾਲੇ ਡਾਊਨਲੋਡ ਨਾ ਹੋਈ ਹੋਵੇ। ਕਿਰਪਾ ਕਰਕੇ ਆਨਲਾਇਨ ਢੰਗ ਨਾਲ ਚਾਲੂ ਹੋਣ ਉਪਰੰਤ �ਡਰੈੱਸ-ਬ�ੱਕ ਡਾਊਨਲੋਡ ਕਰੋ ਤਾਂ ਇਸ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਸਕੇ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
-msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
-msgstr ""
-"ਅਸੀਂ ਇਹ �ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਮਾਰਗ %s ਹੈ ਅਤੇ ਤ�ਹਾਡੇ ਕੋਲ "
-"ਅਧਿਕਾਰ ਹਨ।"
+msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
+msgstr "ਅਸੀਂ ਇਹ �ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਮਾਰਗ %s ਹੈ ਅਤੇ ਤ�ਹਾਡੇ ਕੋਲ ਅਧਿਕਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"ਅਸੀਂ ਇਸ ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤ�ਸੀਂ ਸਹੀਂ URI ਭਰਿਆ ਹੈ ਜਾਂ LDAP "
-"ਸਰਵਰ ਪਹ�ੰਚਯੋਗ ਨਹੀਂ ਹੈ ।"
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "ਅਸੀਂ ਇਸ ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤ�ਸੀਂ ਸਹੀਂ URI ਭਰਿਆ ਹੈ ਜਾਂ LDAP ਸਰਵਰ ਪਹ�ੰਚਯੋਗ ਨਹੀਂ ਹੈ ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
-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 ""
-"ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਵਿੱਚ LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ। ਜੇਕਰ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ LDAP ਮੱਦਦ ਚਾਹ�ੰਦੇ ਹੋ, "
-"ਤ�ਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਪੈਕੇਜ LDAP-enabled ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+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 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਵਿੱਚ LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ। ਜੇਕਰ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ LDAP ਮੱਦਦ ਚਾਹ�ੰਦੇ ਹੋ, ਤ�ਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਪੈਕੇਜ LDAP-enabled ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"ਅਸੀ ਇਸ �ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ ਹਾਂ। ਇਸ ਦਾ ਅਰਥ ਇਹ ਹੈ ਕਿ ਜਾਂ ਤਾਂ ਤ�ਸੀਂ ਗਲਤ URI ਸ਼ਾਮਿਲ "
-"ਕੀਤਾ ਹੈ ਜਾਂ ਸਰਵਰ ਪਹ�ੰਚ ਤੋਂ ਬਾਹਰ ਹੈ"
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "ਅਸੀ ਇਸ �ਡਰੈੱਸ-ਬ�ੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ ਹਾਂ। ਇਸ ਦਾ ਅਰਥ ਇਹ ਹੈ ਕਿ ਜਾਂ ਤਾਂ ਤ�ਸੀਂ ਗਲਤ URI ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ ਜਾਂ ਸਰਵਰ ਪਹ�ੰਚ ਤੋਂ ਬਾਹਰ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+#, fuzzy
+msgid "Detailed error:"
+msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3589,7 +3565,7 @@ msgstr ""
 "ਪਸੰਦ ਨਤੀਜਾਂ ਸਮਾਂ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3601,45 +3577,45 @@ msgstr ""
 "ਵਿੱਚ ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ ਪਸੰਦ ਦਾ ਸਮਾਂ ਹੋਰ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "ਇਸ �ਡਰੈੱਸ-ਬ�ੱਕ ਲਈ ਬੈਕਗਰਾਊਂਡ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "ਇਸ �ਡਰੈੱਸ-ਬ�ੱਕ ਲਈ ਬੈਕਗਰਾਊਂਡ ਨੇ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਇਨਕਾਰੀ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "ਇਹ ਕਿਊਰੀ ਨੂੰ ਸਫਲਤਾਪੂਰਕ ਪੂਰਾ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਲਿਸਟ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "ਸੋਧ ਲਿਸਟ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "ਹਟਾਉਣ ਲਿਸਟ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "ਹਟਾਉਣ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3654,16 +3630,16 @@ msgstr[1] ""
 "ਸੰਪਰਕ %d ਖ�ਦ ਹੀ %d �ਰੋਖੇ ਖੋਲ ਦੇਣਗੇ।\n"
 "ਕੀ ਤ�ਸੀਂ ਇੰਨੇ ਸੰਪਰਕ ਵੇਖਣੇ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "ਨਾ ਵੇਖਾਓ(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਵੇਖਾਓ(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3672,70 +3648,70 @@ msgstr ""
 "%s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ\n"
 "ਕੀ ਇਸ ਉੱਪਰ ਹੀ ਲਿਖਿਆ ਜਾਵੇ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ਸੰਪਰਕ"
 msgstr[1] "ਸੰਪਰਕ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਚ�ਣੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "ਸੂਚੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "ਕਈ vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ਲਈ vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਦੀ ਜਾਂਚ..."
 
@@ -3763,43 +3739,44 @@ msgstr "ਸ�ਨੇਹਾ ਕਿਤਾਬ ਵਿੱਚ ਸੰਭਾਲੋ"
 msgid "Card View"
 msgstr "ਕਾਰਡ ਵੇਖਾਓ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ਆਉਟਲ�ੱਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "ਆਉਟਲ�ੱਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮੌਜੀਲਾ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮੌਜੀਲਾ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ LDIF ਆਯਾਤਕਾਰ"
 
@@ -3852,11 +3829,12 @@ msgid "Format"
 msgstr "ਫਾਰਮੈਟ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432
+#: ../widgets/table/e-table-click-to-add.c:503
 #: ../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:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "ਹੈੱਡਰ"
@@ -3959,7 +3937,7 @@ msgstr "ਛਾਂ"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3978,7 +3956,7 @@ msgid "Top:"
 msgstr "ਉਪਰ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "ਕਿਸਮ:"
 
@@ -4050,9 +4028,7 @@ msgid "Export in asynchronous mode"
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਨਿਰਯਾਤ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "ਇੱਕ ਆਉਟਪ�ੱਟ ਫਾਇਲ ਵਿੱਚ ਅਸਕਰੋਨਸ ਮੋਡ ਵਿੱਚ ਕਾਰਡਾਂ ਦੀ ਗਿਣਤੀ, ਡਿਫਾਲਟ ਆਕਾਰ 100 ਹੈ।"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
@@ -4081,418 +4057,385 @@ msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
-"'{0}' ਕੇਵਲ ਪੜ�ਹਨ ਲਈ ਹੀ ਕੈਲੰਡਰ ਸਰੋਤ ਹੈ। ਕੈਲੰਡਰ �ਲਕ ਲਈ ਸਵਿੱਚ ਕਰੋ ਅਤੇ ਇੱਕ ਕੈਲੰਡਰ ਹਾਈਲਾਈਟ ਕਰੋ "
-"ਤਾਂ ਕਿ ਮ�ਲਾਕਾਤ ਮਨਜ਼ੂਰ ਕੀਤੀਆਂ ਜਾ ਸਕਣ।"
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"ਆਪਣੇ ਮ�ਲਕਾਤ ਦੇ ਸੰਖੇਪ ਵਿੱਚ ਕ�� ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ�ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤ�ਹਾਡੀ "
-"ਮ�ਲਾਕਤਾ ਬਾਰੇ ਸੌਖੀ ਤਰ�ਹਾਂ ਸਮ� ਸਕਣਗੇ।"
+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}' ਕੇਵਲ ਪੜ�ਹਨ ਲਈ ਕੈਲੰਡਰ ਹੈ, ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਕੈਲੰਡਰ �ਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚੋਂਵੱਖਰਾ ਕੈਲੰਡਰ ਚ�ਣੋ ਜੀ।"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"ਆਪਣੇ ਕੰਮ ਦੇ ਸੰਖੇਪ ਵਿੱਚ ਕ�� ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ�ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤ�ਹਾਡੇ ਕੰਮ ਬਾਰੇ "
-"ਆਸਾਨੀ ਨਾਲ ਸਮ� ਸਕਣਗੇ।"
+#, fuzzy
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "'{0}' ਕੇਵਲ ਪੜ�ਹਨ ਲਈ ਹੀ ਕੈਲੰਡਰ ਸਰੋਤ ਹੈ। ਕੈਲੰਡਰ �ਲਕ ਲਈ ਸਵਿੱਚ ਕਰੋ ਅਤੇ ਇੱਕ ਕੈਲੰਡਰ ਹਾਈਲਾਈਟ ਕਰੋ ਤਾਂ ਕਿ ਮ�ਲਾਕਾਤ ਮਨਜ਼ੂਰ ਕੀਤੀਆਂ ਜਾ ਸਕਣ।"
 
 #: ../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: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:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "ਇਹਨਾਂ ਸਭ ਮੀਮੋ ਬਾਰੇ ਸਾਰੀ ਜਾਣਕਾਰੀ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਮ�ੜ-ਸਟੋਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੇਗੀ।"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../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:7
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+#: ../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:8
+#: ../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:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "ਕੀ ਤ�ਸੀਂ '{0}' ਕੰਮ ਹਟਾਉਣ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਮ�ਲਾਕਾਤ '{0}' ਹਟਾਉਣ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "ਕੀ ਤ�ਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ '{0}' ਮ�ਲਾਕਾਤ ਹਟਾਉਣ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ '{0}' ਕੰਮ ਹਟਾਉਣ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਸ ਮ�ਲਾਕਾਤ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਸ ਮੀਟਿੰਗ ਨੂੰ ਹਟਾਓ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਸ ਮੀਮੋ ਨੂੰ ਹਟਾਓ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ ਕੰਮ ਹਟਾਓ ਬਾਰੇ ਤਿਆਰ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਮੀਮੋ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਸੰਭਾਲਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਮ�ਲਾਕਾਤ ਨੂੰ ਸੰਖੇਪ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਕੰਮ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "ਨਵੀਂ ਘਟਨਾ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+#, fuzzy
+msgid "Cannot save event"
+msgstr "ਨਵੀਂ ਘਟਨਾ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "ਕੀ ਕੈਲੰਡਰ '{0}' ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "ਕੀ ਮੀਮੋ ਲਿਸਟ '{0}' ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "ਕੀ ਟਾਸਕ ਲਿਸਟ '{0}' ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "ਨਾ ਭੇਜੋ(_n)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ਡਾਊਨਲੋਡ ਕਰਨਾ ਜਾਰੀ ਹੈ। ਕੀ ਤ�ਸੀਂ ਇਹ ਮ�ਲਾਕਾਤ ਸੰਭਾਲਣੀ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ਡਾਊਨਲੋਡ ਜਾਰੀ ਹੈ। ਕੀ ਤ�ਸੀਂ ਕੰਮ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "�ਡੀਟਰ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:34
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਇਸ ਕੰਮ ਬਾਰੇ ਸੱਦਾ ਭੇਜਿਆ ਗਿਆ ਹੈ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਇਹ ਕੰਮ ਮਨਜ਼ੂਰ ਕਰਨ ਦਾ "
-"ਅਧਿਕਾਰ ਵੀ ਹੈ।"
+#: ../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:35
+#: ../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:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:39
-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:40
-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:41
-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:42
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+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:43
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+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:44
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"ਕ�� ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਮ�ਲਾਕਾਤ ਨੂੰ ਹ�ਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗ�ੰਮ ਹੋਣ ਦਾ ਖਤਰਾ "
-"ਹੋ ਸਕਦਾ ਹੈ।"
+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:45
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"ਕ�� ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਕੰਮ ਨੂੰ ਹ�ਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗ�ੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ "
-"ਸਕਦਾ ਹੈ।"
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
 
 #: ../calendar/calendar.error.xml.h:46
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "ਕ�� ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਮ�ਲਾਕਾਤ ਨੂੰ ਹ�ਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗ�ੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ ਸਕਦਾ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:48
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "ਕ�� ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਕੰਮ ਨੂੰ ਹ�ਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗ�ੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ ਸਕਦਾ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "ਤ�ਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕ�� ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਕੈਲੰਡਰ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਮੀਮੋ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੰਮ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "ਕੈਲੰਡਰ ਨੂੰ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "ਮੀਮੋ ਲਿਸਟ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "ਟਾਸਕ ਲਿਸਟ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "ਇਹ ਕੈਲੰਡਰ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "ਇਹ ਮੀਮੋ ਲਿਸਟ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "ਇਹ ਟਾਸਕ ਲਿਸਟ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਸ ਮ�ਲਾਕਾਤ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ ਮੀਮੋ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ ਮੀਮੋ ਲਈ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹੋਗੇ?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਸਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਲਈ ਸੱਦਾ ਭੇਜਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੂਚਿਤ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣੀ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜਣੀ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:65
-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 ""
-"ਤ�ਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰ�ੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜ�ੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ "
-"ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
+#: ../calendar/calendar.error.xml.h:68
+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 "ਤ�ਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰ�ੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜ�ੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ਇਸ ਮ�ਲਾਕਾਤ ਵਿੱਚ ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ।"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "ਇਸ ਕੰਮ ਵਿੱਚ ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ਇਸ ਕੰਮ ਵਿੱਚ ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡਾ ਕੈਲੰਡਰ ਉਦੋਂ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕੇਗਾ, ਜਦ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮ�ੜ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡੇ ਮੀਮੋ ਈਵੇਲੂਸ਼ਨ ਦੇ ਮ�ੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡੇ ਕੰਮ ਈਵੇਲੂਸ਼ਨ ਦੇ ਮ�ੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76
+#: ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "ਭੇਜੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "ਸੂਚਨਾ ਭੇਜੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "ਬਹ�-ਦਿਨ ਕਾਰਵਾਈਆਂ ਨੂੰ ਵੱਖ ਕਰੋ:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server ਨੂੰ ਸ਼�ਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "ਪਾਇਲਟ ਕੈਲੰਡਰ ਕਾਰਜ ਭਾਗ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਮੀਮੋ ਕਾਰਜ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਮੀਮੋ ਕਾਰਜ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "ਮੂਲ ਪਹਿਲ:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਕੰਮ ਕਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਕਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "ਕੈਲੰਡਰ ਤੇ ਕੰਮ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "ਕੈਲੰਡਰ"
 
@@ -4533,25 +4476,31 @@ msgid "Memo_s"
 msgstr "ਮੀਮੋ(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ਕੰਮ"
@@ -4569,25 +4518,27 @@ msgstr "ਕੰਮ(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
 msgstr[1] "ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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
+#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ਘੰਟੇ"
 msgstr[1] "ਘੰਟੇ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "ਸ਼�ਰੂ ਸਮਾਂ"
 
@@ -4598,9 +4549,9 @@ msgstr "ਮ�ਲਾਕਾਤ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "ਟਿਕਾਣਾ:"
@@ -4610,17 +4561,19 @@ msgid "Snooze _time:"
 msgstr "ਅੰਤਰਾਲ ਸਮਾਂ(_t):"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:167
 #: ../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:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../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 "ਸੋਧ(_E)"
 
@@ -4632,32 +4585,32 @@ msgstr "ਬੇਕਾਰ(_S)"
 msgid "location of appointment"
 msgstr "ਮ�ਲਾਕਾਤ ਦਾ ਟਿਕਾਣਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "ਕੋਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤ�ਹਾਡੇ ਲਈ %d ਅਲਾਰਮ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4669,11 +4622,10 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪ�ੱਛਗਿੱਛ ਬਕਸਾ ਹੀ\n"
 "ਵੇਖਾ ਸਕੇਗੀ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -4685,18 +4637,16 @@ msgstr ""
 "\n"
 "ਕੀ ਤ�ਸੀਂ ਇਸ ਕਾਰਜ ਨੂੰ ਚਲਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ ਮੈਨੂੰ ਮ�ੜ ਨਾ ਪ�ੱਛੋ।"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "ਬੋਨਬੋ ਨੂੰ ਸ਼�ਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
+#: ../calendar/gui/alarm-notify/notify-main.c:151
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "ਚੇਤਾਵਨੀ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸਰਵਿਸ ਫੈਕਟਰੀ ਬਣਾਈ ਜਾ ਸਕੀ ਹੈ, ਸ਼ਾਇਦ ਪਹਿਲਾਂ ਹੀ ਚੱਲਦੀ ਹੈ..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
@@ -4704,7 +4654,8 @@ msgid "invalid time"
 msgstr "ਗਲਤ ਸਮਾਂ"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4713,7 +4664,8 @@ msgstr[0] "%d ਘੰਟਾ"
 msgstr[1] "%d ਘੰਟੇ"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72
+#: ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4724,7 +4676,8 @@ msgstr[1] "%d ਮਿੰਟ"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76
+#: ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4885,48 +4838,28 @@ msgid "Overdue tasks color"
 msgstr "ਮਿਆਦ ਪ�ੱਗੇ ਕੰਮ ਦਾ ਰੰਗ"
 
 #: ../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 ""
-"ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ "
-"ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h: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 ""
-"ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ "
-"ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕੈਲੰਡਰ ਲਿਸਟ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਕੈਲੰਡਰ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ।"
 
 #: ../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."
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "ਟਾਸਕ ਲਿਸਟ ਅਤੇ ਕੰਮ �ਾਤੀ ਵਿੱਚ, ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 ""
-"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ "
-"ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h: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 ""
-"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ "
-"ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹ�ੰਦੀ ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
@@ -4961,12 +4894,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:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"�ਲਕ\" ਪੈਨ ਵੇਖਾਓ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"�ਲਕ\" ਪੱਟੀ ਵੇਖਾਓ।"
 
@@ -4992,20 +4925,12 @@ msgstr "ਕੰਮ ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
 
 #: ../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 ""
-"ਵੇਹਲਾ/ਰ��ਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ �ਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ "
-"ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ �ਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #: ../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 ""
-"ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨ�ਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
-"ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨ�ਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
@@ -5016,14 +4941,12 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "ਸਮਾਂ ਜਦੋਂ ਅਲਾਰਮ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "ਸਮਾਂ-ਖੇਤਰ"
 
 #: ../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)."
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
 msgstr "ਕੈਲੰਡਰ �ਲਕ ਵਿੱਚ ਘਟਨਾਵਾਂ ਵਿੱਚ ਪਾਰਦਰਸ਼ਤਾ, ਮ�ੱਲ 0 (ਪਾਰਦਰਸ਼ੀ) ਅਤੇ 1 (ਧ�ੰਧਲਾ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
@@ -5059,12 +4982,8 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ਕੀ ਮ�ਲਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪ�ਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
 
 #: ../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 ""
-"ਕੀ ਮਹੀਨਾ �ਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ �ਤਵਾਰ ਨੂੰ ਇੱਕ ਦਿਨ ਦੇ ਤੌਰ ਤੇ "
-"ਵੇਖਾਇਆ ਜਾਵੇ।"
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "ਕੀ ਮਹੀਨਾ �ਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ �ਤਵਾਰ ਨੂੰ ਇੱਕ ਦਿਨ ਦੇ ਤੌਰ ਤੇ ਵੇਖਾਇਆ ਜਾਵੇ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
@@ -5142,84 +5061,85 @@ msgstr "ਕਾਰਜਕਾਰੀ ਸ਼�ਰੂ ਮਿੰਟ"
 msgid "daylight savings time"
 msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "ਕੈਟਾਗਰੀ ਹੈ"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "ਟਿੱਪਣੀ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "ਟਿਕਾਣਾ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../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:629
+#: ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "ਅੱਗੇ 7 ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "�ਕਟਿਵ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "ਮਿਆਦ ਪ�ੱਗੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "ਅਟੈਂਚਮਿੰਟ ਨਾਲ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "�ਕਟਿਵ ਮ�ਲਾਕਾਤ"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "ਅਗਲੇ 7 ਦਿਨ ਦੀਆਂ ਮ�ਲਾਕਾਤਾਂ"
 
-#: ../calendar/gui/calendar-commands.c:99 ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../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:324
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"ਇਹ ਚ�ਣੇ ਸਮੇਂ ਤੋਂ ਪ�ਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦੇਵੇਗਾ। ਜੇਕਰ ਤ�ਸੀਂ ਜਾਰੀ ਰਹੇ ਤਾਂ, ਇਹ ਘਟਨਾਵਾਂ "
-"ਮ�ੜ ਪ�ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕਣਗੀਆਂ।"
+#: ../calendar/gui/calendar-commands.c:317
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "ਇਹ ਚ�ਣੇ ਸਮੇਂ ਤੋਂ ਪ�ਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦੇਵੇਗਾ। ਜੇਕਰ ਤ�ਸੀਂ ਜਾਰੀ ਰਹੇ ਤਾਂ, ਇਹ ਘਟਨਾਵਾਂ ਮ�ੜ ਪ�ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕਣਗੀਆਂ।"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "ਇਸ ਤੋਂ ਪ�ਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋਧੋ"
 
-#: ../calendar/gui/calendar-commands.c:335
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../calendar/gui/calendar-commands.c:328
+#: ../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:397
-#: ../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 "ਦਿਨ"
 
@@ -5228,102 +5148,106 @@ msgstr "ਦਿਨ"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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:406
+#: ../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 "ਮੌਸਮ"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "ਨਕਲ(_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "ਵਿਸ਼ੇਸਤਾ(_P)"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "ਕੈਲੰਡਰ ਦਾ ਅੱਪਗਰੇਡ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ਮ�ਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ '%s' ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ਮ�ਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "ਕੈਲੰਡਰ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "ਨਵੀਂ ਮ�ਲਾਕਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+#, fuzzy
+msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮ�ਲਾਕਾਤ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "ਨਵੀਂ ਮ�ਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+#, fuzzy
+msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮੀਟਿੰਗ(_e)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "ਨਵੀਂ ਸਾਰੇ ਦਿਨ ਦੀ ਮ�ਲਾਕਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+#, fuzzy
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰੇ ਦਿਨ ਦੀ ਮ�ਲਾਕਾਤ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "ਨਵੀਂ ਸਾਰਾ-ਦਿਨ ਮ�ਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+#, fuzzy
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ਕੈਲੰਡਰ(_n)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
@@ -5343,16 +5267,286 @@ msgstr "ਹਫਤਾ �ਲਕ"
 msgid "Month View"
 msgstr "ਮਹੀਨਾ �ਲਕ"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+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
+msgid "Attachments"
+msgstr "ਨੱਥੀ"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "ਦਰਸ਼ਕ"
+
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "ਵਪਾਰਿਕ ਫੈਕਸ"
+
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "ਕੈਟਾਗਰੀ ਹੈ"
+
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "ਵਰਗੀਕਰਨ"
+
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "ਗ�ਪਤ"
+
+#: ../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
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "ਵੇਰਵਾ"
+
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "ਬਾਹਰ"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "ਮਾਓਟੀਸ"
+
+#: ../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 "ਅੱਜ"
+
+#: ../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 "ਸੰਪਰਕ"
+
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "ਦਿਨ"
+
+#: ../calendar/gui/caltypes.xml.h:23
+#: ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "ਮੂਲ"
+
+#: ../calendar/gui/caltypes.xml.h:24
+#: ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "ਪਸੰਦ"
+
+#: ../calendar/gui/caltypes.xml.h:26
+#: ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "ਫ�ਟਕਲ"
+
+#: ../calendar/gui/caltypes.xml.h:27
+#: ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "ਅੱਗੇ 7 ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
+
+#: ../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 "ਪ�ਰਬੰਧਕ"
+
+#: ../calendar/gui/caltypes.xml.h:30
+#: ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "ਫੋਨ ਲਿਸਟ(_P)"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "ਨਿੱਜੀ"
+
+#: ../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
+msgid "Public"
+msgstr "ਸਰਵਜਨਕ"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "ਦ�ਹਰਾਓ"
+
+#: ../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:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "ਸਥਿਤੀ"
+
+#: ../calendar/gui/caltypes.xml.h:35
+#: ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "ਕੈਟਾਗਰੀਆਂ"
+
+#: ../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:361
+msgid "Summary"
+msgstr "ਸੰਖੇਪ"
+
+#: ../calendar/gui/caltypes.xml.h:37
+#: ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
+#: ../calendar/gui/caltypes.xml.h:38
+#: ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "ਜਵਾਬ"
+
+#: ../calendar/gui/caltypes.xml.h:39
+#: ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "ਸਮਾਂ &amp; ਖਰਚੇ"
+
+#: ../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 "ਉਡੀਕ ਜਾਰੀ..."
+
+#: ../calendar/gui/caltypes.xml.h:42
+#: ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47
+#: ../mail/em-filter-i18n.h:10
+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
+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
+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
+msgid "is not"
+msgstr "ਇਹ ਨਹੀਂ"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਗਲਤੀ"
@@ -5365,11 +5559,12 @@ msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਤਰੀਕਾ ਸਹਾਇਕ à
 msgid "Permission denied to open the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429
+#: ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "ਅਲਾਰਮ ਸੋਧ"
 
@@ -5402,17 +5597,17 @@ msgid "Mes_sage:"
 msgstr "ਸ�ਨੇਹਾ(_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "ਧ�ਨੀ ਚਲਾਉ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
@@ -5425,7 +5620,7 @@ msgid "Send To:"
 msgstr "ਨੂੰ ਭੇਜੋ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "ਇੱਕ ਈ-ਮੇਲ ਭੇਜੋ"
 
@@ -5480,7 +5675,7 @@ msgstr "ਮਿੰਟ"
 msgid "start of appointment"
 msgstr "ਮ�ਲਾਕਾਤ ਨਾਲ ਸ਼�ਰੂ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "ਕਾਰਵਾਈ/ਤਬਦੀਲ"
 
@@ -5491,16 +5686,15 @@ msgstr "ਸ਼ਾਮਲ(_d)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "ਅਲਾਰਮ"
 
-#: ../calendar/gui/dialogs/cal-attachment-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
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ �ਲਕ ਲਈ ਸ��ਾਅ(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "ਫਾਇਲ ਜੋੜੋ"
 
@@ -5567,8 +5761,8 @@ msgid "Display"
 msgstr "ਡਿਸਪਲੇਅ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ਸ਼�ੱਕਰਵਾਰ"
 
@@ -5583,8 +5777,8 @@ msgstr ""
 "ਦਿਨ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
@@ -5607,7 +5801,7 @@ msgstr ""
 "�ਤਵਾਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "ਰੰਗ ਚ�ਣੋ"
 
@@ -5617,8 +5811,8 @@ msgid "S_un"
 msgstr "�ਤ(_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
@@ -5635,8 +5829,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫਤੇ ਦੇ ਦਿਨ ਵੇਖਾਓ(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "�ਤਵਾਰ"
 
@@ -5654,13 +5848,13 @@ msgid "Template:"
 msgstr "ਟੈਪਲੇਟ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
 #: ../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 "ਸਮਾਂ-ਖੇਤਰ(_z):"
 
@@ -5669,14 +5863,14 @@ msgid "Time format:"
 msgstr "ਸਮਾਂ-ਫਾਰਮੈਟ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ਬ�ੱਧਵਾਰ"
 
@@ -5754,302 +5948,480 @@ msgstr "ਬ�ੱਧ(_W)"
 msgid "before every appointment"
 msgstr "ਹਰ ਮ�ਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕੈਲੰਡਰ ਭਾਗ ਨਕਲ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਲਿਸਟ ਭਾਗਾਂ ਨੂੰ ਲੋਕਲ ਨਕਲ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਲਿਸਟ ਭਾਗਾਂ ਨੂੰ ਲੋਕਲ ਨਕਲ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#, fuzzy
+msgid "Colo_r:"
 msgstr "ਰੰਗ(_o):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "ਟਾਸਕ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "ਕੈਲੰਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਗ�ਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+#, fuzzy
+msgid "New Task List"
+msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ(_N)"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+#, fuzzy
+msgid "Memo List Properties"
+msgstr "ਟਾਸਕ ਲਿਸਟ ਗ�ਣ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "ਇਹ ਘਟਨਾ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "ਇਹ ਕੰਮ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "ਇਹ ਮੀਮੋ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ। ਇਹਨਾਂ ਤਬਦੀਲੀਂ ਨੂੰ ਭ�ੱਲਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  ਤ�ਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤੀ ਹੈ, ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "ਇਹ ਘਟਨਾ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "ਇਹ ਕੰਮ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "ਇਹ ਮੀਮੋ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ। ਇਹਨਾਂ ਤਬਦੀਲੀਂ ਨੂੰ ਭ�ੱਲਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ਤ�ਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤੀ ਹੈ, ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "ਜਾਂਚ ਗਲਤੀ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182
+#: ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186
+#: ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188
+#: ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "ਨੱਥੀ ਸ�ਨੇਹਾ - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ਸ਼ਾਮਿਲ ਸ�ਨੇਹਾ"
 msgstr[1] "%d ਨੱਥੀ ਸ�ਨੇਹੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../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
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483
+#: ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008
+#: ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "ਚ�ੱਕਣਾ ਰੱਦ(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "ਮ�ਲਾਕਾਤ ਸੋਧ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "ਮੀਟਿੰਗ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "ਮ�ਲਾਕਾਤ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "ਮਿਲੇ ਕੰਮ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "ਕੰਮ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "ਮੀਮੋ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+#, fuzzy
+msgid "No Summary"
+msgstr "ਸੰਖੇਪ ਨਹੀਂ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਲਈ ਦਬਾਓ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "ਚ�ਣਿਆ ਟੈਕਸਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕਰੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "ਉਪਲੱਬਧ ਮੱਦਦ ਵੇਖਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਨਕਲ ਕਰੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਸੰਭਾਲਣ ਲਈ ਦਬਾਓ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "ਸਾਰਾ ਟੈਕਸਟ ਚ�ਣੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "ਵਰਗੀਕਰਨ(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "ਫਾਇਲ(_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "ਮੱਦਦ(_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+#, fuzzy
+msgid "_Insert"
+msgstr "ਸ਼ਾਮਿਲ(_i)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "ਚੋਣ(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../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 "ਵੇਖੋ(_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "ਨੱਥੀ(_a)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "ਇੱਕ ਫਾਇਲ ਨੱਥੀ ਕਰਨ ਲਈ ਦਬਾਓ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "ਕੈਟਾਗਰੀ(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ �ਲਕ ਕੈਟਾਗਰੀ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "ਪਬਲਿਕ(_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "ਨਿੱਜੀ(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+#, fuzzy
+msgid "Classify as private"
+msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "ਗ�ਪਤ(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "ਗ�ਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "ਰੋਲ ਖੇਤਰ(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਖ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "ਫੀ-ਸਦੀ ਮ�ਕੰਮਲ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "ਨੱਥੀ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../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
 #: ../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 "ਹਟਾਓ(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "ਨੱਥੀ ਵੇਖਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "ਮ�ਲਾਕਾਤ ਸੋਧ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "ਮੀਟਿੰਗ - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "ਮ�ਲਾਕਾਤ - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "ਮਿਲੇ ਕੰਮ - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "ਕੰਮ - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "ਮੀਮੋ - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "ਸੰਖੇਪ ਨਹੀਂ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "ਸਰੋਤ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "ਨਿਯਤ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "ਨਿਯਤ ਸਿਰਫ ਪੜਨ ਲਈ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ਹੋਰ ਸਭ ਪ�ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਦੇ ਪੱਤਰ-ਬਕਸੇ ਵਿੱਚ ਇਹ ਇਕਾਈ ਹਟਾਉਣੀ ਹੈ?(_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "ਇਹ ਘਟਨਾ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "ਇਹ ਕੰਮ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "ਇਹ ਮੀਮੋ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "ਇਹ ਇਕਾਈ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "ਇਹ ਘਟਨਾ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਈ ਨਹੀ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "ਇਹ ਕੰਮ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "ਇਹ ਮੀਮੋ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "ਇਹ ਇਕਾਈ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਈ ਨਹੀ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "ਇਹ ਘਟਨਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "ਇਹ ਕੰਮ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "ਇਹ ਮੀਮੋ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "ਇਹ ਇਕਾਈ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
@@ -6058,7 +6430,7 @@ msgid "Contacts..."
 msgstr "ਸੰਪਰਕ..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "ਇਸ ਲਈ ਪ�ਰਤੀਨਿਧ:"
 
@@ -6066,135 +6438,185 @@ msgstr "ਇਸ ਲਈ ਪ�ਰਤੀਨਿਧ:"
 msgid "Enter Delegate"
 msgstr "ਪ�ਰਤੀਨਿਧ ਦਿਓ"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "ਅਲਾਰਮ(_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਨੂੰ ਸੈੱਟ ਜਾਂ ਨਾ-ਸੈੱਟ ਕਰਨ ਲਈ ਦਬਾਓ"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "ਦ�ਹਰਾ(_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "ਭੇਜਣ ਚੋਣ"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "ਸਭ ਦਿਨ ਘਟਨਾਵਾਂ(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Show Time as _Busy"
+msgstr "ਸਮਾਂ ਰ��ੇ ਵਾਂਗ ਵੇਖਾਓ(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "ਵੇਹਲਾ/ਰ��ਿਆ(_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰ��ਿਆ ਜਾਣਕਾਰੀ ਪਤਾ ਕਰੋ"
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "ਮ�ਲਾਕਾਤ(_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "ਦ�ਹਰਾਓ"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "ਪ�ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "ਪ�ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼�ਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "ਸ਼�ਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "ਸ਼�ਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "ਚ�ਣੇ ਪ�ਰਬੰਧਕ ਦਾ ਅਕਾਊਂਟ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ�ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "ਸ਼ਾਮਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤ�ਸੀਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਕੰਮ ਕਰ ਰਹੇ ਹੋ"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158
+#: ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685
+#: ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2011
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../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-signature-combo-box.c:69
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀ"
 
@@ -6219,23 +6641,25 @@ msgid "Custom Alarm:"
 msgstr "ਅਲਾਰਮ ਸੋਧ:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "ਵੇਰਵਾ(_e):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "ਘਟਨਾ ਵੇਰਵਾ"
 
-#: ../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 "ਸੰਖੇਪ(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "ਅਲਾਰਮ(_A)"
 
+#: ../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 "ਵੇਰਵਾ(_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "ਸਮਾਂ(_T):"
@@ -6266,28 +6690,29 @@ msgstr "ਪ�ਰਬੰਧਕ ਤਬਦੀਲ(_O):"
 msgid "Co_ntacts..."
 msgstr "ਸੰਪਰਕ(_N)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "ਪ�ਰਬੰਧਕ"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "ਪ�ਰਬੰਧਕ:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141
+#: ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002
+#: ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620
+#: ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77
+#: ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -6300,63 +6725,59 @@ msgstr "ਸ਼�ਰੂਆਤੀ ਮਿਤੀ(_r):"
 msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "ਵੇਰਵਾ(_D):"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "ਗਰ�ੱਪ(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ਤ�ਸੀਂ ਇੱਕ ਆਵਰਤੀ ਘਟਨਾ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤ�ਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ਤ�ਸੀਂ ਇੱਕ ਆਵਰਤੀ ਘਟਨਾ ਲਈ ਪ�ਰਤੀਨਿਧ ਕਰ ਰਹੇ ਹੋ, ਤ�ਸੀਂ ਕੀ ਪ�ਰਤੀਨਿਧ ਬਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ਤ�ਸੀਂ ਇੱਕ ਆਵਰਤੀ ਕੰਮ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤ�ਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ਤ�ਸੀਂ ਇੱਕ ਆਵਰਤੀ ਮੀਮੋ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤ�ਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "ਇਸ ਮੌਕੇ ਤੇ ਹੀ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "ਇਹ ਅਤੇ ਪਹਿਲ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "ਇਹ ਅਤੇ ਭਵਿੱਖਤ ਮੌਕੇ ਲਈ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "ਸਭ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ਇਸ ਮ�ਲਾਕਾਤ ਵਿੱਚ ਲੜੀ ਹੈ, ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸੋਧ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "ਚਾਲੂ"
 
@@ -6364,7 +6785,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
@@ -6373,7 +6794,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "ਦੂਜਾ"
 
@@ -6381,7 +6802,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "ਤੀਜਾ"
 
@@ -6389,7 +6810,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "ਚੌਥਾ"
 
@@ -6397,13 +6818,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "ਆਖਰੀ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "ਹੋਰ ਮਿਤੀ"
 
@@ -6411,7 +6832,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1ਲੇ ਤੋਂ 10ਵਾਂ"
 
@@ -6419,7 +6840,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11ਵੇਂ ਤੋਂ 20ਵਾਂ"
 
@@ -6427,45 +6848,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "ਇਸ ਤੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ਮੌਜੂਦਗੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "ਅਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "ਸੋਧ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "ਅਪਵਾਦ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "ਹਟਾਉਣ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "ਮਿਤੀ/ਸਮਾਂ"
 
@@ -6516,12 +6937,12 @@ msgstr "ਹਫਤਾ"
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "ਸੰਪੂਰਨ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "ਵੈਬ ਸਫਾ"
 
@@ -6536,51 +6957,64 @@ msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642
+#: ../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
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "ਉਚਤਮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641
+#: ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "ਨਿਊਨਤਮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
+#: ../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
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ਸ਼�ਰੂ ਨਹੀਂ ਹੈ"
 
@@ -6593,7 +7027,8 @@ msgid "Stat_us:"
 msgstr "ਹਾਲਤ(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570
+#: ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
@@ -6602,7 +7037,7 @@ msgid "_Date completed:"
 msgstr "ਸੰਪੂਰਨ ਮਿਤੀ(_D):"
 
 #: ../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 "ਪਹਿਲ(_P):"
 
@@ -6610,25 +7045,38 @@ msgstr "ਪਹਿਲ(_P):"
 msgid "_Web Page:"
 msgstr "ਵੈਬ ਸਫ਼ਾ(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:111
+msgid "_Status Details"
+msgstr "ਹਾਲਤ ਵੇਰਵਾ(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ / ਵੇਖੋ ਨੂੰ ਦਬਾਓ"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "ਭੇਜਣ ਚੋਣ(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "ਕੰਮ(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧਕ(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
@@ -6642,19 +7090,15 @@ msgid "Categor_ies..."
 msgstr "ਕੈਟਾਗਰੀ(_i)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "ਵੇਰਵਾ(_s):"
+msgid "D_ue date:"
+msgstr "ਮਿਆਦ(_u):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "ਸਮਾਂ-ਖੇਤਰ:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "ਮਿਆਦ(_D):"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6662,142 +7106,129 @@ 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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ਹਫਤਾ"
 msgstr[1] "%d ਹਫਤਾ"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "ਅਣਪਛਾਤੀ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਹੈ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "ਅਣਪਛਾਤੀ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73
+#: ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "ਬਿਨਾਂ ਨਾਂ"
 
-#: ../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
+#: ../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 "ਸ਼�ਰੂਆਤੀ ਮਿਤੀ:"
 
-#: ../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:69
+#: ../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 "ਵੇਰਵਾ:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "ਵੈਬ ਸਫਾ:"
 
-#: ../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 "ਸੰਖੇਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "ਮਿਆਦ:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "ਸਥਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "ਸਰਵਜਨਕ"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "ਨਿੱਜੀ"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "ਗ�ਪਤ"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
@@ -6807,21 +7238,14 @@ msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 msgid "Start Date"
 msgstr "ਸ਼�ਰੂ ਮਿਤੀ"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "ਸੰਖੇਪ"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "ਵੇਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "ਰ��ਿਆ"
 
@@ -6835,199 +7259,256 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025
+#: ../calendar/gui/e-cal-model.c:976
+#: ../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 "ਹਾਂ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:976
+#: ../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 "ਨਹੀ"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2036
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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-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
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "ਅਣਪਛਾਤਾ"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "ਆਵਿਰਤੀ"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183
+#: ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "ਇੰ� ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199
+#: ../mail/em-format-html-display.c:2029
 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:231
+#: ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ਬਿਨ_ਨਾਂ_ਚਿੱਤਰ.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:561
+#: ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "ਇੰ� ਸੰਭਾਲੋ(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286
+#: ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਉ(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "ਚ�ਣੇ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428
+#: ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ਨਾਲ ਖੋਲ�ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "ਪ�ਰਬੰਧਕ: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "ਸ਼�ਰੂ:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "ਬਾਕੀ:"
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665
+#: ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "ਚ�ਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795
+#: ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-calendar-table.c:1137
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-msg-composer.c:1472
+#: ../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
 msgid "Save as..."
 msgstr "ਇੰ� ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "ਨਵਾਂ ਕੰਮ(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "ਵੈੱਬ ਸਫਾ ਖੋਲੋ(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677
+#: ../calendar/gui/e-memo-table.c:931
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ਕੱਟੋ(_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
-#: ../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
+#: ../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
+#: ../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 "ਚਿਪਕਾਓ(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1376 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪੂਰਾ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ਚ�ਣੇ ਕੰਮ ਪੂਰੇ ਹੋ� ਨਿਰਧਾਰਿਤ ਕਰੋ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪੂਰਾ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "ਚ�ਣੇ ਕੰਮ ਨਾ-ਪੂਰੇ ਹੋਇਆ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1386
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "ਚ�ਣੇ ਕੰਮ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1623
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ਕੰਮ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -7050,7 +7531,8 @@ msgid "Due date"
 msgstr "ਮਿਆਦ"
 
 #: ../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:372
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
@@ -7058,112 +7540,97 @@ msgstr "ਪਹਿਲ"
 msgid "Start date"
 msgstr "ਸ਼�ਰੂਆਤੀ ਮਿਤੀ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ਸਥਿਤੀ"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "ਆਈਟਮਾਂ ਭੇਜੋ"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "ਆਈਟਮਾਂ ਦੀ ਨਕਲ"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "ਨਵੀਂ ਮ�ਲਾਕਾਤ(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "ਨਵੀਂ ਸਾਰੇ ਦਿਨ ਦੀ ਮ�ਲਾਕਾਤ(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "ਮੌਜੂਦਾ �ਲਕ(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "ਅੱਜ ਚ�ਣੋ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "ਮਿਤੀ ਚ�ਣੋ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਨਕਲ(_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "ਪ�ਰਤੀਨਿਧ ਮੀਟਿੰਗ(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "ਮੀਟਿੰਗ ਨਿਯਤ ਸਮਾਂ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "ਜਵਾਬ(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689
+#: ../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 "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "ਪ�ਰਬੰਧਕ: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "ਪ�ਰਬੰਧਕ: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
@@ -7192,7 +7659,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:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰਟ ਵੰਡ"
@@ -7203,46 +7670,38 @@ 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:1359
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 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:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791
+#: ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "ਸਵੇਰ"
 
 #. 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:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794
+#: ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾਂ (ਗ�ੰ�ਲਦਾਰ ਆਵਰਤੀ)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ਹਰ ਦਿਨ"
 msgstr[1] "ਹਰ %d ਦਿਨ"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7250,9 +7709,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7260,51 +7717,35 @@ msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " ਅਤੇ "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "ਦਿਨ %s "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ਵਿੱਚੋਂ"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ਹਰ ਮਹੀਨੇ"
 msgstr[1] "ਮਹੀਨੇ ਵਿੱਚ %d ਵਾਰ"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ਹਰ ਸਾਲ"
 msgstr[1] "ਹਰ %d ਸਾਲ"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7312,334 +7753,341 @@ msgstr[0] "ਕ�ੱਲ %d ਵਾਰ"
 msgstr[1] "ਕ�ੱਲ %d ਵਾਰ "
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", ਤੇ ਸਮਾਪਤੀ"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "ਸ਼�ਰੂ"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "ਬਕਾਇਆ"
 
-#: ../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 "iCalendar ਜਾਣਕਾਰੀ"
 
 #  Title
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: ../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> ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਤੇ ਮ�ੜ ਵਿਚਾਰ ਕਰੋ ਅਤੇ ਮੇਨੂ ਤੋਂ ਤੱਦ ਕੋਈ ਕਾਰਵਾਈ ਚ�ਣੋ।"
 
-#: ../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:728
-#: ../plugins/itip-formatter/itip-formatter.c:2024
+#: ../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:2034
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2027
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2030
+#: ../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:2040
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:1266
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+#: ../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> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ�ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "ਮੀਟਿੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ"
 
-#: ../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> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ %s ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../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> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤ�ਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "ਮੀਟਿੰਗ ਸ��ਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> ਇੱਕ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹ�ੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ"
 
-#: ../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> ਨਵੀਂ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ�ਰਾਪਤ ਕਰਨੀ ਚਾਹ�ੰਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ ਮੰਗ"
 
-#: ../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> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "ਮੀਟਿੰਗ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ"
 
-#: ../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> ਨੇ ਇੱਕ ਨਾ ਬੇਸਮ� ਸ�ਨੇਹਾ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "ਗਲਤ ਮੀਟਿੰਗ ਸ�ਨੇਹਾ"
 
-#: ../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> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪ�ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../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> ਨੇ %s ਨੂੰ ਕਾਰਜ ਪੂਰਾ ਕਰਨ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../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> ਤ�ਹਾਨੂੰ ਇੱਕ ਕੰਮ ਲਈ ਕਹਿ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "ਕੰਮ ਸ��ਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> ਨੇ ਇੱਕ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਣ ਦੀ ਇੱਛਾ ਜਤਾਈ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "ਕੰਮ ਅੱਪਡੇਟ"
 
-#: ../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> ਤਾਜੀ ਕੰਮ ਜਾਣਕਾਰੀ ਪ�ਰਾਪਤ ਕਰਨੀ ਚਾਹ�ੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "ਕੰਮ ਅੱਪਡੇਟ ਬੇਨਤੀ"
 
-#: ../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> ਨੇ ਜਾਰੀ ਕੰਮ ਲਈ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "ਕੰਮ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "ਕੰਮ ਰੱਦੀਕਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "ਗਲਤ ਕੰਮ ਸ�ਨੇਹਾ"
 
-#: ../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> ਨੇ ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ ਪ�ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../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> ਨੇ ਤ�ਹਾਡੀ ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਬੇਨਤੀ"
 
-#: ../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> ਨੇ ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆਂ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "ਗਲਤ ਵੇਹਲਾ/ਰ��ਿਆ ਸ�ਨੇਹਾ"
 
-#: ../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 "ਸ�ਨੇਹਾ ਆਪਣੇ ਸਹੀਂ ਸਰੂਪ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "ਸ�ਨੇਹੇ ਵਿੱਚ ਨਾ-ਸਹਾਇਕ ਬੇਨਤੀਆਂ ਹਨ।"
 
-#: ../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 "ਨੱਥੀ ਵਿੱਚ ਇੱਕ ਜਾਇਜ ਕੈਲੰਡਰ ਸ�ਨੇਹਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਕੋਈ ਵੀ ਵੇਖਣਯੋਗ ਕੈਲੰਡਰ ਇਕਾਈ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "ਨਵੀਨੀਕਰਮ ਪੂਰਨ\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 "ਇਕਾਈ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\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 "ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਿਲ ਕਰਨਾ ਹੈ?"
 
-#: ../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 "ਗਲਤ ਹਾਲਤ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹ�ਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
 
-#: ../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 "ਇਕਾਈ ਭੇਜੀ!\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 " ਇਕਾਈ ਨੂੰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "ਕਾਰਵਾਈ ਚ�ਣੋ"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:2331
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "ਜਵਾਬ ਦੇਣ ਵਾਲਿਆਂ ਦੀ ਹਾਲਤ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470
+#: ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
@@ -7668,112 +8116,127 @@ msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 msgid "Server Message:"
 msgstr "ਸਰਵਰ ਸ�ਨੇਹਾ:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "ਪ�ਰਧਾਨ"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "ਲੋੜੀਦੀ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "ਦਰਸ਼ਕ"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "ਕ�ਰਸੀ"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "ਲੋੜੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
-#: ../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 "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
-#: ../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:737
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../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
 msgid "Delegated"
 msgstr "ਪ�ਰਤੀਨਿਧੀ"
 
 #. 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:526
+#: ../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 "ਕਾਰਵਾਈ ਅਧੀਨ"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7781,85 +8244,81 @@ 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤੋਂ ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "ਦਰਸ਼ਕ(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "ਚੋਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ ਕੰਮ-ਘੰਟੇ ਹੀ ਵੇਖਾਉ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "ਆਕਾਰ ਵੱਡਾ ਵੇਖਾਓ(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਅੱਪਡੇਟ(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "ਸਵੈ-ਚੋਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਸਰੋਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਇੱਕ ਸਰੋਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "ਲੋੜੀਦੇ ਵਿਅਕਤੀ(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "ਲੋੜੀਦੇ ਲੋਕ ਤੇ ਇੱਕ ਸਰੋਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "ਸ਼�ਰੂਆਤੀ ਸਮਾਂ(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "ਦਰਸ਼ਕ"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "ਦਰਸ਼ਕ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -7884,16 +8343,18 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮੈਂਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "ਚ�ਣੇ ਮੀਮੋ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7902,37 +8363,38 @@ msgstr ""
 "%s ਤੇ ਗਲਤੀ:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
+#: ../calendar/gui/e-memos.c:1062
+#: ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "ਚ�ਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: ../calendar/gui/e-tasks.c:975
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "ਕੰਮ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1065
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1310
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "ਕੰਮ ਪੂਰੇ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-tasks.c:1360
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "ਸਮਾਂ ਖੇਤਰ ਚ�ਣੋ"
 
@@ -7942,48 +8404,44 @@ msgstr "ਸਮਾਂ ਖੇਤਰ ਚ�ਣੋ"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348
+#: ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "ਨਵੀਵੀਕਰਨ ਸਵਾਲ"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "�ਲਕ ਸੋਧ(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "ਸੋਧ �ਲਕ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "�ਲਕ ਪ�ਰਭਾਸ਼ਿਤ ਕਰੋ(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s ਉੱਤੇ ਮ�ਲਾਕਾਤ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਲੋਡ ਕਰੋ"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s ਖੋਲ�ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -8043,57 +8501,62 @@ msgstr "ਸਤੰਬਰ"
 msgid "_Select Today"
 msgstr "ਅੱਜ ਚ�ਣੋ(_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "ਇੱਕ ਪ�ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626
+#: ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "ਘਟਨਾ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628
+#: ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "ਨਵੀਨ"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "ਮ�ੜ-ਤਾਜ਼ਾ"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "ਉਲਟ ਸ��ਾਅ"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵੇਹਲਾ/ਰ��ਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾਗਮ ਲਈ ਤ�ਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ"
 
@@ -8108,7 +8571,8 @@ 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:546
+#: ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8132,50 +8596,57 @@ msgstr "ਮੀਮੋ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪà
 msgid "Memo Source Selector"
 msgstr "ਮੀਮੋ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "ਨਵਾਂ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮੀਮੋ(_o)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਮੀਮੋ ਇਕਾਈ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "ਨਵਾਂ ਸਾਂ�ਾ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "ਸਾਂ�ਾ ਮੀਮੋ(_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਸਾਂ�ਾ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "ਨਵਾਂ ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "ਅੱਗੇ 7 ਦਿਨ"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"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 ""
@@ -8183,10 +8654,9 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ, ਜਦ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ ਫੋਲਡਰ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੀ ਹੈ..."
 
-#: ../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"
+"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 ""
@@ -8196,29 +8666,30 @@ msgstr ""
 
 #  FIXME: set proper domain/code
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775
+#: ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb ਤੋਂ ਪ�ਰਾਣੇ ਸੈਟਿੰਗ ਪ�ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ਕੈਲੰਡਰ `%s' ਮਾਈਗਰੇਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "ਕੰਮ `%s' ਮਾਈਗਰੇਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #: ../calendar/gui/migration.c:1227
-#: ../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
+#: ../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
 msgid "Notes"
 msgstr "ਨੋਟ"
 
@@ -8375,57 +8846,52 @@ msgstr "ਸ਼�ੱਕਰ"
 msgid "Sa"
 msgstr "ਸ਼ਨਿਚੱਰ"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "ਮ�ਲਾਕਾਤ"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰਖੇਪ: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "ਦਰਸ਼ਕ:"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤੀਸ਼ਤ ਪੂਰਾ: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "ਕੈਟਾਗਰੀ: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "ਸੰਪਰਕ: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "ਆ ਰਹੀਆਂ ਮ�ਲਾਕਾਤਾਂ"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ(_N)"
@@ -8454,93 +8920,123 @@ msgstr "ਕੰਮ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲà
 msgid "Task Source Selector"
 msgstr "ਕੰਮ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "ਨਵਾਂ ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "ਕੰਮ(_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਦਿਓ"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_d)"
+msgstr "ਦਿੱਤਾ ਕੰਮ(_d)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ "
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "ਟਾਸਕ ਲਿਸਟ(_k)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ ਬਣਾਉ"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"ਇਸ ਕਾਰਵਾਈ ਨਾਲ ਸਾਰੇ ਚ�ਣੀਆਂ ਕਾਰਵਾਈਆਂ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਈਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਇਹ "
-"ਕੰਮ ਮ�ੜ ਮਿਲ ਨਾ ਸਕਣਗੇ।\n"
+"ਇਸ ਕਾਰਵਾਈ ਨਾਲ ਸਾਰੇ ਚ�ਣੀਆਂ ਕਾਰਵਾਈਆਂ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਈਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਇਹ ਕੰਮ ਮ�ੜ ਮਿਲ ਨਾ ਸਕਣਗੇ।\n"
 "\n"
 "ਕੀ ਤ�ਸੀਂ ਇਹਨਾਂ ਕੰਮਾਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ਮੈਨੂੰ ਮ�ੜ ਨਾ ਪ�ੱਛੋ।"
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% ਮ�ਕੰਮਲ"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "ਰੱਦ ਕੀਤਾ"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
+
+#: ../calendar/gui/tasktypes.xml.h:50
+#: ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "ਤੋ ਜਿਆਦਾ ਹੈ"
+
+#: ../calendar/gui/tasktypes.xml.h:51
+#: ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "ਤੋ ਘੱਟ ਹੈ"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "ਮ�ਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ�ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾਇਲਾਂ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar ਫਾਇਲਾਂ (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕ�ਸ਼ਲ ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
@@ -10077,146 +10573,328 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 msgid "Pacific/Yap"
 msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪੀ"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "ਆਟੋ-ਸੰਭਾਲੀ ਫਾਈਲ ਖੋਲ�ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "ਭੇਜਣ ਲਈ ਨਿਯਤ"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "ਸੰਪਾਦਕ ਤੋਂ ਸ�ਨੇਹਾ ਪ�ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "ਸ�ਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚ�ਣੋ"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "ਨੱਥੀ ਸ਼ਾਮਲ"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚ�ਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "ਨੱਥੀ(_t)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "ਦਸਤਖਤ(_g):"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "ਗ਼ੈਰ-ਟਾਇਟਲ ਸ�ਨੇਹਾ"
+
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "ਇੱਕ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#: ../composer/e-composer-actions.c:479
+#: ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
+
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਬੰਦ ਕਰੋ"
+
+#: ../composer/e-composer-actions.c:486
+#: ../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 "ਪਰਿੰਟ ਕਰੋ(_P)..."
+
+#: ../composer/e-composer-actions.c:493
+#: ../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 "ਛਪਾਈ �ਲਕ(_v)"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "ਇੰ� ਸੰਭਾਲੋ(_A)..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਨੂੰ ਵੱਖਰੇ ਨਾਂ ਨਾਲ ਸੰਭਾਲੋ"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_D)"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "ਭੇਜੋ(_e)"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "ਇਹ ਸ�ਨੇਹਾ ਭੇਜੋ"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "ਭੇਜਣ ਚੋਣਾਂ ਸ਼ਾਮਲ"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "ਨਵਾਂ ਸ�ਨੇਹਾ(_M)"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "ਨਵੀਂ ਸ�ਨੇਹਾ ਵਿੰਡੋ ਖੋਲ�ਹੋ"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_E)"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "ਸ�ਰੱਖਿਆ(_S)"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP ਇੰਕ�ਰਿਪਟ(_E)"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "ਇਸ ਸ�ਨੇਹੇ ਨੂੰ PGP ਨਾਲ ਇੰਕ�ਰਿਪਟ ਕਰੋ"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP ਦਸਤਖਤ(_S)"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "ਆਪਣੀ PGP ਕੀ ਨਾਲ ਇਸ ਸ�ਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "ਦਰਜਾ ਸ�ਨੇਹਾ(_P)"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "ਸ�ਨੇਹੇ ਦਾ ਦਰਜਾ ਵਧਾਓ"
+
+#: ../composer/e-composer-actions.c:585
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "ਪੜਨ ਰਸੀਦ ਦੀ ਮੰਗ(_E)"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "ਜਦੋਂ ਤ�ਹਾਡਾ ਸ�ਨੇਹਾ ਪੜਿਆ ਜਾਵੇ ਤਾਂ ਪ�ਰਾਪਤੀ ਸੂਚਨਾ ਲਵੋ"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME ਇੰਕ�ਰਿਪਟ(_C)"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "ਇਸ ਸ�ਨੇਹੇ ਨੂੰ ਆਪਣੇ S/MIME ਇਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਕਰਿਪਟ ਕਰੋ"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME ਸਾਇਨ(_n)"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "ਆਪਣੇ S/MIME ਦਸਤਖਤ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਸ ਸ�ਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "_Bcc ਖੇਤਰ"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ BCC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "_Cc ਖੇਤਰ"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ CC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "ਵੱਲੋਂ ਖੇਤਰ(_F)"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲੋਂ ਚੋਣਕਾਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "ਭੇਜਣਾ ਖੇਤਰ(_P)"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਭੇਜੋ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "ਜਵਾਬ ਖੇਤਰ(_R)"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਜਵਾਬ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-actions.c:649
+#, fuzzy
+msgid "_Subject Field"
+msgstr "_Cc ਖੇਤਰ"
+
+#: ../composer/e-composer-actions.c:651
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "ਵੱਲ ਖੇਤਰ(_T)"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "ਸ�ਨੇਹੇ ਦੇ ਪ�ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "ਉਹ ਸਿਰਨਾਵੀਂ ਦਿਓ, ਜੋ ਕਿ ਸ�ਨੇਹੇ ਦੀ ਨਕਲ ਪ�ਰਾਪਤ ਕਰੇ"
+
+#: ../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 "ਇਸ ਸ�ਨੇਹੇ ਦੇ ਪ�ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਲਗਣ ਤੋਂ ਬਗੈਰ ਕਾਪੀ ਪ�ਰਾਪਤ ਕਰਨ (ਕਾਰਬਨ ਕਾਪੀ) ਵਾਲੇ ਦਾ �ਡਰੈੱਸ।"
 
 #  * From
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "ਵਲੋਂ(_o):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "ਜਵਾਬ(_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "ਸ�ਨੇਹੇ ਦੇ ਪ�ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "ਉਹ ਸਿਰਨਾਵੀਂ ਦਿਓ, ਜੋ ਕਿ ਸ�ਨੇਹੇ ਦੀ ਨਕਲ ਪ�ਰਾਪਤ ਕਰੇ"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr "ਇਸ ਸ�ਨੇਹੇ ਦੇ ਪ�ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਲਗਣ ਤੋਂ ਬਗੈਰ ਕਾਪੀ ਪ�ਰਾਪਤ ਕਰਨ (ਕਾਰਬਨ ਕਾਪੀ) ਵਾਲੇ ਦਾ �ਡਰੈੱਸ।"
-
 #  * Post-To
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "ਭੇਜੋ(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "ਨੱਥੀ(_t)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "ਨੱਥੀ ਸ਼ਾਮਲ"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../composer/e-msg-composer.c:819
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "ਬਾਹਰੀ ਸ�ਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "ਭੇਜਣ ਲਈ ਨਿਯਤ"
 
-#: ../composer/e-msg-composer.c:826
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸ�ਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਇਕ�ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "ਸ�ਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚ�ਣੋ"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
-msgid "Hide _Attachment Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚ�ਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
+
+#: ../composer/e-composer-private.c:65
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "ਫੀ-ਸਦੀ ਮ�ਕੰਮਲ"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
+#: ../composer/e-composer-private.c:180
+#: ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_A)"
 
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "ਅਣਪਛਾਤਾ ਕਾਰਨ"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "ਫਾਇਲ਼ ਨੂੰ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+#: ../composer/e-msg-composer.c:872
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "ਬਾਹਰੀ ਸ�ਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "ਸੰਪਾਦਕ ਤੋਂ ਸ�ਨੇਹਾ ਪ�ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
+#: ../composer/e-msg-composer.c:879
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸ�ਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਇਕ�ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-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
+#: ../mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "ਨੱਥੀ"
+msgstr[1] "ਨੱਥੀ"
 
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "ਫਾਇਲ ਖੋਲੋ"
+#: ../composer/e-msg-composer.c:1556
+msgid "Hide _Attachment Bar"
+msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
 
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1573
+#: ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "ਸ�ਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:5031
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:4055
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(ਲੇਖਣ ਵਿੱਚ ਕ�� ਨਾ-ਟੈਕਸਟ ਭਾਗ ਹੈ, ਜਿਸ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।) <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 ""
-" ਕ�� ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਪੱਤਰ ਭੇਜਣ ਨਾਲ ਬਾਕੀ ਰਹਿੰਦੇ ਨੱਥੀਆਂ ਬਿਨਾਂ ਹੀ ਪੱਤਰ "
-"ਚਲਿਆ ਜਾਵੇਗਾ।"
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr " ਕ�� ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਪੱਤਰ ਭੇਜਣ ਨਾਲ ਬਾਕੀ ਰਹਿੰਦੇ ਨੱਥੀਆਂ ਬਿਨਾਂ ਹੀ ਪੱਤਰ ਚਲਿਆ ਜਾਵੇਗਾ।"
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "ਸਭ ਅਕਾਊਂਟ ਹਟਾ� ਜਾਣ।"
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਲਿਖੇ ਜਾ ਰਹੇ ਸ�ਨੇਹੇ ਟਾਇਟਲ '{0}' ਨਾਲ, ਨੂੰ ਤ�ਸੀਂ ਨਿਕਾਰ ਦੇਣਾ ਚਾਹ�ੰਦੇ ਹੋ? "
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -10229,20 +10907,13 @@ msgstr "ਕਿਉਕਿ &quot;{0}&quot;, ਤà©�ਹਾਨੂੰ ਵੱਖਰੀà¨
 #  mail:no-delete-folder secondary
 #  system:no-save-file secondary
 #  system:no-load-file secondary
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "ਕਿਉਕਿ &quot; {1}&quot;।"
 
 #: ../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 ""
-"ਇਸ ਲੇਖਕ �ਰੋਖੇ ਨੂੰ ਬੰਦ ਕਰਨ ਨਾਲ ਬਣਈ ਜਾ ਰਹੀ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ ਤਬਦੀਲੀਆਂ ਹਮੇਸ਼ਾ ਲਈ ਰੱਦ ਹੋ "
-"ਜਾਣਗੀਆਂ, ਜਦੋਂ ਤੱਕ ਕਿ ਤ�ਸੀਂ ਸ�ਨੇਹੇ ਨੂੰ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਦੇ ਨਹੀਂ। ਇਹ ਫਿਰ ਕਿਸੇ ਦਿਨ ਸ�ਨੇਹੇ ਨੂੰ ਮ�ੜ "
-"ਲਿਖਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ।"
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "ਇਸ ਲੇਖਕ �ਰੋਖੇ ਨੂੰ ਬੰਦ ਕਰਨ ਨਾਲ ਬਣਈ ਜਾ ਰਹੀ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ ਤਬਦੀਲੀਆਂ ਹਮੇਸ਼ਾ ਲਈ ਰੱਦ ਹੋ ਜਾਣਗੀਆਂ, ਜਦੋਂ ਤੱਕ ਕਿ ਤ�ਸੀਂ ਸ�ਨੇਹੇ ਨੂੰ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਦੇ ਨਹੀਂ। ਇਹ ਫਿਰ ਕਿਸੇ ਦਿਨ ਸ�ਨੇਹੇ ਨੂੰ ਮ�ੜ ਲਿਖਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10281,17 +10952,11 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ ਕਿਉਕਿ &quot;{1}&quot;"
 
 #: ../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 ""
-"ਈਵੇਲੂਸ਼ਨ ਉਸ ਸਮੇਂ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ ਸੀ, ਜਦੋਂ ਕਿ ਤ�ਸੀਂ ਇੱਕ ਨਵਾਂ ਸ�ਨੇਹਾ ਲਿਖ ਰਹੇ ਸੀ।ਪੱਤਰ ਮ�ੜ-ਪ�ਰਾਪਤ "
-"ਕਰਨ ਨਾਲ ਤ�ਹਾਨੂੰ ਉਸ ਜਗਾਂ ਤੋਂ ਮ�ੜ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ, ਜਿੱਥੋ ਛੱਡਿਆ ਸੀ।"
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਉਸ ਸਮੇਂ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ ਸੀ, ਜਦੋਂ ਕਿ ਤ�ਸੀਂ ਇੱਕ ਨਵਾਂ ਸ�ਨੇਹਾ ਲਿਖ ਰਹੇ ਸੀ।ਪੱਤਰ ਮ�ੜ-ਪ�ਰਾਪਤ ਕਰਨ ਨਾਲ ਤ�ਹਾਨੂੰ ਉਸ ਜਗਾਂ ਤੋਂ ਮ�ੜ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ, ਜਿੱਥੋ ਛੱਡਿਆ ਸੀ।"
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
-"accounts."
+msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
 msgstr "ਭੇਜਣ ਚੋਣ ਸਿਰਫ਼ ਨੋਵਲ ਗਰ�ੱਪਵਾਈਜ਼ ਅਤੇ ਮਾਈਕਰੋਸਾਫ਼ਟ �ਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਹੀ ਉਪਲੱਬਧ ਹੈ।"
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -10303,24 +10968,18 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "ਫਾਇਲ `{0}' ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ ਅਤੇ ਸ�ਨੇਹੇ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../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 ""
-"ਇਸ ਡਾਇਰੈਕਟਰੀ ਦੇ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਜਾਂ ਤਾਂ ਸਾਰੀਆਂ ਫਾਇਲਾਂ ਇੱਕ ਇੱਕ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰੋ ਜਾਂ "
-"ਡਾਇਰੈਕਟਰੀ ਦਾ ਇੱਕ ਆਕਾਇਵ ਬਣਾਉ ਤੇ ਇਹਨਾਂ ਨੂੰ ਨੱਥੀ ਕਰ ਦਿਓ।"
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "ਇਸ ਡਾਇਰੈਕਟਰੀ ਦੇ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਜਾਂ ਤਾਂ ਸਾਰੀਆਂ ਫਾਇਲਾਂ ਇੱਕ ਇੱਕ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰੋ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਦਾ ਇੱਕ ਆਕਾਇਵ ਬਣਾਉ ਤੇ ਇਹਨਾਂ ਨੂੰ ਨੱਥੀ ਕਰ ਦਿਓ।"
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "HTML ਸੰਪਾਦਕ ਕੰਟਰੋਲ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਤੋਂ ਅਸਫਲ\n"
 "\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਯਕੀਨ ਬਣਾ ਲਵੋਂ ਕਿ ਤ�ਹਾਡੇ ਕੋਲ gtkhtml ਅਤੇ libgtkhtml ਦਾ ਸਹੀਂ ਵਰਜਨ ਇੰਸਟਾਲ "
-"ਹੈ।"
+"ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਯਕੀਨ ਬਣਾ ਲਵੋਂ ਕਿ ਤ�ਹਾਡੇ ਕੋਲ gtkhtml ਅਤੇ libgtkhtml ਦਾ ਸਹੀਂ ਵਰਜਨ ਇੰਸਟਾਲ ਹੈ।"
 
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
@@ -10344,23 +11003,29 @@ msgstr "ਤà©�ਸੀਂ ਇਸ ਸà©�ਨੇਹੇ ਨਾਲ `{0}' ਫਾਇਲ à
 msgid "You need to configure an account before you can compose mail."
 msgstr "ਪੱਤਰ ਲਿਖਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਅਕਾਊਂਟ ਸੰਰਚਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "�ਡੀਟਿੰਗ ਜਾਰੀ ਰੱਖੋ(_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "ਪ�ਰਾਪਤ ਨਾ ਕਰੋ(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "ਪ�ਰਾਪਤ(_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "ਸ�ਨੇਹਾ ਸੰਭਾਲੋ(_S)"
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"
 
-#: ../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:738
 msgid "Groupware Suite"
 msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
 
@@ -10376,47 +11041,88 @@ msgstr "�ਡਰਸ ਕਾਰਡ"
 msgid "calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਗਲਤੀ"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਚੇਤਾਵਨੀ"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਜਾਣਕਾਰੀ"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸਵਾਲ"
 
 #  setup a dummy error
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ, ਅਣਜਾਣ ਗਲਤੀ '%s' ਬੇਨਤੀ"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+#, fuzzy
+msgid "Component"
+msgstr "ਮ�ਕੰਮਲ"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "ਲਾਗ ਰੱਖਣ ਵਾਲੇ ਭਾਗ ਦਾ ਨਾਂ"
+
+#: ../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
+msgid "Enabled"
+msgstr "ਯੋਗ ਕੀਤਾ"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "ਫੈਲਾਓ ਨੂੰ ਫੈਲਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "ਪਰਿੰਟਿੰਗ ਦੇ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "ਪਰਿਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਭੇਜੀ ਹੈ:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਨਹੀਂ ਦਿੱਤੀ ਹੈ।"
 
+#  mail-composer:attach-nomessages secondary
+#  mail-composer:no-sig-file secondary
+#  mail:no-create-tmp-path secondary
+#  mail:no-delete-folder secondary
+#  system:no-save-file secondary
+#  system:no-load-file secondary
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
+#, fuzzy
+msgid "Because \"{1}\"."
+msgstr "ਕਿਉਕਿ &quot; {1}&quot;।"
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "ਫਾਇਲ਼ &quot;{0}&quot; ਨੂੰ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
 msgstr "ਫਾਇਲ਼ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10424,61 +11130,77 @@ msgid "Do you wish to overwrite it?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਉੱਪਰ ਲਿਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+#, fuzzy
+msgid "File exists \"{0}\"."
 msgstr "ਫਾਇਲ ਬੰਦ &quot;{0}&quot;।"
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "ਉੱਪਰ ਲ਼ਿਖੋ?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "ਉੱਤੇ ਲਿਖੋ(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "ਫੋਲਡਰ ਅਧਿਕਾਰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "ਖਾਸ(_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "ਕੰਮ(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "ਨਿੱਜੀ(_P)"
 
 #  forest green
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "ਕਰਨ ਲਈ(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "ਬਾਅਦ 'ਚ(_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "ਲੇਬਲ ਨਾਂ(_N):"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "ਲੇਬਲ ਸੋਧ"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "ਲੇਬਲ ਸ਼ਾਮਲ"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-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 "ਨਾ-ਮੰਨਣਯੋਗ ਗਲਤੀ: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "ਹੋਰ ਬਾਕੀ ਸਭ ਗਲਤੀਆਂ ਕੇਵਲ ਟਰਮੀਨਲ ਉੱਤੇ ਹੀ ਵੇਖੋ।"
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10582,7 +11304,8 @@ msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਾਲ"
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤੀ ਚ�ਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:301
 #: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "ਹ�ਣ"
@@ -10596,65 +11319,67 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "ਮੇਲ ਕਰਨ ਲਈ ਸਮਾਂ ਚ�ਣੋ"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚ�ਣੋ"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "ਜਾਂਚ"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾਂ(_u):"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "ਆਈਟਮਾਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ ਸੀਮਾਵਾਂ ਨੂੰ ਪੂਰੀ ਕਰਦੀ ਹੋਵੇ"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "ਫਿਲਟਰ ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "ਜੇਕਰ ਸਭ ਸੀਮਾ ਮੇਲ ਖਾਣ ਤਾਂ"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "ਜੇਕਰ ਕੋਈ ਵੀ ਸੀਮਾ ਮੇਲ ਖਾਵੇ"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "ਇਕਾਈ ਖੋਜ(_F):"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "ਜਵਾਬ"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "ਜਵਾਬ ਤੇ ਮ�ੱਢਲੇ"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "ਕੋਈ ਜਵਾਬ ਜਾਂ ਮ�ੱਢਲਾ ਨਹੀਂ"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "ਆ ਰਹੇ"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044
+#: ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "ਬਾਹਰੀ"
 
@@ -10681,7 +11406,8 @@ msgstr "ਫਾਇਲ਼ ਨਾਂ ਗ�ੰਮ ਹੈ।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "ਨਾਂ ਗ�ੰਮ ਹੈ।"
 
@@ -10758,7 +11484,8 @@ msgstr "ਭਵਿੱਚ ਵਿੱਚ"
 msgid "months"
 msgstr "ਮਹੀਨੇ"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19
+#: ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "ਸਕਿੰਟ"
 
@@ -10770,9 +11497,11 @@ msgstr "ਮੌਜੂਦਾ ਸਮਾਂ"
 msgid "the time you specify"
 msgstr "ਸਮਾਂ ਜੋ ਤ�ਸੀਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਹੈ"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "ਹਫਤੇ"
 
@@ -10788,7 +11517,7 @@ msgstr "ਨਿਯਮ ਜੋੜ�ਹੋ"
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸੋਧ"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "ਨਿਯਮ ਨਾਂ"
 
@@ -10809,57 +11538,75 @@ msgid "Configure your email accounts here"
 msgstr "ਆਪਣਾ ਈ-ਮੇਲ ਅਕਾਊਂਟ ਇੱਥੇ ਸੰਰਚਿਤ ਕਰੋ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "ਆਪਣਾ ਈ-ਮੇਲ ਅਕਾਊਂਟ ਇੱਥੇ ਸੰਰਚਿਤ ਕਰੋ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ"
 
-#: ../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 "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਸੰਦ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਭਾਗ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਲੇਖਣ"
 
-#: ../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 "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਲੇਖਣ ਸੰਰਚਨਾ ਸੰਦ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਪਸੰਦ ਕੰਟਰੋਲ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
+
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ਅਕਾਊਂਟ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+#, fuzzy
+msgid "Network Preferences"
+msgstr "ਕੰਪੋਜ਼ਰ ਪਸੰਦ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10872,127 +11619,132 @@ msgstr ""
 "ਜੋ ਕਿ %s ਲਈ ਹੇਠ ਦਿੱਤੀਆਂ ਹਨ\n"
 "ਅਤੇ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਜਾਂਚ ਬਕਸੇ ਤੇ ਕਲਿੱਕ ਕਰੋ\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466
+#: ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚ�ਣੋ"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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:97
 msgid "Autogenerated"
 msgstr "ਸਵੈ-ਨਿਰਮਤ"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "ਹਰ ਸ�ਨੇਹੇ ਲਈ ਪ�ੱਛੋ"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810
+#: ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859
+#: ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "ਈ-ਮੇਲ ਪ�ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਚੈੱਕ ਕਰੋ(_n)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "ਮਿੰਟ(_t)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "ਈ-ਮੇਲ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386
+#: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452
+#: ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "ਸ�ਰੱਖਿਆ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "ਪ�ਰਾਪਤੀ ਚੋਣ"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "ਨਵੇਂ ਸ�ਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ਅਕਾਊਂਟ ਸੰਪਾਦਕ"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932
+#: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[ਮੂਲ]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "ਯੋਗ ਕੀਤਾ"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "ਅਕਾਊਂਟ ਨਾਂ"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "ਪ�ਰੋਟੋਕਾਲ"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "ਬੇ-ਨਾਂ"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "ਇੱਕ ਦਸਤਖਤੀ ਸਕਰਿਪਟ ਸ਼ਾਮਿਲ"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜੇ ਸ�ਨੇਹੇ --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "ਅਣਜਾਣਾ ਭੇਜਣ ਵਾਲਾ"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵਜੇ "
-"${TimeZone}, ${Sender} ਨੇ ਲਿਖਿਆ:"
+#: ../mail/em-composer-utils.c:2007
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵਜੇ ${TimeZone}, ${Sender} ਨੇ ਲਿਖਿਆ:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "--------ਅਸਲੀ ਸ�ਨੇਹਾ--------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ(_F)"
 
@@ -11010,10 +11762,6 @@ msgstr "ਰੰਗ ਦਿਓ"
 msgid "Assign Score"
 msgstr "ਸਕੋਰ ਦਿਓ"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "ਨੱਥੀ"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11030,10 +11778,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
@@ -11047,9 +11791,11 @@ msgid "Date sent"
 msgstr "ਭੇਜਣ ਮਿਤੀ"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
-#: ../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
+#: ../plugins/groupwise-features/share-folder.c:767
+#: ../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 "ਹਟਾਓ"
@@ -11058,10 +11804,6 @@ msgstr "ਹਟਾਓ"
 msgid "Deleted"
 msgstr "ਹਟਾ�"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ਸ਼ਾਮਿਲ ਨਹੀ ਹੈ"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ਨਾਲ ਸਮਾਪਤ ਨਾ ਹੋਵੇ"
@@ -11082,10 +11824,6 @@ msgstr "ਆਵਾਜ਼ ਇਸ ਵਰਗੀ ਨਾ ਹੋਵੇ"
 msgid "does not start with"
 msgstr "ਨਾਲ ਸ਼�ਰੂ ਨਾ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "ਬਾਹਰ ਨਾ ਜਾਓ"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "ਡਰਾਫਟ"
@@ -11094,10 +11832,6 @@ msgstr "ਡਰਾਫਟ"
 msgid "ends with"
 msgstr "ਨਾਲ ਸਮਾਪਤ"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "ਬਾਹਰ"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "ਬਾਹਰ"
@@ -11110,14 +11844,11 @@ msgstr "ਸਮੀਕਰਨ"
 msgid "Follow Up"
 msgstr "ਪਿੱਛੇ ਜਾਓ"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "ਲਾਜ਼ਮੀ"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "ਹੈ"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "ਬਾਅਦ ਹੈ"
@@ -11130,18 +11861,6 @@ msgstr "ਪਹਿਲਾਂ ਹੈ"
 msgid "is Flagged"
 msgstr "ਨਿਸ਼ਾਨ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "ਤੋ ਜਿਆਦਾ ਹੈ"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "ਤੋ ਘੱਟ ਹੈ"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ਇਹ ਨਹੀਂ"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ਨਾ-ਨਿਸ਼ਾਨ ਹੋਵੇ"
@@ -11154,7 +11873,8 @@ msgstr "ਸੈੱਟ ਨਹੀਂ ਹੈ"
 msgid "is set"
 msgstr "ਸੈੱਟ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40
+#: ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ਫਜ਼ੂਲ"
@@ -11163,7 +11883,8 @@ msgstr "ਫਜ਼ੂਲ"
 msgid "Junk Test"
 msgstr "ਕੂੜ ਜਾਂਚ"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42
+#: ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "ਲੇਬਲ"
 
@@ -11205,11 +11926,13 @@ 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53
+#: ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "ਪੜ�ਹੋ"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ਪ�ਰਾਪਤ ਕਰਤਾ"
 
@@ -11237,11 +11960,13 @@ msgstr "ਘੱਟ ਵਾਪਿਸ ਕਰੇ"
 msgid "Run Program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:61
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "ਸਕੋਰ"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ਭੇਜਣ ਵਾਲਾ"
 
@@ -11277,10 +12002,12 @@ msgstr "ਇਸ ਨਾਲ ਸ਼�ਰੂ"
 msgid "Stop Processing"
 msgstr "ਕਾਰਵਾਈ ਰੋਕੋ"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11291,64 +12018,64 @@ msgid "Unset Status"
 msgstr "ਸਥਿਤੀ ਨਾ-ਨਿਰਧਾਰਨ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "�ਕਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "ਖੋਜ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_r)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "ਸਭ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪੜ�ਹੇ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "ਬਿਨ-ਲੇਬਲ"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "ਪੜ�ਹੇ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "ਤਾਜ਼ੇ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "ਆਖਰੀ 5 ਦਿਨਾਂ ਦੇ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "ਨੱਥੀ ਸਮੇਤ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "ਖਾਸ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "ਨਾ-ਕੂੜਾ ਸ�ਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਖੋਜ"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ਨਾ ਪੜੇ ਸ�ਨੇਹੇ:"
@@ -11356,61 +12083,78 @@ msgstr[1] "ਨਾ ਪੜਿਆ ਸ�ਨੇਹੇ:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ਕ�ੱਲ ਸਨੇਹੇ:"
 msgstr[1] "ਕ�ੱਲ ਸਨੇਹੇ:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193
+#: ../mail/em-folder-properties.c:195
+#, fuzzy
+msgid "Quota usage"
+msgstr "ਕ�ੱਲ ਸਨੇਹੇ:"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355
+#: ../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
+msgid "Inbox"
+msgstr "ਆਉਣ-ਬਕਸਾ"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<ਫੋਲਡਰ ਚ�ਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "ਬਣਾਓ(_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ(_n):"
 
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#. load store to mail component at the end, when everything is loaded
+#: ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970
+#: ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504
+#: ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "ਡਰਾਫਟ"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "ਆਉਣ-ਬਕਸਾ"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510
+#: ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "ਬਾਹਰੀ-ਬਕਸਾ"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512
+#: ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "ਭੇਜੇ"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534
+#: ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
@@ -11429,849 +12173,867 @@ msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
+#: ../mail/em-folder-tree.c:380
+#, fuzzy, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (...)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫੋਲਡਰ %s ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909
+#: ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸ�ਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911
+#: ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸ�ਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਨਕਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ਉੱਪਰੀ ਸੰਭਾਲ ਤੋਂ ਸ�ਨੇਹਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:1011 ../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 "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
 
-#: ../mail/em-folder-tree.c:1012 ../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 "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718
+#: ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱਚ ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "ਵੇਖੋ(_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "ਨਵੇਂ �ਰੋਖੇ ਵਿੱਚ ਖੋਲ�ਹੋ(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114
+#: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "ਮ�ੜ-ਤਾਜ਼ਾ(_f)"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "ਆਉਟਬਾਕਸ ਫਲੱਸ਼(_u)"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ਨੂੰ `%s' ਵਿੱਚ ਨਕਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "ਫੋਲਡਰ ਚ�ਣੋ"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ਨਕਲ(_o)"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "ਫੋਲਡਰ `%s' ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਫੋਲਡਰ ਕਿੱਥੇ ਬਣਾਇਆ ਜਾਵੇ:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ਮੇਲ ਹਟਾਉਣਾ ਫੇਲ�ਹ"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤ�ਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../mail/em-folder-view.c:1337 ../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 "ਅੱਗੇ ਭੇਜੋ(_F)"
 
 #. 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:1341 ../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 "ਨਵਾਂ ਸ�ਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "ਪਰਿੰਟ ਕਰੋ(_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ਨਾ-ਹਟਾ�(_n)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "ਪੜ�ਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_k)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪੜ�ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "ਖਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "ਨਾ-ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾਓ(_i)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "ਰੱਦੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱਛਾ ਖੋਜ ਲਈ ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "ਲੇਬਲ(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355
+#: ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "ਕੋਈ ਨਹੀਂ(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "ਨਵਾਂ ਲੇਬਲ(_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "ਸ�ਨੇਹੇ ਤੋਂ ਨਿਯਮ ਬਣਾਓ"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "ਵਿਸ਼ੇ ਤੋਂ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_n)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "ਸਿਰਨਾਵੀਂ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_L)"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "ਵਿਸ਼ੇ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_j)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_d)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "ਸ�ਨੇਹੀਆਂ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_c)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_M)"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "ਮੂਲ"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "ਸ�ਨੇਹਾ ਪ�ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "ਸ�ਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "ਕਾਲ ਕਰੋ(_a)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "ਇਸ �ਡਰੈੱਸ ਤੋਂ(_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "ਇਸ �ਡਰੈੱਸ ਲਈ(_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "�ਡਰੈੱਸ ਓਹਲੇ/ਵੇਖਾਉਣ ਲਈ ਦਬਾਓ"
 
 #  message-search popup match count string
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "ਖੋਜ(_d):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "ਪਿੱਛੇ(_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "ਅੱਗੇ(_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "ਮਿਲਦੇ ਸਭ(_a)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:992
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:947
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "ਇਹ ਸ�ਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸ�ਨੇਹਾ ਸਹੀਂ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "ਜਾਇਜ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:993
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: ../mail/em-format-html-display.c:948
+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:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "ਗਲਤ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:994
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: ../mail/em-format-html-display.c:949
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "ਇਸ ਸ�ਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗ� ਜਾਪਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ"
 
-#: ../mail/em-format-html-display.c:995
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: ../mail/em-format-html-display.c:950
+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:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤਖਤ ਮੌਜੂਦ ਹਨ, ਪਰ ਪਬਲਿਕ ਕ�ੰਜੀ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/em-format-html-display.c:996
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../mail/em-format-html-display.c:951
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "ਇਸ ਸ�ਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿਕ ਕੀ ਨਾਲ ਸਬੰਧਿਤ ਨਹੀਂ।"
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "ਅਣ-ਇੰਕ�ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:1003
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+#: ../mail/em-format-html-display.c:958
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "ਇਹ ਸ�ਨੇਹਾ ਇੰਕ�ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕ�� ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ ਸਕਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "ਇੰਕ�ਰਿਪਟਡ, ਹਲਕਾ"
 
-#: ../mail/em-format-html-display.c:1004
-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:959
+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:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "ਇੰਕ�ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:1005
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: ../mail/em-format-html-display.c:960
+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:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "ਇੰਕ�ਰਿਪਟ, ਸਖਤ"
 
-#: ../mail/em-format-html-display.c:1006
-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:961
+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:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ਵਜੇ ਸਮਾਪਤ"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "ਮਿਆਦ ਪ�ੱਗੇ:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "ਲਾਇਨ 'ਚ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "ਚੌੜਾਈ ਦੇ ਫਿੱਟ(_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖਾਓ(_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "ਨੱਥੀ"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "ਅਟੈਂਚਮਿੰਟ ਸੰਭਾਲੋ"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "ਸਭ ਅਟੈਂਚਮਿੰਟ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚ�ਣੋ"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "ਚ�ਣੇ ਸੰਭਾਲੋ(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ਨੱਥੀ(_t)"
 msgstr[1] "%d ਨੱਥੀ(_t)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112
+#: ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338
+#: ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਵੇਖੋ(_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਓਹਲੇ(_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "ਇਸ ਨਾਲ ਖੋਲ�ਹੋ(_p)"
 
-#: ../mail/em-format-html-display.c:2635
-msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹ�ਤ ਵੱਡੀ ਹੈ। ਤ�ਸੀਂ ਇਸ ਨੂੰ ਬਿਨਾਂ ਫਾਰਮੈਟ ਵੇਖ "
-"ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਟੈਕਸਟ ਸੰਪਾਦਕ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
+#: ../mail/em-format-html-display.c:2468
+#, fuzzy
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹ�ਤ ਵੱਡੀ ਹੈ। ਤ�ਸੀਂ ਇਸ ਨੂੰ ਬਿਨਾਂ ਫਾਰਮੈਟ ਵੇਖ ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਟੈਕਸਟ ਸੰਪਾਦਕ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2d ਦਾ %1d ਸਫਾ"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "%s ਪ�ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "ਅਣਜਾਣ ਬਾਹਰੀ-ਮ�ੱਖ ਭਾਗ।"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "ਨਿਕਾਰਾ ਬਾਹਰੀ-ਭਾਗ"
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮੋਟ ਡਾਟਾ(%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ਅਣਜਾਣੇ ਬਾਹਰੀ ਡਾਟਾ (\"%s\" ਕਿਸਮ) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "ਸ�ਨੇਹੇ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "ਸ�ਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563
+#: ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Bcc"
 
 #  pseudo-header
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744
+#: ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "ਮੇਲਰ"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../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
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "ਮਿਤੀ"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "ਇਹ ਸ�ਨੇਹਾ <b>%s</b> ਵਲੋਂ <b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਭੇਜਿਆ ਗਿਆ ਹੈ"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "ਵਲੋਂ"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 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
+msgid "Date"
+msgstr "ਮਿਤੀ"
+
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥੀ"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸ�ਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336
+#: ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸ�ਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹ�ਭਾਗ/ਇਕ�ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ�ਰਿਪਸ਼ਨ ਕਿਸਮ"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸ�ਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸ�ਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1581
+#: ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP ਸ�ਨੇਹਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP ਸ�ਨੇਹੇ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "ਹਰ ਸਮੇਂ"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "ਹਫ਼ਤੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "ਮਹੀਨੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "ਕਸਟਮ ਜੰਕ ਹੈੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "ਹੈੱਡਰ ਨਾਂ:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "ਹੈੱਡਰ ਮ�ੱਲ ਰੱਖਦਾ ਹੈ:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "ਮ�ੱਲ ਰੱਖਦਾ ਹੈ"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "ਰੰਗ"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "ਟੈਗ"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078
+#: ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ਪਲੱਗਇਨ ਉਪਲੱਬਧ ਹੈ ਅਤੇ ਬਾਈਨਰੀ ਇੰਸਟਾਲ ਹੈ।"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086
+#: ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱਗਇਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਚੈੱਕ ਕਰੋ ਕੀ ਕਿ ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "ਕੋਈ ਜੰਕ ਪਲੱਗਇਨ ਨਹੀਂ ਹੈ"
 
 #  forest green
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "ਕਰਨ-ਲਈ"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "ਬਾਅਦ ਵਿੱਚ"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ-ਬਕਸਾ ਫੋਲਡਰ ਦੀ ਸਥਿਤੀ ਤੇ ਲੜੀ ਈਵੇਲੂਸ਼ਨ ੧.੦ ਬਾਅਦ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।\n"
-"\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤ�ਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ਫੋਲਡਰ `%s' ਨੂੰ `%s' ਵਿੱਚ ਨਕਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' ਤੇ ਉਪਲੱਬਧ ਪੱਤਰ-ਬਕਸਿਆਂ ਦੀ ਜਾਂਚ ਲਈ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ-ਬਕਸਾ ਫੋਲਡਰ ਦੀ ਸਥਿਤੀ ਤੇ ਲੜੀ ਈਵੇਲੂਸ਼ਨ ੧.੦ ਬਾਅਦ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।\n"
+"\n"
+"ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤ�ਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਪ�ਰਾਣੇ ਡਾਟੇ `%s' ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖੀ ਡਾਟਾ ਡਾਇਰੈਕਟਰੀ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਡਾਟਾ `%s' ਦੀ ਨਕਲ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583
+#: ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ-ਬਕਸਾ ਫੋਲਡਰ ਦੀ ਸਥਿਤੀ ਤੇ ਲੜੀ ਈਵੇਲੂਸ਼ਨ ੧.੦ ਬਾਅਦ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।\n"
+"\n"
+"ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤ�ਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' ਤੇ ਲੋਕਲ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2846
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ਪ�ਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸੈਟਿੰਗ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਨਿਕਾਰਾ "
-"ਹੋ ਗਈ ਹੈ।"
+#: ../mail/em-migrate.c:2982
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "ਪ�ਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸੈਟਿੰਗ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਨਿਕਾਰਾ ਹੋ ਗਈ ਹੈ।"
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564
+#: ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../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 "ਲਿਸਟ ਨੂੰ ਜਵਾਬ(_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629
+#: ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ 'ਚ ਜੋੜੋ(_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ਇਹ ਭੰਡਾਰ ਮੈਂਬਰ ਲਈ ਸਹਾਈ ਨਹੀਂ ਜਾਂ ਇਹ ਯੋਗ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "ਫੋਲਡਰ"
 
 #  FIXME: This is just to get the shadow, is there a better way?
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਸਰਵਰ ਚ�ਣੋ।"
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "ਕੋਈ ਸਰਵਰ ਚ�ਣਿਆ ਨਹੀਂ ਗਿਆ"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "ਇਹ ਸ�ਨੇਹਾ ਮ�ੜ ਨਾ ਵੇਖਾਓ(_D)।"
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "ਸ�ਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "ਸ�ਨੇਹਾ"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "ਸ�ਨੇਹਾ ਸੰਭਾਲੋ..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "�ਡਰੈੱਸ ਜੋੜ�ਹੋ"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸ�ਨੇਹਾ"
@@ -12285,772 +13047,749 @@ msgid "Search Folder source"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸਰੋਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ"
+
+#: ../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 "ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸੀਮਿਤ ਆਕਾਰ ਦਾ ਟੈਕਸਟ ਵੇਖਾਉਣ ਦਿਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "ਪੜਨ ਰਸੀਦ ਦੀ ਹਮੇਸ਼ਾ ਮੰਗ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
+msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀ ਨੂੰ ਵੇਖਾ� ਜਾਣ ਦਾ ਸਮਾਂ ਸਕਿੰਟਾਂ ਵਿੱਚ।"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "ਆਟੋਮੈਟਿਕ ਈਮੋਸ਼ਨ ਪਛਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਬੰਧ ਪਛਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "ਆਉਣ ਵਾਲੇ ਪੱਤਰਾਂ ਲਈ ਕੂੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "ਕੀਟਾਟੀਓਨ ਉਭਾਰਨ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "ਕੀਟਾਟੀਓਨ ਉਭਾਰਨ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਮੂਲ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "ਕੰਪੋਜ਼ਰ ਲੋਡ/ਅਟੈਂਚ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC ਵਿੱਚ ਛੋਟਾ �ਡਰੈੱਸ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "TO/CC/B_CC ਵਿੱਚ �ਡਰੈੱਸ ਗਿਣਤੀ ਵਿੱਚ ਦਿੱਤੇ ਨੰਬਰਾਂ ਮ�ਤਾਬਕ ਛੋਟਾ �ਡਰੈੱਸ ਵੇਖਾਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 "ਕੰਟਰੋਲ, ਕਿਸ ਤੇਜ਼ੀ ਨਾਲ ਲੋਕਲ ਬਦਲਾਅ ਰਿਮੋਟ ਮੇਲ ਸਰਵਰ ਨਾਲ ਸਮਕਾਲੀ ਕੀਤੇ ਜਾਣ। ਅੰਤਰਾਲਘੱਟੋ-ਘੱਟ 30 ਸਕਿੰਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:18
+#, fuzzy
+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 "ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਦੇ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਪਸੰਦੀਦਾ ਹੈੱਡਰ। ਲਿਸਟ ਇਕਾਈਆਂ \"headername=value\" ਫਾਰਮੈਟ ਦੀ ਲਾਈਨ ਦੇ ਰੂਪ 'ਚ ਹਨ।"
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "ਸ�ਨੇਹਾ ਬਣਾਉਣ ਲਈ ਮੂਲ ਅੱਖਰ ਸਮੂਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "ਸ�ਨੇਹਾ ਬਣਾਉਣ ਲਈ ਮੂਲ ਅੱਖਰ ਸਮੂਹ।"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "ਸ�ਨੇਹਾ ਵੇਖਾਉਣ ਲਈ ਮੂਲ ਅੱਖਰ ਸਮੂਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "ਸ�ਨੇਹਾ ਵੇਖਾਉਣ ਲਈ ਮੂਲ ਅੱਖਰ ਇਕੋਡਿੰਗ।"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "ਮੂਲ ਅੱਗੇ ਭੇਜਣ ਦੀ ਸਟਾਇਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "ਸ�ਨੇਹਾ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "ਮੈਂਬਰੀ ਡਾਈਲਾਗ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "ਮੂਲ ਜਵਾਬ ਸਟਾਇਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "ਥਰਿੱਡ ਫੈਲੀ ਹਾਲਤ ਲਈ ਡਿਫਾਲਟ ਮ�ੱਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "ਸ�ਨੇਹਾ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "ਮੈਂਬਰੀ ਡਾਈਲਾਗ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Determines whether to look up addresses for junk filtering in local addressbook only"
+msgstr "ਦੱਸੋ ਕਿ ਕੀ ਜੰਕ ਫਿਲਟਰਿੰਗ ਲਈ �ਡਰੈੱਸ ਕੇਵਲ ਲੋਕਲ �ਡਰੈੱਸਬ�ੱਕ 'ਚ ਹੀ ਖੋਜੇ ਜਾਣ।"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
-msgstr ""
+msgstr "ਦੱਸੋ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲਾ ਈਮੇਲ �ਡਰੈੱਸਬ�ੱਕ 'ਚ ਖੋਜਿਆ ਜਾਵੇ"
 
-#: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote addressbooks (like ldap) are marked for "
-"autocompletion."
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
+msgstr "ਦੱਸੋ ਕਿ ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਸਮੇਂ ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਵਰਤੇ ਜਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:30
-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."
+#: ../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:31
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
+#: ../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:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਫਾਇਲਾਂ ਲੋਡ ਕਰਨ/ਅਟੈਂਚ ਕਰਨ ਵਾਸਤੇ ਡਾਇਰੈਕਟਰੀ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "ਮੇਲ ਭਾਗ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਵਾਸਤੇ ਡਾਇਰੈਟਰੀ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਫੋਲਡਰ ਖਾਲੀ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਸਾਫ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ਈਵੂਲੇਸ਼ਨ ਬੰਦ ਕਰਨ ਸਮੇਂ ਸਭ ਜੰਕ ਫੋਲਡਰ ਖਾਲੀ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰਨ ਸਮੇਂ ਰੱਦੀ ਖਾਲੀ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../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:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "ਮੈਜਿਕ ਸਪੇਸ ਬਾਰ ਯੋਗ ਜਾਂ ਆਯੋਗ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "ਅੱਗੇ ਖੋਜ ਫੀਚਰ ਕਿਸਮ ਨੂੰ ਯੋਗ ਜਾਂ ਆਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਖੋਜ ਫੋਲਡਰ ਯੋਗ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"ਬਾਹੀ ਖੋਜ ਫੀਚਰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ ਤ�ਸੀਂ ਟੈਕਸਟ ਵਿੱਚ ਲਿਖ ਕੇ ਖੋਜ ਸ਼�ਰੂ ਕਰ ਸਕੋ। ਇਸ ਦਾ ਫਾਇਦਾ ਇਹ ਹੈ "
-"ਕਿ ਤ�ਸੀਂ ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਿਖ ਕੇ ਹੀ ਖੋਜ ਕਰ ਸਕੋ ਅਤੇ ਖੋਜ ਆਟੋਮੈਟਿਕ ਹੀ ਉਸ ਫੋਲਡਰ ਉੱਤੇ ਚਲੀ ਜਾਵੇ।"
+#: ../mail/evolution-mail.schemas.in.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 "ਬਾਹੀ ਖੋਜ ਫੀਚਰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ ਤ�ਸੀਂ ਟੈਕਸਟ ਵਿੱਚ ਲਿਖ ਕੇ ਖੋਜ ਸ਼�ਰੂ ਕਰ ਸਕੋ। ਇਸ ਦਾ ਫਾਇਦਾ ਇਹ ਹੈ ਕਿ ਤ�ਸੀਂ ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਿਖ ਕੇ ਹੀ ਖੋਜ ਕਰ ਸਕੋ ਅਤੇ ਖੋਜ ਆਟੋਮੈਟਿਕ ਹੀ ਉਸ ਫੋਲਡਰ ਉੱਤੇ ਚਲੀ ਜਾਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
+#: ../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:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "ਰੈਡਰ ਸ�ਨੇਹਾ ਟੈਕਸਟ ਭਾਗ ਨੂੰ ਸੀਮਿਤ ਆਕਾਰ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "ਕਾਰਟੀ ਮੋਡ ਯੋਗ/ਅਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫੋਲਡਰ �ਲਕ ਓਹਲੇ ਕਰੋ ਅਤੇ ਚੋਣ ਹਟਾ ਦਿਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"ਜੇਕਰ ਯੂਜ਼ਰ ਨੇ 10 ਜਾਂ ਵਧੇਰੇ ਸ�ਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ, ਯੂਜ਼ਰ ਨੂੰ ਪ�ੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰ� ਕਰਨਾ "
-"ਚਾਹ�ੰਦਾ ਹੈ।"
+#: ../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 "ਜੇਕਰ ਯੂਜ਼ਰ ਨੇ 10 ਜਾਂ ਵਧੇਰੇ ਸ�ਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ, ਯੂਜ਼ਰ ਨੂੰ ਪ�ੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰ� ਕਰਨਾ ਚਾਹ�ੰਦਾ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
+#: ../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:53
-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."
+#: ../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."
+msgstr "ਇੱਕ ਖਾਸ mime ਕਿਸਮ ਲਈ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਦਰਸ਼ਕ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ, ਕਿਸੇ mime ਕਿਸਮ ਨੂੰ ਇਸ ਲਿਸਟ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣ ਲਈ ਉਸ ਨੂੰ ਗਨੋਮ ਦੇ mime ਕਿਸਮ ਡਾਟਾਬੇਸ ਦੇ ਬੋਨਬੋ-ਭਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣਾ ਸਹਾਇਕ ਹੈ।"
+
+#: ../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 "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼�ਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋਜ਼ ਨੂੰ ਵਰਟੀਕਲ ਮ�ੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ ਮ�ੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#: ../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 ""
-"ਇੱਕ ਖਾਸ mime ਕਿਸਮ ਲਈ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਦਰਸ਼ਕ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ, ਕਿਸੇ mime ਕਿਸਮ ਨੂੰ ਇਸ ਲਿਸਟ ਵਿੱਚ "
-"ਉਪਲੱਬਧ ਹੋਣ ਲਈ ਉਸ ਨੂੰ ਗਨੋਮ ਦੇ mime ਕਿਸਮ ਡਾਟਾਬੇਸ ਦੇ ਬੋਨਬੋ-ਭਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣਾ ਸਹਾਇਕ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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:55
-msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr ""
-"ਲਗਾਤਾਰ ਪਰੌਉਟ ਆਯੋਗ/ਯੋਗ ਕਰਦਾ ਹੈ, ਜੇ ਆਫਲਾਈਨ ਸਿਕਰੋ (sync) ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਜਾਣ "
-"ਲਈ ਲਾਜ਼ਮੀ ਹੋਵੇ।"
+#: ../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 "ਲਗਾਤਾਰ ਪਰੌਉਟ ਆਯੋਗ/ਯੋਗ ਕਰਦਾ ਹੈ, ਜੇ ਆਫਲਾਈਨ ਸਿਕਰੋ (sync) ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਜਾਣ ਲਈ ਲਾਜ਼ਮੀ ਹੋਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-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."
+#: ../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:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਸੀ"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "ਆਖਰੀ ਵਾਰ ਰੱਦ ਖਾਲੀ ਕਰਨ ਦਾ ਸਮਾਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
-msgstr ""
+msgstr "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸ�ਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "ਲੇਬਲ ਲਿਸਟ ਅਤੇ ਸੰਬੰਧਿਤ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "ਮਨਜ਼ੂਰ ਲਾਈਸੈਂਸਾਂ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "ਅਕਾਊਂਟ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਲਿਸਟ ਵਿੱਚ ਲਾਈਨਾਂ ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /"
-"apps/evolution/mail/accounts ਦੇ ਅਨ�ਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
+#: ../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."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਲਿਸਟ ਵਿੱਚ ਲਾਈਨਾਂ ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /apps/evolution/mail/accounts ਦੇ ਅਨ�ਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਅਤੇ ਕੀ ਇਹ ਵਰਤੇ ਜਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਲਈ ਪਛਾਣ ਦੀ ਲੇਬਲ ਲਿਸਟ ਹੈ। ਇਹ ਲਿਸਟ ਉਹ ਸਾਰੇ ਰੰਗ ਰੱਖਦੀ ਹੈ, ਜੋ ਕਿ HTML "
-"ਹੈਕਸਾ ਇੰਕੋਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਦੇ ਹਨ।"
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਲਈ ਪਛਾਣ ਦੀ ਲੇਬਲ ਲਿਸਟ ਹੈ। ਇਹ ਲਿਸਟ ਉਹ ਸਾਰੇ ਰੰਗ ਰੱਖਦੀ ਹੈ, ਜੋ ਕਿ HTML ਹੈਕਸਾ ਇੰਕੋਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਦੇ ਹਨ।"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "ਬੋਨਬੋ ਭਾਗ ਦਰਸ਼ਕ ਦੀ ਜਾਂਚ ਲਈ mime ਕਿਸਮ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "ਪਰੋਟੋਕੋਲਾਂ ਨਾਂ ਦੀ ਲਿਸਟ, ਜਿਹਨਾਂ ਦਾ ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "HTML ਸ�ਨੇਹੇ ਲਈ http ਤੋਂ ਚਿੱਤਰ ਪ�ਰਾਪਤ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
-msgstr ""
-"http(s) ਉੱਤੇ HTML ਸ�ਨੇਹਿਆਂ ਲਈ ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ। ਸੰਭਵ ਮ�ੱਲ ਹਨ 0- ਕਦੇ ਨਹੀਂ 1- ਚਿੱਤਰ "
-"ਡਾਊਨਲੋਡ ਤਾਂ ਹੀ ਕਰੋ, ਜੇਕਰ ਭੇਜਣ ਵਾਲਾ �ਡਰੈੱਸ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਵੇ 2 ਨੈੱਟ ਤੋਂ ਹਮੇਸ਼ਾ ਚਿੱਤਰ ਡਾਊਨਲੋਡ "
-"ਕਰੋ।"
+#: ../mail/evolution-mail.schemas.in.h:81
+#, 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 "http(s) ਉੱਤੇ HTML ਸ�ਨੇਹਿਆਂ ਲਈ ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ। ਸੰਭਵ ਮ�ੱਲ ਹਨ 0- ਕਦੇ ਨਹੀਂ 1- ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਤਾਂ ਹੀ ਕਰੋ, ਜੇਕਰ ਭੇਜਣ ਵਾਲਾ �ਡਰੈੱਸ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਵੇ 2 ਨੈੱਟ ਤੋਂ ਹਮੇਸ਼ਾ ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱਗ ਫਾਇਲ ਲਈ ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਲਈ ਲਾੱਗ-ਫਾਇਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਲਈ ਲਾੱਗ-ਫਾਇਲ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਨਿਰਧਾਰਿਤ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸ�ਨੇਹਾ \"�ਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸ�ਨੇਹਾ \"�ਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "ਸ�ਨੇਹਾ �ਰੋਖੇ ਦੀ ਮੂਲ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "ਸ�ਨੇਹਾ �ਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ਸ�ਨੇਹਾ-�ਲਕ ਸਟਾਇਲ (\"ਸਧਾਰਨ\", \"ਪੂਰਾ ਹੈੱਡਰ\", \"ਸਰੋਤ\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਸਿਰਨਾਵੀਆਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "ਖਾਲੀ ਵਿਸ਼ੇ ਤੇ ਪ�ੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪ�ੱਛੋ, ਜਦੋਂ ਖੋਜ ਫੋਲਡਰ ਵਿੱਚ ਸ�ਨੇਹੇ ਹਟਾਉਣੇ ਹੋਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਹਟਾ� ਤਾਂ ਪ�ੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "ਜੇਕਰ ਸਿਰਫ Bcc ਖੇਤਰ ਹੀ ਭਰਿਆ ਹੋਵੇ ਤਾਂ ਪ�ੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ 10 ਸ�ਨੇਹੇ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪ�ੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"ਜਦੋਂ ਯੂਜ਼ਰ HTML ਸ�ਨੇਹੇ, ਉਹਨਾਂ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ ਪ�ਰਾਪਤ ਹੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹ�ੰਦੇ "
-"ਹਨ, ਤਾਂ ਪ�ੱਛੋ।"
+#: ../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 "ਜਦੋਂ ਯੂਜ਼ਰ HTML ਸ�ਨੇਹੇ, ਉਹਨਾਂ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ ਪ�ਰਾਪਤ ਹੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹਨ, ਤਾਂ ਪ�ੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵੱਲ ਜਾਂ Cc ਪ�ਰਾਪਤਕਰਤਾ ਦੇ ਸ�ਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪ�ੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਨਾ-ਚਾਹਿਆਂ HTML ਸ�ਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪ�ੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "ਜਦੋਂ ਕਈ ਸ�ਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰਨੇ ਹੋਣ ਤਾਂ ਪ�ੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ਟੈਕਸਟ ਵਿੱਚੋਂ ਈਮੋਸ਼ਨ ਦੀ ਪਛਾਣ ਕਰਕੇ ਚਿੱਤਰਾਂ ਨਾਲ ਬਦਲ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "ਟੈਕਸਟ ਵਿੱਚ ਲਿੰਕਾਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਤਬਦੀਲ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "ਆ ਰਹੀਆਂ ਮੇਲਾਂ ਲਈ ਜੰਕ ਟੈਸਟ ਚਲਾਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "ਲੋਕਲ �ਡਰੈੱਸਬ�ੱਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਫੋਟੋ ਦੀ ਖੋਜ"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "ਮੂਲ HTML ਪੱਤਰ ਭੇਜੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "ਮੂਲ HTML ਪੱਤਰ ਭੇਜੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "ਸ�ਨੇਹਾ ਲਿਸਟ ਵਿੱਚ ਸ�ਨੇਹਾ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "ਸਿਕਰੋਨਾਈਜ਼ ਚੋਣ(_S)..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "ਸਜੀਵਤਾ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "ਸਜੀਵ ਸ�ਨੇਹੇ ਸਜੀਵ ਹੀ ਵੇਖਾਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾ� ਸ�ਨੇਹੇ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+#: ../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:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr "ਜੰਕ ਵਾਸਤੇ ਚੈੱਕ ਕਰਨ ਲਈ ਹੈੱਡਰ ਦਿਓ।"
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell check inline"
+msgstr "ਕਤਾਰ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Spell checking color"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Spell check inline"
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+msgid "Spell checking languages"
 msgstr "ਕਤਾਰ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "ਮੂਲ ਉਚਾਈ ਤਖਤੀ ਮਨਜ਼ੂਰ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "ਮੂਲ ਚੌੜਾਈ ਤਖਤੀ ਮਨਜ਼ੂਰ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "ਟਰਮੀਨਲ ਫੋਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "ਟੈਕਸਟ ਸ�ਨੇਹਾ ਭਾਗ ਸੀਮਾ"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "ਜੰਕ ਹ�ੱਕ ਲਈ ਡਿਫਾਲਟ ਪਲੱਗਇਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr ""
+msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਖਾਲ ਕੀਤਾ ਗਿਆ ਸੀ, ਇੰਨ�ਹੇ ਦਿਨ ਪਹਿਲਾਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../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:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਟਰਮੀਨਲ ਫੋਂਟ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵੇਰੀਬਲ ਚੌੜੇ ਫੋਂਟ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
+#: ../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 "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ \"0\"। ਚੇਤਾਵਨੀ ਲਈ \"1\"। ਡੀਬੱਗ ਸ�ਨੇਹਾ ਲਈ \"2\"।"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-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."
-msgstr ""
-"ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮ�ਤਾਬਕ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਸਕਦਾ "
-"ਹੈ। ਮੂਲ 4MB / 4097 KB ਹੈ ਅਤੇ KB ਦੇ ਰੂਪ ਵਿੱਚ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+#: ../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."
+msgstr "ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮ�ਤਾਬਕ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਮੂਲ 4MB / 4097 KB ਹੈ ਅਤੇ KB ਦੇ ਰੂਪ ਵਿੱਚ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:129
-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: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:130
-msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h: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 "ਇਹ ਕੀ ਕੇਵਲ ਪੜ�ਹਨ ਲਈ ਹੈ ਅਤੇ ਪੜ�ਹਨ ਬਾਅਦ \"ਗਲਤ\" ਲਈ ਰੀ-ਸੈੱਟ ਕੀਤਾ ਹੈ। ਲਿਸਟ ਵਿੱਚਇਹ ਮੇਲ ਅਣ-ਚ�ਣੀ ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ �ਲਕ ਹਟਾਉਦੀ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:131
-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."
+#: ../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 "ਇਸ ਕੀ ਵਿੱਚ XML ਢਾਂਚਾ ਦਿੱਤਾ ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਸ਼ਾਮਿਲ ਹੈ ਅਤੇ ਕੀ ਇਹ ਵੇਖਾ� ਜਾਣ ਜਾਂ ਨਾ। XML ਢਾਂਚੇ ਦਾ ਫਾਰਮੈਟ ਹੈ &lt; ਟਾਇਟਲ ਯੋਗ&gt; - ਸੈੱਟ ਕਰੋ, ਜੇਕਰ ਮੇਲ �ਲਕ ਵਿੱਚ ਤ�ਸੀਂ ਹੈੱਡਰ ਵੇਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ।"
+
+#: ../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 addressbook only to exclude mail sent by known contacts from junk filtering."
 msgstr ""
-"ਇਸ ਕੀ ਵਿੱਚ XML ਢਾਂਚਾ ਦਿੱਤਾ ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਸ਼ਾਮਿਲ ਹੈ ਅਤੇ ਕੀ ਇਹ ਵੇਖਾ� ਜਾਣ ਜਾਂ ਨਾ। "
-"XML ਢਾਂਚੇ ਦਾ ਫਾਰਮੈਟ ਹੈ &lt; ਟਾਇਟਲ ਯੋਗ&gt; - ਸੈੱਟ ਕਰੋ, ਜੇਕਰ ਮੇਲ �ਲਕ ਵਿੱਚ ਤ�ਸੀਂ ਹੈੱਡਰ ਵੇਖਣਾ "
-"ਚਾਹ�ੰਦੇ ਹੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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:133
-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: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:134
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ ਹੋਇਆ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮ�ੜ-"
-"ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
+#: ../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 "ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ ਹੋਇਆ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮ�ੜ-ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-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: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:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਥਰਿੱਡ।"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਥਰਿੱਡ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼ੇ ਤੇ ਅਧਾਰਿਤ ਸ�ਨੇਹਾ-ਲਿਸਟ ਦਾ ਥਰਿੱਡ ਬਣਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "ਸ�ਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "ਸ�ਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "ਮੂਲ ਅਕਾਊਂਟ ਲ਼ਈ UID ਲਾਈਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "Spamasssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਕਸਟਮ ਫੋਂਟ ਵਰਤੋਂ ਜੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਲੋਕਲ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਲੋਕਲ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ (DNS ਨਹੀਂ)।"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "ਨਾਲ-ਨਾਲ ਜਾਂ ਫੈਲਿਆ ਖਾਕਾ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚ�ਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr ""
+msgstr "ਕੀ ਮੂਲ ਰੂਪ ਵਿੱਚ ਹਰੇਕ ਸ�ਨੇਹੇ ਨਾਲ ਜਵਾਬੀ ਰਸੀਦ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+#: ../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:162
+#: ../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 ""
+msgstr "ਕੀ ਮਾਮਲੇ ਨੂੰ ਉਸ ਮਾਮਲੇ ਵਿੱਚ ਤਾਜ਼ਾ ਸ�ਨੇਹਾ ਮ�ਤਾਬਕ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਬਾਹੀ ਦੀ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "ਸ�ਨੇਹਾ-ਲਿਸਟ ਬਾਹੀ ਦੀ ਚੌੜਾਈ ਹੈ।"
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "ਈਲਨ ਡਾਟਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਈਲਮ ਆਯਾਤਕਾਰ"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫੋਲਡਰ:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫੋਲਡਰ ਚ�ਣੋ"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ ਫਾਰਮੈਟ ਫੋਲਡਰ ਆਯਾਤਕਾਰ"
 
@@ -13058,7 +13797,8 @@ msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ ਫਾਰਮੈਟ ਫà©
 msgid "Importing mailbox"
 msgstr "ਪੱਤਰ-ਬਕਸਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232
+#: ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
@@ -13068,15 +13808,15 @@ msgstr "`%s' ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Scanning %s"
 msgstr "ਜਾਂਚ ਜਾਰੀ ਹੈ %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "ਪਾਈਨ ਡਾਟਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਾਈਨ ਆਯਾਤਕਾਰ"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Pine ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 
@@ -13085,7 +13825,8 @@ msgstr "Pine ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 msgid "Mail to %s"
 msgstr "%s ਨੂੰ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:243
+#: ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ਤੋਂ ਪੱਤਰ"
@@ -13104,139 +13845,163 @@ msgstr "%s ਪੱਤਰ ਲਿਸਟ"
 msgid "Add Filter Rule"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164
+#: ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "ਟੈਪਲੇਟ:"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ਚ�ਣਿਆ, "
 msgstr[1] " %d ਚ�ਣੇ, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹਟਾਇਆ"
 msgstr[1] "%d ਹਟਾ�"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ਕੂੜ"
 msgstr[1] "%d ਕੂੜ"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫਟ"
 msgstr[1] "%d ਡਰਾਫਟ"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭੇਜਿਆ"
 msgstr[1] "%d ਭੇਜੇ"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭੇਜਿਆ"
 msgstr[1] "%d ਨਾ-ਭੇਜੇ"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ਅਣ-ਰੀਡ, "
 msgstr[1] "%d ਅਣ-ਰੀਡ, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ਕ�ੱਲ"
 msgstr[1] "%d ਕ�ੱਲ"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸ�ਨੇਹਾ"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:924
+#, fuzzy
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸ�ਨੇਹਾ(_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "ਇੱਕ ਨਵਾਂ ਪੱਤਰ ਸ�ਨੇਹਾ ਲਿਖੋ"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:932
+#, fuzzy
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ(_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ਪੱਤਰ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "ਗਲਤੀਆਂ"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਗਲਤੀਆਂ"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "ਡੀਬੱਗ"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
-msgstr ""
+msgstr "ਗਲਤੀਆਂ, ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਡੀਬੱਗ ਸ�ਨੇਹੇ"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "ਡੀਬੱਗ ਲਾਗ"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1736
 msgid "Show _errors in the status bar for"
-msgstr ""
+msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀਆਂ ਵੇਖੋ(_e)"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1752
+#, fuzzy
+msgid "second(s)."
 msgstr "ਸਕਿੰਟ।"
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "ਲਾਗ ਸ�ਨੇਹੇ:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "ਲਾਗ ਲੈਵਲ"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1808
+#: ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1818
+#: ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ਸ�ਨੇਹੇ"
 
+#: ../mail/mail-component.c:1827
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
@@ -13250,7 +14015,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b> SSL ਸਹਿਯੋਗ ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਲਈ ਸਹਿਯੋਗ ਨਹੀਂ</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13331,73 +14097,74 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">ਛਪੇ ਫੋਟ</span>"
 
 #: ../mail/mail-config.glade.h:27
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">ਸ�ਰੱਖਿਅਤ MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">ਸ�ਰੱਖਿਆ</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">ਭੇਜੇ ਤੇ ਡਰਾਫਟ ਸ�ਨੇਹੇ</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">ਸਰਵਰ ਸੰਰਚਨਾ</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">ਪਰਮਾਣਕਿਤਾ ਟਾਈਪ(_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "ਅਕਾਊਂਟ ਪਰਬੰਧ"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "ਨਵੇਂ ਦਸਤਖਤ ਸ਼ਾਮਿਲ ਕਰੋ(_w)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "ਸਕ�ਰਿਪਟ ਜੋੜੋ(_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ਇਸ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਭੇਜਣ ਵਾਲੇ ਸ�ਨਹਿਆਂ ਤੇ ਹਮੇਸ਼ਾ ਦਸਤਖਤ ਕਰੋ(_w)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ਇਕ�ਰਿਪਸ਼ਨ ਸ�ਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਖ�ਦ ਇੰਕ�ਰਿਪਟ ਕਰੋ(_f)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ਇਸ ਨੂੰ ਹਮੇਸ਼ਾ ਕਾਰਬਨ ਕਾਪੀ ਭੇਜੀ ਜਾਵੇ(CC):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ਇਸ ਨੂੰ ਹਮੇਸ਼ਾ ਲ�ਕਵੀਂ ਕਾਪੀ ਭੇਜੀ ਜਾਵੇ(_BCC):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ਇਕ�ਰਿਪਸ਼ਨ ਕਰਨ ਸਮੇਂ ਮੇਰੇ ਕੀ-ਰਿੰਗ ਉੱਤੇ ਭਰੋਸਾ ਰੱਖੋ(_t)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ਇਕ�ਰਿਪਟਡ ਸ�ਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਮੈਨੂੰ ਹਮੇਸ਼ਾ ਇੰਕ�ਰਿਪਟ ਕਰੋ(_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "ਪੜਨ ਰਸੀਦ ਹਮੇਸ਼ਾ ਮੰਗੋ(_d)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "ਅਸਲੀ ਸ�ਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰੋ"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "ਈਮੋਸ਼ਨ ਚਿੱਤਰ ਆਟੋਮੈਟਿਕ ਸ਼ਾਮਿਲ ਕਰੋ(_e)"
@@ -13415,13 +14182,14 @@ msgid "C_haracter set:"
 msgstr "ਅੱਖਰ ਸਮੂਹ(_h):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "ਜੰਕ ਲਈ ਕਸਟਮ ਹੈੱਡਰ ਚੈੱਕ ਕਰੋ(_h)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
+#: ../mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Check cu_stom headers for junk"
+msgstr "ਜੰਕ ਲਈ ਕਸਟਮ ਹੈੱਡਰ ਚੈੱਕ ਕਰੋ(_h)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "ਜੰਕ ਲਈ ਆ ਰਹੇ ਸ�ਨੇਹੇ ਚੈੱਕ ਕਰੋ(_m)"
@@ -13483,16 +14251,18 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸ�ਨੇਹੇ ਡਿਜ਼ੀਟਲ ਸਾਈਨ ਕਰੋ (ਡਿਫਾਲਟ)(_s)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr ""
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "ਮੇਲ ਵਿੱਚ ਟੈਕਸਟ ਸਮੱਗਰੀ ਫਾਰਮੈਟ ਨਾ ਕਰੋ, ਜੇ ਟੈਕਸਟ ਸਾਈਜ਼ ਵੱਧ ਜਾਵੇ(_z)"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "ਮੇਲ ਵਿੱਚ ਟੈਕਸਟ ਸਮੱਗਰੀ ਫਾਰਮੈਟ ਨਾ ਕਰੋ, ਜੇ ਟੈਕਸਟ ਸਾਈਜ਼ ਵੱਧ ਜਾਵੇ(_z)"
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "ਜੇ ਭੇਜਣ ਵਾਲਾ ਮੇਰੀ �ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ ਹੋਵੇ ਤਾਂ ਸ�ਨੇਹਾ ਜੰਕ ਨਾ ਬਣਾਓ(_k)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "ਅਸਲੀ ਸ�ਨੇਹੇ ਦਾ ਹਵਾਲਾ ਨਹੀਂ"
+#, fuzzy
+msgid "Do not quote"
+msgstr "ਨਾ ਹਟਾਓ"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13516,7 +14286,7 @@ msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਫੋਲਡਰ ਬੰਦ ਕਰ
 
 #: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
-msgstr ""
+msgstr "ਮੈਜਿਕ ਸਪੇਸਬਾਰ ਯੋਗ(_p)"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
@@ -13555,68 +14325,87 @@ msgid "HTML Messages"
 msgstr "HTML ਸ�ਨੇਹੇ"
 
 #: ../mail/mail-config.glade.h:91
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "_PO ਬਾਕਸ:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "ਹੈੱਡਰ"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲੇ ਨੂੰ ਉਭਾਰੋ(_q)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "ਲਾਇਨ 'ਚ"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Inline (Outlook style)"
 msgstr "ਇਨਲਾਇਨ ਅਸਲੀ ਸ�ਨੇਹਾ (ਆਉਟਲ�ੱਕ ਸਟਾਈਲ)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲੇਬਲ"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "ਮੇਲ ਸੰਰਚਨਾ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "ਮੇਲ ਹੈੱਡਰ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "ਮੇਲ-ਬਾਕਸ ਟਿਕਾਣਾ"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "ਸ�ਨੇਹਾ ਲੇਖਕ"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "ਇਸ ਲਈ ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ(_P):"
+
+#: ../mail/mail-config.glade.h:107
+#, fuzzy
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
+msgstr "ਨੋਟ: ਲੇਬਲ ਨਾਂ ਵਿੱਚ ਹੇਠਾਂ ਲਾਈਨ ਨੂੰ ਮੇਨੂ ਵਿੱਚ "
 
-#: ../mail/mail-config.glade.h:106
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: ../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:107
+#: ../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 "ਸੰਗਠਨ(_g):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Pass_word:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#: ../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."
@@ -13624,130 +14413,128 @@ msgstr ""
 "ਅੱਗੇ ਦਿੱਤੀ ਥਾਂ ਵਿੱਚ ਇਸ ਅਕਾਊਂਟ ਬਾਰੇ ਵਰਣਨ ਕਰਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ।\n"
 "ਇਹ ਨਾਂ ਸਿਰਫ਼ ਵੇਖਾਉਣ ਲਈ ਹੀ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail-config.glade.h:112
-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: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:113
-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: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:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "ਹੇਠ ਲਿਖੀਆਂ ਚੋਣਾਂ ਵਿੱਚੋਂ ਚ�ਣੋ ਜੀ"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Port:"
+msgstr "ਪੋਰਟ(_P):"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ਸੂਚਿਤ ਕਰੋ, ਜਦੋਂ ਵੀ ਸ�ਨੇਹੇ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ, ਜੋ ਕਿ Bcc ਪ�ਰਾਪਤਕਰਨ ਵਾਲਿਆਂ ਲਈ ਹੋਵੇ(_o)"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "ਅਸਲੀ ਸ�ਨੇਹਾ ਵੇਰਵਾ"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "ਹਵਾਲਾ"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_m)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_p)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "S_OCKS ਹੋਸਟ:"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਤਸਵੀਰ ਦੀ ਖੋਜ ਸਿਰਫ਼ ਲੋਕਲ �ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ ਹੀ ਕਰੋ(_e)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "ਚ�ਣੋ(_e)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "ਸ�ਨੇਹਾ ਰਸੀਦ ਭੇਜੋ(_e):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "ਸਟੈਂਡਰਡ ਫੋਂਟ(_t):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚ�ਣੋ"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "ਪਰਿਟਿੰਗ ਲਈ HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚ�ਣੋ"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚ�ਣੋ"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿਟਿੰਗ ਲਈ HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚ�ਣੋ"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "ਭੇਜੇ ਸ�ਨੇਹੇ ਫੋਲਡਰ(_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲਈ ਪ�ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "ਸਰਵਰ ਕਿਸਮ(_T): "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ(_n):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "ਦਸਤਖਤ(_u):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "ਦਸਤਖਤ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "ਜਦੋਂ ਜਵਾਬ ਦੇਣਾ ਹੋਵੇ ਤਾਂ ਹੇਠਾਂ ਲਿਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ(_t)"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "ਕਿਸਮ(_y): "
 
-#: ../mail/mail-config.glade.h:142
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+#: ../mail/mail-config.glade.h:148
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾਂ ਦੀ ਲਿਸਟ, ਸਿਰਫ ਉਹਨਾਂ ਨੂੰ ਵੇਖਾਉਦੀ ਹੈ, ਜਿਨਾਂ ਲਈ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13757,11 +14544,7 @@ msgstr ""
 "ਵਿੱਚ ਵਰਤੀ ਜਾਵੇਗੀ। ਨਾਂ, ਜੋ ਵੀ ਤ�ਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ\n"
 "ਵੇਖਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗੀ।"
 
-#: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13769,16 +14552,29 @@ msgstr ""
 "ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤ�ਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ।\n"
 "ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+#, fuzzy
+msgid "Us_ername:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
+
+#: ../mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "ਪ�ਰਮਾਣਿਕਤਾ"
+
+#: ../mail/mail-config.glade.h:156
+#: ../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 "ਯੂਜ਼ਰ ਨਾਂ(_n):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "ਅਸਥਿਰ-ਚੌੜਾਈ(_a):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13788,100 +14584,129 @@ msgstr ""
 "\n"
 "ਸ਼�ਰੂ ਕਰਨ ਲਈ \"ਅੱਗੇ\" ਦਬਾਓ।"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "ਦਸਤਖਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਹਮੇਸ਼ਾ ਪ�ਰਾਪਤ ਕਰੋ(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Automatic proxy configuration URL:"
+msgstr "ਆਟੋਮੈਟਿਕ ਖ�ਸ਼ ਪਛਾਣ"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ(_D):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "ਇੰਟਰਨੈੱਟ ਲਈ ਸਿੱਧਾ ਕ�ਨੈਕਸ਼ਨ(_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਉੱਤੇ ਦਸਤਖ਼ਤ ਨਾ ਕਰੋ (ਆਉਟਲ�ੱਕ ਅਨ�ਕੂਲਤਾ ਲਈ) (_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਸਟਾਇਲ(_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਦਸਤਖਤ ਅਸਲੀਂ ਸ�ਨੇਹੇ ਦੇ ਉੱਤੇ ਰੱਖੋ(_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "ਸੰਪਰਕਾਂ ਤੋਂ ਆ� ਸ�ਨੇਹਿਆਂ 'ਚ ਚਿੱਤਰ ਲੋਡ ਕਰੋ(_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "ਲੋਕਲ �ਡਰੈੱਸ ਫੋਲਡਰਾਂ ਦੀ ਲਿਸਟ"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "ਮੇਰੇ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਮੂਲ ਬਣਾਓ(_M)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "ਮੇਲ ਸੰਰਚਨਾ"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "ਬਾਅਦ ਵਿੱਚ ਸ�ਨੇਹੇ ਨੂੰ ਪੜਿਆ ਬਣਾਓ(_M)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਕਦੇ ਵੀ ਲੋਡ ਨਾ ਕਰੋ(_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ਮਾਰਗ(_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸ�ਨੇਹਾ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜਣ ਸਮੇਂ ਪ�ੱਛੋ, ਜੋ ਕਿ ਨਹੀਂ ਚਾਹ�ੰਦੇ ਹਨ (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ਖਾਲੀ ਵਿਸ਼ਾ ਲਾਈਨ ਨਾਲ ਸ�ਨੇਹਾ ਭੇਜਣ ਸਮੇਂ ਪ�ੱਛੋ(_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "ਜਵਾਬ ਸਟਾਇਲ(_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "ਸਕ�ਰਿਪਟ(_S):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "ਸ�ਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ(_S):"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "ਚ�ਣੋ(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "ਚਿੱਤਰ ਸਜੀਵਤਾ ਵੇਖਾਓ(_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ਈਮੇਲ �ਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ਵੱਲ / Cc / Bcc ਹੈੱਡਰ ਨੂੰ ਸ�ੰਘੜੋ(_S) "
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ਸ�ਰੱਖਿਅਤ ਕ�ਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "ਮੂਲ ਵਰਤੋਂ(_D)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ਹੋਰ ਕਾਰਜ ਵਾਂਗ ਉਹੀ ਫੋਂਟ ਵਰਤੋਂ(_U)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "�ਡਰੈੱਸ"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "ਰੰਗ"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "ਵੇਰਵਾ"
 
@@ -13921,43 +14746,44 @@ msgstr "ਅੱਖਰ ਅਕਾਰ ਪ�ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ
 msgid "Co_mpleted"
 msgstr "ਮ�ਕੰਮਲ(_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "ਖੋਜ(_i):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "ਸ�ਨੇਹੇ ਵਿੱਚ ਲੱਭੋ"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "ਨਿਸ਼ਾਨ ਦੇ ਪਿੱਛੇ"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ"
 
-#: ../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 "ਕੋਈ ਚ�ਣਿਆ ਨਹੀਂ"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "ਸਰਵਰ(_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "ਸ�ਰੱਖਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "ਖਾਸ ਫੋਲਡਰ"
 
-#: ../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."
@@ -13965,23 +14791,23 @@ msgstr ""
 "ਸ�ਨੇਹੇ, ਜੋ ਕਿ ਤ�ਸੀਂ ਪਿੱਛਾ ਕਰਨ ਲਈ ਚ�ਣੇ ਸਨ, ਹੇਠਾਂ ਦਿੱਤੇ ਜਾ ਰਹੇ ਹਨ।\n"
 "ਕਿਰਪਾ ਕਰਕੇ \"ਨਿਸ਼ਾਨ\" ਮੇਨੂੰ ਵਿੱਚੋਂ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਚ�ਣ।"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "ਲਾਇਸੈਂਸ ਮਨਜ਼ੂਰ(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "ਦੇਣਯੋਗ(_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਇਸ ਨੂੰ ਚ�ਣੋ(_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "ਪਿੰਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %s"
@@ -14000,7 +14826,8 @@ msgstr "ਪੱਤਰ ਲ� ਜਾ ਰਹੇ ਹਨ"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰੀ ਫਿਲਟਰ ਲਾਗੂ ਕਰਨ ਤੋਂ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:572
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14028,11 +14855,13 @@ msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸà©�ਨੇਹਾ ਭੇਜਿਆ ਜਾ à
 msgid "Failed to send %d of %d messages"
 msgstr "ਸ�ਨੇਹੇ %2$d ਵਿੱਚੋਂ %1$d ਭੇਜਣ ਵਿੱਚ ਅਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "ਰੱਦ ਕੀਤਾ।"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
@@ -14060,67 +14889,73 @@ msgid "Opening folder %s"
 msgstr "ਫੋਲਡਰ %s ਖੋਲ�ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "ਸਟੋਰ %s ਖੋਲ�ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "ਫੋਲਡਰ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫੋਲਡਰ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸ�ੰਘੜਿਆ ਜਾ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "ਫੋਲਡਰ ਤਾਜ਼ਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657
+#: ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "ਨਿਕਾਲਾ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "ਲੋਕਲ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "ਸ�ਨੇਹਾ %s ਪ�ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸ�ਨੇਹਾ %d ਪ�ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸ�ਨੇਹੇ %d ਪ�ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1906
-#, c-format
+#: ../mail/mail-ops.c:1978
+#, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "ਸ�ਨੇਹਾ %d ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸ�ਨੇਹੇ %d ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14129,11 +14964,12 @@ msgstr ""
 "ਸ�ਨੇਹਾ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146
+#: ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14142,51 +14978,52 @@ msgstr ""
 "ਆਉਟਪ�ੱਟ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ਡਾਟਾ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ਨਾਲੋਂ ਕ�ਨੈਕਸ਼ਨ ਖਤਮ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ਨਾਲ ਮ�ੜ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ਆਫਲਾਇਨ ਲਈ ਅਕਾਊਂਟ '%s' ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "ਸੇਵਾ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ(_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "ਅੱਪਡੇਟ ਜਾਰੀ..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "ਉਡੀਕ ਜਾਰੀ..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
@@ -14214,17 +15051,20 @@ msgstr "ਪਾਸਵਰਡ ਭਰੋ"
 msgid "User canceled operation."
 msgstr "ਯੂਜ਼ਰ ਨੇ ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ।"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "ਦਸਤਖਤ ਸੋਧ"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "ਇਸ ਦਸਤਖਤ ਲਈ ਨਾਂ ਦਿਓ।"
+#: ../mail/mail-signature-editor.c:355
+#, fuzzy
+msgid "Edit Signature"
+msgstr "ਦਸਤਖਤ ਸੋਧ"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "ਨਾਂ:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "ਦਸਤਖਤ ਟੇਬਲ"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14265,60 +15105,55 @@ msgstr "'%s:%s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸੋਧ"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "ਨਵਾਂ ਖੋਜ ਫੋਲਡਰ"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
+#, fuzzy
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "ਫੋਲਡਰ ਨਾਂ &quot;{0}&quot; ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਦਿਓ ਜੀ।"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "ਫੋਲਡਰ ਨਾਂ &quot;{1}&quot; ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਇੱਕ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ ਜੀ।"
 
 #  mail:ask-migrate-existing secondary
 #: ../mail/mail.error.xml.h:3
+#, fuzzy
 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."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "&quot;{1}&quot; 'ਤੇ ਇੱਕ ਨਾ-ਖਾਲੀ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n"
 "\n"
-"ਤ�ਸੀਂ ਇਸ ਫੋਲਡਰ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਸਕਦੇ ਹੋ, ਉੱਪਰ ਲਿਖ ਸਕਦੇ ਹੋ ਜਾਂ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬੰਦ ਕਰ "
-"ਸਕਦੇ ਹੋ।"
+"ਤ�ਸੀਂ ਇਸ ਫੋਲਡਰ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਸਕਦੇ ਹੋ, ਉੱਪਰ ਲਿਖ ਸਕਦੇ ਹੋ ਜਾਂ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+#, fuzzy
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
 msgstr "&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ ਭੇਜਣੀ ਹੈ?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+#, fuzzy
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "ਨਾਂ &quot;{1}&quot; ਨਾਲ ਇੱਕ ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
 
 #: ../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 ""
-"ਆਪਣੇ ਪੱਤਰ ਦੇ ਵਿਸ਼ੇ ਵਿੱਚ ਕ�� ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ�ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤ�ਹਾਡੇ ਪੱਤਰ ਬਾਰੇ "
-"ਆਸਾਨੀ ਨਾਲ ਸਮ� ਜਾਦੇ ਹਨ।"
+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?"
@@ -14337,16 +15172,13 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "ਕੀ ਤ�ਸੀਂ {0} ਸ�ਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲਣੇ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+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 &quot;{0}&quot;?"
-msgstr "ਕੀ ਤ�ਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸਾਰੇ ਹਟਾ� ਸ�ਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
+#, fuzzy
+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?"
@@ -14362,11 +15194,13 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਪੱਤਰ ਨੂੰ ਵਿਸ਼ੇ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+#, fuzzy
+msgid "Because \"{0}\"."
 msgstr "ਕਿਉਕਿ &quot;{0}&quot;।"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+#, fuzzy
+msgid "Because \"{2}\"."
 msgstr "ਕਿਉਕਿ &quot;{2}&quot;।"
 
 #: ../mail/mail.error.xml.h:21
@@ -14374,15 +15208,18 @@ msgid "Blank Signature"
 msgstr "ਖਾਲੀ ਦਸਤਖਤ"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "&quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨਹੀਂ ਬਣ ਸਕਿਆ।"
 
 #: ../mail/mail.error.xml.h:25
@@ -14390,52 +15227,58 @@ msgid "Cannot create temporary save directory."
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+#, fuzzy
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+#, fuzzy
+msgid "Cannot open source \"{1}\""
 msgstr "ਸਰੋਤ &quot;{1}&quot; ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
 msgstr "ਸਰੋਤ &quot;{2}&quot; ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
 msgstr "ਨਿਯਤ &quot;{2}&quot; ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../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."
-msgstr ""
-"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤ�ਸੀਂ "
-"ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹ�ੰਦੇ।"
+#, fuzzy
+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 "ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤ�ਸੀਂ ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹ�ੰਦੇ।"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "&quot;{0}&quot; ਦਾ ਨਾਂ &quot;{1}&quot; ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:37
@@ -14443,70 +15286,70 @@ msgid "Cannot save changes to account."
 msgstr "ਅਕਾਊਂਟ ਲਈ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
 msgstr "ਡਾਇਰੈਕਟਰੀ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
 msgstr "ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
 msgstr "ਦਸਤਖਤ ਸਕ�ਰਿਪਟ &quot;{0}&quot; ਸੈਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:41
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"ਜਾਂਚ ਕਰੋ ਕਿ ਤ�ਹਾਡੇ ਪਾਸਵਰਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਪਾਸਵਰਡ ਅੱਖਰ ਪ�ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ "
-"ਹੈ, ਤ�ਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "ਕੂੜੇ ਲਈ ਜਾਂਚ(_J)"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Could not save signature file."
-msgstr "ਦਸਤਖਤੀ ਫਾਇਲ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਤ�ਹਾਡੇ ਪਾਸਵਰਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਪਾਸਵਰਡ ਅੱਖਰ ਪ�ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ ਹੈ, ਤ�ਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "ਕੀ &quot;{0}&quot; ਹਟਾਓਣਾ ਹੈ?"
+msgid "Could not save signature file."
+msgstr "ਦਸਤਖਤੀ ਫਾਇਲ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "ਅਕਾਊਂਟ ਹਟਾਓ?"
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "ਹਟਾ�: "
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "ਕੀ ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸ�ਨੇਹੇ ਹਟਾਉਣੇ ਹਨ?"
+msgid "Delete account?"
+msgstr "ਅਕਾਊਂਟ ਹਟਾਓ?"
 
 #: ../mail/mail.error.xml.h:46
-msgid "Delete messages in Search Folder?"
+#, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਵਿੱਚੋਂ ਸ�ਨੇਹੇ ਹਟਾਓ"
 
 #: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr "ਖੋਜ ਫੋਲਡਰ ਵਿੱਚੋਂ ਸ�ਨੇਹੇ ਹਟਾਓ"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "ਕੀ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰਨੀਆਂ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "ਨਾ ਹਟਾਓ(_e)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "ਨਾ ਹਟਾਓ"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "ਅਯੋਗ ਨਾ ਕਰੋ"
 
-#: ../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 "
-"usage?"
-msgstr ""
+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?"
@@ -14549,9 +15392,7 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "ਜੇਕਰ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਤ�ਸੀਂ ਇਹਨਾਂ ਸ�ਨੇਹਿਆਂ ਨੂੰ ਮ�ੜ-ਪ�ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: ../mail/mail.error.xml.h:62
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+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
@@ -14571,12 +15412,8 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ਜੇਕਰ ਤ�ਸੀਂ ਅੱਗੇ ਗ�, ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
 #: ../mail/mail.error.xml.h:67
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"ਜੇਕਰ ਤ�ਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸ�ਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮ�ੜ ਚਾਲੂ ਨਹੀਂ "
-"ਕੀਤਾ ਜਾਦਾ ਹੈ।"
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "ਜੇਕਰ ਤ�ਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸ�ਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮ�ੜ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -14591,92 +15428,84 @@ msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲਟਰ ਆਟੋਮੈਟਿਕ ਹੀ ਅੱਪਡੇਟ ਕੀਤੇ ਗ� ਹਨ।"
 
 #: ../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 ""
-"ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹ�ੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, "
-"ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ�ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤ�ਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ "
-"ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹ�ੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ�ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤ�ਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "ਸਭ ਸ�ਨੇਹੇ ਪੜੇ ਬਣਾਓ"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "ਕੀ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਸਭ ਸ�ਨੇਹੇ ਪੜ�ਹੇ ਬਣਾਉਣੇ ਹਨ?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "ਫੋਲਡਰ ਗ�ੰਮ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਚ�ਣਿਆ।"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "ਕੇਵਲ ਮੌਜੂਦ ਫੋਲਡਰ ਉੱਤੇ(_C)"
-
-#: ../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
-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."
+#: ../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
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
-"ਇਹ ਯਕੀਨੀ ਬਣਾ ਲਵੋ ਕਿ ਇਹ ਪ�ਰਾਪਤ ਕਰਤਾ HTML ਈ-ਮੇਲ ਪ�ਰਾਪਤ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹਨ "
-"ਅਤੇ ਇਹ ਉਹਨਾਂ ਲਈ ਸੰਭਵ ਵੀ ਹੈ:\n"
+"ਇਹ ਯਕੀਨੀ ਬਣਾ ਲਵੋ ਕਿ ਇਹ ਪ�ਰਾਪਤ ਕਰਤਾ HTML ਈ-ਮੇਲ ਪ�ਰਾਪਤ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹਨ ਅਤੇ ਇਹ ਉਹਨਾਂ ਲਈ ਸੰਭਵ ਵੀ ਹੈ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "ਇਸ ਦਸਤਖਤ ਲਈ ਵਿਲੱਖਣ ਨਾਂ ਦਿਓ ਜੀ।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ।"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+#, fuzzy
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ਪ�ਰਾਣੇ ਪੱਤਰ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "ਕਿਊਰਿੰਗ ਸਰਵਰ"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲੋੜੀਦੇ ਪ�ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਲਿਸਟ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "ਪੜਨ ਰਸੀਦ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪ�ਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+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 "ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
@@ -14699,35 +15528,27 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "ਕੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਫੋਲਡਰ ਲੋਕਲੀ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ?"
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"ਸਿਸਟਮ ਫੋਲਡਰ ਈਵੇਲੂਸ਼ਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਤਬਦੀਲ, ਨਾਂ-ਤਬਦੀਲ ਜਾਂ ਹਟਾਉਣਾ "
-"ਸੰਭਵ ਨਹੀਂ ਹੈ।"
+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. "
+"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 ""
 "ਸੰਪਰਕ ਲਿਸਟ, ਜੋ ਤ�ਸੀਂ ਭੇਜ ਰਹੇ ਹੋ, ਲ�ਕਵੇਂ ਪ�ਰਾਪਤ ਕਰਤਾ ਨਾਲ ਸੰਰਚਿਤ ਹੈ।\n"
 "\n"
-"ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹ�ੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, "
-"ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ�ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤ�ਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ "
-"ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
+"ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹ�ੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ�ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤ�ਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਪ�ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #  mail:vfolder-updated secondary
 #: ../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 ""
 "ਹੇਠ ਲਿਖੇ ਖੋਜ ਫੋਲਡਰ:\n"
@@ -14737,11 +15558,12 @@ msgstr ""
 "ਅਤੇ ਅੱਪਡੇਟ ਹੈ।"
 
 #: ../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 ""
 "ਹੇਠ ਲਿਖੇ ਫਿਲਟਰ ਨਿਯਮ ਹਨ:\n"
@@ -14764,21 +15586,15 @@ 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 ""
-"ਇਹ ਸ�ਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਜਿਸ ਅਕਾਊਂਟ ਨਾਲ ਤ�ਸੀਂ ਭੇਜਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਉਹ ਤਾਂ "
-"ਆਯੋਗ ਹੈ।"
+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."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "ਸਰਵਰ ਇਸ ਤਰਾਂ ਦੀ ਪ�ਰਮਾਣਿਤ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਅਤੇ ਸਭ ਪ�ਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਈ ਵੀ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:117
@@ -14786,9 +15602,7 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗ� ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗ� ਹਨ।"
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "ਇਸ ਨਾਲ ਚ�ਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸ�ਨੇਹੇ ਪੜ�ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
 #: ../mail/mail.error.xml.h:119
@@ -14796,12 +15610,8 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "ਗਰ�ੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜ�ੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"ਇਸ ਅਕਾਊਂਟ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾ� ਸਿਸਟਮ ਡਰਾਫਟ ਫੋਲਡਰ "
-"ਵਰਤਿਆ ਜਾਵੇ?"
+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."
@@ -14817,8 +15627,7 @@ msgstr "ਮੂਲ ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
 
 #: ../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"
+"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 ""
 
@@ -14846,14 +15655,14 @@ msgstr "ਤ�ਹਾਨੂੰ ਫੋਲਡਰ ਨਿਰਧਾਰਿਤ ਕਰਨ
 #: ../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."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "ਤ�ਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸਰੋਤ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।\n"
 "ਜਾਂ ਇੱਕਲਾ-ਇੱਕਲਾ ਫੋਲਡਰ ਚ�ਣ ਕੇ ਅਤੇ/ਜਾਂ ਸਾਰੇ ਲੋਕਲ, ਸਾਰੇ ਰਿਮੋਟ ਫੋਲਡਰ ਜਾਂ ਦੋਵੇਂ ਚ�ਣ ਕੇ।"
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ਤ�ਹਾਡਾ ਸਰਵਰ &quot;{0}&quot; 'ਤੇ &quot;{0}&quot; ਦੇ ਤੌਰ ਤੇ ਲਾਗਇਨ ਅਸਫਲ"
 
 #: ../mail/mail.error.xml.h:135
@@ -14876,22 +15685,23 @@ msgstr "ਸ�ੰਘੜੋ(_E)"
 msgid "_Open Messages"
 msgstr "ਸ�ਨੇਹੇ ਖੋਲ�ਹੋ(_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਉੱਤੇ(_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "ਨਾ-ਵੇਖੇ"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
+#: ../mail/message-list.c:1055
+#, fuzzy
+msgid "Forwarded"
+msgstr "ਅੱਗੇ"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹ� ਨਾ-ਵੇਖੇ ਸ�ਨੇਹੇ"
@@ -14916,37 +15726,57 @@ msgstr "ਵੱਧ"
 msgid "Highest"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "ਅੱਜ %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../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 "ਕੱਲ�ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../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"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "ਸ�ਨੇਹਾ ਲਿਸਟ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
+#: ../mail/message-list.c:4223
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4225
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"ਇਸ �ਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਲਿਸਟ ਨਹੀਂ ਹੈ।"
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "ਮਿਆਦ ਨਾਲ"
@@ -14976,39 +15806,42 @@ msgstr "ਭੇਜੇ ਸ�ਨੇਹੇ"
 msgid "Size"
 msgstr "ਅਕਾਰ"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "ਕਾਲ"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "ਅੱਗੇ ਨਾ ਭੇਜੋ"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "ਸਹਾਇਕ"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "ਤ�ਹਾਡੀ ਜਾਣਕਾਰੀ ਲਈ"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ਅੱਗੇ"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "ਕੋਈ ਜਵਾਬ ਲੋੜੀਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "ਮ�ੜ-ਜਾਂਚ"
 
@@ -15033,6 +15866,11 @@ msgid "Subject contains"
 msgstr "ਵਿਸ਼ੇ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
@@ -15045,186 +15883,189 @@ msgid "Provides core functionality for local address books."
 msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦਾ ਹੈ।"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "ਨੱਥੀ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਯੋਗ ਕਰੋ"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "ਅਟੈਂਚਮੈਂਟ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਯੋਗ ਹੈ।"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+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:4
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
+#: ../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/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "ਗ�ੰਮ ਅਟੈਂਚਮਿੰਟ ਯਾਦ ਕਰਵਾਓ(_m)"
-
 #: ../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 "ਅਟੈਂਚਮਿੰਟ ਰੀਮਾਈਡਰ"
 
 #: ../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"
+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."
+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 "ਸ�ਨੇਹੇ ਵਿੱਚ ਕੋਈ ਅਟੈਂਚਮਿੰਟ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "�ਡੀਟਿੰਗ ਜਾਰੀ ਰੱਖੋ(_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#, fuzzy
+msgid "_Edit Message"
+msgstr "ਸ�ਨੇਹਾ ਸੋਧ(_E)"
 
 #: ../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 ""
-"ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਲਾਈਨ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ "
-"ਸਹਾਇਕ ਹੈ।"
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
+msgstr "ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਲਾਈਨ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "ਆਡੀਓ ਇਨ-ਲਾਇਨ ਪਲੱਗ-ਇਨ"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "ਈਵੂਲੇਸਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚ�ਣੋ"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "ਬੈਕਅੱਪ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮ�ੜ-ਚਾਲੂ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚ�ਣੋ"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "ਮ�ੜ-ਪ�ਰਾਪਤ ਕਰਨ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮ�ੜ ਚਾਲੂ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
+"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:264
 msgid "_Restore Evolution from the backup file"
 msgstr "ਬੈਕਅੱਪ ਫਾਇਲ ਤੋ ਈਵੂਲੇਸ਼ਨ ਰੀਸਟੋਰ ਕਰੋ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੂਲੇਸ਼ਨ ਅਕਾਇਵ ਚ�ਣੋ ਜੀ:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਫਾਇਲ ਚ�ਣੋ"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "ਬੈਕਅੱਪ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "ਮ�ੜ-ਪ�ਰਾਪਤੀ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਚੈੱਕ ਕਰੋ"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮ�ੜ-ਚਾਲੂ"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਨਾਲ"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਅਤੇ ਸੈਟਿੰਘ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "ਬੈਕਅੱਪ ਪੂਰਾ ਹੋਇਆ"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮ�ੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "ਬੈਕਅੱਪ ਤੋਂ ਫਾਇਲਾਂ ਖੋਲ�ਹੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈਟਿੰਗ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "ਆਰਜ਼ੀ ਬੈਕਅੱਪ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ਫੋਲਡਰ %s ਲਈ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ਫੋਲਡਰ %s ਤੋਂ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਰੀਸਟੋਰ"
 
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਤ�ਹਾਡੇ ਡਾਟੇ ਦਾ ਬੈਕਅੱਪ ਲੈ ਰਹੀ ਹੈ ਤਾਂ ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
+
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਮ�ੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "ਈਵੈਲੂਸ਼ਨ ਜਦੋਂ ਤੱਕ ਤ�ਹਾਡੇ ਡਾਟੇ ਨੂੰ ਰੀ-ਸਟੋਰ ਕਰਦੀ ਹੈ, ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
+
+#: ../plugins/backup-restore/backup.c:516
+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 "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਅਤੇ ਮ�ੜ-ਪਰਾਪਤ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
@@ -15243,28 +16084,29 @@ 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."
+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
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "ਪ�ਰਤੀਨਿਧ ਅਧਿਕਾਰ"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "ਗਲਤ ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਫਾਇਲ"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਠੀਕ ਬੈਕਅੱਪ ਫਾਇਲ ਚ�ਣੋ ਜੀ।"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-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."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+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
@@ -15279,55 +16121,71 @@ msgstr "ਸੈਟਿੰਗ ਰੀਸਟੋਰ(_e)..."
 msgid "_Backup Settings..."
 msgstr "ਬੈਕਅੱਪ ਸੈਟਿੰਗ(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543
+#: ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "ਸ�ਨੇਹਿਆਂ ਦੇ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਖ�ਦ ਹੀ �ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ �ਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕਾਂ ਲਈ �ਡਰੈੱਸ-ਬ�ੱਕ ਚ�ਣੋ"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "�ੱਟਪਟ ਸ�ਨੇਹੇ ਸੰਪਰਕ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "ਨਿਯਮਤ ਤੌਰ ਉੱਤੇ ਪਿਡਗਿਨ ਬੱਡੀ ਲਿਸਟ ਨਾਲ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚਿੱਤਰਾਂ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਦੇ ਰਹੋ"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਲਿਸਟ ਲਈ �ਡਰੈੱਸ-ਬ�ੱਕ ਚ�ਣੋ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "ਭਾਈ ਸੂਚਨਾ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ(_b)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"ਜਿਵੇਂ ਹੀ ਤ�ਸੀਂ ਕਿਸੇ ਈ-ਮੇਲ ਦਾ ਜਵਾਬ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤ�ਹਾਡੀ �ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ �ਡਰੈੱਸ ਵਿੱਚ "
-"ਜਾਣਕਾਰੀ ਆਪਣੇ ਆਪ ਹੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤ�ਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਤੋਂ IM ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਭਰ ਦਿੱਤੀ "
-"ਜਾਵੇਗੀ।"
+msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
+msgstr "ਜਿਵੇਂ ਹੀ ਤ�ਸੀਂ ਕਿਸੇ ਈ-ਮੇਲ ਦਾ ਜਵਾਬ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤ�ਹਾਡੀ �ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ �ਡਰੈੱਸ ਵਿੱਚ ਜਾਣਕਾਰੀ ਆਪਣੇ ਆਪ ਹੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤ�ਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਤੋਂ IM ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 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:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "ਪਰਿੰਟਿੰਗ ਦੇ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "ਮੇਲ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ(_U)"
 
@@ -15336,9 +16194,7 @@ msgid "Convert mail messages to Unicode"
 msgstr "ਮੇਲ ਸ�ਨੇਹਿਆਂ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
 msgstr "ਸ�ਨੇਹੇ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ UTF-8 ਤੋਂ ਯੂਨੀਫਾਈ ਸਪਮ/ਹਮ ਟੋਕਨ ਵਿੱਚ ਬਦਲੋ, ਜੋ ਕਿ ਵੱਖਰੇ ਅੱਖਰ ਸੈੱਟ ਤੋਂ ਆਉਦੇ ਹਨ।"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -15346,20 +16202,27 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter ਚੋਣਾਂ"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter ਚੋਣਾਂ"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ ਜੰਕ ਸ�ਨੇਹੇ ਫਿਲਟਰ ਕਰੋ।"
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "_SSL ਵਰਤੋਂ"
 
@@ -15379,17 +16242,19 @@ msgstr "ਲੋਕਲ ਕੈਲੰਡਰ"
 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:375
-msgid "_Refresh:"
-msgstr "ਮ�ੜ-ਤਾਜ਼ਾ(_R):"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "ਮ�ੜ-ਤਾਜ਼ਾ(_f)"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "ਸ�ਰੱਖਿਅਤ ਕ�ਨੈਕਸ਼ਨ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_m):"
 
@@ -15455,12 +16320,8 @@ msgid "Weather Calendars"
 msgstr "ਮੌਸਮ ਕੈਲੰਡਰ"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"ਇੱਕ ਟੈਕਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ �ਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤ�ਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ ਦੀ "
-"ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+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"
@@ -15487,13 +16348,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:626
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
+
+#: ../plugins/default-source/default-source.c:102
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
+
+#: ../plugins/default-source/default-source.c:103
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
+
+#: ../plugins/default-source/default-source.c:104
+#, fuzzy
+msgid "Mark as _default memo list"
 msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
@@ -15501,11 +16377,55 @@ msgid "Default Sources"
 msgstr "ਮੂਲ ਸਰੋਤ"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+msgid "Provides functionality for marking a calendar or an addressbook as the default one."
 msgstr "ਇੱਕ ਕੈਲੰਡਰ ਜਾਂ �ਡਰੈੱਸ-ਬ�ੱਕ ਲਈ ਮੂਲ ਰੂਪ ਵਿੱਚ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+#, fuzzy
+msgid "_Custom Header"
+msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+#, fuzzy
+msgid "Key"
+msgstr "ਕੀਨੀਆ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
+
+#. 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 "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+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 "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰ ਖੋਲੋ"
@@ -15523,32 +16443,28 @@ msgid "_User:"
 msgstr "ਯੂਜ਼ਰ(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "ਸ�ਰੱਖਿਅਤ ਪਾਸਵਰਡ"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
 msgstr "ਇਹ ਚੋਣ ਤ�ਹਾਨੂੰ �ਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਸ�ਰੱਖਿਅਤ ਪਾਸਵਰਡ (NTLM) ਪ�ਰਮਾਣਕਿਤਾ ਨਾਲ ਜੋੜੇਗੀ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "ਸਧਾਰਨ ਪਾਸਵਰਡ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr "ਇਹ ਚੋਣ ਤ�ਹਾਨੂੰ �ਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਪ�ਰਮਾਣਕਿਤਾ ਨਾਲ ਜੋੜੇਗੀ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "ਦਫਤਰੋਂ ਬਾਹਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15556,77 +16472,82 @@ msgstr ""
 "ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸ�ਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ\n"
 "ਜਾਵੇਗਾ, ਜੋ ਕਿ ਤ�ਹਾਡੇ ਦਫਤਰੋਂ ਬਾਹਰ ਹੋਣ ਦੀ ਸੂਰਤ ਵਿੱਚ ਪੱਤਰ ਭੇਜਣ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਤੋਂ ਬਾਹਰ ਹਾਂ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਵਿੱਚ ਹਾਂ"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "�ਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਪਾਸਵਰਡ ਤਬਦੀਲ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "ਪਾਸਵਰਡ ਤਬਦੀਲ"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "�ਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਡੈਲੀਗੇਟ ਸੈਟਿੰਗ ਪਰਬੰਧਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "ਡੈਲੀਗੇਸ਼ਨ ਸਹਾਇਕ"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "ਫ�ਟਕਲ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "ਸਭ �ਕਸ਼ਚੇਜ਼ ਫੋਲਡਰਾਂ ਦਾ ਅਕਾਰ ਵੇਖਾਓ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "�ਕਸ਼ਚੇਜ਼ ਸੈਟਿੰਗ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "ਪ�ਰਮਾਣਕਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "ਪੱਤਰ(_M)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15644,15 +16565,11 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਤ�ਹਾਡੇ ਅਕਾਊਂਟ ਦੇ ਮੌਜੂਦ ਪ�ਰਾਣੇ ਪਾਸਵਰਡ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਠੀਕ "
-"ਪਾਸਵਰਡ ਦਿਓ।"
+#: ../plugins/exchange-operations/exchange-change-password.c:113
+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:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "ਦੋ ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੇ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਪਾਸਵਰਡ ਮ�ੜ ਦਿਓ।"
 
@@ -15677,33 +16594,33 @@ msgstr "ਤà©�ਹਾਡੇ ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਦੀ ਮਿà¨
 msgid "Your password will expire in the next %d days"
 msgstr "ਤ�ਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਅਗਲੇ %d ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "ਪਸੰਦੀਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "ਸੰਪਾਦਕ (ਪੜਨ, ਲਿਖਣ, ਸੋਧਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "ਲੇਖਕ (ਪੜਨ, ਲਿਖਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "ਪੜਚੋਲਕਰਤਾ (ਪੜਨ ਲਈ ਹੀ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "ਪ�ਰਤੀਨਿਧ ਅਧਿਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s ਲਈ ਅਧਿਕਾਰ"
@@ -15711,76 +16628,72 @@ 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:353
-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 ""
-"ਇਹ ਸ�ਨੇਹਾ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤ�ਹਾਨੂੰ ਇਹ ਜਾਣਕਾਰੀ ਲਈ ਭੇਜਿਆ ਗਿਆ ਹੈ ਕਿ ਤ�ਸੀਂ ਇੱਕ ਡੈਲੀਗੇਟ ਥਾਪੇ "
-"ਗ� ਹੋ। ਤ�ਸੀਂ ਹ�ਣ ਮੇਰੇ ਤੌਰ ਉੱਤੇ ਸ�ਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ।"
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+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:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "ਪਰ ਤ�ਹਾਨੂੰ ਮੇਰੀਆਂ ਪ�ਰਾਈਵੇਟ ਆਈਟਮਾਂ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "ਤ�ਹਾਨੂੰ %s ਲਈ ਇੱਕ ਡੈਲੀਗੇਟ ਦਾ ਅਹ�ਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "ਇਸ ਲਈ ਪ�ਰਤੀਨਿਧ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "ਕੀ ਪ�ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਦੀ ਲਈ ਪਹ�ੰਚ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਖ�ਦ ਨੂੰ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ %s ਪ�ਰਤੀਨਿਧ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ਪ�ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "ਪ�ਰਤੀਨਿਧਾਂ ਲਿਸਟ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ਪ�ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "ਪ�ਰਤੀਨਿਧ ਲਿਸਟ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
@@ -15828,20 +16741,26 @@ msgstr "ਸੰਖੇਪ ਅਧਿਕਾਰ(_S)"
 msgid "_Tasks:"
 msgstr "ਕੰਮ(_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "ਅਧਿਕਾਰ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "ਫੋਲਡਰ ਨਾਂ"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#, fuzzy
+msgid "User"
+msgstr "ਯੂਜ਼ਰ(_U)"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣਾਓ"
@@ -15850,20 +16769,20 @@ msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂà
 msgid "Exchange Folder Tree"
 msgstr "�ਕਸ਼ਚੇਜ਼ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../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:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਹਟਾਓ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ਕੀ ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
@@ -15888,12 +16807,10 @@ msgstr "<b>ਸਥਿਤੀ:</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"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small> ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸ�ਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ "
-"ਜਾਵੇਗਾ,\n"
+"<small> ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸ�ਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ ਜਾਵੇਗਾ,\n"
 "ਜੋ ਕਿ ਤ�ਹਾਡੇ ਦਫਤਰੋਂ ਬਾਹਰ ਹੋਣ ਦੀ ਸੂਰਤ ਵਿੱਚ ਪੱਤਰ ਭੇਜਣ।</small> "
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -15928,15 +16845,18 @@ msgstr "ਤ�ਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ 7 ਦਿਨਾ
 msgid "_Change Password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "ਯੂਜ਼ਰ ਜੋੜੋ:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../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
 msgid "Add User"
 msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ"
 
@@ -16058,11 +16978,11 @@ msgstr "ਯੂਜ਼ਰ(_U)"
 msgid "button-user"
 msgstr "ਬਟਨ-ਯੂਜ਼ਰ"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "ਯੂਜ਼ਰ ਚ�ਣੋ"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ..."
 
@@ -16075,9 +16995,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਕੈਲੰਡਰ ਦੇ ਮੈਂਬਰ ਬਣੋ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
-"and features."
+#, fuzzy
+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
@@ -16098,12 +17017,8 @@ msgid "Cannot perform the operation."
 msgstr "ਕਾਰਵਾਈ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
 #: ../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 ""
-"�ਕਸਚੇਜ਼ ਅਕਾਊਂਟ \"{0}\" ਲਈ ਚੋਣਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਤ�ਹਾਡੇ ਵਲੋਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਮ�ੜ ਚਾਲੂ "
-"ਕਰਨ ਉਪਰੰਤ ਹੀ ਪਰਭਾਵੀ ਹੋਣਗੀਆਂ।"
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+msgstr "�ਕਸਚੇਜ਼ ਅਕਾਊਂਟ \"{0}\" ਲਈ ਚੋਣਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਤ�ਹਾਡੇ ਵਲੋਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਮ�ੜ ਚਾਲੂ ਕਰਨ ਉਪਰੰਤ ਹੀ ਪਰਭਾਵੀ ਹੋਣਗੀਆਂ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not authenticate to server."
@@ -16168,10 +17083,14 @@ msgid "Could not update out-of-office state"
 msgstr "ਦਫ਼ਤਰੋਂ-ਬਾਹਰ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
 #: ../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 "�ਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਆਫਲਾਇਨ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16200,104 +17119,102 @@ msgstr ""
 "  "
 
 #  FIXME: domain/code
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "ਪ�ਰਤੀਨਿਧ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ ਹੋਇਆ ਹੈ।"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "ਫੋਲਡਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "ਫੋਲਡਰ ਆਫਲਾਇਨ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "ਸਧਾਰਨ ਗਲਤੀ"
 
-#: ../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
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
+#: ../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 "ਜੇਕਰ OWA ਵੱਖਰੇ ਮਾਰਗ ਉੱਤੇ ਚੱਲ ਰਿਹਾ ਹੈ ਤਾਂ ਤ�ਹਾਨੂੰ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਡਾਈਲਾਗ ਦੀ ਦੇਣਾ ਪਵੇਗਾ।"
 
-#: ../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 "ਇਸ ਸਰਵਰ ਉੱਤੇ {0} ਲਈ ਕੋਈ ਪੱਤਰ-ਬਕਸਾ ਨਹੀਂ ਹੈ।"
 
-#: ../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 "ਪ�ਸ਼ਟੀ ਕਰੋ ਕਿ ਠੀਕ URL ਦਿੱਤਾ ਹੈ ਅਤੇ ਮ�ੜ-ਕੋਸ਼ਸ਼ ਕਰੋ।"
 
-#: ../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 "{1} ਉੱਤੇ {0} ਯੂਜ਼ਰ ਲਈ ਕੋਈ ਪੱਤਰ-ਬਕਸਾ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "�ਦਾਂ ਦਾ ਕੋਈ ਯੂਜ਼ਰ {0} ਨਹੀਂ"
 
-#: ../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 "ਇੱਕ ਡੈਲੀਗੇਟ ID ਦਿਓ ਜਾਂ ਇੱਕ ਡੈਲੀਗੇਟ ਵਾਂਗ ਭੇਜਣ ਚੋਣ ਹਟਾ ਦਿਓ।"
 
-#: ../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
 msgid "Please restart Evolution for changes to take effect"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਪਰਭਾਵੀ ਹੋਣ ਲਈ ਈਵੇਲੂਸ਼ਨ ਮ�ੜ-ਚਲਾਓ"
 
 #  FIXME: This is just to get the shadow, is there a better way?
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਯੂਜ਼ਰ ਚ�ਣੋ।"
 
-#: ../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."
@@ -16305,7 +17222,7 @@ msgstr ""
 "ਸਰਵਰ �ਕਸ਼ਚੇਜ਼ 5.5 ਨਾਲ ਚੱਲ ਰਿਹਾ ਹੈ। �ਕਸ਼ਚੇਜ਼ ਕ�ਨੈਕਟਰ ਮਾਈਕਰੋਸਾਫਟ\n"
 "�ਕਸ਼ਚੇਜ਼ 2000 ਅਤੇ 2003 ਲਈ ਹੀ ਸਹਾਇਕ ਹੈ।"
 
-#: ../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"
@@ -16319,89 +17236,80 @@ msgstr ""
 "\n"
 "ਜਾਂ ਤ�ਸੀਂ ਸਿਰਫ਼ ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "ਯੂਜ਼ਰ ਨੂੰ ਪਹ�ੰਚ ਕੰਟਰੋਲ ਲਿਸਟ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "ਪ�ਰਤੀਨਿਧ ਨੂੰ ਸੋਧਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "ਖੋਜ {0} ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../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
 msgid "Unknown error."
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "ਅਣਜਾਣੀ ਕਿਸਮ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ"
 
-#: ../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
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
+#: ../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
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr "ਤ�ਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਕ�� ਪੱਤਰ ਹਟਾਉਣ ਨਾਲ ਕ�� ਥਾਂ ਸਾਫ਼ ਕਰੋ।"
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr "ਤ�ਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤ�ਸੀਂ ਹ�ਣ ਸ਼ਾਇਦ ਪੱਤਰ ਭੇਜ ਜਾਂ ਪ�ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgstr "ਤ�ਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਕ�� ਪੱਤਰ ਹਟਾਉਣ ਨਾਲ ਕ�� ਥਾਂ ਸਾਫ਼ ਕਰੋ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"ਤ�ਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤ�ਸੀਂ ਉਦੋਂ ਤੱਕ ਪੱਤਰ ਨੂੰ ਭੇਜ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਕ�� ਪੱਤਰਾਂ ਨੂੰ ਹਟਾਇਆ "
-"ਨਹੀਂ ਜਾਂਦਾ ਹੈ।"
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgstr "ਤ�ਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤ�ਸੀਂ ਹ�ਣ ਸ਼ਾਇਦ ਪੱਤਰ ਭੇਜ ਜਾਂ ਪ�ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
 
 #: ../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 "ਤ�ਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤ�ਸੀਂ ਉਦੋਂ ਤੱਕ ਪੱਤਰ ਨੂੰ ਭੇਜ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਕ�� ਪੱਤਰਾਂ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾਂਦਾ ਹੈ।"
+
+#: ../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 "{0} ਨੂੰ ਪਹ�ੰਚ ਕੰਟਰੋਲ ਲਿਸਟ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਡੈਲੀਗੇਟ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਲਿਸਟ ਵਿੱਚ ਹੈ"
 
@@ -16413,10 +17321,17 @@ msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਕੰਮਾਂ ਲਈ ਮੈਂਬਰ
 msgid "Check folder permissions"
 msgstr "ਫੋਲਡਰ ਅਧਿਕਾਰ ਚੈੱਕ ਕਰੋ"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+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."
+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
@@ -16424,31 +17339,58 @@ msgstr ""
 msgid "External Editor"
 msgstr "ਬਾਹਰੀ �ਡੀਟਰ"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+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"
+#, fuzzy
+msgid "Compose in _External Editor"
 msgstr "ਬਾਹਰੀ �ਡੀਟਰ ਵਿੱਚ ਕੰਪੋਜ਼ ਕਰੋ"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "ਸ�ਨੇਹੇ ਬਾਹਰੀ �ਡੀਟਰ ਨਾਲ ਲਿਖੋ"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "�ਡੀਟਰ ਚਾਲੂ ਕਰਨ ਲਈ ਚਲਾਉਣ ਵਾਸਤੇ ਕਮਾਂਡ:"
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Emacs ਲਈ \"xemacs\" ਵਰਤੋਂ\n"
+"VI ਲਈ \"gvim\" ਵਰਤੋਂ"
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "ਇੱਕ (48*48) png ਆਕਾਰ ਚ�ਣੋ < 700ਬਾਇਟ"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG ਫਾਇਲਾਂ"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "ਫੇਸ(_F)"
 
 #: ../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."
+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/face/org-gnome-face.eplug.xml.h:2
@@ -16472,20 +17414,59 @@ msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ ਹਟਾਓ"
 msgid "_Unsubscribe"
 msgstr "ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
-#: ../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
 msgid "Google"
 msgstr "ਗੂਗਲ"
 
+#: ../plugins/google-account-setup/google-source.c:439
+#, fuzzy
+msgid "Please enter user name first."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਹੋਰ ਨਾਂ ਚ�ਣੋ"
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, 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 ""
+"ਗੂਗਲ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਪੜ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "ਕੈਲੰਡਰ(_C):"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "%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 "<b>ਮੈਂਬਰ</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "ਜਾਂਚ ਲਿਸਟ"
 
@@ -16565,10 +17546,19 @@ msgid "_Junk List"
 msgstr "ਕੂੜਾ ਲਿਸਟ(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+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 "ਸ�ਨੇਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮ�ੜ-ਖੋਜਿਆ ਗਿਆ"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "ਪੱਤਰ ਮ�ੜ-ਜਾਂਚ"
 
@@ -16576,12 +17566,6 @@ msgstr "ਪੱਤਰ ਮ�ੜ-ਜਾਂਚ"
 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"
-msgstr "ਭੇਜਣ ਚੋਣ"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "ਗਰ�ੱਪਵਾਇਜ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
@@ -16590,6 +17574,84 @@ msgstr "ਗਰ�ੱਪਵਾਇਜ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀ
 msgid "Groupwise Features"
 msgstr "ਗਰ�ੱਪਵਾਇਜ ਫੀਚਰ"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "ਸ�ਨੇਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮ�ੜ-ਖੋਜਿਆ ਗਿਆ"
+
+#: ../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 "ਚ�ਣੇ ਸ�ਨੇਹੇ ਨੂੰ ਇੱਕ ਨਵੇਂ ਕੰਮ 'ਚ ਬਦਲੋ"
+
+#: ../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 "ਗਲਤ ਦਸਤਖਤ"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "ਯੂਜ਼ਰ ਚ�ਣੋ"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#, fuzzy
+msgid "You have already given proxy permissions to this user."
+msgstr "ਤ�ਹਾਨੂੰ ਮੇਰੇ ਫੋਲਡਰ ਲਈ ਹੇਠ ਦਿੱਤੇ ਅਧਿਕਾਰ ਦਿੱਤੇ ਗ� ਹਨ:"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr "ਤ�ਹਾਨੂੰ ਪਰਾਕਸੀ ਹੱਕ ਦੇਣ ਲਈ ਇੱਕ ਠੀਕ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ।"
+
+#  mail:no-rename-folder-exists secondary
+#  mail:vfolder-notunique secondary
+#: ../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 "ਫੋਲਡਰ ਨਾਂ &quot;{0}&quot; ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਦਿਓ ਜੀ।"
+
+#  XXX we shouldn't be popping up dialogs in this code.
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+#, fuzzy
+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
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "ਕੀ ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "ਕੀ ਤ�ਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
+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:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "ਤ�ਹਾਨੂੰ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ, ਜਿਸ ਨੂੰ ਲਿਸਟ 'ਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ"
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "ਅਜ਼ਮਾਇਸੀ ਆਰਜ਼ੀ"
@@ -16688,9 +17750,9 @@ msgstr "<b>ਅਕਾਊਂਟ ਨਾਂ</b>"
 msgid "Proxy Login"
 msgstr "ਪਰਾਕਸੀ ਲਾਗਇਨ"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16699,20 +17761,20 @@ msgstr "%1$s %2$s (ਯੂਜ਼ਰ %3$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:509
 msgid "_Proxy Login..."
 msgstr "ਪਰਾਕਸੀ ਲਾਗਇਨ(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਆਨਲਾਇਨ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਯੋਗ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "ਯੂਜ਼ਰ"
 
@@ -16728,11 +17790,16 @@ msgstr "ਨਵਾਂ ਸਾਂ�ਾ ਫੋਲਡਰ(_S)..."
 msgid "Sharing"
 msgstr "ਸਾਂ�"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+#, fuzzy
+msgid "Custom Notification"
+msgstr "ਇਕਸਾਰ"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "ਸੋਧ"
 
@@ -16798,11 +17865,11 @@ msgstr "ਹà©�ਲਾ ਕੈਲੰਡਰ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕà¨
 msgid "Hula Account Setup"
 msgstr "ਹੂਲਾ ਅਕਾਊਂਟ ਸੈੱਟਅੱਪ"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP ਹੈੱਡਰ"
 
@@ -16824,8 +17891,7 @@ msgstr "ਸਭ ਹੈੱਡਰ ਲਵੋ(_l)"
 
 #: ../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"
+"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 ""
 "ਵਾਧੂ ਹੈੱਡਰ ਦਿੰਦੀ ਹੈ, ਜਿਸ ਦੀ ਤ�ਹਾਨੂੰ ਸਟੈਂਡਰਡ ਹੈੱਡਰ ਵਿੱਚ ਜੋੜਨ ਦੀ ਲੋੜ ਹ�ੰਦੀ ਹੈ।\n"
@@ -16855,28 +17921,28 @@ msgstr "IMAP ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇ
 msgid "IMAP Features"
 msgstr "IMAP ਫੀਚਰ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "ਕੈਲੰਡਰ ਆਯਾਤ(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "ਕੰਮ ਆਯਾਤ(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "ICS ਆਯਾਤ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "ਕੰਮ ਲਿਸਟ ਚ�ਣੋ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "ਕੈਲੰਡਰ ਚ�ਣੋ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "ਆਯਾਤ(_I)"
 
@@ -16894,27 +17960,19 @@ msgid "Hardware Abstraction Layer not loaded"
 msgstr "ਹਾਰਡਵੇਅਰ ਅਬਸਟਸ਼ਨ ਲੇਅਰ ਲੋਡ ਨਹੀਂ ਹੈ"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:35
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"\"hald\" ਸਰਵਿਸ ਲੋੜੀਦੀ ਸੀ, ਪਰ ਇਸ ਵੇਲੇ ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੈ। ਸਰਵਿਸ ਯੋਗ ਕਰੋ ਅਤੇ ਇਹ ਪਰੋਗਰਾਮ ਮ�ੜ-"
-"ਚਾਓ ਜਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr "\"hald\" ਸਰਵਿਸ ਲੋੜੀਦੀ ਸੀ, ਪਰ ਇਸ ਵੇਲੇ ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੈ। ਸਰਵਿਸ ਯੋਗ ਕਰੋ ਅਤੇ ਇਹ ਪਰੋਗਰਾਮ ਮ�ੜ-ਚਾਓ ਜਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
 msgstr "ਇੱਕ iPod ਖੋਜ ਫੇਲ�ਹ ਹੋਈ"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-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 ""
-"ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਇੱਕ iPod ਨਹੀਂ ਲੱਭਿਆ ਹੈ। ਜਾਂ ਤਾਂ ਇਹ ਤ�ਹਾਡੇ ਸਿਸਟਮ ਨਾਲ ਜ�ੜਿਆ ਨਹੀਂ "
-"ਹੈ ਜਾਂ ਇਹ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
+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 "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਇੱਕ iPod ਨਹੀਂ ਲੱਭਿਆ ਹੈ। ਜਾਂ ਤਾਂ ਇਹ ਤ�ਹਾਡੇ ਸਿਸਟਮ ਨਾਲ ਜ�ੜਿਆ ਨਹੀਂ ਹੈ ਜਾਂ ਇਹ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar ਫਾਰਮੈਟ (.ics)"
 
@@ -16930,601 +17988,590 @@ msgstr "iPod ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼"
 msgid "iPod Synchronization"
 msgstr "iPod ਸਿਕਰੋਨਾਈਜ਼"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ 'ਚ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮ�ਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ਕੈਲੰਡਰ ਵਿੱਚ ਮ�ਲਾਕਾਤ ਮਿਲੀ ਹੈ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "ਕਿਸੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "ਕਿਸੇ ਮੀਮੋ ਲਿਸਟ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "ਇਹ ਮ�ਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ '%s' ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ਕੈਲੰਡਰ '%s' ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰਗਠਕ ਨੇ ਪ�ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ਇੱਕ ਪ�ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ�ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "ਟਾਸਕ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਟਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "ਟਾਸਕ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਟਾਸਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਮੋ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "ਸ�ਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (iCalendar) ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇਕਾਈ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+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:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਆਈਟਮਾਂ ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1448
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "ਇਹਨਾਂ ਸਭ ਆਈਟਮਾਂ ਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲ਼ਈ, ਫਾਇਲ ਨੂੰ ਸੰਭਾਲਣਾ ਪਵੇਗਾ ਅਤੇ ਕੈਲੰਡਰ ਆਯਾਤ ਕਰਨਾ ਪਵੇਗਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "ਇਹ ਮੀਟਿੰਗ ਫੇਰ ਹੋਵੇਗੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2141
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "ਇਹ ਟਾਸਕ ਫੇਰ ਹੋਵੇਗੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2144
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "ਇਹ ਮੀਮੋ ਫੇਰ ਹੈ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸ�ਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2369
-#: ../plugins/itip-formatter/itip-formatter.c:2401
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "ਅਪਵਾਦ ਖੋਜ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚ�ਣੋ"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "ਅੱਜ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "ਅੱਜ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "ਅੱਜ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "ਅੱਜ %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "ਕੱਲ�ਹ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "ਕੱਲ�ਹ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "ਕੱਲ�ਹ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "ਕੱਲ�ਹ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ਕੱਲ�ਹ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "<b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਜਵਾਬ ਭੇਜੋ ਜੀ"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "<b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਲਿਆ"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ�ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ�ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ਤ�ਹਾਡੇ ਨਾਲ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਵਿੱਚ ਤ�ਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤ�ਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ਤਾਜ਼ੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ�ਰਾਪਤ ਕਰਨਾ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤਾ ਮੀਟਿੰਗ ਜਾਵਾਬ ਵਾਪਸ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਵਾਪਸੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੇ ਮੀਟਿੰਗ ਬਦਲਾਅ ਸ��ਾ� ਹਨ।"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਲਈ ਸ��ਾਅ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਇੱਕ ਮੀਟਿੰਗ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਲਈ %s ਲਈ ਜਿੰਮੇਵਾਰੀ ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਤ�ਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ਨੇ ਤ�ਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> ਨੇ %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਕੰਮ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਅੱਗੇ ਦਿੱਤੀ ਅਸਾਇਨ ਟਾਸਕ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨੀ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਅਸਾਇਨ ਟਾਸਕ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> ਨੇ ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਜਵਾਬੀ ਸ�ਨੇਹਾ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤਾ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਟਾਸਕ ਅਸਾਇਨਮਿੰਟ ਬਦਲਾਅ ਸ��ਾ� ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸ��ਾਅ ਭੇਜੇ ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਜਾਰੀ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ਨੇ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹ�ੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> ਨੇ %s ਰਾਹੀਂ ਹੇਠ ਦਿੱਤਾ ਸਾਂ�ਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਸਾਂ�ਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ�ਹੋ(_O))"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "ਮਨਜ਼ੂਰ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "ਆਰਜ਼ੀ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "ਸਭ ਮਨਜ਼ੂਰ(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "ਅੱਪਡੇਟ(_U)"
 
@@ -17578,9 +18625,7 @@ msgid "Itip Formatter"
 msgstr "Itip ਫਾਰਮੈਟਰ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
 msgstr "&quot;{0}&quot; ਮੀਟਿੰਗ ਲਈ ਡੈਲੀਗੇਟ ਹੈ। ਕੀ ਤ�ਸੀਂ ਡੈਲੀਗੇਟ &quot;{1}&quot; ਨੂੰ ਜੋੜਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -17624,8 +18669,9 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸ�ਨੇਹਾ ਆਵੇ ਤਾਂ D-BUS ਸ�ਨੇਹਾ ਬਣਾਓ।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr ""
+#, fuzzy
+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."
@@ -17657,7 +18703,7 @@ msgstr "ਕੀ ਨਵੇਂ ਸà©�ਨੇਹੇ ਆਉਣ ਉੱਤੇ ਸਾਊà
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
+msgstr "ਜਦੋਂ ਨਵਾਂ ਸ�ਨੇਹਾ ਆਵੇ ਤਾਂ ਆਈਕਾਨ ਉੱਤੇ ਸ�ਨੇਹਾ ਵੇਖਣਾ"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
@@ -17671,8 +18717,18 @@ msgstr "ਕੀ ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿਚਲੇ ਸà©�ਨੇਹà
 msgid "Generate a _D-Bus message"
 msgstr "ਡੀ-ਬੱਸ ਸ�ਨੇਹਾ ਬਣਾਓ(_D)"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17687,74 +18743,68 @@ msgstr[1] ""
 "ਤ�ਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵੇਂ ਸ�ਨੇਹੇ\n"
 "ਆ� ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "ਨਵੀਂ ਈਮੇਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ �ਰੀ� ਵਿੱਚ ਆਈਕਾਨ ਵੇਖੋ(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ �ਰੀਆ ਵਿੱਚ ਆਈਕਾਨ �ਪਕਾਓ(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "ਆਈਕਾਨ ਨਾਲ ਸ�ਨੇਹਾ ਵੀ ਪੋਪਅੱਪ ਕਰੋ(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾਂ ਸ�ਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਚਲਾਓ(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "ਬੀਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "ਸਾਊਂਡ ਫਾਈਲ ਚਲਾਓ(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "ਖਾਸ ਫਾਇਲ ਨਾਂ(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "ਧ�ਨੀ ਫਾਇਲ ਚ�ਣੋ"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "ਚਲਾਓ(_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿੱਚ ਨਵੇਂ ਸ�ਨੇਹਿਆਂ ਲਈ ਨੋਟੀਫਾਈ ਕਰੋ(_I)"
 
 #: ../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 ""
-"ਇੱਕ ਡੀ-ਬੱਸ ਸ�ਨੇਹਾ ਬਣਾਓ ਜਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਆਈਕਾਨ ਨਾਲ ਨੋਟੀਫਾਈ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਜਦੋਂ ਨਵਾਂ ਸ�ਨੇਹਾ ਆਉਦਾ ਹੈ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸ�ਨੇਹਾ ਵੇਖਾਇਆ "
-"ਜਾਂਦਾ ਹੈ।"
+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 "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
 #: ../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."
+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
@@ -17771,15 +18821,11 @@ msgid "Cannot open calendar. %s"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:275
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
-msgstr ""
+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."
+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
@@ -17838,14 +18884,11 @@ msgstr "ਕਾਰਵਾਈ ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"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."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"URL \"{0}\" ਨੂੰ ਈ-ਮੇਲ ਸ�ਨੇਹਾ ਭੇਜਿਆ ਜਾਵੇਗਾ, ਤ�ਸੀਂ ਆਟੋਮੈਟਿਕ ਸ�ਨੇਹਾ ਭੇਜ ਸਕਦੇ ਹੋ, ਜਾਂ ਇਸ ਨੂੰ ਪਹਿਲਾਂ "
-"ਵੇਖ ਅਤੇ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।\n"
+"URL \"{0}\" ਨੂੰ ਈ-ਮੇਲ ਸ�ਨੇਹਾ ਭੇਜਿਆ ਜਾਵੇਗਾ, ਤ�ਸੀਂ ਆਟੋਮੈਟਿਕ ਸ�ਨੇਹਾ ਭੇਜ ਸਕਦੇ ਹੋ, ਜਾਂ ਇਸ ਨੂੰ ਪਹਿਲਾਂ ਵੇਖ ਅਤੇ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।\n"
 "\n"
 "ਤ�ਸੀਂ ਮੇਲਿੰਗ ਲਿਸਟ ਤੇ ਭੇਜਣ ਬਾਅਦ ਤਰ�ੰਤ ਜਵਾਬ ਪ�ਰਾਪਤ ਕਰ ਲਵੋਗੇ।"
 
@@ -17862,26 +18905,21 @@ msgid "Posting not allowed"
 msgstr "ਪੋਸਟਿੰਗ ਉੱਤੇ ਪਾਬੰਦੀ ਹੈ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"ਇਸ ਮੇਲਿੰਗ ਲਿਸਟ ਤੇ ਪੱਤਰ ਭੇਜਣ ਤੇ ਰੋਕ ਹੈ। ਸੰਭਵ ਤੌਰ ਤੇ, ਇਹ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੀ ਪੱਤਰ ਲਿਸਟ ਹੈ। ਵਧੇਰੇ "
-"ਜਾਣਕਾਰੀ ਲਈ ਲਿਸਟ ਪ�ਰਬੰਧ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "ਇਸ ਮੇਲਿੰਗ ਲਿਸਟ ਤੇ ਪੱਤਰ ਭੇਜਣ ਤੇ ਰੋਕ ਹੈ। ਸੰਭਵ ਤੌਰ ਤੇ, ਇਹ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੀ ਪੱਤਰ ਲਿਸਟ ਹੈ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਲਿਸਟ ਪ�ਰਬੰਧ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "ਕੀ ਈ-ਮੇਲ ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਭੇਜਣਾ ਹੈ?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"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 ""
-"ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ। ਇਹ ਦਾ ਅਰਥ ਹੈ, ਕਿ ਇਸ ਕਾਰਵਾਈ ਲਈ ਮ�ੱਖ ਵਿੱਚ ਉਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ "
-"ਕਾਰਵਾਈ ਨਹੀਂ ਹੈ, ਜਿਸ ਨੂੰ ਅਸੀਂ ਹੈਂਡਲ ਕਰ ਸਕਦੇ ਹਾਂ।\n"
+"ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ। ਇਹ ਦਾ ਅਰਥ ਹੈ, ਕਿ ਇਸ ਕਾਰਵਾਈ ਲਈ ਮ�ੱਖ ਵਿੱਚ ਉਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਹੈ, ਜਿਸ ਨੂੰ ਅਸੀਂ ਹੈਂਡਲ ਕਰ ਸਕਦੇ ਹਾਂ।\n"
 "\n"
 "ਹੈੱਡਰ: {0}"
 
@@ -17896,9 +18934,7 @@ msgstr ""
 "ਹੈੱਡਰ: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+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
@@ -17957,6 +18993,26 @@ msgstr "ਲਿਸਟ ਲਈ ਮੈਂਬਰ(_S)"
 msgid "_Unsubscribe from List"
 msgstr "ਲਿਸਟ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "ਸ�ਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, 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 "ਇਸ ਨਾਲ ਚ�ਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸ�ਨੇਹੇ ਪੜ�ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਉੱਤੇ(_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "ਸਭ ਪੜ�ਹੇ ਬਣਾਓ"
@@ -17999,7 +19055,7 @@ msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਲੱਗ-ਇਨਾਂ à
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "ਪਲੱਗ-ਇਨ ਮੈਨੇਜਰ"
 
@@ -18011,45 +19067,34 @@ msgstr "ਪਲੱਗ-ਇਨ ਆਯੋਗ ਤੇ ਚਾਲੂ"
 msgid "_Plugins"
 msgstr "ਪਲੱਗ-ਇਨ(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "ਲੇਖਕ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "ਵੇਰਵਾ"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "ਸੰਰਚਨਾ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ਨੋਟ: ਕ�� ਤਬਦੀਲੀਆਂ ਮ�ੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਪ�ਰਭਾਵੀ ਨਹੀਂ ਹੋ ਸਕਦੀਆਂ ਹਨ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "ਸੰਖੇਪ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "ਸੰਰਚਨਾ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "ਇਹ ਪਲੱਗਇਨ ਲਈ ਕੋਈ ਸੰਰਚਨਾ ਨਹੀਂ ਹੈ।"
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "ਪਲੱਗ-ਇਨ"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
+"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 ""
-"ਇੱਕ ਟੈਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤ�ਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤ�ਹਾਨੂੰ HTML "
-"ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
+"ਇੱਕ ਟੈਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤ�ਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤ�ਹਾਨੂੰ HTML ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 "\n"
 "ਇਹ ਪਲੱਗ-ਇਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ �ਲਕ ਕੋਡ ਹੀ ਹੈ।\n"
 
@@ -18062,41 +19107,22 @@ msgstr "ਪਲੇਨ ਟੈਕਸਟ ਮੋਡ"
 msgid "Prefer plain-text"
 msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਸੰਦ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "ਜੇਕਰ HTML ਹੋਵੇ ਤਾਂ ਵੇਖਾਓ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "ਸਧਾਰਨ ਹੀ ਪਸੰਦ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "ਹਮੇਸ਼ਾ ਸਧਾਰਨ ਹੀ ਵੇਖਾਓ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HT_ML ਮੋਡ"
 
-#: ../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 "ਸ�ਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
-
-#: ../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 "ਛਪਾਈ �ਲਕ(_v)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "ਸ�ਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਰੋਫਾਇਲਰ"
@@ -18121,13 +19147,7 @@ msgstr "ਟਿਕਾਣੇ"
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "ਕੀ ਤ�ਸੀਂ URL ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
@@ -18215,25 +19235,86 @@ msgstr ""
 "iCal\n"
 "ਵੇਹਲਾ/ਰ��ਿਆ"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+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
+#, fuzzy
+msgid "Python Loader"
+msgstr "ਮੋਨੋ ਲੋਡਰ"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (ਬਿਲਟ-ਇਨ)"
 
-#: ../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:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin ਜੰਕ ਪਲੱਗ-ਇਨ"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"%s ਤੇ ਗਲਤੀ:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "ਭੇਜਣ ਚੋਣ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ਇਹ Spamassasin ਨੂੰ ਹੋਰ ਵੀ ਭਰੋਸੇਯੋਗ ਬਣਾਉਦਾ ਹੈ, ਪਰ ਹੌਲੀ ਕਰਦਾ ਹੈ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮੋਟ ਜਾਂਚ ਸ਼ਾਮਿਲ ਕਰੋ(_n)"
 
 #: ../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 ""
-"SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸ�ਨੇਹੇ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ SpamAssassin ਇੰਸਟਾਲ "
-"ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+msgid "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed."
+msgstr "SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸ�ਨੇਹੇ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ SpamAssassin ਇੰਸਟਾਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin junk plugin"
@@ -18249,7 +19330,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:314
 msgid "Save attachments"
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
 
@@ -18261,16 +19342,15 @@ msgstr "ਨੱਥੀ ਸੰਭਾਲੋ..."
 msgid "Save all attachments"
 msgstr "ਸਭ ਨੱਥੀ ਸੰਭਾਲੋ..."
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "ਸੰਭਾਲ ਮੂਲ ਨਾਂ ਚ�ਣੋ"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "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:347
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -18278,79 +19358,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "ਵੇਰਵਾ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "ਕੈਟਾਗਰੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "ਟਿੱਪਣੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "ਬਣਾਇਆ"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "ਸ਼�ਰੂ"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "ਫੀ-ਸਦੀ ਮ�ਕੰਮਲ"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "ਦਰਸ਼ਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "ਸੋਧਿਆ"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "ਸ��ਾਇਆ ਹੈੱਡਰ"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "ਮੂਲ ਸੀਮਾ:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "ਰਿਕਾਰਡ ਸੀਮਾ:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "ਮ�ੱਲ ਇਸ ਨਾਲ ਢੱਕੇ:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਮ�ੱਲ਼ ਫਾਰਮੈਟ (.csv)"
 
@@ -18371,15 +19451,15 @@ msgstr "ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ(_S)"
 #. * 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:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮੈਟ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾਇਲ ਚ�ਣੋ"
 
@@ -18404,25 +19484,25 @@ msgid "Show _only this Task List"
 msgstr "ਸਿਰਫ਼ ਇਹ ਟਾਸਕ ਲਿਸਟ ਹੀ ਵੇਖਾਓ(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "ਸ਼�ਰੂਆਤੀ ਸਹਾਇਕ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਵਾਲੀ ਪਲੱਗ-ਇਨ ਹੈ।"
+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 "ਸਹਾਇਕ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈੱਟਅੱਪ ਸਹਾਇਕ "
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "ਜੀ ਆਇਆ ਨੂੰ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -18431,29 +19511,29 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਜਾਰੀ ਰਹਿਣ ਲਈ \"ਅੱਗੇ\" ਬਟਨ ਦਬਾਓ।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "ਫਾਇਲਾਂ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤ�ਸੀਂ ਆਯਾਤ ਕਰਨੀ ਚਾਹ�ੰਦੇ ਹੋ, ਨੂੰ ਚ�ਣੋ:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "ਵੱਲੋਂ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "ਡਾਟਾ ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
 
@@ -18474,6 +19554,29 @@ msgstr "ਵਿਸ਼ੇ ਰਾਹੀਂ ਮਸਲਾ ਸ�ਨੇਹੇ"
 msgid "F_all back to threading messages by subject"
 msgstr "ਥਰਿੱਡ ਸ�ਨੇਹਿਆਂ ਵਾਸਤੇ ਫਾਲਬੈਕ ਲਈ ਵਿਸ਼ਾ(_a)"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr ""
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "ਕੰਮ ਟਾਇਟਲ"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "ਡੈਲੀਗੇਟ ਵਾਂਗ ਭੇਜੋ"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "ਇੱਕ ਸੈਂਪਲ ਪਲੱਗਇਨ, ਜੋ ਕਿ tnef ਅਟੈਂਚਮਿੰਟ ਨੂੰ ਡੀਕੋਡ ਕਰਨ ਲਈ ytnef ਵਰਤਦਾ ਹੈ।"
@@ -18482,6 +19585,31 @@ msgstr "ਇੱਕ ਸੈਂਪਲ ਪਲੱਗਇਨ, ਜੋ ਕਿ tnef ਅਟà
 msgid "TNEF Attachment decoder"
 msgstr "TNEF ਅਟੈਂਚਮਿੰਟ ਡੀਕੋਡਰ"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+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 "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
+
+#: ../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 "WebDAV"
+
+#: ../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 "ਈਵੇਲੂਸ਼ਨ ਸ਼ੈੱਲ"
@@ -18499,16 +19627,17 @@ msgid "Evolution Test component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਟੈਸਟ ਭਾਗ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਸੈਟਿੰਗ ਬਾਰੇ ਇੱਕ ਲਾਈਨ"
+msgid "Authenticate proxy server connections"
+msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "ਸੰਰਚਨਾ ਵਰਜਨ"
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "ਆਟੋਮੈਟਿਕ ਖ�ਸ਼ ਪਛਾਣ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "ਚੋਣ ਕਰੋ ਕਿ ਕੀ ਕਰੈਸ਼ ਖੋਜ ਨੂੰ ਚਲਾਇਆ ਜਾਵੇ ਕਿ ਨਾ"
+msgid "Configuration version"
+msgstr "ਸੰਰਚਨਾ ਵਰਜਨ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18527,117 +19656,194 @@ msgid "Default window width"
 msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਚੌੜਾਈ"
 
 #: ../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 "HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "ਪਾਸਵਰਡ ਭਰੋ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "HTTP ਪਰਾਕਸੀ ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: ../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 ਜਾਂ ਉਪਨਾਂ ਨੂੰ ਸ਼�ਰੂਆਤ ਤੇ ਵੇਖਿਆ ਜਾਇਆ ਕਰੇਗਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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 "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../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:11
+#: ../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 "ਸੰਰਚਨਾ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "SOCKS proxy host name"
+msgstr "SOCKS ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr "SOCKS ਪਰਾਕਸੀ ਪੋਰਟ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr "ਸ�ਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr "ਸ�ਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
+
+#: ../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 "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪ�ੱਛਗਿੱਛ ਡਾਈਲਾਗ ਛੱਡੋ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "ਰਿਕਵਰੀ ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ ਛੱਡੋ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼�ਰੂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+#: ../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 "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "ਸ�ਨੇਹਾ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "ਸ�ਨੇਹਾ �ਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+#: ../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 "ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
 msgstr ""
-"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0"
-"\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-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."
+#: ../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:22
+#: ../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 "ਟੂਲਬਾਰ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr "HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ"
+
+#: ../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:24
-msgid "Whether crash detection should be done or not"
-msgstr "ਕੀ ਕਰੈਸ਼ ਖੋਜ ਕੀਤੀ ਜਾਵੇ ਕਿ ਨਾ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "ਕੀ �ਰੋਖੇ ਨੂੰ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਦਿੱਤਾ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "ਕੀ ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../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:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਰਿਕਵਰੀ ਡਾਈਲਾਗ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "ਕੀ ਵਿੰਡੋ ਬਟਨ ਵੇਖਾਈ ਦੇਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਸਟਾਇਲ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਦਿੱਖ ਹਨ।"
 
@@ -18653,27 +19859,25 @@ msgstr "ਸਰਗਰਮ ਕ�ਨੈਕਸ਼ਨ ਦਬਾਓ"
 msgid "Click OK to close these connections and go offline"
 msgstr "ਇਹ ਕ�ਨੈਕਸ਼ਨ ਬੰਦ ਕਰਨ ਲਈ ਅਤੇ ਆਫਲਾਇਨ ਜਾਣ ਲਈ OK ਦਬਾਓ"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "ਚਲਾਉਣ ਲਈ ਆਯਾਤਕਾਰ ਦੀ ਕਿਸਮ ਚ�ਣੋ:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\n"
+"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."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
 "ਫਾਇਲ, ਜੋ ਵੀ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਆਯਾਤ ਕਰਨੀ ਹੈ ਅਤੇ ਇਸ ਦੀ ਕਿਸਮ ਲਿਸਟ ਵਿੱਚੋਂ ਚ�ਣੋ।\n"
 "\n"
 "ਜੇਕਰ ਤ�ਸੀਂ ਨਹੀਂ ਜਾਣਦੇ ਹੋ ਤਾਂ ਤ�ਸੀਂ \"ਆਟੋਮੈਟਿਕ\" ਨੂੰ ਚ�ਣੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਖ�ਦ ਕੋਸ਼ਿਸ ਕਰੇਗਾ।"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "ਇਸ ਆਯਾਤ ਲਈ ਨਿਯਤ ਸਥਾਨ ਚ�ਣੋ"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18685,143 +19889,133 @@ msgstr ""
 "ਆਯਾਤ ਕੀਤੀ ਜਾ ਸਕੇ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਜੇਕਰ ਤ�ਸੀਂ ਮ�ੜ ਕੋਸ਼ਿਸ ਕਰਨੀ ਚਾਹ�ੰਦੇ\n"
 "ਹੋ ਤਾਂ \"ਪਿੱਛੇ\" ਬਟਨ ਨੂੰ ਦਬਾ ਕੇ ਮ�ੜ ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "ਫਾਇਲ਼ ਨਾਂ(_i):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚ�ਣੋ"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "ਫਾਇਲ ਕਿਸਮ(_t):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "ਪ�ਰਾਣੇ ਕਾਰਜ ਤੋਂ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਆਯਾਤ ਕਰੋ"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "ਇੱਕ ਇਕਹੇਰੀ ਫਾਇਲ ਆਯਾਤ ਕਰੋ(_s)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਸੰਦ"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "ਕੋਈ ਫੋਲਡਰ ਨਾਂ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਹੈ।"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ Enter ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"#\" ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' ਅਤੇ '..' ਰਾਖਵੇਂ ਫੋਲਡਰ ਨਾਂ ਹਨ।"
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ਈਵੇਲੂਸ਼ਨ"
 
-#: ../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 "ਗਨੋਮ ਪਾਇਲਟ ਤ�ਹਾਡੇ ਸਿਸਟਮ ਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।"
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ।"
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "ਬੱਗ-ਬੱਡੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "ਬੱਗ-ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ ਵੈੱਬ-ਪੇਜ਼ ਖੋਲ�ਹਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "ਆਨ-ਲਾਇਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ਆਫ਼-ਲਾਇਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "ਆਫ-ਲਾਇਨ ਜਾਓ"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਨਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਦਬਾਓ।"
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਹੋਣ ਦੀ ਕਾਰਵਾਈ ਅਧੀਨ ਹੈ।"
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਨਲਾਇਨ ਜਾਣ ਲਈ ਵਰਤੋਂ।"
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "ਅਣਜਾਣ ਸਿਸਟਮ ਗਲਤੀ ਹੈ।"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839
+#: ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ਕਿਬਾ"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298
+#: ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਨਹੀਂ ਲੱਭਾ ਹੈ"
 
@@ -18831,15 +20025,17 @@ msgstr "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਨਹੀਂ ਲੱਭਾ ਹà©
 msgid "New"
 msgstr "ਨਵਾਂ"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "ਨਵੀਂ ਜਾਂਚ"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#, fuzzy
+msgctxt "New"
 msgid "_Test"
 msgstr "ਜਾਂਚ(_T)"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "ਇੱਕ ਨਵੀਂ ਜਾਂਚ ਇਕਾਈ ਬਣਾਓ"
 
@@ -18882,7 +20078,7 @@ msgstr ""
 "ਕਰ ਸਕਦੇ ਹੋ।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18917,7 +20113,7 @@ msgstr ""
 "ਸਾਨੂੰ ਉਮੀਦ ਹੈ ਮਿੱਤਰ ਤੂੰ ਸਾਡੀ ਮੇਹਨਤ ਦਾ ਆਨੰਦ ਮਾਣੇਗਾ ਅਤੇ ਅਸੀਂ ਤੇਰੇ ਇਸ ਸਹਿਯੋਗ ਦਾ\n"
 "ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18925,63 +20121,43 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮ�ੜ ਨਾ ਦੱਸੋ"
 
-#: ../shell/main.c:309
-msgid "Evolution Crash Detection"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਕਰੈਸ਼ ਖੋਜ"
-
-#: ../shell/main.c:311
-msgid "Ig_nore"
-msgstr "ਅਣਡਿੱਠਾ(_n)"
-
-#: ../shell/main.c:326
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-
-#: ../shell/main.c:337
-msgid "_Do not show this message again"
-msgstr "ਇਹ ਸ�ਨੇਹਾ ਮ�ੜ ਨਾ ਵੇਖਾਓ(_D)"
-
-#: ../shell/main.c:569
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਖਾਸ ਭਾਗ ਦੀ ਸਰਗਰਮੀ ਨਾਲ ਸ਼�ਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼�ਰੂ"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "ਸਭ ਈਵੇਲੂਸ਼ਨ ਭਾਗ ਮਜਬੂਰ ਕਰਕੇ ਬੰਦ ਕਰੋ"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ਈਵੇਲੂਸ਼ਨ ੧.੪ ਤੋਂ ਮਜਬੂਰ ਕਰਕੇ ਵਾਪਿਸ"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪ�ੱਟ ਇੱਕ ਫਾਇਲ ਵਿੱਚ ਭੇਜੋ।"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮੇਲ, ਸੰਪਰਕ ਅਤੇ ਟਾਸਕ ਲਈ �ਲਕ ਪੈਨ ਆਯੋਗ ਕਰੋ।"
 
-#: ../shell/main.c:617
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਇਟ"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19007,12 +20183,8 @@ msgid "Evolution can not start."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸ਼�ਰੂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ।"
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"ਤ�ਹਾਡੇ ਪਾਸਵਰਡ ਭ�ੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤ�ਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ ਤਾਂ "
-"ਮ�ੜ ਪ�ੱਛਿਆ ਜਾਵੇਗਾ।"
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "ਤ�ਹਾਡੇ ਪਾਸਵਰਡ ਭ�ੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤ�ਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ ਤਾਂ ਮ�ੜ ਪ�ੱਛਿਆ ਜਾਵੇਗਾ।"
 
 #  shell:upgrade-nospace primary
 #: ../shell/shell.error.xml.h:7
@@ -19026,38 +20198,27 @@ msgstr "ਕੀ ਪ�ਰਾਣਾ ਡਾਟਾ ਹਟਾਉਣਾ ਹੈ?"
 #  shell:upgrade-remove-1-4-confirm secondary
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"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"
+"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"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
 "ਡਾਇਰੈਕਟਰੀ &quot;evolution&quot; ਦੇ ਭਾਗ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲਈ ਤਿਆਰ ਹਨ।\n"
 "\n"
-"ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤ�ਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖ�ਦ ਜਾਂਚ "
-"ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪ�ਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
+"ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤ�ਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖ�ਦ ਜਾਂਚ ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪ�ਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
 "\n"
-"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪ�ਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤ�ਸੀਂ ਖ�ਦ "
-"ਨਾ ਵਰਤੋਂ।\n"
+"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤ�ਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪ�ਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤ�ਸੀਂ ਖ�ਦ ਨਾ ਵਰਤੋਂ।\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"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 ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪ�ਰਾਣੇ ਵਰਜਨ ਨੇ ਡਾਟਾ ਕਿਸੇ ਵੱਖਰੇ ਟਿਕਾਣੇ ਉੱਤੇ ਸੰਭਾਲਿਆ ਸੀ।\n"
 "\n"
-"ਜੇਕਰ ਤ�ਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚ�ਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ "
-"ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤ�ਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚ�ਣਿਆ, ਤਾਂ ਤ�ਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;"
-"evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
+"ਜੇਕਰ ਤ�ਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚ�ਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤ�ਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚ�ਣਿਆ, ਤਾਂ ਤ�ਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19065,14 +20226,11 @@ msgstr "ਪà©�ਰਾਣੇ ਵਰਜਨ ਉੱਤੇ ਅੱਪਗਰੇਡ ਅà¨
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"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."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"ਤ�ਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤ�ਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ {1} ਉਪਲੱਬਧ "
-"ਹੈ।\n"
+"ਤ�ਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤ�ਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ {1} ਉਪਲੱਬਧ ਹੈ।\n"
 "\n"
 "ਤ�ਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਹੋਰ ਥਾਂ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
 
@@ -19116,14 +20274,13 @@ msgstr "ਮੈਨੂੰ ਬਾਅਦ ਵਿੱਚ ਯਾਦ ਕਰਵਾਓ(_R)"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
 "ਜੇਕਰ ਤ�ਸੀਂ ਜਾਰੀ ਰਹੇ ਤਾਂ ਤ�ਸੀਂ ਆਪਣੇ ਪ�ਰਾਣੇ ਡਾਟਾ ਨੂੰ ਖੋਲ ਨਹੀਂ ਸਕੋਗੇ।\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19134,23 +20291,13 @@ msgstr ""
 "\n"
 "ਵਿਸ਼ਵਾਸ ਸੈਟਿੰਗ ਵਿੱਚ ਸੋਧ:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"ਕਿਉਕਿ ਤ�ਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ�ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾਂ ਕਰਦੇ ਹੋ, ਸੋ ਤ�ਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ "
-"ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
+#: ../smime/gui/cert-trust-dialog.c: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
-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/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
@@ -19179,7 +20326,8 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਨਾਂ"
 msgid "Purposes"
 msgstr "ਮਕਸਦ"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289
+#: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "ਕਰਮ ਅੰਕ"
@@ -19200,11 +20348,16 @@ msgstr "ਈ-ਮੇਲ �ਡਰੈੱਸ"
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਰਸ਼ਕ: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s' ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19216,7 +20369,7 @@ msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਭਰੋ"
 
 #  FIXME: add serial no, validity date, uses
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19225,7 +20378,7 @@ msgstr ""
 "ਇਸ ਨੂੰ ਜਾਰੀ ਕੀਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19234,7 +20387,7 @@ msgstr ""
 "ਇਸ ਨੇ ਜਾਰੀ ਕੀਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਚ�ਣੋ"
 
@@ -19287,14 +20440,11 @@ msgid "Backup All"
 msgstr "ਸਭ ਦਾ ਬੈਕਅੱਪ"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"ਕਿਸੇ ਕੰਮ ਲਈ ਇਸ CA ਤੇ ਭਰੋਸਾ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤ�ਹਾਨੂੰ ਇਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਵੇਖ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਇਸ "
-"ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+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:1077
 msgid "Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
@@ -19370,11 +20520,13 @@ 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:819
 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:823
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"
 
@@ -19420,11 +20572,12 @@ msgstr "CA ਭਰੋਸਾ ਸੋਧ(_E)"
 
 #  XXX we shouldn't be popping up dialogs in this code.
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:239
+#: ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -19506,11 +20659,13 @@ msgstr "ਵਿਸ਼ੇ ਦਾ ਸਰਵਜਨਕ ਕੀ �ਲੋਗਰਿਥਮ"
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼ੇ ਦੀ ਸਰਵਜਨਕ ਕੀ"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:810
+#: ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "ਗਲਤੀ: ਕਾਰਜ ਵਾਧੇ ਲਈ ਅਸਫਲ"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "ਆਬਜੈਕਟ ਦਸਤਖਤ"
 
@@ -19554,7 +20709,8 @@ msgstr "CRL ਦਸਤਖਤੀ"
 msgid "Critical"
 msgstr "ਨਾਜ਼�ਕ"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:941
+#: ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "ਘਾਤਕ ਨਹੀਂ"
 
@@ -19567,7 +20723,8 @@ msgstr "ਵਾਧਾ"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1092
+#: ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ �ਲੋਗਰਿਥਮ"
 
@@ -19629,7 +20786,7 @@ msgid "Contact _Preview"
 msgstr "ਸੰਪਰਕ �ਲਕ(_P)"
 
 #: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ਨਕਲ"
@@ -19642,7 +20799,8 @@ msgstr "ਚà©�ਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ à
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "ਚ�ਣੇ ਫੋਲਡਰ ਦੇ ਭਾਗਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਕਰੋ"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "ਚ�ਣੇ ਦੀ ਨਕਲ"
 
@@ -19655,12 +20813,13 @@ msgid "Create a new addressbook folder"
 msgstr "ਨਵਾਂ �ਡਰੈੱਸ-ਬ�ੱਕ ਫੋਲਡਰ ਬਣਾਓ"
 
 #: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ਕੱਟੋ"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "ਚ�ਣੇ ਕੱਟੋ"
 
@@ -19697,12 +20856,13 @@ msgid "Move to Folder..."
 msgstr "ਫੋਲਡਰ ਭੇਜੋ..."
 
 #: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ਚਿਪਕਾਉ"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਚਿਪਕਾਓ"
 
@@ -19734,13 +20894,12 @@ msgstr "ਚà©�ਣੇ ਸੰਪਰਕ ਨੂੰ VCard ਰਾਹੀ ਸੰਭਾà¨
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ਚ�ਣੇ ਫੋਲਡਰ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ VCard ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "ਸਭ ਚ�ਣੋ"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "ਸਭ ਚ�ਣੋ(_A)"
 
@@ -19780,7 +20939,8 @@ msgstr "ਲੋਡ ਕਰਨ ਨੂੰ ਰੋਕੋ"
 msgid "View the current contact"
 msgstr "ਮੌਜੂਦਾ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "ਕਾਰਵਾਈ(_A)"
@@ -19809,7 +20969,8 @@ msgstr "ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "ਫੋਲਡਰ ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "ਨਵਾਂ(_N)"
 
@@ -19869,8 +21030,9 @@ msgstr "ਸੂਚੀ"
 msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
@@ -19878,8 +21040,9 @@ msgstr "ਅੱਗੇ"
 msgid "Previews the calendar to be printed"
 msgstr "ਪਰਿੰਟ ਕਰਨ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ �ਲਕ"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
@@ -19887,7 +21050,8 @@ msgstr "ਪਿੱਛੇ"
 msgid "Print this calendar"
 msgstr "ਇਹ ਕੈਲੰਡਰ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "ਨਿਚੋੜ(_e)"
 
@@ -19947,232 +21111,6 @@ msgstr "ਕੰਮ ਹਫਤਾ"
 msgid "_Open Appointment"
 msgstr "ਮ�ਲਾਕਾਤ ਖੋਲ�ਹੋ(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "ਚ�ਣਿਆ ਟੈਕਸਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕਰੋ"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "ਚੋਣ ਦੀ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "ਚੋਣ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਲਈ ਕੱਟੋ"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਨਕਲ ਕਰੋ"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "ਸਾਰਾ ਟੈਕਸਟ ਚ�ਣੋ"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "ਨੱਥੀ"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "ਇੱਕ ਫਾਇਲ ਨੱਥੀ ਕਰਨ ਲਈ ਦਬਾਓ"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਲਈ ਦਬਾਓ"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਸੰਭਾਲਣ ਲਈ ਦਬਾਓ"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "ਉਪਲੱਬਧ ਮੱਦਦ ਵੇਖਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "ਬੰਦ ਕਰੋ"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "ਸ਼ਾਮਿਲ(_i)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "ਨੱਥੀ(_a)..."
-
-#: ../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 "ਬੰਦ ਕਰੋ(_C)"
-
-#: ../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:42
-msgid "_File"
-msgstr "ਫਾਇਲ(_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "ਮੱਦਦ(_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "ਚੋਣ(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "ਸਭ ਦਿਨ ਘਟਨਾ"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "ਸਭ ਦਿਨ ਘਟਨਾਵਾਂ(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "ਗ�ਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਨੂੰ ਸੈੱਟ ਜਾਂ ਨਾ-ਸੈੱਟ ਕਰਨ ਲਈ ਦਬਾਓ"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "ਪਬਲਿਕ(_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰ��ਿਆ ਜਾਣਕਾਰੀ ਪਤਾ ਕਰੋ"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "ਰੋਲ ਖੇਤਰ(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "ਭੇਜਣ ਚੋਣਾਂ(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "ਸਮਾਂ ਰ��ੇ ਵਾਂਗ ਵੇਖਾਓ(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਖ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ �ਲਕ ਕੈਟਾਗਰੀ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "ਅਲਾਰਮ(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "ਕੈਟਾਗਰੀ(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "ਵਰਗੀਕਰਨ(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "ਗ�ਪਤ(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "ਵੇਹਲਾ/ਰ��ਿਆ(_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "ਨਿੱਜੀ(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "ਦ�ਹਰਾ(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ਮੌਜੂਦਾ ਮੇਲ ਕਾਰਵਾਈ ਰੱਦ ਕਰੋ"
@@ -20201,8 +21139,8 @@ msgstr "ਆਫਲਾਇਨ ਲਈ ਮਾਰਕ ਕੀਤੇ ਅਕਾਊਂਟ/à
 msgid "Empty _Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../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 "ਫੋਲਡਰ(_o)"
 
@@ -20419,7 +21357,8 @@ msgstr "ਮਸਲਾ ਸ�ਨੇਹਾ ਲਿਸਟ"
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ ਗਰ�ੱਪ(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "ਸ�ਨੇਹਾ(_M)"
@@ -20745,7 +21684,8 @@ msgstr "ਸਭ ਟੈਕਸਟ ਚ�ਣੋ(_A)"
 msgid "Select all the text in a message"
 msgstr "ਇੱਕ ਸ�ਨੇਹੇ ਵਿੱਚ ਸਭ ਟੈਕਸਟ ਚ�ਣੋ"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫਾ ਸੈਟਿੰਗ ਵੇਖਾਓ"
 
@@ -20754,131 +21694,128 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹੇ ਸ�ਨੇਹੇ ਵਿੱਚ ਕਰਸਰ �ਪਕਦੀ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "ਸ�ਨੇਹੇ ਸਧਾਰਨ ਸਟਾਇਲ ਵਿੱਚ ਵੇਖਾਓ"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "ਸ�ਨੇਹੇ ਸਭ ਈ-ਮੇਲ ਹੈੱਡਰਾਂ ਨਾਲ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "ਸ�ਨੇਹੇ ਦੇ ਕੱਚੇ ਈ-ਮੇਲ ਸਰੋਤ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "ਚ�ਣੇ ਸ�ਨੇਹੇ ਨਾ-ਹਟਾ� ਬਣਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "ਜ਼ੂਮ ਬਾਹਰ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "ਨੱਥੀ(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "ਗ�ਪਤ-ਲੇਖਣ ਢੰਗ(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "ਸ�ਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "ਸ�ਨੇਹੇ 'ਚ ਖੋਜ(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "ਜਾਓ(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "ਖਾਸ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "ਲਾਈਨ ਵਿੱਚ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "ਕੂੜਾ(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "ਚਿੱਤਰ ਲੋਡ(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "ਸ�ਨੇਹਾ ਸਰੋਤ(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "ਅੱਗੇ ਸ�ਨੇਹਾ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "ਆਮ ਅਕਾਰ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "ਕੂੜਾ ਨਹੀਂ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "ਨਵੇਂ �ਰੋਖੇ 'ਚ ਖੋਲ�ਹੋ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "ਪਿੱਛੇ ਸ�ਨੇਹਾ(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "ਪੜ�ਹਨ(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "ਸ�ਨੇਹਾ ਸੰਭਾਲੋ(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹਟਾਇਆ ਸ�ਨੇਹਾ(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "ਨਾ-ਪੜਿਆ(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "ਜ਼ੂਮ(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "ਜ਼ੂਮ ਅੰਦਰ(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "ਮ�ੱਖ ਟੂਲਬਾਰ"
 
@@ -20914,290 +21851,6 @@ msgstr "ਚ�ਣੇ ਮੀਮੋ ਵੇਖੋ"
 msgid "_Open Memo"
 msgstr "ਮੀਮੋ ਖੋਲ�ਹੋ(_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "ਇੱਕ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰੋ"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਬੰਦ ਕਰੋ"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "ਸਭ ਹਟਾਓ ਪਰ ਦਸਤਖਤ"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "ਇਸ ਸ�ਨੇਹੇ ਨੂੰ PGP ਨਾਲ ਇੰਕ�ਰਿਪਟ ਕਰੋ"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "ਇਸ ਸ�ਨੇਹੇ ਨੂੰ ਆਪਣੇ S/MIME ਇਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਕਰਿਪਟ ਕਰੋ"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "ਫਾਰਮੈਟ(_m)"
-
-#: ../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
-msgid "Insert Send options"
-msgstr "ਭੇਜਣ ਚੋਣਾਂ ਸ਼ਾਮਲ"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "ਇੱਕ ਫਾਇਲ ਖੋਲ�ਹੋ"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP ਇੰਕ�ਰਿਪਟ"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP ਦਸਤਖਤ"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP ਇੰਕ�ਰਿਪਟ(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP ਦਸਤਖਤ(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "ਪੜਨ ਰਸੀਦ ਦੀ ਮੰਗ(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME ਇੰਕ�ਰਿਪਟ(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME ਇੰਕ�ਰਿਪਟ"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME ਸਾਇਨ(_n)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME ਦਸਤਖਤ"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "ਭੇਜੋ(_e)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "ਇੰਞ ਸੰਭਾਲੋ"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "ਇੰ� ਸੰਭਾਲੋ(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਨੂੰ ਵੱਖਰੇ ਨਾਂ ਨਾਲ ਸੰਭਾਲੋ"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "ਸ�ਨੇਹੇ ਨੂੰ ਖਾਸ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "ਭੇਜੋ"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "ਪੱਤਰ HTML ਫਾਰਮੈਟ ਵਿੱਚ ਭੇਜੋ"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "ਇਹ ਸ�ਨੇਹਾ ਭੇਜੋ"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "ਸ�ਨੇਹੇ ਦਾ ਦਰਜਾ ਵਧਾਓ"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "ਆਪਣੀ PGP ਕੀ ਨਾਲ ਇਸ ਸ�ਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "ਆਪਣੇ S/MIME ਦਸਤਖਤ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਸ ਸ�ਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ BCC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ CC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲੋਂ ਚੋਣਕਾਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਭੇਜੋ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਜਵਾਬ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Bcc ਖੇਤਰ"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Cc ਖੇਤਰ"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "ਸਭ ਹਟਾਉ(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "ਵੱਲੋਂ ਖੇਤਰ(_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "ਖੋਲ�ਹੋ(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "ਭੇਜਣਾ ਖੇਤਰ(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "ਦਰਜਾ ਸ�ਨੇਹਾ(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "ਜਵਾਬ ਖੇਤਰ(_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "ਸ�ਰੱਖਿਆ(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "ਭੇਜਣ ਚੋਣ(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "ਵੱਲ ਖੇਤਰ(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "ਬੰਦ ਕਰੋ(_l)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ ਅਤੇ ਵਿੰਡੋ ਬੰਦ ਕਰ ਦਿਓ"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "ਫੋਲਡਰ ਨੂੰ ਆਪਣੀ ਫੋਲ਼ਡਰ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "ਤਾਜ਼ਾ ਲਿਸਟ"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "ਫੋਲਡਰ ਲਿਸਟ ਨੂੰ ਤਾਜ਼ਾ ਕਰੋ"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "ਫੋਲਡਰ ਨੂੰ ਮੇਰੀ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਓ"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "ਮੈਂਬਰੀ"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "ਮੈਂਬਰ ਨਹੀਂ"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "ਉਲਟ ਚੋਣ(_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ / ਵੇਖੋ ਨੂੰ ਦਬਾਓ"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "ਹਾਲਤ ਵੇਰਵਾ"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "ਸਮਾਂ ਖੇਤਰ"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "ਹਾਲਤ ਵੇਰਵਾ(_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "ਚ�ਣੇ ਕੰਮਾਂ ਦੀ ਨਕਲ"
@@ -21391,50 +22044,55 @@ msgid "View/Hide the Status Bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖਾਓ/ਓਹਲੇ"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "ਆਫ-ਲਾਇਨ ਜਾਓ"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "ਇਸ ਬਾਰੇ(_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ ਜਾਓ(_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "ਆਮ ਪ�ੱਛੇ ਜਾਂਦੇ ਸਵਾਲ(_F)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "ਬਟਨ ਓਹਲੇ(_H)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "ਆਈਕਾਨ ਹੀ(_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "ਤਰ�ੰਤ ਹਵਾਲਾ(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "ਬਾਹਰ(_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "ਸਵਿੱਚਰ ਦਿੱਖ(_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "ਸਿਕਰੋਨਾਈਜ਼ ਚੋਣ(_S)..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "ਸਿਰਫ਼ ਟੈਕਸਟ(_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "ਵਿੰਡੋ(_W)"
 
@@ -21446,7 +22104,8 @@ msgstr "ਕੰਪਨੀ ਨਾਲ(_C)"
 msgid "_Address Cards"
 msgstr "�ਡਰੈੱਸ ਕਾਰਡ(_A)"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "ਲਿਸਟ �ਲਕ(_L)"
 
@@ -21511,11 +22170,11 @@ msgid "With _Status"
 msgstr "ਹਾਲਤ ਨਾਲ(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21532,31 +22191,30 @@ msgid "Select a Time Zone"
 msgstr "ਸਮਾਂ ਖੇਤਰ ਚ�ਣੋ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "ਸਮਾਂ-ਖੇਤਰ ਲਟਕਦਾ ਬਕਸਾ"
+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 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 ""
 "ਮਾਊਸ ਦਾ ਖੱਬਾ ਬਟਨ ਖੇਤਰ ਦਾ ਆਕਾਰ ਵੱਡਾ ਕਰਨ ਲਈ ਵਰਤੋਂ ਅਤੇ ਸਮਾਂ ਖੇਤਰ ਚ�ਣੋ।\n"
 "ਮਾਊਸ ਦਾ ਸੱਜਾ ਬਟਨ ਖੇਤਰ ਘਟਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗਾ।"
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 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 "%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 "�ਲਕ ਪਰਿਭਾਸ਼ਾ"
 
@@ -21566,17 +22224,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\" ਲਈ �ਲਕ ਪਰਿਭਾਸ਼ਿਤ"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "ਮੌਕਾ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "ਮੌਜੂਦਾ �ਲਕ ਸੰਭਾਲੋ"
 
@@ -21628,11 +22286,11 @@ msgstr "ਮੌਜੂਦਾ ਕਸਟਮਾਈਜ਼ ਵਿਊ ਸੰਭਾਲੋ
 msgid "Create or edit views"
 msgstr "ਵਿਊ ਬਣਾਓ ਜਾਂ ਸੋਧ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "ਫੈਕਟਰੀ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "ਨਵੀਂ �ਲਕ ਬਣਾਓ"
 
@@ -21648,17 +22306,20 @@ msgstr "�ਲਕ ਦੀ ਕਿਸਮ"
 msgid "Type of view:"
 msgstr "�ਲਕ ਦੀ ਕਿਸਮ:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../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:314 ../widgets/misc/e-attachment.c:531
+#: ../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 ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:ਇੱਕ ਨਿਯਮਤ ਫਾਇਲ਼ ਨਹੀਂ"
@@ -21680,33 +22341,36 @@ msgid "Suggest automatic display of attachment"
 msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ ਵੇਖਾਉਣ ਲਈ ਸ��ਾਅ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "ਮਹੀਨਾ ਕੈਲੰਡਰ"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
+#: ../widgets/misc/e-canvas-background.c:454
 #: ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
+#: ../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
 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:3664
+#: ../widgets/misc/e-canvas-background.c:475
 #: ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "ਸਟਿਪਲ ਭਰੋ"
 
@@ -21730,30 +22394,33 @@ msgstr "Y1"
 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:3071
+#: ../widgets/misc/e-canvas-vbox.c:92
+#: ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../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:3072
+#: ../widgets/misc/e-canvas-vbox.c:93
+#: ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "ਖਾਲੀ ਥਾਂ"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "ਹ�ਣ"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ਸਮੇਂ ਦਾ ਫਾਰਮੈਟ ਇੰ� ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ: %s"
@@ -21762,188 +22429,192 @@ msgstr "ਸਮੇਂ ਦਾ ਫਾਰਮੈਟ ਇੰ� ਦਾ ਹੋਣਾ ਲ
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ�ਰਤੀਸ਼ਤ ਖਾਸ ਤੌਰ ਤੇ 0 ਤੇ 100 ਦੇ ਦਰਮਿਆਨ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "ਅਰਬੀ"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "ਬਾਲਟਿਕ"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "ਕੇਦਰੀ ਯੂਰਪ"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "ਚੀਨ"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "ਸਰੀਲਿਕ"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "ਗਰੀਕ"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "ਹੈਬਰਿਊ"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "ਜਾਪਾਨੀ"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "ਕੋਰੀਆ"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "ਥਾਈ"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "ਤ�ਰਕਿਸ਼"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "ਯੂਨੀਕੋਡ"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "ਪੱਛਮੀ ਯੂਰਪ"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "ਪੱਛਮੀ ਯੂਰਪ, ਨਵਾਂ"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88
+#: ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "ਮੂਲ"
 
-#: ../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:91
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "ਸਧਾਰਨ"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "ਯੂਕਰੇਨ"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "ਦਿੱਖ"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "ਅਣਪਛਾਤਾ ਅੱਖਰ ਸਮੂਹ: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲਈ ਅੱਖਰ ਦਿਓ"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "ਹੋਰ..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_A)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "ਮਿਤੀ ਦੇਣ ਲਈ ਟੈਕਸਟ ਇੰਦਰਾਜ਼"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾਂ ਚ�ਣਨ ਲਈ ਲਟਕਦਾ ਬਕਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "ਹ�ਣੇ(_w)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "ਅੱਜ(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "ਗਲਤ ਤਾਰੀਖ ਮ�ੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "ਗਲਤ ਸਮਾਂ ਮ�ੱਲ"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "ਫੈਲਿਆ"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "ਫੈਲਾਓ ਨੂੰ ਫੈਲਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "ਫੈਲਾਓ ਦੇ ਲੇਬਲ ਦਾ ਟੈਕਸਟ"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "ਹੇਠਾਂ ਰੇਖਾ ਵਰਤੋਂ"
 
-#: ../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"
+#: ../widgets/misc/e-expander.c:197
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr "ਜੇਕਰ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਤਾਂ, ਟੈਕਸਟ ਵਿੱਚ ਦਿੱਤਾ ਅੱਖਰ ਪ�ਰਵੇਸ਼ਕ ਕੀ ਨੂੰ ਵੇਖਾ�ਗਾ"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "ਲੇਬਲ ਤੇ ਅਗਲੇ ਵਿੱਚਕਾਰ ਅੰਤਰ ਦਿਓ"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "ਲੇਬਲ ਵਿਦਗਿਟ"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "ਆਮ ਫੈਲਾਓ ਲੇਬਲ ਦੀ ਥਾਂ ਤੇ ਇੱਕ ਵਿਦਗਿਟ ਵੇਖਾਓ"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221
+#: ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "ਫੈਲਾਓ ਆਕਾਰ"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "ਫੈਲਾਉ ਤੀਰ ਦਾ ਆਕਾਰ"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "ਸੰਕੇਤਕ ਥਾਂ"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "ਫੈਲਾਓ ਤੀਰ ਦ�ਆਲੇ ਖਾਲੀ ਥਾਓ"
 
 #. 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:748
+#: ../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
 msgid "Advanced Search"
 msgstr "ਤਕਨੀਕੀ ਖੋਜ"
 
@@ -21960,15 +22631,18 @@ msgstr "ਖੋਜ(_S)"
 msgid "Searches"
 msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "ਖੋਜ ਸੰਭਾਲੋ(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲੀ ਖੋਜ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
 
@@ -21988,21 +22662,27 @@ msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
 msgid "Current Message"
 msgstr "ਮੌਜੂਦਾ ਸ�ਨੇਹਾ"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "ਚਿੱਤਰ ਚ�ਣੋ"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨਕਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:628
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
-msgstr ""
-"ਸਮਾਂ-ਖੇਤਰ ਚ�ਣਨ ਲਈ ਮਾਊਸ-ਅਧਾਰਿਤ ਸ�ੰਦਰ ਨਕਸ਼ਾ ਹੈ। ਕੀ-ਬੋਰਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਲੇ ਸਮਾਂ-ਖੇਤਰ ਲਈ ਹੇਠਾਂ "
-"ਦਿੱਤਾ ਕੰਬੋਸਮਾਂ ਖੇਤਰ ਬਕਸਾ ਵਰਤ ਸਕਦੇ ਹਨ।"
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
+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:109
+#, fuzzy
+msgid "Online"
+msgstr "ਲਾਇਨ 'ਚ"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "ਬਟਨ ਹਾਲਤ ਆਨਲਾਈਨ ਹੈ"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22016,73 +22696,79 @@ msgstr "ਨਿੱਜੀ ਰਿਕਾਰਡ ਸਿਕਰੋਨਾਈਜ਼:"
 msgid "Sync Categories:"
 msgstr "ਕੈਟਾਗਰੀ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1448
+#: ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "ਖਾਲੀ ਸ�ਨੇਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1455
+#: ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "ਮ�ੜ-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1462
+#: ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "ਖੋਜ ਟਾਈਪ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "ਹ�ਣ ਖੋਜ(_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "ਸਾਫ਼(_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ਇਕਾਈ ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:875
 #: ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "ਵੇਖਾਓ(_w): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "ਖੋਜ(_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " ਅੰਦਰ(_n) "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "ਕਰਸਰ ਕਾਲਮ"
@@ -22099,7 +22785,7 @@ msgstr "ਚੋਣ ਢੰਗ"
 msgid "Cursor Mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "ਹਟਾਉਣ ਤੇ(_l):"
 
@@ -22123,10 +22809,6 @@ msgstr "<b>ਸਥਿਤੀ ਖੋਜ</b>"
 msgid "A_uto-delete sent item"
 msgstr "ਸਵੈ-ਹਟਾਈ ਭੇਜੀ ਇਕਾਈ(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "ਵਰਗੀਕਰਨ"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "ਜਾਣਕਾਰੀ ਪ�ਰਾਪਤ ਕਰਨ ਲਈ ਭੇਜਣ ਇਕਾਈ ਬਣਾਓ(_e)"
@@ -22207,44 +22889,45 @@ msgstr "ਬਾਅਦ(_A):"
 msgid "_All information"
 msgstr "ਸਭ ਜਾਣਕਾਰੀ(_A)"
 
-#: ../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 "ਦੇਰ ਸ�ਨੇਹਾ ਵੰਡ(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "ਪਹ�ੰਚੇ(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਸੈੱਟ(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "ਜਦ-ਤੱਕ(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "ਜਦੋਂ ਠੀਕ ਲੱਗੇ(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "ਜਦੋਂ ਖੋਲ�ਹਿਆ ਜਾਵੇ(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL ਉੱਤੇ ਜਾਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
@@ -22284,23 +22967,23 @@ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-ਚ�ਣਿਆ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "ਕਾਲਮ ਵਿੰਨੋ"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "ਕਾਲਮ ਹੇਠ ਲਾਈਨ"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "ਕਾਲਮ ਰੰਗ"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG ਰੰਗ ਕਾਲਮ"
 
@@ -22308,11 +22991,13 @@ msgstr "BG ਰੰਗ ਕਾਲਮ"
 msgid "State"
 msgstr "ਸਥਿਤੀ"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(ਵੱਧਦਾ ਕਰਮ)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(ਘੱਟਦਾ ਕਰਮ)"
 
@@ -22338,7 +23023,7 @@ msgid "A_vailable Fields:"
 msgstr "ਉਪਲੱਬਧ ਖੇਤਰ(_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ ਕਰਮ"
 
@@ -22351,7 +23036,7 @@ msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "ਘੱਟਦਾ ਕਰਮ"
 
@@ -22414,14 +23099,14 @@ msgstr "ਲੜੀਬੱਧ(_S)..."
 #: ../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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "ਪੂਰਾ ਹੈੱਡਰ"
 
@@ -22455,437 +23140,521 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ਇਕਾਈ)"
 msgstr[1] "%s (%d ਆਈਟਮਾਂਂ)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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
 msgid "Draw focus"
 msgstr "ਫੋਕਸ ਖਿੱਚੋ"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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
 msgid "Cursor mode"
 msgstr "ਕਰਸਰ ਮੋਡ"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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
 msgid "Selection model"
 msgstr "ਚੋਣ ਮਾਡਲ"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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
 msgid "Length Threshold"
 msgstr "ਮ�ੱਢਲੀ ਲੰਬਾਈ"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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
 msgid "Uniform row height"
 msgstr "ਇਕਸਾਰ ਕਤਾਰ ਉਚਾਈ"
 
-#: ../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: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"
 msgstr "ਸਥਿਰ"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ �ਲਕ"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ਕ�ਰਮ(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "ਘੱਟਦਾ ਕ�ਰਮ(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "ਗੈਰ-ਕ�ਰਮਬੱਧ(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "ਇਸ ਖੇਤਰ ਨਾਲ ਗਰ�ੱਪ(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "ਬਕਸੇ ਨਾਲ ਗਰ�ੱਪ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "ਇਹ ਕਾਲਮ ਹਟਾਓ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "ਕਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "ਵਧੀਆ ਫਿੱਟ(_e)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "ਕਾਲਮ ਫਾਰਮੈਟ(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ �ਲਕ(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "ਲੜੀਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "ਫੋਂਟ ਵੇਰਵਾ"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "ਲੜੀ"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "ਟੇਬਲ ਹੈੱਡਰ"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "ਟੇਬਲ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094
+#: ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "ਹਮੇਸ਼ਾ ਖੋਜੋ"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲਈ ਦਬਾਓ"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree ਟੇਬਲ �ਡਪਟਰ"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "ਵਾਪਸ ਖੋਜ"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "ਲਾਈਨਾਂ ਖਿੱਚੋ ਅਤੇ +/- ਫੈਲਾਓ"
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "ਇੰਪ�ੱਟ ਢੰਗ"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ਘਟਨਾ ਪ�ਰੋਸੈਂਸਰ"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "ਗੂੜਾ"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "ਵਿੰਨ�ਹੋ"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "ਅੰਕਰ"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "ਇਕਸਾਰ"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "ਕਲਿੱਪ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "ਕਲਿੱਪ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "ਕਲਿੱਪ"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "ਕਲਿੱਪ ਚਤਰਭ�ਜ ਭਰੋ"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X ਆਫਸੈੱਟ"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y ਆਫਸੈੱਟ"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "ਟੈਕਸਟ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "ਟੈਕਸਟ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "ਅੰਡਾਕਾਰ ਵਰਤੋਂ"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "ਅੰਡਾਕਾਰ"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "ਲਾਈਨ ਲਪੇਟੋ"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "ਅੰਤਰਾਲ ਅੱਖਰ"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "ਅਧਿਕਤਮ ਲਾਈਨਾਂ"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "ਹਾਸ਼ੀਆਂ ਖਿੱਚੋ"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "ਨਵੀਆਂ-ਲਾਈਨਾਂ ਮਨਜ਼ੂਰ"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਓ"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "ਬਟਨ ਬਣਾਓ"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM ਪਰਸੰਗ"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "ਪੋਪਅੱਪ ਸੰਭਾਲੋ"
 
+#~ msgid "Permission Denied."
+#~ msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।"
+#~ msgid "_Properties..."
+#~ msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)..."
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>ਡਿਸਪਲੇਅ</b>"
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>ਸਰਵਰ ਜਾਣਕਾਰੀ</b>"
+#~ msgid "D_escription:"
+#~ msgstr "ਵੇਰਵਾ(_e):"
+#~ msgid "De_scription:"
+#~ msgstr "ਵੇਰਵਾ(_s):"
+#~ msgid "Updating query"
+#~ msgstr "ਨਵੀਵੀਕਰਨ ਸਵਾਲ"
+#~ msgid "Upcoming Appointments"
+#~ msgstr "ਆ ਰਹੀਆਂ ਮ�ਲਾਕਾਤਾਂ"
+#~ msgid "Unknown reason"
+#~ msgstr "ਅਣਪਛਾਤਾ ਕਾਰਨ"
+#~ msgid "Open File"
+#~ msgstr "ਫਾਇਲ ਖੋਲੋ"
+#~ msgid "_Save Message"
+#~ msgstr "ਸ�ਨੇਹਾ ਸੰਭਾਲੋ(_S)"
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "ਫਾਇਲ਼ &quot;{0}&quot; ਨੂੰ ਖੋਲ�ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+#~ msgid "Attach original message"
+#~ msgstr "ਅਸਲੀ ਸ�ਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰੋ"
+#~ msgid "Do not quote original message"
+#~ msgstr "ਅਸਲੀ ਸ�ਨੇਹੇ ਦਾ ਹਵਾਲਾ ਨਹੀਂ"
+#~ msgid "Quote original message"
+#~ msgstr "ਅਸਲੀ ਸ�ਨੇਹਾ ਵੇਰਵਾ"
+#~ msgid "Enter a name for this signature."
+#~ msgstr "ਇਸ ਦਸਤਖਤ ਲਈ ਨਾਂ ਦਿਓ।"
+#~ msgid "Name:"
+#~ msgstr "ਨਾਂ:"
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "ਕੀ ਤ�ਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸਾਰੇ ਹਟਾ� ਸ�ਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "ਕੀ &quot;{0}&quot; ਹਟਾਓਣਾ ਹੈ?"
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "ਕੀ ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸ�ਨੇਹੇ ਹਟਾਉਣੇ ਹਨ?"
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "ਕੀ ਤ�ਸੀਂ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਕਾਰਵਾਈ ਕਰਨੀ ਚਾਹ�ੰਦੇ ਹੋ?"
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "ਕੀ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਸਭ ਸ�ਨੇਹੇ ਪੜ�ਹੇ ਬਣਾਉਣੇ ਹਨ?"
+#~ msgid "Only on _Current Folder"
+#~ msgstr "ਕੇਵਲ ਮੌਜੂਦ ਫੋਲਡਰ ਉੱਤੇ(_C)"
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "ਨੱਥੀ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਯੋਗ ਕਰੋ"
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "ਅਟੈਂਚਮੈਂਟ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਯੋਗ ਹੈ।"
+#~ msgid "Remind _missing attachments"
+#~ msgstr "ਗ�ੰਮ ਅਟੈਂਚਮਿੰਟ ਯਾਦ ਕਰਵਾਓ(_m)"
+#~ msgid "_Refresh:"
+#~ msgstr "ਮ�ੜ-ਤਾਜ਼ਾ(_R):"
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "ਇਹ ਪਲੱਗਇਨ ਲਈ ਕੋਈ ਸੰਰਚਨਾ ਨਹੀਂ ਹੈ।"
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "ਕੰਪੋਜ਼ਰ ਤੋਂ ਪਰਿੰਟ ਕਰਨ ਲਈ ਇੱਕ ਚੋਣ ਦਿਓ।"
+#~ msgid "Print Message"
+#~ msgstr "ਸ�ਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
+#~ msgid "Prints the message"
+#~ msgstr "ਸ�ਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "ਸ਼�ਰੂਆਤੀ ਸਹਾਇਕ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਵਾਲੀ ਪਲੱਗ-ਇਨ ਹੈ।"
+#~ msgid "Startup wizard"
+#~ msgstr "ਸ਼�ਰੂਆਤੀ ਸਹਾਇਕ"
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਸੈਟਿੰਗ ਬਾਰੇ ਇੱਕ ਲਾਈਨ"
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "ਚੋਣ ਕਰੋ ਕਿ ਕੀ ਕਰੈਸ਼ ਖੋਜ ਨੂੰ ਚਲਾਇਆ ਜਾਵੇ ਕਿ ਨਾ"
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "ਰਿਕਵਰੀ ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ ਛੱਡੋ"
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "ਕੀ ਕਰੈਸ਼ ਖੋਜ ਕੀਤੀ ਜਾਵੇ ਕਿ ਨਾ"
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਰਿਕਵਰੀ ਡਾਈਲਾਗ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
+#~ msgid "No folder name specified."
+#~ msgstr "ਕੋਈ ਫੋਲਡਰ ਨਾਂ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਹੈ।"
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ Enter ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"#\" ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' ਅਤੇ '..' ਰਾਖਵੇਂ ਫੋਲਡਰ ਨਾਂ ਹਨ।"
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਕਰੈਸ਼ ਖੋਜ"
+#~ msgid "Ig_nore"
+#~ msgstr "ਅਣਡਿੱਠਾ(_n)"
+#~ msgid "_Do not show this message again"
+#~ msgstr "ਇਹ ਸ�ਨੇਹਾ ਮ�ੜ ਨਾ ਵੇਖਾਓ(_D)"
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "ਚੋਣ ਦੀ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ"
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "ਚੋਣ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਲਈ ਕੱਟੋ"
+#~ msgid "Paste from clipboard"
+#~ msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
+#~ msgid "All Day Event"
+#~ msgstr "ਸਭ ਦਿਨ ਘਟਨਾ"
+#~ msgid "Send _Options"
+#~ msgstr "ਭੇਜਣ ਚੋਣਾਂ(_O)"
+#~ msgid "Show messages in the normal style"
+#~ msgstr "ਸ�ਨੇਹੇ ਸਧਾਰਨ ਸਟਾਇਲ ਵਿੱਚ ਵੇਖਾਓ"
+#~ msgid "Delete all but signature"
+#~ msgstr "ਸਭ ਹਟਾਓ ਪਰ ਦਸਤਖਤ"
+#~ msgid "For_mat"
+#~ msgstr "ਫਾਰਮੈਟ(_m)"
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+#~ msgid "Open a file"
+#~ msgstr "ਇੱਕ ਫਾਇਲ ਖੋਲ�ਹੋ"
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP ਇੰਕ�ਰਿਪਟ"
+#~ msgid "PGP Sign"
+#~ msgstr "PGP ਦਸਤਖਤ"
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "S/MIME ਇੰਕ�ਰਿਪਟ"
+#~ msgid "S/MIME Sign"
+#~ msgstr "S/MIME ਦਸਤਖਤ"
+#~ msgid "Save As"
+#~ msgstr "ਇੰਞ ਸੰਭਾਲੋ"
+#~ msgid "Save in folder..."
+#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ..."
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "ਸ�ਨੇਹੇ ਨੂੰ ਖਾਸ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ"
+#~ msgid "Send"
+#~ msgstr "ਭੇਜੋ"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "ਪੱਤਰ HTML ਫਾਰਮੈਟ ਵਿੱਚ ਭੇਜੋ"
+#~ msgid "_Delete all"
+#~ msgstr "ਸਭ ਹਟਾਉ(_D)"
+#~ msgid "_Open..."
+#~ msgstr "ਖੋਲ�ਹੋ(_O)..."
+#~ msgid "C_lose"
+#~ msgstr "ਬੰਦ ਕਰੋ(_l)"
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+#~ msgid "Save and _Close"
+#~ msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_C)"
+#~ msgid "Save the current file and close the window"
+#~ msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ ਅਤੇ ਵਿੰਡੋ ਬੰਦ ਕਰ ਦਿਓ"
+#~ msgid "Refresh List"
+#~ msgstr "ਤਾਜ਼ਾ ਲਿਸਟ"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "ਫੋਲਡਰ ਲਿਸਟ ਨੂੰ ਤਾਜ਼ਾ ਕਰੋ"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "ਫੋਲਡਰ ਨੂੰ ਮੇਰੀ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਓ"
+#~ msgid "Subscribe"
+#~ msgstr "ਮੈਂਬਰੀ"
+#~ msgid "Unsubscribe"
+#~ msgstr "ਮੈਂਬਰ ਨਹੀਂ"
+#~ msgid "_Invert Selection"
+#~ msgstr "ਉਲਟ ਚੋਣ(_I)"
+#~ msgid "Status Details"
+#~ msgstr "ਹਾਲਤ ਵੇਰਵਾ"
+#~ msgid "Time Zone"
+#~ msgstr "ਸਮਾਂ ਖੇਤਰ"
+#~ msgid "TimeZone Combobox"
+#~ msgstr "ਸਮਾਂ-ਖੇਤਰ ਲਟਕਦਾ ਬਕਸਾ"
 #~ msgid "_Categories..."
 #~ msgstr "ਕੈਟਾਗਰੀ(_C)..."
-
 #~ msgid "\n"
 #~ msgstr "\n"
-
 #~ msgid "Add an email to the List"
 #~ msgstr "ਈ-ਮੇਲ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
-
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "�ਡਰੈੱਸ-ਬ�ੱਕ ਵਿੱਚੋਂ ਈ-ਮੇਲ �ਡਰੈੱਸ ਸ਼ਾਮਿਲ"
-
 #~ msgid "Members"
 #~ msgstr "ਮੈਂਬਰ"
-
 #~ msgid "Remove an email address from the List"
 #~ msgstr "ਈ-ਮੇਲ �ਡਰੈੱਸ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਓ"
-
 #~ msgid "_Select"
 #~ msgstr "ਚ�ਣੋ(_S)"
-
 #~ msgid "Or_ganiser:"
 #~ msgstr "ਪ�ਰਬੰਧਕ(_g):"
-
 #~ msgid "Task sort"
 #~ msgstr "ਕੰਮ ਕਰਮਬੱਧ"
-
 #~ msgid "Memo sort"
 #~ msgstr "ਮੀਮੋ ਕ�ਰਮਬੱਧ"
-
 #~ msgid "SMTWTFS"
 #~ msgstr "SMTWTFS"
 
-#  * Post-To
-#~ msgid "Post To:"
-#~ msgstr "ਭੇਜੋ:"
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਇਟ"
-
-#~ msgid "_Search name:"
-#~ msgstr "ਖੋਜ ਨਾਂ(_S):"
-
-#~ msgid "Di_sable"
-#~ msgstr "ਅਯੋਗ(_s)"
-
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "ਆਟੋਮੈਟਿਕ ਖ�ਸ਼ ਪਛਾਣ"
-
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "ਨਵੇਂ ਪੱਤਰ ਦੀ ਸੂਚਨਾ ਲਈ ਧ�ਨੀ ਫਾਇਲ"
-
-#~ msgid "New Mail Notify type"
-#~ msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ ਢੰਗ"
-
-#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
-#~ msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ ਲਈ ਯੂਜ਼ਰ ਕੀ ਵਰਤਣੀ ਚਾਹ�ੰਦਾ ਹੈ, ਨਿਰਧਾਰਿਤ ਕਰੋ।"
-
-#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
-#~ msgstr "<span weight=\"bold\">ਲੇਬਲ ਤੇ ਰੰਗ</span>"
-
-#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
-#~ msgstr "<span weight=\"bold\">ਨਵਾਂ ਪੱਤਰ ਸੰਕੇਤ</span>"
-
-#~ msgid "HTML Mail"
-#~ msgstr "HTML ਮੇਲ"
-
-#~ msgid "Se_lect..."
-#~ msgstr "ਚ�ਣੋ(_l)..."
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "ਡਰਾਫਟ ਫੋਲਡਰ ਚ�ਣੋ"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "ਭੇਜੇ ਫੋਲਡਰ ਚ�ਣੋ"
-
-#~ msgid "_Beep when new mail arrives"
-#~ msgstr "ਨਵੀਂ ਮੇਲ ਆਉਣ ਸਮੇਂ ਬੀਪ ਦਿਓ(_B)"
-
-#~ msgid "_Do not notify me when new mail arrives"
-#~ msgstr "ਨਵਾਂ ਪੱਤਰ ਆਉਣ ਤੇ ਮੈਨੂੰ ਸੂਚਿਤ ਨਾ ਕਰੋ(_D)"
-
-#~ msgid "Attachment Reminder Preferences"
-#~ msgstr "ਅਟੈਂਚਮਿੰਟ ਰੀਮਾਈਡਰ ਪਸੰਦ"
-
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "ਇੱਕ (48*48) png ਆਕਾਰ ਚ�ਣੋ < 720ਬਾਇਟ"
-
-#~ msgid "_Contacts..."
-#~ msgstr "ਸੰਪਰਕ(_C)..."
-
-#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
-#~ msgstr "ਜਦੋਂ ਵੀ ਨਵੀਂ ਮੇਲ ਆਵੇ ਤਾਂ ਇੱਕ libnotify ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ।"
-
-#~ msgid "Make the status icon blink"
-#~ msgstr "ਹਾਲਤ ਆਈਕਾਨ �ਪਕਾਓ"
-
-#~ msgid "When the new-mail status icon is visible, make it blink."
-#~ msgstr "ਜਦੋਂ ਨਵਾਂ ਮੇਲ ਹਾਲਤ ਆਈਕਾਨ ਵੇਖਾਈ ਦੇਵੇ ਤਾਂ ਇਹ �ਲਕਾਉ।"
-
-#~ msgid "System error: %s"
-#~ msgstr "ਸਿਸਟਮ ਗਲਤੀ: %s"
-
-#~ msgid "Camel error: %s"
-#~ msgstr "ਨਾ-ਮੰਨਣਯੋਗ ਗਲਤੀ: %s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "ਅਕਾਊਂਟ ਈ-ਮੇਲ ਨਹੀਂ ਭੇਜ ਸਕਦਾ ਹੈ"
-
-#~ msgid "No store available"
-#~ msgstr "ਕੋਈ ਸਟੋਰੇਜ਼ ਉਪਲੱਬਧ ਨਹੀਂ"
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr "ਪੱਤਰ ਡਾਟੇ ਨੂੰ ਰਿਮੋਟ ਤੋਂ ਵਰਤਣ ਲਈ ਇੱਕ CORBA ਇੰਟਰਫੇਸ ਸੈਟਿੰਗ ਲਈ ਪਲੱਗ-ਇਨ ਹੈ।"
-
-#~ msgid "Mail Remote"
-#~ msgstr "ਪੱਤਰ ਰਿਮੋਟ"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "ਨਵੀਂ ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
-
-#~ msgid "Configure"
-#~ msgstr "ਸੰਰਚਨਾ"
-
-#~ msgid "Download messages for offline"
-#~ msgstr "ਆਫਲਾਈਨ ਲਈ ਸ�ਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰੋ"
-
-#~ msgid "_Phone List"
-#~ msgstr "ਫੋਨ ਲਿਸਟ(_P)"
-
-#~ msgid "MTWTFSS"
-#~ msgstr "MTWTFSS"
-
-#~ msgid "<- _Remove"
-#~ msgstr "< - ਹਟਾਓ(_R)"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "ਇਹ ਫੋਲਡਰ ਕਰਮ ਵਿੱਚ ਵੇਖਾਓ(_o):"
-
-#~ msgid "_Add ->"
-#~ msgstr "ਸ਼ਾਮਲ(_A) ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "ਲੇਬਲ ਮ�ੜ-ਅਕਾਰ ਸਮਰੂਪ"
-
diff --git a/po/pt.po b/po/pt.po
index 835b2ceb53..b9aa351cec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,13 +4,13 @@
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
 # Tiago Antão <tiagoantao@bigfoot.com>, 2000.
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 16:03+0100\n"
-"PO-Revision-Date: 2008-08-11 16:05+0000\n"
+"POT-Creation-Date: 2008-09-06 16:13+0000\n"
+"PO-Revision-Date: 2008-09-07 20:45+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -21,16 +21,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
-msgstr "livro de endereços evolution"
+msgid "evolution address book"
+msgstr "livro de endereços do evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Novo Contacto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
@@ -57,63 +57,63 @@ msgstr "Contacto: "
 msgid "evolution minicard"
 msgstr "mini-cartão evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Possui alertas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Possui recorrência."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "É uma reunião."
 
-#: ../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 Calendário: 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 Calendário: Não possui resumo."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "evento de vista de calendário"
 
-#: ../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 "Novo Compromisso"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Novo Evento de Dia Completo"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Ir para Hoje"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Ir para uma Data"
 
-#: ../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 "uma tabela onde visualizar e seleccionar o intervalo de datas 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."
@@ -122,14 +122,14 @@ msgstr[1] "Possui %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 "Não possui qualquer evento."
 
 #. 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 "Vista de Semana de Trabalho: %s. %s"
@@ -137,21 +137,21 @@ msgstr "Vista de Semana de Trabalho: %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 "Vista de Dia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "vista de calendário para uma semana de trabalho"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "vista de calendário para um ou mais dias"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -161,30 +161,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:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../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: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:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -193,59 +193,59 @@ 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:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../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:349
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendário Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barra de procura"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "barra de procura do calendário evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Botão de ir para"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, pode encontrar mais eventos."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista de Mês: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista de Semana: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "vista de calendário para um mês"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendário para uma ou mais semanas"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "popup"
 
 #. 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 "abrir um filho em popup"
 
@@ -257,12 +257,12 @@ msgstr "editar"
 msgid "begin editing this cell"
 msgstr "iniciar a edição desta célula"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "alternar"
 
 #. 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 "alternar a célula"
 
@@ -282,55 +282,55 @@ msgstr "recolher"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "recolhe a linha na ETree que contém esta célula"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Célula de Tabela"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c: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 "clique para adicionar"
 
-#: ../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 "clique"
 
-#: ../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 "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 %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 "Calendário: de %s a %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "item de calendário evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Botão de Caixa de Selecção"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Activar Valor Por Omissão"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Menu de Popup"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Alternar a Barra de Anexos"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "activar"
 
@@ -382,7 +382,7 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Incapaz de obter informação de esquema do servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Incapaz de remover o livro de endereços."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -400,7 +400,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Apagar o livro de endereços '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Erro ao ler o livro de endereços."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -413,7 +413,7 @@ msgstr "Falha ao autenticar-se no servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Falha ao apagar o contacto"
 
@@ -436,7 +436,7 @@ msgstr ""
 "actual do servidor"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "O livro de endereços do Evolution terminou inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -457,33 +457,33 @@ msgstr ""
 "do servidor por suporte para bases de procura."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Este livro de endereços será definitivamente removido."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Incapaz de abrir este livro de endereços."
 
-#: ../addressbook/addressbook.error.xml.h:26
-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 ""
 "Este servidor de livros de endereços não possui nenhuma base de procura "
 "sugerida."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "Este servidor de livro de endereços pode estar indisponível, o nome do "
 "servidor mal escrito ou a sua ligação à rede em baixo."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Este livro de endereços será definitivamente removido."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor não suporta esquema de informação LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Incapaz de abrir o livro de endereços"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -500,7 +500,7 @@ msgstr "Deseja gravar as suas alterações?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "Está a tentar mover um contacto de um livro de endereços para outro mas este "
@@ -533,7 +533,7 @@ msgstr ""
 "Os seus contactos para {0} não estarão disponíveis até que o Evolution seja "
 "reiniciado."
 
-#: ../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
@@ -556,7 +556,7 @@ msgstr "_Redimensionar"
 msgid "_Use as it is"
 msgstr "_Utilizar tal como está"
 
-#. 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."
+#. 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}"
@@ -573,7 +573,7 @@ msgstr "Endereço de Sincronização Por Omissão:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Incapaz de ler o livro de endereços"
 
 #: ../addressbook/conduit/address-conduit.c:1398
@@ -599,10 +599,10 @@ msgstr "Configurar aqui o completar automaticamente"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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-folder.c:582
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -627,8 +627,8 @@ msgid "Evolution Address Book component"
 msgstr "Componente de Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Controlo de Gestão de Certificados S/Mime do Evolution"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Controlo de Gestão de Certificados S/MIME do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -642,10 +642,10 @@ msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../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:196 ../mail/em-folder-tree-model.c:200
+#: ../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
@@ -661,10 +661,10 @@ msgstr "Neste Computador"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../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:205
+#: ../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 "Pessoal"
@@ -676,23 +676,38 @@ msgid "On LDAP Servers"
 msgstr "Em Servidores LDAP"
 
 #: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Criar um novo contacto"
 
 #: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Lista de Contactos"
+
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Novo Livro de Endereços"
 
 #: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Livro de _Endereços"
+
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Criar um novo livro de endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falha ao actualizar as pastas ou definições do Livro de Endereços."
 
@@ -701,7 +716,7 @@ msgid "Base"
 msgstr "Base"
 
 #: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tipo:"
 
@@ -710,48 +725,48 @@ msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o conteúdo do _livro localmente para trabalhar em modo desligado"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Informação de Servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:965
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "A procurar"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "A Efectuar Download"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propriedades do Livro de Endereços"
@@ -762,10 +777,10 @@ msgid "Migrating..."
 msgstr "A migrar..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "A migrar `%s':"
+msgid "Migrating '%s':"
+msgstr "A migrar '%s':"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -818,36 +833,36 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra os seus dados Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Renomear a Pasta"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Nomes de pastas não podem conter '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Novo Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Gravar como um vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
+#: ../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:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../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
 #: ../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
@@ -855,39 +870,39 @@ msgstr "Gravar como um vCard..."
 msgid "_Delete"
 msgstr "Apa_gar"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Selector de Origem do Contacto"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar-se.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 a senha para %s (utilizador %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduza a senha"
 
@@ -1207,7 +1222,7 @@ msgid "_Login method:"
 msgstr "_Método de autenticação:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../calendar/gui/dialogs/calendar-setup.c:227
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
@@ -1246,7 +1261,8 @@ msgstr "cartões"
 #: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutos"
 
@@ -1287,7 +1303,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Emprego</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1299,16 +1315,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1348,8 +1364,8 @@ msgstr "Telefone"
 
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1374,8 +1390,8 @@ msgid "_Birthday:"
 msgstr "_Data de Nascimento:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendário:"
@@ -1473,15 +1489,15 @@ msgstr "Endereço"
 #: ../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:293
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../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:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
+#: ../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
 msgid "Editable"
@@ -2457,9 +2473,9 @@ msgstr "Zimbabué"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
 #: ../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/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
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
@@ -2472,7 +2488,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:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2486,7 +2502,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:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2507,78 +2523,78 @@ msgstr "Localização"
 msgid "Username"
 msgstr "Utilizador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Casa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Outro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Livro de Origem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Livro de Destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "É um Novo Contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Campos Requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Seleccione uma imagem para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Nenhuma imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2586,23 +2602,23 @@ msgstr ""
 "Os dados do contacto são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' possui um formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' possui um formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2760,7 +2776,7 @@ msgstr "Serviço de _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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Localização:"
@@ -2770,7 +2786,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 de Lista de Contactos"
 
@@ -2791,25 +2807,25 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "In_troduza um endereço de email ou arraste um contacto para a lista 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 Contacto"
 
-#: ../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 "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Livro"
 
-#: ../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 "É uma Nova Lista"
 
@@ -2851,15 +2867,15 @@ msgstr ""
 "pasta.  Ainda assim deseja adicioná-lo?"
 
 #: ../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 "_Agregar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "Agregar 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
@@ -2870,14 +2886,14 @@ msgid "Email"
 msgstr "Email"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "Email começa por"
 
@@ -2897,10 +2913,10 @@ 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:227
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Consulta"
 
@@ -2908,28 +2924,28 @@ msgstr "Consulta"
 msgid "Error getting book view"
 msgstr "Erro ao obter a vista de livro"
 
-#: ../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
+#: ../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
 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 alterar o cartão"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "Nome começa por"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Origem"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2937,72 +2953,72 @@ msgstr "Origem"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Gravar como um vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../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:1680 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Novo Contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nova _Lista de Contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Gravar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Reenviar Contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Reenviar Contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Enviar _Mensagem para o Contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Enviar _Mensagem para a Lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Enviar _Mensagem para os Contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "C_opiar para o Livro de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver para o Livro de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../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:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../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
 #: ../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
@@ -3010,23 +3026,17 @@ msgstr "Cor_tar"
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "Col_ar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
-#: ../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"
@@ -3161,7 +3171,7 @@ msgstr "Rádio"
 #: ../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 "Cargo"
 
@@ -3198,13 +3208,13 @@ msgstr "Página 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
+#: ../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-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-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
@@ -3214,12 +3224,12 @@ 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
+#: ../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-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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
@@ -3248,11 +3258,11 @@ msgstr "Modelo de Texto"
 msgid "Max field name length"
 msgstr "Comprimento máx. do nome 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 Coluna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3262,7 +3272,7 @@ msgstr ""
 "\n"
 "A procurar pelos Contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3286,7 @@ msgstr ""
 "\n"
 "ou faça clique-duplo aqui para criar um novo Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3290,7 +3300,7 @@ msgstr ""
 "\n"
 "Faça clique-duplo aqui para criar um novo Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3300,7 +3310,7 @@ msgstr ""
 "\n"
 "Procure o Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3310,7 +3320,7 @@ msgstr ""
 "\n"
 "Não existem itens a apresentar nesta vista."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adaptador"
 
@@ -3335,7 +3345,7 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tem Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Abrir o Link no _Navegador"
 
@@ -3344,7 +3354,7 @@ msgstr "Abrir o Link no _Navegador"
 msgid "_Copy Link Location"
 msgstr "_Copiar a Localização do Link"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Enviar uma Nova Mensagem Para..."
 
@@ -3388,23 +3398,22 @@ msgstr "Diálogo Vídeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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-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 "Calendário"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Livre/Ocupado"
 
@@ -3426,13 +3435,13 @@ msgid "Web Log"
 msgstr "Diário na Web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Data de Nascimento"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversário"
@@ -3541,40 +3550,50 @@ msgstr "Origem inexistente"
 msgid "Not available in offline mode"
 msgstr "Indisponível em modo desligado"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Outro erro"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Versão do servidor inválida"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Método de autenticação não suportado"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 ""
 "Incapaz de abrir este livro de endereços. Isto significa que ou este livro "
 "não está marcado para utilização quando desligado ou ainda não foi efectuado "
 "o seu download. Leia o livro de endereços uma vez quando ligado para "
 "efectuar o download do seu conteúdo"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "Incapaz de abrir este livro de endereços.  Certifique-se de que o caminho %s "
 "existe e de que possui permissões para lhe aceder."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "Incapaz de abrir este livro de endereços.  Isto significa que ou introduziu "
 "um URI incorrecto ou o servir LDAP está inacessível."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3584,79 +3603,83 @@ msgstr ""
 "deseja utilizar LDAP no Evolution terá de instalar um pacote do Evolution "
 "com o LDAP activo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "Incapaz de abrir este livro de endereços.  Isto ou significa que introduziu "
 "um URI incorrecto, ou que o servidor está inacessível."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Detalhe do erro:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "A procura encontrou mais cartões do que os servidor está configurado \n"
 "para devolver ou o Evolution para apresentar. Efectue a sua procura de\n"
 "forma mais específica ou aumente o limite de resultados nas preferências\n"
 "do servidor de directório para este livro de endereços."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "O tempo necessário para efectuar esta procura excedeu o limite do servidor\n"
 "ou a configuração para este livro de endereços.  Efectue a sua procura de\n"
 "forma mais específica ou aumente o limite de tempo nas preferências do\n"
 "servidor de directório para este livro de endereços."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "O suporte para este livro de endereços foi incapaz de processar a consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "O suporte para este livro de endereços recusou-se a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Erro ao adicionar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Erro ao adicionar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Erro ao alterar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Erro ao alterar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Erro ao remover a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Erro ao remover o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3671,16 +3694,16 @@ msgstr[1] ""
 "Abrir %d contactos irá abrir %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Não Apresentar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "Apresentar _Todos os Contactos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3689,70 +3712,70 @@ msgstr ""
 "%s já existe\n"
 "Deseja sobrepo-lo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Sobrepor"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 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:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Seleccionar o Livro de Endereços"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Mover contacto para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Copiar contacto para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Mover contactos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Copiar contactos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "Múltiplos vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard de %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Informação de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informação de contacto para %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "A Consultar o Livro de Endereços..."
 
@@ -3773,14 +3796,14 @@ msgid "Show Compact vCard"
 msgstr "Apresentar vCard Compacto"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Gravar no livro de endereços"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Vista de Cartão"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../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
@@ -3788,27 +3811,27 @@ msgstr "Vista de Cartão"
 msgid "Importing..."
 msgstr "A Importar..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Evolution"
 
@@ -3869,12 +3892,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:432 ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Cabeçalho"
 
@@ -3977,7 +4000,7 @@ 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-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Tamanho:"
@@ -3995,7 +4018,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:"
 
@@ -4007,36 +4030,36 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: ../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 "Teste do Editor de Estilos de Impressão 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 "Copyright © 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 deverá testar o widget de editor de estilos de impressão de contactos"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Teste de Impressão de Contacto"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Isto deverá testar o código de impressão de um contacto"
 
-#: ../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 "Incapaz de abrir o ficheiro"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Incapaz de obter a lista de livros de endereços"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4052,7 +4075,7 @@ msgid "OUTPUTFILE"
 msgstr "FICHEIROSA�DA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Listar as pastas locais de livros de endereços"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4212,19 +4235,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Tem a certeza de que deseja apagar este compromisso?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Tem a certeza de que deseja apagar esta reunião?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Tem a certeza de que deseja apagar este memo?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Tem a certeza de que deseja apagar esta tarefa?"
@@ -4482,7 +4505,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "_Descartar as Alterações"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Gravar"
 
@@ -4547,12 +4570,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Incapaz de escrever o bloco da aplicação de A Fazer da pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendário e Tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendários"
 
@@ -4594,24 +4618,24 @@ msgstr "Memo_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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../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
 msgid "Memos"
 msgstr "Memos"
 
 #: ../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:1574 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/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
+#: ../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"
@@ -4629,19 +4653,20 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de alarme de notificação do Calendário Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../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:117
+#: ../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:716
+#: ../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"
@@ -4658,8 +4683,8 @@ msgstr "Compromissos"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4670,7 +4695,7 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4690,32 +4715,32 @@ msgstr "_Adiar"
 msgid "location of appointment"
 msgstr "localização do compromisso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Nenhum resumo disponível."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "Nenhuma descrição disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Nenhuma informação de local disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Possui %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
-#: ../mail/mail-component.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4727,7 +4752,7 @@ msgstr ""
 "configurado para enviar um email.  O Evolution\n"
 "irá apresentar um diálogo de lembrete normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4744,7 +4769,7 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicação?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Não perguntar novamente sobre esta aplicação."
 
@@ -4760,13 +4785,13 @@ msgstr ""
 "Incapaz de criar a fábrica de serviço de notificação de alarme, talvez já se "
 "encontre em execução..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 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: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:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4774,8 +4799,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:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4785,8 +4810,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:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5097,7 +5122,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Quando foi executado o último alarme, em time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Zona Horária"
 
@@ -5246,56 +5271,56 @@ msgstr "Minuto a que se inicia o expediente"
 msgid "daylight savings time"
 msgstr "horário de verão"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Categoria é"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Localização contém"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Sem equivalência"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos Próximos 7 Dias"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Tarefas Activas"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Tarefas Atrasadas"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Tarefas Terminadas"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tarefas com Anexos"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Compromissos Activos"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos Próximos 7 Dias"
 
@@ -5323,7 +5348,8 @@ msgstr "Expurgar eventos mais antigos do que"
 #: ../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:717
+#: ../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 "dias"
@@ -5332,47 +5358,47 @@ msgstr "dias"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../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:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de Nascimento & Aniversários"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "O Tempo"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Novo Calendário"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Falha ao actualizar os calendários."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Incapaz de abrir o calendário '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não existe nenhum calendário disponível para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Selector de Origem do Calendário"
 
@@ -5380,6 +5406,11 @@ msgstr "Selector de Origem do Calendário"
 msgid "New appointment"
 msgstr "Novo compromisso"
 
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Compromisso"
+
 #: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
@@ -5388,6 +5419,11 @@ msgstr "Criar um novo compromisso"
 msgid "New meeting"
 msgstr "Nova reunião"
 
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
+msgid "M_eeting"
+msgstr "R_eunião"
+
 #: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Criar uma nova convocatória de reunião"
@@ -5396,6 +5432,11 @@ msgstr "Criar uma nova convocatória de reunião"
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia completo"
 
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Com_promisso de Dia Completo"
+
 #: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia completo"
@@ -5404,23 +5445,28 @@ msgstr "Criar um novo compromisso de dia completo"
 msgid "New calendar"
 msgstr "Novo calendário"
 
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndário"
+
 #: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Criar um novo calendário"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Vista de Dia"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Vista de Semana de Trabalho"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Vista de Semana"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Vista de Mês"
 
@@ -5460,15 +5506,15 @@ msgstr "Classificação"
 msgid "Competition"
 msgstr "Competição"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../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:337 ../calendar/gui/e-calendar-table.c:547
 #: ../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 "Descrição"
@@ -5553,20 +5599,20 @@ msgstr "Organizador"
 msgid "Phone Calls"
 msgstr "Chamadas Telefónicas"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../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:335 ../calendar/gui/e-calendar-table.c:546
 #: ../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:318 ../calendar/gui/e-cal-model.c:325
+#: ../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
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "Recorrência"
 
@@ -5650,11 +5696,11 @@ msgstr "Método não suportado ao abrir o calendário"
 msgid "Permission denied to open the calendar"
 msgstr "Autorização negada ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Editar Alarme"
 
@@ -5757,10 +5803,7 @@ msgstr "tempos extra a cada"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#. Translators: This is the second half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -5768,7 +5811,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Acção/Despoletar"
 
@@ -5782,12 +5825,12 @@ msgstr "A_dicionar"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir a apresentação automática do anexo"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
@@ -5950,7 +5993,7 @@ msgid "Thursday"
 msgstr "Quinta-Feira"
 
 #: ../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 "Fuso-_horário:"
 
@@ -6045,397 +6088,397 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes de todos os compromissos"
 
-#: ../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 o conteúdo do calendário localmente para trabalhar em modo desligado"
 
-#: ../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 o conteúdo da lista de tarefas localmente para trabalhar em modo "
 "desligado"
 
-#: ../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 ""
 "Cop_iar o conteúdo da lista de memos localmente para trabalhar em modo "
 "desligado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Co_res:"
 
-#: ../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 Memos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Propriedades do Calendário"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Novo Calendário"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Propriedades da 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 "Propriedades da Lista de Memos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nova Lista de Memos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Este evento foi apagado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi apagada."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Este memo foi apagado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Efectuou alterações. Esquecer estas alterações e fechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, fechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Este evento foi alterado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Este memo foi alterado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Efectuou alterações. Esquecer essas alterações e actualizar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validação: %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:2356
 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:2360
 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:2362
 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:2367
 msgid " (Due "
 msgstr " (Limite "
 
-#: ../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:2369
 msgid "Due "
 msgstr "Limite "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensagem anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
 #: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancelar A_rrastar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../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:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Incapaz de actualizar o objecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunião - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa Atribuída - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "Sem Resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "Clique aqui para fechar a janela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar o texto seleccionado para a área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar o texto seleccionado para a área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "Clique aqui para consultar a ajuda disponível"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "Colar o texto da área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "Clique aqui para gravar a janela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "_Classificação"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1346
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "_Opções"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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:1376
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "Clique aqui para anexar um ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "_Categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "Alterna se apresentar ou não as categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "Fuso-_Horário"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna se o fuso horário é ou não apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "Classificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "Classificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "Classificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "Campo de _Papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna se o campo de Papel é ou não apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_Responder SFF"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna se o campo Responder SFF é ou não apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "Campo de E_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna se o campo de Estado é ou não apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "Campo _Tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna se o Tipo de Participante é ou não apresentado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
-#: ../widgets/misc/e-attachment-bar.c:1381
-msgid "Recent Docu_ments"
-msgstr "Docu_mentos Recentes"
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../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:1784
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Esconder a _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Apresentar a _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Adicionar um anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2194
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Apresentar os Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Prima a tecla de espaços para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Alterações efectuadas a este item poderão ser descartadas se chegarem "
 "actualizações"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Incapaz de utilizar a versão actual!"
 
@@ -6451,56 +6494,56 @@ msgstr "Incapaz de abrir o destino"
 msgid "Destination is read only"
 msgstr "O destino é apenas de leitura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Apagar este item da caixa de correio de todos os outros destinatários?"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento não pode ser apagado devido a um erro corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa não pode ser apagada devido a um erro corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "O memo não pode ser apagado devido a um erro corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "O item não pode ser apagado devido a um erro corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento não pode ser apagado pois a autorização foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa não pode ser apagada pois a autorização foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "O memo não pode ser apagado pois a autorização foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item não pode ser apagado pois a autorização foi negada"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "O evento não pode ser apagado devido a um erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa não pode ser apagada devido a um erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "O memo não pode ser apagado devido a um erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "O item não pode ser apagado devido a um erro"
 
@@ -6509,7 +6552,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 A:"
 
@@ -6517,181 +6560,181 @@ msgstr "Delegar A:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "Clique aqui para definir ou remover alarmes para este evento"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "_Recorrência"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "Tornar este evento como recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Opções de Envio"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Inserir opções avançadas de envio"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "Evento de _Dia Completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna se ter ou não apresentado Eventos de Dia Completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "Apresentar Horas como _Ocupadas"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "Alterna se apresentar ou não o tempo como ocupado"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "_Livre/Ocupado"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a informação de livre/ocupado dos participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Compro_misso"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Este evento possui alertas"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Evento sem data de finalização"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Data de início incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Hora de início incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Hora de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado já não possui uma conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Adicionar "
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Incapaz de abrir o calendário '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está a agir em nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia antes do compromisso"
 msgstr[1] "%d dias antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes do compromisso"
 msgstr[1] "%d horas antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes do compromisso"
 msgstr[1] "%d minutos antes do compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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-signature-combo-box.c:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Nenhum(a)"
 
@@ -6716,23 +6759,25 @@ msgid "Custom Alarm:"
 msgstr "Alarme Personalizado:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escrição:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Descrição do Evento"
 
-#: ../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 "Resu_mo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarme"
 
+#: ../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 "_Descrição:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Tempo:"
@@ -6777,9 +6822,9 @@ msgstr "Memo"
 msgid "Unable to open memos in '%s'."
 msgstr "Incapaz de abrir os memos em '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
-#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "Para"
@@ -6793,10 +6838,6 @@ msgstr "_Data de início:"
 msgid "T_o:"
 msgstr "P_ara:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descrição:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -7009,12 +7050,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 "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Página Web"
 
@@ -7066,7 +7107,7 @@ 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:966 ../calendar/gui/e-calendar-table.c:568
+#: ../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
 msgid "Normal"
 msgstr "Normal"
@@ -7107,24 +7148,24 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Página _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Detalhes de _Estado"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Clique para alterar ou visualizar os detalhes de estado da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "_Opções de Envio"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Detalhes da Tarefa"
 
@@ -7151,17 +7192,13 @@ msgid "Categor_ies..."
 msgstr "Categor_ias..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scrição:"
+msgid "D_ue date:"
+msgstr "Data li_mite:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fuso-horário:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Data limite:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7300,12 +7337,12 @@ msgstr "Data de Finalização"
 msgid "Start Date"
 msgstr "Data de Início"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-cal-model-calendar.c:187
 #: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Livre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
@@ -7321,7 +7358,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7329,7 +7366,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
 #: ../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
@@ -7337,7 +7374,7 @@ msgid "No"
 msgstr "Não"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../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-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
 #: ../calendar/gui/e-meeting-list-view.c:167
@@ -7345,43 +7382,43 @@ msgstr "Não"
 #: ../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:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../plugins/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../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 "Desconhecida"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Atribuída"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Gravar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccionar a pasta onde gravar os anexos especificados..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagem_sem_titulo.%s"
 
 #: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Gravar _Como..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Definir como _Fundo"
 
@@ -7389,7 +7426,7 @@ msgstr "Definir como _Fundo"
 msgid "_Save Selected"
 msgstr "_Gravar as Seleccionadas"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -7400,7 +7437,7 @@ msgstr "* Sem Resumo *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -7408,7 +7445,7 @@ 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:2228
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
@@ -7466,23 +7503,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "A apagar os objectos seleccionados"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "A actualizar os objectos"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Gravar como..."
 
 #: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
@@ -7491,20 +7528,20 @@ msgid "Open _Web Page"
 msgstr "Abrir Página _Web"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
 #: ../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"
@@ -7571,108 +7608,108 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de início"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "A mover itens"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "A copiar itens"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Completo"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nova _Reunião"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "Vista A_ctual"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Seleccionar H_oje"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Seleccionar a Data..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "I_mprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o Calendário..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o Calendário..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../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:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta Ocorrência _Móvel"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas as Ocorrências"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Localização: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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"
@@ -7685,7 +7722,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 divisões de minuto"
@@ -7696,19 +7733,19 @@ msgstr "%02i divisões de minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../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
 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:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
 #: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
 #: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
@@ -7805,12 +7842,12 @@ msgstr "Erro 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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
@@ -7827,12 +7864,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Aceite"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
@@ -7840,7 +7877,7 @@ msgstr "Aceite Tentativamente"
 #: ../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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Recusada"
 
@@ -8063,7 +8100,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado de participante não pode ser actualizado pois o item já não existe"
@@ -8085,7 +8122,7 @@ msgid "Update"
 msgstr "Actualizar"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Aceitar"
 
@@ -8094,7 +8131,7 @@ msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Recusar"
 
@@ -8222,7 +8259,7 @@ msgstr "Tentativa"
 #: ../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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegada"
 
@@ -8243,7 +8280,7 @@ msgstr "Em Curso"
 
 #. 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-item.c:467
 #: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
@@ -8252,14 +8289,14 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
 #: ../calendar/gui/e-meeting-time-sel.c:2153
 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"
 
@@ -8360,7 +8397,7 @@ msgid "Click to add a memo"
 msgstr "Clicar para adicionar um memo"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8399,54 +8436,50 @@ msgstr "A terminar as tarefas..."
 msgid "Expunging"
 msgstr "A expurgar"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Seleccione o Fuso Horário"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "A actualizar a consulta"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Vista _Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Gravar a Vista Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Definir as Vistas..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "A ler os compromisso em %s"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "A ler as tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "A ler os memos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "A expurgar"
 
@@ -8560,38 +8593,38 @@ msgstr "Informação de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Nova Lista de Memos"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionada"
 msgstr[1] ", %d seleccionadas"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Falha ao actualizar os memos."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Incapaz de abrir a lista de memos '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Não existe nenhum calendário disponível para criar memos"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Selector de Origem da Memos"
 
@@ -8599,6 +8632,11 @@ msgstr "Selector de Origem da Memos"
 msgid "New memo"
 msgstr "Novo memo"
 
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Mem_o"
+
 #: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Criar um novo memo"
@@ -8607,6 +8645,11 @@ msgstr "Criar um novo memo"
 msgid "New shared memo"
 msgstr "Novo memo partilhado"
 
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "Memo partil_hado"
+
 #: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Criar um novo memo partilhado"
@@ -8615,11 +8658,16 @@ msgstr "Criar um novo memo partilhado"
 msgid "New memo list"
 msgstr "Nova lista de memos"
 
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
+msgid "Memo li_st"
+msgstr "Li_sta de memos"
+
 #: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Criar uma nova lista de memos"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Imprimir Memos"
 
@@ -8670,9 +8718,9 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Incapaz de 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"
 
@@ -8875,36 +8923,31 @@ msgstr "Categorias: %s"
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Próximos Compromisso"
-
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nova Lista de Tarefas"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Falha ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Incapaz de abrir a lista de tarefas '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe nenhum calendário disponível para criar tarefas"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Selector de Origem da Tarefa"
 
@@ -8912,6 +8955,11 @@ msgstr "Selector de Origem da Tarefa"
 msgid "New task"
 msgstr "Nova tarefa"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarefa"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
@@ -8920,6 +8968,11 @@ msgstr "Criar uma nova tarefa"
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tarefa Atribuí_da"
+
 #: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Criar uma nova tarefa atribuída"
@@ -8928,6 +8981,11 @@ msgstr "Criar uma nova tarefa atribuída"
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
+msgid "Tas_k list"
+msgstr "L_ista de tarefas"
+
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
@@ -8979,7 +9037,7 @@ msgstr "Compromissos e Reuniões"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "A abrir o calendário"
 
@@ -9012,1532 +9070,1551 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente de Calendário 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 "�frica/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�frica/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�frica/Adis_Abeba"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�frica/Algéria"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�frica/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�frica/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�frica/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�frica/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�frica/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "�frica/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�frica/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�frica/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�frica/Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�frica/Casabranca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�frica/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�frica/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�frica/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "�frica/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�frica/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "�frica/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "�frica/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�frica/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�frica/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�frica/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�frica/Joanesburgo"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�frica/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�frica/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�frica/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�frica/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�frica/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�frica/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�frica/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�frica/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "�frica/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�frica/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�frica/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�frica/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�frica/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�frica/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "�frica/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�frica/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�frica/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�frica/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�frica/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�frica/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�frica/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�frica/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "�frica/São_Tomé"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�frica/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�frica/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�frica/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�frica/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "América/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "América/Assunção"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "América/Belém"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "América/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "América/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "América/Baia_Cambridge"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "América/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "América/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "América/Caimão"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "América/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "América/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "América/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "América/Coração"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "América/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "América/Riacho_Dawson"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "América/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "América/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "América/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "América/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "América/Baia_Glace"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "América/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "América/Baia_Goose"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "América/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "América/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "América/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "América/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "América/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "América/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "América/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "América/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "América/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "América/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "América/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "América/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "América/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "América/Martinica"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "América/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "América/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "América/Mérida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "América/Cidade_do_México"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "América/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "América/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "América/Nova_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "América/Dakota_Norte/Centro"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "América/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "América/Porto_de_Espanha"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "América/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "América/Porto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "América/Rio_Rainy"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "América/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "América/Rosário"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "América/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "América/São_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "América/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "América/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "América/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "América/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "América/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "América/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "América/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "América/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "América/Baia_Thunder"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "América/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "América/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antártida/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antártida/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártida/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antártida/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antártida/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antártida/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antártida/Polo_Sul"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antártida/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antártida/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Antártida/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "�sia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "�sia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "�sia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "�sia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "�sia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "�sia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "�sia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "�sia/Bagdade"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "�sia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "�sia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "�sia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "�sia/Beirute"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "�sia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "�sia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "�sia/Calcutá"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "�sia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "�sia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "�sia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "�sia/Damasco"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "�sia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "�sia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "�sia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "�sia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "�sia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "�sia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "�sia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "�sia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "�sia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "�sia/Istambul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "�sia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "�sia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "�sia/Jerusalém"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "�sia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "�sia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "�sia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "�sia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "�sia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "�sia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "�sia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "�sia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "�sia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "�sia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "�sia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "�sia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "�sia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "�sia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "�sia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "�sia/Nicósia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "�sia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "�sia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "�sia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "�sia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "�sia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "�sia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "�sia/Quatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "�sia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "�sia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "�sia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "�sia/Saigão"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "�sia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "�sia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "�sia/Seul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "�sia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "�sia/Singapura"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "�sia/Taipé"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "�sia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "�sia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "�sia/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "�sia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "�sia/Tóquio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "�sia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "�sia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "�sia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "�sia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "�sia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "�sia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "�sia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "�sia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlântico/Açores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlântico/Bermudas"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlântico/Canárias"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlântico/Cabo_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlântico/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlântico/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlântico/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlântico/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlântico/Geórgia_Sul"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlântico/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlântico/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/Sidnei"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdão"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlim"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelas"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucareste"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budapeste"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhaga"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsínquia"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istambul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrado"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubliana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Mónaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moscovo"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicósia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/São_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sófia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vílnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsóvia"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zurique"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "�ndico/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "�ndico/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "�ndico/Natal"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "�ndico/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "�ndico/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "�ndico/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "�ndico/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "�ndico/Maldivas"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "�ndico/Mauricias"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "�ndico/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "�ndico/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacífico/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacífico/Páscoa"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacífico/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacífico/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacífico/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galápagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacífico/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacífico/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacífico/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
@@ -10557,185 +10634,185 @@ msgstr "Inserir Anexo"
 msgid "A_ttach"
 msgstr "Ane_xar"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "Mensagem sem Título"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Anexar um 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 "_Fechar"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Fechar 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 "Im_primir..."
 
-#: ../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 "Ante_ver a Impressão"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Gravar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Gravar _Como..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Gravar o ficheiro actual com outro nome"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Gravar o _Rascunho"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Gravar como rascunho"
 
-#: ../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 mensagem"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Inserir opções de Envio"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
 msgstr "Nova _Mensagem"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
 msgstr "Abrir a janela de Nova Mensagem"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "Codificação de Caract_eres"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Segurança"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "_Encriptação PGP"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar esta mensagem com PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "A_ssinatura PGP"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Prioritizar a Mensagem"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensagem como elevada"
 
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "P_edir Recibo de Leitura"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Obter notificação de entrega quando a mensagem for lida"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "En_cripação 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 "Encriptar esta mensagem com o seu Certificado de Encriptação S/MIME"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "Assi_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 "Assinar esta mensagem com o seu Certificado de Assinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna se o campo BCC é ou não apresentado"
 
-#: ../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 se o campo CC é ou não apresentado"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna se o selector De é ou não apresentado"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "Campo _Afixar-Em"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Alterna se o campo Afixar-Em é ou não apresentado"
 
-#: ../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 se o campo Responder-A é ou não apresentado"
 
-#: ../composer/e-composer-actions.c:649
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "Campo _Assunto"
 
-#: ../composer/e-composer-actions.c:651
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Alterna se o campo de Assunto é ou não apresentado"
 
-#: ../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 se o campo Para é ou não apresentado"
 
@@ -10787,38 +10864,34 @@ msgstr "Ass_unto:"
 msgid "Si_gnature:"
 msgstr "A_ssinatura:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Clique aqui para o livro de endereços"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Destino da afixagem"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Seleccione as pastas onde anexar a mensagem."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para seleccionar as pastas onde afixar"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "_Documentos Recentes"
-
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Apresentar a Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Incapaz de assinar a mensagem a enviar: Nenhum certificado de assinatura "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10826,23 +10899,23 @@ msgstr ""
 "Incapaz de encriptar a mensagem a enviar: Nenhum certificado de encriptação "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
-#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Esconder a Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Escrever uma Mensagem"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11000,7 +11073,7 @@ msgstr "_Prosseguir a Edição"
 msgid "_Do not Recover"
 msgstr "_Não Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Recuperar"
 
@@ -11050,17 +11123,17 @@ msgstr "Questão Evolution"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno, pedido o erro desconhecido '%s'"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:156
 msgid "Component"
 msgstr "Componente"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
 msgstr "Nome do componente que irá escrever no registo"
 
 #: ../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/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Activo"
@@ -11069,15 +11142,15 @@ msgstr "Activo"
 msgid "Whether the plugin is enabled"
 msgstr "Se o plugin está ou não activo"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Ocorreu um erro ao imprimir"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impressão reportou os seguintes detalhes sobre o erro:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -11112,6 +11185,10 @@ msgstr "Sobrepor o ficheiro?"
 msgid "_Overwrite"
 msgstr "_Sobrepor"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Incapaz de apresentar a ajuda do Evolution."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportante"
@@ -11456,7 +11533,8 @@ msgstr "a data especificada"
 
 #: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "semanas"
 
@@ -11531,8 +11609,8 @@ msgstr "Controlo de configuração de Rede 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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Email"
@@ -11573,13 +11651,13 @@ msgstr ""
 "para %s apresentado abaixo\n"
 "e marque a caixa de selecção para a aceitar\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Seleccionar Pasta"
 
 #: ../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:97
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Gerada automaticamente"
 
@@ -11664,18 +11742,18 @@ msgstr "Adicionar script de assinatura"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem Reencaminhada ------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11683,7 +11761,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} às ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escreveu:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "----- Mensagem Original-----"
 
@@ -11935,9 +12013,9 @@ msgstr "começa por"
 msgid "Stop Processing"
 msgstr "Parar o Processamento"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:318
+#: ../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
 msgid "Subject"
@@ -11948,64 +12026,64 @@ msgid "Unset Status"
 msgstr "Retirar o Estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Depois"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Adicio_nar Acção"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "C_riar uma Pasta Baseada na Procura..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Todas as Mensagens"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Mensagens por Ler"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Nenhuma Etiqueta"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Mensagens Lidas"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Mensagens Recentes"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Mensagens dos  Últimos 5 Dias"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Mensagens com Anexos"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Mensagens Importantes"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Mensagens que não são \"Não Solicitadas\""
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Procurar Conta"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Procura em 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] "Mensagens por ler:"
@@ -12013,26 +12091,32 @@ msgstr[1] "Mensagens por ler:"
 
 #. 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] "Total de mensagens:"
 msgstr[1] "Total de mensagens:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Utilização de quota (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
 msgstr "Utilização de quota"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../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:583
+#: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propriedades da Pasta"
@@ -12076,6 +12160,27 @@ msgstr "Enviadas"
 msgid "Loading..."
 msgstr "A Ler..."
 
+#. 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:380
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (%u)"
+
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "�rvore de Pastas de Mensagens"
@@ -12113,7 +12218,7 @@ msgstr "_Copiar para a Pasta"
 msgid "_Move to Folder"
 msgstr "_Mover para a Pasta"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar as pastas em \"%s\""
@@ -12147,36 +12252,36 @@ msgstr "Esva_ziar a Caixa de Saída"
 msgid "_Empty Trash"
 msgstr "_Esvaziar o Lixo"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "A copiar `%s' para `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../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
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: ../mail/em-folder-utils.c:366 ../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:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "A criar a pasta `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
@@ -12192,7 +12297,7 @@ msgstr "Não possui permissões suficientes para apagar este correio."
 msgid "_Reply to Sender"
 msgstr "_Responder ao Remetente"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../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 "R_eencaminhar"
@@ -12306,9 +12411,9 @@ msgstr "Filtrar pela _Lista de Distribuição"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "Por Omissão"
 
@@ -12373,7 +12478,7 @@ msgstr "_Seguinte"
 msgid "M_atch case"
 msgstr "Coincidir a Capitali_zação"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Não assinada"
 
@@ -12385,7 +12490,7 @@ msgstr ""
 "Esta mensagem não está assinada. Não existe nenhuma garantia de que seja "
 "autêntica."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
@@ -12397,7 +12502,7 @@ msgstr ""
 "Esta mensagem está assinada e é válida o que significa que muito "
 "provavelmente é autêntica."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
@@ -12409,7 +12514,7 @@ msgstr ""
 "A assinatura nesta mensagem não pode ser verificada, o que significa que "
 "pode ter sido alterada durante o percurso."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Assinatura válida, mas incapaz de verificar o remetente"
 
@@ -12421,7 +12526,7 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida mas não é possível "
 "verificar o remetente da mesma."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Assinatura existe, mas é necessária a chave pública"
 
@@ -12433,7 +12538,7 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura, mas não existe uma chave "
 "pública correspondente."
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Sem encriptação"
 
@@ -12445,7 +12550,7 @@ msgstr ""
 "Esta mensagem não está encriptada. O seu conteúdo pode ser visualizado "
 "durante o seu percurso pela Internet."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Encriptada com cifra fraca"
 
@@ -12459,7 +12564,7 @@ msgstr ""
 "Seria difícil, mas não impossível, que um terceiro conseguisse visualizar o "
 "conteúdo da mensagem dentro de um período de tempo útil."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Encriptada"
 
@@ -12471,7 +12576,7 @@ msgstr ""
 "Esta mensagem está encriptada.  Seria difícil que um terceiro conseguisse "
 "visualizar o seu conteúdo."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Encriptada com cifra forte"
 
@@ -12493,79 +12598,79 @@ msgstr "_Visualizar o Certificado"
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é visualizável"
 
-#: ../mail/em-format-html-display.c:1370
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminada a %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1378
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Ver Embutido"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Caber à Largura"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Apresentar no Tamanho _Original"
 
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Gravar o anexo como"
 
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Seleccionar a pasta onde gravar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2037
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Gravar Seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2104
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d a_nexo"
 msgstr[1] "%d a_nexos"
 
-#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "Gr_avar"
 
-#: ../mail/em-format-html-display.c:2122
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Gr_avar Todos"
 
-#: ../mail/em-format-html-display.c:2196
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Nenhum Anexo"
 
-#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Ver Sem _Formatação"
 
-#: ../mail/em-format-html-display.c:2339
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Esconder Sem _Formatação"
 
-#: ../mail/em-format-html-display.c:2394
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "A_brir Com"
 
-#: ../mail/em-format-html-display.c:2465
+#: ../mail/em-format-html-display.c:2473
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12579,95 +12684,95 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "A obter `%s'"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Parte do corpo-externo desconhecida."
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo mal formada."
 
-#: ../mail/em-format-html.c:962
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para o servidor FTP (%s)"
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para o ficheiro local (%s) válido no servidor \"%s\""
 
-#: ../mail/em-format-html.c:975
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para o ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:996
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:1007
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1235
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "A formatar a mensagem"
 
-#: ../mail/em-format-html.c:1409
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "A Formatar a Mensagem..."
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
+#: ../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:1563 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Aplicação de Email"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1770
+#: ../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:1775
+#: ../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:1906
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensagem foi enviada por <b>%s</b> em nome de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:314
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Responder-A"
@@ -12795,11 +12900,6 @@ msgstr "A Fazer"
 msgid "Later"
 msgstr "Mais Tarde"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "A migrar '%s':"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12873,17 +12973,17 @@ msgstr ""
 "Incapaz de ler as definições da instalação anterior do Evolution, `evolution/"
 "config.xmldb' não existe ou está corrompido."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder para a _Lista"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Adicionar ao Livro de Endereços"
 
@@ -12936,11 +13036,11 @@ msgstr "Adicionar o endereço"
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "_Pastas de Procura"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Origem das Pastas de Procura"
 
@@ -13090,28 +13190,28 @@ msgstr "Largura por omissão do diálogo de subscrição."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 "Determina se procurar ou não apenas no livro de endereços local por "
 "endereços, ao filtrar por correio não solicitado"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se procurar ou não no livro de endereços o email do remetente"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Determina se procurar ou não o endereço do remetente no livro de endereços. "
 "Se encontrado, não deverá ser correio não solicitado. Procura nos livros "
 "marcados para completar automaticamente. Poderá ser demorado, se estiverem "
-"marcados livros de endereços remotos (como ldap) para completar "
+"marcados livros de endereços remotos (como LDAP) para completar "
 "automaticamente."
 
 #: ../mail/evolution-mail.schemas.in.h:36
@@ -13532,7 +13632,7 @@ msgid "Save directory"
 msgstr "Gravar o directório"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
+msgid "Search for the sender photo in local address books"
 msgstr "Procurar a foto do remetente no livro de endereços local"
 
 #: ../mail/evolution-mail.schemas.in.h:115
@@ -13680,7 +13780,7 @@ msgstr ""
 #: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "Esta opção é relacionada com a chave lookup_addressbook e é utilizada para "
@@ -13888,7 +13988,7 @@ msgstr "Pastas do importador do formato Caixa de Correio Berkeley"
 msgid "Importing mailbox"
 msgstr "A Importar caixa de correio"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "A Importar `%s'"
@@ -13910,27 +14010,27 @@ msgstr "Importador de Pine do Evolution"
 msgid "Import mail from Pine."
 msgstr "Importar correio do Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Mensagem para %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 "Mensagem de %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto é %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de distribuição %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra de Filtro"
 
@@ -13940,134 +14040,144 @@ msgstr "Adicionar Regra de Filtro"
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d apagada"
 msgstr[1] "%d apagadas"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d não solicitado"
 msgstr[1] "%d não solicitados"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d rascunho"
 msgstr[1] "%d rascunhos"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviada"
 msgstr[1] "%d enviadas"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d por enviar"
 msgstr[1] "%d por enviar"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d por ler, "
 msgstr[1] "%d por ler, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d no total"
 msgstr[1] "%d no total"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nova Mensagem de Email"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:924
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mensagem de Email"
+
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nova Pasta de Mensagens"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:932
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Pasta de Mensagens"
+
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao actualizar as definições ou pastas de Mensagens."
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Erro"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Erros"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Avisos e Erros"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Depuração"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensagens de Erro, Avisos e Depuração"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Registos de Depuração"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Apresentar _erros na barra de estados durante"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1745
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Mensagens de Registo:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Nível de Registo"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2435
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Fechar esta janela"
@@ -14322,7 +14432,7 @@ msgid "Do not format messages when text si_ze exceeds"
 msgstr "Não formatar mensagens se o taman_ho do texto exceder"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Não _marcar as mensagens como não solicitadas se o remetente constar do meu "
 "livro de endereços"
@@ -14535,7 +14645,7 @@ msgid "S_OCKS Host:"
 msgstr "Servidor S_OCKS:"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "Procurar p_ela fotografia do remetente apenas no livro de endereços local"
 
@@ -14646,7 +14756,8 @@ msgid "Use Authe_ntication"
 msgstr "Utilizar Aute_nticação"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../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 utilizador:"
@@ -14703,7 +14814,7 @@ msgid "_Load images in messages from contacts"
 msgstr "_Ler imagens em mensagens de contactos"
 
 #: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "_Procurar apenas no livro de endereços local"
 
 #: ../mail/mail-config.glade.h:172
@@ -14831,7 +14942,7 @@ msgstr "_Procurar:"
 msgid "Find in Message"
 msgstr "Procurar na Mensagem"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Marcar para Dar Seguimento"
 
@@ -14883,7 +14994,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque aqui para aceitar a licença de utilização"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "A pingar %s"
@@ -14930,104 +15041,104 @@ msgstr "A enviar a mensagem %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens."
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "A gravar a mensagem na pasta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "A mover as mensagens para %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "A copiar as mensagens para %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "A abrir a pasta %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "A obter a informação de quota da pasta %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "A abrir o armazenamento %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "A remover a pasta %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar a pasta '%s'"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "A expurgar e armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "A actualizar a pasta"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "A expurgar a pasta"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar o lixo em '%s'"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "A obter a mensagem %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "A obter %d mensagem"
 msgstr[1] "A obter %d mensagens"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "A gravar %d mensagem"
 msgstr[1] "A gravar %d mensagens"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15036,11 +15147,11 @@ msgstr ""
 "Erro ao gravar as mensagens em: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "A gravar o anexo"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15049,75 +15160,75 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A estabelecer nova ligação a %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "A preparar a conta '%s' para o modo desligado"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "A Verificar o Serviço"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "A Cancelar..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Enviar & Receber Mensagens"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "A Actualizar..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "A verificar a existência de novas mensagens"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a Senha para %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Introduza a Senha"
 
-#: ../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 a Senha para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Introduza a Senha"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Utilizador cancelou a operação."
 
@@ -15845,7 +15956,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 %l:%M %p"
@@ -15867,11 +15978,11 @@ 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:3897 ../mail/message-list.c:4354
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
-#: ../mail/message-list.c:4204
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15879,7 +15990,7 @@ msgstr ""
 "Nenhuma mensagem satisfaz os seus critérios de pesquisa. Limpe a procura no "
 "item de menu Procurar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4206
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
 msgstr "Não existem mensagens nesta pasta."
 
@@ -16046,28 +16157,28 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Plugin de áudio embutido"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do ficheiro de cópia de segurança do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution após a cópia de segurança"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione o nome do ficheiro de cópia de segurança do Evolution a repôr"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution após repôr o arquivo"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Recuperar da cópia de segurança"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16077,119 +16188,119 @@ msgstr ""
 "recuperar todo o Correio, Calendários, Tarefas, Memos e Contactos.\n"
 "Também recupera todas as suas definições pessoais, filtros de correio, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Recuperar o Evolution a partir de um ficheiro de cópia de segurança"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione um ficheiro de Cópia de Segurança do Evolution a recuperar:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Seleccione um ficheiro a recuperar"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Directório de cópia de segurança do Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Repôr o directório do Evolution"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Verificar o Ficheiro de Cópia de Segurança do Evolution"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Com o Interface Gráfico de Utilizador"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "A desligar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "A realizar a cópia de segurança das contas e definições do Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "A realizar a cópia de segurança dos dados do Evolution (Correio, Contactos, "
 "Calendários, Tarefas, Memos)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Cópia de segurança terminada"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "A Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Realizar de cópia de segurança dos dados actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "A extrair ficheiros da cópia de segurança"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "A ler as definições do Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "A remover os ficheiros temporários de cópia de segurança"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "A garantir recursos locais"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "A criar cópia de segurança na pasta %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "A recuperar da pasta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Cópia de Segurança do Evolution"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Recuperação do Evolution"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "A Realizar de Cópia de Segurança dos Dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Aguarde enquanto o Evolution realiza uma cópia de segurança dos seus dados."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Recuperar Dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Aguarde enquanto o Evolution recupera os seus dados."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Esta operação poderá demorar dependendo da quantidade de dados na sua conta."
@@ -16278,7 +16389,7 @@ msgstr "Contactos Automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:567
-msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Criar _automaticamente entradas no livro de endereços ao responder a "
 "mensagens"
@@ -16309,13 +16420,13 @@ msgstr "Sincronizar com a lista de _amigos agora"
 
 #: ../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 ""
 "Preenche automaticamente o seu livro de endereços com nomes e endereços à "
-"medida que responde a mensagens. Também preenche informação de contacto a "
-"partir da sua lista de contactos de mensageiro."
+"medida que responde a mensagens. Também preenche informação de contacto de "
+"Mensagens Instantâneas partir das suas listas de contactos de mensageiro."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16381,7 +16492,8 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Utilizar _SSL"
 
@@ -16403,7 +16515,8 @@ msgstr "Disponibiliza funcionalidades base para calendários locais."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "Act_ualizar:"
 
@@ -16513,23 +16626,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Deseja tornar o Evolution no seu cliente de email por omissão?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 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 livro de endereços por _omissão"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendário por _omissão"
 
-#: ../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 por _omissão"
 
-#: ../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 memos por _omissão"
 
@@ -16539,21 +16652,21 @@ msgstr "Origens por omissão"
 
 #: ../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 ""
 "Disponibiliza funcionalidades para marcar um calendário ou livro de "
 "endereços como o por omissão."
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "_Cabeçalho Personalizado"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr "Valores"
@@ -16730,7 +16843,7 @@ msgstr "%s KB"
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -16743,7 +16856,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16751,7 +16864,7 @@ msgstr ""
 "A senha actual não coincide com a senha existente para a sua conta. "
 "Introduza a senha correcta"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "As duas senhas não coincidem. Reintroduza as senhas."
 
@@ -16771,13 +16884,13 @@ msgstr "Nova Senha:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "A sua senha actual expirou. Altere a sua senha 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 "A sua senha irá expirar nos próximos %d dias"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -16802,7 +16915,7 @@ msgid "Delegate Permissions"
 msgstr "Permissões do Delegado"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissões para %s"
@@ -16843,43 +16956,43 @@ msgstr "No entanto não lhe é permitido ver os meus itens."
 msgid "You have been designated as a delegate for %s"
 msgstr "Foi designado como delegado de %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegar A"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Remover a delegação %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Incapaz de aceder 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 "Incapaz de encontrar o próprio 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 "Incapaz de encontrar 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 "Incapaz de remover a delegação %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Incapaz de actualizar a lista de delegações."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Incapaz de adicionar 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."
 
@@ -16927,25 +17040,25 @@ msgstr "_Resumir as permissões"
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permissões..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Nome da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Tamanho da Pasta"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Utilizador"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Subscrever a Pasta de Outro Utilizador"
@@ -16954,20 +17067,20 @@ msgstr "Subscrever a Pasta de Outro Utilizador"
 msgid "Exchange Folder Tree"
 msgstr "�rvore de Pastas 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 "Remover Subscrição de Pasta..."
 
-#: ../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 "Remover mesmo a subscrição da pasta \"%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 "Remover a subscrição de \"%s\""
@@ -17032,16 +17145,16 @@ msgstr "A sua senha irá expirar dentro de 7 dias..."
 msgid "_Change Password"
 msgstr "Alterar a _Senha"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Permissão negada.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Adicionar Utilizador:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../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
 msgid "Add User"
@@ -17161,10 +17274,6 @@ msgstr "_Sensibilidade: "
 msgid "_User"
 msgstr "_Utilizador"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "botão-utilizador"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccionar Utilizador"
@@ -17330,7 +17439,7 @@ msgid "Folder offline"
 msgstr "Pasta desligada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -17454,7 +17563,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Erro desconhecido ao procurar {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -17593,11 +17702,11 @@ msgstr "Compor num Editor _Externo"
 msgid "Compose messages using an external editor"
 msgstr "Compor as mensagens utilizando um editor externo"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando a ser executado para iniciar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17605,15 +17714,15 @@ msgstr ""
 "Para o Emacs utilize \"xemacs\"\n"
 "Para o VI utilize \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Seleccione um png (48*48) de tamanho < 700bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Ficheiros PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Face"
 
@@ -17659,18 +17768,18 @@ msgstr "_Remover a Subscrição"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Introduza primeiro o nome de utilizador."
 
-#: ../plugins/google-account-setup/google-source.c:497
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza a senha do utilizador %s para aceder à lista de calendários "
 "subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17679,29 +17788,19 @@ msgstr ""
 "Incapaz de ler dados do servidor Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "Cal_endário:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr "Obter a _lista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/google-account-setup/google-contacts-source.c:268
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-msgid "Username:"
-msgstr "Utilizador:"
-
-#. Translators: This is the first half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
-#: ../plugins/google-account-setup/google-contacts-source.c:233
-msgid "Update every"
-msgstr "Actualizar a cada"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar and contacts."
 msgstr "Um plugin para configurar o calendário e contactos do Google."
@@ -17710,7 +17809,7 @@ msgstr "Um plugin para configurar o calendário e contactos do Google."
 msgid "Google sources"
 msgstr "Fontes Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Lista de Verificação"
 
@@ -17755,16 +17854,16 @@ msgstr "Instalar a pasta partilhada"
 msgid "Shared Folder Installation"
 msgstr "Instalação de Pasta Partilhada"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Definições de Não Solicitado"
 
-#: ../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 "Definições de Correio Não Solicitado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Definições de Correio Não Solicitado..."
 
@@ -17892,7 +17991,7 @@ msgstr "Não é possível partilhar a pasta com o utilizador &quot;{0}&quot;"
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Tem de especificar o utilizador que deseja adicionar à lista"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Aceitar Tentativamente"
 
@@ -17909,7 +18008,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 "Mensagem"
 
@@ -18015,20 +18114,20 @@ msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador de Proxy apenas estará disponível quando a conta estiver activa."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Introduza os utilizadores e defina as permissões"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Nova Pasta _Partilhada..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Partilhar"
 
@@ -18183,8 +18282,8 @@ msgstr "Seleccionar a Lista de Tarefas"
 msgid "Select Calendar"
 msgstr "Seleccionar o Calendário"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:698
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importar"
 
@@ -18228,7 +18327,8 @@ msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Sincronizar o livro de endereços/tarefa/memo/calendário com o iPod da Apple"
 
@@ -18240,129 +18340,129 @@ msgstr "Sincronizar com o iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronização com iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Falha ao ler o calendário '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Um compromisso no calendário '%s' entra em conflicto com esta reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Encontrado o compromisso no calendário '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Incapaz de encontrar qualquer calendário"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Incapaz de encontrar esta reunião em qualquer calendário"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Incapaz de encontrar esta tarefa em qualquer lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Incapaz de encontrar este memo em qualquer lista de memos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "A procurar por uma versão existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Incapaz de processar o item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Incapaz de enviar o item para o calendário '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviar para o calendário '%s' como aceite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviar para o calendário '%s' como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviar para o calendário '%s' como recusada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviada para o calendário '%s' como cancelada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizador removeu o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviada uma notificação de cancelamento ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Incapaz de enviar uma notificação de cancelamento ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Incapaz de actualizar o estado de participante pois o estado é inválido!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Incapaz de actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Estado de participante actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Enviada a informação de reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Enviada a informação da tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Enviada a informação do memo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Incapaz de enviar a informação de reunião, a reunião não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Incapaz de enviar a informação de tarefa, a tarefa não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Incapaz de enviar a informação de memo, o memo não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "O calendário anexo é inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18370,15 +18470,15 @@ msgstr ""
 "A mensagem indica conter um calendário, mas este não é um calendário "
 "iCalendar 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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "O item no calendário é inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18386,11 +18486,11 @@ msgstr ""
 "A mensagem contém um calendário mas este não contém quaisquer eventos, "
 "tarefas ou informação de livre/ocupado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "O calendário anexo contém múltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18398,227 +18498,227 @@ msgstr ""
 "Para processar todos estes itens, o ficheiro deverá ser gravado e o "
 "calendário importado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Esta reunião é recorrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Esta tarefa é recorrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Este memo é recorrente"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Apagar as mensagens depois de agir"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Procura de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendários onde procurar por conflitos entre reuniões"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Hoje"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Hoje %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Hoje %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Hoje %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Amanhã"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Amanhã %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Amanhã %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Amanhã %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Amanhã %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../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:273
+#: ../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:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../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:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 em nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Recebida em nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> através de %s publicou a seguinte informação de reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte informação de reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegou-lhe a seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> através de %s pede a sua presença na seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> pede a sua presença na seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> através de %s deseja adicionar a uma reunião existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> deseja adicionar a uma reunião existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18627,89 +18727,89 @@ msgstr ""
 "<b>%s</b> através de %s deseja receber a mais recente informação sobre a "
 "seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> deseja receber a mais recente informação sobre a seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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> através de %s enviou de volta a seguinte resposta à reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> enviou de volta a seguinte resposta à reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> através de %s cancelou a seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a seguinte reunião."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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> através de %s propôs as seguintes alterações à reunião."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propôs as seguintes alterações à reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> através de %s recusou as seguintes alterações à reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> recusou as seguintes alterações à reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> através de %s publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> pede que seja atribuída a %s a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> através de %s atribuiu-lhe uma tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> atribuiu-lhe uma tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> através de %s deseja adicionar a uma tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> deseja adicionar a uma tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18718,7 +18818,7 @@ msgstr ""
 "<b>%s</b> através de %s deseja receber a mais recente informação sobre a "
 "seguinte tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18727,7 +18827,7 @@ msgstr ""
 "<b>%s</b> deseja receber a mais recente informação sobre a seguinte tarefa "
 "atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18735,22 +18835,22 @@ msgstr ""
 "<b>%s</b> através de %s enviou de volta a seguinte resposta à tarefa "
 "atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> enviou de volta a seguinte resposta à tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> através de %s cancelou a seguinte tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18758,102 +18858,102 @@ msgstr ""
 "<b>%s</b> através de %s propôs as seguintes alterações à atribuição da "
 "tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propôs as seguintes alterações à atribuição da tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> através de %s recusou a seguinte tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> recusou a atribuição da seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> através de %s publicou o seguinte memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> publicou o seguinte memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> através de %s deseja adicionar a um memo existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> deseja adicionar a um memo existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> através de %s cancelou o seguinte memo partilhado:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou o seguinte memo partilhado:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Abrir o Calendário"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "_Recusar"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Aceitar"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Recusar tudo"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "Todas _tentativas"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "_Tentativa"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Aceitar todas"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Enviar Informação"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o Estado dos Presentes"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -19008,20 +19108,20 @@ msgstr "Se o ícone deverá ou não piscar."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar apenas sobre mensagens na Caixa de Entrada ou todas."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "Gerar uma mensagem _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "Notificação de Nova Mensagem do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:398
 msgid "Mail Notification Properties"
 msgstr "Propriedades da Notificação de Nova Mensagem"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19036,55 +19136,55 @@ msgstr[1] ""
 "Recebeu %d mensagens novas\n"
 "em %s."
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recebeu %d mensagem nova."
 msgstr[1] "Recebeu %d mensagens novas."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Nova mensagem"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Apresentar o ícone na área de _notificação"
 
-#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "P_iscar o ícone na área de notificação"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Apresentar a _mensagem em popup junto ao ícone"
 
-#: ../plugins/mail-notification/mail-notification.c:728
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproduzir um som ao chegarem novas mensagens"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Reproduzir um ficheiro de _som"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Especificar um nome de _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Seleccione um ficheiro de som"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Reprodu_zir"
 
-#: ../plugins/mail-notification/mail-notification.c:805
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Apenas notificar sobre mensagens novas na Caixa de _Entrada"
 
@@ -19117,12 +19217,12 @@ msgstr "Con_verter em Reunião"
 msgid "Mail to meeting"
 msgstr "Mensagem para reunião"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Incapaz de abrir o calendário. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19323,11 +19423,11 @@ msgstr "_Subscrever a Lista"
 msgid "_Unsubscribe from List"
 msgstr "_Remover a Subscrição da Lista"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "Marcar também as mensagens nas subpastas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../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?"
@@ -19335,11 +19435,11 @@ msgstr ""
 "Deseja marcar como lidas apenas as mensagens na pasta actual ou nesta bem "
 "como em todas as suas subpastas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Pasta Actual e Suas _Subpastas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Apenas _Pasta Actual"
 
@@ -19386,7 +19486,7 @@ msgstr "Um plugin para gerir que plugins estão activos ou inactivos."
 
 #. 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 "Gestor do Plugin"
 
@@ -19398,24 +19498,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 "Configuração"
 
-#: ../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: Algumas alterações não terão efeito até que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Resumo"
 
-#: ../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"
 
@@ -19440,19 +19540,19 @@ msgstr "Modo de Texto Simples"
 msgid "Prefer plain-text"
 msgstr "Preferir texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Apresentar HTML se existente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Preferir SIMPLES"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Apenas apresentar SIMPLES"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19825,15 +19925,15 @@ msgstr "Guia-o através da configuração inicial de conta."
 msgid "Setup Assistant"
 msgstr "Assistente de Configuração"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de Configuração do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Bem Vindo"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19845,29 +19945,29 @@ msgstr ""
 "\n"
 "Prima o botão \"Avançar\" para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "A importar ficheiros"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:143
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a informação que deseja importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:396
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:507
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "A importar os dados."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:521
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Aguarde por favor"
 
@@ -19885,7 +19985,7 @@ msgid "Thread messages by subject"
 msgstr "Organizar as mensagens em árvore por assunto"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Recorrer a organizar as mensagens em ár_vore por assunto"
 
@@ -19897,7 +19997,7 @@ msgstr ""
 "Lista de pares chave/valor para o plugin de modelos substituir no corpo de "
 "uma mensagem."
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:615
 msgid "No title"
 msgstr "Sem título"
 
@@ -19972,53 +20072,48 @@ msgid "Configuration version"
 msgstr "Versão da configuração"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr ""
-"Decide se a detecção de terminação em erro deverá ser executada ou não."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largura por omissão da barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Altura por omissão da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Estado por omissão da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Largura por omissão da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Activa as definições de proxy ao aceder por HTTP/HTTP Seguro à Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Nome do servidor de proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Senha da proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Porto da proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Utilizador da proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 ou alcunha do componente a ser apresentado por omissão ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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/"
@@ -20030,46 +20125,46 @@ msgstr ""
 "authentication_user\", e a senha é obtida ou do gnome-keyring ou do ficheiro "
 "de senhas ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Versão da última configuração actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de caminhos para as pastas a serem sincronizadas para o disco para "
 "serem acedidas em modo desligado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Servidores sem proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Senha a indicar como autenticação ao aceder pela proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Modo de configuração da proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Nome do servidor de proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Porto da proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Nome do servidor de proxy de HTTP Seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Porto da proxy de HTTP Seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
@@ -20081,27 +20176,23 @@ msgstr ""
 "\"utilizar configuração manual de proxy\" e \"utilizar a configuração de "
 "proxy disponibilizada pelo URL de configuração\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Barra lateral está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de versão de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Saltar o diálogo de aviso de recuperação"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Barra de estados está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20109,19 +20200,19 @@ msgstr ""
 "A versão da configuração do Evolution, com o nível principal/menor/"
 "configuração (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "A altura por omissão da janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "A largura por omissão da janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura por omissão da barra lateral, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20129,19 +20220,19 @@ msgstr ""
 "A última versão actualizada da configuração do Evolution, com o nível "
 "principal/menor/configuração (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "O nome da máquina a utilizar como proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "O nome da máquina a utilizar como proxy HTTP Seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "O nome da máquina a utilizar como proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -20149,7 +20240,7 @@ msgstr ""
 "O porto da máquina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que é utilizada como proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -20157,7 +20248,7 @@ msgstr ""
 "O porto da máquina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que é utilizada como proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -20165,7 +20256,7 @@ msgstr ""
 "O porto da máquina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que é utilizada como proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20175,7 +20266,7 @@ msgstr ""
 "\"toolbar\". Se estiver definido \"toolbar\", o estilo dos botões é "
 "determinado pela definição da barra de ferramentas GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
@@ -20188,67 +20279,58 @@ msgstr ""
 "(tanto IPv4 como IPv6) e endereços de rede com uma máscara (algo do tipo "
 "192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Barra de ferramentas está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL que disponibiliza valores de configuração de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Utilizar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Utilizador a indicar como autenticação ao utilizar a proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Se o Evolution irá iniciar em modo desligado ou ligado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Se a detecção de terminação em erro deverá ou não ser realizada."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Se a janela deverá ou não estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral deverá ou não estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Se a barra de estados deverá ou não estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas deverá ou não estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Se o diálogo de aviso de versão Evolution de desenvolvimento é ou não "
 "apresentado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Se o diálogo de aviso de recuperação do Evolution é ou não apresentado."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botões de janela deverão ser ou não visíveis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Estilo dos botões da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Botões da janela são visíveis"
 
@@ -20271,22 +20353,16 @@ msgstr "Seleccione o tipo de 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.\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 ""
-"Seleccione o ficheiro que deseja importar para o Evolution bem como o seu "
-"tipo, de entre os apresentados na lista.\n"
-"\n"
-"Se não souber pode seleccionar \"Automático\" e o Evolution tentará "
-"descobrir."
+"Seleccione o ficheiro que deseja importar para o Evolution, e seleccione da "
+"lista qual o seu tipo de ficheiro."
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Seleccione o destino desta importação"
 
-#: ../shell/e-shell-importer.c:146
+#: ../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"
@@ -20298,33 +20374,33 @@ msgstr ""
 "encontradas nenhumas passíveis de serem importadas. Se desejar\n"
 "tentar novamente, prima o botão \"Retroceder\".\n"
 
-#: ../shell/e-shell-importer.c:284
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../shell/e-shell-importer.c:289
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: ../shell/e-shell-importer.c:298
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:334
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configurações de aplicações _antigas"
 
-#: ../shell/e-shell-importer.c:337
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importar _um único ficheiro"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Preferências do 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20374,7 +20450,7 @@ msgstr "Trabalhar _Desligado"
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20382,11 +20458,11 @@ msgstr ""
 "Evolution de momento está ligado.\n"
 "Clique neste botão para trabalhar desligado."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está no processo de se desligar."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20394,47 +20470,52 @@ msgstr ""
 "Evolution de momento está desligado.\n"
 "Prima este botão para trabalhar ligado."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Incapaz de se registar no OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Base de Dados de Configuração não foi encontrada"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Novo"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Novo Teste"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
+msgid "_Test"
+msgstr "_Teste"
+
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Criar um novo item de teste"
 
@@ -20478,7 +20559,7 @@ msgstr ""
 "importação de ficheiros externos para o Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20514,7 +20595,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho e aguardamos\n"
 "as suas contribuições!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20522,68 +20603,45 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Não apresentar esta mensagem novamente"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Detecção de Terminação em Erro do Evolution"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norar"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Parece que o Evolution terminou em erro inesperadamente, da última vez que\n"
-"foi utilizado. Como precaução, todos os paineis de antevisão serão\n"
-"escondidas. Pode repô-los a partir do menu Ver.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "_Não apresentar esta mensagem novamente"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o componente especificado"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forçar todos os componentes do Evolution a terminar"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 "Forçar uma nova actualização de ficheiros de configuração do Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Enviar o resultado de depuração de todos os componentes para um ficheiro."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Desactivar o carregamento de quaisquer plugins."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o painel de antevisão de Correio, Contactos e Tarefas."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O Cliente de Email e Gestor Pessoal Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20808,27 +20866,27 @@ msgstr "Endereço de Email"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificado de AC"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de Certificado: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduza a senha 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 a nova senha para a base de dados de certificados"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Introduza a nova senha"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20837,7 +20895,7 @@ msgstr ""
 "Emitido a:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20846,7 +20904,7 @@ msgstr ""
 "Emitido por:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Seleccionar certificado"
 
@@ -21201,15 +21259,15 @@ msgstr "ID Único de Sujeito"
 msgid "Certificate Signature Value"
 msgstr "Valor da Assinatura do Certificado"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "Senha do Ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza a senha para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Certificado Importado"
 
@@ -21264,7 +21322,7 @@ msgid "Copy to Folder..."
 msgstr "Copiar para a Pasta..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Criar uma nova pasta de livro de endereços"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -22651,7 +22709,7 @@ msgstr ""
 "Utilize o botão direito do rato para afastar."
 
 #: ../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 "Colecção"
 
@@ -22696,7 +22754,7 @@ msgstr "_Substituir a vista 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 "Vista Personalizada"
 
@@ -22705,32 +22763,32 @@ msgid "Save Custom View"
 msgstr "Gravar a Vista 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 as Vistas..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Vista Act_ual"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Vista de Selecção: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "A vista actual é uma vista personalizada"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Gravar a Vista Personalizada..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Gravar a vista personalizada actual"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Criar ou editar vistas"
 
@@ -22758,13 +22816,13 @@ msgstr "Tipo de vista:"
 msgid "Attachment Bar"
 msgstr "Barra de Anexos"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Incapaz de anexar o ficheiro %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Incapaz de anexar o ficheiro %s: não é um ficheiro normal"
@@ -22786,7 +22844,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Sugerir a apresentação automática do anexo"
 
 #. 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 %Y"
 
@@ -22835,30 +22893,30 @@ msgstr "Y1"
 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
 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
 msgid "Minimum Width"
 msgstr "Largura Mínima"
 
-#: ../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:204
 msgid "Spacing"
 msgstr "Espaçamento"
 
-#: ../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 hora tem de ser no formato: %s"
@@ -22867,98 +22925,98 @@ msgstr "A hora tem de ser no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor de percentagem tem de ser entre 0 e 100, inclusivé"
 
-#: ../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 "Europeu Central"
 
-#: ../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 "Hebreu"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japonê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 "Europeu Ocidental"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Europeu Ocidental, 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 "Ucraniano"
 
-#: ../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 "Conjunto de caracteres desconhecido: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Codificação de 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 conjunto de caracteres a utilizar"
 
-#: ../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 "Codificação de C_aracteres"
 
@@ -23048,61 +23106,61 @@ msgid "Spacing around expander arrow"
 msgstr "Espaço em torno da seta de expansão"
 
 #. 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 "Procura Avançada"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Gravar a Procura"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Procuras"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Procuras"
 
-#: ../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 "_Gravar a Procura..."
 
-#: ../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 Procuras Gravadas..."
 
-#: ../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 "Procura _Avançada..."
 
-#: ../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 "Pasta Actual"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Mensagem Actual"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Seleccione a Imagem"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa Mundi"
 
-#: ../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."
@@ -23111,23 +23169,23 @@ msgstr ""
 "Utilizadores apenas com teclado deverão antes seleccionar o fuso-horário na "
 "caixa de selecção abaixo."
 
-#: ../widgets/misc/e-online-button.c:112
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
 msgstr "Ligado"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
 msgstr "O estado do botão é ligado"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sincronizar com:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sincronizar os Registos Privados:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Categorias de Sincronização:"
 
@@ -23143,52 +23201,52 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura da coluna"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Procurar"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Clique aqui para alterar o tipo de procura"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "Procurar _Agora"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID de Item"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "_Apresentar: "
 
 #. 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "Proc_urar: "
 
 #. 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " e_m "
 
@@ -23202,19 +23260,19 @@ msgstr "Linha de Cursor"
 msgid "Cursor Column"
 msgstr "Coluna de Cursor"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Ordenador"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Modo de Selecção"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Modo de Cursor"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Ao apa_gar:"
 
@@ -23344,19 +23402,19 @@ msgid "_When opened:"
 msgstr "_Quando aberta:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Clique aqui para ir para o URL"
 
@@ -23376,7 +23434,7 @@ msgstr "C_ategorias Disponíveis:"
 msgid "categories"
 msgstr "categorias"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "lista em popup"
 
@@ -23553,30 +23611,30 @@ msgstr ""
 "Para adicionar uma coluna à sua tabela, arraste-a\n"
 "para o local onde a deseja."
 
-#: ../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 item)"
 msgstr[1] "%s : %s (%d itens)"
 
-#: ../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 item)"
 msgstr[1] "%s (%d itens)"
 
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "Cores de Linhas Alternadas"
 
+#: ../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
@@ -23584,8 +23642,8 @@ msgstr "Cores de Linhas Alternadas"
 msgid "Horizontal Draw Grid"
 msgstr "Grelha Desenhada Horizontalmente"
 
+#: ../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
@@ -23593,8 +23651,8 @@ msgstr "Grelha Desenhada Horizontalmente"
 msgid "Vertical Draw Grid"
 msgstr "Grelha Desenhada Verticalmente"
 
+#: ../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
@@ -23602,24 +23660,24 @@ msgstr "Grelha Desenhada Verticalmente"
 msgid "Draw focus"
 msgstr "Desenhar 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
 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
 msgid "Selection model"
 msgstr "Modelo de selecção"
 
+#: ../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
@@ -23628,8 +23686,8 @@ msgstr "Modelo de selecção"
 msgid "Length Threshold"
 msgstr "Tolerância de Comprimento"
 
+#: ../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
@@ -23638,8 +23696,8 @@ msgstr "Tolerância de Comprimento"
 msgid "Uniform row height"
 msgstr "Altura de linha uniforme"
 
+#: ../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"
@@ -23707,7 +23765,7 @@ msgid "Font Description"
 msgstr "Descrição de Fonte"
 
 #: ../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 "Info de Ordenação"
 
@@ -23854,53 +23912,77 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Manípulo de Popup"
 
-#~ msgid "Permission Denied."
-#~ msgstr "Autorização Negada."
+#~ msgid "Migrating `%s':"
+#~ msgstr "A migrar `%s':"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Docu_mentos Recentes"
 
-#~ msgid "Contact _List"
-#~ msgstr "_Lista de Contactos"
+#~ msgid "D_escription:"
+#~ msgstr "D_escrição:"
 
-#~ msgid "Address _Book"
-#~ msgstr "Livro de _Endereços"
+#~ msgid "De_scription:"
+#~ msgstr "De_scrição:"
 
-#~ msgid "_Properties..."
-#~ msgstr "_Propriedades..."
+#~ msgid "Updating query"
+#~ msgstr "A actualizar a consulta"
 
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>Apresentação</b>"
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Próximos Compromisso"
 
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Informação de Servidor</b>"
+#~ msgid "button-user"
+#~ msgstr "botão-utilizador"
 
-#~ msgid "_Appointment"
-#~ msgstr "_Compromisso"
+#~ msgid "Username:"
+#~ msgstr "Utilizador:"
 
-#~ msgid "M_eeting"
-#~ msgstr "R_eunião"
+#~ msgid "Update every"
+#~ msgstr "Actualizar a cada"
 
-#~ msgid "All Day A_ppointment"
-#~ msgstr "Com_promisso de Dia Completo"
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr ""
+#~ "Decide se a detecção de terminação em erro deverá ser executada ou não."
 
-#~ msgid "Cale_ndar"
-#~ msgstr "Cale_ndário"
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Saltar o diálogo de aviso de recuperação"
 
-#~ msgid "Mem_o"
-#~ msgstr "Mem_o"
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Se a detecção de terminação em erro deverá ou não ser realizada."
 
-#~ msgid "_Shared memo"
-#~ msgstr "Memo partil_hado"
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Se o diálogo de aviso de recuperação do Evolution é ou não apresentado."
 
-#~ msgid "Memo li_st"
-#~ msgstr "Li_sta de memos"
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Detecção de Terminação em Erro do Evolution"
 
-#~ msgid "Assigne_d Task"
-#~ msgstr "Tarefa Atribuí_da"
+#~ msgid "Ig_nore"
+#~ msgstr "Ig_norar"
 
-#~ msgid "Tas_k list"
-#~ msgstr "L_ista de tarefas"
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Parece que o Evolution terminou em erro inesperadamente, da última vez "
+#~ "que\n"
+#~ "foi utilizado. Como precaução, todos os paineis de antevisão serão\n"
+#~ "escondidas. Pode repô-los a partir do menu Ver.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Não apresentar esta mensagem novamente"
+
+#~ msgid "Permission Denied."
+#~ msgstr "Autorização Negada."
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propriedades..."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Apresentação</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>Informação de Servidor</b>"
 
 #~ msgid "Unknown reason"
 #~ msgstr "Razão desconhecida"
@@ -23917,12 +23999,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
 
-#~ msgid "_Mail Message"
-#~ msgstr "_Mensagem de Email"
-
-#~ msgid "Mail _Folder"
-#~ msgstr "_Pasta de Mensagens"
-
 #~ msgid "Attach original message"
 #~ msgstr "Anexar a mensagem original"
 
@@ -24008,9 +24084,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "'.' e '..' são nomes de pastas reservados."
 
-#~ msgid "_Test"
-#~ msgstr "_Teste"
-
 #~ msgid "Copy selection to clipboard"
 #~ msgstr "Copiar a selecção para a área de transferência"
 
diff --git a/po/sl.po b/po/sl.po
index 7500018baa..fa6a470982 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-28 16:28+0100\n"
-"PO-Revision-Date: 2008-05-01 13:32+0100\n"
+"POT-Creation-Date: 2008-09-06 16:13+0000\n"
+"PO-Revision-Date: 2008-09-09 13:56+0100\n"
 "Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@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:179
-msgid "evolution addressbook"
-msgstr "evolution imenik"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "Imenik Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -64,64 +64,64 @@ msgstr "Stiki: "
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Ima alarme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Ima ponovitve."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Je sestanek."
 
-#: ../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 "Dogodek koledarja: povzetek 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 "Dogodek koledarja: ni povzetka."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "dogodek pogleda koledarja"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Dobi fokus"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nov sestanek"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Nov celodnevni dogodek"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Pojdi na danes"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Pojdi na datum"
 
-#: ../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 "razpredelnica za ogled in izbiro trenutnega �asovnega obsega"
 
 #. 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."
@@ -132,15 +132,15 @@ msgstr[3] "Ima %d dogodke."
 
 #. 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 "Nima dogodkov."
 
 #. 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 "Pogled delovnega tedna: %s. %s"
@@ -148,21 +148,21 @@ msgstr "Pogled delovnega tedna: %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 "Dnevni pogled: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "pogled koledarja za delovni teden"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "pogled koledarja za enega ali ve� dni"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -172,31 +172,31 @@ 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:750
-#: ../calendar/gui/e-day-view-top-item.c:841
-#: ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../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: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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -205,60 +205,60 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:845
-#: ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../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: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:766
 msgid "Gnome Calendar"
 msgstr "Gnome Koledar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "vrstica za iskanje"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "vrstica za iskanje koledarja Evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Gumb sko�i"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Kliknite tu za iskanje ve� dogodkov."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Mese�ni pogled: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Tedenski pogled: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "Pogled celotnega meseca v koledarju"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "pogled koledarja za enega ali ve� tednov"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "pojavno okno"
 
 #. 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 "prikaži podrejenega v pojavnem oknu"
 
@@ -270,12 +270,12 @@ msgstr "uredi"
 msgid "begin editing this cell"
 msgstr "za�ni urejati to celico"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "preklopi"
 
 #. 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 "preklopi na celico"
 
@@ -295,47 +295,47 @@ msgstr "zloži"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "zloži vrstico v ETree, ki vsebuje to celico"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Celica razpredelnice"
 
-#: ../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 "kliknite za dodajanje"
 
-#: ../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 "kliknite"
 
-#: ../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 "razvrsti"
 
-#: ../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 "Koledar: od %s do %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "Predmet koledarja v Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Spustni gumb"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Vklju�i privzeto"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Pojavni meni"
 
@@ -349,7 +349,8 @@ msgstr "Vklju�i"
 
 #. 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 source. Switch to Contacts View and highlight an address book that can accept contacts."
+#, fuzzy
+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}' je vir imenik samo za branje Preklopite na pogled stikov in ozna�ite imenik, ki lahko sprejema stike."
 
 #: ../addressbook/addressbook.error.xml.h:3
@@ -381,19 +382,20 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Ni mogo�e dobiti podatkov o shemi za LDAP strežnik."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Ni mogo�e odstraniti imenika."
 
 #: ../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 "Iz programa Evolutiona lahko trenutno uporabljate le sistemski imenik GroupWise. Za dostop do pogostih stikov in map osebnih stikov uporabite kateri drugi poštni odjemalec GroupWise."
+#, fuzzy
+msgid "Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr "Iz Evolutiona lahko trenutno dostopate samo do sistemskega adresarja GroupWise. Za dostop do pogostih stikov in map osebnih stikov uporabite kateri drugi poštni odjemalec GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Ali želite izbrisati imenik '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Napaka pri nalaganju imenika."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -406,7 +408,7 @@ msgstr "Overitev na LDAP strežniku ni uspela."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Brisanje stika ni uspelo"
 
@@ -427,7 +429,8 @@ msgid "Some features may not work properly with your current server"
 msgstr "Nekatere zmogljivosti morda ne bodo delovale pravilno na vašem trenutnem strežniku"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+#, fuzzy
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Imenik Evolution se je nepri�akovano kon�al."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -439,28 +442,32 @@ msgid "This LDAP server may use an older version of LDAP, which does not support
 msgstr "LDAP strežnik morda uporablja starejšo razli�ico LDAP, ki ne podpira te zmogljivosti ali pa je napa�no nastavljen. Za podprto iskalno zbirko se obrnite na vašega skrbnika sistema."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Imenik bo za vedno odstranjen."
+#, fuzzy
+msgid "This address book could not be opened."
+msgstr "Imenika ni mogo�e odpreti."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
-msgstr "Imenika ni mogo�e odpreti."
+#, fuzzy
+msgid "This address book server does not have any suggested search bases."
+msgstr "Strežnik imenika nima predlagane iskalne zbirke."
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Strežnik imenika nima predlagane iskalne zbirke."
+#, fuzzy
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "Strežnik imenika morda ni dosegljiv, morda je ime strežnika napa�no �rkovano ali pa je povezava z omrežjem prekinjena."
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
-msgstr "Strežnik imenika morda ni dosegljiv, morda je ime strežnika napa�no �rkovano ali pa je povezava z omrežjem prekinjena."
+msgid "This address book will be removed permanently."
+msgstr "Imenik bo za vedno odstranjen."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Strežnik ne podpira podatkov sheme LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
-msgstr "Imenika ni mogo�e odpreti"
+#, fuzzy
+msgid "Unable to open address book"
+msgstr "Ni bilo mo� odpreti adresarja"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
@@ -475,7 +482,8 @@ msgid "Would you like to save your changes?"
 msgstr "Želite shraniti spremembe?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
+#, fuzzy
+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 "Stik poskušate prenesti iz enega imenika v drugega, vendar ga ni mogo�e izbrisati iz vira. Želite namesto tega shraniti kopijo?"
 
 #: ../addressbook/addressbook.error.xml.h:34
@@ -483,7 +491,8 @@ msgid "You are connecting to an unsupported GroupWise server and may encounter p
 msgstr "Povezujete se na nepodprt strežnik GroupWise, zato lahko pride do težav pri uporabi Evolutiona. Za boljšo izkušnjo strežnik raje nadgradite na podprto razli�ico"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "You do not have enough permissions to delete contact in this Address Book."
+#, fuzzy
+msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nimate dovoljenja za izbris stika v imeniku."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -495,7 +504,7 @@ msgid "Your contacts for {0} will not be available until Evolution is restarted.
 msgstr "Vaši stiki za {0} ne bodo na voljo, dokler Evolutiona ne zaženete ponovno."
 
 #: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:512
+#: ../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
@@ -518,10 +527,10 @@ msgstr "_Pove�aj"
 msgid "_Use as it is"
 msgstr "_Uporabi kot 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."
+#. 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:147
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -530,17 +539,18 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Privzet usklajevalni naslov:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+#, fuzzy
+msgid "Could not load address book"
 msgstr "Ni mogo�e naložiti imenika"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Ni mogo�e prebrati Pilotovega imenika"
 
@@ -562,11 +572,11 @@ msgstr "Nastavitve samodejnega dopolnjevanja"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285
-#: ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -591,7 +601,8 @@ msgid "Evolution Address Book component"
 msgstr "Komponenta imenika Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Gradnik za upravljanje certifikatov S/Mime v Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -606,17 +617,18 @@ msgstr "Tu lahko upravljate vaše certifikate S/MIME"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200
-#: ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582
-#: ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196
+#: ../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/mail-component.c:308
+#: ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312
 #: ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1475
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "Na tem ra�unalniku"
 
@@ -629,128 +641,134 @@ msgstr "Na tem ra�unalniku"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209
-#: ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590
-#: ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205
-#: ../mail/em-migrate.c:1056
+#: ../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 "Osebno"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Na LDAP strežnikih"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Stik"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Nov imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+#, fuzzy
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_Imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Ustvari nov imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Napaka pri nadgradnji nastavitev ali map imenika."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "Vrs_ta:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Vsebino _knjige kopiraj lokalno za delo brez povezave"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../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:257
+#: ../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:2362
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Splošno"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Imenik"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Podatki o strežniku"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Overovitev"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Iskanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Prenašanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Lastnosti imenika"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153
-#: ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Prenašanje ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1244
-#, c-format
-msgid "Migrating `%s':"
-msgstr "Prenašanje '%s':"
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "Prenašanje ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -800,40 +818,40 @@ msgstr ""
 "\n"
 "Bodite pozorni medtem ko Evolution premika vaše mape ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Preimenuj mapo"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Ime mape ne sme vsebovati '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Nov imenik"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Shrani kot VCard ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1707
+#: ../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
-#: ../mail/em-folder-tree.c:2092
-#: ../mail/em-folder-view.c:1347
+#: ../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
@@ -842,33 +860,42 @@ msgstr "Shrani kot VCard ..."
 msgid "_Delete"
 msgstr "_Zbriši"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Lastnosti ..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Lastnosti"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Izbirnik virov stika"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimen dostop do LDAP strežnika"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Overovitev ni uspela.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Vnesite geslo za %s (uporabnik %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Vnesite geslo"
 
@@ -954,7 +981,7 @@ msgid "Add Address Book"
 msgstr "Dodaj imenik"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Vedno"
 
@@ -962,200 +989,206 @@ msgstr "Vedno"
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "Osnovno"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Razlo�no ime"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-poštni naslov"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution bo uporabila ta e-poštni naslov, za vašo overitev pri povezavi s strežnikom."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Najdi mogo�e iskalne zbirke"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Prijava:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nikoli"
 
 #. 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:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Brez Å¡ifriranja"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Ena"
 
 #. 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:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Å ifriranje SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Iskalni filter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Iskalna z_birka:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Iskalni _filter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Iskalni filter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
 msgstr "Iskalni filter je vrsta predmetov, iskanih med izvajanjem iskanja. ÄŒe tega ne spremenite, se bo iskanje privzeto izvedlo na objectclass vrste \"oseba\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
 msgstr "Če izberete to možnost se bo Evolution na vaš LDAP strežnik povezal samo v primeru, �e podpira SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
 msgstr "Če izberete to možnost se bo Evolution na vaš LDAP strežnik povezal samo v primeru, �e podpira TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "Izbira te možnosti pomeni, da vaš strežnik ne podpira ali SSL ali TLS. To pomeni, da vaša povezava ne bo varna in da boste bolj ranljivi na varnostne napake."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Pod"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Podprte iskalne zbirke"
 
 #. 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:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Å ifriranje TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "Iskalna zbirka je razlo�no ime (DN) vnosa, kjer se za�nejo vaša iskanja. Če želite to polje prazno, se bo iskanje za�elo pri korenu drevesne razporeditve map."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "Doseg iskanja dolo�a, kako dale� po drevesu razporeditve naj se razširi iskanje. Doseg \"pod\" obsega vse vnose pod vašo iskalno zbirko, doseg \"en\" pa samo vnose, ki so en nivo pod vašo zbirko."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "To je polno ime vašega LDAP strežnika. Na primer: \"ldap.mojepodjetje.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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 "To je najve�je število predmetov za prenos. Če je nastavljeno na ve�jo vrednost, bo upo�asnilo ta imenik."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr "To je na�in, ki ga bo Evolution uporabil za vašo overovitev. Če boste izbrali \"E-poštni naslov\", bo zahtevan anonimni dostop do vašega LDAP strežnika."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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 "To ime strežnika bo prikazano v seznamu map Evolutiona. Uporablja se le za prikaz."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "To so vrata LDAP strežnika na katera se bo poskušal povezati Evolution. Na voljo je seznam standardnih vrat. O tem, katera vrata morate navesti, se pozanimajte pri skrbniku vašega sistema."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Z uporabo razlo�nega imena (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Z uporabo e-poštnega naslova"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Dodaj imenik"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Omejitev prenosa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Najdi mogo�e iskalne zbirke"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Na�in prijave:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Doseg iskanja:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Strežnik:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_ÄŒasovna omejitev:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Uporabi varno povezavo:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "vizitke"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minut"
 
@@ -1196,7 +1229,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Služba</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1208,16 +1241,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorije ..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Stik"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../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
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -1230,7 +1263,7 @@ msgid "Image"
 msgstr "Slika"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1243,7 +1276,7 @@ msgid "Nic_kname:"
 msgstr "_Vzdevek:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1257,11 +1290,11 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Delo"
 
@@ -1283,8 +1316,8 @@ msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Koledar:"
@@ -1373,1122 +1406,1123 @@ msgstr "_Kje:"
 msgid "_Zip/Postal Code:"
 msgstr "_Poštna številka: "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "Naslov"
 
-#: ../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:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "Spremenljiv"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Združene države Amerike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alžirija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Ameriška Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andora"
 
-#: ../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 "Angvila"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: ../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 "Antigva in Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenija"
 
-#: ../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 "Avstralija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Avstrija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbajdžan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahami"
 
-#: ../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 "Bangladeš"
 
-#: ../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 "Belorusija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../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 "Bermudi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Butan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivija"
 
-#: ../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 in Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Bocvana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Bouvetski otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: ../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 "Britansko Indijsko oceansko obmo�je"
 
-#: ../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 "Bolgarija"
 
-#: ../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 "Zelenortski otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Kajmanski otoki"
 
-#: ../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 "Srednjeafriška 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 "ÄŒile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Kitajska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Velikono�ni otok"
 
-#: ../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 "Kokosovi otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komori"
 
-#: ../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 "Demokrati�na republika Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cookovi otoki"
 
-#: ../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 "Slonokoš�ena obala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Hrvaška"
 
-#: ../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 "Ciper"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Danska"
 
-#: ../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 "Dominika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikanska republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egipt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Ekvatorialna Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritreja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falklandski otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Ferski otoki"
 
-#: ../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 "Finska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Francoska Gvajana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Francoska Polinezija"
 
-#: ../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 "Francoska južna obmo�ja"
 
-#: ../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 "Gambija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Nem�ija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../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�ija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../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 "Gvatemala"
 
-#: ../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 "Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Gvineja Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Gvajana"
 
-#: ../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 "Heardovi in McDonaldovi otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Sveto morje"
 
-#: ../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 "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Madžarska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islandija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Indija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../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 "Irska"
 
-#: ../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 "Isle of 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 "Italija"
 
-#: ../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 "Japonska"
 
-#: ../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 "Jordanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Demokrati�na ljudska republika Koreja"
 
-#: ../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 "Republika Koreja"
 
-#: ../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 "Kirgizistan"
 
-#: ../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 "Latvija"
 
-#: ../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 "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Litvanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Makedonija"
 
-#: ../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 "Malavi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldivi"
 
-#: ../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 "Marshallovi otoki"
 
-#: ../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 "Mavretanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../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 "Mehika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: ../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 "Moldova, 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 "Mongolija"
 
-#: ../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 "Mjanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibija"
 
-#: ../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 "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Nizozemski Antili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nova Zelandija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../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 "Nigerija"
 
-#: ../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 "Norfolški otoki"
 
-#: ../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 "Severni marianski otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../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 "Paragvaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestinsko osvobojeno ozemlje"
 
-#: ../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 Nova Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paragvaj"
 
-#: ../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 "Filipini"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugalska"
 
-#: ../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 "Romunija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Ruska federacija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../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 "St. Kitts in 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 "St. Lucija"
 
-#: ../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 "Staint Vincent in Grenadini"
 
-#: ../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 in 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 "Savdska Arabija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegalija"
 
-#: ../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 "Srbija in ÄŒrna gora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Sejšeli"
 
-#: ../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 "Slovaška"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Solomonovi otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalija"
 
-#: ../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žno afriška republika"
 
-#: ../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žna Georgija in Južni Sandwichovi otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Å panija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Å rilanka"
 
-#: ../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 in Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../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 "Svalbardovi in Jan Mayenovi otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Svazi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Å vedska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Å vica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Sirija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: ../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 "Tanzanija, Združena republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tajska"
 
-#: ../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 "Tongo"
 
-#: ../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 in Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunizija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Tur�ija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../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 "Oto�ji Turks in Caicos"
 
-#: ../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 "Združeni arabski emirati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Velika Britanija"
 
-#: ../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 "Ameriški zunajleže�i otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: ../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 "Britanski deviški otoki"
 
-#: ../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 "Ameriški deviški otoki"
 
-#: ../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 "Wallisovi in Futunini otoki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Zahodna 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 "Zambija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Ime"
 
-#: ../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 "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "Storitev"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Mesto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Doma"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Drugo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Izvorna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Ciljna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Je nov stik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Zapisljiva polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Zahtevana polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Spremenjeno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Urejevalnik stikov - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Izberite sliko za ta stik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Brez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2496,47 +2530,47 @@ msgstr ""
 "Podatki o stiku so neveljavni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ima neveljavno obliko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ima neveljavno obliko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' je prazen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Neveljaven stik."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Uredi celoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Polno ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Izberite imenik"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2545,7 +2579,7 @@ msgstr ""
 "Ste prepri�ani, da želite\n"
 "izbrisati seznam stikov (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2553,7 +2587,7 @@ msgstr ""
 "Ste prepri�ani, da želite\n"
 "izbrisati te sezname stikov?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2562,7 +2596,7 @@ msgstr ""
 "Ste prepri�ani, da želite\n"
 "izbrisati stik (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2670,7 +2704,7 @@ msgstr "Storitev _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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Mesto:"
@@ -2680,7 +2714,7 @@ msgid "<b>Members</b>"
 msgstr "<b>ÄŒlani</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 "Urejevalnik stikov"
 
@@ -2700,25 +2734,25 @@ msgstr "_Ime seznama:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Vnesite e-poštni naslov ali potegnite stik na spodnji seznam:"
 
-#: ../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 "ÄŒlani seznama stikov"
 
-#: ../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 "_ÄŒlani"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Knjiga"
 
-#: ../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 "Je nov seznam"
 
@@ -2755,43 +2789,43 @@ msgstr ""
 "Ime ali e-poštni naslov tega stika že obstaja v tej mapi.\n"
 "Ga želite vseeno dodati?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Združi stik"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Združi"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Združi stik"
+
+#: ../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:425
+#: ../plugins/groupwise-features/junk-settings.c:415
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-pošta"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:166
-#: ../calendar/gui/cal-search-bar.c:81
-#: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-pošta se za�ne z"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Name begins with"
-msgstr "Ime se za�ne z"
+msgid "Name contains"
+msgstr "Ime vsebuje"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2807,10 +2841,10 @@ msgstr[2] "%d stika"
 msgstr[3] "%d stiki"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Poizvedba"
 
@@ -2818,131 +2852,127 @@ msgstr "Poizvedba"
 msgid "Error getting book view"
 msgstr "Napaka ob dobivanju pogleda knjige"
 
-#: ../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:3335
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Ime se za�ne z"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../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 "Vrsta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Shrani kot vCard ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Odpri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Nov stik ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nov _seznam stikov ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Shrani kot vCard ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Posreduj stik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "Posreduj _stike"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Pošlji sporo�ilo _stiku"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Pošlji sporo�ilo se_znamu stikov"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Pošlji sporo�ilo stiko_m"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Natisni"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Kopiraj v imenik ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_Premakni v imenik ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Izreži"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../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:2009
-#: ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332
-#: ../mail/message-list.c:2065
+#: ../composer/e-msg-composer.c:2057
+#: ../mail/em-folder-tree.c:1005
+#: ../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-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:103
 #: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "P_rilepi"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1523
-#: ../calendar/gui/cal-search-bar.c:622
-#: ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1733
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Druga�na napaka"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -2974,7 +3004,7 @@ msgstr "Telefon v avtu"
 
 #: ../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:143
+#: ../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
@@ -3075,9 +3105,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../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 "Vloga"
 
@@ -3113,46 +3143,46 @@ msgid "Web Site"
 msgstr "Spletna stran"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:85
 #: ../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-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-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:3078
-#: ../widgets/table/e-table-item.c:3079
+#: ../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
 msgid "Width"
 msgstr "Å irina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:97
 #: ../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-click-to-add.c:530
 #: ../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:3084
-#: ../widgets/table/e-table-item.c:3085
+#: ../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
 msgid "Height"
 msgstr "Višina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ima fokus"
 
@@ -3172,11 +3202,21 @@ msgstr "Model besedila"
 msgid "Max field name length"
 msgstr "Najve�ja dolžina imena polja"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Å irina stolpca"
 
-#: ../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"
+"Iskanje stikov ..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3190,7 +3230,7 @@ msgstr ""
 "\n"
 "ali pa tukaj dvakrat kliknite z miško, da ustvarite novega."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3204,7 +3244,7 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3214,7 +3254,7 @@ msgstr ""
 "\n"
 "Iskanje stika."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3224,43 +3264,43 @@ msgstr ""
 "\n"
 "V tem pogledu ni predmetov za prikaz."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Prilagojevalnik"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Službena e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Doma�a e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Druga e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Izbrano"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ima kazalec"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../mail/em-popup.c:638
+#: ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Kopiraj mesto povezave"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-popup.c:639
+#: ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "Pošlji novo _sporo�ilo osebi ..."
 
@@ -3303,25 +3343,23 @@ msgid "Video Chat"
 msgstr "Videoklepet"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2372
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../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
+#: ../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-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 "Koledar"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Zasedenost"
 
@@ -3343,12 +3381,18 @@ msgid "Web Log"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2360
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Rojstni dan"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2361
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Obletnica"
 
@@ -3394,7 +3438,7 @@ msgstr "Ni lastnega stika"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
@@ -3416,12 +3460,12 @@ msgstr "Protokol ni podprt"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643
+#: ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Preklicano"
 
@@ -3457,94 +3501,117 @@ msgstr "Ni takšnega vira"
 msgid "Not available in offline mode"
 msgstr "Ni na voljo v na�inu brez povezave"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Druga�na napaka"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Neveljavna razli�ica strežnika"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
-msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "Nepodprto dejanje"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#, fuzzy
+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 "Odpiranje tega imenika ni uspelo. Knjiga ni ozna�ena za uporabo brez povezave ali pa še ni prenesena. Za prenos vsebine knjige morate enkrat naložiti imenika v stanju na zvezi"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
-#, c-format
-msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#, fuzzy, 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 "Odpiranje tega imenika ni bilo uspelo. Preverite, ali pot %s obstaja in ali imate dovoljenje za dostop."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#, fuzzy
+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 "Odpiranje tega imenika ni bilo uspelo. To pomeni, da ste vpisali neveljaven URI ali da je LDAP strežnik nedosegljiv."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "Ta razli�ica Evolutiona nima vgrajene podpore za LDAP. Če želite uporabljati LDAP, morate namestiti paket Evolutiona s podporo za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, fuzzy
+msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the server is unreachable."
 msgstr "Odpiranje tega imenika ni uspelo. To pomeni, da ste vpisali neveljaven URI ali da je LDAP strežnik nedosegljiv."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#, fuzzy
+msgid "Detailed error:"
+msgstr "Neobdelana napaka"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#, 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 ""
 "Poizvedbi ustreza ve� vizitk kot jih lahko vrne strežnik \n"
 "ali kot jih lahko prikaže Evolution.\n"
 "Vnesite strožje pogoje iskanja ali pove�ajte omejitev števila\n"
 "rezultatov iskanja v nastavitvah strežnika map za ta imenik."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#, 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 za izvedbo poizvedbe je presegel omejitev strežnika ali\n"
 "omejitev, ki ste jo nastavili za imenik. Vnesite strožje pogoje iskanja\n"
 "ali pove�ajte �asovno omejitev v nastavitvah strežnika map za ta imenik."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Hrbtni del tega imenika ni uspel raz�leniti te poizvedbe."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "Hrbtni del tega imenika je zavrnil izvajanje te poizvedbe."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Poizvedba se ni izvedla v celoti."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "Napaka pri dodajanju stika"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "Napaka pri spreminjanju stika"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "Napaka pri odstranjevanju stika"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3565,16 +3632,16 @@ msgstr[3] ""
 "Odpiranje stika %d bo odprlo %d nova okna.\n"
 "Ali zares želite prikazati ta stik?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_Ne prikaži"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "Prikaži _vse stike"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3583,15 +3650,15 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 msgid "Overwrite"
 msgstr "Prepiši"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "stikov"
@@ -3600,55 +3667,55 @@ msgstr[2] "stika"
 msgstr[3] "stiki"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "vizitka.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "Izbor imenika"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "seznam"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "Premakni stik v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "Kopiraj stik v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "Premakni stike v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "Kopiraj stike v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "Ve� vizitk vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard za %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "Podatki o stiku"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "Podatki o stiku za %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Poizvedovanje imenika ..."
 
@@ -3671,51 +3738,52 @@ msgid "Show Compact vCard"
 msgstr "Prikaži skr�eno vCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+#, fuzzy
+msgid "Save in address book"
 msgstr "Shranite v imenik"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Pogled vizitke"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671
 #: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Uvažanje ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ali Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Uvoznik Outlook CSV in Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ali Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ali Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Uvoznik Evolution CSV in Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Zapis za imenjavo podatkov LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Uvoznik Evolution LDIF"
 
@@ -3768,13 +3836,13 @@ msgid "Format"
 msgstr "Oblika izpisa"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432
+#: ../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-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Glava"
 
@@ -3876,8 +3944,8 @@ msgstr "Sen�enje"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Velikost:"
@@ -3895,7 +3963,7 @@ msgid "Top:"
 msgstr "Zgoraj:"
 
 #: ../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 "Vrsta:"
 
@@ -3907,35 +3975,36 @@ msgstr "Å irina:"
 msgid "_Font..."
 msgstr "_Pisava ..."
 
-#: ../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 "Preskus urejevalnika izpisa stikov"
 
-#: ../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 "Avtorske pravice pridržane (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 "S tem lahko preizkusite gradnik za urejanje sloga izpisa"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Preskus izpisa stikov"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "S tem lahko preizkusite kodo izpisa vizitke"
 
-#: ../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 "Ni mogo�e odpreti datoteke"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+#, fuzzy
+msgid "Couldn't get list of address books"
 msgstr "Ni mogo�e naložiti seznama imenikov"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -3951,7 +4020,8 @@ msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+#, fuzzy
+msgid "List local address book folders"
 msgstr "Seznam map lokalnih imenikov"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -3996,12 +4066,13 @@ msgstr "Neobdelana napaka"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar source. Change Calendar to one that can accept appointments."
-msgstr "'{0}' je vir koledarja samo za branje. Preklopite na pogled koledarja in ozna�ite koledar, ki lahko sprejema sestanke."
+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 source. Switch to Calendar View and highlight a calendar that can accept appointments."
+#, fuzzy
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
 msgstr "'{0}' je vir koledarja samo za branje. Preklopite na pogled koledarja in ozna�ite koledar, ki lahko sprejema sestanke."
 
 #: ../calendar/calendar.error.xml.h:5
@@ -4073,19 +4144,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Ste prepri�ani, da želite izbrisati ta sestanek?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ste prepri�ani, da želite izbrisati ta sestanek?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Ste prepri�ani, da želite izbrisati ta opomnik?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ste prepri�ani, da želite izbrisati to opravilo?"
@@ -4207,7 +4278,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Koledar ni ozna�en za uporabo brez povezave."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Seznam zapiskov ni ozna�en za uporabo brez povezave"
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4291,13 +4363,12 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Vaša opravila ne bodo na voljo do ponovnega zagona Evolutiona."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Prezri spremembe"
 
 #: ../calendar/calendar.error.xml.h:76
-#: ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Shrani"
 
@@ -4306,9 +4377,9 @@ msgid "_Save Changes"
 msgstr "_Shrani spremembe"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33
-#: ../mail/mail.error.xml.h:145
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../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 "_Pošlji"
 
@@ -4320,55 +4391,56 @@ msgstr "_Pošlji obvestilo"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Lo�i ve�dnevne dogodke:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Ni mogo�e zagnati evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ni mogo�e prebrati Pilotovega koledarja"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Ni mogo�e prebrati Pilotovega zapiska"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Ni mogo�e zapisati Pilotovega zapiska"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Privzeta prednost:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ni mogo�e prebrati Pilotovega seznama opravil"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Ni mogo�e zapisati Pilotovega seznama opravil"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Koledar in opravila"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Koledarji"
 
@@ -4410,30 +4482,30 @@ msgstr "Zapisk_i"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280
-#: ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1698
+#: ../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:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Zapiski"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495
-#: ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1570
-#: ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../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: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 "Naloge"
@@ -4451,7 +4523,7 @@ msgstr "_Opravila"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Storitev obvestil alarma koledarja Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -4459,14 +4531,15 @@ msgstr[1] "minuta"
 msgstr[2] "minuti"
 msgstr[3] "minute"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ur"
@@ -4474,7 +4547,7 @@ msgstr[1] "ura"
 msgstr[2] "uri"
 msgstr[3] "ure"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Čas za�etka"
 
@@ -4485,9 +4558,9 @@ msgstr "Sestanki"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Kraj:"
@@ -4497,20 +4570,18 @@ msgid "Snooze _time:"
 msgstr "Čas _dremeža:"
 
 #: ../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:166
+#: ../mail/mail-config.glade.h:167
 #: ../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-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10
 #: ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Uredi"
@@ -4523,32 +4594,32 @@ msgstr "_Dremež"
 msgid "location of appointment"
 msgstr "kraj sestanka"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Podatki o kraju niso na voljo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Imate %d alarmov"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4560,7 +4631,7 @@ msgstr ""
 "bil nastavljen, da pošlje e-pošto. Evolution bo\n"
 "prikazal obi�ajno pogovorno okno opomnika."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4576,26 +4647,26 @@ msgstr ""
 "\n"
 "Ste prepri�ani, da želite pognati ta program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj ve�."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Ni mogo�e zagnati Bonoba"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "Ni mogo�e ustvariti tovarne opozorilnega alarma; morda že te�e ..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "neveljaven �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
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4605,9 +4676,9 @@ msgstr[2] "%d uri"
 msgstr[3] "%d ur"
 
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4619,9 +4690,9 @@ msgstr[3] "%d minute"
 #. 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
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4839,12 +4910,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Prikaži polje stanja v urejevalniku dogodkov/opravil/sestankov."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži pano \"predogleda\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Prikaži pano \"Predogled\"."
 
@@ -4886,7 +4957,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "ÄŒas, ko je tekel zadnji alarm (v time_t)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "ÄŒasovni pas "
 
@@ -5006,61 +5077,61 @@ msgstr "Minuta za�etka delovnega dneva"
 msgid "daylight savings time"
 msgstr "prilagojeni �as"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Kategorija je"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Kraj vsebuje"
 
-#: ../calendar/gui/cal-search-bar.c:626
-#: ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629
+#: ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Naloge naslednjih 7 dni"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Dejavne naloge"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Zakasnjene naloge"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Kon�ane naloge"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Naloge s priponkami"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Dejavni sestanki"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Sestanki naslednjih 7 dni"
 
-#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-commands.c:92
 #: ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75
@@ -5069,20 +5140,21 @@ msgstr "Sestanki naslednjih 7 dni"
 msgid "Print"
 msgstr "Natisni"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "Ta operacija bo za vedno izbrisala vse dogodke, ki so starejši od izbrane vrednosti. Če boste nadaljevali, ne boste mogli povrniti teh opravil."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Po�isti dogodke, starejše kot"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
+#: ../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 "dni"
@@ -5093,139 +5165,385 @@ msgstr "dni"
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:273
 #: ../calendar/gui/memos-component.c:235
-#: ../calendar/gui/migration.c:510
-#: ../calendar/gui/migration.c:609
-#: ../calendar/gui/migration.c:1123
+#: ../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 spletu"
 
-#: ../calendar/gui/calendar-component.c:296
-#: ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:310
+#: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Rojstni dnevi in obletnice"
 
 #. 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 "Vreme"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Nov koledar"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465
 #: ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopiraj ..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471
-#: ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1045
-#: ../mail/em-folder-tree.c:2101
-#: ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Lastnosti"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Nadgradnja koledarjev ni uspela."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ni mogo�e odpreti koledarja '%s' za ustvarjanje dogodkov in sestankov"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Na voljo ni nobenega koledarja za ustvarjanje dogodkov in sestankov"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Izbirnik vira koledarja"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "S_estanek"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sestanek"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nov celodnevni sestanek"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevni _sestanek"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov celodnevni sestanek"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nov koledar"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Koledar"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Dnevni pogled"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Pogled delavnega tedna"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Tedenski pogled"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Mese�ni pogled"
 
 #: ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Katerokoli polje"
+
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6
+#: ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Priponke"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Udeležen"
+
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "posel"
+
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Kategorija"
+
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Razvrstitev"
+
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Tekmovanje"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Srednje zaupno"
+
+#: ../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 "Opis"
+
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Opis vsebuje"
 
-#: ../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:22
+msgid "Do Not Exist"
+msgstr "ne obstaja"
+
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "obstaja"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Priljubljeno"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Darila"
+
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Cilji"
+
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Prazniki"
+
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Prazni�ne voš�ilnice"
+
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Vro�i stiki"
+
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideje"
+
+#: ../calendar/gui/caltypes.xml.h:23
+#: ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Mednarodno"
+
+#: ../calendar/gui/caltypes.xml.h:24
+#: ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Klju�na stranka"
+
+#: ../calendar/gui/caltypes.xml.h:26
+#: ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Razli�no"
+
+#: ../calendar/gui/caltypes.xml.h:27
+#: ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Naslednjih 7 dni"
+
+#: ../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 "Organizator"
+
+#: ../calendar/gui/caltypes.xml.h:30
+#: ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Telefonski klici"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "osebno"
+
+#: ../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
+msgid "Public"
+msgstr "javno"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Ponovitev"
+
+#: ../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:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stanje"
+
+#: ../calendar/gui/caltypes.xml.h:35
+#: ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategije"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Povzetek"
+
+#: ../calendar/gui/caltypes.xml.h:37
+#: ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Povzetek vsebuje"
 
+#: ../calendar/gui/caltypes.xml.h:38
+#: ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Dobavitelji"
+
+#: ../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 "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41
+#: ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "ÄŒakanje"
+
+#: ../calendar/gui/caltypes.xml.h:42
+#: ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47
+#: ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "vsebuje"
+
+#: ../calendar/gui/caltypes.xml.h:43
+#: ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48
+#: ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "ne vsebuje"
+
+#: ../calendar/gui/caltypes.xml.h:44
+#: ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49
+#: ../mail/em-filter-i18n.h:30
+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:36
+msgid "is not"
+msgstr "ni"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Napaka pri odpiranju koledarja"
@@ -5239,11 +5557,11 @@ msgid "Permission denied to open the calendar"
 msgstr "Nimate dovoljenja za odpiranje koledarja"
 
 #: ../calendar/gui/comp-editor-factory.c:429
-#: ../shell/e-shell.c:1290
+#: ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Uredi alarm"
 
@@ -5276,17 +5594,17 @@ msgid "Mes_sage:"
 msgstr "_Sporo�ilo:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Prikaži opozorilo"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Poženi program"
 
@@ -5299,7 +5617,7 @@ msgid "Send To:"
 msgstr "Pošlji za:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Pošlji e-pošto"
 
@@ -5354,7 +5672,7 @@ msgstr "minut"
 msgid "start of appointment"
 msgstr "pri�etek sestanka"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Dejanje/Prožilec"
 
@@ -5365,16 +5683,15 @@ msgstr "_Dodaj"
 #: ../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 "Alarmi"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "Predlagaj _samodejen prikaz priponk"
 
-#: ../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 datoteko(e)"
 
@@ -5441,8 +5758,8 @@ msgid "Display"
 msgstr "Prikaz"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "petek"
 
@@ -5457,8 +5774,8 @@ msgstr ""
 "Dnevi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -5481,7 +5798,7 @@ msgstr ""
 "Nedelja"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
@@ -5491,8 +5808,8 @@ msgid "S_un"
 msgstr "_ned"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sobota"
 
@@ -5509,8 +5826,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Prikaži številke tednov v krmarju po dnevih"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -5528,13 +5845,13 @@ msgid "Template:"
 msgstr "Predloga:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "�etrtek"
 
 #: ../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 "ÄŒasovni _pas:"
 
@@ -5543,14 +5860,14 @@ msgid "Time format:"
 msgstr "Oblika izpisa �asa:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "torek"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -5628,138 +5945,138 @@ msgstr "_sre"
 msgid "before every appointment"
 msgstr "pred vsakim sestankom"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopira_j vsebino koledarja lokalno za delo brez povezave"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopira_j vsebino seznama opravil lokalno za delo brez povezave"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopira_j vsebino opomnikov lokalno za delo brez povezave"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_Barva:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Seznam opravil"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Seznam zapiskov"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Lastnosti koledarja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Nov koledar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Lastnosti seznama opravil"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Nov seznam opravil"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Lastnosti seznama opravil"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nov seznam zapiskov"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil izbrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "To opravilo je bilo izbrisano."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Ta opomnik je izbrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Naredili ste spremembe. Jih prekli�em in zaprem urejevalnik?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Ni�esar niste spremenili, zapri urejevalnik?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Ta posel je bil spremenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Ta opomnik je bil spremenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Naredili ste spremembe. Jih prekli�em in posodobim urejevalnik?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ni�esar niste spremenili, posodobi urejevalnik?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Napaka pri potrjevanju: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186
+#: ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190
+#: ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Kon�ano "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192
+#: ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "kon�ano "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197
+#: ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Rok "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199
+#: ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Rok"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Priloženo sporo�ilo - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385
-#: ../composer/e-msg-composer.c:1723
-#: ../composer/e-msg-composer.c:1942
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5768,35 +6085,223 @@ msgstr[1] "%d priloženo sporo�ilo"
 msgstr[2] "%d priloženi sporo�ili"
 msgstr[3] "%d priložena sporo�ila"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456
-#: ../composer/e-msg-composer.c:2010
-#: ../mail/em-folder-tree.c:999
-#: ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193
-#: ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481
+#: ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006
+#: ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186
+#: ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "Pre_makni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458
-#: ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:1001
-#: ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483
+#: ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008
+#: ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Prekli�i _vle�enje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856
+#: ../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:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "priponka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Ni mogo�e posodobiti predmeta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Uredi sestanke"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Sestanek - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Sestanek - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Dodeljeno opravilo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Zapisek -%s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Ni povzetka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Kliknite tukaj za zapiranje trenutnega okna"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Kopiraj izbrano besedilo na odložiš�e"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Izreži izbrano besedilo na odložiš�e"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Kliknite tukaj za ogled pomo�i, ki je na voljo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Prilepi besedilo z odložiš�a"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Kliknite tukaj za shranjevanje trenutnega okna"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Izberi vso besedilo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Razvrstitev"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Pomo�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Vstavi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "M_ožnosti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../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 "Po_gled"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Priponka ..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Kliknite tukaj za dodajanje priponk"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Kategorije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Preklopi prikaz kategorij"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "ÄŒasovni _pas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Preklopi prikaz �asovnega pasa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "_Javno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Razvrsti kot javno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "Z_asebno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Razvrsti kot zasebno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Srednje zaupno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Razvrsti kot zaupno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "Polje Vl_oga"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Preklopi prikaz polja Vloga"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Preklopi prikaz polja RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "Polje _Stanje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Preklopi prikaz polja Stanje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "Polje _Vrsta"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Preklopi prikaz polja vrste udeleženca"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "_Nedavni dokumenti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Priloži"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5805,150 +6310,111 @@ msgstr[1] "<b>%d</b>priponka"
 msgstr[2] "<b>%d</b> priponki"
 msgstr[3] "<b>%d</b> priponke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Skrij vrstico priponk"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Prikaži vrstico priponk"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266
-#: ../composer/e-msg-composer.c:1044
+#: ../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
 #: ../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 "_Odstrani"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../composer/e-msg-composer.c:1047
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Dod_aj priponke ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Prikaži priponke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Za preklop vrstice priponk pritisnite preslednico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Uredi sestanke"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Sestanek - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Sestanek - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Dodeljeno opravilo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Zapisek -%s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "Ni povzetka"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Spremembe tega predmeta bodo morda prezrte, �e prispe popravek"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Ni mogo�e uporabiti trenutne razli�ice!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Ni mogo�e odpreti vira"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Ni mogo�e odpreti cilja"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Cilj je mogo�e samo brati"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "Zbrišem ta predem iz poštnih predalov vseh ostalih prejemnikov?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Dogodka ni mogo�e izbrisati zaradi napake corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Opravila ni mogo�e izbrisati zaradi napake corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Opomnika ni mogo�e izbrisati zaradi napake corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Predmeta ni bilo mogo�e izbrisati zaradi napake corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Dogodka ni mogo�e izbrisati zaradi neustreznih dovoljenj"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Opravila ni bilo mogo�e izbrisati, ker nimate dovoljenja"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Opomnika ni mogo�e izbrisati zaradi neustreznih dovoljenj"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Predmeta ni mogo�e izbrisati zaradi neustreznih dovoljenj"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Dogodka ni bilo mogo�e izbrisati zaradi napake"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Opravila ni bilo mogo�e izbrisati zaradi napake"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Opomnika ni mogo�e izbrisati zaradi napake"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogo�e izbrisati zaradi napake"
 
@@ -5957,7 +6423,7 @@ msgid "Contacts..."
 msgstr "Stiki ..."
 
 #: ../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 "Pooblasti Za:"
 
@@ -5965,96 +6431,142 @@ msgstr "Pooblasti Za:"
 msgid "Enter Delegate"
 msgstr "Vnesite pooblaš�enca"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarmi"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "Kliknite tukaj za nastavljanje alarmov za ta dogodek"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Ponovitev"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Ozna�i dogodek kot ponovljiv"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Možnosti pošiljanja"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Vstavi napredne možnosti pošiljanja"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "Celo_dnevni dogodek"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Preklopi celodnevnost dogodka"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Prikaži �as kot _zaseden"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Preklopi prikaz zasedenosti �asa"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Zasedenost"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Poizvedi stanje zasedenosti udeležencev"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Sestanki"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Ponovitev"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Dogodek ima alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Pooblaš�enci"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Udeleže_nci"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Dogodek brez za�etnega datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Dogodek brez kon�nega datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Datum za�etka je napa�en"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Kon�ni datum je napa�en"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Čas za�etka je napa�en"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Kon�ni �as je napa�en"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Izbran organizator nima ve� ra�una."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Potreben je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "Dod_aj"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ni bilo mogo�e odpreti koledarja '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Trenutno delujete v imenu %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6063,7 +6575,7 @@ msgstr[1] "%d dan pred sestankom"
 msgstr[2] "%d dni pred sestankom"
 msgstr[3] "%d dni pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6072,7 +6584,7 @@ msgstr[1] "%d ura pred sestankom"
 msgstr[2] "%d uri pred sestankom"
 msgstr[3] "%d ure pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6081,29 +6593,29 @@ msgstr[1] "%d minuto pred sestankom"
 msgstr[2] "%d minuti pred sestankom"
 msgstr[3] "%d minute pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Prilagodi"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141
-#: ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445
-#: ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158
+#: ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685
+#: ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:249
-#: ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
-#: ../widgets/misc/e-signature-combo-box.c:69
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "brez"
 
@@ -6128,23 +6640,25 @@ msgid "Custom Alarm:"
 msgstr "Alarm po meri:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Opis:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Opis dogodka:"
 
-#: ../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 "Po_vzetek:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarmi"
 
+#: ../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 "_Opis:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_ÄŒas:"
@@ -6175,32 +6689,28 @@ msgstr "_Spremeni organizatorja"
 msgid "Co_ntacts..."
 msgstr "_Stiki ..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organizator"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141
+#: ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Zapisek"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ni mogo�e odpreti zapiskov v '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136
-#: ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1642
-#: ../mail/em-format-quote.c:209
+#: ../calendar/gui/dialogs/memo-page.c:1002
+#: ../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:92
+#: ../mail/em-mailer-prefs.c:77
 #: ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Za"
@@ -6214,63 +6724,59 @@ msgstr "_Datum za�etka:"
 msgid "T_o:"
 msgstr "Za:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Opis:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Skupina:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Spreminjate dogodek, ki se ponavlja. Kaj želite spremeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Pooblastiti želite dogodek, ki se ponavlja. Kaj želite pooblastiti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Spreminjate ponavljujo�e opravilo. Kaj želite spremeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Spreminjate dogodek, ki se ponavlja. Kaj želite spremeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Samo primerek"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Ta in pretekli primerki"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Ta in prihodnji primerki"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Vsi primerki"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolution ne zna urejati."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "ÄŒas ponovitve ni veljaven"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "na"
 
@@ -6278,7 +6784,7 @@ msgstr "na"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "prvi"
 
@@ -6287,7 +6793,7 @@ msgstr "prvi"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "sekunda"
 
@@ -6295,7 +6801,7 @@ msgstr "sekunda"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tretji"
 
@@ -6303,7 +6809,7 @@ msgstr "tretji"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "�etrti"
 
@@ -6311,13 +6817,13 @@ msgstr "�etrti"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "zadnji"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -6325,7 +6831,7 @@ msgstr "Drugi 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1. do 10."
 
@@ -6333,7 +6839,7 @@ msgstr "1. do 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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "1. do 20."
 
@@ -6341,45 +6847,45 @@ msgstr "1. do 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21. do 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "dan"
 
 #. 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Dodaj izjemo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Ni mogo�e dobiti izbire za spreminjanje."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Spremeni izjemo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Ni mogo�e dobiti izbire za brisanje."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/�as"
 
@@ -6430,12 +6936,12 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: ../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 "Datum konca je napa�en"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Spletna stran"
 
@@ -6450,59 +6956,64 @@ msgstr "<span weight=\"bold\">Stanje</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:252
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435
-#: ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182
-#: ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642
+#: ../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
 msgid "Completed"
 msgstr "kon�ano"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360
+#: ../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
 msgid "High"
 msgstr "visoka"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434
-#: ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641
+#: ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "v teku"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362
+#: ../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
 msgid "Low"
 msgstr "nizka"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966
-#: ../calendar/gui/e-calendar-table.c:361
+#: ../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
 msgid "Normal"
 msgstr "obi�ajna"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ni pri�eto"
 
@@ -6515,7 +7026,8 @@ msgid "Stat_us:"
 msgstr "S_tanje:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570
+#: ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "ni definirana"
 
@@ -6532,25 +7044,38 @@ msgstr "_Prednost:"
 msgid "_Web Page:"
 msgstr "_Spletna stran:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "Podrobnosti _stanja"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Kliknite spremeni / preglej podrobnosti stanja opravila"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "Možnosti _pošiljanja"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Naloga"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Podrobnosti opravila"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Rok je napa�en"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ni mogo�e odpreti opravil v '%s'."
@@ -6564,19 +7089,15 @@ msgid "Categor_ies..."
 msgstr "Kategor_ije ..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Opis:"
+msgid "D_ue date:"
+msgstr "_Datum konca:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "ÄŒasovni pas:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Datum konca:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6586,7 +7107,7 @@ msgstr[2] "%d dni"
 msgstr[3] "%d dni"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -6595,142 +7116,122 @@ msgstr[1] "%d teden"
 msgstr[2] "%d tedna"
 msgstr[3] "%d tedni"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Izvršena bi moralo biti neznano dejanje"
 
 #. 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:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pred pri�etkom sestanka"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po pri�etku sestanka"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ob pri�etku sestanka"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pred koncem sestanka"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po koncu sestanka"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na koncu sestanka"
 
 #. 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:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s ob %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:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za neznano vrsto sprožilca"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72
-#: ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73
+#: ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za odpiranje %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176
-#: ../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:857
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../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 "Datum za�etka:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../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 "Opis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Spletna stran:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../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 "Povzetek:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Do datuma:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prednost:"
 
-#: ../calendar/gui/e-cal-list-view.c:257
-#: ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "javno"
-
-#: ../calendar/gui/e-cal-list-view.c:258
-#: ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "osebno"
-
-#: ../calendar/gui/e-cal-list-view.c:259
-#: ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Srednje zaupno"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Datum konca"
@@ -6740,22 +7241,14 @@ msgstr "Datum konca"
 msgid "Start Date"
 msgstr "Datum pri�etka"
 
-#: ../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:365
-msgid "Summary"
-msgstr "Povzetek"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Prost"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Zaseden"
 
@@ -6770,83 +7263,83 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-cal-model.c:980
+#: ../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 "Da"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-cal-model.c:980
+#: ../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 "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331
+#: ../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-itip-control.c:1186
-#: ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986
+#: ../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:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../plugins/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "neznano"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "Dodeljeno"
 
 #: ../calendar/gui/e-cal-popup.c:183
-#: ../mail/em-popup.c:427
+#: ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
 #: ../calendar/gui/e-cal-popup.c:199
-#: ../mail/em-format-html-display.c:2052
+#: ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Izberite mapo za shranjevanje izbranih priponk ..."
 
 #: ../calendar/gui/e-cal-popup.c:231
-#: ../mail/em-popup.c:455
+#: ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
 #: ../calendar/gui/e-cal-popup.c:285
-#: ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1672
 #: ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
 msgid "_Save As..."
 msgstr "_Shrani kot ..."
 
 #: ../calendar/gui/e-cal-popup.c:286
+#: ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
 msgid "Set as _Background"
 msgstr "Nastavi za _ozadje"
 
@@ -6854,93 +7347,120 @@ msgstr "Nastavi za _ozadje"
 msgid "_Save Selected"
 msgstr "_Shrani izbrano"
 
-#: ../calendar/gui/e-cal-popup.c:439
-#: ../mail/em-popup.c:853
+#: ../calendar/gui/e-cal-popup.c:428
+#: ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s ..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Ni povzetka *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizator: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Za�etek:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Do:"
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:679
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665
 #: ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:809
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795
 #: ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1235
+#: ../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:277
 msgid "Save as..."
 msgstr "Shrani kot ..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Novo _opravilo"
 
-#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-calendar-table.c:1575
 #: ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Odpri _spletno stran"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1671
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657
 #: ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Na_tisni ..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677
 #: ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
@@ -6949,50 +7469,49 @@ msgstr "Na_tisni ..."
 msgid "C_ut"
 msgstr "_Izreži"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1674
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19
 #: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1587
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Dodeli opr_avilo"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1588
 #: ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Posreduj kot i_Koledar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Ozna�i kot opravljeno"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Ozna�i izbrana opravila kot dokon�ana"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Ozna�i kot nedokon�ano"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Ozna�i izbrana opravila kot nedokon�ana"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
@@ -7015,7 +7534,8 @@ msgid "Due date"
 msgstr "Datum konca"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prednost"
 
@@ -7023,132 +7543,112 @@ msgstr "Prednost"
 msgid "Start date"
 msgstr "Datum za�etka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stanje"
-
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Premikanje predmetov"
 
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Kopiranje predmetov"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Nov _sestanek ..."
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nov _sestanek"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Izberi _danes"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Izberi datum ..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Na_tisni ..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj v _koledar ..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Kopiraj _v mapo ..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Pooblasti sestanek ..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Na�rtuj sestanek ..."
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj kot i_Koledar ..."
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "Odgovo_ri"
 
-#: ../calendar/gui/e-calendar-view.c:1703
-#: ../mail/em-folder-view.c:1337
+#: ../calendar/gui/e-calendar-view.c:1689
+#: ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566
 #: ../mail/em-popup.c:577
-#: ../mail/em-popup.c:588
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: ../calendar/gui/e-calendar-view.c:1709
+#: ../calendar/gui/e-calendar-view.c:1695
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2232
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2236
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2252
-#: ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Kraj: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 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
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7172,37 +7672,32 @@ msgstr "%02i delitev minute"
 #. 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:837
-#: ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322
-#: ../calendar/gui/print.c:1656
+#: ../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
 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:772
-#: ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791
+#: ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775
-#: ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794
+#: ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pop"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Zapletena ponovitev)"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7211,11 +7706,6 @@ msgstr[1] "Vsak %d dan"
 msgstr[2] "Vsak %d dan"
 msgstr[3] "Vsak %d dan"
 
-#. 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
 #, c-format
 msgid "Every week"
@@ -7225,9 +7715,7 @@ msgstr[1] "Vsak %d teden"
 msgstr[2] "Vsak %d teden"
 msgstr[3] "Vsak %d teden"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7237,30 +7725,21 @@ msgstr[2] "Vsak %d teden v"
 msgstr[3] "Vsak %d teden 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 " in"
 
-#. 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 dan v "
 
-#. 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 v "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7269,12 +7748,7 @@ msgstr[1] "Vsak %d mesec"
 msgstr[2] "Vsak %d mesec"
 msgstr[3] "Vsak %d mesec"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7283,9 +7757,7 @@ msgstr[1] "Vsako %d leto"
 msgstr[2] "Vsako %d leto"
 msgstr[3] "Vsako %d leto"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7295,339 +7767,339 @@ msgstr[2] "Skupaj %d-krat"
 msgstr[3] "Skupaj %d-krat"
 
 #. 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 ", ki se kon�a"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Za�etek"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Konec"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Konec"
 
-#: ../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 "Podatki o iKoledarju"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: ../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:1092
+#: ../calendar/gui/e-itip-control.c:1108
 #: ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "neznana oseba"
 
 #. 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> Prosimo, preglejte slede�e podatke in izberite dejanje iz spodnjega menija."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../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:2034
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../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:705
-#: ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../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:2040
 msgid "Declined"
 msgstr "Odklonjeno"
 
-#: ../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 "Sestanek je bil odpovedan, vendar ga ni bilo mogo�e najti v vaših koledarjih"
 
-#: ../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 "Opravilo je bilo preklicano, vendar ga ni bilo mogo�e najti v vašem seznamu opravil"
 
-#: ../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> je izdal(a) podatke o sestanku."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: ../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> zahteva prisotnost %s na sestanku."
 
-#: ../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> zahteva vašo prisotnost na sestanku."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> želi biti dodan na seznam udeležencev sestanka."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: ../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> želi dobiti najnovejše podatke o sestanku."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: ../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> je odgovoril(a) na zahtevek po sestanku."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Preklic sestanka"
 
-#: ../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> je poslal(a) nerazumljivo sporo�ilo."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporo�ilo o sestanku"
 
-#: ../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> je objavil(a) podatke o nalogi."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: ../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> zahteva, da %s opravi nalogo."
 
-#: ../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> zahteva, da opravite nalogo."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> želi biti dodan na seznam izvajalcev izbrane naloge."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: ../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> želi dobiti najnovejše podatke o nalogi."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: ../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> je odgovoril(a) na dodelitev naloge."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> je preklical(a) opravilo."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Preklic opravila"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporo�ilo o nalogi"
 
-#: ../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> je objavil(a) podatke o zasedenosti."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: ../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> zahteva vaše podatke o zasedenosti."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: ../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> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporo�ilo o zasedenosti"
 
-#: ../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 "Zdi se, da sporo�ilo ni pravilno oblikovano"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "To sporo�ilo vsebuje le nepodprte zahtevke."
 
-#: ../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 "Priponka ne vsebuje veljavnega sporo�ila koledarja"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Priponka nima gledljivih predmetov koledarja"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Posodobitev kon�ana\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Predmet je neveljaven in ga ni mogo�e posodobiti\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Odgovora ni poslal trenutni udeleženec. Ga želite dodati kot udeleženca?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja ve�"
 
-#: ../calendar/gui/e-itip-control.c:2088
-#: ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111
+#: ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094
-#: ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117
+#: ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogo�e poslati!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: ../calendar/gui/e-itip-control.c:2447
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470
+#: ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekli�i"
@@ -7656,127 +8128,127 @@ msgstr "Nalaganje koledarja ..."
 msgid "Server Message:"
 msgstr "Sporo�ilo strežnika:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Predsedujo�i"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Obvezno udeleženi"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Neobvezno udeleženi"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Viri"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Udeleženci"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87
-#: ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741
-#: ../calendar/gui/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Individualno"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89
-#: ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966
+#: ../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
 msgid "Group"
 msgstr "Skupina"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91
-#: ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Vir"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93
-#: ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122
-#: ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Stol"
 
-#: ../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-store.c:744
-#: ../calendar/gui/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Možni sodelujo�i"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Ne-sodelujo�i"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../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 "Potrebuje dejanje"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../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
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180
-#: ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../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
 msgid "Delegated"
 msgstr "Pooblaš�eno"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Udeleženec"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../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:184
-#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "V obdelavi"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -7784,85 +8256,81 @@ msgstr "%A, %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Iz pisarne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "_Udeleženci ..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_Možnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Prikaži le del_ovne ure"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Prikaži _pomanjšano"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Posodobi zasedenost"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "Vsi ljudje in vs_a sredstva"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Vsi _ljudje in eno sredstvo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Pot_rebni ljudje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Potrebni ljudje in _eno sredstvo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Čas pri�etka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_ÄŒas konca:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Udeležen"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Kliknite tu za dodajo udeleženca"
@@ -7896,9 +8364,9 @@ msgstr "_Zbriši izbrane zapiske"
 msgid "Click to add a memo"
 msgstr "Kliknite za dodajanje zapiska"
 
-#: ../calendar/gui/e-memos.c:761
-#: ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2860
+#: ../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"
@@ -7907,86 +8375,82 @@ msgstr ""
 "Napaka ob %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Nalaganje zapiskov"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Odpiranje zapiskov v %s"
 
-#: ../calendar/gui/e-memos.c:1063
-#: ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062
+#: ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Brisanje izbranih predmetov ..."
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Nalaganje opravil"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Dokon�evanje opravil ..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Uni�ujem"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Izberi �asovni pas"
 
 #. 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:339
-#: ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343
+#: ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:825
-msgid "Updating query"
-msgstr "Posodabljanje poizvedbe"
-
-#: ../calendar/gui/gnome-cal.c:2497
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "Pogled _po meri"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Shrani pogled po meri"
 
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Dolo�i poglede ..."
 
-#: ../calendar/gui/gnome-cal.c:2684
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Nalaganje sestankov pri %s"
 
-#: ../calendar/gui/gnome-cal.c:2703
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Nalaganje opravil pri %s"
 
-#: ../calendar/gui/gnome-cal.c:2712
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Nalaganje zapiskov v %s"
 
-#: ../calendar/gui/gnome-cal.c:2819
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Odpiranje %s"
 
-#: ../calendar/gui/gnome-cal.c:3776
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Čiš�enje"
 
@@ -8046,62 +8510,62 @@ msgstr "september"
 msgid "_Select Today"
 msgstr "Izberi danes"
 
-#: ../calendar/gui/itip-utils.c:439
-#: ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../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 "Organizator mora biti naveden."
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Potreben je vsaj en udeleženec"
 
-#: ../calendar/gui/itip-utils.c:661
-#: ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626
+#: ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: ../calendar/gui/itip-utils.c:663
-#: ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628
+#: ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: ../calendar/gui/itip-utils.c:665
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Podrobnosti opomnikov"
 
-#: ../calendar/gui/itip-utils.c:667
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Osveži"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podatki o zasedenosti (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Podatki o iKodledarju"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
@@ -8145,48 +8609,55 @@ msgstr "Za ustvarjanje zapiskov ni na voljo nobenega koledarja"
 msgid "Memo Source Selector"
 msgstr "Izbirnik vira zapiskov"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nov zapisek"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "Zapise_k"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Ustvari nov zapisek"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nov zapisek v skupni rabi"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Zapisek v _skupni rabi"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Ustvari nov zapisek v skupni rabi"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nov seznam zapiskov"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Seznam zapiskov"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Ustvari nov seznam zapiskov"
 
-#: ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Natisni zapiske"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Naslednjih 7 dni"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
@@ -8196,7 +8667,7 @@ msgstr ""
 "\n"
 "Bodite pozorni, medtem ko Evolution premika vaše mape ..."
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
@@ -8207,28 +8678,28 @@ msgstr ""
 "Bodite pozorni, medtem ko Evolution premika vaše mape ..."
 
 #. 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 "Ni mogo�e preseliti starih nastavitev iz evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ni mogo�e premakniti koledarja '%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ni mogo�e premakniti opravil '%s'"
 
-#: ../calendar/gui/migration.c:1232
-#: ../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
+#: ../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 "Opombe"
 
@@ -8385,57 +8856,52 @@ msgstr "pe"
 msgid "Sa"
 msgstr "so"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Naloga"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Povzetek: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Udeleženci:"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prednost: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Odstotkov opravljeno: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Stiki: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Prihajajo�i sestanki"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nov seznam opravil"
@@ -8466,39 +8932,46 @@ msgstr "Za ustvarjanje opravil ni na voljo nobenega koledarja"
 msgid "Task Source Selector"
 msgstr "Izbirnik vira opravil"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nova naloga"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Naloga"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Novo dodeljeno opravilo"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Dodeljeno opravilo"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Ustvari novo dodeljeno opravilo"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nov seznam opravil"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Seznam _opravil"
 
-#: ../calendar/gui/tasks-component.c:1344
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Ustvari nov seznam opravil"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8508,1581 +8981,1623 @@ msgstr ""
 " \n"
 "Želite res izbrisati te naloge? "
 
-#: ../calendar/gui/tasks-control.c:458
-#: ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me ve�."
 
-#: ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% kon�ano"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "V teku"
+
+#: ../calendar/gui/tasktypes.xml.h:50
+#: ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "je ve�je"
+
+#: ../calendar/gui/tasktypes.xml.h:51
+#: ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "je manjše"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Sestanki"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Odpiranje koledarja"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Opomnik!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Datoteke vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Dogodki koledarja"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Pametni uvoznik Evolution Calendar"
 
 #.
+#. *
+#. * 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/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Algiers"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmara"
 
-#: ../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 "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/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/Angvila"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amerika/Antigva"
 
-#: ../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/Dominika"
 
-#: ../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/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/Gvatemala"
 
-#: ../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/Guyana"
 
-#: ../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 "Ameriška Samoa"
 
-#: ../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/Severna_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 "Antarktika/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/Južni_pol"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktika/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Azija/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Azija/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Azija/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Azija/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Azija/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Azija/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Azija/AÅ¡gabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Azija/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Azija/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Azija/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Azija/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Azija/Bejrut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Azija/Biškek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Azija/Brunej"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Azija/Kalkuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Azija/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Azija/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Azija/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Azija/Damask"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Azija/Daka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Azija/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Azija/Dubaj"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Azija/Dušanbej"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Azija/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Azija/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Azija/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Azija/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Azija/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Azija/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Azija/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Azija/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Azija/Jeruzalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Azija/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Azija/Kam�atka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Azija/Kara�i"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Azija/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Azija/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Azija/Krasnojarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azija/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Azija/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Azija/Kuvajt"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Azija/Makao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Azija/Makau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Azija/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Azija/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Azija/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Azija/Nikozija"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Azija/Ural"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Azija/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Azija/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pjongjang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Azija/Katar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Azija/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Azija/Riad"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Azija/Sajgon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Azija/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Azija/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Azija/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Azija/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Azija/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Azija/Taškent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Azija/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Azija/Teheran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Azija/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokijo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Azija/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Azija/Ulan_Bator"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Azija/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Azija/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Azija/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Azija/Ekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Azija/Erevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azori"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudi"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantski_ocean/Kanarski_otoki"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Zelenortski otoki"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantski_ocean/Ferski_otoki"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantski_ocean/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantski_ocean/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantski_ocean/Južna_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sveta_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantski_ocean/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Avstralija/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Avstralia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Avstralija/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Avstralija/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Avstralija/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Avstralija/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Avstralija/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Avstralija/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Avstralija/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Avstralija/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Evropa/Andora"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Evropa/Atene"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Evropa/Beograd"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Evropa/Brusel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukarešta"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Evropa/Budimpešta"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Evropa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Evropa/Kobenhavn"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Evropa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibrlaltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Evropa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Evropa/Kijev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lizbona"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Evropa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Luksemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nikozija"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Evropa/Pariz"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Evropa/Praga"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Evropa/Rim"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Evropa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Evropa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofija"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Evropa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Užgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Evropa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Evropa/Dunaj"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Evropa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Evropa/Zaporožje"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Evropa/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indijski_ocean/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indijski_ocean/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indijski_ocean/Boži�ni_otoki"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indijski_ocean/Kokosovi_otoki"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indijski_ocean/Komori"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indijski_ocean/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indijski_ocean/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indijski_ocean/Maldivi"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indijski_ocean/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indijski_ocean/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indijski_ocean/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Tihi_ocean/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Tihi_ocean/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Tihi_ocean/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Tihi_ocean/Velikono�ni_otok"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Tihi_ocean/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Tihi_ocean/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Tihi_ocean/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fidži"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Tihi_ocean/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Tihi_ocean/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Tihi_ocean/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacifik/Gvam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Tihi_ocean/Johnstonovi_otoki"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Tihi_ocean/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Tihi_ocean/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Tihi_ocean/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Tihi_ocean/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Tihi_ocean/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Tihi_ocean/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Tihi_ocean/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Tihi_ocean/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Tihi_ocean/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Tihi_ocean/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairin"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Tihi_ocean/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Tihi_ocean/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Tihi_ocean/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Tihi_ocean/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Tihi_ocean/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Tihi_ocean/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Tihi_ocean/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Tihi_ocean/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Tihi_ocean/Yap"
 
@@ -10094,11 +10609,11 @@ msgstr "Ni mogo�e odpreti autosave datoteke"
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika ni mogo�e dobiti sporo�ila"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Vstavi priponko"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "_Priloži"
 
@@ -10106,44 +10621,31 @@ msgstr "_Priloži"
 msgid "Untitled Message"
 msgstr "Neimenovano sporo�ilo"
 
-#: ../composer/e-composer-actions.c:464
-#: ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Priponka ..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:478
 #: ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Zapri"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../composer/e-composer-actions.c:473
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../composer/e-composer-actions.c:478
-#: ../mail/em-folder-view.c:1344
+#: ../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:124
+#: ../ui/evolution-mail-message.xml.h:123
 #: ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Na_tisni ..."
 
-#: ../composer/e-composer-actions.c:485
+#: ../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
@@ -10152,160 +10654,158 @@ msgstr "Na_tisni ..."
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Shrani _kot ..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Shrani _osnutek"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Shrani kot osnutek"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "_Pošlji"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Pošlji to sporo�ilo"
 
-#: ../composer/e-composer-actions.c:520
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Možnosti _pošiljanja"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Vstavi možnosti pošiljanja"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "Novo _sporo�ilo"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Odpri okno novega _sporo�ila"
+
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "_Nabor znakov"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Varnost"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "Å ifriraj s _PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Šifriraj to sporo�ilo s PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "_Podpis s PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Podpiši to sporo�ilo s svojim PGP klju�em"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "Naredi sporo�ilo _prednostno"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Nastavi prednost sporo�ila na visoko"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "Zaht_evaj povratnico"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Pridobi obvestlo o dostavi, ko je vaše sporo�ilo prebrano"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "Å ifriraj z S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifriraj to sporo�ilo z vašim šifrirnim certifikatom S/MIME "
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "Podpis z S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpiši to sporo�ilo s svojim S/MIME podpisnim certifikatom"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "Polje _skp"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Preklopi prikaz polja SKP"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "Polje _kp"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Preklopi prikaz polja KP"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Preklopi prikaz izbirnika Od"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "Polje _Pošlji-Za"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Preklopi prikaz polja Pošlji-Za"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na:"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "Polje _zadeva"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Preklopi prikaz polja zadeve"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "Polje _Za"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Preklopi prikaz polja Za"
 
-#: ../composer/e-composer-actions.c:685
-#: ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Priloži"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporo�ila"
@@ -10350,42 +10850,38 @@ msgstr "Z_adeva:"
 msgid "Si_gnature:"
 msgstr "_Podpis:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Kliknite tu za imenik"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Cilj pošiljanja"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Izberite mape, v katere želite poslati sporo�ilo."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Kliknite tukaj za izbiro map, v katere želite pošiljati"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "_Nedavni dokumenti"
-
-#: ../composer/e-composer-private.c:173
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-composer-private.c:180
+#: ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "_Prikaži vrstico priponk"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:872
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Odhodnega sporo�ila ni mogo�e podpisati: za ta ra�un ni nastavljen noben certifikat za podpisovanje"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:879
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Odhodnega sporo�ila ni mogo�e šifrirati: za ta ra�un ni nastavljen noben certifikat za šifriranje"
 
-#: ../composer/e-msg-composer.c:1499
-#: ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -10395,16 +10891,16 @@ msgstr[1] "Priponka"
 msgstr[2] "Priponki"
 msgstr[3] "Priponke"
 
-#: ../composer/e-msg-composer.c:1555
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "_Skrij vrstico priponk"
 
-#: ../composer/e-msg-composer.c:1572
-#: ../composer/e-msg-composer.c:2739
+#: ../composer/e-msg-composer.c:1573
+#: ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Sestavi sporo�ilo"
 
-#: ../composer/e-msg-composer.c:4029
+#: ../composer/e-msg-composer.c:4055
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(Sestavljalnik vsebuje nebesedilno telo sporo�ila, ki ga ni mogo�e urejati.)</b>"
 
@@ -10518,25 +11014,28 @@ msgstr "Sporo�ilu ni mogo�e priložiti datoteke '{0}'."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Pred sestavljanjem pošte morate nastaviti ra�un."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_ Nadaljevanje urejanja"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Ne povrni"
 
-#: ../composer/mail-composer.error.xml.h:31
-#: ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Povrni"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Shrani sporo�ilo"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Shrani osnutek"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Koledar in pošta Evolution"
 
 #: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:751
+#: ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Zbirka za skupinsko delo"
 
@@ -10552,41 +11051,63 @@ msgstr "vizitka"
 msgid "calendar information"
 msgstr "podatki o kodledarju"
 
-#: ../e-util/e-error.c:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Napaka Evolutiona"
 
-#: ../e-util/e-error.c:88
-#: ../e-util/e-error.c:89
-#: ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Opozorila Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Podatki Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Poizvedba Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Notranja napaka zaradi zahteve neznane napake '%s'"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Enota"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../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
+msgid "Enabled"
+msgstr "Vklju�eno"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Ali je razširitveni gumb razširjen ali ne"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Prišlo je do napake med tiskanjem"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Podrobnosti o napaki sistema tiskanja:"
 
-#: ../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 "Ni dodatnij podrobnosti o napaki sistema tiskanja."
 
@@ -10616,51 +11137,56 @@ msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
 #: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Ni mogo�e nadgraditi dovoljenj mape."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "Po_membno"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Služba"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Osebno"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Seznam opravil"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Pozneje"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Ime oznake:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Uredi oznako"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Dodaj oznako"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Ime oznake ne sme biti prazno."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:356
 msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "Oznaka z istim imenom na strežniku že obstaja. Prosim, preimenujte oznako."
 
@@ -10818,66 +11344,66 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Izberi �as s katerim naj se primerja"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Izberi datoteko"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Preizkus"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Ime _pravila:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Najdi predmete, ki ustrezajo naslednjim pogojem"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "Dodaj pravilo filtru"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Če je zadoš�eno vsem pogojem"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Če je zadoš�eno kateremukoli pogoju"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "Poiš�i predmete:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Vse povezano"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Odgovori in nadrejeni"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Brez odgovora ali nadrejenega"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "Vklju�i _niti"
 
-#: ../filter/filter-rule.c:990
+#: ../filter/filter-rule.c:1044
 #: ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: ../filter/filter-rule.c:990
+#: ../filter/filter-rule.c:1044
 #: ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Odhodna"
@@ -10903,7 +11429,7 @@ msgid "Missing file name."
 msgstr "Manjkajo�e ime datoteke."
 
 #: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Manjkajo�e ime."
 
@@ -10980,7 +11506,7 @@ msgid "months"
 msgstr "mesecev"
 
 #: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr " sekund"
 
@@ -10993,9 +11519,10 @@ msgid "the time you specify"
 msgstr "�as, ki ga navedete"
 
 #: ../filter/filter.glade.h:22
-#: ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "tedenov"
 
@@ -11011,7 +11538,7 @@ msgstr "Dodaj pravilo"
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Ime pravila"
 
@@ -11064,18 +11591,18 @@ msgid "Evolution Network configuration control"
 msgstr "Nadzornik nastavitev omrežja Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329
-#: ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:584
-#: ../mail/mail-component.c:585
-#: ../mail/mail-component.c:749
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Poštni ra�uni"
 
@@ -11092,12 +11619,12 @@ msgstr "Nastavitve omrežja"
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Licen�na pogodba"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11110,139 +11637,132 @@ msgstr ""
 "za %s, prikazano spodaj,\n"
 "in obkljukajte, da jo želite sprejeti\n"
 
-#: ../mail/em-account-editor.c:482
-#: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466
+#: ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718
-#: ../widgets/misc/e-signature-combo-box.c:97
+#: ../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
 msgid "Autogenerated"
 msgstr "Samoustvarjeno"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Vprašaj za vsako sporo�ilo"
 
-#: ../mail/em-account-editor.c:1822
+#: ../mail/em-account-editor.c:1810
 #: ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identiteta"
 
-#: ../mail/em-account-editor.c:1871
-#: ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859
+#: ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Samodejno preveri _novo pošto na"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minute"
 
-#: ../mail/em-account-editor.c:2235
-#: ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: ../mail/em-account-editor.c:2294
+#: ../mail/em-account-editor.c:2386
 #: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Privzeto"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360
-#: ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452
+#: ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Varnost"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397
-#: ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Možnosti prejemanja"
 
-#: ../mail/em-account-editor.c:2398
-#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Preverjanje novih sporo�il"
 
-#: ../mail/em-account-editor.c:2840
+#: ../mail/em-account-editor.c:2932
 #: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Urejevalnik ra�unov"
 
-#: ../mail/em-account-editor.c:2840
+#: ../mail/em-account-editor.c:2932
 #: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Pomo�nik za ra�une Evolutiona"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Privzeto]"
 
-#: ../mail/em-account-prefs.c:489
-#: ../mail/em-composer-prefs.c:978
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:689
-msgid "Enabled"
-msgstr "Vklju�eno"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Ime ra�una"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../mail/em-composer-prefs.c:299
-#: ../mail/em-composer-prefs.c:434
-#: ../mail/mail-config.c:1117
+#: ../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 "Neimenovan"
 
-#: ../mail/em-composer-prefs.c:982
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Jezik(i)"
 
-#: ../mail/em-composer-prefs.c:1031
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Dodaj skripto za podpisovanje"
 
-#: ../mail/em-composer-prefs.c:1073
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Podpis(i)"
 
-#: ../mail/em-composer-utils.c:938
-#: ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1150
+#: ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Posredovano sporo�ilo --------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
 #. 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:1801
+#: ../mail/em-composer-utils.c:2009
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "Dne ${Day}.${Month}.${Year} (${AbbrevWeekdayName}) ob ${24Hour}:${Minute} ${TimeZone} je ${Sender} zapisal(a):"
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- Prvotno sporo�ilo --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Pravila _filtriranja"
 
@@ -11259,10 +11779,6 @@ msgstr "Dodeli barvo"
 msgid "Assign Score"
 msgstr "Dodeli to�ke"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Priponke"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Skp"
@@ -11279,10 +11795,6 @@ msgstr "Kp"
 msgid "Completed On"
 msgstr "Dokon�ano dne"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "vsebuje"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
@@ -11296,7 +11808,7 @@ msgid "Date sent"
 msgstr "Poslano dne"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25
@@ -11309,10 +11821,6 @@ msgstr "Zbriši"
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ne vsebuje"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "se ne kon�a z"
@@ -11333,10 +11841,6 @@ msgstr "ne zveni kot"
 msgid "does not start with"
 msgstr "se ne za�ne z"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "ne obstaja"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Osnutek"
@@ -11345,10 +11849,6 @@ msgstr "Osnutek"
 msgid "ends with"
 msgstr "se kon�a z"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "obstaja"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "obstaja"
@@ -11362,14 +11862,10 @@ msgid "Follow Up"
 msgstr "Navezava"
 
 #: ../mail/em-filter-i18n.h:29
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Pomembno"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "je"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "je po"
@@ -11382,18 +11878,6 @@ msgstr "je pred"
 msgid "is Flagged"
 msgstr "je ozna�eno"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "je ve�je"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "je manjše"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ni"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ni ozna�eno"
@@ -11417,7 +11901,7 @@ msgid "Junk Test"
 msgstr "Preverjanje neželene pošte"
 
 #: ../mail/em-filter-i18n.h:42
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Oznaka"
 
@@ -11460,7 +11944,7 @@ msgstr "Predvajaj zvok"
 #. 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:82
+#: ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Beri"
 
@@ -11536,11 +12020,11 @@ msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
 #: ../mail/em-filter-i18n.h:72
-#: ../mail/em-format-quote.c:341
+#: ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11551,11 +12035,11 @@ msgid "Unset Status"
 msgstr "Prekli�i stanje"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Nato"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Dodaj _dejanje"
 
@@ -11599,16 +12083,16 @@ msgstr "Pomembna sporo�ila"
 msgid "Messages Not Junk"
 msgstr "Sporo�ila, ki niso neželena"
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Iskanje ra�una"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Iskanje po vseh ra�unih"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Neprebranih sporo�il:"
@@ -11618,7 +12102,7 @@ msgstr[3] "Neprebranih sporo�il:"
 
 #. 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:182
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Vseh sporo�il:"
@@ -11626,32 +12110,49 @@ msgstr[1] "Vseh sporo�il:"
 msgstr[2] "Vseh sporo�il:"
 msgstr[3] "Vseh sporo�il:"
 
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Omejitev uporabe (%s):"
+
 #: ../mail/em-folder-properties.c:198
-#: ../mail/em-folder-properties.c:200
+#, c-format
 msgid "Quota usage"
 msgstr "Omejitev uporabe"
 
-#: ../mail/em-folder-properties.c:362
+#. 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
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Nastavitve mape"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Ime _mape:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204
 #: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935
-#: ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970
+#: ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Iskalne mape"
 
@@ -11661,32 +12162,23 @@ msgstr "Iskalne mape"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:500
-#: ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504
+#: ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Osnutki"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503
-#: ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
-#: ../mail/em-folder-tree-model.c:506
-#: ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510
+#: ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Odhodna pošta"
 
-#: ../mail/em-folder-tree-model.c:508
-#: ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512
+#: ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Poslano"
 
-#: ../mail/em-folder-tree-model.c:530
-#: ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534
+#: ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Nalaganje ..."
 
@@ -11705,461 +12197,457 @@ msgstr "Nalaganje ..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Drevesna razporeditev poštnih map"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premikam mapo %s"
 
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram mapo %s"
 
-#: ../mail/em-folder-tree.c:902
-#: ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909
+#: ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premikanje sporo�il v mapo %s"
 
-#: ../mail/em-folder-tree.c:904
-#: ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911
+#: ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiranje sporo�il v mapo %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ni mogo�e spustiti sporo�il(a) v vrhnjo shrambo"
 
-#: ../mail/em-folder-tree.c:996
-#: ../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 "_Kopiraj v mapo"
 
-#: ../mail/em-folder-tree.c:997
-#: ../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 "_Prestavi v mapo"
 
-#: ../mail/em-folder-tree.c:1706
-#: ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718
+#: ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: ../mail/em-folder-tree.c:2079
-#: ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "Po_gled"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Odpri v _novem oknu"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Nova mapa ..."
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Prestavi ..."
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2114
 #: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Preimenuj ..."
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_Osveži"
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Odplakni odhodna sporo�ila"
 
-#: ../mail/em-folder-tree.c:2103
-#: ../mail/mail.error.xml.h:141
+#: ../mail/em-folder-tree.c:2122
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Sprazni _smeti"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiranje '%s' to '%s'"
 
-#: ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../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:83
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "K_opiraj"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Ustvarjanje mape '%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Ustvari mapo"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
-#: ../mail/em-folder-view.c:1097
-#: ../mail/mail.error.xml.h:71
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Neuspelo brisanje pošte"
 
-#: ../mail/em-folder-view.c:1098
-#: ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-view.c:1091
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nimate dovoljenja za izbris tega sporo�ila."
 
-#: ../mail/em-folder-view.c:1336
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: ../mail/em-folder-view.c:1338
+#: ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:568
 #: ../mail/em-popup.c:579
-#: ../mail/em-popup.c:590
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
 #. 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:1342
-#: ../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 "_Uredi kot novo sporo�ilo ..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo ..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo ..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Ozna�i kot _prebrano"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Ozna�i kot _neprebrano"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Ozna�i kot po_membno"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Ozna�i kot ne_pomembno"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Ozna�i kot _neželeno"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Ozna�i kot _zaželeno"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Ozna�i kot na_vezujo�e ..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Oznaka"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362
-#: ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1355
+#: ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Brez"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico kon�ano"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporo�ila ustvari _pravilo"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Iskalna mapa po _zadevi"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Iskalna mapa po _pošiljatelju"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Iskalna mapa po _prejemnikih"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Iskalna mapa po _dopisnem seznamu"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filter povzet po za_devi"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filter povzet po pošilja_telju"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filter povzet po preje_mnikih"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filter povzet po p_oštnem seznamu"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268
-#: ../mail/em-folder-view.c:2312
+#. 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 "Privzeto"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Ni mogo�e pridobiti sporo�ila"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Prenašanje sporo�ila ..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Klic za ..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Ustvari _iskalno mapo"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Iz tega naslova"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Za ta naslov"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za pošiljanje pošte osebi %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite za klicanje %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Klikni za skrij/prikaži naslove"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Ustreza: %d"
 
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Poiš�i:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "Predhodno"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Naslednje"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "Ujem_anje velikosti �rk"
 
-#: ../mail/em-format-html-display.c:971
-#: ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Nepodpisano"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "To sporo�ilo ni podpisano, zato ni mogo�e zagotoviti njegove pristnosti."
 
-#: ../mail/em-format-html-display.c:972
-#: ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Veljaven podpis"
 
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "To sporo�ilo je podpisano in veljavno, zato je zelo verjetno tudi pristno."
 
-#: ../mail/em-format-html-display.c:973
-#: ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Neveljaven podpis"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "Podpisa tega sporo�ila ni mogo�e preveriti. Morda je bilo spremenjeno med prenosom."
 
-#: ../mail/em-format-html-display.c:974
-#: ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Veljaven podpis, vendar ni mogo�e preveriti pošiljatelja"
 
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "Sporo�ilo je podpisano z veljavnim podpisom, vendar pošiljatelja ni mogo�e preveriti."
 
-#: ../mail/em-format-html-display.c:975
-#: ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Podpis obstaja, vendar potrebuje javni klju�"
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
 msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "Sporo�ilo je podpisano, vendar pripadajo�ega javnega klju�a ni mogo�e preveriti."
 
-#: ../mail/em-format-html-display.c:982
-#: ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Nešifrirano"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "Sporo�ilo ni šifrirano, zato je njegova vsebina med prenosom po internetu vidna."
 
-#: ../mail/em-format-html-display.c:983
-#: ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Å ibko Å¡ifrirano"
 
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
 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 "Sporo�ilo je šifrirano, vendar s šibkim šifrirnim algoritmom, zato si je v doglednem �asu sicer težko, a še vedno mogo�e pogledati njegovo vsebino."
 
-#: ../mail/em-format-html-display.c:984
-#: ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Å ifrirano"
 
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "Sporo�ilo je šifrirano, zato je njegovo vsebino težko videti."
 
-#: ../mail/em-format-html-display.c:985
-#: ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Mo�no šifrirano"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
 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 "Sporo�ilo je šifrirano z mo�nim šifrirnim algoritmom, zato si je v doglednem �asu zelo težko pogledati njegovo vsebino."
 
-#: ../mail/em-format-html-display.c:1086
+#: ../mail/em-format-html-display.c:1062
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ogled certifikata"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Tega certifikata si ni mogo�e pogledati"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Dokon�ano dne %B %d, %Y ob %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Zakasnelo:"
 
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "Poglej _znotraj"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Skrij"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "P_rilagodi Å¡irini"
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Prikaži _izvirno velikost"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Shrani priponke kot"
 
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Izberite mapo za shranjevanje vseh priponk"
 
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Shrani izbrano ..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12168,34 +12656,35 @@ msgstr[1] "%d priponka"
 msgstr[2] "%d priponki"
 msgstr[3] "%d priponke"
 
-#: ../mail/em-format-html-display.c:2135
-#: ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2112
+#: ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "Shr_ani"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Shrani _kot"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Brez priponk"
 
-#: ../mail/em-format-html-display.c:2361
-#: ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2338
+#: ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Poglej _neoblikovano"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Skrij _neoblikovano"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "Odpri _z"
 
-#: ../mail/em-format-html-display.c:2489
-msgid "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
+#: ../mail/em-format-html-display.c:2473
+#, fuzzy
+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 "Ni mogo�e prikazati elektronskega sporo�ila, ker je prevelik. Lahko ga pogledate neoblikovanega ali pa si ga pogledate z zunanjim urejevalnikom besedila."
 
 #: ../mail/em-format-html-print.c:156
@@ -12203,334 +12692,347 @@ msgstr "Ni mogo�e prikazati elektronskega sporo�ila, ker je prevelik. Lahko ga
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: ../mail/em-format-html.c:501
-#: ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Pridobivam '%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Neznan zunanji del telesa sporo�ila."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Nepravilen del zunanjega telesa sporo�ila."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Oblikovanje sporo�ila"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Formatting Message..."
 
-#: ../mail/em-format-html.c:1559
-#: ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645
-#: ../mail/em-format-quote.c:209
+#: ../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:93
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Kp"
 
-#: ../mail/em-format-html.c:1560
-#: ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648
-#: ../mail/em-format-quote.c:209
+#: ../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:94
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Skp"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740
-#: ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1744
+#: ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Poštni odjemalec"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../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:1772
+#: ../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:1903
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Sporo�ilo je poslal uporabnik <b>%s</b> v imenu <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209
+#: ../mail/em-format-quote.c:210
 #: ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-mailer-prefs.c:75
 #: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Od"
 
-#: ../mail/em-format-quote.c:209
+#: ../mail/em-format-quote.c:210
 #: ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
 #: ../mail/em-format.c:890
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:81
 #: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Date"
 msgstr "Datum"
 
 #: ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Novi�arske skupine"
 
-#: ../mail/em-format.c:1156
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "priponka %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ni mogo�e raz�leniti sporo�ila S/MIME: neznana napaka"
 
-#: ../mail/em-format.c:1333
-#: ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336
+#: ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ni mogo�e raz�leniti sporo�ila MIME. Prikazano bo izvorno besedilo."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodprta vrsta šifriranja za ve�delno/šifrirano"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Ni mogo�e raz�leniti PGP/MIME sporo�ila"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ni mogo�e raz�leniti PGP/MIME sporo�ila: neznana napaka"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Nepodprta oblika podpisa"
 
-#: ../mail/em-format.c:1516
-#: ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Napaka pri preverjanju sporo�ila"
 
-#: ../mail/em-format.c:1516
-#: ../mail/em-format.c:1578
-#: ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1581
+#: ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Neznana napaka pri preverjanju podpisa"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Ni mogo�e raz�leniti PGP sporo�ila"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Ni mogo�e raz�leniti PGP sporo�ila: neznana napaka"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Vedno"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Enkrat na dan"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Enkrat na teden"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Enkrat na mesec"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Dodaj glavo neželenih sporo�il po meri"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Ime glave:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Vrednost glave vsebuje:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Vsebuje vrednost"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Barva"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Oznaka"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093
-#: ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078
+#: ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s vstavek je na voljo in je pravilno nameš�en."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101
-#: ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086
+#: ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s vstavek ni na voljo. Prosim, preverite, �e je paket nameš�en."
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Vstavek nezaželene pošte ni na voljo."
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Seznam opravil"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Pozneje"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Lokacija in hierarhija poštnih predalov v Evolutionu sta se spremenili od Evolutiona 1.x.\n"
-"\n"
-"Bodite pozorni, medtem ko Evolution premika vaše mape ..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ni mogo�e ustvariti nove mape '%s': %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Ni mogo�e kopirati mape '%s' v '%s': %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Ni mogo�e iskati obstoje�ih poštnih predalov v '%s': %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Lokacija in hierarhija poštnih predalov v Evolutionu sta se spremenili od Evolutiona 1.x.\n"
+"\n"
+"Bodite pozorni, medtem ko Evolution premika vaše mape ..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Ni mogo�e odpreti starih podatkov POP keep-on-server '%s': %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Ni mogo�e ustvariti mape podatkov POP3 keep-on-server '%s': %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Ni mogo�e kopirati podatkov POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2579
-#: ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583
+#: ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Ni mogo�e ustvariti lokalne shrambe pošte '%s': %s"
 
-#: ../mail/em-migrate.c:2852
+#: ../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 ""
+"Lokacija in hierarhija poštnih predalov v Evolutionu sta se spremenili od Evolutiona 1.x.\n"
+"\n"
+"Bodite pozorni, medtem ko Evolution premika vaše mape ..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Ni mogo�e ustvariti lokalnih map pošte v '%s': %s"
 
-#: ../mail/em-migrate.c:2871
+#: ../mail/em-migrate.c:2982
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "Ni mogo�e prebrati nastavitev prejšnje namestitve Evolutiona. Datoteka 'evolution/config.xmldb' ne obstaja ali pa je pokvarjena."
 
+#: ../mail/em-popup.c:564
 #: ../mail/em-popup.c:575
-#: ../mail/em-popup.c:586
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljatelju"
 
+#: ../mail/em-popup.c:565
 #: ../mail/em-popup.c:576
-#: ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
 #. make it first item
-#: ../mail/em-popup.c:640
-#: ../mail/em-popup.c:874
+#: ../mail/em-popup.c:629
+#: ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "Dod_aj v imenik"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Shramba ne podpira naro�anja ali pa je le-to onemogo�eno."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Naro�en"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "Ne prikaži ve� tega sporo�ila."
 
@@ -12556,11 +13058,11 @@ msgstr "Dodaj naslov"
 msgid "Messages from %s"
 msgstr "Sporo�ila od %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Iskalne _mape"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Vir iskalnih map"
 
@@ -12629,670 +13131,687 @@ msgid "Compress display of addresses in TO/CC/BCC to the number specified in add
 msgstr "Skr�i prikaz naslovov v poljih ZA/KP/SKP na število, navedeno v 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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Dolo�itev glave po meri za preverjanje neželene pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../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 "Dolo�a glavo sporo�ila po meri za preverjanje neželene pošte. Zapis je v obliki \"headername=vrednost\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Privzet nabor znakov za sestavljanje sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Privzet nabor znakov za sestavljanje sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Privzet nabor znakov za prikaz sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Privzet nabor znakov za prikaz sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Privzet na�in posredovanja"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Privzeta višina okna sestavljalnika."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Privzeta višina okna za pisanje sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Privzeta višina pogovornega okna za naro�anje."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Privzet na�in odgovarjanja: "
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Privzeta vrednost stanja razširitve niti sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Privzeta Å¡irina okna sestavljalnika."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Privzeta širina okna za pisanje sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Privzeta širina pogovornega okna za naro�anje."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Determines whether to look up addresses for junk filtering in local addressbook only"
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "Dolo�a ali pregledati imenik za elektronski naslov pošiljatelja le v krajevnem imeniku."
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "Dolo�a ali pregledati imenik za elektronski nalsov pošiljatelja"
 
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
+#: ../mail/evolution-mail.schemas.in.h:35
+#, fuzzy
+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 "Dolo�a ali pregledati imenik za elektronski naslov pošiljatelja. V primeru, da naslov najde, sporo�ilo ne more biti ozna�eno kot neželena pošta. Pregleda v zapisih ozna�enih za samodejno zaklju�evanje. Postopek je lahko po�asen, �e uporabljate oddaljeni imenik (LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Dolo�a ali uporabiti glave po meri za preverjanje neželene pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "Dolo�a ali uporabiti glave po meri za dolo�anje neželene pošte. V primeru, da je možnost omogo�ena in so omenjene glave sporo�il, se izboljša hitrost preverjanja neželene pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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 "Dolo�a ali uporabiti pisave za \"Od\" in \"Zadeva\" vrstice v stolpcu \"Sporo�ila\" v vodoravnem pogledu."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Mapa za nalaganje/pripenjanje datotek k sporo�ilu."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Mapa za shranjevanje datotek pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr "Omogo�i ali onemogo�i elipsiranje imen map v drevesni razporeditvi"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Med pisanjem ozna�i napa�no �rkovane besede."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Ob izhodu izprazni mapo neželene pošte"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Ob izhodu sprazni mape smeti"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Ob izhodu iz programa izprazni vse mape neželene pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ob izhodu iz Evolutiona sprazni vse mape smeti"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogo�i na�in kazalke, tako da bo med branjem pošte viden kazalec."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Omogo�i ali onemogo�i možnost magi�ne preslednice"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Omogo�i ali onemogo�i možnost takojšjnega iskanja"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Omogo�i iskalne mape"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Omogo�i iskalne mape ob zagonu."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "Omogo�i možnost iskanja v stranski vrstici, tako da lahko iš�ete z interaktivnim vnosom besedila. Tako lahko v stranski vrstici z vnosom imena preprosto najdete mapo, ki se ob zadetku samodejno izbere."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../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 "Omogo�i možnost za uporabo preslednice za drsenje med pogledom sporo�ila, seznama sporo�il in map."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Omogo�i prilagajanje besedilnega dela sporo�ila omejene velikosti."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Omogo�i/onemogo�i na�in kazalke"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Višina panoja s seznamom sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Višina pulta s seznamom sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skrije mapni predogled in odstrani izbiro"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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 "Če uporabnik poskuša odpreti 10 ali ve� sporo�il hkrati, ga vprašaj, ali res želi to storiti."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 msgstr "Če je pult \"Predogled\" prikazan, ga prikaži raje ob strani kot navpi�no."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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."
 msgstr "Če v Evolutionu ni vgrajenega pregledovalnika za dolo�eno vrsto MIME, se lahko za prikaz vsebine uporabi poljubna vrsta MIME v tem seznamu, povezana s pregledovalnikom bonobo-component v zbirki vrst MIME v GNOME."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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 "Za�etna višina okna \"Pošlji in sprejmi pošto\". Vrednost se posodobi, ko uporabnik spremeni navpi�no velikost okna."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "Zagonsko stanje okna \"Pošlji in sprejmi pošto\". Vrednost se posodobi, ko uporabnik razpne ali skr�i okno. Te nastavitve neposredno ne uporablja Evolution, saj okna \"Pošlji in sprejmi pošto\" ni mogo�e razpreti. Nastavitev je zgolj podrobnost."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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 "Za�etna širina okna \"Pošlji in sprejmi pošto\". Vrednost se posodobi, ko uporabnik spremeni vodoravno velikost okna."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Onemogo�i/omogo�i opozorilo med ozna�evanjem ve� sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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 "Onemogo�i ali omogo�i možnost ponavljajo�ih se opozoril z vprašanjem ali je treba sistem uskladiti za delo brez povezave."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "Onemogo�i/omogo�i ponavljajo�a se obvestila o brisanju sporo�il iz mape iskanja in trajnega brisanja sporo�il in ne zgolj odstranjevanja iz pogleda zadetkov iskanja."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Čas zadnjega praznjenja neželene pošte"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Čas zadnjega praznjenja koša"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Raven po kateri bi moralo sporo�ilo biti beleženo."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Seznam Oznak in povezanih barv"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Seznam sprejetih licenc"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Seznam ra�unov"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../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."
 msgstr "Seznam ra�unov, ki jih pozna poštna komponenta Evolutiona. Seznam vsebuje nize, ki predstavljajo podmape, povezane z /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Seznam glav po meri in ali so omogo�ene."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Seznam slovarjev jezikov uporabljenih za �rkovanje."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../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."
 msgstr "Seznam oznak, ki jih pozna poštna komponenta Evolutiona. Seznam vsebuje nize ime:barva, kjer je barva podana v obliki HTML heks."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Seznam vrst MIME za preverjanje pregledovalnikov bonobo component"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Seznam imen protokolov, katerih licence so bile sprejete."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Naloži slike sporo�il HTML preko HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:80
-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."
+#: ../mail/evolution-mail.schemas.in.h:81
+#, 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 "Naloži slike sporo�il HTML preko http(s). Mogo�e vrednosti so: 0 - Nikoli ne nalagaj slik s spleta 1 - Naloži slike v sporo�ilih oseb v imeniku 2 - Vedno naloži slike s spleta"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Beleži dejanja filtra"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži dejanja filtra v navedeno datoteko."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Dnevniška datoteka za beleženje dejanj filtra"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Dnevniška datoteka za beleženje dejanj filtra."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Ozna�i kot pregledano po dolo�eni zakasnitvi"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Ozna�i kot Videno po dolo�eni zakasnitvi."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Ozna�i navedke v \"Predogledu\" sporo�ila"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Ozna�i navedke v \"Predogledu\" sporo�ila."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Privzeta višina okna za pisanje sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Privzeta širina okna za pisanje sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Slog prikaza sporo�il (\"obi�ajno\", \"celotne glave\", \"vir\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanjše število dni med praznjenji neželene pošte"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanjše število dni med praznjenji koša"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanjši �as med praznjenji neželene pošte (v dneh)."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanjši �as med praznjenji koša (v dneh)."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Å tevilo naslovov za prikaz v poljih TO/KP/SKP"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Opozori ob prazni zadevi"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Opozori uporabnika, ko želi uni�iti mapo."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Opozori uporabnika, ko želi poslati sporo�ilo brez Zadeve."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Opomnik, ki preveri ali uporabnik želi takoj nadaljevati z delom brez povezave"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "O_pozori ob brisanju sporo�il v iskalnem oknu"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Opozori ob uni�enju"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Opozori, ko uporabnik izpolni samo Skp"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Opozori, ko želi uporabnik hkrati odpreti 10 ali ve� sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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 "Opozori, ko želi uporabnik poslati pošto v obliki HTML prejemnikom, ki morda ne želijo prejemati takšne pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Opozori, ko želi uporabnik poslati sporo�ilo brez prejemnikov v poljih Za ali Kp."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Opozori, ko uporabnik želi poslati neželen HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Opozori ob ozna�evanju ve� sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Prepoznaj smeške v besedilu in jih zamenjaj s slikami."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj povezave v besedilu in jih zamenjaj."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Nad dohodno pošto izvedi preizkus neželene pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Shrani mapo"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+#, fuzzy
+msgid "Search for the sender photo in local address books"
 msgstr "Poiš�i pošiljateljevo fotografijo v imeniku"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Privzeto pošiljaj pošto v obliki HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Privzeto pošiljaj pošto v obliki HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Stolpec elektronskega naslova v seznamu sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "Možnosti _usklajevanja ..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Animirane slike prikaži kot animacije."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikaži izbrisana sporo�ila (pre�rtana) v seznamu sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Zbrisana sporo�ila prikaži na seznamu sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Prikaži fotografije pošiljatelja"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Prikaži elektronski naslov pošiljatelja v posebnem stolpcu na seznamu sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikaži fotografijo pošiljatelja na pladnju branja sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Sproti preverjaj �rkovanje"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Barva preverjanja �rkovanja"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Jeziki za �rkovanje"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Privzeta višina okna za naro�anje"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Pogovorno okno za naro�anje brez širine"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Pisava terminala"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Omejitev besedilnega dela sporo�ila"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Privzeti vstavek za nezaželeno pošto"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Čas zadnjega praznjenja neželene pošte (v dneh od praznjenja)."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Čas zadnjega praznjenja koša (v dneh od praznjenja)."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Pisava terminala za prikaz pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Pisava spremenljive širine za prikaz pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "Mogo�e so tri vrednosti. 0 za napake. 1 za opozorila. 2 za sporo�ila razhroš�evanja."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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."
 msgstr "Nastavitev dolo�a najve�jo velikost dela besedila, ki ga oblikuje program evolution. Privzeta vrednost je 4MB ali 4096KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "Privzeti vstavek neželene pošte, �eprav je lahko so�asno dejavnih ve� vstavkov. V primeru, da privzeti vstavek onemogo�imo, se preverjanje ne povrne na ostale vstavke, ki so na voljo."
 
-#: ../mail/evolution-mail.schemas.in.h:141
-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."
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+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 "Klju� je dolo�en le za branje samo enkrat, po branju pa se samodejno onemogo�i. To odstrani oznako sporo�ila v seznamu in odstrani predogled za to mapo."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "Ta klju� naj bi vseboval seznam struktur XML, ki dolo�ajo poljubne glave, in ali naj bodo prikazane. Oblika strukture XML je &lt;glava omogo�ena&gt; - nastavi kot omogo�eno, �e naj bo glava prikazana v poštnem pogledu."
 
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local addressbook only to exclude mail sent by known contacts from junk filtering."
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+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 "Možnost je povezana z  klju�em lookup_addressbook in je uporabljena za dolo�evanje vpogleda v naslove krajevnega imenika za izlo�evanje pošte poslane s strani neznanih stikov v filtriranje neželene pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ta možnost pomaga pri izboljšanju hitrosti pridobivanja."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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 "To dolo�a število naslovov, ki se prikažejo v privzetem pogledu seznama sporo�il, preko katerega se prikaže '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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 "Nastavitev dolo�a ali naj niti sporo�il ostanejo privzeto razširjene ali skr�ene. Spreminjanje nastavitve zahteva ponoven zagon programa."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "Nastavitev dolo�a ali naj privzeto niti sporo�il ostanejo razvrš�ene po novosti sporo�il namesto po datumu sporo�ila. Spreminjanje nastavitve zahteva ponoven zagon programa."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Niten seznam sporo�il."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Niten seznam sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Niten seznam sporo�il na podlagi polja Zadeva"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Zakasnitev, po kateri se sporo�ilo ozna�i kot pregledano"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Zakasnitev, po kateri se sporo�ilo ozna�i kot pregledano."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Niz UID privzetega ra�una."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Barva pod�rtane narobe zapisane besede med uporabo �rkovalnika."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Uporabi Spamassassin demon in odjemalca"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Uporabi Spamassassin demon in odjemalca (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Uporabi poljubne pisave"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Uporabi pisave po meri za prikaz pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Uporabi samo lokalno preskušanje neželene pošte"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Uporabi samo lokalno preskušanje neželene pošte (brez DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Uporabi stransko razporeditev namesto Å¡iroke"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Pisava spremenljive Å¡irine"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Predmet menija Pogled/Skp je ozna�en"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Predmet menija Pogled/Skp je ozna�en."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Predmet menija Pogled/Kp je ozna�en"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Predmet menija Pogled/Kp je ozna�en."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Predmet menija Pogled/Od je ozna�en"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Predmet menija Pogled/Od je ozna�en."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Predmet menija Pogled/PošljiZa je ozna�en"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Predmet menija Pogled/PošljiZa je ozna�en."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Predmet menija Pogled/OdgovoriNa je ozna�en"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Predmet menija Pogled/OdgovoriNa je ozna�en."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ali se povratnica samodejno doda privzeto k vsakemu sporo�ilu."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr "Ali je onemogo�ena možnosti elipsiranja imen map v drevesni razporeditvi."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../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 "Ali naj se nitene, ko sporo�ila ne vsebujejo glav Kot-Odgovor-Na ali Reference, navezuje na zadeve."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ali naj bodo niti razvrš�ene po zadnjih sporo�ilih v niti"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Širina panoja s seznamom sporo�il"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Širina panoja s seznamom sporo�il."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Uvažanje podatkov Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Uvoznik Elm Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Uvozi pošto iz Elma."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Ciljna mapa"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Izberite mapo za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Poštni predal Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik map v obliki poštnih predalov Berkeley"
 
@@ -13301,7 +13820,7 @@ msgid "Importing mailbox"
 msgstr "Uvažanje poštnih predalov"
 
 #: ../mail/importers/mail-importer.c:232
-#: ../shell/e-shell-importer.c:518
+#: ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvažanje '%s'"
@@ -13311,44 +13830,52 @@ msgstr "Uvažanje '%s'"
 msgid "Scanning %s"
 msgstr "Pregledujem %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Uvažanje podatkov Pina"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Uvoznik Pine Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Uvozi pošto iz Pina."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %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 "Zadeva je %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:164
+#: ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Predloge"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13357,7 +13884,7 @@ msgstr[1] "%d izbrana, "
 msgstr[2] "%d izbrani, "
 msgstr[3] "%d izbrane, "
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13366,7 +13893,7 @@ msgstr[1] "%d izbrisan"
 msgstr[2] "%d izbrisana"
 msgstr[3] "%d izbrisani"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13375,7 +13902,7 @@ msgstr[1] "%d neželeno"
 msgstr[2] "%d neželeni"
 msgstr[3] "%d neželena"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13384,7 +13911,7 @@ msgstr[1] "%d osnutek"
 msgstr[2] "%d osnutka"
 msgstr[3] "%d osnutki"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13393,7 +13920,7 @@ msgstr[1] "%d poslano"
 msgstr[2] "%d poslani"
 msgstr[3] "%d poslana"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13402,7 +13929,7 @@ msgstr[1] "%d neposlano"
 msgstr[2] "%d neposlani"
 msgstr[3] "%d neposlana"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13411,7 +13938,7 @@ msgstr[1] "%d neprebrano,"
 msgstr[2] "%d neprebrani,"
 msgstr[3] "%d neprebrana,"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13420,87 +13947,95 @@ msgstr[1] "skupaj: %d"
 msgstr[2] "skupaj: %d"
 msgstr[3] "skupaj: %d"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Novo poštno sporo�ilo"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Pošlji sporo�ilo"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Sestavi novo poštno sporo�ilo"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nova poštna mapa"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Poštna _mapa"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Ustvari novo poštno mapo"
 
-#: ../mail/mail-component.c:1062
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nadgradnja nastavitev ali map Pošte ni uspela."
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Napaka"
 
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Napake"
 
-#: ../mail/mail-component.c:1536
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Opozorila in napake"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Razhroš�evanje"
 
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "Napake, opozorila in obvestila razhroš�evanja"
 
-#: ../mail/mail-component.c:1647
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Beleženje razhroš�evanja"
 
-#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1652
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "Prikaži _napake v vrstici stanja za"
 
-#. Translators: This is the second part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1660
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "sekund"
 
-#: ../mail/mail-component.c:1670
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Sporo�ila beleženja:"
 
-#: ../mail/mail-component.c:1722
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Raven beleženja"
 
-#: ../mail/mail-component.c:1729
-#: ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811
+#: ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../mail/mail-component.c:1736
-#: ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821
+#: ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Sporo�ila"
 
+#: ../mail/mail-component.c:1830
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zapri to okno"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "Pr_everi podprte vrste"
@@ -13747,11 +14282,13 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitalno _podpiši odhodno pošto (privzeto)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ne oblikuj besedila v sporo�ilih, �e _velikost besedila presega"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+#, fuzzy
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "_Ne ozna�i sporo�ila kot neželenega, �e je pošiljatelj v mojem imeniku."
 
 #: ../mail/mail-config.glade.h:73
@@ -13880,18 +14417,23 @@ msgid "Note: you will not be prompted for a password until you connect for the f
 msgstr "Opomba: geslo bo zahtevano, ko se prvi� povežete"
 
 #: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Možnost bo prepisana, je najdena glava po meri za neželeno pošto."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klju�a PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Geslo:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -13899,123 +14441,128 @@ msgstr ""
 "V spodnji prostor vnesite opisno ime tega ra�una.\n"
 "To ime bo uporabljeno samo za prikaz."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "Vnesite podatke o na�inu odpošiljanja pošte. Če jih ne poznate, se obrnite na skrbnika vašega sistema ali ponudnika dostopa do interneta."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "Spodaj vnesite vaše ime in e-poštni naslov. Polj \"po želji\" ni potrebno izpolnjevati, razen �e želite tudi te podatke vklju�iti v e-pošto, ki jo boste pošiljali."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Vrata:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Opozori ob pošiljanju sporo�il, ki imajo izpolnjene le prejemnike Skp"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Zapo_mni si geslo"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Od_govori-na:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Za_pomni si geslo"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "Gostitelj _SOCKS:"
 
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:127
+#, fuzzy
+msgid "S_earch for sender photograph only in local address books"
 msgstr "Sliko pošiljatelja iš�i le v lokalnih imenikih"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "Izb_eri ..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Pošlji povratnic_e sporo�il:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Obi�ajna pisava:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Izberi pisavo HTML stalne Å¡irine"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Izberi pisavo HTML stalne Å¡irine za tiskanje"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Izberi pisavo HTML spremenljive Å¡irine"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Izberi pisavo HTML spremenljive Å¡irine za tiskanje"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "_Mapa poslanih sporo�il:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva overitev"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certifikat za podpisova_nje:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Po_dpis:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Podpisi"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Razpredelnica podpisov"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Preverjanje �rkovanja"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "V_rsta:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "Ta seznam jezikov vsebuje samo tiste jezike, katerih slovar imate nameš�en."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14025,35 +14572,33 @@ msgstr ""
 "Ime, ki ga navedete, pa bo uporabljeno samo\n"
 "za prikaz. "
 
-#: ../mail/mail-config.glade.h:150
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr "Možnost bo prepisana, je najdena glava po meri za neželeno pošto."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr "Vpišite ime s katerimi želite imenovati ta ra�un. Na primer:\"službeni\" ali \"doma�i\"."
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "Uporab_niško ime:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
 msgstr "Uporabi _overovitev"
 
-#: ../mail/mail-config.glade.h:155
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156
+#: ../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 "Uporab_niško ime:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "Spremenljiv_a-Å¡irina:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14063,124 +14608,126 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za za�etek. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "Dod_aj podpis"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Vedno n_aloži slike s spleta"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL za _samodejno nastavitev posredovalnega strežnika"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Privzet vstavek nazaželene pošte"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Neposredna povezava s spletom"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne po_dpisuj zahtev za sestanke (za združljivost z Outlookom)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Na�in posredovanja"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Ohrani podpis nad izvirnim sporo�ilom med odgovarjanjem"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "V sporo�ilu _pokaži slike oseb v imeniku"
 
-#: ../mail/mail-config.glade.h:170
-msgid "_Lookup in local addressbook only"
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local address book only"
 msgstr "_Vpogled le v krajevni seznam imenikov"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "To naj bo _moj privzet ra�un"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_Ro�na nastavitev posredovalnega strežnika"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Ozna�i sporo�ila kot prebrana po"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nikoli ne nalagaj slik s spleta"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "O_pozori ob pošiljanju sporo�il v obliki HTML tistim stikom, ki tega no�ejo"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "O_pozori ob pošiljanju sporo�il s praznim poljem Zadeva"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Na�in odgovo_ra:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Varni HTTP posredovalni strežnik:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Izbor ..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Prikaži animacije _slik"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Prikaži sliko pošiljatelja v _predogledu sporo�ila"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Glave Za / Kp / Skp _skr�i na"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Uporabi varno povezavo:"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "Uporabi _privzete sistemske vrednosti"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Uporabi enake pisave kot ostali programi"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "naslovi"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr " barva"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "opis"
 
@@ -14220,44 +14767,44 @@ msgstr "_Lo�i velike/male �rke"
 msgid "Co_mpleted"
 msgstr "_Kon�ano"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "Najd_i:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Poiš�i v sporo�ilu"
 
-#: ../mail/mail-dialogs.glade.h:13
-#: ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Zastavica za navezavo"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Naro�nine na mape"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Licen�na pogodba"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Prazen izbor"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "Str_ežnik:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Varnostni podatki"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Izbrane mape"
 
-#: ../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."
@@ -14265,23 +14812,23 @@ msgstr ""
 "Sporo�ila, ki ste jih izbrali za navezavo, so navedena spodaj.\n"
 "Izberite dejanje navezave iz menija \"Zastavica\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Sprejmi licenco"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "Kon�ano _do:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Zastavica:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Obkljukajte, �e želite sprejeti licen�no pogodbo"
 
-#: ../mail/mail-folder-cache.c:831
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "\"Pinganje\" %s"
@@ -14330,92 +14877,92 @@ msgid "Failed to send %d of %d messages"
 msgstr "Pošiljanje %d od %d sporo�il ni uspelo"
 
 #: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:711
+#: ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Preklicano."
 
 #: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:713
+#: ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Kon�ano."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Shranjujem sporo�ilo v mapo"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporo�ila v %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporo�ila v %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Posredovana sporo�ila"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Pridobivanje podatkov omejitve porabe prostora za mapo %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Uni�evanje in shranjevanje ra�una '%s'"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Shranjevanje ra�una '%s'"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: ../mail/mail-ops.c:1654
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Uni�ujem mapo"
 
-#: ../mail/mail-ops.c:1701
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznjenje koša v '%s'"
 
-#: ../mail/mail-ops.c:1702
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
-#: ../mail/mail-ops.c:1783
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporo�ilo %s"
 
-#: ../mail/mail-ops.c:1890
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14424,16 +14971,16 @@ msgstr[1] "Prenašanje %d sporo�ila"
 msgstr[2] "Prenašanje %d sporo�il"
 msgstr[3] "Prenašanje %d sporo�il"
 
-#: ../mail/mail-ops.c:1975
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Shranjevanje %d sporo�il"
 msgstr[1] "Shranjevanje %d sporo�ila"
 msgstr[2] "Shranjevanje %d sporo�il"
 msgstr[3] "Shranjevanje %d sporo�il"
 
-#: ../mail/mail-ops.c:2053
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14442,12 +14989,12 @@ msgstr ""
 "Napaka ob shranjevanju sporo�il v: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2125
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Shranjujem priponko"
 
-#: ../mail/mail-ops.c:2143
-#: ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2148
+#: ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14456,76 +15003,76 @@ msgstr ""
 "Ni mogo�e ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ni mogo�e pisati podatkov: %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: ../mail/mail-ops.c:2408
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Priprava ra�una '%s' za delo brez povezave"
 
-#: ../mail/mail-ops.c:2494
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Prekinjanje ..."
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Pošlji in spreji pošto"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Prekli�i _vse"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Posodabljanje ..."
 
-#: ../mail/mail-send-recv.c:517
-#: ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "ÄŒakanje ..."
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Preverjanje nove pošte"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Vnesite geslo za %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Vnesite geslo"
 
-#: ../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 "Vpišite geslo za %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
@@ -14533,15 +15080,6 @@ msgstr "Uporabnik je dejanje preklical."
 msgid "_Save and Close"
 msgstr "_Shrani in zapri"
 
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11
-#: ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Datoteka"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Uredi podpis"
@@ -14589,11 +15127,11 @@ msgstr "Posodabljanje iskalne mape za '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Posodabljanje iskalne mape za '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Uredi iskalno mapo"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nova iskalna mapa"
 
@@ -14796,58 +15334,54 @@ msgid "Do not disable"
 msgstr "Ne onemogo�i"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Ali želite, da se operacija izvede tudi v podmapah?"
-
-#: ../mail/mail.error.xml.h:53
 msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "Želite lokalno uskladiti mape ozna�ene za delo brez povezave?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Želite vsa sporo�ila ozna�iti kot prebrana?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Želite shraniti spremembe?"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Vnesite geslo."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Napaka pri nalaganju dolo�il filtrov."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Napaka pri izvajanju operacij."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Napaka med {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka obstaja, a je ni mogo�e prepisati."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Datoteka obstaja, a ni regularna."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Če boste nadaljevali, teh sporo�il ne bo mogo�e povrniti."
 
-#: ../mail/mail.error.xml.h:63
+#: ../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 "Če zbrišete mapo, bo njena vsebina in vsebina njenih podmap za vedno izbrisana."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Če boste nadaljevali, bodo vsi ra�uni posredovalnih strežnikov trajno izbrisani."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14855,67 +15389,59 @@ msgstr ""
 "Če boste nadaljevali, bodo podatki o ra�unu in\n"
 "vsi podatki o posredovalnih strežnikih trajno izbrisani."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Če boste nadaljevali, bodo vsi podatki o ra�unu izbrisani za vedno."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "Če kon�ate, ta sporo�ila ne bodo poslana do ponovnega zagona Evolutiona."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Neveljavna overovitev"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Ozna�i samodejno posodabljanje filtrov."
 
-#: ../mail/mail.error.xml.h:73
+#: ../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 "Številni e-poštni sistemi dodajo sporo�ilom, ki vsebujejo prejemnike samo v polju SKP, glavo O�itno-Za. V tem primeru glava vsebuje vse prejemnike. Takšno obnašanje lahko zaobidete, �e dodate vsaj enega prejemnika v polje Za: ali KP:."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Ozna�i vsa sporo�ila kot prebrana"
 
-#: ../mail/mail.error.xml.h:75
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Ali naj bodo vsa sporo�ila mape in njenih podmap ozna�ija kot prebrana?"
-
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Manjkajo�a mapa."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Noben vir ni izbran."
 
-#: ../mail/mail.error.xml.h:79
-msgid "Only on _Current Folder"
-msgstr "Le na trenutni mapi"
-
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Odpiranje prevelikega števila sporo�il hkrati lahko traja nekaj �asa."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Preverite nastavitve vašega ra�una in poskusite znova."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Omogo�ite ra�un ali pošljite z drugim ra�unom."
 
-#: ../mail/mail.error.xml.h:83
+#: ../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 "Vnesite veljaven e-poštni naslov v polje Za:. E-poštne naslove lahko poiš�ete s klikom na gumb Za: ob vnosnem polju."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
@@ -14923,67 +15449,67 @@ msgstr ""
 "Prepri�ajte se, da naslednji prejemniki želijo in lahko prejemajo pošto v obliki HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Izberite edinstveno ime za ugotovitev istovetnosti tega podpisa."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Prosim, poka�ajte."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Napaka pri prenašanju mape s staro pošto \"{0}\"."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Strežnik poizvedb"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Poizvedovanje strežnika za seznam podprtih mehanizmov overovitve."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Zahtevana povratnica."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ali želite izbrisati mapo \"{0}\" in vse njene podmape?"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
 msgstr "Poro�anje o neželeni pošti ni uspelo"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
 msgstr "Poro�ilo prejetja neželene pošte ni uspelo"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Samodejno posodabljanje iskalnih map."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Pošlji povratnico"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Podpis že obstaja"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Uskladi"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ali naj se mape uskladijo za delo brez povezave?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr "Za pravilno delovanje Evolutiona so potrebne sistemske mape, ki ne smejo biti preimenovane, premaknjene ali izbrisane."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14993,7 +15519,7 @@ msgstr ""
 "\n"
 "Številni e-poštni sistemi dodajo sporo�ilom, ki vsebujejo prejemnike samo v polju SKP, glavo O�itno-Za. V tem primeru glava vsebuje vse prejemnike. Takšno obnašanje lahko zaobidete, �e dodate vsaj enega prejemnika v polje Za: ali KP:."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15007,7 +15533,7 @@ msgstr ""
 "    \"{1}\"\n"
 "in so bile posodobljene."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15021,11 +15547,11 @@ msgstr ""
 "    \"{1}\"\n"
 "in so bila posodobljena."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "Skriptna datoteka mora obstajati in biti izvedljiva."
 
-#: ../mail/mail.error.xml.h:115
+#: ../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."
@@ -15033,47 +15559,47 @@ msgstr ""
 "Mapa je bila morda dodana brezpogojno.\n"
 "Pojdite v urejevalnik Map iskanja in jo dodajte izrecno, �e je to potrebno."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Tega sporo�ila ni mogo�e poslati, ker ra�un za pošiljanje ni omogo�en"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Tega sporo�ila ni mogo�e poslati, ker niste navedli nobenega prejemnika"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "Strežnik ne podpira tovrstne ali celo nikakršne overovitve."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Podpis je bil spremenjen, a ni bil shranjen."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "To bo ozna�ilo vsa sporo�ila v izbrani mapi in podmapah kot prebrana."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Povezava s strežnikom GroupWise ni uspela."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "Ni mogo�e odpreti mape osnutkov za ta ra�un. Želite uporabiti sistemsko mapo osnutkov?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Licen�ne datoteke ni mogo�e prebrati."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Uporabi _privzeto"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Uporabim privzeto mapo osnutkov?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../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?"
@@ -15081,27 +15607,27 @@ msgstr ""
 "Opozorilo: Brisanje sporo�ila iz iskalne mape izbriše tudi dejansko sporo�ilo v mapi dohodne pošte.\n"
 "Ali zares želite nadaljevati?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlana sporo�ila. Želite kljub temu kon�ati?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh ra�unov z enakim imenom."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "To iskalno mapo morate poimenovati."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Navesti morate mapo."
 
-#: ../mail/mail.error.xml.h:135
+#: ../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."
@@ -15109,46 +15635,46 @@ msgstr ""
 "Kot vir morate navesti vsaj eno mapo.\n"
 "Mape lahko izberete posami�no ali pa izberete vse lokalne mape, vse oddaljene mape ali oboje."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Prijava na vaš strežnik \"{0}\" kot \"{0}\" ni uspela."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "Dod_aj"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Prezri spremembe"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "_Ne uskladi"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Uni�i"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Odpri sporo�ila"
 
-#: ../mail/mail.error.xml.h:146
-msgid "on Current Folder and _Subfolders"
-msgstr "na trenutni mapi in podmapah"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Neogledano"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Ogledano"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Odgovorjeno"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Posredovano"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Ve� neogledanih sporo�il"
@@ -15173,49 +15699,52 @@ msgstr "visoka"
 msgid "Highest"
 msgstr "najvišja"
 
-#: ../mail/message-list.c:1614
+#: ../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:1621
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Danes %l:%M %p"
 
-#: ../mail/message-list.c:1630
+#: ../mail/message-list.c:1612
 #: ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "V�eraj %l:%M %p"
 
-#: ../mail/message-list.c:1642
+#: ../mail/message-list.c:1624
 #: ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1650
+#: ../mail/message-list.c:1632
 #: ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1652
+#: ../mail/message-list.c:1634
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3838
+#. 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
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporo�il"
 
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4224
 msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "Ni sporo�il, ki sovpadajo z iskalnim nizom. Lahko po�istite iskanje ali pa vnesete nov iskalni niz."
 
-#: ../mail/message-list.c:4103
-msgid "There is currently no message in this folder."
+#: ../mail/message-list.c:4226
+#, fuzzy
+msgid "There are no messages in this folder."
 msgstr "Trenutno v tej mapi ni sporo�il."
 
 #: ../mail/message-list.etspec.h:3
@@ -15247,42 +15776,42 @@ msgstr "Pošlji sporo�ila"
 msgid "Size"
 msgstr "Velikost"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Kli�i"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ne posreduj"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Navezava"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Vam na znanje"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:60
 #: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Odgovor ni potreben"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:64
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:65
 #: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Ocena"
 
@@ -15307,6 +15836,11 @@ msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Zadeva ali Pošiljatelj vsebuje"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Zadeva ali Pošiljatelj vsebuje"
 
@@ -15319,29 +15853,18 @@ msgid "Provides core functionality for local address books."
 msgstr "Omogo�a osnovne zmogljivosti za lokalne imenike."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Omogo�i vstavek opomnikov priponk"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Omogo�i vstavek opomnikov priponk."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid "List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "Seznam namigov za vstavek opomnika priponke, ki ga je mogo�e najti v telesu sporo�ila."
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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 "Seznam namigov za vstavek opomnika priponke, ki ga je mogo�e najti v telesu sporo�ila."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Klju�ne besede"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Opomni na manjkajo�e priponke"
-
 #: ../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"
@@ -15359,7 +15882,7 @@ msgstr "Program Evolution je našel nekaj klju�nih besed, ki so povezane s prip
 msgid "Message has no attachments"
 msgstr "Sporo�ilo nima priponke"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "Ur_edi sporo�ilo"
 
@@ -15371,27 +15894,27 @@ msgstr "Vstavek za vgrajeno predvajanje zvo�nih priponk znotraj programa Evolut
 msgid "Audio inline plugin"
 msgstr "Vstavek za vgrajeni zvok"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Izberite ime datoteke varnostne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Znova zaženi Evolution po varnostnem kopiranju"
 
-#: ../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 "Izberite ime varnostne kopije za obnovitev"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Znova zaženi Evolution po obnovitvi"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Obnovi iz varnostne kopije"
 
-#: ../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."
@@ -15399,95 +15922,122 @@ msgstr ""
 "Lahko obnovite nastavitve programa Evolution. Varnostna kopija shranjuje pošto, koledarje, naloge, opomnike in stike.\n"
 "Prav tako shranjuje vse osebne nastavitve, filtre pošte in podobno."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Obnovitev programa Evolution iz varnostne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Izberite arhiv programa Evolution za obnovitev:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Izberi datoteko za shranjevanje"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Varnostno kopiraj mapo Evolutiona"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Povrni mapo Evolutiona"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Preveri varnostne kopije"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Ponovno zaženi Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Z grafi�nim uporabniškim vmesnikom"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Izklapljanje programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Varnostno kopiranje ra�unov in nastavitev"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Varnostna kopija Evolution (pošta, imenik, koledar, naloge, zaznamki)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Varnostna kopija narejena"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Ponovni zagon programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Varnostna kopija podatkov programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Razširanjanje datotek iz varnostne kopije"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Nalaganje nastavitev programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Odstranjevanje za�asnih varnostnih kopij"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+#, fuzzy
+msgid "Ensuring local sources"
+msgstr "Zagotovi si krajevne vire"
+
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Shranjevanje varnostne kopije v mapo %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Povrnitev podatkov iz mape %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Varnostna kopija programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Obnavljanje Evolution"
 
+#: ../plugins/backup-restore/backup.c:514
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Varnostna kopija podatkov programa 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 "Ponovni zagon programa 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
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Vstavek za izdelavo varnostnih kopij in obnovitev podatkov ter nastavitev Evolutiona."
@@ -15510,14 +16060,24 @@ msgid "Evolution backup can start only when Evolution is not running. Please mak
 msgstr "Priprava varnostne kopije se lahko pri�ne le kadar program Evolution ne te�e. Prosim, prepri�ajte se, da ste shranili in zaprli vsa vaša neshranjena okna preden nadaljujete. Če želite, da se program ponovno samodejno zažene po kon�anem delu, prosim izberite to možnost."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Dovoljenja pooblaš�enca"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Neveljavna varnostna kopija programa Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Prosim, izberite datoteko veljavene varnostne kopije za obnovitev."
 
-#: ../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 "Kopiraj izbrano mapo v drugo mapo"
+
+#: ../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 "S tem boste izbrisali vse trenutne nastavitve in vaše podatke, povrnili pa boste tiste, ki so shranjene v varnostni kopiji. Priprava varnostne kopije se lahko pri�ne le kadar program Evolution ne te�e. Prosim, prepri�ajte se, da ste shranili in zaprli vsa vaša neshranjena okna preden nadaljujete. Če želite, da se program ponovno samodejno zažene po kon�anem delu, prosim izberite to možnost."
 
@@ -15533,41 +16093,44 @@ msgstr "_Povrni nastavitve ..."
 msgid "_Backup Settings..."
 msgstr "_Nastavitve varnostne kopije ..."
 
-#: ../plugins/bbdb/bbdb.c:541
-#: ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543
+#: ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Samodejni stiki"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+#, fuzzy
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "S_amodejno ustvari vnose v imeniku pri odgovarjanju na sporo�ila"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izberite imenik za samodejne stike"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Stiki neposrednega sporo�anja"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid "Periodically synchronize contact information and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:603
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Ob�asno uskladi podatke in slike s seznamom stikov programa Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Izberite imenik za Pidgin seznam stikov"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi s _seznamom prijateljev"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
+#, fuzzy
+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 "Samodejno doda imena in e-poštne naslove v imenik, ko odgovarjate na sporo�ila. Prav tako doda stike iz seznama prijateljev odjemalca za neposredno sporo�anje."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
@@ -15619,18 +16182,19 @@ msgstr "Bogofilter vstavek neželene pošte"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtriranje neželenih sporo�il z Bogofiltrom"
 
-#: ../plugins/caldav/caldav-source.c:64
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "Uporabi _SSL"
 
@@ -15650,17 +16214,18 @@ msgstr "Krajevni koledarji"
 msgid "Provides core functionality for local calendars."
 msgstr "Omogo�a osnovne zmogljivosti za lokalne koledarje."
 
-#: ../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:375
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "_Osveži:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Varna povezava"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Uporabniško ime:"
 
@@ -15754,23 +16319,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Želite, da Evolution postane vaš privzeti poštni odjemalec?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 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 "Ozna�i kot _privzeti imenik"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Ozna�i kot _privzeti koledar"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Ozna�i kot _privzeti seznam opravil"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Ozna�i kot _privzeti opomnik"
 
@@ -15779,9 +16344,52 @@ msgid "Default Sources"
 msgstr "Privzeti viri"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Provides functionality for marking a calendar or an addressbook as the default one."
+#, fuzzy
+msgid "Provides functionality for marking a calendar or an address book as the default one."
 msgstr "Omogo�a možnost nastavitve privzetega koledarja ali imenika."
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "_Glava sporo�ila po meri"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Klju�"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Vrednosti"
+
+#. 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 "Glave sporo�il po meri"
+
+#. 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 "Glava sporo�ila po meri"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Seznam glav sporo�il po meri"
+
+#: ../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 "Odpri mapo drugega uporabnika"
@@ -15799,28 +16407,28 @@ msgid "_User:"
 msgstr "_Uporabnik:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Varno geslo"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
 msgstr "Ta možnost bo vzpostavila povezavo s strežnikom Exchange ob uporabi varne overovitve z geslom (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Besedilno geslo"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr "Ta možnost bo vzpostavila povezavo s strežnikom Exchange ob uporabi obi�ajne overitve z geslom kot navadnim besedilom."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Iz pisarne"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15828,83 +16436,87 @@ msgstr ""
 "Spodnje sporo�ilo bo samodejno poslano vsaki osebi, \n"
 "ki vam pošlje sporo�ilo v �asu vaše odsotnosti."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Sam iz pisarne"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Sem v pisarni"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Spremeni geslo ra�una Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Upravljaj nastavitve pooblaš�enca za ra�un Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Pomo�nik pooblaš�anja"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Razli�no"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Ogled velikosti vseh map Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Velikost map"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Nastavitve Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "Overovi"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Poštni predal:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Vrsta _overitve"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Pr_everi podprte vrste"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15916,11 +16528,11 @@ 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 "Trenutno geslo se ne ujema z obstoje�im geslom vašega ra�una. Vnesite pravilno geslo"
 
-#: ../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 "Gesli se ne ujemata. Ponovno ju vnesite."
 
@@ -15940,38 +16552,38 @@ msgstr "Novo geslo:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Vaše trenutno geslo je poteklo. Spremenite ga zdaj."
 
-#: ../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 "Vaše geslo bo poteklo v naslednjih %d dneh"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Po meri"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Urednik (branje, ustvarjanje, urejanje)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Avtor (branje, ustvarjanje)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Ocenjevalec (samo branje)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Dovoljenja pooblaš�enca"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Dovoljenja za %s"
@@ -15979,72 +16591,72 @@ msgstr "Dovoljenja za %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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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 "Sporo�ilo je poslano samodejno, z namenom obvestiti vas, da ste predlagani kot pooblaš�enec. Sedaj lahko v mojem imenu pošiljate sporo�ila."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Pridobili ste si naslednja dovoljenja v mojih mapah:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Dovoljeno vam je videti moje zasebne predmete."
 
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Kljub vsemu pa nimate dovoljenja za pregled mojih osebnih predmetov."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Predlagani ste bili za pooblaš�enca %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Pooblasti Za"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Odstranim pooblaš�enca %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Ni mogo�e dostopiti do Aktivnega imenika"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Ni mogo�e najti sebe v Aktivnem imeniku"
 
-#: ../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 "Ni mogo�e najti pooblaš�enca %s v Aktivnem imeniku"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Ni mogo�e odstraniti pooblaš�enca %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Ni mogo�e posodobiti seznama pooblaš�encev."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Ni mogo�e dodati pooblaš�enca %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Napaka pri branju seznama pooblaš�encev."
 
@@ -16092,25 +16704,25 @@ msgstr "_Povzetek dovoljenj"
 msgid "_Tasks:"
 msgstr "_Opravila:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Dovoljenja ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Ime mape"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Velikost mape"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Uporabnik"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../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 "Naro�i se na mapo drugega uporabnika"
@@ -16119,20 +16731,20 @@ msgstr "Naro�i se na mapo drugega uporabnika"
 msgid "Exchange Folder Tree"
 msgstr "Drevesna razporeditev map Exchange"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "Prekli�i naro�nino na mapo ..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Želite res preklicati naro�nino na mapo \"%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Prekli�i naro�nino na \"%s\""
@@ -16195,18 +16807,18 @@ msgstr "Vaše geslo bo poteklo �ez 7 dni ..."
 msgid "_Change Password"
 msgstr "_Spremeni geslo"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Nimate dovoljenj.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Dodaj uporabnika:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../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
 msgid "Add User"
 msgstr "Dodaj uporabnika"
 
@@ -16324,15 +16936,11 @@ msgstr "_Ob�utljivost:"
 msgid "_User"
 msgstr "_Uporabnik"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "gumb_uporabnik"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Izberi uporabnika"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "imenik ..."
 
@@ -16345,7 +16953,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Naro�i se na koledar drugega uporabnika"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "A plugin that handles a collection of Exchange account specific operations and features."
+#, fuzzy
+msgid "A plugin that manages a collection of Exchange account specific operations and features."
 msgstr "Vstavek, ki skrbi za operacije in lastnosti ra�unov Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16431,10 +17040,14 @@ msgid "Could not update out-of-office state"
 msgstr "Ni mogo�e posodobiti stanja Iz pisarne"
 
 #: ../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 "Ra�un Exchange ni na zvezi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16462,100 +17075,100 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Posodabljanje delegatov ni uspelo:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Mapa že obstaja"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Mapa ne obstaja"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Mapa ni na zvezi"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Generi�na napaka"
 
-#: ../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 "Global Catalog Server ni dosegljiv"
 
-#: ../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 "Če OWA te�e na drugi poti, morate to ozna�iti v pogovornem oknu za nastavitev ra�una."
 
-#: ../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 "Poštni predal za {0} ni na tem strežniku."
 
-#: ../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 "Prepri�ajte se, da je URL pravilen in poskusite znova."
 
-#: ../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 "Prepri�ajte se, da je ime strežnika pravilno, in poskusite znova."
 
-#: ../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 "Prepri�ajte se, da sta uporabniško ime in geslo pravilna, in poskusite znova."
 
-#: ../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 "Noben strežnik Global Catalog ni nastavljen za ta ra�un."
 
-#: ../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 "Uporabnik {0} nima poštnega predala na {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Ni tega uporabnika {0}"
 
-#: ../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 "Geslo uspešno spremenjeno."
 
-#: ../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 "Prosim, vnesite vaš ID pooblaš�enca ali pa odstranite oznako pošiljanja kot pooblaš�enec."
 
-#: ../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 "Prepri�ajte se, da je ime strežnika Global Catalog Server pravilno."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Za uveljavitev sprememb ponovno zaženite Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Prosim, izberite uporabnika."
 
-#: ../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 "Strežnik je zavrnil geslo, ker je prešibko."
 
-#: ../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 "Ra�un Exchange bo onemogo�en, ko kon�ate Evolution"
 
-#: ../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 "Ra�un Exchange bo izbrisan, ko kon�ate Evolution."
 
-#: ../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 "Strežnik Exchange ni združljiv z Exchange Connectorjem."
 
-#: ../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."
@@ -16563,7 +17176,7 @@ msgstr ""
 "Strežnik poganja Exchange 5.5. Exchange Connector \n"
 "podpira samo Microsoft Exchange 2000 in 2003."
 
-#: ../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"
@@ -16577,79 +17190,80 @@ msgstr ""
 "\n"
 "Morda pa ste narobe vnesli vaše geslo."
 
-#: ../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 "Poskusite ponovno z novim geslom."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Ni mogo�e dodati uporabnika na seznam nadzora dostopa: "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Ni mogo�e urediti pooblaš�encev."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Neznana napaka pri iskanju {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Neznana vrsta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Nepodprto dejanje"
 
-#: ../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 "Približujete se prostorski omejitvi za shranjevanje pošte na tem strežniku."
 
-#: ../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 "Imate dovoljenje, da pošljete sporo�ilo so�asno v imenu samo ene osebe katere pooblaš�enec ste."
 
-#: ../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 "Sami sebe ne morete pooblastiti"
 
-#: ../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 "Presegli ste prostorsko omejitev za shranjevanje pošte na tem strežniku."
 
-#: ../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 "Nastavite lahko le en ra�un Exchange."
 
-#: ../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 "Vaša trenutna uporaba je: {0} KB. Poskusite sprostiti nekaj prostora, tako da zbrišete nekaj sporo�il."
 
-#: ../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 "Vaša trenutna uporaba je: {0} KB. Trenutno ni mogo�e pošiljati ali prejemati e-pošte."
 
-#: ../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 "Vaša trenutna uporaba je: {0} KB. Dokler ne sprostite nekaj prostora, tako da zbrišete nekaj sporo�il, ne boste mogli pošiljati e-pošte."
 
-#: ../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 "Vaše geslo je poteklo."
 
-#: ../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 "{0} ni mogo�e dodati na seznam nadzora dostopa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} je že pooblaš�en"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} je že na seznamu"
 
@@ -16695,18 +17309,18 @@ msgid "The external editor set in your plugin preferences cannot be launched. Tr
 msgstr "Zunanjega urejevalnika, ki je dolo�en med nastavitvami vstavka, ni mogo�e zagnati. Poskusite dolo�iti drug urejevalnik."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Uredi v zunanjem urejevalniku"
+msgid "Compose in _External Editor"
+msgstr "Sestavi v zunanjem urejevalniku"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Urejanje sporo�il z zunanjim urejevalnikom."
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Ukaz za zagon urejevalnika:"
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -16714,15 +17328,15 @@ msgstr ""
 "Za Emacs uporabite \"xemacs\"\n"
 "Za VI uporabite \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Izbor (48*48) sliko png manjšo kot 700 bajtov"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Datoteke PNGVse krajevne mape"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_ObrazFrancija"
 
@@ -16751,20 +17365,56 @@ msgstr "Prekli�i naro�nino na mape"
 msgid "_Unsubscribe"
 msgstr "_Prekli�i naro�nino"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+#, fuzzy
+msgid "Please enter user name first."
+msgstr "Izberite druga�no ime."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Dodaj mapo na seznam naro�enih map"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Ni mogo�e prebrati podatkov strežnika Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "_Koledar:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Pridobi _seznam"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Strežnik</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Vstavek za nastavitev virov koledarja Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google viri"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Nadzorni seznam"
 
@@ -16809,16 +17459,16 @@ msgstr "Namesti mapo za izmenjevanje"
 msgid "Shared Folder Installation"
 msgstr "Namestitev mape za izmenjevanje"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Nastavitve neželene pošte"
 
-#: ../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 "Nastavitve neželene pošte"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Nastavitve neželene pošte ..."
 
@@ -16844,10 +17494,19 @@ msgid "_Junk List"
 msgstr "Seznam _neželene pošte"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Stanje sporo�ila ..."
+
+#: ../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 "Sporo�ilo uspešno preklicano"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Prekli�i pošto"
 
@@ -16855,13 +17514,6 @@ msgstr "Prekli�i pošto"
 msgid "Add Send Options to groupwise messages"
 msgstr "Dodaj možnosti pošiljanja sporo�ilom groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15
-#: ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Možnosti pošiljanja"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Vstavek za lastnosti ra�unov Groupwise"
@@ -16910,7 +17562,8 @@ msgid "Account Already Exists"
 msgstr "Ra�un že obstaja"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and try again."
+#, fuzzy
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
 msgstr "Posredovalna prijava kot &quot;{0}&quot; ni bila uspešna. Prosim, preverite ID elektronske pošte in poskusite znova."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
@@ -16918,18 +17571,22 @@ msgid "This is a recurring meeting"
 msgstr "Ozna�i dogodek kot ponovljiv"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "Kaj želite {0}?"
+msgid "Would you like to accept it?"
+msgstr "Ali želite sprejeti?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Ali želite zavrniti?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "Ni mogo�e deliti mape z dolo�enim uporabnikom &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../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 "Dolo�iti morate uporabniško ime, ki ga želite dodati na seznam."
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Sprejmi poskusno"
 
@@ -16946,7 +17603,7 @@ msgid "Con_tacts..."
 msgstr "S_tiki ..."
 
 #: ../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 "Sporo�ilo"
 
@@ -17027,9 +17684,9 @@ msgstr "<b>Ime ra�una</b>"
 msgid "Proxy Login"
 msgstr "Prijava v posredovalni strežnik"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17038,44 +17695,44 @@ msgstr "%sVnesite geslo za %s (uporabnik %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:509
 msgid "_Proxy Login..."
 msgstr "_Prijava posredovanja ..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Zavihek posredovalnega strežnika bo na voljo samo, ko je ra�un na zvezi."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Zavihek posredovalnega strežnika bo na voljo samo, ko je ra�un omogo�en."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Vnesite uporabnikova in nastavljena dovoljenja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Nova mapa v _skupni rabi ..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Souporaba"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
 msgstr "Obvestila po meri"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Dodaj"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Spremeni"
 
@@ -17140,11 +17797,11 @@ msgstr "Vstavek za nastavitev virov koledarja Hula."
 msgid "Hula Account Setup"
 msgstr "Nastavitve ra�una Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Glave sporo�il po meri"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP Glave"
 
@@ -17216,8 +17873,8 @@ msgstr "Izberi seznam opravil"
 msgid "Select Calendar"
 msgstr "Izberi koledar"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "Uvoz_i"
 
@@ -17246,13 +17903,14 @@ msgstr "Iskanje iPod napave ni uspelo"
 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 "Z napravo iPod ni mogo�e uskladiti sistema. Ali iPod naprava ni povezana ali pa ni priklju�ena."
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Zapis iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+#, fuzzy
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr "Uskladi izbrano opravilo/koledar/imenik z Apple iPodom"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -17263,588 +17921,588 @@ msgstr "Uskladi z iPodom"
 msgid "iPod Synchronization"
 msgstr "Usklajevanje z iPodom"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Ni mogo�e naložiti koledarja '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Sestanek v koledarju '%s' je v sporu s tem sestankom"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Najden sestanek v koledarju '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Ni mogo�e najti nobenega koledarja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Sestanka ni mogo�e najti v nobenem koledarju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Opravila ni mogo�e najti v nobenem seznamu opravil"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Opomnika ni mogo�e najti v nobenem seznamu opravil"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Iskanje obstoje�e razli�ice tega sestanka"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Ni mogo�e raz�leniti predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ni mogo�e poslati predmeta v koledar '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslano koledarju '%s' kot sprejeto"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslano koledarju '%s' kot poskusno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslano koledarju '%s' kot odklonjeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslano koledarju '%s' kot preklicano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je odstranil pooblaš�enca %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Pooblaš�encu pošlji obvestilo o preklicu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Pooblaš�encu ni mogo�e poslati obvestila o preklicu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Stanja udeleženca ni mogo�e posodobiti zaradi neveljavnega stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ni mogo�e posodobiti udeleženca. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Stanje udeleženca posodobljeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Podrobnosti sestanka uspešno poslane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Podrobnosti naloge uspešno poslane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Podrobnosti opomnika uspešno poslane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ni mogo�e poslati podrobnosti o sestanku, saj ta še ni ustvarjen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Podrobnosti opravila ni mogo�e poslati; opravilo ne obstaja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ni mogo�e poslati opomnika, saj ta še ni ustvarjen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Priložen koledar ni veljaven"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Sporo�ilo trdi, da vsebuje koledar, vendar ni v veljavni obliki iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Predmet v koledarju ni veljaven"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "Sporo�ilo vsebuje koledar, vendar koledar ne vsebuje nobenih dogodkov, opravil ali podatkov o zasedenosti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Priložen koledar vsebuje ve� predmetov"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "Za obdelavo vseh predmetov morate shraniti datoteko in uvoziti koledar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Sestanek se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Ta naloga se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Opomnik se ponavlja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "Zbriši sporo�ilo po _dejanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Iskanje sporov"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Izberite koledarje za iskanje sporov sestankov"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:189
 #: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Danes"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Danes %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Danes %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Danes %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Jutri"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Jutri ob %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Jutri %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Jutri %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Jutri %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Prosim odgovorite v imenu <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Prejeto v imenu <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> je preko %s izdal(a) naslednje podatke o sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> je izdal(a) naslednje podatke o sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> vam je pooblastil naslednji sestanek:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> preko %s zahteva vašo prisotnost na naslednjem sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> zahteva vašo prisotnost na naslednjem sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> vas želi preko %s dodati k obstoje�emu sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> vas želi dodati k obstoje�emu sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b> želi preko %s pridobiti najnovejše podrobnosti o sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o naslednjem sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> pošilja preko %s naslednji odgovor o sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> je poslal(a) naslednji odgovor o sestanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> je preko %s preklical(a) naslednji sestanek:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> je preklical(a) naslednji sestanek:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> preko %s predlaga naslednje spremembe sestanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> je predlagal(a) naslednje spremembe sestanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> je preko %s odklonil(a) naslednje spremembe sestanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> je odklonil(a) naslednje spremembe sestanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> je preko %s objavil(a) naslednja opravila:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> je objavil(a) naslednje opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> zahteva dodelitev %s naslednjemu opravilu:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> vam je preko %s dodelil(a) opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vam je dodelil(a) opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> vas želi preko %s dodati k obstoje�emu opravilu:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> vas želi dodati k obstoje�emu opravilu:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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 "<b>%s</b> želi preko %s pridobiti najnovejše podrobnostie o naslednji nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> želi dobiti najnovejše podatke o naslednjem opravilu:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> preko %s pošilja naslednji odgovor o dodeljeni nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> je poslal(a) naslednji odgovor o dodeljenem opravilu:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> je preko %s preklical(a) naslednje dodeljeno opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> je preklical(a) naslednje dodeljeno opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> predlaga preko %s naslednje spremembe dodelitev naloge:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> je predlagal(a) naslednje spremembe dodelitev opravil:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> je preko %s odklonil naslednje dodeljeno opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> je odklonil(a) nasledjne dodeljeno opravilo:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> je preko %s objavil(a) naslednji zapisek:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> je objavil(a) naslednji zapisek:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> vas želi preko %s dodati k obstoje�emu zapisku:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> vas želi dodati k obstoje�emu zapisku:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> je preko %s preklical(a) naslednji zapisek v skupni rabi:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> je preklical(a) naslednji zapisek v skupni rabi:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Odpri koledar"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Odkloni"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Sprejmi"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Odkloni vse"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "Vse _poskusno"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Poskusno"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Sprejmi vse"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Podatki o pošiljanju"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Posodobi stanje udeleženca"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Posodobi"
 
@@ -17941,7 +18599,8 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Ustvari sporo�ilo D-BUS, ko prispe nova pošta."
 
 #: ../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."
+#, fuzzy
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
 msgstr "Možnost omogo�a pisk ob prihodu novega sporo�ila namesto zvo�ne datoteke."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17988,8 +18647,18 @@ msgstr "Ali naj se prikaže obvestilo le za nova sporo�ila v mapi prihajajo�ih
 msgid "Generate a _D-Bus message"
 msgstr "Ustvari D-Bus sporo�ilo"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Obvestilo o novi pošti"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Obvestilo o novi pošti"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18010,7 +18679,7 @@ msgstr[3] ""
 "Prejeli ste %d nova sporo�ila\n"
 "v %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18019,48 +18688,48 @@ msgstr[1] "Prejeli ste %d novo sporo�ilo."
 msgstr[2] "Prejeli ste %d novi sporo�ili."
 msgstr[3] "Prejeli ste %d nova sporo�ila."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Novo elektronsko sporo�ilo"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "_Prikaži ikono na pladnju obvestil"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Utripaj ikono na pladnju obvestil"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "_Pojavno sporo�ilo naj se prikaže skupaj z ikono."
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Ob prihodu nove pošte predvajaj z_vok"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Pisk"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Predvajaj _zvo�no datoteko"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Navedite ime _datoteke:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Izberi zvo�no datoteko"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "_Predvajaj"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Prikaži obvestilo le za nova sporo�ila v mapi _prihajajo�ih sporo�il"
 
@@ -18084,12 +18753,12 @@ msgstr "Pretvori _v sestanek"
 msgid "Mail to meeting"
 msgstr "Pošta za sestanek"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ni mogo�e odpreti koledarja. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../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 "Izbrani vir je samo za branje, zato ni mogo�e ustvariti opravila. Prosim, izberite drug vir."
 
@@ -18182,8 +18851,9 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Pošljem e-poštno sporo�ilo na dopisni seznam?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
-"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
+"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 ""
@@ -18261,6 +18931,25 @@ msgstr "_Naro�i se na seznam"
 msgid "_Unsubscribe from List"
 msgstr "_Prekli�i naro�nino na seznam"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Premikanje sporo�il v mapo %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 "To bo ozna�ilo vsa sporo�ila v izbrani mapi in podmapah kot prebrana."
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "na trenutni mapi in podmapah"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "_Le trenutna mapa"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Ozna�i vse kot prebrano"
@@ -18303,7 +18992,7 @@ msgstr "Vstavek za omogo�anje in onemogo�anje vstavkov."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Upravljalnik profilov"
 
@@ -18315,33 +19004,24 @@ msgstr "Omogo�i ali onemogo�i vstavke"
 msgid "_Plugins"
 msgstr "_Vstavki"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Avtor(ji)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Opis"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Nastavitve"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Opozorilo: nekatere spremembe ne bodo uveljavljene do ponovnega zagona"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Pregled"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Nastavitve"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Ni namestitvenih možnosti za ta vstavek."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Vstavek"
 
@@ -18364,19 +19044,19 @@ msgstr "Na�in navadnega besedila"
 msgid "Prefer plain-text"
 msgstr "Raje navadno besedilo"
 
-#: ../plugins/prefer-plain/prefer-plain.c:158
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Prikaži HTML, �e je na voljo"
 
-#: ../plugins/prefer-plain/prefer-plain.c:159
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Raje PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:160
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Prikaži samo PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "Na�in _HTML"
 
@@ -18492,6 +19172,30 @@ msgstr ""
 "iCal\n"
 "Zasedenost"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../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 "Testni vstavek Python"
+
+#: ../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 "Nalagalnik Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (vgrajen)"
@@ -18558,7 +19262,7 @@ msgstr "Vstavek za shranjevanje vseh priponk ali delov sporo�ila naenkrat."
 
 #. 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:314
 msgid "Save attachments"
 msgstr "Shrani priponke"
 
@@ -18570,16 +19274,15 @@ msgstr "Shrani priponke ..."
 msgid "Save all attachments"
 msgstr "Shrani vse priponke"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Izberite ime zbirke"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Vrsta MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Shrani"
 
@@ -18587,79 +19290,79 @@ msgstr "Shrani"
 #. * 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:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Seznam opisov"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Seznam kategorij"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Seznam komentarjev"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Ustvarjeno"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Seznam stikov"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Za�etek"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Konec"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "odstotkov kon�ano"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Seznam udeležencev"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Napredne možnosti zapisa CSV"
 
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Spredaj dodaj glavo"
 
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Lo�evalec vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Lo�evalec zapisov:"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Ovij vrednosti z:"
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Zapis vrednosti, lo�enih z vejicami (.csv)"
 
@@ -18680,15 +19383,15 @@ msgstr "_Shrani 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:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Zapis RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Izberite ciljno datoteko"
 
@@ -18713,22 +19416,22 @@ msgid "Show _only this Task List"
 msgstr "Prikaži sam_o ta seznam opravil"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Vstavek, ki upravlja �arovnika ob zagonu"
+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 "ÄŒarovnik ob zagonu"
+msgid "Setup Assistant"
+msgstr "Pomo�nik namestitve"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Pomo�nik za namestitev Evolutiona"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Pozdravljeni"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18738,29 +19441,29 @@ msgstr ""
 "\n"
 "Za nadaljevanje kliknite gumb \"Naprej\". "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Uvoz datotek"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Prosim, izberite podatke, ki jih želite uvoziti:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../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:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Uvažanje podatkov."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Prosim poka�ajte"
 
@@ -18777,10 +19480,31 @@ msgid "Thread messages by subject"
 msgstr "Nitenje sporo�il po zadevi"
 
 #. 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
 msgid "F_all back to threading messages by subject"
 msgstr "Povrni se na nitenje sporo�il na podlagi zadeve"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr "Seznam namigov za vstavek opomnika priponke, ki ga je mogo�e najti v telesu sporo�ila."
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "Brez naslova"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Shrani kot _predlogo"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Shrani kot predlogo"
+
+#: ../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."
 msgstr "Enostaven vstavek, ki uporablja ytnef za dekodiranje tnef priponk."
@@ -18789,6 +19513,28 @@ msgstr "Enostaven vstavek, ki uporablja ytnef za dekodiranje tnef priponk."
 msgid "TNEF Attachment decoder"
 msgstr "TNEF dekoder priponk"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Vstavek za nastavitev WebDAV virov."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV stiki"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+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 "Lupina Evolution"
@@ -18806,239 +19552,220 @@ msgid "Evolution Test component"
 msgstr "Komponenta za preizkušanje Evolutiona"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Opis trenutnih nastavitev tiskanja."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr "Overovi povezave posredovalnega strežnika"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "URL za samodejno nastavitev posredovalnega strežnika"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Razli�ica nastavitev"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Dolo�a ali naj se zažene zaznavanje sesutja ali ne."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Privzeta Å¡irina stranskega pulta"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Privzeta višina okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Privzeto stanje okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Privzeta Å¡irina okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "Omogo�i nastavitve posredovalnega strežnika ob dostopu varnega HTTP preko spleta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Ime gostitelja posredovalnega strežnika HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Geslo posredovalnega strežnika HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Vrata posredovalnega strežnika HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Uporabniško ime posredovalnega strežnika HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 ali vzdevek komponente, ki naj se privzeto prikaže ob zagonu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "If true, then connections to the proxy server require authentication. The username/password combo is defined by \"/apps/evolution/shell/network_config/authentication_user\" and locally stored password in .gnome2_private/."
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+#, fuzzy
+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 "Izbrana možnost omogo�i zahtevo overitve pred uporabo posredniškega strežnika. Spustno polje dolo�a \"/apps/evolution/shell/network_config/authentication_user\" in krajevno shranjena gesla v .gnome2_private/."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Zadnja nadgrajena razli�ica nastavitev"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Seznam poti map, ki naj se uskladijo z diskom za delo brez povezave"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Gostitelji brez posredovalnega strežnika"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Geslo za overitev posredovalnega strežnika HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Na�in nastavitev posredovalnega strežnika"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Ime gostitelja posredovalnega strežnika SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Vrata posredovalnega strežnika SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Ime gostitelja varnega posredovalnega strežnika HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Vrata varnega posredovalnega strežnika HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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 "Izberite na�in nastavitev posredniškega strežnika. Podprte vrednosti so 0, 1, 2 in tri in predstavljajo \"uporabo sistemskih nastavitev\", \"brez posredovanja\", \"uporabi ro�ne nastavitve posredovanja\" in \"uporabi nastavitve posredovanja zapisane v naslovu autoconfig\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Stranski pult je viden"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Presko�i opozorilo o razvoju"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Presko�i opozorilo o obnavljanju"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-#: ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Za�ni v ne-mrežnem na�inu"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Vrstica stanja je vidna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../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 "Nastavitvena razli�ica Evolutiona, z velikim/majhnim/nastavitvenim nivojem (npr. \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Privzeta višina glavnega okna (v pikah)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Privzeta Å¡irina glavnega okna (v pikah)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Privzeta Å¡irina stranskega pulta (v pikah)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../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 "Zadnja nadgrajena razli�ica Evolutiona, z velikim/majhnim/nastavitvenim nivojem (npr. \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "Ime ra�unalnika posredovalnega strežnika HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Ime ra�unalnika varnega posredovalnega strežnika HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "Ime ra�unalnika posredovalnega strežnika SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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 "Vrata na ra�unalniku, ki jih dolo�a \"/apps/evolution/shell/network_config/http_host\" posredovalnega strežnika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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 "Vrata na ra�unalniku, ki jih dolo�a \"/apps/evolution/shell/network_config/secure_host\" posredovalnega strežnika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "Vrata na ra�unalniku, ki jih dolo�a \"/apps/evolution/shell/network_config/socks_host\" posredovalnega strežnika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "Slog gumbov okna. Lahko je \"besedilo\", \"ikone\", \"oboje\" ali \"orodna vrstica\". ÄŒe je izbrana \"orodna vrstica\", je slog gumbov enak kot v nastavitvah orodnih vrstic v GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../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 "Ta klju� vsebuje seznam gostiteljev, s katerimi se vzpostavi neposredna povezava in preko posredovalnega strežnika (�e je dejaven). Vrednosti so lahko imena gostiteljev, domene (z nadomestnimi znaki kot je *.foo.com), naslovi IP gostitelja (tako IPv4 kot tudi IPv6) in omrežni naslovi z omrežno masko (npr. 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Orodna vrstica je vidna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL z vrednostmi nastavitev posredovalnega strežnika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Uporabi HTTP posredovalni strežnik"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Uporabniško ime za overitev na HTTP posredovalnem strežniku."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Ali naj se Evolution zažene v na�inu brez povezave namestu z povezavo."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Ali naj se zažene zaznavanje sesutja ali ne."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Ali naj bo okno razprto."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Ali naj bo stranski pult viden."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Ali naj bo vrstica stanja vidna."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Ali naj bo orodna vrstica vidna."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Ali naj se opozorilno okno v razvojnih razli�icah Evolution presko�i."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Ali naj se opozorilno okno obnavljanja v programu Evolution presko�i."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Ali naj bodo gumbi okna vidni."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Slog gumbov okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Gumbi okna so vidni"
 
@@ -19054,25 +19781,23 @@ msgstr "Dejavne povezave"
 msgid "Click OK to close these connections and go offline"
 msgstr "Kliknite \"V redu\" za zaprtje povezav in nadalnje delo brez mreže"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Izberite vrsto uvoznika, ki naj se požene:"
 
-#: ../shell/e-shell-importer.c:138
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+#: ../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."
 msgstr ""
 "Izberite datoteko, ki jo želite uvoziti v Evolution in izberite vrsto datoteke s seznama\n"
 "\n"
 "ÄŒe ne veste, lahko izberete \"Samodejno\" in Evolution bo poskusil urediti."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Zapri cilj za ta uvoz"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -19084,23 +19809,23 @@ msgstr ""
 "nobenih nastavitev, ki bi se jih dalo uvoziti. Če želite\n"
 "poskusiti znova, kliknite gumb \"Nazaj\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "Vrs_ta datoteke:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Uv_ozi podatke in nastavitve iz starejših programov"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Uvozi eno _samo datoteko"
 
@@ -19108,30 +19833,10 @@ msgstr "Uvozi eno _samo datoteko"
 msgid "Evolution Preferences"
 msgstr "Nastavitve Evolutiona"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Ime mape ni navedeno."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Ime mape me sme vsebovati znaka return"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Ime mape ne sme vsebovati znaka \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Ime mape ne sme vsebovati znaka \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' in '..' sta rezervirana za imena map."
-
 #. 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:50
-#: ../shell/e-shell-window.c:343
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19156,72 +19861,78 @@ msgstr "Programa 'Bug buddy' ni bilo mogo�e pognati."
 #. 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:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "Matjaž Horvat <m@owca.info>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution - spletna stran"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Napaka pri odpiranju FAQ strani."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: ../shell/e-shell-window-commands.c:981
-#: ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr "Evolution je trenutno na zvezi. Kliknite na ta gumb za delo brez povezave."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution je v postopku preklaplanja na delo brez povezave."
 
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr "Evolution trenutno ni na zvezi. Kliknite na ta gumb za povezan na�in."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Preklopi na %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Neznana sistemska napaka."
 
-#: ../shell/e-shell.c:838
 #: ../shell/e-shell.c:839
+#: ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280
-#: ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1298
+#: ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "V redu"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Ni mogo�a registracija pri OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
@@ -19231,15 +19942,16 @@ msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 msgid "New"
 msgstr "Nov"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nov preizkus"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
-msgstr "_Preizkus"
+msgstr "_Test"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Ustvari nov preizkusni predmet"
 
@@ -19282,7 +19994,7 @@ msgstr ""
 "zunanjih datotek v Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19317,7 +20029,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela, in nestrpno\n"
 "pri�akujemo vaše prispevke!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19325,66 +20037,43 @@ msgstr ""
 "Hvala!\n"
 "Ekipa Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Ne opozarjaj ve�"
 
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr "Zaznavanje sesutja programa"
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "P_rezri"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Vide ti je, da se je program Evolution ob zadnjem zagonu nenadoma sesul.\n"
-"Zaradi varnosti, bodo vsa okna pogledov skrita.\n"
-"Okna lahko obnovite preko menija pogled.\n"
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "_Ne pokaži ve� tega sporo�ila"
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Ob zagonu Evolutiona uporabi navedeno komponento"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Za�ni v mrežnem na�inu"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Prisilno kon�aj vse komponente Evolutiona"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Ponovno u�inkovito nadgradite iz Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroš�evalna sporo�ila vseh komponent v datoteko."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Onemogo�i nalaganje vseh vstavkov."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Onemogo�i pladenj predogleda za pošto, stike in naloge."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Poštni odjemalec in PIM Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19505,7 +20194,7 @@ msgstr ""
 "\n"
 "Če se odlo�ite za nadaljevanje, morda ne boste imeli dostopa do nekaterih svojih starih podatkov.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19516,11 +20205,11 @@ msgstr ""
 "\n"
 "Uredi nastavitve zaupanja:"
 
-#: ../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 "Ker zaupate overitelju, ki je izdal certifikat, zaupate pristnosti tega certifikata, razen �e tukaj ozna�ite druga�e"
 
-#: ../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 unless otherwise indicated here"
 msgstr "Ker ne zaupate overitelju, ki je izdal certifikat, ne zaupate pristnosti tega certifikata, razen �e tukaj ozna�ite druga�e"
 
@@ -19573,27 +20262,27 @@ msgstr "E-poštni naslov"
 msgid "All CA certificate files"
 msgstr "Vse CA overitvene datoteke"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Pregledovalnik certifikatov: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Vnesite geslo za '%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 "Vnesite geslo za podatkovno zbirko certifikata"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Vnesite novo geslo"
 
 #. 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"
@@ -19602,7 +20291,7 @@ msgstr ""
 "Izdano za:\n"
 " Zadeva: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19611,7 +20300,7 @@ msgstr ""
 "Izdal:\n"
 " Zadeva: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Izberi certifikat"
 
@@ -19795,7 +20484,7 @@ msgid "_Edit CA Trust"
 msgstr "Ur_edi zaupanje CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certifikat že obstaja "
 
@@ -19967,15 +20656,15 @@ msgstr "Edinstven ID Zadeve"
 msgid "Certificate Signature Value"
 msgstr "Vrednost podpisa certifikata"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "Geslo datoteke PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Vnesite geslo za datoteko PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Uvožen certifikat"
 
@@ -20032,7 +20721,7 @@ msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo ..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Ustvari novo mapo imenika"
 
 #: ../ui/evolution-addressbook.xml.h:12
@@ -20123,8 +20812,6 @@ msgid "Select All"
 msgstr "Izberi vse"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Izberi _vse"
 
@@ -20195,7 +20882,7 @@ msgid "_Move Folder Contacts To"
 msgstr "_Premakni stike mape v"
 
 #: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nova"
 
@@ -20257,7 +20944,7 @@ msgstr "Mesec"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Naslednje"
 
@@ -20267,7 +20954,7 @@ msgstr "Predogled koledarja, ki bo natisnjen"
 
 #: ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Prejšnje"
 
@@ -20336,221 +21023,6 @@ msgstr "Delavni teden"
 msgid "_Open Appointment"
 msgstr "_Odpri sestanek"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Kliknite tukaj za dodajanje priponk"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Kliknite tukaj za zapiranje trenutnega okna"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Kliknite tukaj za shranjevanje trenutnega okna"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Kliknite tukaj za ogled pomo�i, ki je na voljo"
-
-#.
-#. <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-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Zapri"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopiraj izbrano besedilo na odložiš�e"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Izreži izbrano besedilo na odložiš�e"
-
-#: ../ui/evolution-editor.xml.h:10
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Vstavi"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Prilepi besedilo z odložiš�a"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Izberi vso besedilo"
-
-#: ../ui/evolution-editor.xml.h:20
-#: ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Pomo�"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "M_ožnosti"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Celodnevni dogodek"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Celo_dnevni dogodek"
-
-#: ../ui/evolution-event-editor.xml.h:4
-#: ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Razvrsti kot srednje zaupno"
-
-#: ../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 "Razvrsti kot zasebno"
-
-#: ../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 "Razvrsti kot javno"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Kliknite tukaj za nastavljanje alarmov za ta dogodek"
-
-#: ../ui/evolution-event-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Vstavi napredne možnosti pošiljanja"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Ozna�i dogodek kot ponovljiv"
-
-#: ../ui/evolution-event-editor.xml.h:11
-#: ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_Javno"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Poizvedi stanje zasedenosti udeležencev"
-
-#: ../ui/evolution-event-editor.xml.h:13
-#: ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Polje Vl_oga"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Možnosti _pošiljanja"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Prikaži �as kot _zaseden"
-
-#: ../ui/evolution-event-editor.xml.h:18
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "ÄŒasovni _pas"
-
-#: ../ui/evolution-event-editor.xml.h:19
-#: ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Preklopi prikaz polja Vrsta udeleženca"
-
-#: ../ui/evolution-event-editor.xml.h:20
-#: ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Preklopi prikaz polja RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:21
-#: ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Preklopi prikaz polja Vloga"
-
-#: ../ui/evolution-event-editor.xml.h:22
-#: ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Preklopi prikaz polja Stanje"
-
-#: ../ui/evolution-event-editor.xml.h:23
-#: ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Preklopi prikaz �asovnega pasa"
-
-#: ../ui/evolution-event-editor.xml.h:24
-#: ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Preklopi prikaz kategorij"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Preklopi celodnevnost dogodka"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Preklopi prikaz zasedenosti �asa"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmi"
-
-#: ../ui/evolution-event-editor.xml.h:28
-#: ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorije"
-
-#: ../ui/evolution-event-editor.xml.h:29
-#: ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Razvrstitev"
-
-#: ../ui/evolution-event-editor.xml.h:30
-#: ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Srednje zaupno"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Zasedenost"
-
-#: ../ui/evolution-event-editor.xml.h:32
-#: ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "Z_asebno"
-
-#: ../ui/evolution-event-editor.xml.h:33
-#: ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Ponovitev"
-
-#: ../ui/evolution-event-editor.xml.h:35
-#: ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Polje _Stanje"
-
-#: ../ui/evolution-event-editor.xml.h:36
-#: ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Polje _Vrsta"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Prekli�i trenutno operacijo pošte"
@@ -20581,7 +21053,6 @@ msgstr "Sprazni _smeti"
 
 #: ../ui/evolution-mail-global.xml.h:9
 #: ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Mapa"
 
@@ -20799,7 +21270,7 @@ msgid "_Group By Threads"
 msgstr "_Združi po nitih"
 
 #: ../ui/evolution-mail-list.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Sporo�ilo"
@@ -21135,130 +21606,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikaži utripajo� kazalec v telesu prikazanega sporo�ila"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Prikaži sporo�ila v obi�ajnem slogu"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Prikaži sporo�ila z vsemi e-poštnimi glavami"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporo�ila"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Povrni izbrana sporo�ila"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Nepo_membno"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Po_manjšaj"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Na�in _kazalke"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "Zb_riši zastavico"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Zbriši sporo�ilo"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Najdi v sporo�ilu ..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Dolo�itev _zastavice kon�ana"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Pomembno"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "Kot del sporo�_ila"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Neželeno"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Na_loži slike"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Vir sporo�il"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Naslednje sporo�ilo"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Obi�aj_na velikost"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Ni neželeno"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Prejšnje sporo�ilo"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Navedeno"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Beri"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Shrani sporo�ilo ..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Povrni sporo�ilo"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Neprebrano"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Pove�aj"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Po_ve�aj"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zapri to okno"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Zapri"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3
 #: ../ui/evolution.xml.h:18
@@ -21297,81 +21763,6 @@ msgstr "Ogled izbranega zapiska"
 msgid "_Open Memo"
 msgstr "_Odpri zapisek"
 
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zapri"
-
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "O_blika"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Shrani in zapri"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Shrani in _zapri"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Shrani trenutno datoteko in zapri okno"
-
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Pošlji pošto v HTML obliki"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Dodaj mapo na seznam naro�enih map"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Osveži seznam"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Osveži seznam map"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstrani mapo iz seznama naro�enih map"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Naro�i"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Prekini naro�nino"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Obrni izbor"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Kliknite spremeni / preglej podrobnosti stanja opravila"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Podrobnosti stanja"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "ÄŒasovni pas "
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Podrobnosti _stanja"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopiraj izbrana opravila"
@@ -21565,50 +21956,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Prikaži/skrij vrstico stanja"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "_Nepovezan v omrežje"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_O"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Zapri okno"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Pozabi gesla"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Skrij gumbe"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Samo _ikone"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Kratek priro�nik"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Izhod"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Videz _preklopnika"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Možnosti _usklajevanja ..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Samo besedilo"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Okno"
 
@@ -21686,11 +22081,11 @@ msgid "With _Status"
 msgstr "S _stanjem"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21718,19 +22113,19 @@ msgstr ""
 "Uporabite lev miškin gumb za pove�avo obmo�ja zemljevida in izbiro �asovnega pasu.\n"
 "Uporabite desni miškin gumb za zmanjšanje velikosti."
 
-#: ../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 "Zbirka"
 
-#: ../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 "Dolo�i poglede za %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 "Dolo�i poglede"
 
@@ -21746,11 +22141,11 @@ msgstr "Dolo�i poglede za \"%s\""
 msgid "Table"
 msgstr "Razpredelnica"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Primerek"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Shrani trenutni pogled"
 
@@ -21764,7 +22159,7 @@ msgstr "Zamenjaj obstoje�i pogled"
 
 #. 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 "Pogled po meri"
 
@@ -21773,40 +22168,40 @@ msgid "Save Custom View"
 msgstr "Shrani prikrojen pogled"
 
 #: ../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 "Dolo�i poglede ..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Tren_utni pogled"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Izbor pogleda: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Trenutni pogled je prilagojen"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Shrani pogled po meri ..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Shrani trenutni prilagojeni pogled"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Ustvari ali uredi pogled"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Tovarna"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Dolo�i nov pogled"
 
@@ -21822,48 +22217,20 @@ msgstr "Vrsta pogleda"
 msgid "Type of view:"
 msgstr "Vrsta pogleda:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u bajtov"
-msgstr[1] "%u bajt"
-msgstr[2] "%u bajta"
-msgstr[3] "%u bajti"
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Vrstica priponk"
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-msgid "Recent Docu_ments"
-msgstr "Nedavni _dokumenti"
-
-#: ../widgets/misc/e-attachment.c:296
-#: ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596
-#: ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:291
+#: ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591
+#: ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ni mogo�e pripeti datoteke %s: %s"
 
-#: ../widgets/misc/e-attachment.c:304
-#: ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:299
+#: ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ni mogo�e pripeti datoteke %s: ni obi�ajna datoteka"
@@ -21885,11 +22252,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priponke"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Mese�ni koledar"
 
@@ -21938,33 +22305,33 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92
+#: ../widgets/misc/e-canvas-vbox.c:91
 #: ../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:3071
+#: ../widgets/table/e-table-group-container.c:999
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Najmanjša širina"
 
-#: ../widgets/misc/e-canvas-vbox.c:93
+#: ../widgets/misc/e-canvas-vbox.c:92
 #: ../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:3072
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Najmanjša širina"
 
+#: ../widgets/misc/e-canvas-vbox.c:103
 #: ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Razmik"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Sedaj"
 
-#: ../widgets/misc/e-cell-date-edit.c:797
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
@@ -21973,259 +22340,267 @@ msgstr "Datum mora biti v obliki: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v odstotkih mora biti med vklju�no 0 in 100"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabsko"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltski"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Srednjeevropski"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kitajski"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirili�ni"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grški"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japonski"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korejski"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Tajsko"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turški"
 
-#: ../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 "Zahodnoevropski"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Zahodnoevropski, Nov"
 
-#: ../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:91
 msgid "Traditional"
 msgstr "Tradicionalen"
 
-#: ../widgets/misc/e-charset-picker.c:91
 #: ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Poenostavljen"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Vidno"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznan nabor znakov: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Nabor znakov"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Vpišite nabor znakov, ki naj se uporablja"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Drugo ..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "N_abor znakov"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Datum in �as"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Besedilno polje za vnos datuma"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Kliknite ta gumb za prikaz koledarja"
 
-#: ../widgets/misc/e-dateedit.c:409
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Spustno polje za izbiro �asa"
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "Zda_j"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Danes"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Neveljavna vrednost datuma"
 
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Neveljavna vrednost �asa"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Razširjeno"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Ali je razširitveni gumb razširjen ali ne"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Besedilo oznake razširitvenega gumba"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Uporabi pod�rtano"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr "Če nastavljen, pod�rtaj v besedilu ozna�uje, da naj bo naslednji znak uporabljen kot mnemoni�na pospeševalna tipka"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Prostor za vstavljanje med napis in podrejenega"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Gradnik napis"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Gradnik za prikaz namesto obi�ajnega napisa razširitvenega gumba"
 
-#: ../widgets/misc/e-expander.c:223
-#: ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221
+#: ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Velikost razširitvenega gumba"
 
-#: ../widgets/misc/e-expander.c:224
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Velikost puš�ice razširitvenega gumba"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Razmik kazalnika"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Razmik okoli puš�ice razširitvenega gumba"
 
 #. 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 "Napredno iskanje"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "I_skanja"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Iskanja"
 
-#: ../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 "_Shrani iskanje ..."
 
-#: ../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 "_Uredi shranjena iskanja ..."
 
-#: ../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 "N_apredno iskanje ..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Vsi ra�un"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Trenutni ra�un"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Trenutna mapa"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Trenutno sporo�ilo"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Izberi sliko"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Zemljevid sveta"
 
-#: ../widgets/misc/e-map.c:628
+#: ../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 "Gradnik za interaktivni izbor �asovnega pasu z miško na zemljevidu. Uporabniki tipkovnice lahko �asovni pas izberejo iz spodnjega spustnega polja."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "Povezano"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "Gumb je ozna�en kot povezan"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Uskladi z:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Uskladi zasebne kartoteke"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "kategorije usklajevanja:"
 
@@ -22244,35 +22619,35 @@ msgstr "Model ponovnega toka"
 msgid "Column width"
 msgstr "Å irina stolpca"
 
-#: ../widgets/misc/e-search-bar.c:350
-#: ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../widgets/misc/e-search-bar.c:350
-#: ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Kliknite tukaj za zamenjavo na�ina iskanja"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "I_skanje"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Iš�i sedaj"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Po�isti"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID predmeta"
 
-#: ../widgets/misc/e-search-bar.c:884
+#: ../widgets/misc/e-search-bar.c:875
 #: ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
@@ -22280,41 +22655,41 @@ msgstr "Besedilo"
 
 #. 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:1018
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "Pri_kaži:"
 
 #. 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:1035
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "I_skanje:"
 
 #. 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:1047
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr "_v"
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Vrstica kazalca"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Stolpec kazalca"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Razvrš�anje"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Na�in izbire"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Na�in kazalca"
 
@@ -22342,10 +22717,6 @@ msgstr "<b>Sledenje stanja</b>"
 msgid "A_uto-delete sent item"
 msgstr "Samodejno zbriši poslani predmet"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Razvrstitev"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Ustvari poslani predm_et za sledenje podatkov"
@@ -22452,19 +22823,19 @@ msgid "_When opened:"
 msgstr "_Ko je odprto:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kon�ano)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Kliknite tukaj za obisk URL-ja"
 
@@ -22663,7 +23034,7 @@ msgstr ""
 "Da bi dodali stolpec k vaši razpredelnici, ga\n"
 "potegnite do mesta kjer želite, da se pojavi."
 
-#: ../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)"
@@ -22672,7 +23043,7 @@ msgstr[1] "%s : %s (%d predmet)"
 msgstr[2] "%s : %s (%d predmeta)"
 msgstr[3] "%s : %s (%d predmeti)"
 
-#: ../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)"
@@ -22681,94 +23052,94 @@ msgstr[1] "%s (%d predmet)"
 msgstr[2] "%s (%d predmeta)"
 msgstr[3] "%s (%d predmeti)"
 
-#: ../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:3029
-#: ../widgets/table/e-table-item.c:3030
+#: ../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:3032
+#: ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Izmeni�ne barve vrstic"
 
-#: ../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:3036
-#: ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3322
-#: ../widgets/table/e-tree.c:3323
+#: ../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:3039
+#: ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Riši vodoravno mrežo"
 
-#: ../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:3043
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3328
-#: ../widgets/table/e-tree.c:3329
+#: ../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:3046
+#: ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Riši navpi�no mrežo"
 
-#: ../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:3050
-#: ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3334
-#: ../widgets/table/e-tree.c:3335
+#: ../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:3053
+#: ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Riši 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:3057
-#: ../widgets/table/e-table-item.c:3058
+#: ../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:3060
+#: ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Na�in kazalca"
 
-#: ../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:3022
-#: ../widgets/table/e-table-item.c:3023
+#: ../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:3025
+#: ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Na�in izbire"
 
-#: ../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:3064
-#: ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307
-#: ../widgets/table/e-tree.c:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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: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
 msgid "Length Threshold"
 msgstr "Prag dolžine"
 
-#: ../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:3098
-#: ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314
-#: ../widgets/table/e-tree.c:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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: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
 msgid "Uniform row height"
 msgstr "Enotna višina vrstic"
 
-#: ../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 "Zmrznjena"
 
@@ -22834,7 +23205,7 @@ msgid "Font Description"
 msgstr "Opis pisave"
 
 #: ../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 "Razvrsti podatke"
 
@@ -22844,41 +23215,41 @@ msgstr "Razvrsti podatke"
 msgid "Tree"
 msgstr "Drevo"
 
-#: ../widgets/table/e-table-item.c:3008
-#: ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Glava razpredelnice"
 
-#: ../widgets/table/e-table-item.c:3015
-#: ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Model razpredelnice"
 
-#: ../widgets/table/e-table-item.c:3091
-#: ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094
+#: ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Vrstica kazalca"
 
-#: ../widgets/table/e-table.c:3321
-#: ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Vedno iš�i"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Za dodajanje uporabi klik"
 
-#: ../widgets/table/e-tree.c:3341
-#: ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Prilagojevalnik razpredelnice ETree"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Staromoden videz"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Nariši �rte in razširitvene gumbe +/-."
 
@@ -23011,3 +23382,130 @@ msgstr "Vsebina IM"
 msgid "Handle Popup"
 msgstr "Pojavno okno ro�ice"
 
+#~ msgid "_Properties..."
+#~ msgstr "_Lastnosti ..."
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' je vir koledarja samo za branje. Preklopite na pogled koledarja in "
+#~ "ozna�ite koledar, ki lahko sprejema sestanke."
+#~ msgid "D_escription:"
+#~ msgstr "_Opis:"
+#~ msgid "De_scription:"
+#~ msgstr "_Opis:"
+#~ msgid "Updating query"
+#~ msgstr "Posodabljanje poizvedbe"
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Prihajajo�i sestanki"
+#~ msgid "_Save Message"
+#~ msgstr "_Shrani sporo�ilo"
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Ali želite, da se operacija izvede tudi v podmapah?"
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr ""
+#~ "Ali naj bodo vsa sporo�ila mape in njenih podmap ozna�ija kot prebrana?"
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Le na trenutni mapi"
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Omogo�i vstavek opomnikov priponk"
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Omogo�i vstavek opomnikov priponk."
+#~ msgid "Remind _missing attachments"
+#~ msgstr "Opomni na manjkajo�e priponke"
+#~ msgid "button-user"
+#~ msgstr "gumb_uporabnik"
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Ni namestitvenih možnosti za ta vstavek."
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "Vstavek, ki upravlja �arovnika ob zagonu"
+#~ msgid "Startup wizard"
+#~ msgstr "ÄŒarovnik ob zagonu"
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Opis trenutnih nastavitev tiskanja."
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Dolo�a ali naj se zažene zaznavanje sesutja ali ne."
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Presko�i opozorilo o obnavljanju"
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Ali naj se zažene zaznavanje sesutja ali ne."
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Ali naj se opozorilno okno obnavljanja v programu Evolution presko�i."
+#~ msgid "No folder name specified."
+#~ msgstr "Ime mape ni navedeno."
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Ime mape me sme vsebovati znaka return"
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Ime mape ne sme vsebovati znaka \"/\"."
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Ime mape ne sme vsebovati znaka \"#\"."
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' in '..' sta rezervirana za imena map."
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Zaznavanje sesutja programa"
+#~ msgid "Ig_nore"
+#~ msgstr "P_rezri"
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Vide ti je, da se je program Evolution ob zadnjem zagonu nenadoma sesul.\n"
+#~ "Zaradi varnosti, bodo vsa okna pogledov skrita.\n"
+#~ "Okna lahko obnovite preko menija pogled.\n"
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Ne pokaži ve� tega sporo�ila"
+#~ msgid "All Day Event"
+#~ msgstr "Celodnevni dogodek"
+#~ msgid "Send _Options"
+#~ msgstr "Možnosti _pošiljanja"
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Prikaži sporo�ila v obi�ajnem slogu"
+#~ msgid "C_lose"
+#~ msgstr "_Zapri"
+#~ msgid "For_mat"
+#~ msgstr "O_blika"
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+#~ msgid "Save and Close"
+#~ msgstr "Shrani in zapri"
+#~ msgid "Save and _Close"
+#~ msgstr "Shrani in _zapri"
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Shrani trenutno datoteko in zapri okno"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Pošlji pošto v HTML obliki"
+#~ msgid "Refresh List"
+#~ msgstr "Osveži seznam"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Osveži seznam map"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Odstrani mapo iz seznama naro�enih map"
+#~ msgid "Subscribe"
+#~ msgstr "Naro�i"
+#~ msgid "Unsubscribe"
+#~ msgstr "Prekini naro�nino"
+#~ msgid "_Invert Selection"
+#~ msgstr "_Obrni izbor"
+#~ msgid "Status Details"
+#~ msgstr "Podrobnosti stanja"
+#~ msgid "Time Zone"
+#~ msgstr "ÄŒasovni pas "
+#~ msgid "%u byte"
+#~ msgid_plural "%u bytes"
+#~ msgstr[0] "%u bajtov"
+#~ msgstr[1] "%u bajt"
+#~ msgstr[2] "%u bajta"
+#~ msgstr[3] "%u bajti"
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Nedavni _dokumenti"
+
diff --git a/po/sr.po b/po/sr.po
index 8f79ec93a2..8e33c7173f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10619,7 +10619,7 @@ msgstr[2] "пре %d �екунди"
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "1 �екунда у будућно�ти"
+msgstr[0] "%d �екунда у будућно�ти"
 msgstr[1] "%d �екунде у будућно�ти"
 msgstr[2] "%d �екунди у будућно�ти"
 
@@ -10635,7 +10635,7 @@ msgstr[2] "пре %d минута"
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "1 минут у будућно�ти"
+msgstr[0] "%d минут у будућно�ти"
 msgstr[1] "%d минута у будућно�ти"
 msgstr[2] "%d минута у будућно�ти"
 
@@ -10651,7 +10651,7 @@ msgstr[2] "пре %d �ати"
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "1 �ат у будућно�ти"
+msgstr[0] "%d �ат у будућно�ти"
 msgstr[1] "%d �ата у будућно�ти"
 msgstr[2] "%d �ати у будућно�ти"
 
@@ -10667,7 +10667,7 @@ msgstr[2] "пре %d дана"
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "1 дан у будућно�ти"
+msgstr[0] "%d дан у будућно�ти"
 msgstr[1] "%d дана у будућно�ти"
 msgstr[2] "%d дана у будућно�ти"
 
@@ -10683,7 +10683,7 @@ msgstr[2] "пре %d недеља"
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "1 недеља у будућно�ти"
+msgstr[0] "%d недеља у будућно�ти"
 msgstr[1] "%d недеље у будућно�ти"
 msgstr[2] "%d недеља у будућно�ти"
 
@@ -10699,7 +10699,7 @@ msgstr[2] "пре %d ме�еци"
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "1 ме�ец у будућно�ти"
+msgstr[0] "%d ме�ец у будућно�ти"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
 
@@ -10715,7 +10715,7 @@ msgstr[2] "пре %d година"
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "1 година у будућно�ти"
+msgstr[0] "%d година у будућно�ти"
 msgstr[1] "%d године у будућно�ти"
 msgstr[2] "%d година у будућно�ти"
 
diff --git a/po/sr@Latn.po b/po/sr@latin.po
index 0c3c973ee5..b0f662fe67 100644
--- a/po/sr@Latn.po
+++ b/po/sr@latin.po
@@ -10619,7 +10619,7 @@ msgstr[2] "pre %d sekundi"
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "1 sekunda u budućnosti"
+msgstr[0] "%d sekunda u budućnosti"
 msgstr[1] "%d sekunde u budućnosti"
 msgstr[2] "%d sekundi u budućnosti"
 
@@ -10635,7 +10635,7 @@ msgstr[2] "pre %d minuta"
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "1 minut u budućnosti"
+msgstr[0] "%d minut u budućnosti"
 msgstr[1] "%d minuta u budućnosti"
 msgstr[2] "%d minuta u budućnosti"
 
@@ -10651,7 +10651,7 @@ msgstr[2] "pre %d sati"
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "1 sat u budućnosti"
+msgstr[0] "%d sat u budućnosti"
 msgstr[1] "%d sata u budućnosti"
 msgstr[2] "%d sati u budućnosti"
 
@@ -10667,7 +10667,7 @@ msgstr[2] "pre %d dana"
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "1 dan u budućnosti"
+msgstr[0] "%d dan u budućnosti"
 msgstr[1] "%d dana u budućnosti"
 msgstr[2] "%d dana u budućnosti"
 
@@ -10683,7 +10683,7 @@ msgstr[2] "pre %d nedelja"
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "1 nedelja u budućnosti"
+msgstr[0] "%d nedelja u budućnosti"
 msgstr[1] "%d nedelje u budućnosti"
 msgstr[2] "%d nedelja u budućnosti"
 
@@ -10699,7 +10699,7 @@ msgstr[2] "pre %d meseci"
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "1 mesec u budućnosti"
+msgstr[0] "%d mesec u budućnosti"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
 
@@ -10715,7 +10715,7 @@ msgstr[2] "pre %d godina"
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "1 godina u budućnosti"
+msgstr[0] "%d godina u budućnosti"
 msgstr[1] "%d godine u budućnosti"
 msgstr[2] "%d godina u budućnosti"
 
diff --git a/po/sv.po b/po/sv.po
index be1b669ecd..7d2ae873e9 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-03-27 23:52+0100\n"
-"PO-Revision-Date: 2008-03-28 00:03+0100\n"
+"POT-Creation-Date: 2008-08-25 21:42+0200\n"
+"PO-Revision-Date: 2008-08-25 21:43+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:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "evolution-adressbok"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -50,7 +50,6 @@ msgstr[0] "aktuella adressboksmappen %s har %d kort"
 msgstr[1] "aktuella adressboksmappen %s har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öppna"
 
@@ -162,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:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -173,19 +172,19 @@ 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:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:841
-#: ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../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
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -193,10 +192,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -206,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:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:845
-#: ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../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
 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
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
@@ -327,30 +326,30 @@ msgstr "Kalender: från %s till %s"
 msgid "evolution calendar item"
 msgstr "evolutionkalenderobjekt"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Komboknapp"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Aktivera standardalternativ"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Popup-meny"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Växla bilagerad"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "aktivera"
 
 #. 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 source. Switch to Contacts View and highlight an address book that can accept contacts."
-msgstr "\"{0}\" är en skrivskyddad adressbokskälla. Växla till Kontaktervy och markera en adressbok som kan ta emot kontakter."
+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}\" är en skrivskyddad adressbok och kan inte ändras. Välj en annan adressbok från sidopanelen i Kontakter-vyn."
 
 #: ../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?"
@@ -385,7 +384,8 @@ msgid "Could not remove addressbook."
 msgstr "Kunde inte ta bort adressboken."
 
 #: ../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."
+#, fuzzy
+msgid "Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr "För närvarande kan du endast komma åt systemadressboken i GroupWise från Evolution. Använd någon annan GroupWise-klient en gång för att få tag på dina ofta använda kontakter och mappar för personliga kontakter i GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -406,7 +406,7 @@ msgstr "Misslyckades med att autentisera med LDAP-server."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Misslyckades med att ta bort kontakt"
 
@@ -483,9 +483,8 @@ msgid "You are connecting to an unsupported GroupWise server and may encounter p
 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"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
-msgid "You do not have enough permissions to delete contact in this Address Book."
-msgstr "Du har inte tillräckliga rättigheter för att ta bort den här posten. "
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Du har inte behörighet att ta bort kontakter i den här adressboken."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid "You have made modifications to this contact. Do you want to save these changes?"
@@ -523,7 +522,8 @@ msgstr "_Använd som det är"
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #. 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:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -534,17 +534,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Kunde inte läsa in adressboken"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
@@ -566,11 +566,11 @@ 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:1338
-#: ../calendar/gui/calendar-component.c:285
-#: ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -579,7 +579,8 @@ msgid "Evolution Address Book"
 msgstr "Evolutions adressbok"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address popup"
 msgstr "Adress-popup för Evolutions adressbok"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -595,8 +596,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolutions adressbokskomponent"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolutionkontroll för S/Mime-certifikathantering"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolutionkontroll för S/MIME-certifikathantering"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -610,16 +611,18 @@ msgstr "Hantera dina S/MIME-certifikat här"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200
-#: ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098
-#: ../calendar/gui/tasks-component.c:196
+#: ../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/mail-component.c:308
+#: ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312
 #: ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "PÃ¥ denna dator"
 
@@ -632,84 +635,75 @@ msgstr "PÃ¥ denna dator"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209
-#: ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:592
-#: ../calendar/gui/migration.c:1106
-#: ../calendar/gui/tasks-component.c:205
-#: ../mail/em-migrate.c:1056
+#: ../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 "Personligt"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "PÃ¥ LDAP-servrar"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Kontakt_lista"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Adress_bok"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "Skapa en ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Misslyckades med att uppgradera adressboksinställningar eller mappar."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Bas"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 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:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../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
+#: ../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:280
 #: ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2356
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allmänt"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Adressbok"
 
@@ -722,14 +716,13 @@ msgid "Authentication"
 msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10
+#: ../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:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Söker"
 
@@ -743,17 +736,17 @@ msgid "Address Book Properties"
 msgstr "Egenskaper för adressboken"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155
-#: ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrerar..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202
-#: ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "Migrerar \"%s\""
+msgid "Migrating '%s':"
+msgstr "Migrerar \"%s\":"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -803,40 +796,40 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina Pilot Sync-data..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "Mappnamn kan inte innehålla \"/\""
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Spara som vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../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
-#: ../mail/em-folder-tree.c:2091
-#: ../mail/em-folder-view.c:1346
+#: ../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
@@ -845,32 +838,41 @@ msgstr "Spara som vCard..."
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Egenskaper..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Egenskaper"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Ange lösenord"
@@ -957,7 +959,7 @@ msgid "Add Address Book"
 msgstr "Lägg till adressbok"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Alltid"
 
@@ -965,201 +967,207 @@ msgstr "Alltid"
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "Grundläggande"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-postadress"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution kommer att använda denna e-postadress för att autentisera dig med servern."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Sök möjliga sökbaser"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "Inlo_ggning:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 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:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "En"
 
 #. 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:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Sökfilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Sök_bas:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Sök_filter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Sökfilter"
 
 # Intressant engelska
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
 msgstr "Sökfilter är den typ av objekt som ska sökas efter när ett sök genomförs. Om den inte ändras kommer den som standard använda objektklassen av typen \"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
 msgstr "Att välja detta alternativ innebär att Evolution endast kommer att ansluta till din LDAP-server om den stöder SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
 msgstr "Att välja detta alternativ innebär att Evolution endast kommer att ansluta till din LDAP-server om den stöder TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "Att välja detta alternativ betyder att din server inte stöder varken SSL eller TLS. Detta betyder att din anslutning kommer att vara osäker, och att du kommer att vara sårbar för säkerhetsluckor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Pren"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Sökbaser som stöds"
 
 #. 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:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "Sökbasen är distinguished name (DN) för posten där dina sökningar kommer att starta. Om du lämnar detta tomt kommer sökningen att börja vid roten av katalogträdet."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "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:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 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:40
+#: ../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 "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:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr "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:42
+#: ../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 "Det här är namnet på denna server som kommer att visas i din Evolution-mapplista. Det används endast för visning."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "Det här är porten på LDAP-servern som Evolution kommer att försöka ansluta till. En lista med standardportar tillhandahålls. Fråga din systemadministratör vilken port du ska ange."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Använder distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Använder e-postadress"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Närsomhelst"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Lägg till adressbok"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Sök möjliga sökbaser"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Inloggningsmetod:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:173
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Sökomfattning:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:182
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tidsgräns:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Använd säker anslutning:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kort"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minuter"
 
@@ -1200,7 +1208,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1212,16 +1220,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../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:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1234,7 +1242,7 @@ msgid "Image"
 msgstr "Bild"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1247,7 +1255,7 @@ msgid "Nic_kname:"
 msgstr "Sme_knamn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1261,11 +1269,11 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Jobb"
 
@@ -1287,8 +1295,8 @@ msgid "_Birthday:"
 msgstr "_Födelsedag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
@@ -1377,1121 +1385,1123 @@ msgstr "_Var:"
 msgid "_Zip/Postal Code:"
 msgstr "_Postnummer:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adress"
 
-#: ../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-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:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../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:1835
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1836
 #: ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "USA"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algeriet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Amerikanska Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua och Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Österrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbajdzjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Vitryssland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien och Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Bouvetön"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Brittiskt territorium i Indiska Oceanen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 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:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Kambodja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Caymanöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Centralafrikanska republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Tchad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Kina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Julön"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komorerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo, demokratiska republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Cooköarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskusten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Cypern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Tjeckien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Dominikanska republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egypten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatorialguinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandsöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Färöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Frankrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Franska Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polynesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Franska sydterritorierna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grekland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 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:222
+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:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Heard och McDonald-öarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Ungern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Nordkorea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Sydkorea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libyen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Makedonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldiverna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Marshallöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldavien, republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marocko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar (Burma)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Nederländerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Nederländska Antillerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nya Kaledonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nya Zeeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolköarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Norra Marianeröarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua Nya Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filippinerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Ryssland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts och Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent och Grenadinerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 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:318
 msgid "Sao Tome And Principe"
 msgstr "São Tomé och Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudiarabien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbien och Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychellerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 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:324
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Slovakien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Solomonöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Sydafrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sydgeorgien och södra Sandwichöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre och Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard och Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadzjikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, förenade republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Östtimor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad och Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunisien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turkiet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks och Caicosöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Förenade Arabemiraten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "USA:s mindre avlägsna öar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Brittiska Jungfruöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Amerikanska Jungfruöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis och Futunaöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Västsahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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:111
 msgid "Service"
 msgstr "Tjänst"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Plats"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../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:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hem"
 
-#: ../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:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "Källbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "MÃ¥lbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Är ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Obligatoriska fält"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Ändrad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigerare - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 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:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Ingen bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2499,47 +2509,47 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" är tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Välj adressbok"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2548,7 +2558,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort kontaktlistan (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2556,7 +2566,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort dessa kontaktlistor?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2565,7 +2575,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort kontakten (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2715,9 +2725,9 @@ msgstr "_Medlemmar"
 #: ../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:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../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
 msgid "Book"
 msgstr "Bok"
 
@@ -2758,43 +2768,43 @@ msgstr ""
 "Denna kontakts namn eller e-postadress finns redan i den\n"
 "här mappen. Vill du lägga till den ändå?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Sammanfoga kontakt"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "Samman_foga"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Sammanfoga kontakt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81
-#: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
 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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Namn börjar med"
+msgid "Name contains"
+msgstr "Namn innehåller"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2809,9 +2819,9 @@ msgstr[1] "%d kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Fråga"
 
@@ -2822,10 +2832,10 @@ msgstr "Fel vid hämtande av bokvy"
 #: ../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:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-text.c:3550
 #: ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modell"
 
@@ -2833,116 +2843,116 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Namn börjar med"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Källkod"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Spara som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Ny kontakt_lista..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Spara som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Vidarebefordra kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Vidarebefordra kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Skicka _meddelande till kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Skicka _meddelande till lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Skicka _meddelande till kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Ko_piera till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Fly_tta till adressbok..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../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:3099
-#: ../mail/em-folder-tree.c:997
-#: ../mail/em-folder-view.c:1331
-#: ../mail/message-list.c:2064
+#: ../composer/e-msg-composer.c:2057
+#: ../mail/em-folder-tree.c:1005
+#: ../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-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:103
 #: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "Klistra _in"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:622
-#: ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "Alla kategorier"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Annat fel"
 
@@ -2977,7 +2987,7 @@ msgstr "Biltelefon"
 
 #: ../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
@@ -3078,9 +3088,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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:713
 msgid "Role"
 msgstr "Roll"
 
@@ -3117,7 +3127,7 @@ msgid "Web Site"
 msgstr "Webbplats"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86
 #: ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433
@@ -3125,38 +3135,38 @@ msgstr "Webbplats"
 #: ../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:3078
-#: ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728
+#: ../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/text/e-text.c:3729
+#: ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Bredd"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../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:3084
-#: ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736
+#: ../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/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Höjd"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Har fokus"
 
@@ -3176,11 +3186,21 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximal fältnamnslängd"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Kolumnbredd"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Söker efter kontakterna..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3194,7 +3214,7 @@ msgstr ""
 "\n"
 "eller dubbelklicka här för att skapa en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3208,7 +3228,7 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3218,7 +3238,7 @@ msgstr ""
 "\n"
 "Sök efter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3228,42 +3248,43 @@ msgstr ""
 "\n"
 "Det finns inga objekt att visa i denna vy."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-post arbete"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "E-post hem"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Annan e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Markerad"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Har markör"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../mail/em-popup.c:638
+#: ../mail/em-popup.c:627
 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:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkplats"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-popup.c:639
+#: ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Skicka nytt meddelande till..."
 
@@ -3288,7 +3309,7 @@ msgstr "karta"
 
 # Osäker
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Listmedlemmar"
 
@@ -3309,15 +3330,14 @@ msgid "Video Chat"
 msgstr "Videochatt"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../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/publish-calendar/publish-calendar.glade.h:5
@@ -3326,8 +3346,7 @@ msgstr "Kalender"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "Ledig/Upptagen"
 
@@ -3349,147 +3368,162 @@ msgid "Web Log"
 msgstr "Webblogg"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Födelsedag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Jubileum"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Hemsida"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Webblogg"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Lyckades"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Bakänden upptagen"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Adressboken finns inte"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Kontakten hittades inte"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID finns redan"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643
+#: ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Avbruten"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Kunde inte avbryta"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 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:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Det finns ingen sådan källa"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Inte tillgänglig i frånkopplat läge"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Ogiltig serverversion"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Autentiseringsmetoden stöds inte"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
-msgstr "Vi kunde inte öppna denna adressbok. Detta betyder antingen att denna bok inte är märkt 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"
+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:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
 msgstr "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen %s finns och att du har rätt att komma åt den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid "We were unable to open this addressbook.  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 är onåbar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid "We were unable to open this addressbook.  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 är onåbar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "Detaljerat fel:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3501,7 +3535,7 @@ msgstr ""
 "Gör din sökning mer specifik eller höj resultatgränsen i\n"
 "katalogserverinställningarna för denna adressbok."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3513,45 +3547,45 @@ msgstr ""
 "specifik eller höj resultatgränsen i katalogserverinställningarna\n"
 "för denna adressbok."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook 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:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakänden för denna adressbok vägrade att utföra denna fråga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "Denna fråga returnerade inte utan problem."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "Fel vid ändring av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3566,16 +3600,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:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "Visa _inte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "Visa _alla kontakter"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3584,70 +3618,70 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 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:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "Välj adressbok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "Flytta kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "Kopiera kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "Flytta kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "Kopiera kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "Flera vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard för %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformation"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformation för %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Frågar adressboken..."
 
@@ -3675,44 +3709,44 @@ msgstr "Spara i adressboken"
 msgid "Card View"
 msgstr "Kortvy"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671
 #: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importerar..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlooks CSV and Tab-importör"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozillas CSV och Tab-importör"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutions CSV och Tab-importör"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 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:666
 msgid "Evolution LDIF importer"
 msgstr "Evolutions LDIF-importör"
 
@@ -3765,12 +3799,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447
+#: ../mail/em-mailer-prefs.c:432
 #: ../widgets/table/e-table-click-to-add.c:503
 #: ../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:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Rubrik"
@@ -3873,7 +3907,7 @@ msgstr "Skuggning"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3892,7 +3926,7 @@ msgid "Top:"
 msgstr "Överst:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Typ:"
 
@@ -3993,13 +4027,13 @@ msgstr "Fel som inte hanteras"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar source. Change Calendar to one that can accept appointments."
-msgstr "\"{0}\" är en skrivskyddad kalenderkälla. Byt till en kalender som kan ta emot möten."
+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 source. Switch to Calendar View and highlight a calendar that can accept appointments."
-msgstr "\"{0}\" är en skrivskyddad kalenderkälla. Växla till Kalendervy och markera en kalender som kan ta emot möten."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "\"{0}\" är en skrivskyddad kalender och kan inte ändras. Välj en annan kalender som kan ta emot möten."
 
 #: ../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."
@@ -4070,19 +4104,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:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, 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?"
@@ -4207,15 +4241,15 @@ msgstr "Evolution-uppgifterna har oväntat avslutats."
 
 #: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
-msgstr "Kalendern är inte märkt för frånkopplad användning."
+msgstr "Kalendern är inte markerad för frånkopplad användning."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "Memolistan är inte märkt för frånkopplad användning"
+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
 msgid "The task list is not marked for offline usage."
-msgstr "Uppgiftslistan är inte märkt för frånkopplad användning."
+msgstr "Uppgiftslistan är inte markerad för frånkopplad användning."
 
 #: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
@@ -4294,13 +4328,12 @@ 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
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Förkasta ändringar"
 
 #: ../calendar/calendar.error.xml.h:76
-#: ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Spara"
 
@@ -4309,9 +4342,9 @@ msgid "_Save Changes"
 msgstr "_Spara ändringar"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 #: ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -4325,55 +4358,56 @@ msgstr "_Skicka meddelande"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Delade flerdagsevenemang:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Kunde inte starta evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunde inte läsa pilotens memo-programblock"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunde inte skriva pilotens memo-programblock"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 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:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 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:2347
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Kalender och uppgifter"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalendrar"
 
@@ -4415,30 +4449,30 @@ msgstr "Mem_o"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280
-#: ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701
+#: ../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:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Memon"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495
-#: ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573
-#: ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -4456,26 +4490,27 @@ msgstr "_Uppgifter"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionkalenderns alarmnotifieringstjänst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timmar"
 msgstr[1] "timmar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Starttid"
 
@@ -4486,9 +4521,9 @@ msgstr "Möten"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Plats:"
@@ -4498,22 +4533,18 @@ 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/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 #: ../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:41
+#: ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Redigera"
@@ -4526,32 +4557,32 @@ msgstr "_Slumra"
 msgid "location of appointment"
 msgstr "platsen för mötet"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Ingen platsinformation finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarm"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "Varning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4563,7 +4594,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4579,15 +4610,15 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 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:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 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..."
 
@@ -4597,7 +4628,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:66
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4607,7 +4638,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:72
-#: ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4619,7 +4650,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:76
-#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4840,12 +4871,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Visa statusfältet i evenemang/uppgift/sammanträdesredigeraren"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Visa panelen \"Förhandsvisning\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Visa panelen \"Förhandsvisning\"."
 
@@ -4887,7 +4918,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:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Tidszon"
 
@@ -5032,61 +5063,61 @@ msgstr "Minut som arbetsdagen börjar"
 msgid "daylight savings time"
 msgstr "sommartid"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Kategori är"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Platsen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:626
-#: ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629
+#: ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Uppgifter de närmsta 7 dagarna"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Aktiva uppgifter"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Uppgifter som skulle ha utförts"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Färdiga uppgifter"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Uppgifter med bilagor"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Aktiva möten"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Möten de närmsta 7 dagarna"
 
-#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-commands.c:92
 #: ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75
@@ -5095,20 +5126,21 @@ msgstr "Möten de närmsta 7 dagarna"
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Töm evenemang äldre än"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
+#: ../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 "dag"
@@ -5119,108 +5151,81 @@ msgstr "dag"
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:273
 #: ../calendar/gui/memos-component.c:235
-#: ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:611
-#: ../calendar/gui/migration.c:1125
+#: ../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 "PÃ¥ webben"
 
-#: ../calendar/gui/calendar-component.c:296
-#: ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310
+#: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Födelsedagar och jubileum"
 
 #. 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 "Väder"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465
 #: ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471
-#: ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3637
-#: ../mail/em-folder-tree.c:2100
-#: ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Egenskaper"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Misslyckades med att uppgradera kalendrar."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, 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:1254
+#: ../calendar/gui/calendar-component.c:1264
 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:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Väljare för kalenderkälla"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "_Möte"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "_Sammanträde"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "Hel_dagsmöte"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "Kale_nder"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
@@ -5242,16 +5247,271 @@ msgstr "MÃ¥nadsvy"
 
 #: ../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 "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
+msgid "Attachments"
+msgstr "Bilagor"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Deltagare"
+
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Arbete"
+
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Kategori"
+
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Klassifikation"
+
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Färdigdatum"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Konfidentiellt"
+
+#: ../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
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Beskrivningen innehåller"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "finns"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoriter"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Presenter"
+
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "MÃ¥l"
+
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Semester"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "Viktiga kontakter"
+
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Idéer"
+
+#: ../calendar/gui/caltypes.xml.h:23
+#: ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Internationellt"
+
+#: ../calendar/gui/caltypes.xml.h:24
+#: ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Viktig kund"
+
+# Felstavat... borde buggrapporteras.
+#: ../calendar/gui/caltypes.xml.h:26
+#: ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: ../calendar/gui/caltypes.xml.h:27
+#: ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Närmsta 7 dagarna"
+
+#: ../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 "Organisatör"
+
+#: ../calendar/gui/caltypes.xml.h:30
+#: ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Telefonsamtal"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privat"
+
+#: ../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
+msgid "Public"
+msgstr "Publikt"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "Upprepning"
+
+#: ../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:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35
+#: ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategier"
+
+#: ../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:361
+msgid "Summary"
+msgstr "Sammanfattning"
+
+#: ../calendar/gui/caltypes.xml.h:37
+#: ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Sammanfattningen innehåller"
 
+#: ../calendar/gui/caltypes.xml.h:38
+#: ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Leverantörer"
+
+#: ../calendar/gui/caltypes.xml.h:39
+#: ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Tid och utlägg"
+
+#: ../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
+msgid "Waiting"
+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
+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
+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
+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
+msgid "is not"
+msgstr "är inte"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Fel vid öppnande av kalendern"
@@ -5265,11 +5525,11 @@ 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:1290
+#: ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Redigera alarm"
 
@@ -5302,17 +5562,17 @@ msgid "Mes_sage:"
 msgstr "Me_ddelande:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Visa en varning"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Kör ett program"
 
@@ -5325,7 +5585,7 @@ msgid "Send To:"
 msgstr "Skicka till:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Skicka e-post"
 
@@ -5380,7 +5640,7 @@ msgstr "minut(er)"
 msgid "start of appointment"
 msgstr "start på möte"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Åtgärd/trigger"
 
@@ -5391,16 +5651,15 @@ msgstr "L_ägg till"
 #: ../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 "Alarm"
 
-#: ../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
 msgid "_Suggest automatic display of attachment"
 msgstr "_Föreslå automatisk visning av bilaga"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
@@ -5469,8 +5728,8 @@ msgid "Display"
 msgstr "Visning"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "fredag"
 
@@ -5485,8 +5744,8 @@ msgstr ""
 "Dagar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "måndag"
 
@@ -5509,7 +5768,7 @@ msgstr ""
 "Söndag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Välj en färg"
 
@@ -5519,8 +5778,8 @@ msgid "S_un"
 msgstr "_sön"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "lördag"
 
@@ -5537,8 +5796,8 @@ 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:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "söndag"
 
@@ -5556,13 +5815,13 @@ msgid "Template:"
 msgstr "Mall:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "torsdag"
 
 #: ../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 "Tids_zon:"
 
@@ -5571,14 +5830,14 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -5656,326 +5915,475 @@ msgstr "_ons"
 msgid "before every appointment"
 msgstr "före varje möte"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 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:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 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:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 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:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
 msgstr "F_ärg:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Uppgiftslista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Memolista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Egenskaper för kalendern"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Egenskaper för uppgiftslistan"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "New Task List"
 msgstr "Ny uppgiftslista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 #, fuzzy
 msgid "Memo List Properties"
 msgstr "Egenskaper för uppgiftslistan"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Ny memolista"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Denna uppgift har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Detta memo har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, 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:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, 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:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Detta evenemang har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Denna uppgift har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Detta memo har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, 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:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182
+#: ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " till "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186
+#: ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Färdigt "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188
+#: ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Färdigt "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Ska utföras "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209
-#: ../composer/e-msg-composer.c:2849
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bifogat meddelande - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387
-#: ../composer/e-msg-composer.c:2854
-#: ../composer/e-msg-composer.c:3036
+#: ../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
 #, 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:458
-#: ../composer/e-msg-composer.c:3100
-#: ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192
-#: ../mail/message-list.c:2065
+#: ../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
 msgid "_Move"
 msgstr "_Flytta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460
-#: ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:1000
-#: ../mail/message-list.c:2067
+#: ../calendar/gui/dialogs/comp-editor.c:483
+#: ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008
+#: ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Avbryt _dragning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821
-#: ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "bilaga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-#: ../composer/e-msg-composer.c:2486
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Redigera möte"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Sammanträde - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Möte - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tilldelad uppgift - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Uppgift - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Memo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "Ingen sammanfattning"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+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
+msgid "Copy selected text to the clipboard"
+msgstr "Kopiera markerad text till urklipp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Klipp ut markerad text till urklipp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+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
+msgid "Paste text from the clipboard"
+msgstr "Klistra in text från urklipp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+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
+msgid "Select all text"
+msgstr "Markera all text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Klassifikation"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../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
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Infoga"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Alternativ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../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 "_Visa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Bilaga..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Klicka här för att bifoga en fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Kategorier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Växlar huruvida kategorier ska visas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Tids_zon"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Växlar huruvida tidszonen ska visas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Pu_blikt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Klassificera som publik"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Klassificera som privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Konfidentiellt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Klassificera som konfidentiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "_Rollfältet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+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
+msgid "_RSVP"
+msgstr "_OSA"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Växlar huruvida OSA-fältet ska visas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Statusfält"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Växlar huruvida statusfältet ska visas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Typfält"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Växlar huruvida deltagartypfältet ska visas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Senaste doku_ment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Bifoga"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Visa _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266
-#: ../composer/e-msg-composer.c:3636
+#: ../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
 #: ../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:1132
-#: ../composer/e-msg-composer.c:3639
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../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:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Visa bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Tryck på blankstegstangenten för att växla bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Redigera möte"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Sammanträde - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Möte - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tilldelad uppgift - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Uppgift - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Memo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Ingen sammanfattning"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 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:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Kunde inte uppdatera källa"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Kunde inte öppna mål"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Målet är skrivskyddat"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 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:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 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:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 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:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 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:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 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:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 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:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 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:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 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:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 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:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 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:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 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:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 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:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Objektet kunde inte tas bort på grund av ett fel"
 
@@ -5984,7 +6392,7 @@ msgid "Contacts..."
 msgstr "Kontakter..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Delegera till:"
 
@@ -5992,139 +6400,185 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "_Alarm"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klicka här för att ställa in eller ta bort alarm för detta evenemang"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "Upp_repning"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "Gör detta till ett återkommande evenemang"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Alternativ för sändning"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "Infoga avancerade sändningsalternativ"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "Hel_dagsevenemang"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "Växlar huruvida heldagsevenemang ska användas"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Show Time as _Busy"
+msgstr "Visa tid som _upptagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "Växlar huruvida tid ska visas som upptagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "_Ledig/Upptagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr "Fråga efter ledig-/upptageninformation för deltagarna"
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "_Möte"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Upprepning"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Detta evenemang har alarm"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Delta_gare"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Evenemang utan startdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Evenemang utan slutdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 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:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Lägg till "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan inte öppna kalendern \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du arbetar på uppdrag av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Anpassa"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141
-#: ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445
-#: ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158
+#: ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685
+#: ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2024
-#: ../widgets/misc/e-cell-date-edit.c:247
-#: ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../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-signature-combo-box.c:69
 msgid "None"
 msgstr "Ingen"
 
@@ -6149,23 +6603,25 @@ msgid "Custom Alarm:"
 msgstr "Anpassat alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "B_eskrivning:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Evenemangsbeskrivning"
 
-#: ../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 "Sa_mmanfattning:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarm"
 
+#: ../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 "_Beskrivning:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Tid:"
@@ -6196,32 +6652,28 @@ msgstr "_Ändra organisatör"
 msgid "Co_ntacts..."
 msgstr "Ko_ntakter..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisatör"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisatör:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141
+#: ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan inte öppna memon i \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136
-#: ../mail/em-format-html.c:1549
-#: ../mail/em-format-html.c:1607
-#: ../mail/em-format-html.c:1633
+#: ../calendar/gui/dialogs/memo-page.c:1002
+#: ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620
+#: ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77
 #: ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Till"
@@ -6235,63 +6687,59 @@ msgstr "Sta_rtdatum:"
 msgid "T_o:"
 msgstr "T_ill:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Beskrivning:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, 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:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, 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:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, 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:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, 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:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Endast denna instans"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Denna och tidigare instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Denna och framtida instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Alla instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 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:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "vid"
 
@@ -6299,7 +6747,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "första"
 
@@ -6309,7 +6757,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "sekund"
 
@@ -6317,7 +6765,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tredje"
 
@@ -6325,7 +6773,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "fjärde"
 
@@ -6333,13 +6781,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Annat datum"
 
@@ -6347,7 +6795,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "Första till tionde"
 
@@ -6355,7 +6803,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "elfte till tjugonde"
 
@@ -6363,45 +6811,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "förekomster"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Lägg till undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Kunde inte få ett val att ändra."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Ändra undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Kunde inte få ett val att ta bort."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/tid"
 
@@ -6452,12 +6900,12 @@ msgstr "veckor"
 msgid "year(s)"
 msgstr "Ã¥r"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Utförtdatumet är fel"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Webbsida"
 
@@ -6472,59 +6920,64 @@ msgstr "<span weight=\"bold\">Status</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:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435
-#: ../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:2520
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642
+#: ../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
 msgid "Completed"
 msgstr "Färdigt"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360
+#: ../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
 msgid "High"
 msgstr "Hög"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434
-#: ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641
+#: ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Pågår"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362
+#: ../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
 msgid "Low"
 msgstr "LÃ¥g"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966
-#: ../calendar/gui/e-calendar-table.c:361
+#: ../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
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Inte startad"
 
@@ -6537,7 +6990,8 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570
+#: ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -6554,25 +7008,39 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Webbsida:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:111
+msgid "_Status Details"
+msgstr "_Statusdetaljer"
+
+# Intressant engelska
+#: ../calendar/gui/dialogs/task-editor.c:113
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Klicka ändra / visa statusdetaljer för uppgiften"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Alternativ för _sändning"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "Uppgiftsdetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organisa_tör:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
@@ -6586,19 +7054,16 @@ msgid "Categor_ies..."
 msgstr "Kategor_ier..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "Be_skrivning:"
+#, fuzzy
+msgid "D_ue date:"
+msgstr "_Förfallodatum:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Tidszon:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Förfallodatum:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6606,149 +7071,129 @@ 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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d vecka"
 msgstr[1] "%d veckor"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Okänd åtgärd att utfö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:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s innan starten på mötet"
 
 #. 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:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s innan starten på mötet"
 
 #. 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:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s innan starten på mötet"
 
 #. 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:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s innan starten på mötet"
 
 #. 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:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter slut på mötet"
 
 #. 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:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s efter slut på mötet"
 
 #. 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:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s vid %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:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd triggertyp"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72
-#: ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73
+#: ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: ../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
+#: ../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 "Startdatum:"
 
-#: ../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-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 "Beskrivning:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "Webbsida:"
 
-#: ../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 "Sammanfattning:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Förfallodatum:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-list-view.c:257
-#: ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Publikt"
-
-#: ../calendar/gui/e-cal-list-view.c:258
-#: ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privat"
-
-#: ../calendar/gui/e-cal-list-view.c:259
-#: ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Konfidentiellt"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Slutdatum"
@@ -6758,22 +7203,14 @@ msgstr "Slutdatum"
 msgid "Start Date"
 msgstr "Startdatum"
 
-#: ../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 "Sammanfattning"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Upptagen"
 
@@ -6788,177 +7225,206 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:972
-#: ../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.c:976
+#: ../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 "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model.c:976
+#: ../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 "Nej"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331
-#: ../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
-#: ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986
-#: ../mail/em-utils.c:1329
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2049
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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-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
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "Ã…terkommande"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: ../calendar/gui/e-cal-popup.c:177
-#: ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183
+#: ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199
+#: ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Välj mapp att spara markerade bilagor i..."
 
-#: ../calendar/gui/e-cal-popup.c:225
-#: ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231
+#: ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namnlös_bild.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279
-#: ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../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
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: ../calendar/gui/e-cal-popup.c:280
+#: ../calendar/gui/e-cal-popup.c:286
+#: ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
 msgid "Set as _Background"
 msgstr "Spara som _bakgrund"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Spara markerade"
 
-#: ../calendar/gui/e-cal-popup.c:402
-#: ../mail/em-popup.c:830
+#: ../calendar/gui/e-cal-popup.c:428
+#: ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisatör: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+#, fuzzy
+msgid "Start: "
+msgstr "Start"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "Ska utföras "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665
 #: ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795
 #: ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1221
 #: ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Ny _uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-calendar-table.c:1575
 #: ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Öppna _webbsida"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657
 #: ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Skriv _ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677
 #: ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
@@ -6967,51 +7433,49 @@ msgstr "Skriv _ut..."
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../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
 #: ../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 "Klistra _in"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1587
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1588
 #: ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Markera som ej färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Markera markerade uppgifter som ej färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -7034,7 +7498,8 @@ msgid "Due date"
 msgstr "Förfallodatum"
 
 #: ../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:372
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -7042,117 +7507,97 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Flyttar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Kopierar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nytt sa_mmanträde"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Markera i_dag"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Markera datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "Skri_v ut..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_era till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delegera sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../calendar/gui/e-calendar-view.c:1701
-#: ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1689
+#: ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566
 #: ../mail/em-popup.c:577
-#: ../mail/em-popup.c:588
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1707
+#: ../calendar/gui/e-calendar-view.c:1695
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisatör: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisatör: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228
-#: ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7180,7 +7625,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:583
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
@@ -7191,40 +7636,35 @@ 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:837
-#: ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322
-#: ../calendar/gui/print.c:1656
+#: ../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
 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:772
-#: ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791
+#: ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775
-#: ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794
+#: ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "em"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja, (Komplex upprepning)"
 
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#. 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
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7234,11 +7674,6 @@ msgstr[1] "Var %d dag"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#. 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
 #, c-format
 msgid "Every week"
@@ -7249,9 +7684,7 @@ msgstr[1] "Var %d vecka"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#. 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
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7259,19 +7692,16 @@ msgstr[0] "Varje vecka på "
 msgstr[1] "Var %d vecka på "
 
 #. 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 " och "
 
-#. 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 "Den %s dagen i "
 
-#. 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 "Den %s %s i "
@@ -7279,13 +7709,7 @@ msgstr "Den %s %s i "
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7295,21 +7719,14 @@ msgstr[1] "var %d månad"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#. 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
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Varje år"
 msgstr[1] "Var %d år"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7317,339 +7734,339 @@ msgstr[0] "totalt %d gång"
 msgstr[1] "totalt %d gånger"
 
 #. 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 ", med slut den "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Börjar"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Slutar"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Ska utföras"
 
-#: ../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 "iCalendar-information"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: ../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:1092
+#: ../calendar/gui/e-itip-control.c:1108
 #: ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "En okänd person"
 
 #. 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> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: ../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:728
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../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:2034
 msgid "Accepted"
 msgstr "Accepterat"
 
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Preliminärt accepterat"
 
-#: ../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:734
-#: ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../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:2040
 msgid "Declined"
 msgstr "Avslaget"
 
-#: ../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 "Sammanträdet har avbrutits, men det kunde dock inte hittas i dina kalendrar"
 
-#: ../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 "Uppgiften har avbrutits, men den kunde dock inte hittas i dina uppgiftslistor"
 
-#: ../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> har publicerat sammanträdesinformation."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Sammanträdesinformation"
 
-#: ../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> begär att %s närvarar vid ett sammanträde."
 
-#: ../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> begär din närvaro vid ett sammanträde."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Sammanträdesförslag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> önskar bli tillagd i ett befintligt sammanträde."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Sammanträdesuppdatering"
 
-#: ../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> önskar få den senaste sammanträdesinformationen."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Begäran av sammanträdesuppdatering"
 
-#: ../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> har svarat på en sammanträdesbegäran."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Sammanträdessvar"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> har avbokat ett sammanträde."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Sammanträdesavbokning"
 
-#: ../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> har skickat ett obegripligt meddelande."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Felaktigt sammanträdesmeddelande"
 
-#: ../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> har publicerat uppgiftsinformation."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: ../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> begär att %s utför en uppgift."
 
-#: ../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> begär att du utför en uppgift."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> önskar bli tillagd i en befintlig uppgift."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: ../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> önskar få den senaste uppgiftsinformationen."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: ../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> har svarat på en uppgiftstilldelning."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Avbokning av uppgift"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: ../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> har publicerat ledig-/upptageninformation."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: ../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> begär din ledig-/upptageninformation."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: ../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> har svarat på en ledig-/upptagenbegäran."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: ../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 "Meddelandet verkar inte vara korrekt utformat"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: ../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 "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet är ogiltigt och kan inte uppdateras\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Detta svar är inte från en nuvarande deltagare. Lägg till som deltagare?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagarstatus kunde inte uppdateras på grund av ogiltig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Deltagarstatus är uppdaterad\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Deltagarstatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: ../calendar/gui/e-itip-control.c:2088
-#: ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111
+#: ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094
-#: ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117
+#: ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: ../calendar/gui/e-itip-control.c:2447
-#: ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470
+#: ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7678,129 +8095,129 @@ msgstr "Läser in kalendern..."
 msgid "Server Message:"
 msgstr "Servermeddelande:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Valfria deltagare"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Resurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Deltagare"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "Person"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91
-#: ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966
+#: ../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
 msgid "Group"
 msgstr "Grupp"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93
-#: ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "Resurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "Rum"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "Mötesordförande"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: ../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 "Behöver åtgärd"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "Preliminärt"
 
-#: ../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:737
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../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
 msgid "Delegated"
 msgstr "Delegerat"
 
 #. 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 "Deltagare                         "
 
 # RSVP borde kanske förklaras med en kommentar?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
 
-#: ../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 "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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7808,85 +8225,81 @@ msgstr "%A %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Del_tagare..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "A_lternativ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Allt folk och resurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Allt _folk och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Folk som k_rävs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Deltagare"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Klicka här för att lägga till en deltagare"
@@ -7920,9 +8333,9 @@ msgstr "_Ta bort markerade memon"
 msgid "Click to add a memo"
 msgstr "Klicka för att lägga till ett memo"
 
-#: ../calendar/gui/e-memos.c:791
-#: ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7931,87 +8344,83 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Läser in memon"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Öppnar memon i %s"
 
-#: ../calendar/gui/e-memos.c:1094
-#: ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062
+#: ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Läser in uppgifter"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Tömmer"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Välj tidszon"
 
 #. 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:339
-#: ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348
+#: ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "Uppdaterar fråga"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "An_passad vy"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Spara anpassad vy"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Definiera vyer..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Läser in möten i %s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Läser in uppgifter i %s"
 
 # DENNA BÖR FELRAPPORTERAS!
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Läser in memon på %s"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Tömmer"
 
@@ -8071,62 +8480,62 @@ msgstr "september"
 msgid "_Select Today"
 msgstr "_Välj idag"
 
-#: ../calendar/gui/itip-utils.c:449
-#: ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "En organisatör måste vara angiven."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en deltagare krävs"
 
-#: ../calendar/gui/itip-utils.c:690
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626
+#: ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: ../calendar/gui/itip-utils.c:692
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628
+#: ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: ../calendar/gui/itip-utils.c:694
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Memoinformation"
 
-#: ../calendar/gui/itip-utils.c:696
-#: ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig-/upptageninformation (%s till %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
@@ -8166,48 +8575,40 @@ msgstr "Det finns ingen kalender tillgänglig för skapande av memon"
 msgid "Memo Source Selector"
 msgstr "Väljare för memokälla"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nytt memo"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Skapa ett nytt memo"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nytt delat memo"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Delat memo"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Skapa ett nytt delat memo"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Ny memolista"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Memoli_sta"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Skapa en ny memolista"
 
-#: ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Skriv ut memon"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Närmsta 7 dagarna"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
@@ -8217,7 +8618,7 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina mappar..."
 
-#: ../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"
 "\n"
@@ -8228,28 +8629,28 @@ msgstr ""
 "Ha tålamod medan Evolution migrerar dina mappar..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:782
-#: ../calendar/gui/migration.c:950
+#: ../calendar/gui/migration.c:775
+#: ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan inte migrera gamla inställningar från evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:811
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan inte migrera kalendern \"%s\""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:979
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan inte migrera uppgifterna \"%s\""
 
-#: ../calendar/gui/migration.c:1234
-#: ../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
+#: ../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
 msgid "Notes"
 msgstr "Anteckningar"
 
@@ -8406,57 +8807,52 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Lö"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Möte"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Uppgift"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammanfattning: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Deltagare:"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Kommande möten"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Ny uppgiftslista"
@@ -8485,39 +8881,31 @@ msgstr "Det finns ingen kalender tillgänglig för skapande av uppgifter"
 msgid "Task Source Selector"
 msgstr "Väljare för uppgiftskälla"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Ny tilldelad uppgift"
 
-#: ../calendar/gui/tasks-component.c:1330
-msgid "Assigne_d Task"
-msgstr "Tilldela_d uppgift"
-
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Skapa en ny tilldelad uppgift"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Ny uppgiftslista"
 
-#: ../calendar/gui/tasks-component.c:1338
-msgid "Tas_k list"
-msgstr "Uppgif_tslista"
-
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Skapa en ny uppgiftslista"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8527,51 +8915,74 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: ../calendar/gui/tasks-control.c:458
-#: ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% färdigt"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Avbruten"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Pågår"
+
+#: ../calendar/gui/tasktypes.xml.h:50
+#: ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "är större än"
+
+#: ../calendar/gui/tasktypes.xml.h:51
+#: ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "är mindre än"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Möten och sammanträden"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Öppnar kalender"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolutions iCalendar-importör"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "PÃ¥minnelse!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolutions vCalendar-importör"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Kalenderevenemang"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolutionkalenderns intelligenta importör"
 
@@ -10105,123 +10516,309 @@ msgstr "Stilla_Havet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Klicka här för att ta fram adressboken"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "Kunde inte öppna fil"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Postdestination"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Välj mappar att posta meddelandet till."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Infoga bilaga"
 
-#: ../composer/e-composer-post-header.c:152
-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-actions.c:51
+msgid "A_ttach"
+msgstr "_Bifoga"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gnatur:"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Namnlöst meddelande"
+
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Bifoga en fil"
+
+#: ../composer/e-composer-actions.c:479
+#: ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "S_täng"
+
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Stäng aktuell fil"
+
+#: ../composer/e-composer-actions.c:486
+#: ../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 "Skriv _ut..."
+
+#: ../composer/e-composer-actions.c:493
+#: ../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 "Förhands_granska"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Spara aktuell fil"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Spara so_m..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Spara aktuell fil med ett annat namn"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "Spara ut_kast"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Spara som utkast"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "S_kicka"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Skicka detta meddelande"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Infoga sändalternativ"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Nytt _meddelande"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Öppna Nytt meddelande-fönster"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "Tecken_kodning"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "_Säkerhet"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP-_kryptera"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Kryptera detta meddelande med PGP"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP-_signera"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Signera detta meddelande med din PGP-nyckel"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "_Prioritera meddelande"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Ställ in meddelandeprioritet till hög"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "Be_gär läskvitto"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "Få en leveranskvitto när ditt meddelande läses"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME-k_ryptera"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME-sig_nera"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signera detta meddelande med ditt S/MIME-signaturcertifikat"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "_Blindkopia-fältet"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Växlar huruvida blindkopiefältet ska visas"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "_Kopia-fältet"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Växlar huruvida kopiefältet ska visas"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "_Från-fältet"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Växlar huruvida frånväljaren ska visas"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "_Posta till-fältet"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Växlar huruvida svara till-fältet ska visas"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "_Svara till-fältet"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Växlar huruvida svara till-fältet ska visas"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "_Ämne-fältet"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Växlar huruvida ämnesfältet ska visas"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "_Till-fältet"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "Växlar huruvida kopiefältet ska visas"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "Ange meddelandets mottagare"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Ange adresserna som ska få en kopia av meddelandet"
+
+#: ../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 "Ange adresserna till de som ska ta emot en kopia av meddelandet utan att visas i mottagarlistan för meddelandet."
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "_Från:"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "_Svara till:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "_Till:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "Ange meddelandets mottagare"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "_Kopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Ange adresserna som ska få en kopia av meddelandet"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "_Blindkopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
-msgstr "Ange adresserna till de som ska ta emot en kopia av meddelandet utan att visas i mottagarlistan för meddelandet."
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Posta till:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "_Ämne:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "_Bifoga"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Infoga bilaga"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Klicka här för att ta fram adressboken"
 
-#: ../composer/e-msg-composer.c:819
-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-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Postdestination"
 
-#: ../composer/e-msg-composer.c:826
-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-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Välj mappar att posta meddelandet till."
 
-#: ../composer/e-msg-composer.c:1418
-#: ../composer/e-msg-composer.c:2515
-msgid "Hide _Attachment Bar"
-msgstr "Dölj _bilageraden"
+#: ../composer/e-composer-post-header.c:171
+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:65
+msgid "Recent _Documents"
+msgstr "Senaste _dokument"
 
-#: ../composer/e-msg-composer.c:1421
-#: ../composer/e-msg-composer.c:2518
-#: ../composer/e-msg-composer.c:3884
+#: ../composer/e-composer-private.c:180
+#: ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Visa _bilageraden"
 
-#: ../composer/e-msg-composer.c:1453
-#: ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Okänd anledning"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Kunde inte öppna fil"
+#: ../composer/e-msg-composer.c:872
+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:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Kunde inte hämta meddelande från redigeraren"
+#: ../composer/e-msg-composer.c:879
+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:1819
-msgid "Untitled Message"
-msgstr "Namnlöst meddelande"
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Bilaga"
+msgstr[1] "Bilagor"
 
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1855
-msgid "Open File"
-msgstr "Öppna fil"
+#: ../composer/e-msg-composer.c:1556
+msgid "Hide _Attachment Bar"
+msgstr "Dölj _bilageraden"
 
-#: ../composer/e-msg-composer.c:2529
-#: ../composer/e-msg-composer.c:3764
-#: ../composer/e-msg-composer.c:3767
+#: ../composer/e-msg-composer.c:1573
+#: ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Skriv ett meddelande"
 
-#: ../composer/e-msg-composer.c:5037
+#: ../composer/e-msg-composer.c:4055
 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>"
 
@@ -10243,8 +10840,6 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Du kan behöva välja andra e-postalternativ på grund av &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5
-#: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Eftersom &quot;{1}&quot;."
 
@@ -10339,25 +10934,28 @@ msgstr "Du kan inte bifoga filen \"{0}\" till detta meddelande."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du måste konfigurera ett konto innan du kan skriva meddelanden."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Fortsätt redigera"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "Återställ _inte"
 
-#: ../composer/mail-composer.error.xml.h:31
-#: ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Återställ"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Spara meddelande"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Spara utkast"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolutions e-post och kalender"
 
 #: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Grupprogramvarusvit"
 
@@ -10373,59 +10971,85 @@ msgstr "adresskort"
 msgid "calendar information"
 msgstr "kalenderinformation"
 
-#: ../e-util/e-error.c:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution-fel"
 
-#: ../e-util/e-error.c:88
-#: ../e-util/e-error.c:89
-#: ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution-varning"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution-information"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution-fråga"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Internt fel, okänt fel \"%s\" begärt"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Komponent"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../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
+msgid "Enabled"
+msgstr "Aktiverad"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Huruvida insticksmodulen är aktiverad"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Ett fel inträffade vid utskrift"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Utskriftssystemet rapporterade följande detaljer om felet:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
 msgstr "Utskriftssystemet rapporterade inte några ytterligare detaljer om felet."
 
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Eftersom \"{0}\"."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Kan inte öppna filen &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "Kan inte öppna filen \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Kan inte spara filen &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "Kan inte spara filen \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Vill du skriva över den?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "Filen finns &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
+msgstr "Filen finns \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10436,50 +11060,65 @@ msgstr "Skriv över fil?"
 msgid "_Overwrite"
 msgstr "Skriv _över"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Kunde inte uppdatera mapprättigheter."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "V_iktigt"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Jobb"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Personligt"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "A_tt-göra"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "Se_nare"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "Etikett_namn:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Redigera etikett"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Lägg till etikett"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Etikettnamnet får inte vara tomt."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+#, fuzzy
+msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "Etikett med samma tag finns redan. Välj ett annat namn på din etikett."
 
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-fel: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ""
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10597,67 +11236,67 @@ msgstr "%d %b %Y"
 msgid "Select a time to compare against"
 msgstr "Välj en tid att jämföra med"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: ../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
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Re_gelnamn:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Visa objekt som matchar följande villkor"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "Lägg til_l filterkriteria"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Om alla villkor uppfylls"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Om några villkor uppfylls"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Sök objekt:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Alla relaterade"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Svar och föräldrar"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Inget svar eller förälder"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_nkludera trådar"
 
-#: ../filter/filter-rule.c:990
+#: ../filter/filter-rule.c:1044
 #: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: ../filter/filter-rule.c:990
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044
+#: ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10682,7 +11321,7 @@ msgid "Missing file name."
 msgstr "Filnamn saknas."
 
 #: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Namn saknas."
 
@@ -10759,7 +11398,7 @@ msgid "months"
 msgstr "månader"
 
 #: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "sekunder"
 
@@ -10772,9 +11411,10 @@ msgid "the time you specify"
 msgstr "den tid du anger"
 
 #: ../filter/filter.glade.h:22
-#: ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "veckor"
 
@@ -10790,7 +11430,7 @@ msgstr "Lägg till regel"
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -10844,18 +11484,18 @@ msgid "Evolution Network configuration control"
 msgstr "Evolutionkalenderns konfigurationskontroll"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329
-#: ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579
-#: ../mail/mail-component.c:743
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "E-postkonton"
 
@@ -10872,12 +11512,12 @@ msgstr "Nätverksinställningar"
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Licensavtal för %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10886,141 +11526,135 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 "\n"
-"Läs licensavtalet för %s nedan noggrannt\n"
+"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:482
+#: ../mail/em-account-editor.c:466
 #: ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718
-#: ../widgets/misc/e-signature-combo-box.c:78
+#: ../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:97
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Fråga för varje meddelande"
 
-#: ../mail/em-account-editor.c:1822
+#: ../mail/em-account-editor.c:1810
 #: ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1871
-#: ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859
+#: ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Leta efter _nya meddelanden var"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_ter"
 
-#: ../mail/em-account-editor.c:2235
-#: ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Sändning av e-post"
 
-#: ../mail/em-account-editor.c:2294
+#: ../mail/em-account-editor.c:2386
 #: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Standardvärden"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360
-#: ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452
+#: ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Säkerhet"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397
-#: ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Alternativ för mottagning"
 
-#: ../mail/em-account-editor.c:2398
-#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Letar efter nya meddelanden"
 
-#: ../mail/em-account-editor.c:2840
+#: ../mail/em-account-editor.c:2932
 #: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: ../mail/em-account-editor.c:2840
+#: ../mail/em-account-editor.c:2932
 #: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoguide"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: ../mail/em-account-prefs.c:489
-#: ../mail/em-composer-prefs.c:970
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Aktiverad"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:304
-#: ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "Namnlös"
 
-#: ../mail/em-composer-prefs.c:976
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Språk"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Lägg till signaturskript"
 
-#: ../mail/em-composer-prefs.c:1039
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:898
-#: ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Vidarebefordrat meddelande --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2007
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "${AbbrevWeekdayName} ${Year}-${Month}-${Day} klockan ${24Hour}:${Minute} ${TimeZone} skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Ursprungligt meddelande-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
@@ -11037,10 +11671,6 @@ msgstr "Tilldela färg"
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Bilagor"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Blindkopia"
@@ -11057,10 +11687,6 @@ msgstr "Kopia"
 msgid "Completed On"
 msgstr "Färdigt den"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "innehåller"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
@@ -11074,7 +11700,7 @@ msgid "Date sent"
 msgstr "Avsändningsdatum"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25
@@ -11087,10 +11713,6 @@ msgstr "Ta bort"
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "innehåller inte"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "slutar inte med"
@@ -11111,10 +11733,6 @@ msgstr "låter inte som"
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "finns inte"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Utkast"
@@ -11123,10 +11741,6 @@ msgstr "Utkast"
 msgid "ends with"
 msgstr "slutar med"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "finns"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "finns"
@@ -11140,14 +11754,10 @@ msgid "Follow Up"
 msgstr "Följ upp"
 
 #: ../mail/em-filter-i18n.h:29
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "viktigt"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "är"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "är efter"
@@ -11160,18 +11770,6 @@ msgstr "är innan"
 msgid "is Flagged"
 msgstr "är flaggad"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "är större än"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "är mindre än"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "är inte"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "är inte flaggad"
@@ -11195,7 +11793,7 @@ msgid "Junk Test"
 msgstr "Skräptest"
 
 #: ../mail/em-filter-i18n.h:42
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etikett"
 
@@ -11240,7 +11838,7 @@ msgstr "Spela ljud"
 #. 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:82
+#: ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Läst"
 
@@ -11316,12 +11914,11 @@ msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
 #: ../mail/em-filter-i18n.h:72
-#: ../mail/em-format-html.c:1706
-#: ../mail/em-format-quote.c:322
-#: ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11332,64 +11929,64 @@ msgid "Unset Status"
 msgstr "Töm status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Sedan"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Lägg till åt_gärd"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "S_kapa sökmapp från sökning..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Alla meddelanden"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Olästa meddelanden"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Lästa meddelanden"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Senaste meddelanden"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Meddelanden de senaste 5 dagarna"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Meddelanden med bilagor"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Viktiga meddelanden"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Meddelandet är inte skräp"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Kontosökning"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Sökning i alla konton"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Olästa meddelanden:"
@@ -11397,33 +11994,50 @@ msgstr[1] "Olästa meddelanden:"
 
 #. 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
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antal meddelanden:"
 msgstr[1] "Totalt antal meddelanden:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193
+#: ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "Kvotanvändning"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355
+#: ../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
+msgid "Inbox"
+msgstr "Inkorg"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Mappegenskaper"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "S_kapa"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204
 #: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935
-#: ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970
+#: ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Sökmappar"
 
@@ -11433,557 +12047,506 @@ msgstr "Sökmappar"
 msgid "UNMATCHED"
 msgstr "OMATCHADE"
 
-#: ../mail/em-folder-tree-model.c:500
-#: ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504
+#: ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Utkast"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503
-#: ../mail/em-folder-tree.c:2536
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Inkorg"
-
-#: ../mail/em-folder-tree-model.c:506
-#: ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510
+#: ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: ../mail/em-folder-tree-model.c:508
-#: ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512
+#: ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Skickat"
 
-#: ../mail/em-folder-tree-model.c:530
-#: ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534
+#: ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Läser in..."
 
-#. 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 "%s (%u)"
-
-#: ../mail/em-folder-tree.c:733
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "E-postmappträd"
 
-#: ../mail/em-folder-tree.c:892
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flyttar mappen %s"
 
-#: ../mail/em-folder-tree.c:894
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierar mappen %s"
 
-#: ../mail/em-folder-tree.c:901
-#: ../mail/message-list.c:1973
+#: ../mail/em-folder-tree.c:909
+#: ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till mappen %s"
 
-#: ../mail/em-folder-tree.c:903
-#: ../mail/message-list.c:1975
+#: ../mail/em-folder-tree.c:911
+#: ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till mappen %s"
 
-#: ../mail/em-folder-tree.c:918
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan inte släppa meddelanden i ett lager på översta nivån"
 
-#: ../mail/em-folder-tree.c:995
-#: ../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 "_Kopiera till mapp"
 
-#: ../mail/em-folder-tree.c:996
-#: ../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 "_Flytta till mapp"
 
-#: ../mail/em-folder-tree.c:1705
+#: ../mail/em-folder-tree.c:1718
 #: ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Söker igenom mappar på \"%s\""
 
-#: ../mail/em-folder-tree.c:2078
-#: ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63
-#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Visa"
-
-#: ../mail/em-folder-tree.c:2079
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Öppna i _nytt fönster"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2084
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2114
 #: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Upp_datera"
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Tö_m utkorg"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2122
 #: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Töm papperskor_gen"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierar \"%s\" till \"%s\""
 
-#: ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Kopiera"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Skapar mappen \"%s\""
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Skapa mapp"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
-#: ../mail/em-folder-view.c:1096
+#: ../mail/em-folder-view.c:1090
 #: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Misslyckades att ta bort post"
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1091
 #: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har inte tillräckliga rättigheter för att ta bort den här posten. "
 
-#: ../mail/em-folder-view.c:1335
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: ../mail/em-folder-view.c:1337
+#: ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:568
 #: ../mail/em-popup.c:579
-#: ../mail/em-popup.c:590
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
 #. 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:1341
-#: ../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 "_Redigera som nytt meddelande..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124
-#: ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "Skriv _ut..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Ã…ngra borttagning"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Markera som ovikt_igt"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Markera som _skräp"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Markera som _inte skräp"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Markera för _uppföljning..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 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:1361
-#: ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355
+#: ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ingen"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Sökmapp baserat på _ämne"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Sökmapp baserat på _avsändare"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Sökmapp baserat på _mottagare"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Sökmapp baserat på sänd_lista"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtrera baserat på _ämne"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtrera baserat på _avsändare"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtrera baserat på _mottagare"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtrera baserat på sä_ndlista"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267
-#: ../mail/em-folder-view.c:2311
+#. 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 "Standard"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Kan inte hämta meddelande"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Hämtar meddelande..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "R_ing till..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Skapa ny _sökmapp"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Från denna adress"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Till denna adress"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicka för att ringa till %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Klicka för att dölja/visa adresser"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Träffar: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Sö_k:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Föregående"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Nästa"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "M_atcha versaler/gemener"
 
-#: ../mail/em-format-html-display.c:992
-#: ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Osignerat"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "Detta meddelande är inte signerat. Det finns ingen garanti att detta meddelande är autentiskt."
 
-#: ../mail/em-format-html-display.c:993
-#: ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Giltig signatur"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "Detta meddelande är signerat och giltigt, vilket betyder att det är mycket sannolikt att meddelandet är autentiskt."
 
-#: ../mail/em-format-html-display.c:994
-#: ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ogiltig signatur"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "Signaturen för detta meddelande kan inte verifieras. Den kan ha ändrats under överföringen."
 
-#: ../mail/em-format-html-display.c:995
-#: ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Giltig signatur men kan inte verifiera avsändaren"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "Detta meddelande är signerat med en giltig signatur, men meddelandets avsändare kan inte verifieras."
 
-#: ../mail/em-format-html-display.c:996
-#: ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Signaturen finns men behöver publik nyckel"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "Detta meddelande är signerat med en signatur, men det finns ingen motsvarande publik nyckel."
 
-#: ../mail/em-format-html-display.c:1003
-#: ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Okrypterat"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "Detta meddelande är inte krypterat. Dess innehåll kan ses i överföringen på Internet."
 
-#: ../mail/em-format-html-display.c:1004
-#: ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Krypterat, svagt"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "Detta meddelande är krypterat, men med en svag krypteringsalgoritm. Det skulle vara svårt men inte omöjligt för en utomstående att se innehållet i detta meddelande inom en rimlig tid."
 
-#: ../mail/em-format-html-display.c:1005
-#: ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Krypterat"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "Detta meddelande är krypterat. Det skulle vara svårt för en utomstående att se innehållet i detta meddelande."
 
-#: ../mail/em-format-html-display.c:1006
-#: ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Krypterat, starkt"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "Detta meddelande är krypterat med en stark krypteringsalgoritm. Det skulle vara mycket svårt för en utomstående att se innehållet i detta meddelande inom en rimlig tid."
 
-#: ../mail/em-format-html-display.c:1107
+#: ../mail/em-format-html-display.c:1062
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visa certifikat"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Detta certifikatet är inte visningsbart"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Färdigställt den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Visa inuti"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Anpassa till bredden"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Visa _originalstorlek"
 
-#: ../mail/em-format-html-display.c:1959
-#: ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Bilaga"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Spara bilaga som"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Välj mapp att spara alla bilagor i"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Spara markerade..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d bi_laga"
 msgstr[1] "%d bi_lagor"
 
-#: ../mail/em-format-html-display.c:2302
-#: ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112
+#: ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "Sp_ara"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Spara _alla"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Ingen bilaga"
 
-#: ../mail/em-format-html-display.c:2507
-#: ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338
+#: ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Visa _oformaterat"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Dölj o_formaterat"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "Ö_ppna med"
 
-#: ../mail/em-format-html-display.c:2635
-msgid "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
+#: ../mail/em-format-html-display.c:2468
+#, fuzzy
+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 kan inte rita upp det här e-postmeddelandet eftersom det är för stort för att hantera. Du kan visa det oformaterat eller med en extern textredigerare."
 
 #: ../mail/em-format-html-print.c:156
@@ -11991,358 +12554,368 @@ msgstr "Evolution kan inte rita upp det här e-postmeddelandet eftersom det är
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
-#: ../mail/em-format-html.c:499
-#: ../mail/em-format-html.c:508
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Hämtar \"%s\""
 
-#: ../mail/em-format-html.c:920
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Okänd del med extern meddelandetext."
 
-#: ../mail/em-format-html.c:928
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: ../mail/em-format-html.c:958
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: ../mail/em-format-html.c:969
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: ../mail/em-format-html.c:992
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: ../mail/em-format-html.c:1003
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: ../mail/em-format-html.c:1231
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formaterar meddelande"
 
-#: ../mail/em-format-html.c:1398
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Formaterar meddelande..."
 
-#: ../mail/em-format-html.c:1550
-#: ../mail/em-format-html.c:1614
-#: ../mail/em-format-html.c:1636
+#: ../mail/em-format-html.c:1563
+#: ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649
 #: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Kopia"
 
-#: ../mail/em-format-html.c:1551
-#: ../mail/em-format-html.c:1620
-#: ../mail/em-format-html.c:1639
+#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652
 #: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Blindkopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1710
-#: ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744
+#: ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1737
+#: ../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:1742
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1754
-#: ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892
-#: ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Datum"
-
-#: ../mail/em-format-html.c:1777
-#: ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Diskussionsgrupper"
-
 #. 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:1870
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Det här meddelandet skickades av <b>%s</b> på uppdrag av <b>%s</b>"
 
 #: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75
 #: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Från"
 
 #: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 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
+msgid "Date"
+msgstr "Datum"
+
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Diskussionsgrupper"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunde inte tolka S/MIME-meddelande: Okänt fel"
 
-#: ../mail/em-format.c:1333
-#: ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336
+#: ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstypen stöds inte för multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunde inte tolka PGP/MIME-meddelande"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunde inte tolka PGP/MIME-meddelande: Okänt fel"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Signaturformatet stöds inte"
 
-#: ../mail/em-format.c:1516
-#: ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Fel vid verifiering av signatur"
 
-#: ../mail/em-format.c:1516
-#: ../mail/em-format.c:1578
-#: ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1581
+#: ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Okänt fel vid verifiering av signatur"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Kunde inte tolka PGP-meddelande"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunde inte tolka PGP-meddelande: Okänt fel"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Varje gång"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "En gång per dag"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "En gång per vecka"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "En gång per månad"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Lägg till anpassad skräprubrik"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Rubriknamn:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Rubrikvärde innehåller:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Innehåller värde"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Färg"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Tagg"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086
-#: ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078
+#: ../mail/em-mailer-prefs.c:1132
 #, 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:1094
-#: ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086
+#: ../mail/em-mailer-prefs.c:1141
 #, 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:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Ingen insticksmodul för skräp finns tillgänglig."
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Att-göra"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Senare"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Platsen och hierarkin för Evolution-postlådemapparna har ändrats sedan Evolution 1.x.\n"
-"\n"
-"Vänta medan Evolution migrerar dina mappar..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan inte skapa nya mappen \"%s\": %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan inte kopiera mappen \"%s\" till \"%s\": %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan inte söka efter befintliga postlådor på \"%s\": %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Platsen och hierarkin för Evolution-postlådemapparna har ändrats sedan Evolution 1.x.\n"
+"\n"
+"Vänta medan Evolution migrerar dina mappar..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kan inte öppna gamla POP-behåll-på-server-data \"%s\": %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kan inte skapa katalog för POP3-behåll-på-server-data \"%s\": %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan inte kopiera POP3-behåll-på-server-data \"%s\": %s"
 
-#: ../mail/em-migrate.c:2579
-#: ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583
+#: ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Misslyckades med att skapa lokalt e-postlager \"%s\": %s"
 
-#: ../mail/em-migrate.c:2852
+#: ../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 ""
+"Platsen och hierarkin för Evolution-postlådemapparna har ändrats sedan Evolution 1.x.\n"
+"\n"
+"Vänta medan Evolution migrerar dina mappar..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kan inte skapa lokala postlådemappar på \"%s\": %s"
 
-#: ../mail/em-migrate.c:2871
+#: ../mail/em-migrate.c:2982
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "Kan inte läsa inställningar från tidigare Evolution-installation, \"evolution/config.xmldb\" finns inte eller är skadad."
 
+#: ../mail/em-popup.c:564
 #: ../mail/em-popup.c:575
-#: ../mail/em-popup.c:586
 msgid "_Reply to sender"
 msgstr "_Svara till avsändaren"
 
+#: ../mail/em-popup.c:565
 #: ../mail/em-popup.c:576
-#: ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:640
-#: ../mail/em-popup.c:851
+#: ../mail/em-popup.c:629
+#: ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Lägg till i adressbok"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 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:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "Visa _inte detta meddelande igen."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Meddelandefilter"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "meddelande"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Spara meddelande..."
 
-#: ../mail/em-utils.c:692
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Lägg till adress"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1213
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Meddelanden från %s"
@@ -12356,679 +12929,750 @@ msgid "Search Folder source"
 msgstr "Sökmappskälla"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Fönsterhöjd för \"Skicka och ta emot e-post\""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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"
 msgstr "Tillåter att Evolution visar textdelen av begränsad storlek"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Begär alltid läskvitto"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Den tidsperiod i sekunder som felet ska visas på statusraden."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk detektering av känsloikoner"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Automatisk detektering av länkar"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Kontrollera om inkommande e-post är skräp"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Färgmarkeringsfärg för citat"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Färgmarkeringsfärg för citat."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Standardhöjd för redigerarfönstret"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Standardbredd för redigerarfönstret"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Katalog för inläsning/bifogning"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Minska visning av adresser i Till/Kopia/Blindkopia"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "Minska visning av adresser i Till/Kopia/Blindkopia till det antal som angivits i address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "Anger rubriken att kontrollera efter skräp."
+
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "Anger rubriken att kontrollera efter skräp. Formatet är rubriknamn=värde i gconf."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Standardteckentabell som ska användas vid skapande av meddelanden"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Standardteckentabell som ska användas vid skapande av meddelanden."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Standardteckentabell som ska användas vid visning av meddelanden"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Standardteckentabell som ska användas vid visning av meddelanden."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Standardstil för vidarebefordran"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Standardhöjd för redigerarfönstret."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Standardhöjd för meddelandefönstret."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Standardhöjd för prenumerationsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Standardstil för svar"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Standardvärde för trådexpandering"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Standardbredd för fönstret för redigerarfönstret."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Standardbredd för meddelandefönstret."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Standardbredd för prenumerationsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+msgid "Determines whether to look up addresses for junk filtering in local addressbook only"
+msgstr "Bestämmer huruvida en uppslagning i adressboken efter avsändarens e-postadress ska göras"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "Bestämmer huruvida en uppslagning i adressboken efter avsändarens e-postadress ska göras"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
 msgstr "Bestämmer huruvida en uppslagning i adressboken efter avsändarens e-postadress ska göras. Om den hittas, ska meddelandet inte vara skräppost. Den slår upp i adressböckerna markerade för automatiskt komplettering. Uppslagningen kan vara långsam om fjärradressböcker (som ldap) är markerade för automatisk komplettering. "
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Bestämmer huruvida anpassade rubriker ska kontrolleras efter skräp"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../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 "Bestämmer huruvida anpassade rubriker ska kontrolleras efter skräp. Om detta alternativ är aktiverat och rubrikerna finns, kommer det att öka hastigheten för skräpkontrollen."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../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 "Bestämmer huruvida samma typsnitt för båda raderna \"Från\" och \"Ämne\" i kolumnen \"Meddelanden\" ska användas i vertikal vy."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog för inläsning/bifogning av filer till redigeraren."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Katalog för sparning av postkomponentfiler."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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 "Rita stavfelsindikatorer på ord efterhand som du skriver."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Töm skräpmappar vid avslut"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Töm papperskorgsmappar vid avslut"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Töm alla skräpmappar vid avslutande av Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Töm alla papperskorgsmappar vid avslutande av Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Aktivera markörläge, så att du ser en markör när du läser e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Aktivera eller inaktivera magiskt blanksteg"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktivera eller inaktivera sökfunktion för förhandsinmatning"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Aktivera sökmappar"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Aktivera sökmappar vid uppstart."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "Aktivera sökfunktionen i sidopanelen så att du kan påbörja en interaktiv sökning genom att skriva in text. Använd funktionen så att du enkelt kan hitta en mapp i sidopanelen eller genom att skriva in mappens namn och markeringen hoppar automatiskt till den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../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 "Aktivera denna för att använda Magiskt blanksteg för att rulla i förhandsvisning av meddelanden, meddelandelistor och mappar."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Aktivera för att rita upp meddelandetextdel av begränsad storlek."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Aktivera/inaktivera markörläge"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Höjd för meddelandelistpanelen"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Höjd för meddelandelistpanelen."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Döljer mappförhandsvisningen och tar bort markeringen"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "Om en användare försöker att öppna 10 eller fler meddelanden på samma gång, fråga om användaren verkligen vill göra det."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 msgstr "Om \"Förhandsgranskning\"-panelen är aktiv visas det sida vid sida istället för vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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."
 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:54
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 "Denna aktiverar/inaktiverar en fråga vid markering av flera meddelanden."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../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 "Den inaktiverar/aktiverar funktionen för upprepade förfrågningar om frånkopplad synkronisering krävs innan frånkopplat läge aktiveras."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../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 "Den inaktiverar/aktiverar funktionen för upprepade varningar om att borttagning av meddelanden från en sökmapp permanent tar bort meddelandet, inte att den helt enkelt tar bort det från sökresultaten."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Senaste gången när tömning av skräpkorgen kördes"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Senaste tid när tömning av papperskorgen kördes"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nivå bortom vilken meddelandet ska loggas."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lista med etiketter och deras associerade färger"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lista med accepterade licenser"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista med konton"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
 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:64
+#: ../mail/evolution-mail.schemas.in.h:75
 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:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../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."
 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:66
+#: ../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:67
+#: ../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:68
+#: ../mail/evolution-mail.schemas.in.h:80
 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:69
-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."
+#: ../mail/evolution-mail.schemas.in.h:81
+#, 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:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Logga filteråtgärder"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Logga filteråtgärder i den angivna loggfilen."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Markera som läst efter angiven tidsgräns"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Markera som läst efter angiven tidsgräns."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markera citat i meddelandeförhandsgranskningen"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markera citat i meddelandeförhandsgranskningen."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Standardhöjd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Standardbredd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på meddelandevisning (normal, \"full headers\" (fullständiga rubriker), \"source\" (källkod))"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minsta antalet dagar mellan tömning av skräpkorgen vid avslut"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minsta antalet dagar mellan tömning av papperskorgen vid avslut"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minsta tiden mellan tömning av skräpkorgen vid avslut, i dagar."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minsta tiden mellan tömning av papperskorgen vid avslut, i dagar."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antal adresser att visa i Till/Kopia/Blindkopia"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Fråga vid tom ämnesrad"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Fråga användaren när han eller hon försöker att tömma en mapp."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Fråga användaren när han eller hon försöker att skicka ett meddelande utan en ämnesrad."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Fråga om att kontrollera om användaren omedelbart vill gå i frånkopplat läge"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Fråga när meddelanden tas bort från sökmappar"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Fråga när användaren tömmer"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Fråga när användaren endast fyller i blindkopia"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Fråga när användaren försöker att öppna tio eller fler meddelanden på samma gång"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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 "Fråga när användaren försöker skicka HTML-brev till mottagare som kanske inte vill ha HTML-brev."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Fråga när användaren försöker skicka ett meddelande utan till- eller kopiemottagare."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Fråga när användaren försöker skicka oönskad HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Fråga vid markering av flera meddelanden"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Känn igen känsloikoner i text och ersätt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Känn igen länkar i text och ersätt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Kör skräptest på inkommande e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Spara katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Sök efter avsändarens foto i lokala adressböcker"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Skicka HTML-brev som standard"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Skicka HTML-brev som standard."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Kolumn för avsändarens e-postadress i meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "_Synkroniseringsalternativ..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Visa animationer"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Visa animerade bilder som animationer."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Visa borttagna meddelanden (med en genomstrykning) i meddelandelistan."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Visa borttagna meddelanden i meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Visa fotot på avsändaren"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Visa avsändarens e-postadress i en separat kolumn i meddelandelistan."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Visa avsändarens foto i meddelandets läsningspanel."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Anger rubriken att kontrollera efter skräp."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Specifies the header to check for junk. The format is headername=value in gconf."
-msgstr "Anger rubriken att kontrollera efter skräp. Formatet är rubriknamn=värde i gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Stavningskontrollera inuti"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "Färg för stavningskontroll"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "Språk för stavningskontroll"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Standardhöjd på prenumerationsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Standardbredd på prenumerationsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminaltypsnitt"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Gräns för textmeddelandedel"
 
 # Hook?
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Standardinsticksmodul för skräpkrok"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Den senaste gången som tömning av skräpkorgen gjordes, i dagar sedan epoken."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Den senaste dagen som tömning av papperskorgen gjordes, i dagar sedan epoken."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Terminaltypsnittet för e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Det typsnitt med variabelt breddsteg som ska användas för e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 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:128
+#: ../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."
 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:129
+#: ../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 "Det här är standardinsticksmodulen för skräppost, även om det finns flera aktiverade insticksmoduler. Om listad standardinsticksmodul är inaktiverad kommer den inte att falla tillbaka på andra tillgängliga insticksmoduler."
 
-#: ../mail/evolution-mail.schemas.in.h:130
-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."
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+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 "Den här nyckeln läses bara en gång och nollställs efter läsning. Det här avmarkerar meddelandet i listan och tar bort förhandsvisningen för den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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 "Denna nyckel bör innehålla en lista med XML-strukturer som anger anpassade rubriker, och huruvida de ska visas. Formatet på XML-strukturen är &lt;header enabled&gt; - ställ detta till \"enabled\" om rubriken ska visas i e-postvyn."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 addressbook 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 "Det här alternativet hjälper till att förbättra hämtningshastigheten."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../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 "Detta anger antalet adresser som skall visas i standardmeddelandelistan, utanför gränsen visas en \"...\"."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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 "Den här inställningen anger huruvida trådarna ska vara utfällda eller infällda som standard. Evolution kräver en omstart vid ändring."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "Den här inställningen anger huruvida trådarna ska sorteras baserat på senaste meddelandet i varje tråd, istället för meddelandets datum. En omstart av Evolution krävs."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Tråda meddelandelistan."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Tråda meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Tråda meddelandelistan baserat på ämnet"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgräns för markering av meddelande som läst"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Tidsgräns för markering av meddelande som läst."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID-sträng för standardkontot."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "Använd SpamAssassin-demonen och klient"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Använd SpamAssassin-demonen och klient (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Använd anpassade typsnitt"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Använd anpassade typsnitt för visning av e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
-msgstr "Använd endast lokala spamtest."
+msgstr "Använd endast lokala skräpposttest."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
-msgstr "Använd endast de lokala spamtesten (ingen DNS)."
+msgstr "Använd endast de lokala skräpposttesten (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Använd sida-vid-sida eller bred layout"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Typsnitt med variabelt breddsteg"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Menyobjektet Visa/Blindkopia är ikryssat"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Menyobjektet Visa/Blindkopia är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Menyobjektet Visa/Kopia är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Menyobjektet Visa/Kopia är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Menyobjektet Visa/Från är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Menyobjektet Visa/Från är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Menyobjektet Visa/Posta till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Menyobjektet Visa/Posta till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Menyobjektet Visa/Svara till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Menyobjektet Visa/Svara till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Huruvida en begäran om läskvitto ska läggas till i varje meddelande som standard."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../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 "Huruvida Evolution ska falla tillbaka på att tråda efter ämne när meddelandena inte innehåller \"In-Reply-To\"- eller \"References\"-rubriker."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Huruvida trådar sorteras baserat på senaste meddelandet i tråden"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Bredd på meddelandelistpanelen"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Bredd på meddelandelistpanelen."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importerar Elm-data"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolutions Elm-importör"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importera e-post från Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "MÃ¥lmapp:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Välj mapp att importera till"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley-brevlåda (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importera mappar i Berkeley-brevlådeformat"
 
@@ -13037,7 +13681,7 @@ msgid "Importing mailbox"
 msgstr "Importerar brevlåda"
 
 #: ../mail/importers/mail-importer.c:232
-#: ../shell/e-shell-importer.c:518
+#: ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerar \"%s\""
@@ -13047,15 +13691,15 @@ msgstr "Importerar \"%s\""
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importerar Pine-data"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolutions Pine-importör"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importera e-post från Pine."
 
@@ -13084,143 +13728,149 @@ msgstr "Sändlistan %s"
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:164
+#: ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Mallar"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d markerad, "
 msgstr[1] "%d markerade, "
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borttaget"
 msgstr[1] "%d borttagna"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d skräp"
 msgstr[1] "%d skräp"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d utkast"
 msgstr[1] "%d utkast"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d skickat"
 msgstr[1] "%d skickade"
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d oskickat"
 msgstr[1] "%d oskickade"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d oläst, "
 msgstr[1] "%d olästa, "
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:900
-msgid "_Mail Message"
-msgstr "_E-postmeddelande"
-
-#: ../mail/mail-component.c:901
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Ny e-postmapp"
 
-#: ../mail/mail-component.c:908
-msgid "Mail _Folder"
-msgstr "E-post_mapp"
-
-#: ../mail/mail-component.c:909
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Skapa en ny e-postmapp"
 
-#: ../mail/mail-component.c:1056
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Misslyckades med att uppgradera e-postinställningar eller e-postmappar."
 
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "Fel"
 
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "Fel"
 
-#: ../mail/mail-component.c:1530
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "Varningar och fel"
 
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "Felsök"
 
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "Meddelanden om fel, varningar och felsökning"
 
-#: ../mail/mail-component.c:1641
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "Felsökningsloggar"
 
-#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1646
+#: ../mail/mail-component.c:1736
 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:1654
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1752
 msgid "second(s)."
 msgstr "sekund(er)."
 
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "Loggmeddelanden:"
 
-#: ../mail/mail-component.c:1716
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../mail/mail-component.c:1723
-#: ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1808
+#: ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1730
-#: ../mail/message-list.c:2405
+#: ../mail/mail-component.c:1818
+#: ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meddelanden"
 
+#: ../mail/mail-component.c:1827
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Stäng detta fönster"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
@@ -13234,7 +13884,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL stöds inte i detta bygge av Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Avsändarens fotografi</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13467,7 +14117,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signera _utgående meddelanden digitalt (som standard)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "Formatera inte textinnehåll i meddelanden om textstorle_ken överstiger"
 
 #: ../mail/mail-config.glade.h:72
@@ -13600,18 +14251,23 @@ msgid "Note: you will not be prompted for a password until you connect for the f
 msgstr "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för första gången"
 
 #: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Detta alternativ kommer att åsidosättas om en sökning hittar anpassade skräprubriker."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -13619,123 +14275,127 @@ msgstr ""
 "Ange ett beskrivande namn för detta konto i utrymmet nedan.\n"
 "Detta namn kommer endast att användas för visningsändamål."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "Ange information om hur du vill skicka e-post. Om du inte är säker bör du fråga din systemadministratör eller Internetleverantör."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "Ange ditt namn och din e-postadress nedan. De \"valfria\" fälten nedan behöver du inte fylla i, såvida du inte vill inkludera denna information i den e-post du skickar."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Välj mellan följande alternativ"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fr_åga när meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citerad"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Ko_m ihåg lösenord"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Kom ihåg _lösenord"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "S_OCKS-värd:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Sö_k endast efter avsändarens fotografi i lokala adressböcker"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "_Välj..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Skicka m_eddelandekvitton:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Sändning av post"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certifikat för sig_nering:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 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:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13745,11 +14405,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: ../mail/mail-config.glade.h:150
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr "Detta alternativ kommer att åsidosättas om en sökning hittar anpassade skräprubriker."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13757,25 +14413,27 @@ 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:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "Använ_darnamn:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
 msgstr "Använd aute_ntisering"
 
-#: ../mail/mail-config.glade.h:155
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156
+#: ../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 "Användar_namn:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13785,120 +14443,126 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Läs _alltid in bilder från nätet"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL för _automatisk proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "S_tandardinsticksmodul för skräppost:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Direktanslutning till Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 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:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Läs in bilder i meddelanden från kontakter"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "Lista lokala adressboksmappar"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "Läs al_drig in bilder från nätet"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: ../mail/mail-config.glade.h:176
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Fråga när HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 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:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Säker HTTP-proxy:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Välj..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Visa bildanimeringar"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:187
 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:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Minska rubriker för Till / Kopia / Blindkopia till "
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Använd säker anslutning:"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "An_vänd systemets standard"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "färg"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "beskrivning"
 
@@ -13938,44 +14602,44 @@ msgstr "Skiftläges_känslig"
 msgid "Co_mpleted"
 msgstr "Fä_rdigt"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "S_ök:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Sök i meddelande"
 
-#: ../mail/mail-dialogs.glade.h:13
-#: ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Flagga att följa upp"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Mapprenumerationer"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Licensavtal"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Inga markerade"
 
-#: ../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
 msgid "Security Information"
 msgstr "Säkerhetsinformation"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Specifika mappar"
 
-#: ../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."
@@ -13983,23 +14647,23 @@ msgstr ""
 "De meddelanden du har valt för uppföljning listas nedan.\n"
 "Välj en uppföljningsåtgärd från menyn \"Flagga\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Acceptera licens"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Ska utföras den:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Flagga:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryssa för detta för att acceptera licensavtalet"
 
-#: ../mail/mail-folder-cache.c:831
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14048,12 +14712,12 @@ 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:704
+#: ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Avbruten."
 
 #: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:706
+#: ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Färdig."
 
@@ -14081,68 +14745,73 @@ msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Kontaktinformation för %s"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tömmer och lagrar kontot \"%s\""
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar kontot \"%s\""
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: ../mail/mail-ops.c:1585
-#: ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657
+#: ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, 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:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Sparar %d meddelande"
 msgstr[1] "Sparar %d meddelanden"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14151,12 +14820,12 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: ../mail/mail-ops.c:2060
-#: ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146
+#: ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14165,52 +14834,52 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Förbereder kontot \"%s\" för frånkopplat"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Avbryter..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Avbryt a_llt"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: ../mail/mail-send-recv.c:510
-#: ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Kontrollerar ny e-post"
@@ -14238,17 +14907,17 @@ msgstr "Ange lösenord"
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Redigera signatur"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Spara och stäng"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Ange ett namn för denna signatur."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Redigera signatur"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Namn:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "_Signaturnamn:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14289,39 +14958,39 @@ msgstr "Uppdaterar sökmappar för \"%s:%s\""
 msgid "Updating Search Folders for '%s'"
 msgstr "Uppdaterar sökmappar för \"%s\""
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Redigera sökmapp"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Ny sökmapp"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "En mapp med namnet &quot;{0}&quot; finns redan. Använd ett annat namn."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "En mapp med namnet \"{0}\" finns redan. Använd ett annat namn."
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "En mapp med namnet &quot;{1}&quot; finns redan. Använd ett annat namn."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "En mapp med namnet \"{1}\" finns redan. Använd ett annat namn."
 
 #: ../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."
 msgstr ""
-"En icke-tom mapp, &quot;{1}&quot;, finns redan.\n"
+"En icke-tom mapp, \"{1}\", finns redan.\n"
 "\n"
 "Du kan välja att ignorera denna mapp, skriva över eller lägga till dess innehåll, eller avsluta."
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?"
-msgstr "En läskvittonotifiering har begärts för &quot;{1}&quot;. Skicka kvittonotifieringen till {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "Ett läskvitto har begärts för \"{1}\". Skicka läskvitto till {0}?"
 
 #: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
-msgstr "En signatur med namnet &quot;{0}&quot; finns redan. Använd ett annat namn."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgstr "En signatur med namnet \"{0}\" finns redan. Använd ett annat namn."
 
 #: ../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."
@@ -14350,8 +15019,8 @@ msgid "Are you sure you want to permanently remove all the deleted messages in a
 msgstr "Är du säker på att du vill permanent ta bort alla borttagna meddelanden i alla mappar?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
-msgstr "Är du säker på att du vill ta bort alla borttagna meddelanden i mappen &quot;{0}&quot;?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgstr "Är du säker på att du vill permanent ta bort alla borttagna meddelanden i mappen \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14367,138 +15036,138 @@ msgstr "Är du säker på att du vill skicka ett meddelande utan en ämnesrad?"
 
 # Mycket konstigt meddelande...
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "Eftersom &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "Eftersom \"{0}\"."
 
 # Mycket konstigt meddelande...
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "Eftersom &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "Eftersom \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Blank signatur"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Kan inte lägga till sökmappen &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Kan inte lägga till sökmappen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Kan inte kopiera mappen &quot;{0}&quot; till &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Kan inte kopiera mappen \"{0}\" till \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Kan inte skapa mappen &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kan inte skapa mappen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Kan inte skapa temporär sparandekatalog."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Kan inte skapa sparandekatalogen, eftersom &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Kan inte skapa sparkatalogen, eftersom \"{1}\"."
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Kan inte ta bort mappen &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Kan inte ta bort mappen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Kan inte ta bort systemmappen &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan inte ta bort systemmappen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Kan inte redigera sökmappen &quot;{0}&quot; eftersom den inte finns."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Kan inte redigera sökmappen \"{0}\" eftersom den inte finns."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Kan inte flytta mappen &quot;{0}&quot; till &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kan inte flytta mappen \"{0}\" till \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Kan inte öppna källan &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
+msgstr "Kan inte öppna källan \"{1}\"."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Kunde inte öppna källan &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
+msgstr "Kunde inte öppna källan \"{2}\"."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Kan inte öppna målet &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
+msgstr "Kan inte öppna målet \"{2}\"."
 
 #: ../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."
-msgstr "Kan inte läsa licensfilen &quot;{0}&quot; på grund av ett problem med installationen. Du kommer inte att kunna använda denna leverantör innan du accepterar dess licens."
+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 "Kan inte läsa licensfilen \"{0}\" på grund av ett problem med installationen. Du kommer inte att kunna använda denna leverantör innan du accepterar dess licens."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Kan inte byta namn på &quot;{0}&quot; till &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Kan inte byta namn på \"{0}\" till \"{1}\"."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Kan inte byta namn på eller flytta systemmappen &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan inte byta namn på eller flytta systemmappen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Kan inte spara ändringar i kontot."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Kan inte spara till katalogen &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Kan inte spara till katalogen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Kan inte spara till filen &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
+msgstr "Kan inte spara till filen \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Kan inte ställa in signaturskriptet &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Kan inte ställa in signaturskriptet \"{0}\"."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "Kontroll av skräppost misslyckades"
+
+#: ../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 "Kontrollera att ditt lösenord är rättstavat. Kom ihåg att många lösenord är känsliga för skillnader i gemener och versaler; din CapsLock kan vara aktiverad."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Kunde inte spara signaturfilen."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Ta bort &quot;{0}&quot;?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Ta bort kontot?"
+msgid "Delete \"{0}\"?"
+msgstr "Ta bort \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Ta bort meddelanden i sökmappen &quot;{0}&quot;?"
+msgid "Delete account?"
+msgstr "Ta bort kontot?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Ta bort meddelanden i sökmappen \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Ta bort meddelanden i sökmapp?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Förkasta ändringar?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ta inte _bort"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ta inte bort"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Inaktivera inte"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Vill du att åtgärden även ska utföras i undermapparna?"
-
 #: ../mail/mail.error.xml.h:52
 msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "Vill du synkronisera mapparna lokalt som är markerade för frånkopplad användning?"
@@ -14584,38 +15253,30 @@ msgid "Mark all messages as read"
 msgstr "Markera alla meddelanden som lästa"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Markera alla meddelanden i den här mappen och undermappar som lästa?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Mapp saknas."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Inga källor har valts."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Endast i a_ktuell mapp"
-
-#: ../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 "Att öppna för många meddelanden på en gång kan ta lång tid."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Kontrollera dina kontoinställningar och försök igen."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Aktivera kontot eller skicka med ett annat konto."
 
-#: ../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 "Ange en giltig e-postadress i Till:-fältet. Du kan söka efter en e-postadress genom att klicka på Till:-knappen bredvid inmatningsfältet."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
@@ -14623,33 +15284,42 @@ msgstr ""
 "Försäkra dig om att följande mottagare vill ha och kan ta emot HTML-post:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Ange ett unikt namn för att identifiera denna signatur."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Var god vänta."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "Problem vid migrering av den gamla e-postmappen &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem vid migrering av den gamla e-postmappen \"{0}\"."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Rådfrågar server"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Rådfrågar servern om en lista över de autentiseringsmekanismer som stöds."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Läskvitto begärt."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Vill du verkligen ta bort mappen \"{0}\" och alla dess undermappar?"
+
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Importera fil"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Vill du verkligen ta bort mappen &quot;{0}&quot; och alla dess undermappar?"
+msgid "Report Not Junk Failed"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14690,21 +15360,22 @@ 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 ""
-"Följande sökmappar:\n"
+"Följande sökmapp(ar):\n"
 "{0}\n"
-"Använde den nu borttagna mappen:\n"
-"    &quot;{1}&quot;\n"
+"använde den nu borttagna mappen:\n"
+"    \"{1}\"\n"
 "och har uppdaterats."
 
 #: ../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 ""
 "Följande filterregler:\n"
@@ -14802,8 +15473,8 @@ msgstr ""
 "Antingen genom att markera mapparna individuellt, och/eller genom att markera alla lokala mappar, alla fjärrmappar, eller bådadera."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "Din inloggning till servern &quot;{0}&quot; som &quot;{0}&quot; misslyckades."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Din inloggning till servern \"{0}\" som \"{0}\" misslyckades."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14825,22 +15496,22 @@ msgstr "_Töm"
 msgid "_Open Messages"
 msgstr "_Öppna meddelanden"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "i aktuell mapp och _undermappar"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Oläst"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Läst"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Besvarad"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Vidarebefordrat"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
@@ -14865,43 +15536,53 @@ msgstr "Högre"
 msgid "Highest"
 msgstr "Högsta"
 
-#: ../mail/message-list.c:1613
+#: ../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:1620
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "Idag %H.%M"
 
-#: ../mail/message-list.c:1629
+#: ../mail/message-list.c:1612
 #: ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: ../mail/message-list.c:1641
+#: ../mail/message-list.c:1624
 #: ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1649
+#: ../mail/message-list.c:1632
 #: ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1651
+#: ../mail/message-list.c:1634
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3837
+#. 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
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
+#: ../mail/message-list.c:4223
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4225
+msgid "There are no messages in this folder."
+msgstr "Det finns inga meddelanden i denna mapp."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Ska utföras den"
@@ -14931,42 +15612,42 @@ msgstr "Skickade meddelanden"
 msgid "Size"
 msgstr "Storlek"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Vidarebefordra inte"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Följ upp"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "För information"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:59
 #: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Inget svar krävs"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:63
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Svara"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:64
 #: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Granska"
 
@@ -14980,19 +15661,23 @@ msgstr "Meddelandet innehåller"
 
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
-msgstr "Mottagarna innehåller"
+msgstr "Mottagare innehåller"
 
 #: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
-msgstr "Avsändaren innehåller"
+msgstr "Avsändare innehåller"
 
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
-msgstr "Ämnet innehåller"
+msgstr "Ämne innehåller"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Ämne eller Avsändare innehåller"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
-msgstr "Ämnet eller avsändaren innehåller"
+msgstr "Ämne eller Avsändare innehåller"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
@@ -15003,29 +15688,18 @@ msgid "Provides core functionality for local address books."
 msgstr "Tillhandahåller grundläggande funktionalitet för lokala adressböcker."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Aktivera insticksmodul för bilagepåminnare"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Aktivera insticksmodul för bilagepåminnare."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 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 en meddelandetext"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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 "Lista över ledtrådar för bilagepåminnaren att leta efter i meddelandetexten."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Nyckelord"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "PÃ¥minn om _saknade bilagor"
-
 #: ../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"
@@ -15043,9 +15717,9 @@ msgstr "Evolution har hittat några nyckelord som säger att det här meddelande
 msgid "Message has no attachments"
 msgstr "Meddelandet saknar bilagor"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Fortsätt redigera"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+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."
@@ -15055,27 +15729,27 @@ msgstr "En formateringsinsticksmodul som visar infogade ljudbilagor och låter d
 msgid "Audio inline plugin"
 msgstr "Insticksmodul för infogade ljud"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Välj namnet på Evolution-säkerhetskopian"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "Starta _om Evolution efter säkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Välj namnet på Evolution-säkerhetskopian att återställa"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "Starta _om Evolution efter återställning"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Återställ från säkerhetskopia"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 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."
@@ -15083,95 +15757,119 @@ msgstr ""
 "Du kan återställa Evolution från din säkerhetskopia. Det kan återställa all e-post, kalendrar, uppgifter, memon och kontakter. \n"
 "Den kan även återställa alla dina personliga inställningar, e-postfilter etc."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "Å_terställ Evolution från säkerhetskopian"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Välj ett Evolution-arkiv att återställa:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Välj en fil att återställa"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Säkerhetskopiera Evolution-katalog"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Återställ Evolution-katalogen"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Kontrollera Evolution-säkerhetskopia"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Starta om Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Med grafiskt användargränssnitt"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Stänger ner Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Säkerhetskopierar konton och inställningar i Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Säkerhetskopierar Evolution-data (e-post, kontakter, kalender, uppgifter, memon)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Säkerhetskopiering färdig"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Startar om Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Säkerhetskopiera aktuellt Evolution-data"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Extraherar filer från säkerhetskopia"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Läser in Evolutions inställningar"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Tar bort temporära säkerhetskopior"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Säkerhetskopierar till mappen %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Återställer från mappen %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Evolutions säkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Evolutions återställning"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Säkerhetskopierar Evolution-data"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Återställer Evolution-data"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+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 "En insticksmodul för att säkerhetskopiera och återställa data och inställningar i Evolution."
@@ -15194,14 +15892,23 @@ msgid "Evolution backup can start only when Evolution is not running. Please mak
 msgstr "Evolutions säkerhetskopiering kan endast starta när Evolution inte är igång. Försäkra dig om att du har sparat och stängt alla dina osparade fönster innan du fortsätter.  Om du vill att Evolution ska starta om automatiskt efter säkerhetskopieringen kan du använda växlingsknappen."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Otillräckliga rättigheter"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Ogiltig Evolution-säkerhetskopia"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Välj en giltig säkerhetskopia att återställa."
 
-#: ../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 "Kopiera den markerade mappen till en annan mapp"
+
+#: ../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 "Det här kommer att ta bort allt ditt aktuell Evolution-data och inställningar och sedan återställa dem från din säkerhetskopia. Evolutions återställning kan endast starta när Evolution inte är igång. Försäkra dig om att du har stängt alla dina osparade fönster innan du fortsätter. Om du vill att Evolution ska starta om automatiskt efter återställningen kan du använda växlingsknappen."
 
@@ -15217,36 +15924,38 @@ msgstr "Åters_täll inställningar..."
 msgid "_Backup Settings..."
 msgstr "Inst_ällningar för säkerhetskopiering..."
 
-#: ../plugins/bbdb/bbdb.c:541
-#: ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543
+#: ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiska kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "Skapa _automatiskt poster i adressboken när meddelanden besvaras"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Välj adressbok för automatiska kontakter"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter för snabbmeddelanden"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid "Periodically synchronize contact information and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:603
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synkronisera periodiskt kontaktinformation och bilder från Pidgins kompislista"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Välj adressbok för Pidgins kompislista"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisera med _kompislistan nu"
 
@@ -15259,7 +15968,28 @@ msgstr "Fyller automatiskt din adressbok med namn och e-postadresser efterhand s
 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:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Ett fel inträffade vid utskrift"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, 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
 msgid "Convert message text to _Unicode"
 msgstr "Konvertera meddelandetext till _Unicode"
 
@@ -15283,18 +16013,19 @@ msgstr "Skräppostinsticksmodul för Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtrerar skräpmeddelanden med Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "Använd _SSL"
 
@@ -15314,17 +16045,18 @@ msgstr "Lokala kalendrar"
 msgid "Provides core functionality for local calendars."
 msgstr "Tillhandahåller grundläggande funktionalitet för lokala kalendrar."
 
-#: ../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:375
-msgid "_Refresh:"
-msgstr "_Uppdatera:"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "Upp_datera:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Säker anslutning"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Användarna_mn:"
 
@@ -15418,14 +16150,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vill du göra Evolution till din standardklient för e-post?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Markera som _standardmapp"
+msgid "Mark as _default address book"
+msgstr "Markera som _standardadressbok"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Markera som _standardkalender"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Markera som _standarduppgiftslista"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Markera som _standardmemolista"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15435,6 +16178,49 @@ msgstr "Standardkällor"
 msgid "Provides functionality for marking a calendar or an addressbook 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
+msgid "_Custom Header"
+msgstr "_Anpassad rubrik"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Nyckel"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Värden"
+
+#. 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 "Anpassade rubriker"
+
+#. 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 "Lägger till anpassad rubrik till utgående meddelanden."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Anpassad rubrik"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+msgid "List of Custom Headers"
+msgstr "Anpassade rubriker"
+
+#: ../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 "Öppna en annan användares mapp"
@@ -15452,28 +16238,28 @@ msgid "_User:"
 msgstr "_Användare:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Säkert lösenord"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 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:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Lösenord i klartext"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 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:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Inte på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15482,79 +16268,84 @@ 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:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Jag är inte på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Jag är på kontoret"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Byt lösenordet på Exchange-kontot"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../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:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 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:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegeringsassistent"
 
 # Felstavat... borde buggrapporteras.
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Diverse"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Visa storleken på alla Exchange-mappar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Mappstorlek"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../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:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utentisera"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_E-post"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Autentiseringstyp"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Kontrollera vilka typer som stöds"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15572,11 +16363,11 @@ 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:113
 msgid "The current password does not match the existing password for your account. Please enter the correct password"
 msgstr "Det nuvarande lösenordet stämmer inte överens med det befintliga lösenordet för ditt konto. Ange rätt lösenord"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "De två lösenorden stämmer inte överens. Ange lösenorden på nytt."
 
@@ -15601,33 +16392,33 @@ 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:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../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:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../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:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Granskare (skrivskyddad)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegaträttigheter"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Rättigheter för %s"
@@ -15635,73 +16426,73 @@ 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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 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:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Du har utsetts till en delegat för %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Delegera till"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Ta bort delegaten %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Kunde inte komma åt Active Directory"
 
 # Osäker.
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Kunde inte hitta mig själv i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Kunde inte hitta delegaten %s i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Kunde inte ta bort delegaten %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Kunde inte uppdatera listan med delegater."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Kunde inte lägga till delegaten %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Fel vid läsning av delegatlista."
 
@@ -15749,25 +16540,25 @@ msgstr "_Sammanställ rättigheter"
 msgid "_Tasks:"
 msgstr "_Uppgifter:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Rättigheter..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Mappnamn"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Mappstorlek"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
 msgid "User"
 msgstr "Användare"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Prenumerera på annan användares mapp"
@@ -15776,20 +16567,20 @@ msgstr "Prenumerera på annan användares mapp"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-mappträd"
 
-#: ../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:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Säg upp prenumeration på mapp..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Verkligen säga upp prenumerationen på mappen \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Säg upp prenumerationen på \"%s\""
@@ -15852,17 +16643,18 @@ msgstr "Ditt lösenord går ut om 7 dagar..."
 msgid "_Change Password"
 msgstr "_Byt lösenord"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Ã…tkomst nekas.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Lägg till användare:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../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
 msgid "Add User"
 msgstr "Lägg till användare"
 
@@ -15986,11 +16778,11 @@ msgstr "_Användare"
 msgid "button-user"
 msgstr "Användare"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Välj användare"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Adressbok..."
 
@@ -16003,7 +16795,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Prenumerera på annan användares kalender"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "A plugin that handles a collection of Exchange account specific operations and features."
+#, fuzzy
+msgid "A plugin that manages a collection of Exchange account specific operations and features."
 msgstr "En insticksmodul som hanterar en samling åtgärder och funktioner som är specifika för Exchange-konton."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16090,10 +16883,14 @@ msgid "Could not update out-of-office state"
 msgstr "Kunde inte uppdatera inte-på-kontoret-tillstånd"
 
 #: ../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 "Exchange-kontot är frånkopplat."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16122,100 +16919,100 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Misslyckades med att uppdatera delegater:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Mappen finns redan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Mappen finns inte"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Mapp frånkopplad"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Allmänt fel"
 
-#: ../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 "Global katalogserver är inte nåbar"
 
-#: ../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 "Om OWA körs på en annan sökväg måste du ange det i kontokonfigurationsdialogen."
 
-#: ../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 "Brevlådan för {0} finns inte på denna server."
 
-#: ../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 "Försäkra dig om att URL:en stämmer och försök igen."
 
-#: ../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 "Försäkra dig om att servernamnet är rättstavat och försök igen."
 
-#: ../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 "Försäkra dig om att användarnamnet och lösenordet stämmer och försök igen."
 
-#: ../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 "Ingen global katalogserver är konfigurerad för detta konto."
 
-#: ../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 "Ingen brevlåda för användaren {0} på {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Det finns ingen användare {0}"
 
-#: ../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 "Lösenordet byttes utan problem."
 
-#: ../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 "Ange ett delegat-id eller avmarkera alternativet Skicka som en delegat."
 
-#: ../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 "Kontrollera att namnet på den globala katalogservern är korrekt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Starta om Evolution för att ändringar ska börja gälla"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Välj en användare."
 
-#: ../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 "Servern avvisade lösenordet eftersom det är för enkelt."
 
-#: ../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 "Exchange-kontot kommer att inaktiveras när du avslutar Evolution"
 
-#: ../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 "Exchange-kontot kommer att tas bort när du avslutar Evolution"
 
-#: ../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 "Exchange-servern är inte kompatibel med Exchange Connector."
 
-#: ../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."
@@ -16223,7 +17020,7 @@ msgstr ""
 "Servern kör Exchange 5.5. Exchange Connector\n"
 "stöder endast Microsoft Exchange 2000 och 2003."
 
-#: ../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"
@@ -16237,79 +17034,80 @@ msgstr ""
 "\n"
 "Eller så har du kanske bara skrivit ditt lösenord fel."
 
-#: ../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 "Försök igen med ett annat lösenord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Kan inte lägga till användaren i åtkomstkontrollistan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Kan inte redigera delegater."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Okänt fel vid uppslag av {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "Okänt fel."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Okänd typ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: ../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 "Du håller på att närma dig din tillgängliga kvot för lagring av post på denna server."
 
-#: ../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 "Du tillåts endast att skicka ett meddelande på uppdrag av en delegat åt gången."
 
-#: ../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 "Du kan inte göra dig själv till din egen delegat"
 
-#: ../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 "Du har överskridit din kvot för lagring av post på denna server."
 
-#: ../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 "Du kan endast konfigurera ett enstaka Exchange-konto."
 
-#: ../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 "Din nuvarande användning är: {0} KB. Prova att rensa upp en del utrymme genom att ta bort en del brev."
 
-#: ../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 "Din nuvarande användning är: {0} KB. Du kommer varken att kunna skicka eller ta emot brev nu."
 
-#: ../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 "Din nuvarande användning är: {0} KB. Du kommer varken att kunna skicka brev till dess att du rensar upp en del utrymme genom att ta bort en del brev."
 
-#: ../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 "Ditt lösenord har gått ut."
 
-#: ../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 "{0} kan inte läggas till i en åtkomstkontrollista"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} är redan en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} är redan i listan"
 
@@ -16321,6 +17119,14 @@ msgstr "Prenumerera på annan användares uppgifter"
 msgid "Check folder permissions"
 msgstr "Kontrollera mapprättigheter"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Extern standardredigerare"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "Standardkommandot som måste användas som redigeraren."
+
 #: ../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 "En insticksmodul för att använda en extern redigerare att skriva meddelanden med. Du kan endast skicka meddelanden med vanlig text."
@@ -16330,14 +17136,42 @@ msgstr "En insticksmodul för att använda en extern redigerare att skriva medde
 msgid "External Editor"
 msgstr "Extern redigerare"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Kan inte skapa temporär fil"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Inte möjligt att köra redigeraren"
+
+#: ../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 "Evolution kan inte skapa en temporärfil för att spara din e-post. Försök igen senare."
+
+#: ../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 "Skriv i extern redigerare"
+msgid "Compose in _External Editor"
+msgstr "Skriv i _extern redigerare"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Skriv meddelanden med en extern redigerare"
 
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"För Emacs, använd \"xemacs\"\n"
+"För VI, använd \"gvim\""
+
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Välj en png-bild (48x48) med storleken < 700 byte"
@@ -16346,7 +17180,7 @@ msgstr "Välj en png-bild (48x48) med storleken < 700 byte"
 msgid "PNG files"
 msgstr "PNG-filer"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "A_nsikte"
 
@@ -16375,20 +17209,55 @@ msgstr "Säg upp prenumeration på mappar"
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
-#: ../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
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Ange användarnamnet först."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Lägg till mapp till din lista över prenumererade mappar"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Kan inte läsa data från Google-server.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "Kal_ender:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Hämta _lista"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "En insticksmodul för att konfigurera Google Kalender."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-resurser"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Kontrollista"
 
@@ -16468,10 +17337,18 @@ msgid "_Junk List"
 msgstr "_Skräplista"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Dra tillbaka meddelande"
+
+#: ../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 "Meddelandet togs tillbaka"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Dra tillbaka e-post"
 
@@ -16479,13 +17356,6 @@ msgstr "Dra tillbaka e-post"
 msgid "Add Send Options to groupwise messages"
 msgstr "Lägger till alternativ för sändning till groupwise-meddelanden"
 
-#: ../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"
-msgstr "Alternativ för sändning"
-
 #: ../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."
@@ -16495,35 +17365,31 @@ msgid "Groupwise Features"
 msgstr "Groupwise-funktioner"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "Meddelandet togs tillbaka"
+msgstr "Misslyckades med att dra tillbaka meddelande"
 
 #: ../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 "Konvertera det markerade meddelandet till en ny uppgift"
+msgstr "Servern tillät inte att det valda meddelandet drogs tillbaka."
 
 #: ../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:2
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
 msgid "Invalid user"
 msgstr "Ogiltig användare"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Kan inte spara till filen &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-shared-folder.errors.xml.h:3
+#: ../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
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "Du har tilldelats följande rättigheter på mina mappar:"
+msgstr "Du har redan tilldelat proxyrättigheter till denna användare."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
@@ -16539,32 +17405,27 @@ msgid "Account Already Exists"
 msgstr "Kontot finns redan"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and try again."
-msgstr ""
+#, fuzzy
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "En mapp med namnet &quot;{0}&quot; finns redan. Använd ett annat namn."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
-msgid "All instances"
-msgstr "Alla instanser"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "Detta är ett återkommande sammanträde"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "This instance"
-msgstr "Denna instans"
+msgid "Would you like to accept it?"
+msgstr "Vill du acceptera det?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "Detta är ett återkommande sammanträde"
+msgid "Would you like to decline it?"
+msgstr "Vill du avslå det?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-#, fuzzy
-msgid "What would you like to {0}?"
-msgstr "Vill du spara dina ändringar?"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-#, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Kunde inte spara till automatsparandefilen &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
+#: ../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 ""
 
@@ -16666,9 +17527,9 @@ msgstr "<b>Kontonamn</b>"
 msgid "Proxy Login"
 msgstr "Proxyinloggning"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16677,20 +17538,20 @@ 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:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Proxyinloggning..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 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:708
+#: ../plugins/groupwise-features/proxy.c:696
 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/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Användare"
 
@@ -16706,15 +17567,15 @@ msgstr "Ny _delad mapp..."
 msgid "Sharing"
 msgstr "Delning"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
 msgstr "Anpassad notifiering"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Lägg till   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Ändra"
 
@@ -16779,11 +17640,11 @@ msgstr "En insticksmodul för att konfigurera Hula-kalenderresurser."
 msgid "Hula Account Setup"
 msgstr "Konfiguration av Hula-konto"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Anpassade rubriker"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP-rubriker"
 
@@ -16835,28 +17696,28 @@ msgstr "En insticksmodul för funktionerna i IMAP-konton."
 msgid "IMAP Features"
 msgstr "IMAP-funktioner"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "_Importera till kalender"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "_Importera till uppgifter"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "Importera ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "Välj uppgiftslista"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "Välj kalender"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Importera"
 
@@ -16885,8 +17746,8 @@ msgstr "Sökning efter en iPod misslyckades"
 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:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
@@ -16902,588 +17763,588 @@ msgstr "Synkronisera till iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronisering"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Misslyckades med att läsa in kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, 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:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hittade mötet i kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Kunde inte hitta några kalendrar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 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:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 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:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 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:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 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:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Kan inte tolka objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, 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:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Skickade till kalendern \"%s\" som accepterat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Skickade till kalendern \"%s\" som preliminärt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Skickade till kalendern \"%s\" som avslaget"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Skickade till kalendern \"%s\" som avbrutet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatören har tagit bort delegaten %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Skickade ett avbokningsmeddelande till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunde inte skicka en avbokningsnotering till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 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:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan inte uppdatera deltagare. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Deltagarstatusen är uppdaterad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Sammanträdesinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Uppgiftsinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Memoinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 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:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 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:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 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:1372
-#: ../plugins/itip-formatter/itip-formatter.c:1387
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Den bifogade kalendern är inte giltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1373
-#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 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:1423
-#: ../plugins/itip-formatter/itip-formatter.c:1441
-#: ../plugins/itip-formatter/itip-formatter.c:1523
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Objektet i kalendern är inte giltigt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1424
-#: ../plugins/itip-formatter/itip-formatter.c:1442
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 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:1453
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Den bifogade kalendern innehåller flera objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1454
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 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:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Detta möte upprepas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Denna uppgift upprepas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2157
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Detta memo upprepas"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2372
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Ta bort meddelande efter åtgärd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2382
-#: ../plugins/itip-formatter/itip-formatter.c:2414
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Konfliktsökning"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2397
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Välj de kalendrar som ska genomsökas efter sammanträdeskonflikter"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../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:299
 msgid "Today"
 msgstr "Idag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Idag %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Idag %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Idag %H.%M.%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Imorgon"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Imorgon %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Imorgon %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Imorgon %H.%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Imorgon %H.%M.%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%a %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B %H.%M.%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y %H.%M.%S"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Svara på uppdrag av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "Mottaget på uppdrag av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> genom %s har publicerat följande sammanträdesinformation:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publicerat följande sammanträdesinformation:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> har delegerat följande sammanträde till dig:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> genom %s begär din närvaro vid följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> begär din närvaro vid följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> genom %s önskar lägga till i ett befintligt sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> önskar lägga till i ett befintligt sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b> genom %s önskar få den senaste informationen för följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> önskar få den senaste informationen för följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> genom %s har skickat tillbaka följande sammanträdessvar:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> har skickat tillbaka följande sammanträdessvar:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> genom %s har avbokat följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> har avbokat följande sammanträde."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> genom %s har föreslagit följande sammanträdesändringar."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> har föreslagit följande sammanträdesändringar."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> genom %s har avslagit följande sammanträdesändringar:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> har avslagit följande sammanträdesändringar."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> genom %s har publicerat följande uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> har publicerat följande uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> begär att %s tilldelas följande uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> genom %s har tilldelat dig en uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> har tilldelat dig en uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> genom %s önskar att lägga till i en befintlig uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> önskar lägga till i en befintlig uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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 "<b>%s</b> genom %s önskar få den senaste informationen för följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> önskar få den senaste informationen för följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> genom %s har skickat tillbaka följande svar på en tilldelad uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> har skickat tillbaka följande svar på en tilldelad uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> genom %s har avbokat följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> har avbokat följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> genom %s har föreslagit följande ändringar i uppgiftstilldelningen:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har föreslagit följande ändringar i uppgiftstilldelningen:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> genom %s har avslagit följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslagit följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> genom %s har publicerat följande memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> har publicerat följande memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> genom %s önskar lägga till i ett befintligt memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> önskar lägga till i ett befintligt memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> genom %s har avbrutit följande delat memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har avbrutit följande delat memo:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "A_vslå"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "_Acceptera"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "A_vslå alla"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Preliminärt alla"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "_Preliminärt"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Acceptera alla"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Skicka information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Uppdatera svarandestatus"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Uppdatera"
 
@@ -17581,7 +18442,8 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genererar ett D-Bus-meddelande när nya meddelanden anländer."
 
 #: ../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."
+#, fuzzy
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
 msgstr "Om sant, använd pip, annars spela upp ljudfil när nya meddelanden anländer."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17628,8 +18490,18 @@ msgstr "Huruvida notifiering av nya meddelanden endast ska göras för Inkorgen.
 msgid "Generate a _D-Bus message"
 msgstr "Generera ett _D-Bus-meddelande"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "E-postnotifiering"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17644,55 +18516,55 @@ msgstr[1] ""
 "Du har fått %d nya meddelanden\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Nya e-postmeddelanden"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Visa ikon i _notifieringsytan"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "B_linka med ikon i notifieringsytan"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Visa popup_meddelande tillsammans med ikonen"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Spela _upp ljud när nya meddelanden anländer"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Spela upp _ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Välj ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Spela u_pp"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Notifiera om nya meddelanden endast för _inkorgen"
 
@@ -17814,8 +18686,9 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Skicka e-postmeddelande till sändlista?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
-"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
+"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 ""
@@ -17893,6 +18766,23 @@ msgstr "Prenumerera på _listan"
 msgid "_Unsubscribe from List"
 msgstr "A_vsluta prenumerationen på listan"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Also mark messages in subfolders?"
+msgstr "Markera även meddelanden i undermappar?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, 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 "Detta kommer att markera alla meddelanden som lästa i den markerade mappen och dess undermappar."
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "Aktuell mapp och _undermappar"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "Endast aktuell _mapp"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Markera alla som lästa"
@@ -17907,11 +18797,11 @@ 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 "Märk kalendern som frånkopplad"
+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 "Märker den valda kalendern för frånkopplad visning."
+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"
@@ -17935,7 +18825,7 @@ msgstr "En insticksmodul för hantering av vilka insticksmoduler som är aktiver
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Hanterare för insticksmoduler"
 
@@ -17947,33 +18837,24 @@ msgstr "Aktivera och inaktivera insticksmoduler"
 msgid "_Plugins"
 msgstr "Insticksm_oduler"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Författare"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Beskrivning"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Konfiguration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Obs: En del ändringar kommer inte att börja gälla förrän omstart sker"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Översikt"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Det finns inga konfigurationsalternativ för denna insticksmodul."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Insticksmodul"
 
@@ -17996,43 +18877,22 @@ msgstr "Klartextläge"
 msgid "Prefer plain-text"
 msgstr "Föredrar klartext"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Visa HTML om sådan finns"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Föredrar VANLIG TEXT"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Visa alltid bara VANLIG TEXT"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML-lä_ge"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Ger en möjlighet att skriva ut från redigeraren."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Skriv ut meddelande"
-
-#: ../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 "Förhands_granska"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Skriver ut meddelandet"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution-profilering"
@@ -18057,13 +18917,7 @@ msgstr "Platser"
 msgid "_Publish Calendar Information"
 msgstr "_Publicera kalendarinformation"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Ange lösenordet för \"%s\""
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Är du säker på att du vill ta bort denna URL?"
 
@@ -18151,15 +19005,75 @@ msgstr ""
 "iCal\n"
 "Ledig/Upptagen"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hej Python"
+
+#: ../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 "Python-inläsare"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (inbyggd)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, 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
+#, 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
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Fel efter processgrening: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, 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
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin är inte tillgänglig."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
 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:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "_Inkludera fjärrtester"
 
@@ -18181,7 +19095,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:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Spara bilagor"
 
@@ -18193,17 +19107,15 @@ msgstr "Spara bilagor..."
 msgid "Save all attachments"
 msgstr "Spara alla bilagor"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Välj basnamn för sparande"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: ../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:347
 msgid "Save"
 msgstr "Spara"
 
@@ -18211,79 +19123,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Beskrivningslista"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Kategorilista"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Kommentarlista"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Skapat"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Kontaktlista"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Slut"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "procent klart"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Deltagarlista"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Ändrad"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Avancerade alternativ för CVS-formatet"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Lägg till en rubrik före"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Värdeavskiljare:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Postavskiljare:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Kapsla in värden med:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparerat värdeformat (.csv)"
 
@@ -18304,15 +19216,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:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Välj målfil"
 
@@ -18337,22 +19249,22 @@ msgid "Show _only this Task List"
 msgstr "_Visa endast denna uppgiftslista"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "En insticksmodul som hanterar uppstartsguiden."
+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 "Uppstartsguide"
+msgid "Setup Assistant"
+msgstr "Konfigurationsguide"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolutions konfigurationsguide"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Välkommen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18362,29 +19274,29 @@ msgstr ""
 "\n"
 "Klicka på knappen \"Framåt\" för att fortsätta. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importerar filer"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 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:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "Importerar data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Var god vänta"
 
@@ -18405,6 +19317,27 @@ msgstr "Tråda meddelanden efter ämne"
 msgid "F_all back to threading messages by subject"
 msgstr "Fall tillbaka på trådning av meddelanden efter _ämne"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr "Lista över ledtrådar för bilagepåminnaren att leta efter i meddelandetexten."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Ingen titel"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Spara som _mall"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Spara som mall"
+
+#: ../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."
 msgstr "En enkel insticksmodul som använder ytnef för att avkoda tnef-bilagor."
@@ -18413,6 +19346,29 @@ msgstr "En enkel insticksmodul som använder ytnef för att avkoda tnef-bilagor.
 msgid "TNEF Attachment decoder"
 msgstr "Avkodare för TNEF-bilagor"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "En insticksmodul för att konfigurera Google Kalender."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV-kontakter"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+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
 msgid "Evolution Shell"
 msgstr "Evolutionskalet"
@@ -18430,240 +19386,219 @@ msgid "Evolution Test component"
 msgstr "Evolutiontestkomponent"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "En strängbeskrivning av de aktuella skrivarinställningarna."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
-msgstr "Automatisk detektering av smilisar"
+msgstr "URL för automatisk proxykonfiguration"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Bestämmer huruvida kraschdetekteringen ska köras eller inte."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Standardbredd på sidopanel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Standardfönsterhöjd"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Standardfönstertillstånd"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Standardfönsterbredd"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../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:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Värdnamn för HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Lösenord för HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Port för HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Användarnamn för HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 eller alias för den komponent som ska visas som standard vid uppstart."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "If true, then connections to the proxy server require authentication. The username/password combo is defined by \"/apps/evolution/shell/network_config/authentication_user\" and locally stored password in .gnome2_private/."
+#: ../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:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Senast uppgraderad konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Lista med sökvägar till de mappar som ska synkroniseras till disk vid frånkopplad användning"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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:21
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Konfigurationsläge för proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Värdnamn för SOCKS-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Port för SOCKS-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Värdnamn för säker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Port för säker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sidoraden är synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Hoppa över varningsdialogen för utveckling"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Hoppa över varningsdialogen för återställning"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-#: ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Statusraden är synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../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 "Evolutions konfigurationsversion, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Standardhöjd för huvudfönstret, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Standardbredd för huvudfönstret, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Standardbredd för sidopanelen, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../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 "Den senast uppgraderade konfigurationsversionen för Evolution, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../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:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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:41
+#: ../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:42
+#: ../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:43
+#: ../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 "Stilen på fönsterknapparna. Kan vara \"text\", \"icons\" (ikoner), \"both\" (både och), \"toolbar\" (verktygsrad). Om \"toolbar\" är angivet kommer stilen på knapparna att avgöras utifrån verktygsradsinställningen i GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../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:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Verktygsraden är synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL som tillhandahåller värden för proxykonfiguration."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Använd HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../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:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Huruvida Evolution kommer att starta i frånkopplat läge istället för anslutet läge."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Huruvida kraschdetektering ska genomföras eller inte"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Huruvida fönstret ska vara maximerat eller inte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Huruvida sidoraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Huruvida statusraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Huruvida verktygsraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Huruvida varningsdialogen i utvecklingsversioner av Evolution hoppas över."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Huruvida varningsdialogen i återställningen av Evolution hoppas över."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Huruvida fönsterknapparna ska vara synliga."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Stil på fönsterknappar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Fönsterknapparna är synliga"
 
@@ -18679,11 +19614,11 @@ msgstr "Aktiva anslutningar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klicka OK för att stänga dessa anslutningar och arbeta frånkopplad"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Välj den typ av importör som ska köras:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\n"
 "\n"
@@ -18693,11 +19628,11 @@ msgstr ""
 "\n"
 "Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka reda ut det."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Välj målet för denna import"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18709,79 +19644,59 @@ msgstr ""
 "inställningar som kunde importeras hittades. Om du vill\n"
 "försöka igen bör du klicka på knappen \"Bakåt\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "F_ilnamn:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "Fil_typ:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Importera data och inställningar från _äldre program"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Importera en _enda fil"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Inställningar för Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Inget mappnamn är angivet."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Mappnamnet kan inte innehålla returtecknet."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Mappnamnet kan inte innehålla tecknet \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Mappnamnet kan inte innehålla tecknet \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" och \"..\" är reserverade mappnamn."
-
 #. 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:50
-#: ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 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 "GNOME Pilot-verktygen verkar inte vara installerade på detta system."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug-buddy är inte installerat."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 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:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander\n"
@@ -18794,68 +19709,74 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "tp-sv@listor.tp-sv.se"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolutions webbplats"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Fel vid öppnande av webbplats för frågor och svar."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: ../shell/e-shell-window-commands.c:983
-#: ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr "Evolution är just nu ansluten. Klicka på denna knapp för att arbeta frånkopplad."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution håller på att koppla från."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr "Evolution är just nu frånkopplad. Klicka på denna knapp för att arbeta ansluten."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Växla till %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Okänt systemfel."
 
-#: ../shell/e-shell.c:838
 #: ../shell/e-shell.c:839
+#: ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld kB"
 
-#: ../shell/e-shell.c:1280
-#: ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298
+#: ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
@@ -18865,15 +19786,11 @@ msgstr "Konfigurationsdatabasen hittades inte"
 msgid "New"
 msgstr "Nytt"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nytt 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 "Skapa ett nytt testobjekt"
 
@@ -18916,7 +19833,7 @@ msgstr ""
 "importera externa filer till Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18953,7 +19870,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18961,66 +19878,43 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr "Evolutions kraschdetektering"
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "Ig_norera"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution verkar har avslutats på ett onormalt sätt förra gången.\n"
-"Alla förhandsvisningspaneler kommer av säkerhetsskäl därför att döljas.\n"
-"Du kan återställa förhandsvisningspanelerna från Visa-menyn.\n"
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "Visa _inte detta meddelande igen"
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Starta Evolution och aktivera den angivna komponenten"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga fram ommigrering från Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Inaktivera inläsning av alla insticksmoduler."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Inaktivera förhandsvisningspanelen för e-post, kontakter och uppgifter."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Den personliga informationshanteraren och e-postklienten Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19141,7 +20035,7 @@ msgstr ""
 "\n"
 "Om du väljer att fortsätta har du kanske inte tillgång till en del av dina gamla data.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19152,11 +20046,11 @@ msgstr ""
 "\n"
 "Redigera pålitlighetsinställningar:"
 
-#: ../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 "Eftersom du litar på den certifikatutfärdare som utfärdade detta certifikat litar du också på autenticiteten för detta certifikat, såvida inte annat indikeras här"
 
-#: ../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 unless otherwise indicated here"
 msgstr "Eftersom du inte litar på den certifikatutfärdare som utfärdade detta certifikat litar du inte heller på autenticiteten för detta certifikat, såvida inte annat indikeras här"
 
@@ -19209,11 +20103,16 @@ msgstr "E-postadress"
 msgid "All CA certificate files"
 msgstr "Alla certifikatutfärdarfiler"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certifikatvisare: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Ange lösenordet för \"%s\""
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19224,7 +20123,7 @@ msgid "Enter new password"
 msgstr "Ange nytt lösenord"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19233,7 +20132,7 @@ msgstr ""
 "Utställt till:\n"
 "  Ämne: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19242,7 +20141,7 @@ msgstr ""
 "Utställt av:\n"
 "  Ämne: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Välj certifikat"
 
@@ -19426,7 +20325,7 @@ 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:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certifikatet finns redan"
 
@@ -19640,7 +20539,6 @@ msgid "Contact _Preview"
 msgstr "Förhandsgranskning av _kontakt"
 
 #: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1
 #: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -19668,7 +20566,6 @@ msgid "Create a new addressbook folder"
 msgstr "Skapa en ny adressboksmapp"
 
 #: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5
 #: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
@@ -19712,7 +20609,6 @@ msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
 #: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
@@ -19754,14 +20650,11 @@ 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:2722
+#: ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Markera allt"
 
 #: ../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 "Markera _alla"
 
@@ -19832,7 +20725,7 @@ msgid "_Move Folder Contacts To"
 msgstr "_Flytta mappkontakter till"
 
 #: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nytt"
 
@@ -19894,7 +20787,7 @@ msgstr "MÃ¥nad"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Nästa"
 
@@ -19904,7 +20797,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:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Föregående"
 
@@ -19973,267 +20866,6 @@ msgstr "Arbetsvecka"
 msgid "_Open Appointment"
 msgstr "_Öppna möte"
 
-#: ../ui/evolution-composer-entries.xml.h:2
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopiera markerad text till urklipp"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Kopiera markering till urklipp"
-
-#: ../ui/evolution-composer-entries.xml.h:6
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Klipp ut markerad text till urklipp"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Klipp ut markering till urklipp"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Klistra in från urklipp"
-
-#: ../ui/evolution-composer-entries.xml.h:10
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Klistra in text från urklipp"
-
-#: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Markera all text"
-
-#: ../ui/evolution-editor.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Bifoga"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Klicka här för att bifoga en fil"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klicka här för att stänga aktuellt fönster"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klicka här för att spara aktuellt fönster"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Klicka här för att visa tillgänglig hjälp"
-
-#.
-#. <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 "Stäng"
-
-#: ../ui/evolution-editor.xml.h:10
-#: ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nfoga"
-
-#: ../ui/evolution-editor.xml.h:15
-#: ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Bilaga..."
-
-#: ../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 "S_täng"
-
-#: ../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:42
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../ui/evolution-editor.xml.h:20
-#: ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Alternativ"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Heldagsevenemang"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Hel_dagsevenemang"
-
-#: ../ui/evolution-event-editor.xml.h:4
-#: ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Klassificera som konfidentiell"
-
-#: ../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 "Klassificera som privat"
-
-#: ../ui/evolution-event-editor.xml.h:6
-#: ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Klassificera som publik"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klicka här för att ställa in eller ta bort alarm för detta evenemang"
-
-#: ../ui/evolution-event-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Infoga avancerade sändningsalternativ"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Gör detta till ett återkommande evenemang"
-
-#: ../ui/evolution-event-editor.xml.h:11
-#: ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_blikt"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Fråga efter ledig-/upptageninformation för deltagarna"
-
-#: ../ui/evolution-event-editor.xml.h:13
-#: ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "_Rollfältet"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Alternati_v för sändning"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Visa tid som _upptagen"
-
-#: ../ui/evolution-event-editor.xml.h:18
-#: ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Tids_zon"
-
-#: ../ui/evolution-event-editor.xml.h:19
-#: ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Växlar huruvida deltagartypfältet ska visas"
-
-#: ../ui/evolution-event-editor.xml.h:20
-#: ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Växlar huruvida OSA-fältet ska visas"
-
-#: ../ui/evolution-event-editor.xml.h:21
-#: ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Växlar huruvida rollfältet ska visas"
-
-#: ../ui/evolution-event-editor.xml.h:22
-#: ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Växlar huruvida statusfältet ska visas"
-
-#: ../ui/evolution-event-editor.xml.h:23
-#: ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Växlar huruvida tidszonen ska visas"
-
-#: ../ui/evolution-event-editor.xml.h:24
-#: ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Växlar huruvida kategorier ska visas"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Växlar huruvida heldagsevenemang ska användas"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Växlar huruvida tid ska visas som upptagen"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarm"
-
-#: ../ui/evolution-event-editor.xml.h:28
-#: ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorier"
-
-#: ../ui/evolution-event-editor.xml.h:29
-#: ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Klassifikation"
-
-#: ../ui/evolution-event-editor.xml.h:30
-#: ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Konfidentiellt"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Ledig/Upptagen"
-
-#: ../ui/evolution-event-editor.xml.h:32
-#: ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-# RSVP borde kanske förklaras med en kommentar?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#: ../ui/evolution-event-editor.xml.h:33
-#: ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_OSA"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "Upp_repning"
-
-#: ../ui/evolution-event-editor.xml.h:35
-#: ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Statusfält"
-
-#: ../ui/evolution-event-editor.xml.h:36
-#: ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Typfält"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktuell e-poståtgärd"
@@ -20264,7 +20896,6 @@ msgstr "Töm _papperskorgen"
 
 #: ../ui/evolution-mail-global.xml.h:9
 #: ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Ma_pp"
 
@@ -20482,7 +21113,7 @@ msgid "_Group By Threads"
 msgstr "_Gruppera efter trådar"
 
 #: ../ui/evolution-mail-list.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Meddelande"
@@ -20818,131 +21449,126 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Visa en blinkande markör i meddelandetexten på de visade meddelandena"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Visa meddelanden i normal stil"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Visa meddelanden med alla e-postrubriker"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Visa den råa e-postkällkoden till meddelandet"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Ã…ngra borttagning av de markerade meddelandena"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Ovikti_gt"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Bifogad"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Markörläge"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Ta bort flagga"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Ta bort meddelande"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "S_ök i meddelande..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_Flagga som färdig"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_GÃ¥ till"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Viktigt"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "S_kräp"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "L_äs in bilder"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Me_ddelandekälla"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Nästa meddelande"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normal storlek"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "I_nte skräp"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Öppna i nytt fönster"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Föregående meddelande"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citerad"
 
 # [Status] [är] [Läst]
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Läst"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Spara meddelande..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Ã…ngra borttagning av meddelande"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Oläst"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Zooma in"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Stäng detta fönster"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Stäng"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3
 #: ../ui/evolution.xml.h:18
@@ -20981,291 +21607,6 @@ msgstr "Visa markerat memo"
 msgid "_Open Memo"
 msgstr "_Öppna memo"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Bifoga en fil"
-
-#.
-#. <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 "Stäng aktuell fil"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Ta bort allt utom signatur"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Kryptera detta meddelande med PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mat"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Få en leveranskvitto när ditt meddelande läses"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Infoga sändalternativ"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Öppna en fil"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP-kryptera"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP-signera"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP-_kryptera"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP-_signera"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "Be_gär läskvitto"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME-k_ryptera"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME-kryptera"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME-sig_nera"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME-signera"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "S_kicka"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Spara som"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Spara utkast"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Spara so_m..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Spara ut_kast"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Spara som utkast"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Spara i mapp..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Spara aktuell fil"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Spara aktuell fil med ett annat namn"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Spara meddelandet i angiven mapp"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Skicka"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Skicka brevet i HTML-format"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Skicka detta meddelande"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Ställ in meddelandeprioritet till hög"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Signera detta meddelande med din PGP-nyckel"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Signera detta meddelande med ditt S/MIME-signaturcertifikat"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Växlar huruvida blindkopiefältet ska visas"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Växlar huruvida kopiefältet ska visas"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Växlar huruvida frånväljaren ska visas"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Växlar huruvida svara till-fältet ska visas"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Växlar huruvida svara till-fältet ska visas"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Växlar huruvida kopiefältet ska visas"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Blindkopia-fältet"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Kopia-fältet"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Ta bort alla"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "_Från-fältet"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Öppna..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "_Posta till-fältet"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Prioritera meddelande"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "_Svara till-fältet"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Säkerhet"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Alternativ för _sändning"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "_Till-fältet"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "S_täng"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Spara och stäng"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Spara och s_täng"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Spara den aktuella filen och stäng fönstret"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Lägg till mapp till din lista över prenumererade mappar"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Uppdatera lista"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Uppdatera listan med mappar"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ta bort mapp från din lista över prenumererade mappar"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Avsluta prenumeration"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Omvänd markering"
-
-# Intressant engelska
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Klicka ändra / visa statusdetaljer för uppgiften"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Statusdetaljer"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Tidszon"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Statusdetaljer"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopiera markerade uppgifter"
@@ -21459,51 +21800,55 @@ msgid "View/Hide the Status Bar"
 msgstr "Visa/Dölj statusraden"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Arbeta _frånkopplad"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Om"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "S_täng fönster"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Glöm lös_enord"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Frågor och svar"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Dölj knappar"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Endast _ikoner"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Snabbreferens"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
-msgstr "_Avsluta"
+msgstr "A_vsluta"
 
 # Osäker.
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Utseende för växlaren"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Synkroniseringsalternativ..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Endast _text"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Fönster"
 
@@ -21581,11 +21926,11 @@ msgid "With _Status"
 msgstr "Med _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21602,8 +21947,8 @@ msgid "Select a Time Zone"
 msgstr "Välj en tidszon"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Kombinationsruta för tidszon"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21613,19 +21958,19 @@ msgstr ""
 "Använd vänster musknapp för att zooma in på ett intressant område på kartan och välja en tidszon.\n"
 "Använd höger musknapp för att zooma ut."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Samling"
 
-#: ../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 "Definiera vyer för %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 "Definiera vyer"
 
@@ -21635,17 +21980,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:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instans"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Spara aktuell vy"
 
@@ -21697,11 +22042,11 @@ msgstr "Spara aktuell anpassad vy"
 msgid "Create or edit views"
 msgstr "Skapa eller redigera vyer"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrik"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definiera ny vy"
 
@@ -21717,20 +22062,20 @@ msgstr "Typ av vy"
 msgid "Type of view:"
 msgstr "Typ av vy:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Bilagerad"
 
-#: ../widgets/misc/e-attachment.c:317
-#: ../widgets/misc/e-attachment.c:332
-#: ../widgets/misc/e-attachment.c:533
-#: ../widgets/misc/e-attachment.c:550
+#: ../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:325
-#: ../widgets/misc/e-attachment.c:542
+#: ../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"
@@ -21752,18 +22097,18 @@ msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 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:3642
 #: ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Fyllningsfärg"
 
@@ -21771,18 +22116,18 @@ msgstr "Fyllningsfärg"
 #: ../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:3649
 #: ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3651
 #: ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 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:3664
 #: ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Fyll stöppling"
 
@@ -21808,31 +22153,31 @@ 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:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Minsta bredd"
 
 #: ../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:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Minsta bredd"
 
 #: ../widgets/misc/e-canvas-vbox.c:104
 #: ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Mellanrum"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Nu"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
@@ -21841,183 +22186,184 @@ msgstr "Tiden måste anges i formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentvärdet måste vara mellan 0 och 100"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Centraleuropeisk"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Grekisk"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hebreisk"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Turkisk"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Västeuropeisk"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Västeuropeisk, ny"
 
-#: ../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:88
+#: ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: ../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:91
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Förenklad"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Okänd teckentabell: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Teckenkodning"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Ange teckentabellen att använda"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Annan..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "Tecken_kodning"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Datum och tid"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Textfält för att ange datum"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Klicka på denna knapp för att visa en kalender"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Kombinationsruta för att välja tid"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "N_u"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Idag"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Ogiltigt datumvärde"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Ogiltigt tidsvärde"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Expanderad"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Huruvida expanderaren är expanderad eller inte"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Text på expanderarens etikett"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Använd understrykning"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 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:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Mellanrum att placera mellan etiketten och barnet"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Etikettwidget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 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:223
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221
+#: ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Expanderarstorlek"
 
-#: ../widgets/misc/e-expander.c:224
-#: ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Storlek på expanderarpilen"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indikatormellanrum"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Mellanrum runt expanderarpilen"
 
@@ -22025,7 +22371,7 @@ msgstr "Mellanrum runt expanderarpilen"
 #: ../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:748
+#: ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -22073,18 +22419,27 @@ msgstr "Aktuell mapp"
 msgid "Current Message"
 msgstr "Aktuellt meddelande"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Välj bild"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Världskarta"
 
-#: ../widgets/misc/e-map.c:628
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
+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 karta 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
+msgid "Online"
+msgstr "Ansluten"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkronisera med:"
@@ -22112,64 +22467,64 @@ msgstr "Reflow-modell"
 msgid "Column width"
 msgstr "Kolumnbredd"
 
-#: ../widgets/misc/e-search-bar.c:350
-#: ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Sök"
 
-#: ../widgets/misc/e-search-bar.c:350
-#: ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Klicka här för att ändra söktypen"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Sök nu"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Töm"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:884
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:875
 #: ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1018
+#: ../widgets/misc/e-search-bar.c:1006
 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:1035
+#: ../widgets/misc/e-search-bar.c:1023
 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:1047
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " _i "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Markörrad"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Markörkolumn"
@@ -22186,7 +22541,7 @@ msgstr "Markeringsläge"
 msgid "Cursor Mode"
 msgstr "Markörläge"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "När _borttagen:"
 
@@ -22210,10 +22565,6 @@ msgstr "<b>Statusspårning</b>"
 msgid "A_uto-delete sent item"
 msgstr "Ta a_utomatiskt bort skickat objekt"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klassifikation"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Ska_pa ett skickatobjekt för att spåra information"
@@ -22321,19 +22672,19 @@ 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:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Klicka här för att gå till url"
 
@@ -22373,23 +22724,23 @@ msgstr "Fokuserad kolumn"
 msgid "Unselected Column"
 msgstr "Omarkerad kolumn"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Genomstryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Understryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Gör kolumn fet"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Färglägg kolumn"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Bakgrundsfärga kolumn"
 
@@ -22429,7 +22780,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:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Stigande"
 
@@ -22442,7 +22793,7 @@ msgid "Clear _All"
 msgstr "Töm _alla"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Fallande"
 
@@ -22505,14 +22856,14 @@ 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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Fullständiga rubriker"
 
@@ -22546,336 +22897,555 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d objekt)"
 msgstr[1] "%s (%d objekt)"
 
-#: ../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:3029
-#: ../widgets/table/e-table-item.c:3030
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "Färger för alternerande rader"
 
-#: ../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:3036
-#: ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309
-#: ../widgets/table/e-tree.c:3310
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "Rutnät för horisontell ritning"
 
-#: ../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:3043
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315
-#: ../widgets/table/e-tree.c:3316
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "Rutnät för vertikal ritning"
 
-#: ../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:3050
-#: ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321
-#: ../widgets/table/e-tree.c:3322
+#: ../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
 msgid "Draw focus"
 msgstr "Rita 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:3057
-#: ../widgets/table/e-table-item.c:3058
+#: ../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
 msgid "Cursor mode"
 msgstr "Markörläge"
 
-#: ../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:3022
-#: ../widgets/table/e-table-item.c:3023
+#: ../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
 msgid "Selection model"
 msgstr "Markeringsmodell"
 
-#: ../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:3064
-#: ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307
-#: ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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
 msgid "Length Threshold"
 msgstr "Längdtröskelvärde"
 
-#: ../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:3098
-#: ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314
-#: ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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
 msgid "Uniform row height"
 msgstr "Identisk radhöjd"
 
-#: ../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: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"
 msgstr "Fryst"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Anpassa aktuell vy"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Sortera _stigande"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Sortera _fallande"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Osortera"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Gruppera efter detta _fält"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Gruppera efter _låda"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Ta bort denna _kolumn"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Lägg till en _kolumn..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "J_ustering"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "Bästa _passning"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Formatera kolum_ner..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "A_npassa aktuell vy..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Sortera efter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "A_npassad"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Typsnittsbeskrivning"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Sorteringsinformation"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../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:3008
-#: ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabellhuvud"
 
-#: ../widgets/table/e-table-item.c:3015
-#: ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Tabellmodell"
 
-#: ../widgets/table/e-table-item.c:3091
-#: ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094
+#: ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Markörrad"
 
-#: ../widgets/table/e-table.c:3321
-#: ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Sök alltid"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Använd klick för att lägga till"
 
-#: ../widgets/table/e-tree.c:3328
-#: ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree-tabelladapter"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retroutseende"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Rita linjer och +/--expanderare."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Inmatningsmetoder"
 
-#: ../widgets/text/e-text.c:3557
 #: ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Händelsebehandlare"
 
-#: ../widgets/text/e-text.c:3571
 #: ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Fet"
 
-#: ../widgets/text/e-text.c:3578
 #: ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Genomstruken"
 
-#: ../widgets/text/e-text.c:3585
 #: ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ankare"
 
-#: ../widgets/text/e-text.c:3593
 #: ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Justering"
 
-#: ../widgets/text/e-text.c:3600
 #: ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Klippbredd"
 
-#: ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Klipphöjd"
 
-#: ../widgets/text/e-text.c:3614
 #: ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Klipp"
 
-#: ../widgets/text/e-text.c:3621
 #: ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Fyll klipprektangel"
 
-#: ../widgets/text/e-text.c:3628
 #: ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X-avstånd"
 
-#: ../widgets/text/e-text.c:3635
 #: ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y-avstånd"
 
-#: ../widgets/text/e-text.c:3671
 #: ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Textbredd"
 
-#: ../widgets/text/e-text.c:3678
 #: ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Texthöjd"
 
-#: ../widgets/text/e-text.c:3693
 #: ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Använd ellips"
 
-#: ../widgets/text/e-text.c:3700
 #: ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Ellips"
 
-#: ../widgets/text/e-text.c:3707
 #: ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Radbrytning"
 
-#: ../widgets/text/e-text.c:3714
 #: ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Brytningstecken"
 
-#: ../widgets/text/e-text.c:3721
 #: ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Max rader"
 
-#: ../widgets/text/e-text.c:3743
 #: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Rita ramar"
 
-#: ../widgets/text/e-text.c:3750
 #: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Tillåt nyrader"
 
-#: ../widgets/text/e-text.c:3757
 #: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Rita bakgrund"
 
-#: ../widgets/text/e-text.c:3764
 #: ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Rita knapp"
 
-#: ../widgets/text/e-text.c:3771
 #: ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Markörposition"
 
-#: ../widgets/text/e-text.c:3778
 #: ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM-sammanhang"
 
-#: ../widgets/text/e-text.c:3785
+# Skum. Kolla denna
 #: ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
-msgstr "Handtagspopupfönster"
+msgstr "Hantera popupfönster"
+
+#~ msgid "Updating query"
+#~ msgstr "Uppdaterar fråga"
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Kommande möten"
+#~ msgid "Username:"
+#~ msgstr "Användarnamn:"
+#~ msgid "Update every"
+#~ msgstr "Uppdatera var"
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Bestämmer huruvida kraschdetekteringen ska köras eller inte."
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Hoppa över varningsdialogen för återställning"
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Huruvida kraschdetektering ska genomföras eller inte"
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Huruvida varningsdialogen i återställningen av Evolution hoppas över."
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolutions kraschdetektering"
+#~ msgid "Ig_nore"
+#~ msgstr "Ig_norera"
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution verkar har avslutats på ett onormalt sätt förra gången.\n"
+#~ "Alla förhandsvisningspaneler kommer av säkerhetsskäl därför att döljas.\n"
+#~ "Du kan återställa förhandsvisningspanelerna från Visa-menyn.\n"
+#~ msgid "_Do not show this message again"
+#~ msgstr "Visa _inte detta meddelande igen"
+#~ msgid "Migrating `%s':"
+#~ msgstr "Migrerar \"%s\""
+#~ msgid "_Properties..."
+#~ msgstr "_Egenskaper..."
+#~ msgid "_Appointment"
+#~ msgstr "_Möte"
+#~ msgid "M_eeting"
+#~ msgstr "_Sammanträde"
+#~ msgid "All Day A_ppointment"
+#~ msgstr "Hel_dagsmöte"
+#~ msgid "Cale_ndar"
+#~ msgstr "Kale_nder"
+#~ msgid "D_escription:"
+#~ msgstr "B_eskrivning:"
+#~ msgid "De_scription:"
+#~ msgstr "Be_skrivning:"
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr ""
+#~ "Markera alla meddelanden i den här mappen och undermappar som lästa?"
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Vill du att åtgärden även ska utföras i undermapparna?"
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "Markera alla meddelanden som lästa"
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Visa meddelanden i normal stil"
+#~ msgid "_Contact"
+#~ msgstr "_Kontakt"
+#~ msgid "Contact _List"
+#~ msgstr "Kontakt_lista"
+#~ msgid "Address _Book"
+#~ msgstr "Adress_bok"
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "\"{0}\" är en skrivskyddad kalenderkälla. Byt till en kalender som kan ta "
+#~ "emot möten."
+#~ msgid "Mem_o"
+#~ msgstr "Mem_o"
+#~ msgid "_Shared memo"
+#~ msgstr "_Delat memo"
+#~ msgid "Memo li_st"
+#~ msgstr "Memoli_sta"
+#~ msgid "Assigne_d Task"
+#~ msgstr "Tilldela_d uppgift"
+#~ msgid "Tas_k list"
+#~ msgstr "Uppgif_tslista"
+#~ msgid "_Save Message"
+#~ msgstr "_Spara meddelande"
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+#~ msgid "_Mail Message"
+#~ msgstr "_E-postmeddelande"
+#~ msgid "Mail _Folder"
+#~ msgstr "E-post_mapp"
 
+#, fuzzy
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr ""
+#~ "Du har inte tillräckliga rättigheter för att ta bort den här posten. "
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "En insticksmodul som hanterar uppstartsguiden."
+#~ msgid "Startup wizard"
+#~ msgstr "Uppstartsguide"
+#~ msgid "_Test"
+#~ msgstr "_Test"
+#~ msgid "All Day Event"
+#~ msgstr "Heldagsevenemang"
+#~ msgid "Send _Options"
+#~ msgstr "Alternati_v för sändning"
+#~ msgid "Status Details"
+#~ msgstr "Statusdetaljer"
+#~ msgid "Time Zone"
+#~ msgstr "Tidszon"
+#~ msgid "Unknown reason"
+#~ msgstr "Okänd anledning"
+#~ msgid "Open File"
+#~ msgstr "Öppna fil"
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Kan inte öppna filen &quot;{0}&quot;."
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Ange ett namn för denna signatur."
+#~ msgid "Name:"
+#~ msgstr "Namn:"
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Är du säker på att du vill ta bort alla borttagna meddelanden i mappen "
+#~ "&quot;{0}&quot;?"
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "Ta bort &quot;{0}&quot;?"
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "Ta bort meddelanden i sökmappen &quot;{0}&quot;?"
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Endast i a_ktuell mapp"
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Aktivera insticksmodul för bilagepåminnare"
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Aktivera insticksmodul för bilagepåminnare."
+#~ msgid "Remind _missing attachments"
+#~ msgstr "PÃ¥minn om _saknade bilagor"
+#~ msgid "_Refresh:"
+#~ msgstr "_Uppdatera:"
+#~ msgid "All instances"
+#~ msgstr "Alla instanser"
+#~ msgid "This instance"
+#~ msgstr "Denna instans"
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Det finns inga konfigurationsalternativ för denna insticksmodul."
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "Ger en möjlighet att skriva ut från redigeraren."
+#~ msgid "Print Message"
+#~ msgstr "Skriv ut meddelande"
+#~ msgid "Prints the message"
+#~ msgstr "Skriver ut meddelandet"
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "En strängbeskrivning av de aktuella skrivarinställningarna."
+#~ msgid "No folder name specified."
+#~ msgstr "Inget mappnamn är angivet."
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Mappnamnet kan inte innehålla returtecknet."
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Mappnamnet kan inte innehålla tecknet \"/\"."
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Mappnamnet kan inte innehålla tecknet \"#\"."
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "\".\" och \"..\" är reserverade mappnamn."
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Kopiera markering till urklipp"
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Klipp ut markering till urklipp"
+#~ msgid "Paste from clipboard"
+#~ msgstr "Klistra in från urklipp"
+#~ msgid "Delete all but signature"
+#~ msgstr "Ta bort allt utom signatur"
+#~ msgid "For_mat"
+#~ msgstr "For_mat"
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+#~ msgid "Open a file"
+#~ msgstr "Öppna en fil"
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP-kryptera"
+#~ msgid "PGP Sign"
+#~ msgstr "PGP-signera"
+#~ msgid "S/MIME Encrypt"
+#~ 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"
+#~ msgstr "Spara meddelandet i angiven mapp"
+#~ msgid "Send"
+#~ msgstr "Skicka"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Skicka brevet i HTML-format"
+#~ msgid "_Delete all"
+#~ msgstr "_Ta bort alla"
+#~ msgid "_Open..."
+#~ msgstr "_Öppna..."
+#~ msgid "C_lose"
+#~ msgstr "S_täng"
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+#~ msgid "Save and _Close"
+#~ msgstr "Spara och s_täng"
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Spara den aktuella filen och stäng fönstret"
+#~ msgid "Refresh List"
+#~ msgstr "Uppdatera lista"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Uppdatera listan med mappar"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Ta bort mapp från din lista över prenumererade mappar"
+#~ msgid "Subscribe"
+#~ msgstr "Prenumerera"
+#~ msgid "Unsubscribe"
+#~ msgstr "Avsluta prenumeration"
+#~ msgid "_Invert Selection"
+#~ msgstr "_Omvänd markering"
+#~ msgid "TimeZone Combobox"
+#~ msgstr "Kombinationsruta för tidszon"
 #~ msgid "Permission Denied."
 #~ msgstr "Ã…tkomst nekas."
 #~ msgid "<b>Display</b>"
@@ -22971,8 +23541,6 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Or_ganisatör:"
 #~ msgid "System error: %s"
 #~ msgstr "Systemfel: %s"
-#~ msgid "Camel error: %s"
-#~ msgstr "Camel-fel: %s"
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Kontot kan inte skicka e-post"
 #~ msgid "No store available"
@@ -22985,8 +23553,6 @@ msgstr "Handtagspopupfönster"
 #~ "av e-postdata."
 #~ msgid "Mail Remote"
 #~ msgstr "Fjärrpost"
-#~ msgid "_Phone List"
-#~ msgstr "_Telefonlista"
 #~ msgid "Emulate label resize"
 #~ msgstr "Emulera storleksändring av etikett"
 #~ msgid "Task sort"
diff --git a/po/ta.po b/po/ta.po
index 65a6a5ed03..0580b66572 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,21 +1,22 @@
-# translation of evolution.HEAD.po to TAMIL
+# translation of evolution.HEAD.ta.po to
 # translation of evo-ta.po to
 # translation of ta.po to
 # translation of evolution.HEAD.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
+#: ../shell/main.c:589
 # Jayaradha N <jaya@pune.redhat.com>, 2004.
 # Felix <ifelix@redhat.com>, 2006.
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: evolution.HEAD.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-28 03:21+0100\n"
-"PO-Revision-Date: 2007-08-28 15:43+0530\n"
-"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
+"POT-Creation-Date: 2008-09-02 03:25+0000\n"
+"PO-Revision-Date: 2008-09-08 15:42+0530\n"
+"Last-Translator: \n"
+"Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,21 +26,21 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "எவல�யூஷன� ம�கவரி ப�த�தகம�"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "ப�திய தொடர�ப�"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "ப�திய தொடர�ப� பட�டியல�"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -47,7 +48,6 @@ msgstr[0] "நடப�ப� ம�கவரி ப�த�தக அடைவ
 msgstr[1] "நடப�ப� ம�கவரி ப�த�தக அடைவ� %s %d அட�டைகளை கொண�ட�ள�ளத�"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "திற"
 
@@ -88,7 +88,7 @@ msgstr "நாளà¯�காடà¯�டி நிகழà¯�வà¯�: இதிலà¯� à®
 msgid "calendar view event"
 msgstr "நாள�காட�டி பார�வை நிகழ�வ�"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "ம�ன�னிலையை பற�ற�க"
 
@@ -112,7 +112,7 @@ msgstr "இன�றைய தேதிக�க� செல�லவ�ம�"
 msgid "Go to Date"
 msgstr "தேதிக�க� செல�லவ�ம�"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-day-view-main-item.c:301
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "ஒர� அட�டவணையை பார�வையிட� மற�ற�ம� நடப�ப� நேர வரையறையை தேர�ந�தெட�"
@@ -156,8 +156,8 @@ msgstr "ஒர� வேலை வாரத�திற�கான நாள�
 msgid "calendar view for one or more days"
 msgstr "ஒன�ற� அல�லத� அதற�க� மேற�பட�ட நாட�களின� நாள�காட�டி பார�வை"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:740
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 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:743
-#: ../calendar/gui/e-day-view-top-item.c:1340
-#: ../calendar/gui/e-day-view.c:2115
-#: ../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: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
 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:745
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:764
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:777
-#: ../calendar/gui/calendar-component.c:779
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -201,34 +199,32 @@ 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:769
-#: ../calendar/gui/e-day-view-top-item.c:1344
-#: ../calendar/gui/e-day-view.c:2131
-#: ../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: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
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
-#: ../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:766
 msgid "Gnome Calendar"
 msgstr "க�னோம� நாள�காட�டி"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "தேட� பட�டை"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "எவல�யூஷன� நாள�காட�டி தேட� பட�டை"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "தாவ� பொத�தான�"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "பல நிகழ�வ�களை காண, இங�க� சொட�க�கவ�ம�."
 
@@ -276,19 +272,19 @@ msgstr "மாற�ற�"
 msgid "toggle the cell"
 msgstr "அறைகள�க�கிடையே மாற�ற�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "விரிவ�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "இந�த அறை உள�ள வரியை ஈடிரீயில� விரிவாக�க�கிறத�."
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "க�ற�க�க�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "இந�த அறை உள�ள வரியை ஈடிரீயில� க�ற�க�க�கிறத�."
 
@@ -298,7 +294,7 @@ msgstr "அட�டவணை அறை"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:571
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "சேர�க�க சொட�க�கவ�ம�"
 
@@ -306,7 +302,7 @@ msgstr "சேர�க�க சொட�க�கவ�ம�"
 msgid "click"
 msgstr "சொட�க�க�"
 
-#: ../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 "வரிசைப�பட�த�த�"
 
@@ -324,15 +320,15 @@ msgstr "நாள�காட�டி: %sலிர�ந�த� %sவரை"
 msgid "evolution calendar item"
 msgstr "எவல�யூஷன� நாள�காட�டி உர�ப�படி"
 
-#: ../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 "ம�ன�னிர�ப�பாக செயல�பட�த�த�"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "மேல�மீட�ப� பட�டி"
 
@@ -344,7 +340,14 @@ msgstr "மாற�ற� இணைப�ப� பட�டை"
 msgid "activate"
 msgstr "செயல�பட�த�த�"
 
-#: ../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 "'{0}' என�பத� படிக�கமட�ட�மேயான ம�கவரி ப�த�தகம�. அதை மாற�ற ம�டியாத�. தயை செய�த� வேறொர� ம�கவரி ப�த�தகத�தை தொடர�ப�கள� பார�வையில�  பக�க பலகத�தில� இர�ந�த� தேர�ந�தெட�க�கவ�ம�."
+
+#: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -352,19 +355,23 @@ msgstr ""
 "இந�த ம�கவரிக�க� ஒர� தொடர�ப� �ற�கனவே உள�ளத�. நீங�கள� அதே ம�கவரியை கொண�ட ஒர� ப�திய "
 "அட�டையை சேர�க�க வேண�ட�மா?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "ம�கவரி '{0}' �ற�கனவே உள�ளத�."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "ப�திய தொடர�ப�களை சேர�க�க இயலாத�"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "தொடர�பை நகர�த�த ம�டியவில�லை."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "வகை தொக�ப�பி உபயோகத�தில� இல�லை"
 
-#: ../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; "
@@ -373,75 +380,71 @@ msgstr ""
 "உங�கள� கடவ�ச�சொல�லில� பிழை உள�ளதா மற�ற�ம� சான�றளித�தல� ம�றையை பயன�பட�த�த�கிறீர�களா என "
 "சோதிக�கவ�ம�. உங�கள� கேப�லாக� விசை செயலில� உள�ளதா எனப�பார�க�கவ�ம�"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "எல�டி�பி(LDAP) சேவகனால� மாதிரி தகவலை பெற ம�டியவில�லை"
 
-#: ../addressbook/addressbook.error.xml.h:7
-msgid "Could not remove addressbook."
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove address book."
 msgstr "ம�கவரி ப�த�தகத�தை நீக�க ம�டியவில�லை"
 
-#: ../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 "ம�கவரி ப�த�தகத�தை அழிக�கவ�ம� '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
-msgid "Error loading addressbook."
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading address book."
 msgstr "ம�கவரி ப�த�தகத�தை �ற�ற�ம� போத� பிழை"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "சேமிப�பில� பிழை {0} to {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "எல�டி�பி(LDAP) சேவகனில� சான�ற� சரிபார�த�தல� தோல�வியில� ம�டிந�தத�"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "தொடர�பினை அழிக�க ம�டியவில�லை"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "க�ழ� வாரியாக ம�கவரி ப�த�தகம� உர�வாக�கம�:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "எல�டி�பி(LDAP) சேவகன� சரியான மாதிரி தகவல�க�க� பதில� தராமல� உள�ளத�."
 
-#: ../addressbook/addressbook.error.xml.h:16
-msgid "Permission Denied."
-msgstr "அன�மதி மற�க�கப�பட�டத�."
-
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Server Version"
 msgstr "சேவையகப பதிப�ப�"
 
-#: ../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 "எவல�யூஷன� ம�கவரிப�ப�த�தகம� எதிர�பாராதவிதமாகவெளியேறியத�. "
 
-#: ../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 "
@@ -451,55 +454,55 @@ msgstr ""
 "செயல�பாட�டிற�கான ஆதரவ� இதில� இல�லை அல�லத� வடிவமைத�தலில� பிழை நேர�ந�திர�க�கலாம�. "
 "தேட�வதற�க� உங�கள� கணினி நிர�வாகியை அண�கவ�ம�."
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "This address book will be removed permanently."
-msgstr "இந�த ம�கவரிப�ப�த�தகம� நிரந�தரமாக நீக�கப�பட�ம�."
-
-#: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook could not be opened."
-msgstr "இந�த ம�கவரிப�ப�த�தகத�தை திறக�க ம�டியாத�"
-
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "சேவகன�க�கான தேடல� அடித�தளம� எத�வ�ம� இல�லை"
+msgid "This address book could not be opened."
+msgstr "இந�த ம�கவரிப�ப�த�தகத�தை திறக�க ம�டியாத�"
 
 #: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
+msgstr "இந�த ம�கவரி ப�த�தக சேவகன�க�காக பரிந�த�ரைத�த தேடல� அடித�தளம� எத�வ�ம� இல�லை"
+
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "இந�த ம�கவரிப�ப�த�தக சேவையகத�தை அண�க ம�டியவில�லை அல�லத� சேவையக பெயரில� பிழை உள�ளத� "
 "அல�லத� பிணைய இணைப�பில� சிக�கல� உள�ளத�."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "இந�த ம�கவரிப�ப�த�தகம� நிரந�தரமாக நீக�கப�பட�ம�."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "இந�த சேவகன� எல�டி�பி(LDAP)v3 மாதிரி தகவலை ஆதரிக�காத�"
 
-#: ../addressbook/addressbook.error.xml.h:27
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "ம�கவரி ப�த�தகத�தை திறக�க ம�டியவில�லை"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "தேட ம�டியவில�லை"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0}� சேமிக�க ம�டியவில�லை."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "மாற�றங�களை சேமிக�க விர�ப�பமா?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "நீங�கள� தொடர�ப�களை ஒர� ம�கவரிப�ப�த�தகத�திலிர�ந�த� மற�றதற�க� மாற�ற ம�னைந�த�ள�ளீர� ஆனால� மூல "
 "ஆவணத�தை நீக�க ம�டியாத�. இதன� நகலை சேமிக�க விர�ப�பமா?"
 
-#: ../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 "
@@ -508,61 +511,65 @@ msgstr ""
 "ஆதரவில�லாத க�ரூப�வைஸ� சேவயகத�த�க�க� நீங�கள� இணைகிறீர�கள�. எவல�ஷன� பயன�பட�த�த�வதில� சில "
 "பிரச�சினைகள� நேரலாம�. நல�லபடி நடக�க சேவையகத�தை ஆதரவ�ள�ள பதிப�ப�க�க� மேம�பட�த�தவ�ம�. "
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "நீங�கள� இந�த தொடர�ப�களை நீக�க தேவையான அன�மதி இல�லை."
+
+#: ../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 "எவல�யூஷனை மீண�ட�ம� த�வக�காதவரை {0} க�கான தொடர�ப� கிடைக�க வாய�ப�ப� இல�லை"
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
 #: ../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 "_ச சேர�"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_ந நீக�க�"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "_க சேமிக�காதே"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "_அளவ� மாற�ற�"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
-msgstr "இர�ப�பத� போலவே பயன�பட�த�த�க"
+msgstr "(_U) இர�ப�பத� போலவே பயன�பட�த�த�க"
 
-#. 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:299
 msgid "Default Sync Address:"
 msgstr "இயல�பான ஒத�திசைந�த ம�கவரி:"
 
-#: ../addressbook/conduit/address-conduit.c:1315
-#: ../addressbook/conduit/address-conduit.c:1316
-msgid "Could not load addressbook"
-msgstr "ம�கவரிப�த�தகத�தை �ற�ற ம�டியவில�லை"
+#: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
+msgstr "ம�கவரி ப�த�தகத�தை �ற�ற ம�டியவில�லை"
 
-#: ../addressbook/conduit/address-conduit.c:1393
-#: ../addressbook/conduit/address-conduit.c:1396
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "பைலட� ம�கவரி பயன�பாட�ட� பக�தியை படிக�க ம�டியவில�லை"
 
@@ -572,7 +579,7 @@ msgstr "தானியங�கிம�டிவ�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
-msgstr "_த தொடர�ப�கள�"
+msgstr "(_o) தொடர�ப�கள�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
@@ -584,10 +591,10 @@ msgstr "தானாக சரிபார�தல� பக�தியை இ
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../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:1326
+#: ../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
 msgid "Contacts"
 msgstr "தொடர�ப�கள�"
 
@@ -596,7 +603,7 @@ msgid "Evolution Address Book"
 msgstr "எவல�யூஷன� ம�கவரி ப�த�தகம�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "எவல�யூஷன� ம�கவரி ப�த�தக மேல�மீட�ப�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -612,8 +619,8 @@ msgid "Evolution Address Book component"
 msgstr "எவல�யூஷன� ம�கவரி ப�த�தக கூற�கள�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "எவல�யூஷன� S/மைம� சான�றிதழ� நிர�வாகியை கட�ட�ப�பட�த�தி"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "எவல�யூஷன� எஸ�/மைம� சான�றிதழ� நிர�வாக கட�ட�ப�பட�த�தி"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -626,13 +633,14 @@ msgstr "இங�கே உங�கள� S/MIME சான�றிதழ�க
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c: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:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
 msgid "On This Computer"
 msgstr "இந�த கணிப�பொறியில�"
 
@@ -642,135 +650,138 @@ msgstr "இந�த கணிப�பொறியில�"
 #. 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:122
-#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../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
+#: ../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 "தனிப�பட�ட"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "எல�டி�பி(LDAP) சேவகனில�"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+# msgctxt "New"
 msgid "_Contact"
-msgstr "_த தொடர�ப�கள�"
+msgstr "_C தொடர�ப�கள�"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "ப�திய தொடர�ப�களை உர�வாக�க�"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+# msgctxt "New"
 msgid "Contact _List"
-msgstr "ம�கவரி _பட�டியல�"
+msgstr "ம�கவரி பட�டியல�(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "ப�திய தொடர�ப� பட�டியலை உர�வாக�க�"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1209
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "ப�திய ம�கவரிப�ப�த�தகம�"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+# msgctxt "New"
 msgid "Address _Book"
-msgstr "_ப ம�கவரி ப�த�தகம�"
+msgstr "_B ம�கவரி ப�த�தகம�"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "ப�திய ம�கவரி ப�த�தகத�தை உர�வாக�க�"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "ம�கவரிப�ப�த�தக அமைவ�கள� மற�ற�ம� அடைவ�களை மேம�பட�த�த ம�டியவில�லை"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "அடிப�படை"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_வகை:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "இணைப�பில� இல�லாமல� பணிப�ரிய ப�த�தக உள�ளடக�கங�களை நிலைவட�டில� நகலெட� "
+#: ../addressbook/gui/component/addressbook-config.c:619
+msgid "Copy _book content locally for offline operation"
+msgstr "(_b) இணைப�பில� இல�லாமல� பணிப�ரிய ப�த�தக உள�ளடக�கங�களை நிலைவட�டில� நகலெட� "
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:2238
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "பொத�"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:565
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "ம�கவரி ப�த�தகம�"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "சேவையக தகவல�"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "அங�கீகாரம�"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "விவரம�"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:865
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "தேட�கிறத�"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "பதிவிறக�க�கிறத�"
 
-#: ../addressbook/gui/component/addressbook-config.c:1207
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "ம�கவரி ப�த�தகத�தின� பண�ப�கள�"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "இடம�பெயர�கிறத�..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "இடம�பெயர�கிறத� `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "எல�டி�பி(LDAP) சேவகன�களில�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "தானியங�கி ம�டிக�க�ம� அமைப�ப�கள�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -782,7 +793,7 @@ msgstr ""
 "\n"
 "எவல�யூஷன� உங�கள� அடைவ�களை இடம� பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -792,7 +803,7 @@ msgstr ""
 "\n"
 "எவல�யூஷன� உங�கள� அடைவை இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -802,7 +813,7 @@ msgstr ""
 "\n"
 "எவல�யூஷன� உங�கள� அடைவை இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -813,69 +824,79 @@ msgstr ""
 "\n"
 "எவல�யூஷன� உங�கள� கையடக�க கணினி தகவல� ஒத�திசைதல� இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:504
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" அடைவை இப�படி மற�பெயரிட�:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:506
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "அடைவிற�க� மற�பெயரிட�"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:512
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "அடைவ� பெயர� '/'� கொண�டிர�க�கக�கூடாத�"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_ப ப�திய ம�கவரிப�ப�த�தகம�"
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:981
-#: ../calendar/gui/calendar-component.c:604
-#: ../calendar/gui/e-calendar-table.c:1375
-#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:992
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2127 ../mail/em-folder-view.c:1233
+#: ../addressbook/gui/component/addressbook-view.c:943
+msgid "Save As vCard..."
+msgstr "விகார�ட� ஆக சேமிக�கவ�ம�..."
+
+#: ../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
+#: ../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 "_ந நீக�க�"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "VCard ஆக சேமிக�கவ�ம�..."
-
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:605
-#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
-msgid "_Properties..."
-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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "(_P)பண�ப�கள�"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "மூல தேர�வாளரை தொடர�ப� கொள�ளவ�ம�"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "எல�டி�பி(LDAP) சேவகனை யார�வேண�ட�மால�ம� அண�க ம�டிகிறத�"
 
-#: ../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:536
 msgid "Failed to authenticate.\n"
 msgstr "உற�திப�பட�த�த ம�டியவில�லை.\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:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr " %s க�க� கடவ�ச�சொல�லை உள�ளிடவ�ம� (பயனர� %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
+msgid "Enter password"
+msgstr "கடவ�ச�சொல�லை உள�ளிட�"
+
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "தானாக ம�டித�தல� நீளம�"
@@ -948,38 +969,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>உற�திப�பட�த�த�</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>காட�ட�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>தரவிறக�க�கிறத�</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>தேட�கிறத�</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>சேவகனின� தகவல�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>வகை:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "ம�கவரி ப�த�தகத�தை சேர�"
 
-#: ../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:761
 msgid "Always"
 msgstr "எப�போத�ம�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "பெயரில�லாத"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "(_r) வரையரை வர�ம� வரை இந�த ப�த�தகத�தை பார�வையிட�"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "அடிப�படை"
@@ -1005,14 +1023,14 @@ msgid "Lo_gin:"
 msgstr "_உள�ந�ழை:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "எப�போத�மில�லை"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "க�றியாக�கம� இல�லை"
 
@@ -1024,7 +1042,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL க�றியாக�கம�"
 
@@ -1081,7 +1099,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
-msgstr "உபா"
+msgstr "த�ணை"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
@@ -1091,7 +1109,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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS க�றியாக�கம�றை"
 
@@ -1183,8 +1201,9 @@ msgid "_Login method:"
 msgstr "உள� ந�ழைய�ம� ம�றை: (_L)"
 
 #: ../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:226
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "(_N)பெயர�:"
@@ -1198,7 +1217,7 @@ msgid "_Search scope:"
 msgstr "(_S)தேடல� எல�லை:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "(_S)சேவகன�:"
@@ -1219,9 +1238,10 @@ msgstr "அட�டைகள�"
 #: ../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:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "நிமிடங�கள�"
 
@@ -1262,99 +1282,99 @@ msgid "<b>Work</b>"
 msgstr "<b>வேலை</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../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:274
-#: ../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 "(_t)வகைகள�..."
+
+#: ../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
 msgid "Contact"
 msgstr "தொடர�ப�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../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
 msgid "Contact Editor"
 msgstr "தொடர�ப� தொக�ப�பி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "ம�ழ� பெயர�(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "உர�"
 
-#: ../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:58
 msgid "MSN Messenger"
 msgstr "MSN செய�தி அன�ப�பி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "அன�ப�பவேண�டிய ம�கவரி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "ப�னைப�பெயர�(_c):"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+msgid "Nic_kname:"
+msgstr "ப�னைப�பெயர�(_k):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "பழைமையான க�ழ�வாரியாக"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "சொந�த தகவல�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "தொலைபேசி"
 
 #. 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:203
+#: ../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/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:158
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "வேலை"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "(_A)ம�கவரி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "ஆண�ட� விழா: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "உதவியாளர�: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "பிறந�தநாள�:(_B)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:908
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1833
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "நாள�காட�டி:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "வகைகள�...(_C)"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "நகரம�: (_C)"
@@ -1431,7 +1451,7 @@ msgid "_Web Log:"
 msgstr "இணைய பதிவ�: (_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "(_W) எங�கே:"
 
@@ -1439,1105 +1459,1108 @@ msgstr "(_W) எங�கே:"
 msgid "_Zip/Postal Code:"
 msgstr "அஞ�சல� க�றியீட�: (_Z)"
 
-#: ../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:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "ம�கவரி"
 
-#: ../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:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../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:397
+#: ../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:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../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:1831 ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3681
-#: ../widgets/text/e-text.c:3682
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "தொக�க�கக�கூடிய"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "அமெரிக �க�கிய நாட�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "ஆப�கானிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "அல�பேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "அல�ஜீரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "அமெரிக�கன� சமோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "அன�டோரா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "அங�கோலா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "அங�க�ல�லா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "அண�டார�ட�டிக�கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "ஆன�டிக�க�வா மற�ற�ம� பார�ப�டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "அர�ஜென�டினா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "அர�மெனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "அர�பா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "ஆஸ�திரேலியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "ஆஸ�திரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "அசர�பஜான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "பஹாமா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "பஹ�ரெயின�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "பங�ளாதேஷ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "பார�படாஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "பெலார�ஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "பெல�ஜியம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "பெலிஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "பெனின�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "பெர�ம�டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "பூட�டான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "பொலிவியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "போஸ�னியா மற�ற�ம� ஹர�சேகோவினா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "போஸ�வானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "போவெட� தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "ப�ரேசில�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "ப�ரிடீஸ� இந�திய பெர�ங�கடல� பிரதேசம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "ப�ரூனே தர�சலம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "பல�கேரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "ப�ர�கினா பாசோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "ப�ர�ன�டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "கம�போடியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "கேமரூன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "கனடா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "கேப� வெர�டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "சைமன� தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "மத�திய ஆப�ரிக�க க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "சாட�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "சிலி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "சீனா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "கிறிஸ�த�மஸ� தீவ�தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "கோகோஸ�(கீலிங�) தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "கொலம�பியா�பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "கோமொரொஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "காங�கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "காங�கோ க�டியரசின�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "க�க� தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "கோஸ�டா ரிக�கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "கோட� டில�வொரி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "கொரிட�டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "க�யூபா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "சைப�ரஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "செக� க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "டென�மார�க�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "டிஜ�பொட�டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "டொம�னிக�கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "சொமினிக� க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "ஈக�வடார�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "எகிப�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "எல� சால�வடார�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "ஈக�வடோசியல� கினியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "எரிட�ரிய"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "எஸ�தோனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "எதியோப�பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "ஃபிளாங�லான� தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "ஃபோரி தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "பிஜி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "பின�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "ஃப�ரான�ஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "ஃப�ரெஞ�ச� கையானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "ஃப�ரெஞ�ச� பாலினேசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "ஃப�ரெஞ�ச� தெற�க� பிரதேசம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "கபான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "ஜாம�பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "ஜியார�ஜியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "ஜெர�மனி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "கானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "கிப�ரால�டர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "க�ரீஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "க�ரீன�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "க�ரெனடா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "க�வாடிலோப�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "க�கம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "க�வாதிமாலா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "க�ரென�சி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "கினியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Guinea-Bissau"
 msgstr "கினியா-பிசாய�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "கயானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "ஹைடி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "ஹார�ட� மற�ற�ம� மெக�டொனால� தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "ஹோலி சீ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "ஹோன�ட�ராஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "ஹாங�காங�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "ஹங�கேரி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "�ஸ�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "இந�தியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "இந�தோனேசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "ஈரான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "ஈராக�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "அயர�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "இஸ�லி ஆஃப� மேன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "இஸ�ரேல�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "இத�தாலி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "ஜமைக�கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "ஜப�பான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "ஜெர�சி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ஜோர�டான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "கசகிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "கென�யா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "க�ரிபட�டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "கொரியா, க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "கொரியா, க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "க�வைத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "கிரிகிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "லாவோஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "லாத�வியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "லெபனான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "லெஸத�தோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "லாபேரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "லிபியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "லிசன�ஸ�டைன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "லித�வேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "லக�ஸம�பர�க�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "மகாவோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "மெசிடோனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "மடகாஸ�கர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "மாலாவி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "மலேசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "மாலதீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "மாலி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "மால�டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "மார�ஷெல� தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "மார�டினிக�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "மாரிடேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "மொரீஷியஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "மயோதி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "மெக�ஸிகோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "மெக�ரோனிசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "மால�டோவா க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "மொனாக�கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "மங�கோலியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "மோன�ஸிராட�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "மொரோக�கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "மொசாம�பிக�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "மியான�மர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "நமீபியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "நௌர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "நேபால�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "நெதர�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "நெதர�லாந�த� ஆன�டிலிஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "நியூ காலிடொனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "நியூசிலாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "நிகராக�வா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "நிகெர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "நைஜீரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "நிய�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "நொர�ஃபோக� தீவ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "வடக�க� மெரைனா தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "நார�வே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "ஓமன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "பாகிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "பாலௌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "பாலஸ�தீனிய பிரதேசம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "பனாமா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "பாபௌ நியூ கினியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "பராக�வே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "பெர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "பிலிப�பைன�ஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "பிட�கேரின�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "போலந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "போர�ச�கல�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "பௌட�டோ ரிக�கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "கதார�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "ரீயூனியன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "ரோமானியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "ரஸ�யன� ஃபெடரேஷன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "ர�வான�டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "செயின� கிட�ட�ஸ� மற�ற�ம� நெவிஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "செயின�ட� லூசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "செயின�ட� வின�ஸ�சென�ட� மற�ற�ம� க�ரீனாடைன�ஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "சாமௌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "சான� மரினோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "சயோ டோம� மற�ற�ம� பிரின�ஸ�ப�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "சௌதி அரேபியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "செனெகல�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "செர�பியா மற�ற�ம� மொன�டெனெங�ரோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "செய�செல�லெஸ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "சியரா லியோன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "சிங�கபூர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "ஸ�லோவோக�கியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "ஸ�லோவேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "சாலமொன� தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "சோமாலியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "தென� ஆப�ரிக�கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "தெற�க� ஜியார�ஜியா மற�ற�ம� தெற�க� சான�விச� தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "ஸ�பெயின� "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "இலங�கை"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "செயின�ட� ஹெலெனா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "செயின�ட� பிரி மற�ற�ம� மிஃயூலான��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "சூடான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "ச�ரினாம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "ஸ�வால�பார� மற�ற�ம� ஜான� மாயென� தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "ஸ�வாசிலாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "ஸ�வீடன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "ச�விசர�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "சிரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "தாய�வான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "தஜிகிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "தான�சானியா க�டியரச�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "தாய�லாந�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "திமோர�-லெஸ�டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "டோகோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "டோகெலௌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "தாங�கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "டிரினிடாட� மற�ற�ம� டொபாகோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "ட�னீஷியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "த�ர�க�கி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "த�ர�க�மெனிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "த�ர�க�ஸ� மற�ற�ம� காய�கோஸ� தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "த�வால�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "உகாண�டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "உக�ரெயின�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "ய�னெய�டர� அரப� எமிரேட�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "ய�னைட�டட� கிங�டம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "அமெர�க�க �க�கிய மைனர� அவ�ட�லேயிங� தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "உர�க�வே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "உஸ�பெகிஸ�தான�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "வனாட�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "வெனிசூலா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "வியட�னாம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "வெர�ஜின� தீவ�கள�, ப�ரிடீஷ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "வெர�ஜின� தீவ�கள� , U.S."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "வாலிஸ� மற�ற�ம� ஃப�ட�னா தீவ�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "மேற�க� சஹாரா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "யேமன�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "ஜாம�பியா�பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "ஜிம�பாப�வே"
 
-#: ../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: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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "பெயர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL உடன�க�க�டன� செய�தி அன�ப�பி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "ஜப�பார�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "யாகூ செய�தி அன�ப�பி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu செய�தி அன�ப�ப�பவர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../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:111
 msgid "Service"
 msgstr "சேவைகள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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
 msgid "Location"
 msgstr "இடம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "பயனீடாளர� பெயர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "இல�லம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "யாகூ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "க�ழ�க�களாக"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "மூல ப�த�தகம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "சேர�ம� ப�த�தகம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "ப�திய தொடர�ப�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "எழ�தக�கூடிய ப�லங�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "தேவையான ப�லங�கள�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "மாற�றப�பட�டத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ஆசிரியரை தொடர�ப� கொள�ளவ�ம� - %s"
@@ -2550,7 +2573,7 @@ msgstr "இநà¯�த தொடரà¯�பிலிரà¯�நà¯�தà¯� படதà¯�à
 msgid "_No image"
 msgstr "படங�கள� இல�லை (_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2558,47 +2581,47 @@ msgstr ""
 "தொடர�பின� தகவல� செல�லாத�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3117
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ஒர� தவறான வடிவத�தை கொண�ட�ள�ளத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' தவறான வடிவத�தை கொண�ட�ள�ளத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3150
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' வெற�றாக உள�ளத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3165
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "செல�லாத தொடர�ப�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "தொடர�ப� வேகமாக- சேர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:297
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "(_E)ம�ழ�வத�ம� திர�த�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:339
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "ம�ழ�ப� பெயர� (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "மின�னஞ�சல� (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:361
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "ம�கவரிப�ப�த�தகத�தை தேர�ந�தெட� (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2607,7 +2630,7 @@ msgstr ""
 "நீங�கள� தொடர�ப� பட�டியலை\n"
 "அழிக�க வேண�ட�மா (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2615,7 +2638,7 @@ msgstr ""
 "நீங�கள� இந�த தொடர�ப� பட�டியல�களை\n"
 "அழிக�க வேண�ட�மா?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2624,7 +2647,7 @@ msgstr ""
 "நீங�கள� தொடர�பினை\n"
 "அழிக�க வேண�ட�மா (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2738,69 +2761,54 @@ msgid "_Location:"
 msgstr "(_L)இடம�:"
 
 #: ../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 "மின�னஞ�சலை பட�டியலில� சேர�க�கவ�ம�"
+msgid "<b>Members</b>"
+msgstr "<b>பயனர�கள�:</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "தொடர�ப� பட�டியல� தொக�ப�பி"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "ம�கவரி ப�த�தகத�திலிர�ந�த� மின�னஞ�சல� ம�கவரிகளை ந�ழைக�கவ�ம�"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "உற�ப�பினர�கள�"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "பட�டியலிலிர�ந�த� மின�னஞ�சல� ம�கவரியை நீக�கவ�ம�"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "தேர�ந�தெட�..."
 
-#: ../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 "(_H)மின�னஞ�சலை க�ழ�விற�க� அன�ப�ப�ப�போத� ம�கவரிகளை மறைக�கவ�ம�"
 
-#: ../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 "(_L)பட�டியல� பெயர�:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "தேர�ந�தெட� (_S)"
-
-#: ../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 ""
 "மின�னஞ�சல� ம�கவரியை தட�டச�ச� செய�யவ�ம� அல�லத� கீழ� உள�ள பட�டியலிர�ந�த� தொடர�பினை இழ�க�கவ�ம�: "
 "(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "தொடர�ப� பட�டியல� உற�ப�பினர�கள�"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "உற�ப�பினர�கள� (_M)"
+
+#: ../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:383
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../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
 msgid "Book"
 msgstr "ப�த�தகம�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "இத� ப�திய பட�டியல�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
-msgid "_Members"
-msgstr "உற�ப�பினர�கள� (_M)"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "தொடர�ப� பட�டியல� உற�ப�பினர�கள�"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "தொடர�ப� மாற�றப�பட�டத�:"
@@ -2838,39 +2846,40 @@ msgstr ""
 "இந�த தொடர�பின� மாற�றப�பட�டட�ட மின�னஞ�சல� மற�ற�ம�யர� �ற�கெனவே அடைவில� உள�ளத�. \n"
 " மீண�ட�ம� சேர�க�க விர�ப�பமா? "
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "தொடர�ப�களை ஒன�றாகச� சேர�க"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_ஒன�றாகச� சேர�"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "தொடர�ப�களை ஒன�றாகச� சேர�க"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../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:780
-#: ../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:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "மின�னஞ�சல� ம�கவரி"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "மின�னஞ�சல� த�வக�கத�தில�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-msgid "Name begins with"
-msgstr "பெயரின� த�வக�கத�தில�"
+msgid "Name contains"
+msgstr "பெயரில� உள�ளத�"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2884,10 +2893,10 @@ msgstr[0] "%d தொடர�ப�"
 msgstr[1] "%d தொடர�ப�கள�"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../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
 msgid "Query"
 msgstr "கேள�வி"
 
@@ -2895,129 +2904,121 @@ msgstr "கேள�வி"
 msgid "Error getting book view"
 msgstr "ப�த�தக பார�வையில� பிழை"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:307
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-entry.c:1202 ../widgets/text/e-entry.c:1203
-#: ../widgets/text/e-text.c:3545 ../widgets/text/e-text.c:3546
+#: ../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
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "மாதிரி"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "அட�டையை திர�த�த�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "பெயரின� த�வக�கத�தில�"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "மூலம�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../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:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "வகை"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:838
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2049
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "VCard என சேமிக�கப�பட�டத�..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+msgid "Save as vCard..."
+msgstr "விகார�ட� என சேமி..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1353
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:975
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "(_O)திற"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "ப�திய தொடர�ப�... (_N)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "ப�திய தொடர�ப� பட�டியல�... (_L)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
-msgid "_Save as VCard..."
-msgstr "(_S)VCard ஆக சேமி..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+msgid "_Save as vCard..."
+msgstr "(_S)விகார�ட� ஆக சேமி..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "தொடர�பினை ம�ன�அன�ப�ப� (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "தொடர�ப�களை ம�ன�அன�ப�ப� (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "தொடர�ப�க�க� செய�தியை அன�ப�ப� (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "பட�டியல�க�க� செய�தியை அன�ப�ப� (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "தொடர�ப�கள�க�க� செய�தியை அன�ப�ப� (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "அச�சடி (_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "ம�கவரி ப�த�தகத�தில� நகலெட�... (_y)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "ம�கவரி ப�த�தகத�த�க�க� நகர�த�த�... (_v)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "(_t)வெட�ட�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
-#: ../calendar/gui/calendar-component.c:603
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:983
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../composer/e-msg-composer.c:3221 ../mail/em-folder-tree.c:1006
-#: ../mail/em-folder-view.c:1218 ../mail/message-list.c:1962
+#: ../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
 #: ../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 "(_C)நகலெட�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "ஒட�ட� (_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1636
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "�தாவத� ஒர� வகை"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "Other error"
-msgstr "மற�ற பிழை"
-
 #: ../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 "உதவியாள�"
 
@@ -3047,7 +3048,7 @@ msgstr "கார� தொலைபேசி எண�"
 
 #: ../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
@@ -3055,7 +3056,7 @@ msgid "Categories"
 msgstr "வகைகள�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Company"
 msgstr "நிற�வனம�"
 
@@ -3104,22 +3105,22 @@ msgid "Journal"
 msgstr "இதழ�"
 
 #: ../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 "மேலாளர�"
 
 #: ../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 "மொபைல� தொலைபேசி"
 
 #: ../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 "ப�னைபெயர�"
 
 #: ../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 "க�றிப�ப�"
 
@@ -3148,14 +3149,14 @@ msgid "Radio"
 msgstr "வானொலி"
 
 #: ../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:713
 msgid "Role"
 msgstr "பங�க�"
 
 #: ../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 "மனைவி"
 
@@ -3186,38 +3187,38 @@ msgid "Web Site"
 msgstr "இணைய தளம�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../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:514
+#: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:657
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../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/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "அகலம�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../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:521
-#: ../widgets/table/e-table-field-chooser-item.c:664
-#: ../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:3028 ../widgets/table/e-table-item.c:3029
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../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: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/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "உயரம�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "த�வக�கதில�"
 
@@ -3237,11 +3238,21 @@ msgstr "மாதிரி உரை"
 msgid "Max field name length"
 msgstr "ப�லத�தின� பெயரின� அதிக பட�ச நீளம�"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "நெட�வரிசையின� அகலம�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"தொடர�பினை தேட�கிறத�..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3255,7 +3266,7 @@ msgstr ""
 "\n"
 "அல�லத� இங�க� இரட�டை சொட�க�கி ஒர� ப�திய தொடர�பினை உர�வாக�கவ�ம�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3269,7 +3280,7 @@ msgstr ""
 "\n"
 "ப�திய தொடர�பை உர�வாக�க இங�கே இரண�ட�-ம�றை க�ளிக� செய�யவ�ம�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +3290,7 @@ msgstr ""
 "\n"
 "தொடர�பினை தேடவ�ம�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3289,40 +3300,41 @@ msgstr ""
 "\n"
 "இதில� காட�ட எந�த பொர�ள�ம� இல�லை."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "�ற�பி"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "பணி மின�னஞ�சல�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "வீட�ட� மின�னஞ�சல�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "வேற� மின�னஞ�சல�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "தேர�வ� செய�யப�பட�ட"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
-msgstr "கர�சரில�"
+msgstr "கர�சர� உள�ளத�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "(_O)இணைப�பை உலாவியில� திற"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2603
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "(_C)இணைப�பை நகலெட�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "செய�தியை அன�ப�ப�... (_S)"
 
@@ -3332,222 +3344,235 @@ msgid "Copy _Email Address"
 msgstr "மின�னஞ�சல� ம�கவரிகளை நகலெட�க�கவ�ம� (_E)"
 
 #: ../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:758
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "உற�ப�பினர�களின� பட�டியல�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "த�றை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "பணி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "நிலை"
 
-#: ../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:788
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2354
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../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/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "நாள�காட�டி"
 
-#: ../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
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "ஓய�வ�/பணியில�"
 
-#: ../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 "தொலைபேசி எண�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "தொலை நகலி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "ம�தன�மை பக�கம�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "இணைய பதிவ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2323
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "பிறந�தநாள�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "ஆண�ட� விழாநாள�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:776
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "வேலையின� தலைப�ப�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "வீட�ட�ப�பக�கம�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "வலைப�பூ"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "வெற�றி"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "பின�னே வேலையாக "
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "கிடங�க� இயக�கதில� இல�லை"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "ம�கவரி ப�த�தகம� இல�லை"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:59
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "தொடர�ப� காணவில�லை"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "தொடர�ப� அடையாள எண� �ற�கெனவே உள�ளத�"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "விதிம�றைக�க� ஆதரவ� இல�லை"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:475 ../calendar/gui/print.c:2351
+#: ../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
 msgid "Canceled"
 msgstr "ரத�த� செய�யப�பட�டத�"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "ரத�த� செய�ய ம�டியாத�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "அன�மதி சோதிப�ப� தோல�விய�ற�றத�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "அன�மதியை சோதிக�க வேண�ட�ம�"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS கிடைக�கவில�லை"
 
 #. 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:75
 msgid "No such source"
 msgstr "இத� போன�ற மூலம� இல�லை"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "இணைப�பில�லா ம�றையில� இல�லை"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "மற�ற பிழை"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "தவறான சேவையக பதிப�ப�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "த�ணையில�லாத உற�தி செய�ய�ம� செயல�பாட�"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
-"இந�த ம�கவரி ப�த�தகத�தை திறக�க ம�டியவில�லை. உங�கள�க�க� அண�க அன�மதி இர�ந�த� பாதையை %s "
-"இர�ந�தால� சோதிக�கவ�ம�."
+"இந�த ம�கவரி ப�த�தகத�தை திறக�க ம�டியவில�லை. பாதை %s யை "
+"சோதிக�கவ�ம�. உங�கள�க�க� அண�க அன�மதி உள�ளதாதா எனவ�மபார�ங�கள�.� "
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "இந�த ம�கவரி ப�த�தகத�தை திறக�க ம�டியவில�லை . அதாவத� நீங�கள� தவறான யூஆர��(URI) � "
 "உள�ளிட�ட�ள�ளீர� அல�லத� எல�டி�பி(LDAP) சேவகனை அண�க ம�டியவில�லை."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3556,77 +3581,83 @@ msgstr ""
 "எவல�யூஷனின� இந�த பதிப�பில� எல�டி�பி(LDAP)  சேவகனின� ஆதரவ� இல�லை. நீங�கள� எல�டி�பி(LDAP) "
 "� எவல�யூஷனில� பயன�பட�த�த விர�ம�பினால� எல�டி�பி(LDAP)-ஆதரவ�ள�ள எவல�யூஷனை நிற�வவ�ம�."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "ம�கவரி ப�த�தகத�தை திறக�க ம�டியவில�லை. நீங�கள� தவறான யூஆர��(URI) � உள�ளிட�ட�ள�ளீர�கள� அல�லத� "
 "சேவகனை தொடர�ப�கொள�ள ம�டியவில�லை."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "விவரமான பிழை �"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
-"இந�த கேள�வி தொர�பாக அதிக விடைகள� வந�த�ள�ளதால� சேவகனால�\n"
-" விடைகளை காட�ட ம�டியவில�லை அல�லத� எவல�யூஷனால� காட�ட ம�டியவில�லை\n"
-"தேடலை ச�ர�க�கவ�ம� \n"
-"அல�லத� அடைவின� திறனை அதிகரிக�கவ�ம�"
+"இந�த கேள�விக�க� பொர�த�தமாக அதிக அட�டைகள� வந�த�ள�ளன. இத� சேவையக \n"
+" அல�லத� எவல�யூஷன� அமைப�ப�க�க�ம� அதிகமாக�ம�.\n"
+"தேடலை ச�ர�க�கவ�ம�. அல�லத� இந�த ம�கவரி ப�த�தகத�த�க�க� \n"
+"அடைவ� சேவையகத�தின� விடை வரையரையை அதிகரிக�கவ�ம�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
-"இந�த கேள�வியை இயக�க�வதற�கான நேரம� ம�டிவ�ற�றத� \n"
-"தயவ� செய�த� உங�கள� அடைவில� தனிவிர�ப�பங�கள� பக�தியில�\n"
-"தேடல�க�கான கால அளவை \n"
-"கூட�டவ�ம�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
-msgid "The backend for this addressbook was unable to parse this query."
+"இந�த கேள�வியை இயக�க�வதற�கான சேவையக  அல�லத� ம�கவரி ப�த�தக \n"
+"அமைப�ப� படி நேரம� ம�டிவ�ற�றத� தயவ� செய�த� தேடலை ச�ர�க�கவ�ம�. \n"
+"அல�லத� உங�கள� அடைவில� தனிவிர�ப�பங�கள� பக�தியில�  \n"
+"தேடல�க�கான கால அளவை கூட�டவ�ம�"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#,
+msgid "The backend for this address book was unable to parse this query."
 msgstr "ம�கவரி ப�த�தகத�தின� பின� இயக�கத�தால� இந�த கேள�வியை ப�ரிந�த�கொள�ள ம�டியவில�லை"
 
-#: ../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:181
+#,
+msgid "The backend for this address book refused to perform this query."
 msgstr "இந�த ம�கவரி ப�த�தகத�தின� பின� இயக�கி இந�த கேள�வியை ப�றக�கணித�தத�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "இந�த கேள�வி ம�ழ�மையாக ம�டியவில�லை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "பட�டியலில� சேர�க�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:713
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "தொடர�பை சேர�க�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "தொடர�பை திர�த�த�ம�போத� பிழை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "தொடர�பை திர�த�த�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "பட�டியலை நீக�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:663
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "தொடர�பை நீக�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3641,16 +3672,16 @@ msgstr[1] ""
 "%d தொடர�ப�களை திறக�க�ம� போத�%d ப�திய சாளரங�கள� திறக�கப�பட�ம�.\n"
 "எல�லா தொடர�ப�களைய�ம� காட�ட வேண�ட�மா?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "_� காட�டாதே"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "அனைத�த� தொடர�ப�களைய�ம� _காட�ட�"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3659,69 +3690,71 @@ msgstr ""
 "%s �ற�கெனவே உள�லத�\n"
 "மேலெழ�த விர�ப�பமா?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "தொடர�ப�"
 msgstr[1] "தொடர�ப�கள�"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:467
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "ம�கவரிப�ப�த�தகத�தை தேர�ந�தெட�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "பட�டியல�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:774
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "தொடர�ப�களை நகர�த�த�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "தொடர�ப�களை நகலெட�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:779
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "தொடர�ப�களை நகர�த�த�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:781
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "தொடர�ப�களை நகர�த�த�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
-msgid "Multiple VCards"
-msgstr "பல VCards"
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#,
+msgid "Multiple vCards"
+msgstr "பல விகார�ட�கள�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1010
-#, c-format
-msgid "VCard for %s"
-msgstr "%s க�கான VCard"
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#,  c-format
+msgid "vCard for %s"
+msgstr "%s க�கான விகார�ட�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#: ../addressbook/gui/widgets/eab-gui-util.c:1069
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#, c-format
 msgid "Contact information"
 msgstr "தொடர�ப� தகவல�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1071
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "%sக�க� தொடர�ப� தகவல�"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "ம�கவரி ப�த�தகத�தில� கேள�வி கேட�க�கப�பட�கிறத�..."
 
@@ -3733,69 +3766,73 @@ msgstr[0] "வேற� ஒர� தொடர�ப� உள�ளத�."
 msgstr[1] "%d வேற� தொடர�ப�கள� உள�ளன."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:281
-msgid "Show Full VCard"
-msgstr "ம�ழ� VCard � காட�ட�"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#,
+msgid "Show Full vCard"
+msgstr "ம�ழ� விகார�ட� � காட�ட�"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:232
-msgid "Show Compact VCard"
-msgstr "பொர�ந�த�ம� VCard"
+msgid "Show Compact vCard"
+msgstr "கையடக�க விகார�ட�"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:286
-msgid "Save in addressbook"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#,
+msgid "Save in address book"
 msgstr "ம�கவரி ப�த�தகத�தில� சேமி"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "அட�டை காட�சி"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "�ற�ற�கிறத�...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "அவ�ட�ல�க� CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "அவ�ட�ல�க� CSV மற�ற�ம� Tab இறக�கி"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "மோசில�லா CSV அல�லத� Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "மோசில�லா CSV மற�ற�ம� Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "எவல�ஷன� CSV அல�லத� Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "எவல�ஷன� CSV மற�ற�ம� Tab இறக�கி"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "எல�டி�பி(LDAP) தகவல� பறிமாற�ற வடிவம� (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "எவல�யூஷன� LDIF �ற�றி"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#,
+msgid "vCard (.vcf, .gcrd)"
+msgstr "விகார�ட� (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "எவல�யூஷன� VCard �ற�றி"
+#,
+msgid "Evolution vCard Importer"
+msgstr "எவல�யூஷன� விகார�ட� �ற�றி"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3838,12 +3875,12 @@ msgid "Format"
 msgstr "வடிவம�"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:493
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:650
+#: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1896
-#: ../widgets/table/e-table-selection-model.c:314
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "தலைப�ப�"
 
@@ -3945,7 +3982,7 @@ msgstr "நிழல�"
 
 #. 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-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3964,7 +4001,7 @@ msgid "Top:"
 msgstr "மேல�:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "வகை:"
 
@@ -3981,7 +4018,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "தொடர�ப�களின�அச�ச� பாணி தொக�ப�பியின� சோதனை"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:47
+#: ../addressbook/printing/test-print.c:44
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
@@ -3989,11 +4026,11 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 msgid "This should test the contact print style editor widget"
 msgstr "இத� அச�சின� பாணியின� சாளர அளவை சோதிக�க�ம�"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
 msgstr "தொடர�ப� அச�ச� சோதனை"
 
-#: ../addressbook/printing/test-print.c:49
+#: ../addressbook/printing/test-print.c:46
 msgid "This should test the contact print code"
 msgstr "தொடர�ப� அச�ச� எண�ணை சோதிக�க�ம�"
 
@@ -4004,8 +4041,9 @@ msgid "Can not open file"
 msgstr "கோப�பை திறக�க ம�டியவில�லை"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "ம�கவரி ப�த�தகங�கள� கிடைக�கவில�லை"
+#,
+msgid "Couldn't get list of address books"
+msgstr "ம�கவரி ப�த�தகங�களின� பட�டியல� கிடைக�கவில�லை"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4020,7 +4058,8 @@ msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+#,
+msgid "List local address book folders"
 msgstr "உள� ம�கவரி ப�த�தக அடைவ�களை பட�டியலிட�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4065,7 +4104,23 @@ msgstr "இயலà¯�பான à®®à¯�றையிலà¯�, அளவà¯� விரà¯
 msgid "Unhandled error"
 msgstr "கையாள ம�டியாத பிழை"
 
-#: ../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 "'{0}' என�பத� படிக�கமட�ட�மேயான நாள�காட�டி. அதை மாற�ற ம�டியாத�. தயை செய�த� வேறொர� நாள�காட�டியை நாள�காட�டி பார�வையில�  பக�க பலகத�தில� இர�ந�த� தேர�ந�தெட�க�கவ�ம�."
+
+#. 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."
@@ -4073,7 +4128,7 @@ 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."
@@ -4081,152 +4136,160 @@ 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
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "{0} வேலையை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "நிச�சயம�  தலைப�ப� {0}' க�க� ஒத�க�கப�பட�ட நேரத�தை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "நிச�சயம�  {0} க�றிப�பை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "நிச�சயம� {0} நேர ஒத�க�கத�தை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "நிச�சயம� {0} பணிகளை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "{0} பணியை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "இந�த நேர ஒத�க�கத�தை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "இந�த கூட�டத�தை நீக�க விர�ப�பமா?"
 
-#: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
+#, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "நிச�சயமாக இந�த க�றிப�பை நீக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "நிச�சயமாக இந�த பணியை நீக�க  வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "க�றிப�பை நிச�சயம� ச�ர�க�கம� இல�லாத� சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "ச�ர�க�கம� இல�லாமல� நேர ஒத�க�கம� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "பணியை ச�ர�க�கம� இல�லாமல� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "ஒர� ப�திய நிகழ�வினை உர�வாக�க ம�டியவில�லை"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:29
+#,
+msgid "Cannot save event"
+msgstr " நிகழ�வினை சேமிக�க ம�டியவில�லை"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "நாள�காட�டியை அழிக�க வேண�ட�மா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "க�றிப�ப� பட�டியலை அழிக�க வேண�ட�மா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "பணி பட�டியலை அழிக�க வேண�ட�மா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "அன�ப�ப வேண�டாம� (_n)"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "பதிவிறக�க�ம� நடைபெற�கிறத�. நேர ஒத�க�கம� �ற�பாட�டினை சேமிக�க வேண�ட�மா?"
 
-#: ../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
 msgid "Editor could not be loaded."
 msgstr "தொக�ப�பியை �ற�ற ம�டியவில�லை."
 
-#: ../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
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "நாள�காட�டியை �ற�ற�ம� போத� பிழை"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "க�றிப�ப� பட�டியலை �ற�ற�ம� போத� பிழை"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "பணி பட�டியலை �ற�ற�ம� போத� பிழை"
 
-#: ../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."
@@ -4234,7 +4297,7 @@ 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."
@@ -4242,7 +4305,7 @@ 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."
@@ -4250,19 +4313,19 @@ msgstr ""
 "இரத�த� செய�த தகவலை மற�றவர�கள�க�க� தெரிவிக�காவிட�டால� அவர�கள� பணி நீக�கப�பட�டதை "
 "அறியமாட�டார�கள�."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:45
 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:46
 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:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4270,7 +4333,7 @@ msgstr ""
 "சில இணைப�ப�கள� பதிவிறக�கம� செய�ய வேண�டிய�ள�ளத�. நேர ஒத�க�கத�தை சேமித�தால� இந�த இணைப�ப�கள� "
 "இழக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4278,83 +4341,84 @@ msgstr ""
 "சில இணைப�ப�கள� பதிவிறக�கம� செய�ய வேண�டிய�ள�ளத�. பணிகளை சேமித�தால� இந�த இணைப�ப�கள� "
 "இழக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "உங�கள� நடப�ப� சேவையகத�தில� சில அம�சங�கள� வேலை செய�யாத�."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "எவல�யூஷன� நாள�காட�டி எதிர�பாராமல� வெளியேறியத�"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "எவல�யூஷன� க�றிப�ப� எதிர�பாராமல� வெளியேறியத�."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "எதிர�பாராமல� எவல�யூஷன� வெளியேறியத�"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "நாள�காட�டி இணைப�பில�லாமல� பயன�பட�த�த க�றிக�கப�படவில�லை."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+#,
+msgid "The memo list is not marked for offline usage."
 msgstr "க�றிப�ப� பட�டியல� இணைப�பில�லாமல� பயன�பட�த�த க�றிக�கப�படவில�லை."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "பணி பட�டியல� இணைப�பில�லாமல� பயன�பட�த�த க�றிக�கப�படவில�லை."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "இந�த நாள�காட�டி நிரந�தரமாக நீக�கப�பட�ம�"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "இந�த க�றிப�ப� பட�டியல� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "இந�த பணி பட�டியல� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "இந�த நேர ஒத�க�கத�தில� உள�ள மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "இந�த க�றிப�பில� உங�கள� மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "இந�த நேர ஒத�க�கத�தில� உள�ள மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "இந�த க�றிப�ப�க�க� இரத�த� செய�த அறிக�கை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "அனைத�த� பங�க� கொள�வோர�க�க�ம� இரத�த� செய�த அறிக�கை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "கூட�ட அழைப�பை பங�கீட�டாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "இந�த பணியை பங�கேற�பாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "திர�த�தப�பட�ட கூட�டம� பற�றிய தகவல�களை பங�கேற�பாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "திர�த�தப�பட�ட பணியை பங�கேற�பாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4363,119 +4427,107 @@ 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:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "நேர ஒத�க�கம� �ற�பாட�டில� மாற�றங�கள� செய�த�ள�ளீர�கள�, ஆனால� இத�வரை சேமிக�கவில�லை."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "நீங�கள� இந�த பணியை மாற�றி விட�டீர�கள� ஆனால� சேமிக�கவில�லை"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "நீங�கள� இந�த க�றிப�பை மாற�றி விட�டீர�கள� ஆனால� சேமிக�கவில�லை."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "எவல�யூஷனை மீண�ட�ம� த�வக�காமல� நாள�காட�டியை பார�க�க ம�டியாத�"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "எவல�யூஷன� மற� த�வங�க�ம� வரை உங�கள� க�றிப�ப�கள� கிடைக�கப�பெறா."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 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:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "மாற�றங�களை நிராகரிக�கவ�ம� (_D)"
 
-#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "(_S)சேமி"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "மாற�றங�களை சேமி (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "(_S)அன�ப�ப�"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "அறிவிப�ப� அன�ப�ப� (_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:50 ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "கடவ�ச�சொல�லை உள�ளிட�"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:253
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "பல நாட�கள�க�கான நிகழ�வ�களை பிரி"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1504
-#: ../calendar/conduits/calendar/calendar-conduit.c:1505
-#: ../calendar/conduits/memo/memo-conduit.c:930
-#: ../calendar/conduits/memo/memo-conduit.c:931
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1107
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "எவல�யூஷன� தகவல� சேவகனை திறக�க ம�டியவில�லை"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1612
-#: ../calendar/conduits/calendar/calendar-conduit.c:1615
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "பைலட� நாள�காட�டியை படிக�க ம�டியவில�லை"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1024
-#: ../calendar/conduits/memo/memo-conduit.c:1027
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "பைலட� க�றிப�ப� செயல�பாட� தொக�தி � படிக�க இயலவில�லை."
 
-#: ../calendar/conduits/memo/memo-conduit.c:1071
-#: ../calendar/conduits/memo/memo-conduit.c:1074
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "பைலட� க�றிப�ப� செயல�பாட� தொக�தி இல� எழ�த இயலவில�லை."
 
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "இயல�பான ம�ன�னிரிமை:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1190
-#: ../calendar/conduits/todo/todo-conduit.c:1193
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "பைலட� செய�யவேண�டிய பயன�பாட�ட� வேலையை படிக�க ம�டியவில�லை"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1235
-#: ../calendar/conduits/todo/todo-conduit.c:1238
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "பைலட� செய�யவேண�டிய பயன�பாட�ட� வேலையில� எழ�த ம�டியவில�லை"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2229
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "நாள�காட�டி மற�ற�ம� பணிகள�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1385
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "நாள�காட�டிகள�"
 
@@ -4516,25 +4568,25 @@ msgid "Memo_s"
 msgstr "க�றிப�ப�கள� (_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:335 ../calendar/gui/e-memos.c:1093
-#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:544
-#: ../calendar/gui/memos-component.c:1031 ../calendar/gui/memos-control.c:336
-#: ../calendar/gui/memos-control.c:352
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "க�றிப�ப�கள�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:538 ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1541 ../calendar/gui/print.c:1809
-#: ../calendar/gui/tasks-component.c:535
-#: ../calendar/gui/tasks-component.c:1026 ../calendar/gui/tasks-control.c:478
-#: ../calendar/gui/tasks-control.c:494
-#: ../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: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/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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "பணிகள�"
@@ -4552,24 +4604,26 @@ msgstr "(_T)பணிகள�"
 msgid "Evolution Calendar alarm notification service"
 msgstr "எவல�யூஷன� நாள�காட�டி நினைவூட�டல� சேவை"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "நிமிடம�"
 msgstr[1] "நிமிடங�கள�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "மணிகள�"
 msgstr[1] "மணிகள�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "த�வக�க நேரம�"
 
@@ -4580,10 +4634,10 @@ msgstr "நேர ஒத�க�க �ற�பாட�கள�"
 
 #. 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:1145
-#: ../plugins/itip-formatter/itip-view.c:998
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "இடம�:"
 
@@ -4592,17 +4646,15 @@ msgid "Snooze _time:"
 msgstr "தூக�க நேரம�: (_t)"
 
 #: ../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:165
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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 "திர�த�த� (_E)"
 
@@ -4614,31 +4666,32 @@ msgstr "தூங�க� (_S)"
 msgid "location of appointment"
 msgstr "நேர ஒத�க�க �ற�பாட� இடம�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "ச�ர�க�கம� இல�லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "விளக�கம� இல�லை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "இட விவரம� இல�லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "உங�களிடம� %d அலாரங�கள� உள�ளன"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "எச�சரிக�கை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4650,7 +4703,7 @@ msgstr ""
 "அன�ப�ப�ம� வசதி அமைக�கப�பட�ட�ள�ளத�, எவல�யூஷன� \n"
 "சாதாரன நினைவூட�டல� உரையாடல� பெட�டியை காட�ட�ம�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4666,15 +4719,15 @@ msgstr ""
 "\n"
 "இந�த நிரலை இயக�க விர�ப�பமா?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "இந�த நிரல� பற�றி இனி என�னிடம� கேட�க வேண�டாம�."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "பொனொபொ வை த�வக�க வேண�டாம�"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4685,7 +4738,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:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4694,7 +4747,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:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4705,13 +4758,13 @@ msgstr[1] "%d நிமிடங�கள�"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d வினாடி"
-msgstr[1] ""
+msgstr[1] "%d வினாடிகள�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
@@ -4944,12 +4997,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:96
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"ம�ன�தோற�ற\"பலகத�தை காட�ட�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"ம�ன�தோற�ற\"பலகத�தை காட�ட�"
 
@@ -4999,7 +5052,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "கடைசியாக அலாரம� ஒலித�தத�. (_t)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "நேரம� மண�டலம�"
 
@@ -5129,66 +5182,66 @@ msgstr "வேலைநாளà¯� தà¯�வஙà¯�கà¯�à®®à¯� நிமிடமà
 msgid "daylight savings time"
 msgstr "பகல� நேர சேமிப�ப�"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "ச�ர�க�கத�தில�"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "விளக�கத�தில�"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "வகை"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "கர�த�தில�"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "இடத�தில�"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "பொர�ந�தவில�லை"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "அட�த�த 7 தினங�களின� பணிகள�"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "நடப�பில� உள�ள பணிகள�"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "நில�வை பணிகள�"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "நிறைவேறிய பணிகள�"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "இணைப�ப�கள� உடன� பணிகள�"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "நடப�பில� உள�ள நேர ஒத�க�க �ற�பாட�கள�"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "அட�த�த 7 நாட�கள� நேர ஒத�க�க �ற�பாட�கள�"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5197,15 +5250,17 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நிகழ�வ�கள� தவிர மற�ற நிகழ�வ�கள� ம�டிந�த� போன நிகழ�வ�கள� நீக�கப�பட�ம�. "
 "தொடர�ந�தால� இந�த நிகழ�வ�கள� பற�றி இனி தெரிந�த�கொள�ள ம�டியாத�"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "நீக�க வேண�டிய பழைய நிகழ�வ�கள�"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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
-#: ../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 "நாட�கள�"
 
@@ -5214,88 +5269,102 @@ msgstr "நாட�கள�"
 #. 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:305
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "வானிலை"
 
-#: ../calendar/gui/calendar-component.c:602
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "ப�திய நாள�காட�டி (_N)"
 
-#: ../calendar/gui/calendar-component.c:932
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2106
+msgid "_Copy..."
+msgstr "(_C)நகல�..."
+
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "நாள�காட�டியை ப�த�ப�பிக�க ம�டியாத�"
 
-#: ../calendar/gui/calendar-component.c:1231
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ப�திய நிகழ�வ�கள� மற�ற�ம� கூட�டத�தை உர�வாக�க '%s' நாள�காட�டியை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/calendar-component.c:1247
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "நிகவ�கள� மற�ற�ம� கூட�டத�தை உர�வாக�க இதில� நாள�காட�டி எத�வ�ம� இல�லை"
 
-#: ../calendar/gui/calendar-component.c:1360
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "நாள�காட�டி மூல தேர�வாளர�"
 
-#: ../calendar/gui/calendar-component.c:1578
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "ப�திய நேரஒத�க�கம�"
 
-#: ../calendar/gui/calendar-component.c:1579
+#: ../calendar/gui/calendar-component.c:1597
+#,
+msgctxt "New"
 msgid "_Appointment"
 msgstr "(_A)நேர ஒத�க�கம�"
 
-#: ../calendar/gui/calendar-component.c:1580
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "ப�திய நேர ஒத�க�கத�தை உர�வாக�க�"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "ப�திய கூட�டம�"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1605
+#,
+msgctxt "New"
 msgid "M_eeting"
 msgstr "(_M)கூட�டம�"
 
-#: ../calendar/gui/calendar-component.c:1588
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "ப�திய கூட�டத�தை உர�வாக�க கோரிக�கை"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "ம�ழ�நாட�கள�க�க�மான ப�திய நேர ஒத�க�கம�"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1613
+#,
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "(_p) ம�ழ� நாள�க�க�மான நேர ஒத�க�கம�"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "ம�ழ� நாள�க�க�மான நேர ஒத�க�கத�தை உர�வாக�க�"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "ப�திய நாள�காட�டி"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1621
+#,
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "(_N)நாள�காட�டி"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "ப�திய நாள�காட�டியை உர�வாக�க�"
 
@@ -5316,32 +5385,237 @@ msgid "Month View"
 msgstr "மாதத�தை பார�"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#,
+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
+msgid "Attachments"
+msgstr "இணைப�ப�கள�"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "கலந�த�கொள�பவர�கள�"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "வணிகம�"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "வகை"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "வகைப�பட�த�த�தல�"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "போட�டி"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "நம�பகமான"
+
+#: ../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
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "விவரணம�"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "இத� விவரத�தில� உள�ளத�"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "உள�ளத�"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "விர�ப�பங�கள�"
+
+#: ../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
+msgid "Holiday"
+msgstr "விட�ம�றை�ற�"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "ம�க�கிய தொடர�ப�கள�"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "யோசனைகள��கள�"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "சர�வததேசான"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "ம�க�கிய வாடிக�கையாளர�"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "மற�றவை"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "அட�த�த 7 தினங�களின� பணிகள�"
+
+#: ../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 "ஒர�ங�கிணைப�பாளர�"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "தொலைபேசி அழைப�ப�கள�"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "தனிப�பட�ட"
+
+#: ../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
+msgid "Public"
+msgstr "பொத�வான"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "மீண�ட�ம� தோன�ற�கிறத�"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "நிலை"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "திட�டங�கள�"
+
+#: ../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:361
+msgid "Summary"
+msgstr "ச�ர�க�கம�"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "ச�ர�க�கத�தில� உள�ளத� இத�"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "பரிமாற�வோர�"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "நேரம� &amp; செலவ�கள�"
+
+#: ../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
+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
+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
+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
+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
+msgid "is not"
+msgstr "இல�லை"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "நாள�காட�டியை திறக�க�ம� போத� பிழை"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "நாள�காட�டியை திறக�க இந�த ம�றைக�க� ஆதரவ� இல�லை"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "நாள�காட�டியை திறப�பதற�கான அன�மதி மற�க�கப�பட�டத�"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1282
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "தெரியாத பிழை"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "அலாரத�தை தொக�"
 
@@ -5374,17 +5648,17 @@ msgid "Mes_sage:"
 msgstr "(_s)செய�தி:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "ஒலியை இயக�க�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "நிரலை இயக�க�"
 
@@ -5397,7 +5671,7 @@ msgid "Send To:"
 msgstr "அன�ப�ப� :"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "மின�னஞ�சல� அன�ப�ப�"
 
@@ -5452,7 +5726,7 @@ msgstr "நிமிடம�(கள�)"
 msgid "start of appointment"
 msgstr "நேர ஒத�க�கத�தின� த�வக�கம�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "செயல�/த�வக�க�"
 
@@ -5463,18 +5737,15 @@ msgstr "(_d)சேர�"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "எச�சரிக�கை மணி"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "இணைப�பை தானாக காட�ட வலிய�ற�த�த� (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "கோப�ப�(களை) இணை"
 
@@ -5502,7 +5773,7 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
 msgstr "<i>%u மற�ற�ம� %d பயனர� மற�ற�ம� களம� மின�னஞ�சல� ம�கவரியால� மாற�றப�பட�ம�.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">எச�சரிக�கைகள�</span>"
 
@@ -5541,8 +5812,8 @@ msgid "Display"
 msgstr "காட�சி"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "வெள�ளிக�கிழமை"
 
@@ -5557,8 +5828,8 @@ msgstr ""
 "நாட�கள�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "திங�கட�கிழமை"
 
@@ -5581,7 +5852,7 @@ 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 "நிறத�தை தேர�வ� செய�"
 
@@ -5591,8 +5862,8 @@ msgid "S_un"
 msgstr "(_u)ஞாயிற�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "சனிக�கிழமை"
 
@@ -5609,8 +5880,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "(_n) தேதி நகர�த�தியில� வார எண�களை காட�ட�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ஞாயிற�ற�க�கிழமை"
 
@@ -5628,29 +5899,29 @@ msgid "Template:"
 msgstr "மாதிரிஉர�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "வியாழக�கிழமை"
 
 #: ../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 "நேரம� காட�டி: (_z)"
+msgstr "நேரம� காட�டி (_z):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "நேரத�தின� அமைப�ப�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ப�தன� கிழமை"
 
@@ -5728,306 +5999,453 @@ msgstr "(_W)ப�தன�"
 msgid "before every appointment"
 msgstr "ஒவ�வொர� நேர ஒத�க�கத�த�க�க� ம�ன�ன�ம�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_y இணைப�ப� விலகிய செயல�கள�க�க� நாள�காட�டி உள�ளடக�கத�தை நகலெட�."
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "_y இணைப�ப� விலகிய செயல�கள�க�க� பட�டியல� உள�ளடக�கத�தை நகலெட�."
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_y இணைப�ப� விலகிய செயல�கள�க�க�  க�றிப�ப� பட�டியல� உள�ளடக�கத�தை நகலெட�."
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "(_o) நிறம�"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "(_r) நிறம�:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "பணிகளின� பட�டியல�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "க�றிப�ப�களின� பட�டியல�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "நாள�காட�டி பண�ப�கள�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "ப�திய நாள�காட�டி"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "பணி பட�டியல� பண�ப�கள�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "ப�திய பணிபட�டியல�"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "பணி பட�டியல� பண�ப�கள�"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "ப�திய க�றிப�ப� பட�டியல�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "இந�த நிகழ�வ� நீக�கப�பட�டத�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "இந�த பணி நீக�கப�பட�டத�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "இந�த க�றிப�ப� நீக�கப�பட�டத�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s மாற�றங�கள� செய�த�ள�ளார�. இந�த மாற�றங�களை மறக�கச�செய�த� தொக�ப�பியை மூட வேண�ட�மா?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s நீங�கள� மாற�றம� எத�வ�ம� செய�யவில�லை. தொக�ப�பியை மூட வேண�ட�மா?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "இந�த நிகழ�வ� மாற�றப�பட�டத�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "இந�த பணி மாற�றப�பட�டத�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "இந�த க�றிப�ப� மாற�றப�பட�டத�"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s மாற�றங�கள� செய�த�ள�ளார�. இந�த மாற�றங�களை மறக�கச�செய�த� தொக�ப�பியை மூட வேண�ட�மா?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s நீங�கள� மாற�றம� எத�வ�ம� செய�யவில�லை. தொக�ப�பியை மூட வேண�ட�மா?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "சரிபார�க�க�ம� போத� பிழை: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr "பெற�நர�"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr "(ம�டிந�தத�"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "ம�டிந�தத�"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr "(நில�வையில�"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "நில�வையில�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2968
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "செய�தியை இணை - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2973
-#: ../composer/e-msg-composer.c:3158
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "இணைக�கப�பட�ட செய�தி"
 msgstr[1] "%d இணைக�கப�பட�ட செய�தி"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3222
-#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:369
-#: ../mail/em-folder-view.c:1114 ../mail/message-list.c:1963
+#: ../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
 msgid "_Move"
 msgstr "(_M)நகர�த�த�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3224
-#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "(_D)இழ�ப�பதை ரத�த� செய�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../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
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "இணைப�ப�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "பொர�ளை திர�த�த ம�டியவில�லை"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2585
-#, 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:1003
-msgid "Hide Attachment _Bar"
-msgstr "இணைப�ப�கள� பட�டையை மறை (_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1542
-msgid "Show Attachment _Bar"
-msgstr "இணைப�ப�கள� பட�டையை காட�ட� (_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1976
-#: ../calendar/gui/dialogs/task-page.c:1252 ../composer/e-msg-composer.c:3739
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "(_R)நீக�க�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2134
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
-msgid "_Properties"
-msgstr "(_P)பண�ப�கள�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../composer/e-msg-composer.c:3742
-msgid "_Add attachment..."
-msgstr "இணைப�பினை சேர�... (_A)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1566
-#: ../mail/em-format-html-display.c:2320
-msgid "Show Attachments"
-msgstr "இணைப�ப�கள� காட�ட�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1567
-msgid "Press space key to toggle attachment bar"
-msgstr "இணைப�ப� பட�டைகள�க�கிடையே மாற�ற இடைவெளி விசையை அழ�த�தவ�ம�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2173
-#: ../calendar/gui/dialogs/comp-editor.c:2216
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "நேர ஒத�க�கத�தை மாற�ற�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "சந�திப�ப� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2181
-#: ../calendar/gui/dialogs/comp-editor.c:2224
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "நேர ஒத�க�கம� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2185
-#: ../calendar/gui/dialogs/comp-editor.c:2228
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ஒத�க�கப�பட�ட பணி - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2187
-#: ../calendar/gui/dialogs/comp-editor.c:2230
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "பணி - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "க�றிப�ப�கள� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2243
-msgid "No summary"
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
 msgstr "ச�ர�க�கம� இல�லை"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2791 ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:361
-msgid "attachment"
-msgstr "இணைப�ப�"
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "நடப�ப� சாளரத�தை மூட இங�க� சொட�க�கவ�ம�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "தேர�வ� செய�த உரையை தற�காலிக நினைவிடத�தில� நகலெட�க�கவ�ம�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "தேர�வ� செய�த உரையை ஒட�ட�ப�பலகத�தில� படியெட�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "உதவியை பெற இங�க� சொட�க�கவ�ம�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "தற�காலிக நினைவிடத�தில� உள�ள உரையை ஒட�ட�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "நடப�ப� சாளரத�தை சேமிக�க இங�க� சொட�க�கவ�ம�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "எல�லா உரையைய�ம� தேர�வ�செய�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "பிரிவ�கள� (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "(_F)கோப�ப�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "(_H)உதவி..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "ந�ழை (_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "விர�ப�பங�கள� (_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "(_V)பார�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "(_A)இணைப�ப�...."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "ஒர� கோப�பினை இணைக�க இங�க� சொட�க�கவ�ம�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "(_C)வகைகள�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "வகைகள� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "நேரம� மண�டலம�: (_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "நேர மண�டலம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "பொத� (_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "பொத� என வகைப�பட�த�த�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "தனிப�பட�ட (_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "தனிபட�டத� என வகைப�பட�த�த�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "இரகசியமானத� (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "இரகசியமானதாக வகைப�பட�த�த�க"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "பங�க� ப�லம� (_o)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "பங�க� ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2880
-#: ../calendar/gui/dialogs/comp-editor.c:2934
-#: ../calendar/gui/dialogs/comp-editor.c:2958
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "RSVP ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "நிலை ப�லம� (_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "நிலை ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "வகை ப�லம� (_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+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"
+msgstr "(_m) அண�மைய கோப�ப�கள�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "இணைக�கவ�ம�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
+#, 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
+msgid "Hide Attachment _Bar"
+msgstr "இணைப�ப�கள� பட�டையை மறை (_B)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+msgid "Show Attachment _Bar"
+msgstr "இணைப�ப�கள� பட�டையை காட�ட� (_B)"
+
+#: ../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
+#: ../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 "(_R)நீக�க�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "இணைப�பினை சேர�... (_A)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
+msgid "Show Attachments"
+msgstr "இணைப�ப�கள� காட�ட�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2246
+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
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "இந�த உர�ப�படியில� செய�த மாற�றங�கள� ப�திப�பிக�க�ம� போத� நீக�கப�பட�ம�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2987
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "தற�போதைய பதிப�பை பயன�பட�த�த�வதற�காக மேம�பட�த�தவ�ம�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "மூலத�தை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "சேர�ம� இடத�தை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "சேர�ம� இடத�தின� பண�ப� படிக�க மட�ட�ம� என உள�ளத�"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "இந�த உர�ப�படியை மற�ற அனைத�த� பெற�நர� அஞ�சல� பெட�டிகளிலிர�ந�த�ம� அழிக�க வேண�டாமா? (_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "கோப�ரா பிழையால� இந�த நிகழ�வை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "கோப�ரா பிழையால� இந�த வேலையை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "கோர�பா பிழையால� இந�த க�றிப�பை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "கோப�ரா பிழையால� இந�த உர�ப�படியை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "அன�மதி இல�லாததால� இந�த நிகழ�வை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "அன�மதி இல�லாததால� இந�த பணியை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "அன�மதி இல�லாததால� இந�த க�றிப�பை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "அன�மதி இல�லாததால� இந�த உர�ப�படியை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "ஒர� பிழையால� இந�த நிகழ�வை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "ஒர� பிழையால� இந�த பணியை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "ஒர� பிழையால� இந�த க�றிப�பை நீக�க ம�டியாத�"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "பிழை உள�ளதால� இந�த உர�ப�படியை நீக�க ம�டியாத�"
 
@@ -6036,7 +6454,7 @@ msgid "Contacts..."
 msgstr "தொடர�ப�கள�...."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "ம�க�கிய விர�ந�தினர�கள�க�க� :"
 
@@ -6044,136 +6462,181 @@ msgstr "à®®à¯�கà¯�கிய விரà¯�நà¯�தினரà¯�களà¯�கà¯�à®
 msgid "Enter Delegate"
 msgstr "ம�க�கிய விர�ந�தினர�களை உள�ளிட�"
 
-#: ../calendar/gui/dialogs/event-editor.c:601
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "அலாரங�கள� (_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr "இந�த நிகழ�வ�க�க� எச�சரிக�கையை அமைக�க அல�லத� நீக�க இங�க� சொட�க�க�"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "மீண�ட�ம� தோன�றல� (_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "இந�த நிகழ�வை ச�ர�ள� நிகழ�வாகச� செய�"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "அன�ப�ப� விர�ப�பங�கள�"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "கூட�தல� அன�ப�ப�ம� விர�ப�பங�களை ந�ழை"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "அனைத�த� நாள� நிகழ�வ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "அனைத�த� நாள� நிகழ�வ� வைத�த�க�கொள�ளலாமா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Show Time as _Busy"
+msgstr "(_b) வேலையில� உள�ள நேரம� எனக�காட�ட�"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "பெற�வத� நேரத�தை வேலையில� என காட�டலாமா என�பதை மாற�ற�கிறத�."
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "ஓய�வ�/பணியில� (_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr "பங�கேற�போர�க�க� வேலை அல�லத� ஓய�வ� தகவலை கேட�கவ�ம�"
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "சந�திப�ப� �ற�பாட� (_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:605
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "மீண�ட�ம� தோன�ற�கிறத�"
-
-#: ../calendar/gui/dialogs/event-page.c:835
-#: ../calendar/gui/dialogs/event-page.c:2852
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "இந�த நிகழ�வ� அலாரங�களை கொண�ட�ள�ளத�."
 
-#: ../calendar/gui/dialogs/event-page.c:915
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:456
 msgid "Or_ganizer:"
 msgstr "(_g)ஒர�ங�கிணைப�பாளர�:"
 
-#: ../calendar/gui/dialogs/event-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "பேராளர�கள� (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:955
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "கலந�த�கொள�பவர�கள� (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1138
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "த�வக�க தேதி இல�லாத நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/event-page.c:1141
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "ம�டிவ� தேதி இல�லாத நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/event-page.c:1312
-#: ../calendar/gui/dialogs/memo-page.c:693
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "த�வக�க தேதி தவறாக உள�ளத�"
 
-#: ../calendar/gui/dialogs/event-page.c:1322
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "ம�டிய�ம� தேதி தவறாக உள�ளத�"
 
-#: ../calendar/gui/dialogs/event-page.c:1345
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "த�வக�க நேரம� தவறாக உள�ளத�"
 
-#: ../calendar/gui/dialogs/event-page.c:1352
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "ம�டிய�ம� நேரம� தவறாக உள�ளத�"
 
-#: ../calendar/gui/dialogs/event-page.c:1514
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "நீங�கள� தேர�வ� செய�த நாள�காட�டியில� எந�த கணக�க�ம� இல�லை"
 
-#: ../calendar/gui/dialogs/event-page.c:1520
-#: ../calendar/gui/dialogs/memo-page.c:739
-#: ../calendar/gui/dialogs/task-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "நாள�காட�டி தேவை"
 
-#: ../calendar/gui/dialogs/event-page.c:1545
-#: ../calendar/gui/dialogs/task-page.c:970
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "க�றைந�தத� ஒர� பங�கேற�பாளராவத� இர�க�க வேண�ட�ம�"
 
-#: ../calendar/gui/dialogs/event-page.c:1977
-#: ../calendar/gui/dialogs/task-page.c:1253
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "சேர� (_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2723
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "நாள�காட�டியை திறக�க ம�டியவில�லை '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2772
-#: ../calendar/gui/dialogs/memo-page.c:1138
-#: ../calendar/gui/dialogs/task-page.c:1948
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s சார�பாக நீங�கள� வேலை செய�கிறீர�கள�"
 
-#: ../calendar/gui/dialogs/event-page.c:3068
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "%d நேரம� ஒத�க�க�வதற�க� ம�ந�தைய நாட�கள�"
-msgstr[1] ""
+msgstr[0] "%d நேரம� ஒத�க�க�வதற�க� ம�ந�தைய நாள�"
+msgstr[1] "%d நேரம� ஒத�க�க�வதற�க� ம�ந�தைய நாட�கள�"
 
-#: ../calendar/gui/dialogs/event-page.c:3074
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:3080
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:3093
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "தனிபயனாக�க�"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3098
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2369
-#: ../filter/filter-rule.c:891 ../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: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
+#: ../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:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
-#: ../widgets/misc/e-dateedit.c:1718
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
@@ -6193,33 +6656,30 @@ msgstr "நேரமà¯� ஒதà¯�கà¯�கà¯�வறà¯�கà¯� 15 நிமிடà
 msgid "Attendee_s..."
 msgstr "கலந�த�கொள�பவர�கள�_s..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "(_t)வகைகள�..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "தனிபயன� அலாரம�:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "(_e)விளக�கம�:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "நிகழ�வ� விவரம�"
 
-#: ../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 "(_m)ச�ர�க�கம�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "(_A)நினைவூட�டன� மணி"
 
+#: ../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 "(_D)விளக�கம�:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "காலம�: (_T)"
@@ -6250,29 +6710,24 @@ msgstr "(_h)ஒர�ங�கிணைப�பாளரை மாற�ற�"
 msgid "Co_ntacts..."
 msgstr "தொடர�ப�கள�... (_n)"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "ஒர�ங�கிணைப�பாளர�"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "ஒர�ங�கிணைப�பாளர�:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "க�றிப�ப�"
 
-#: ../calendar/gui/dialogs/memo-page.c:911
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'. இல� க�றிப�ப�களை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/dialogs/memo-page.c:1076 ../mail/em-format-html.c:1517
-#: ../mail/em-format-html.c:1531 ../mail/em-format-html.c:1589
-#: ../mail/em-format-html.c:1615 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "பெற�நர�"
 
@@ -6285,59 +6740,61 @@ msgstr "(_r)த�வக�க தேதி:"
 msgid "T_o:"
 msgstr "ம�ன�னால�_o:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "(_D)விளக�கம�:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:449
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "(_G)க�ழ�:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "நீங�கள� மீண�ட�ம� காட�டிய நிகழ�வில� மாற�றம� செய�கிறீர�கள�. என�ன மாற�றம� செய�ய விர�ம�ப�கிறீர�கள�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "நீங�கள� ஒர� நிகழ�வ�க�க� பிரதிநிதி அமைகிறீர�கள�. எதற�க� பிரதிநிதி அமைக�க வேண�ட�ம�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "நீங�கள� ஒர� ச�ழல� வேலையை மாற�றி அமைகிறீர�கள�. எதை மாற�றி அமைக�க வேண�ட�ம�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "நீங�கள� மீண�ட�ம� நிகழ�ம� ச�ழல� க�றிப�பில� மாற�றம� செய�கிறீர�கள�. என�ன மாற�றம� செய�ய விர�ம�ப�கிறீர�கள�?"
+msgstr ""
+"நீங�கள� மீண�ட�ம� நிகழ�ம� ச�ழல� க�றிப�பில� மாற�றம� செய�கிறீர�கள�. என�ன மாற�றம� செய�ய "
+"விர�ம�ப�கிறீர�கள�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "இந�த நிகழ�வ� மட�ட�ம�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "இந�த மற�ற�ம� ம�ந�தைய நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "இந�த மற�ற�ம� இனிவர�ம� நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "எல�லா நிகழ�வ�கள�ம�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "இந�த நேர ஒத�க�கீட�டில� மீண�ட�ம� வந�த�ள�ளதால� எவல�யூஷனால� திர�த�த ம�டியாத�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "இயக�க�"
 
@@ -6345,7 +6802,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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "ம�தல�"
 
@@ -6354,7 +6811,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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "இரண�டாவத�"
 
@@ -6362,7 +6819,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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "மூன�றாவத�"
 
@@ -6370,7 +6827,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "நான�காவத�"
 
@@ -6378,13 +6835,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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "கடைசி"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "மற�ற தேதிகள�"
 
@@ -6392,7 +6849,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1 ம�தல� 10 வரை"
 
@@ -6400,7 +6857,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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11 ம�தல� 20 வரை"
 
@@ -6408,45 +6865,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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21 ம�தல� 31 வரை"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "நாள�"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "மேல�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "விதிவிலக�கை சேர�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "மாற�ற ஒர� தேர�வ� இல�லை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "விதிவிலக�கை மாற�றியமை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "நீக�க ஒர� தேர�வ� இல�லை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "தேதி/நேரம�"
 
@@ -6455,7 +6912,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>பிழைகள�</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>ம�ன� தோற�றம�</b>"
 
@@ -6497,12 +6954,12 @@ msgstr "வாரம�(கள�)"
 msgid "year(s)"
 msgstr "வர�டம�(கள�)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "ம�டிந�த தேதியில� தவற�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "இணைய பக�கம�"
 
@@ -6517,48 +6974,55 @@ msgstr "<span weight=\"bold\">நிலை</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:474 ../calendar/gui/e-itip-control.c:923
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
+#: ../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-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
 msgid "Completed"
 msgstr "ம�டிவ�ற�றத�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:399 ../mail/message-list.c:1034
+#: ../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
 msgid "High"
 msgstr "அதிக"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:473 ../calendar/gui/print.c:2345
+#: ../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
 msgid "In Progress"
 msgstr "நடந�த�கொண�டிர�க�கிறத�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:401 ../mail/message-list.c:1032
+#: ../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
 msgid "Low"
 msgstr "க�றைவாக"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:400
-#: ../mail/message-list.c:1033
+#: ../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
 msgid "Normal"
 msgstr "இயல�பாக"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:472 ../calendar/gui/print.c:2342
+#: ../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/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "த�வங�கவில�லை"
 
@@ -6571,7 +7035,7 @@ msgid "Stat_us:"
 msgstr "நிலை: (_u)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "க�றிப�பில�லா"
 
@@ -6580,7 +7044,7 @@ msgid "_Date completed:"
 msgstr "(_D) தேதி ம�டிந�தத�"
 
 #: ../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 "(_P)ம�ன�ன�ரிமை"
 
@@ -6588,20 +7052,37 @@ msgstr "(_P)ம�ன�ன�ரிமை"
 msgid "_Web Page:"
 msgstr "(_W)இணைய பக�கம�:"
 
-#: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/dialogs/task-editor.c:111
+msgid "_Status Details"
+msgstr "நிலை விவரங�கள� (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "Click to change or view the status details of the task"
+msgstr "பணியின� நிலை விவரங�களை மாற�ற / பார�வையிட சொட�க�கவ�ம�"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "அன�ப�ப�ம� விர�ப�பங�கள� (_S) "
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "(_T)பணி"
 
-#: ../calendar/gui/dialogs/task-editor.c:428
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "பணி விவரங�கள�"
 
-#: ../calendar/gui/dialogs/task-page.c:851
+#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "(_z) ஒர�ங�கிணைப�பாளர�:"
+
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "நில�வை தேதி தவறாக உள�ளத�"
 
-#: ../calendar/gui/dialogs/task-page.c:1719
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'. இல� பணியை திறக�கம�டியவில�லை"
@@ -6615,194 +7096,163 @@ msgid "Categor_ies..."
 msgstr "வகைகள�... (_i)"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_வ விளக�கம�:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "ஒர�ங�கிணைப�பாளர�: (_g)"
+msgid "D_ue date:"
+msgstr "(_D)நில�வை தேதி:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "நேரம� மண�டலம�:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "(_D)நில�வை தேதி:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d நாட�கள�"
-msgstr[1] ""
+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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] "%d வாரங�கள�"
-msgstr[1] ""
+msgstr[0] "%d வாரம�"
+msgstr[1] "%d வாரங�கள�"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "தெரியாத செயல� நிகழ�ந�தத�"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s தெரியாத த�வக�க வகை"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3001
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "%s திறக�க க�ளிக� செய�யவ�ம�"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "தலைப�பில�லா"
 
-#: ../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
+#: ../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 "த�வக�க தேதி:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../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 "விளக�கம�:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "இணைய பக�கம�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../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 "ச�ர�க�கம�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "நில�வை தேதி:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "நிலை:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "ம�ன�ன�ரிமை:"
 
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:377
-msgid "Public"
-msgstr "பொத�வான"
-
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:378
-msgid "Private"
-msgstr "தனிப�பட�ட"
-
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:379
-msgid "Confidential"
-msgstr "நம�பகமான"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "ம�டிய�ம� தேதி:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "த�வக�க தேதி"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "ச�ர�க�கம�"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:451
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "வேலையில� இல�லை�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:452
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "வேலையில�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6812,204 +7262,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "ஆம�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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 "இல�லை"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1210
-#: ../plugins/itip-formatter/itip-formatter.c:394
-#: ../plugins/itip-formatter/itip-formatter.c:1945
-#: ../plugins/plugin-manager/plugin-manager.c:82
-#: ../widgets/misc/e-attachment-bar.c:724
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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-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
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "தெரியாத�"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "மீண�ட�ம�நடக�கிறத�"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "ஒத�க�கப�பட�ட"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:422
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "எனச�சேமி......"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "தேர�ந�தெட�த�த இணைப�ப�களை சேமிக�க அடைவினை தேர�தெட�"
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:450
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "(_i)தலைப�பில�லா பிம�பம�.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1355
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:977
-#: ../mail/em-folder-view.c:1229 ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "(_S)எனச�சேமி..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:568
-#: ../mail/em-popup.c:579
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "(_B)பின�னனியாக அமை"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "தேர�ந�தெட�த�ததை சேமி (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:789
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "%s இல� திற..."
 
-#: ../calendar/gui/e-calendar-table.c:421
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "ஒர�ங�கிணைப�பாளர�: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "த�வக�க�:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "நில�வை:"
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:422
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:423
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:424
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:425
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:426
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:427
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:428
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:429
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:430
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:431
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:716
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:494
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "தேர�வ� செய�யப�பட�ட பொர�ள� நீக�கப�பட�கிறத�"
 
-#: ../calendar/gui/e-calendar-table.c:995
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:697
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "பொர�ள� ப�த�ப�பிக�கப�பட�கிறத�"
 
-#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:872
-#: ../composer/e-msg-composer.c:1405
+#: ../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:277
 msgid "Save as..."
 msgstr "எனச�சேமி..."
 
-#: ../calendar/gui/e-calendar-table.c:1350
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "ப�திய பணி (_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1354 ../calendar/gui/e-memo-table.c:976
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "(_W)இணைய பக�கத�தை திற"
 
-#: ../calendar/gui/e-calendar-table.c:1356
-#: ../calendar/gui/e-calendar-view.c:1665
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:978
-#: ../mail/em-folder-view.c:1230
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "(_P)அச�சடி..."
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr "(_r)அச�சடி..."
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:982
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "(_u)வெட�ட�"
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1668
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:984
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "(_P)ஒட�ட�"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "(_A)பணியை ஒத�க�க�"
 
-#: ../calendar/gui/e-calendar-table.c:1367 ../calendar/gui/e-memo-table.c:988
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "(_F)iநாள�காட�டியாக அன�ப�ப�"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "(_M)ம�டிவ�ற�றத� என க�றி"
 
-#: ../calendar/gui/e-calendar-table.c:1369
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "(_M)தேர�வ� செய�யப�பட�ட பணி ம�டிந�தத� என க�றி"
 
-#: ../calendar/gui/e-calendar-table.c:1370
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "ம�டிவ�றாதத� என க�றிக�கவ�ம� (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1371
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "தேர�வ� செய�யப�பட�ட பணி ம�டியாதத� என க�றிக�கவ�ம� (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1376
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "தேர�ந�தெட�க�கப�பட�ட பணியை அழிக�கவ�ம� (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ஒர� பணியை சேர�க�க சொட�க�கவ�ம�"
@@ -7032,7 +7503,8 @@ msgid "Due date"
 msgstr "நில�வை தேதி"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "ம�ன�ன�ரிமை"
 
@@ -7040,112 +7512,93 @@ msgstr "ம�ன�ன�ரிமை"
 msgid "Start date"
 msgstr "த�வக�க தேதி"
 
-#: ../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 "நிலை"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "பணி அட�க�க�"
-
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "உர�ப�படிகளை நகர�த�த�கிறத�"
 
-#: ../calendar/gui/e-calendar-view.c:1350
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "உர�ப�படிகளை நகலெட�க�கிறத�"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "(_A)ப�திய நேர ஒத�க�கங�கள�..."
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "(_E)எல�லா நாட�கள�க�க�மான நிகழ�வ�கள�"
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "ப�திய சந�திப�ப� (_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "(_C)தற�போதைய காட�சி"
 
-#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "இன�றைய தேதியை தேர�ந�தெட� (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "(_S)தேதியை தேர�வ� செய�.."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1673
+msgid "Pri_nt..."
+msgstr "(_n)அச�சடி..."
+
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "(_y)நாள�காட�டியில� நகலெட�..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "(_v)நாள�காட�டிக�க� நகர�த�த�..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "பேராளர� சந�திப�ப�... (_D)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "சந�திப�பினை திட�டமிட�... (_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "(_F)iநாள�காட�டியாக அன�ப�ப�..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "பதில� (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1223
-#: ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "(_A) அனைவர�க�க�ம� பதிலலி"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "(_M)இந�த தர�வாயை நகர�த�தகூடியதாக�க�"
 
-#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "(_O)இந�த மற�நிகழ�வை நீக�க�"
 
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "(_A)எல�லா மற�நிகழ�வ�களைய�ம� நீக�க�"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2201
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "ஒர�ங�கிணைப�பாளர�: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2205
-#, c-format
-msgid "Organizer: %s"
-msgstr "ஒர�ங�கிணைப�பாளர�: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2221 ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "இடம�: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2252
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "நேரம�: %s %s"
@@ -7173,7 +7626,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:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i நிமிட பக�ப�ப�கள�"
@@ -7184,56 +7637,42 @@ 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:1336
-#: ../calendar/gui/e-day-view.c:2098
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
+#: ../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
 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:749 ../calendar/gui/e-day-view.c:1095
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "ம�ப"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-day-view.c:1098
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "பிப"
 
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ஆம� (கடினமான மற�நிகழ�வ�)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] "எல�லா %d  நாட�கள�ம�"
-msgstr[1] ""
+msgstr[0] "தினம�ம�"
+msgstr[1] "எல�லா %d  நாட�கள�ம�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
-msgstr[0] "எல�லா %d வாரங�கள�ம�"
-msgstr[1] ""
+msgstr[0] "ஒவ�வொர� வாரம�ம�"
+msgstr[1] "எல�லா %d வாரங�கள�ம�"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7241,88 +7680,72 @@ msgstr[0] "ஒவ�வொர� வாரத�தில�ம� இந�த
 msgstr[1] "ஒவ�வொர� %d வாரங�களில�ம� இந�த நாள�"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " மற�ற�ம� "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s நாளில�"
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:821
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr " %s %s இல�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:834
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
-msgstr[0] "எல�லா %d மாதங�கள�ம�"
-msgstr[1] ""
+msgstr[0] "ஒவ�வொர� மாதம�ம�"
+msgstr[1] "எல�லா %d மாதங�கள�ம�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:843
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
-msgstr[0] "எல�லா %d வர�டங�கள�ம�"
-msgstr[1] ""
+msgstr[0] "ஒவ�வொர� வர�டம�ம�"
+msgstr[1] "எல�லா %d வர�டங�கள�ம�"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] "%d மொத�த நேரம�"
-msgstr[1] ""
+msgstr[0] "மொத�தம� %d நேரம�"
+msgstr[1] "மொத�தம� %d நேரங�கள�"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", ம�டிந�த"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "த�வங�கிய"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "ம�டிந�த"
 
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "நில�வை"
 
-#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iநாள�காட�டி தகவல�"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iநாள�காட�டி பிழை"
 
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
+#: ../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
@@ -7333,292 +7756,292 @@ msgid "An unknown person"
 msgstr "தெரியாத நபர�"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../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> இந�த தகவலை பார�த�த பிறக� அதற�காக செயலை கீழ�ள�ள மென�விலிர�ந�த� தேர�வ� செய�யவ�ம�"
 
-#: ../calendar/gui/e-itip-control.c:1164
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:730
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../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:2034
 msgid "Accepted"
 msgstr "�ற�கப�பட�டத�"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:1936
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "�ற�கப�படலாம�"
 
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:1939
+#: ../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:2040
 msgid "Declined"
 msgstr "நிராகரிக�கப�பட�டத�"
 
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../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:1258
+#: ../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:1337
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> கூட�டம� பற�றிய தகவல� பதிப�பிக�கப�பட�டத�"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "கூட�டம� பற�றிய தகவல�"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../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> கூட�டத�தின� போத� %s இன� வர�கை ம�க�கியம�"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> கூட�டத�திற�க� உங�கள� வர�கை அவசியம�"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "கூட�ட அன�மதி"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../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> இர�ப�பில� உள�ள சந�திப�ப�க�க� சேர�க�கப�பட விர�ம�ப�கிறார�."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "கூட�ட நிகழ�வ�கள�"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> சமீபத�திய கூட�ட தகவலை பெற விர�ம�ப�கிறார�"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "கூட�ட தகவல� கோரிக�கை"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> கூட�ட தகவல�க�க� பதிலலித�த�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "கூட�ட பதில�"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> கூட�டத�தை ரத�த� செய�த�விட�டார�."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "சந�திப�ப� ரத�த� செய�யப�பட�கிறத�"
 
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c: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> தவறான செய�தி அன�ப�பி உள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "தவறான கூட�ட செய�தி"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> பணி தகவலை பதிப�பித�த�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "பணி தகவல�"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>இந�த வேலையை %s செய�ய கோரிக�கை விட�த�த�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> இந�த வேலையை நீங�கள� செய�யவேண�ட�ம� என�கிறார�"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "பணி கோரிக�கை"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../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> இர�ப�பில� உள�ள பணிக�க� சேர�க�கப�பட விர�ம�ப�கிறார�."
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "பணி திர�த�தம�"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> சமீபத�திய பணி பற�றிய தகவலை தெரிந�த�கொள�ள விர�ம�ப�கிறார�."
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "பணி ப�த�ப�பித�தல� கோரிக�கை"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>பணி ஒத�க�கத�த�க�க� பதிலலித�த�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "பணி பதில�"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> பணியை ரத�த� செய�த� விட�டார�"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "பணி ரத�த� செய�யப�பட�கிறத�"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "தவறான பணி செய�தி"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> வேலையில�/வேலையில� இல�லை செய�தியை பதிப�பித�த�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "வேலையிலில�லை/வேலையில� தகவல�"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>நீங�கள� வேலையில�இர�க�கிறீர�களா/இல�லையா தகவலை கேட�ட�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "வேலையில�/இல�லை கோரிக�கை"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>வேலையில�/இல�லை தகவல�க�க� பதிலலித�த�ள�ளார�"
 
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "வேலையில�/இல�லை பதில�"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "தவறான வேலையில�/இல�லை செய�தி"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "செய�தி சரியாக அமைக�கப�படவில�லை என தெரிகிறத�"
 
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "செய�தியில� ஆதரவ� இல�லாத கோரிக�கைகள� உள�ளத�"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "இணைப�ப� செய�தியில� சரியான நாள�காட�டி செய�தி இல�லை"
 
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "இணைப�பில� பார�க�க ம�டிந�த நாள�காட�டி இல�லை"
 
-#: ../calendar/gui/e-itip-control.c:1944
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "மேம�பட�த�தல� ம�டிந�தத�\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "பொர�ள� செல�லாத� அதனால� மேம�பட�த�த ம�டியாத�\n"
 
-#: ../calendar/gui/e-itip-control.c:1994
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "இந�த பதில� தற�போதைய பங�கேற�பாளரிடமிர�ந�த� அல�லத�. இவரை சேர�க�கலாமா?"
 
-#: ../calendar/gui/e-itip-control.c:2012
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "பங�கேற�பாளரின� நிலை செல�லாத� அதனால� ப�த�ப�பிக�க ம�டியவில�லை\n"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "பங�கேற�பாளர� நிலை ப�த�ப�பிக�கபட�டத�\n"
 
-#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1229
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "பங�கேற�பாளர� நிலை ப�த�ப�பிக�கப�படாதற�க� காரணம� இவர� பட�டியலில� இல�லை"
 
-#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "உர�ப�படி அன�ப�பப�பட�டத�\n"
 
-#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "உர�ப�படி அன�ப�ப ம�டியவில�லை!\n"
 
-#: ../calendar/gui/e-itip-control.c:2223
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "செயலை தேர�வ� செய�:"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "திர�த�த�"
 
-#: ../calendar/gui/e-itip-control.c:2324
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "�ற�கப�பட�டத�"
 
-#: ../calendar/gui/e-itip-control.c:2325
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "�ற�கப�படலாம�"
 
-#: ../calendar/gui/e-itip-control.c:2326
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "நிராகரிக�கப�பட�டத�"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "வேலைஇல�லை /வேலையில� தகவலை அன�ப�ப�"
 
-#: ../calendar/gui/e-itip-control.c:2383
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "பதில� தர�பவரின� நிலையை ப�த�ப�பி"
 
-#: ../calendar/gui/e-itip-control.c:2411
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "தற�போதைய தகவலை அன�ப�ப�"
 
-#: ../calendar/gui/e-itip-control.c:2439 ../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 "ரத�த� செய�"
@@ -7647,108 +8070,112 @@ msgstr "நாளà¯�காடà¯�டி à®�à®±à¯�றபà¯�படà¯�கிறதà¯
 msgid "Server Message:"
 msgstr "சேவகன� செய�தி:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "நட�வர�"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "தேவையான பங�களிப�ப�"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "மற�ற பங�கேற�பாளர�கள� "
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "மூலங�கள�"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "கலந�த�கொள�பவர�கள�"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-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
 msgid "Individual"
 msgstr "தனிநபர�"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../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:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "க�ழ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "மூலங�கள�"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "அறை"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "நட�வர�"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-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
 msgid "Required Participant"
 msgstr "தேவையான பங�கேற�பாளர�கள�"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "பங�கேற�பாளர�கள�"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "பங�கேற�காதவர�கள�"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-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 "செயல� தேவை"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c: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:397
 msgid "Tentative"
 msgstr "தோராயமாக"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:739
-#: ../plugins/itip-formatter/itip-formatter.c:1942
+#: ../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
 msgid "Delegated"
 msgstr "விர�ந�தினராக"
 
 #. 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:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "செயலில� உள�ளத�"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7756,85 +8183,81 @@ 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:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "அல�வலகத�திற�க� வெளியில�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "தகவல� இல�லை"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "கலந�த�கொள�பவர�கள�... (_t)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "விர�ப�பங�கள� (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "வேலை நேரத�தை மட�ட�ம� காட�ட� (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "(_z) பெரிதாக�கபப�ட�டத�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "(_U)வேலை/வேலையில�லை தகவலை ப�த�ப�பி"
 
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "(_A)வேகமாகதேர�வ� செய�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "(_A)எல�லோர�ம� மற�ற�ம� மூலங�கள�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "(_p)எல�லோர�ம� மற�ற�ம� ஒரே ஒர� மூலம� மட�ட�ம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "(_R)தேவையானவர�கள� மட�ட�ம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "(_o)தேவையானவர�கள� மற�ற�ம� ஒர� மூலம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "(_S)த�வக�க நேரம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "(_E)ம�டிய�ம� நேரம�:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "கலந�த�கொள�பவர�கள�"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "எல�லா பங�கேற�பாளர�களைய�ம� க�ளிக� செய�த� சேர�க�கவ�ம�"
@@ -7859,20 +8282,16 @@ msgstr "மொழி"
 msgid "Member"
 msgstr "உற�ப�பினர�"
 
-#: ../calendar/gui/e-memo-table.c:993
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "தேர�ந�தெட�த�த க�றிப�பினை அழி (_D)"
 
-#: ../calendar/gui/e-memo-table.c:1144 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ஒர� க�றிப�பினை சேர�க�க சொட�க�கவ�ம�"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "க�றிப�ப� வரிசை"
-
-#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2828
+#: ../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"
@@ -7881,85 +8300,80 @@ msgstr ""
 "%s: இல� பிழை\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:781
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "க�றிப�பினை �ற�ற�கிறத�"
 
-#: ../calendar/gui/e-memos.c:862
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s இல� க�றிப�பினை திறக�கிறத�"
 
-#: ../calendar/gui/e-memos.c:1035 ../calendar/gui/e-tasks.c:1249
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "தேர�வ� செய�யப�பட�ட பொர�ள� நீக�கப�பட�கிறத�..."
 
-#: ../calendar/gui/e-tasks.c:894
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "பணியை �ற�ற�கிறத�"
 
-#: ../calendar/gui/e-tasks.c:981
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s இல� பணியை திறக�கிறத�"
 
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "பணி ம�டிகிறத�..."
 
-#: ../calendar/gui/e-tasks.c:1276
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "அழிக�கிறத�"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:824
-msgid "Updating query"
-msgstr "கேள�வி ப�த�ப�பிக�கப�பட�கிறத�"
-
-#: ../calendar/gui/gnome-cal.c:2479
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "தனிபயன� காட�சி (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2480
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "தனிப�பயன� காட�சியை சேமி (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2485
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "காட�சிகளை க�றிப�பிட�... (_D)"
 
-#: ../calendar/gui/gnome-cal.c:2651
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr " %s இல� நேர ஒத�க�கத�தை �ற�ற�கிறத�"
 
-#: ../calendar/gui/gnome-cal.c:2670
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s இல� வேலையை �ற�ற�கிறத�"
 
-#: ../calendar/gui/gnome-cal.c:2679
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ல� க�றிப�ப�களை �ற�ற�கிறத�"
 
-#: ../calendar/gui/gnome-cal.c:2787
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s� திறக�கிறத�"
 
-#: ../calendar/gui/gnome-cal.c:3726
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "தூய�மை பட�த�த�கிறத�"
 
@@ -8019,57 +8433,57 @@ msgstr "செப�டம�பர�"
 msgid "_Select Today"
 msgstr "(_S)இன�றைய தேதியை தேர�வ� செய�"
 
-#: ../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 "ஒர�ங�கிணைப�பாளர� அமைக�கப�பட வேண�ட�ம�"
 
-#: ../calendar/gui/itip-utils.c:487
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "ஒர� பங�கேற�பாளராவத� தேவை"
 
-#: ../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 "நிகழ�வ� தகவல�"
 
-#: ../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 "பணி தகவல�"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "க�றிப�ப� இல�லை"
 
-#: ../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 "வேலை/வேலையிலில�லை தகவல�"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "நாள�காட�டி தகவல�"
 
-#: ../calendar/gui/itip-utils.c:749
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "ப�த�ப�பிக�கப�பட�கிறத�"
 
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "ப�த�ப�பி"
 
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "எதிர�-கோரிக�கை"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "வேலை/வேலையில�லை தகவல�(%s %s க�க�)"
 
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iநாள�காட�டி தகவல�"
 
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "இந�த நிகழ�வில� நீங�கள� கலந�த�கொள�ள வேண�ட�ம�"
 
@@ -8077,78 +8491,85 @@ msgstr "இந�த நிகழ�வில� நீங�கள� கலந
 msgid "_New Memo List"
 msgstr "ப�திய க�றிப�ப� பட�டியல� (_N)"
 
-#: ../calendar/gui/memos-component.c:540
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d க�றிப�ப�"
 msgstr[1] "%d க�றிப�ப�கள�"
 
-#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d தேர�வ� செய�யப�பட�டத�"
-msgstr[1] ""
+msgstr[1] ", %d தேர�வ� செய�யப�பட�டன"
 
-#: ../calendar/gui/memos-component.c:589
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "க�றிப�ப�களை மேம�பட�த�த ம�டியவில�லை."
 
-#: ../calendar/gui/memos-component.c:897
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "'%s' நிகழ�வ� மற�ற�ம� சந�திப�பினை உர�வாக�க க�றிப�ப� பட�டியலை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/memos-component.c:910
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "க�றிப�ப�களை உர�வாக�க நாள�காட�டி எத�வ�மில�லை"
 
-#: ../calendar/gui/memos-component.c:1006
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "க�றிப�ப� மூல தேர�வாளர�"
 
-#: ../calendar/gui/memos-component.c:1189
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "ப�திய க�றிப�ப�"
 
-#: ../calendar/gui/memos-component.c:1190
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
-msgstr "க�றிப�ப�_o"
+msgstr "க�றிப�ப� (_o)"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "ப�திய க�றிப�பினை உர�வாக�க�"
 
-#: ../calendar/gui/memos-component.c:1197
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "ப�திய க�றிப�பின� பங�க�"
 
-#: ../calendar/gui/memos-component.c:1198
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
-msgstr "_ பங�க� க�றிப�ப�கள�"
+msgstr "(_S) பங�கிட�ம� க�றிப�ப�கள�"
 
-#: ../calendar/gui/memos-component.c:1199
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "ப�திய க�றிப�பினை பற�றி உர�வாக�க�"
 
-#: ../calendar/gui/memos-component.c:1205
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "ப�திய க�றிப�ப� பட�டியல�"
 
-#: ../calendar/gui/memos-component.c:1206
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
-msgstr "க�றிப�ப� பட�டியல�_s "
+msgstr "க�றிப�ப� பட�டியல� (_s)"
 
-#: ../calendar/gui/memos-component.c:1207
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "ஒர� ப�திய க�றிப�ப� பட�டியலை உர�வாக�க�"
 
-#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "க�றிப�ப�களைஅச�சிட�"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "அட�த�த 7 தினங�கள�"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8159,7 +8580,7 @@ msgstr ""
 "\n"
 "எவல�யூஷன� உங�கள� அடைவ�களை நகர�த�த�ம� வரை காத�திர�க�கவ�ம�"
 
-#: ../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"
@@ -8171,290 +8592,297 @@ 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 "எவல�ஷன�/config.xmldb லிர�ந�த� பழைய அமைப�ப�களை நகர�த�த ம�டியவில�லை"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "`%s' நாள�காட�டியை நகர�த�த ம�டியவில�லை"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "%s' பணியை நகர�த�த ம�டியவில�லை"
 
-#: ../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
+#: ../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
 msgid "Notes"
 msgstr "க�றிப�ப�கள�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "ம�தல�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "2வத�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "3வத�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "4வத�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "5வத�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "6வத�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "7வத�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "8வத�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "9வத�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "10வத�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "11வத�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "12வத�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "13வத�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "14th"
 msgstr "14வத�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "15th"
 msgstr "15வத�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "16வத�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "17வத�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "18வத�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "19வத�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "20வத�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "21வத�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "22வத�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "23வத�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "24வத�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "25வத�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "26வத�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "28வத�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "29வத�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "29வத�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "30வத�"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "31வத�"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "ஞா"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "தி"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "செ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "ப�"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "வி"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "வெ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "ச"
 
-#: ../calendar/gui/print.c:2283
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "நேர ஒத�க�கங�கள�"
 
-#: ../calendar/gui/print.c:2285
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "பணி"
 
-#: ../calendar/gui/print.c:2307
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "ச�ர�க�கம�: %s"
 
-#: ../calendar/gui/print.c:2358
+#: ../calendar/gui/print.c:2522
+msgid "Attendees: "
+msgstr "கலந�த�கொள�பவர�கள�:"
+
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "நிலை : %s"
 
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "ம�ன�ன�ரிமை: %s"
 
-#: ../calendar/gui/print.c:2387
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ம�டிந�த விகிதம� : %i"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "வகைகள�: %s"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "தொடர�ப�கள�:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2524
-msgid "Upcoming Appointments"
-msgstr "வர�ம� நேர ஒத�க�க �ற�பாட�கள�"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "ப�திய பணிபட�டியல� (_N)"
 
-#: ../calendar/gui/tasks-component.c:531
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d பணி"
-msgstr[1] ""
+msgstr[1] "%d பணிகள�"
 
-#: ../calendar/gui/tasks-component.c:580
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "பணியை மேம�பட�த�தல� தோல�வியில� ம�டிந�தத�"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "'%s' நிகழ�வ� மற�ற�ம� கூட�டத�தை உர�வாக�க பணி பட�டியலை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/tasks-component.c:904
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "பணியை உர�வாக�க நாள�காட�டி எத�வ�மில�லை"
 
-#: ../calendar/gui/tasks-component.c:1001
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "பணி மூல தேர�வாளர�"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "ப�திய பணி"
 
-#: ../calendar/gui/tasks-component.c:1259
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "(_T) பணி"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "ப�திய பணியை உர�வாக�க�"
 
-#: ../calendar/gui/tasks-component.c:1265
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "ப�திய பணியை ஒத�க�க�"
 
-#: ../calendar/gui/tasks-component.c:1266
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "(_d)ஒத�க�கிய பணி"
+msgstr "(_d) ஒத�க�கிய பணி"
 
-#: ../calendar/gui/tasks-component.c:1267
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "ஒத�க�கப�பட�ட ப�திய பணியை உர�வாக�க�"
 
-#: ../calendar/gui/tasks-component.c:1273
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "ப�திய பணிபட�டியல�"
 
-#: ../calendar/gui/tasks-component.c:1274
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "பணி பட�டியல�(_i)"
+msgstr "பணி பட�டியல� (_i)"
 
-#: ../calendar/gui/tasks-component.c:1275
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "ப�திய பணிபட�டியலயை உர�வாக�க�"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../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"
@@ -8466,1677 +8894,1895 @@ msgstr ""
 "\n"
 "பணிகளை அழிக�க விர�ம�ப�கிறீர�களா?"
 
-#: ../calendar/gui/tasks-control.c:441
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "என�னிடம� மீண�ட�ம� கேட�காதே"
 
-#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "பணியை அச�சடி"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "SMTWTFS"
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% ம�டிந�தத�"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "ரத�த� செய�யப�பட�டத�"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "நடந�த�கொண�டிர�க�கிறத�"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "விடப�பெரிய"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "விட சிறிய"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "நேர ஒத�க�கங�கள� மற�ற�ம� கூட�டங�கள�"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "நாள�காட�டியை திறக�கிறத�"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iநாள�காட�டி கோப�ப�கள� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "எவல�யூஷன� iநாள�காட�டி �ற�றி"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "நினைவில�கொள�!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vநாள�காட�டி கோப�ப�கள� (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "எவல�யூஷன�vநாள�காட�டி �ற�றி"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "நாள�காட�டி நிகழ�வ�கள�"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 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)
+#. *
+#.
+#.
 #. * 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 "ஆப�ரிக�கா/அபிட�ஜான�"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "ஆப�ரிக�கா/அக�ரா"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "ஆப�ரிக�கா/அடிஸ�_அபபா"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "ஆப�ரிக�கா/அல�க�ரிஸ�"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "ஆப�ரிக�கா/அஸ�மெரா"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "ஆப�ரிக�கா/பமகொ"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "ஆப�ரிக�கா/பான�க�யூ"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "ஆப�ரிக�கா/பன�ஜ�ல�"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "ஆப�ரிக�கா/பிஸ�ஸாவ�"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "ஆப�ரிக�கா/ப�ளான�டைரி"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "ஆப�ரிக�கா/ப�ராஸ�வில�லா"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "ஆப�ரிக�கா/ப�ஜ�ம�ப�ரா"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "ஆப�ரிக�கா/கைய�ரொ"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "ஆப�ரிக�கா/கசப�லாகா"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "ஆப�ரிக�கா/சியூடா"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "ஆப�ரிக�கா/கொனக�ரி"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "ஆப�ரிக�கா/டகார�"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "ஆப�ரிக�கா/டார�_ஸ�_சலாம�"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "ஆப�ரிக�கா/டிஜ�போடி"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "ஆப�ரிக�கா/டோய�லா"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "ஆப�ரிக�கா/எல�_�ய�ன�"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "ஆப�ரிக�கா/ஃபீரீடௌன�"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "ஆப�ரிக�கா//கப�ரொனி"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "ஆப�ரிக�கா/ஹராரி"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "ஆப�ரிக�கா/ஜொஹனஸ�பர�க�"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "ஆப�ரிக�கா/கம�பாலா"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "ஆப�ரிக�கா/கஹடொய�ம�"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "ஆப�ரிக�கா/கிகாலி"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "ஆப�ரிக�கா/கின�ஷஷா"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "ஆப�ரிக�கா/லகோஸ�"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "ஆப�ரிக�கா/லிபெர�வில�லா"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "ஆப�ரிக�கா/லொமி"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "ஆப�ரிக�கா/லௌனாடா"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "ஆப�ரிக�கா/ல�ப�ம�பாஷி"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "ஆப�ரிக�கா/ல�ஷாகா"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "ஆப�ரிக�கா/மலபொ"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "ஆப�ரிக�கா/மாப�டோ"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "ஆப�ரிக�கா/மசார�"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "ஆப�ரிக�கா/மபானானே"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "ஆப�ரிக�கா/மகடிஷ�"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "ஆப�ரிக�கா/மொரொவியா"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "ஆப�ரிக�கா/நைரோபி"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "ஆப�ரிக�கா/நஜமினா"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "ஆப�ரிக�கா/நியாமி"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "ஆப�ரிக�கா/நௌக�சோட�"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "ஆப�ரிக�கா/ஒகடோக�"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "ஆப�ரிக�கா/போர�டோ-நோவா"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "ஆப�ரிக�கா/சாவோ_டோம�"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "ஆப�ரிக�கா/டிம�ப�க�"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "ஆப�ரிக�கா/டிரிபோலி"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "ஆப�ரிக�கா/ட�னிஸ�"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "ஆப�ரிக�கா/வின�ஹொக�"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "அமெரிக�கா/அடாக�"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "அமெரிக�கா/ஆங�கோராஞ�"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "அமெரிக�கா/அங�க�லியா"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "அமெரிக�கா/ஆன�டிக�வா"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "அமெரிக�கா/அரக�னியா"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "அமெரிக�கா/அரூபா"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "அமெரிக�கா/ஆச�னியான�"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "அமெரிக�கா/பாப�பெடாஸ�"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "அமெரிக�கா/பெலிம�"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "அமெரிக�கா/பெலிஸ�"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "அமெரிக�கா/போ_விஸ�டா"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "அமெரிக�கா/பொகோடா"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "அமெரிக�கா/போயிஸ�"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "அமெரிக�கா/போனஸ�_�ரிஸ�"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "அமெரிக�கா/கேம�பிரிஜ�_வளைக�டா"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "அமெரிக�கா/கான�கன�"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "அமெரிக�கா/கரகஸ�"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "அமெரிக�கா/கடமர�கா"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "அமெரிக�கா/கெயென�னி"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "அமெரிக�கா/கேமான�"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "அமெரிக�கா/சிக�காகோ"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "அமெரிக�கா/சிஹ�வாஹ�வா"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "அமெரிக�கா/கோர�டோபா"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "அமெரிக�கா/கோஸ�டா_ரிக�கா"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "அமெரிக�கா/க�ய�பா"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "அமெரிக�கா/க�ரகோவா"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "அமெரிக�கா/டென�மார�ஷான�"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "அமெரிக�கா/டௌசான�"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "அமெரிக�கா/டௌசன�_க�ரீக�"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "அமெரிக�கா/டென�வர�"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "அமெரிக�கா/டெட�ராயிட�"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "அமெரிக�கா/டொமினிக�கா"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "அமெரிக�கா/எட�மான�டன�"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "அமெரிக�கா/எர�ரனிப�"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "அமெரிக�கா/எல�-சால�வடார�"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "அமெரிக�கா/ஃபோர�ட�லெசா"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "அமெரிக�கா/க�ளேஸ�_வளைக�டா"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "அமெரிக�கா/காட�தாப�"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "அமெரிக�கா/கூஸ�_வளைக�டா"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "அமெரிக�கா/க�ரான�ட�_டர�க�"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "அமெரிக�கா/க�ரெனடா"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "அமெரிக�கா/க�வாடிலோப�"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "அமெரிக�கா/க�வாதிமாலா"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "அமெரிக�கா/க�யாக�க�ள�"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "அமெரிக�கா/க�யானா"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "அமெரிக�கா/ஹாலிஃபாக�ஸ�"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "அமெரிக�கா/ஹவானா"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "அமெரிக�கா/ஹெர�மொசில�லோ"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "அமெரிக�கா/இன�டியானா/இன�டியானாபோலிஸ�"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "அமெரிக�கா/இன�டியானா/க�னாக�ஸ�"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "அமெரிக�கா/இன�டியானா/மாரிங�கோ"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "அமெரிக�கா/இன�டியானா/வீவாய�"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "அமெரிக�கா/இன�டியானாபோலிஸ�"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "அமெரிக�கா/இன�விக�"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "அமெரிக�கா/க�வால�ட�"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "அமெரிக�கா/ஜமைக�கா"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "அமெரிக�கா/ஜ�ஜ�ய�"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "அமெரிக�கா/ஜ�னெய�"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "அமெரிக�கா/கென�டகி/லோஸ�வில�லா"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "அமெரிக�கா/கென�டகி/மோன�டிசிலோ"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "அமெரிக�கா/லா_பாஸ�"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "அமெரிக�கா/லிமா"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "அமெரிக�கா/லாஸ�_�ஞ�சல�ஸ�"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "அமெரிக�கா/லௌஸ�வில�லா"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "அமெரிக�கா/மெக�சிகோ"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "அமெரிக�கா/மனாக�வா"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "அமெரிக�கா/மானஸ�"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "அமெரிக�கா/மார�டினிக�"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "அமெரிக�கா/மசட�லான�"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "அமெரிக�கா/மென�டோஸா"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "அமெரிக�கா/மெனொமினீ"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "அமெரிக�கா/மெரிடா"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "அமெரிக�கா/மெக�சிகோ_நகரம��கோ"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "அமெரிக�கா/மிக�யூலான�"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "அமெரிக�கா/மோன�டெரி"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "அமெரிக�கா/மொன�டெவிடீயோ"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "அமெரிக�கா/மோன�ட�ரியல�"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "அமெரிக�கா/மோன�ஸெராட�"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "அமெரிக�கா/நசாச�"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "அமெரிக�கா/நீயூ_யார�க�"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "அமெரிக�கா/நிபிகான�"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "அமெரிக�கா/நோமி"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "அமெரிக�கா/நொரொன�ஹா"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "அமெரிக�கா/வடக�க�_டகொடா/மத�திய"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "அமெரிக�கா/பனாமா"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "அமெரிக�கா/பாங�கிர�டங�"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "அமெரிக�கா/பரமரிபோ"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "அமெரிக�கா/போனிக�ஸ�"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "அமெரிக�கா/போர�ட�-ஔ-ப�ரின�ஸ�"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "அமெரிக�கா/போர�ட�-ஆஃப�-ஸ�பெயின�"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "அமெரிக�கா/போர�டோ_வெல�ஹோ"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "அமெரிக�கா/ப�யூடோ_ரிக�கோ"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "அமெரிக�கா/ரெய�னி_ரிவர�"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "அமெரிக�கா/ராங�கின�_இன�லெட�"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "அமெரிக�கா/ரெக�பி"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "அமெரிக�கா/ரெகினா"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "அமெரிக�கா/ரியோ_ப�ராங�கோ"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "அமெரிக�கா/ரொசாரியோ"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "அமெரிக�கா/சான�டியாகோ"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "அமெரிக�கா/சான�டோ_சொமிங�கோ"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "அமெரிக�கா/சௌ_பௌலொ"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "அமெரிக�கா/ஸ�கோர�பைசன�ட�"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "அமெரிக�கா/ஷிப�ராக�"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "அமெரிக�கா/செயின�ட�_ஜோன�ஸ�"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "அமெரிக�கா/செயின�ட�-கிட�ஸ�"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "அமெரிக�கா/செயின�ட�_லூசியா"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "அமெரிக�கா/செயின�ட�_தாமஸ�"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "அமெரிக�கா/செயின�ட�_வின�ஸன�ட�"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "அமெரிக�கா/ஸ�ஃப�ட�_கரன�ட�"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "அமெரிக�கா/டெக�சிகல�பா"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "அமெரிக�கா/த�லே"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "அமெரிக�கா/தன�டர�_வளைக�டா"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "அமெரிக�கா/டிக�வானா"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "அமெரிக�கா/தொறான�ரோ"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "அமெரிக�கா/வான�கோவெர�"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "அமெரிக�கா/ஒயிஹார�ஸ�"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "அமெரிக�கா/வினிபெக�"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "அமெரிக�கா/யகடாட�"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "அமெரிக�கா/யெல�லோக�னைஃப�"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "அன�டார�டிக�கா/காசெய�"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "அன�டார�டிக�கா/டாவிஸ�"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "அன�டார�டிக�கா/ட�மொன�ட�ர�வில�லா"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "அன�டார�டிக�கா/மௌசன�"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "அன�டார�டிக�கா/மெக�ம�ர�டொ"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "அன�டார�டிக�கா/பால�மெர�"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "அன�டார�டிக�கா/தென�_த�ர�வம�"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "அன�டார�டிக�கா/ஸ�யோவா"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "அன�டார�டிக�கா/வோஸ�டோக�"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "அன�டார�டிக�கா/லாங�இயர�யென�"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "ஆசியா/�டன�"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "ஆசியா/அல�மடி"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "ஆசியா/அமான�"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "ஆசியா/அன�ட�யார�"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "ஆசியா/அக�டௌ"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "ஆசியா/அக�டொபி"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "ஆசியா/அஷ�காபாத�"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "ஆசியா/பாக�தாத�"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "ஆசியா/பஹ�ரெயின�"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "ஆசியா/பாக�"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "ஆசியா/பாங�காக�"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "ஆசியா/பெய�ரட�"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "ஆசியா/பிஷ�கெக��"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "ஆசியா/ப�ரூனெய�"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "ஆசியா/கல�கத�தா"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "ஆசியா/கோய�பால�சன�"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "ஆசியா/சௌங�க�யிங�"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "ஆசியா/கொலம�போ"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "ஆசியா/டமாஸ�கஸ�"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "ஆசியா/டாக�கா"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "ஆசியா/டிலி"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "ஆசியா/த�பாய�"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "ஆசியா/ட�ஷான�பி"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "ஆசியா/காஸா"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "ஆசியா/ஹார�பின�"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "ஆசியா/ஹாங�க�-காங�"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "ஆசியா/ஹோவ�ட�"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "ஆசியா/இர�க�ஸ�க�"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "ஆசியா/இஸ�தான�ப�ல�"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "ஆசியா/ஜகார�தா"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "ஆசியா/ஜெயப�ரா"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "ஆசியா/ஜெர�சலெம�"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "ஆசியா/காபூல�"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "ஆசியா/காம�சட�கா"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "ஆசியா/கராச�சி"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "ஆசியா/காஷ�கர�"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "ஆசியா/காட�மாண�ட�"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "ஆசியா/கரச�னொயார�ஸ�க�"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "ஆசியா/கோலா_லம�பூர�"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "ஆசியா/கச�சிங�"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "ஆசியா/க�வைத�"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "ஆசியா/மாகோ"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "ஆசியா/மாசௌ"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "ஆசியா/மகதான�"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "ஆசியா/மகாஸாஸர�"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "ஆசியா/மனிலா"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "ஆசியா/மஸ�கட�"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "ஆசியா/நிகோசியா"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "ஆசியா/நொவொசிபிர�க�"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "ஆசியா/ஒம�ஸ�க�"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "ஆசியா/ஓரல�"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "ஆசியா/ப�னோம�பெ_ன�ஹ�"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "ஆசியா/பொன�டியானாக�"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "ஆசியா/ப�யோயாங�"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "ஆசியா/கதார�"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "ஆசியா/க�வைசிலோர�டா"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "ஆசியா/ரங�கோன�"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "ஆசியா/நியாத�"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "ஆசியா/சாய�கோன�"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "ஆசியா/சக�ஹாலின�"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "ஆசியா/சமர�கான�ட�"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "ஆசியா/சியோல�"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "ஆசியா/ஷாங�காய�"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "ஆசியா/சிங�கப�பூர�"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "ஆசியா/தாய�பெய�"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "ஆசியா/தாஷ�கென�ட�"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "ஆசியா/பிலிசி"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "ஆசியா/டெஹ�ரான�"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "ஆசியா/திம�ப�"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "ஆசியா/டோக�கியோ"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "ஆசியா/ஜங�_பன�டாங�"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "ஆசியா/உலான�பாடர�"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "ஆசியா/ர�ம�கி�கி"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "ஆசியா/வியன�டினாம�"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "ஆசியா/வ�லடிவிஸ�டோல�"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "ஆசியா/யக�ட�ஸ�"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "ஆசியா/யெகடெரிங�பர�க�"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "ஆசியா/யெரிவான�"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "அட�லாண�டிக�ிக�/அசோரிஸ�"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "அட�லாண�டிக�/பெர�ம�டாதா"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "அட�லாண�டிக�/கனாரி"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "அட�லாண�டிக�/கேப�_வெர�டி"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "அட�லாண�டிக�/ஃப�ரோ"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "அட�லாண�டிக�/ஜான�_மாயென�"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "அட�லாண�டிக�/மடிரா"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "அட�லாண�டிக�/யேக�ஜாவிக�"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "அட�லாண�டிக�/தெற�க_ஜார�ஜியா"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "அட�லாண�டிக�/செயின�ட�_ஹெலினா"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "அட�லாண�டிக�/ஸ�டான�லி"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "ஆஸ�திரேலியா/ண�டிக�/அடிலைட�"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "ஆஸ�திரேலியா/ண�டிக�பேன�/பிரிஸ�"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "ஆஸ�திரேலியா/ப�ரோக�கன�_ஹில�"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "ஆஸ�திரேலியா/டார�வின�"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "ஆஸ�திரேலியா/ஹோபார�ட�"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "ஆஸ�திரேலியா/லின�டெமான�"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "ஆஸ�திரேலியா/லார�ட�_ஹௌ"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "ஆஸ�திரேலியா/மெல�பர�ன�"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "ஆஸ�திரேலியா/பெர�த�"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "ஆஸ�திரேலியா/சிட�னி"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "�ரோப�பா/ஆம�ஸ�ராடெம�ாடெம�"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "�ரோப�பா/அன�டோரா"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "�ரோப�பா/�தென�ஸ�"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "�ரோப�பா/பெல�ஃபாஸ�ட�"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "�ரோப�பா/பெல�க�ரேட�"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "�ரோப�பா/பெர�லின�"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "�ரோப�பா/ப�ராடிஸ�வாலா"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "�ரோப�பா/ப�ரஸல�ஸ�"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "�ரோப�பா/பர�ஷாரெஸ�ட�"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "�ரோப�பா/ப�டபெஸ�ட�"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "�ரோப�பா/சிஸ�னௌஸ�னௌ"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "�ரோப�பா/கொபென�ஹாஜென�"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "�ரோப�பா/ட�ப�லின�"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "�ரோப�பா/கிப�ரால�டர�"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "�ரோப�பா/ஹெல�சின�கி"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "�ரோப�பா/இஸ�தான�ப�ல�"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "�ரோப�பா/கலின�னிக�ரான�ட�"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "�ரோப�பா/கிவ�"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "�ரோப�பா/லிஸ�பேன�"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "�ரோப�பா/ஜ�ப�ஜானா"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "�ரோப�பா/லண�டன�"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "�ரோப�பா/லக�ஸம�பர�க�"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "�ரோப�பா/மாட�ரிட�"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "�ரோப�பா/மால�டா"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "�ரோப�பா/மின�ஸ�க�"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "�ரோப�பா/மொனாக�கோ"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "�ரோப�பா/மாஸ�கோ"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "�ரோப�பா/நிக�கோசியா"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "�ரோப�பா/ஓஸ�லோ"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "�ரோப�பா/பாரிஸ�"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "�ரோப�பா/பாராக�வே"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "�ரோப�பா/ரிகா"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "�ரோப�பா/ரோம�"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "�ரோப�பா/சமாரா"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "�ரோப�பா/சான�_மரினோ"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "�ரோப�பா/சரஜீவோ"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "�ரோப�பா/சிம�ஃபெர�போல�"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "�ரோப�பா/ஸ�கோப�ஜி"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "�ரோப�பா/சோபியா"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "�ரோப�பா/ஸ�டாகஹாம�"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "�ரோப�பா/டாலின�"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "�ரோப�பா/டிரானே"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "�ரோப�பா/உஸ�கோரோட�"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "�ரோப�பா/வட�ஸ�"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "�ரோப�பா/வாடிகன�"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "�ரோப�பா/வியன�னா"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "�ரோப�பா/வெல�ன�யஸ�"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "�ரோப�பா/வார�சா"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "�ரோப�பா/ஸாக�ரெப�"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "�ரோப�பா/ஸபொரொஸ�ஹை"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "�ரோப�பா/ஜூரிச�"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "இந�தியன�/ஆன�டனனார�வோ"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "இந�தியன�/சாகோஸ�"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "இந�தியன�/கிர�ஸ�த�மஸ�"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "இந�தியன�/கோகோஸ�"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "இந�தியன�/கொமோரோ"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "இந�தியன�/கெர�க�லென�"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "இந�தியன�/மாஹி"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "இந�தியன�/மாலத�தீவ�"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "இந�தியன�/மொரீஷியஸ�"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "இந�தியன�/மயோட�டி"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "இந�தியன�/ரீயூனியன�"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "பசிபிக�/�பியா"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "பசிபிக�/ஆக�லான�ச�"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "பசிபிக�/சாட�ஹம�"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "பசிபிக�/ஈஸ�டர�"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "பசிபிக�/இபேட�"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "பசிபிக�/என�டர�பரி"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "பசிபிக�/ஃபாகோஃபோ"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "பசிபிக�/பிஜி"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "பசிபிக�/ஃப�னாஃப�டி"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "பசிபிக�/கலபாகோஸ�"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "பசிபிக�/ஜிம�பெயர�ெயர�"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "பசிபிக�/க�வாடல�கேனால�"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "பசிபிக�/க�வாம�"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "பசிபிக�/ஹொனோல�ல�"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "பசிபிக�/ஜான�ஸ�டன�"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "பசிபிக�/க�ரிடிமாட�டி"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "பசிபிக�/கொஸ�ராய�"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "பசிபிக�/க�வாஜலென�"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "பசிபிக�/மஜூரோ"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "பசிபிக�/மார�க�சாஸ�"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "பசிபிக�/மிட�வே"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "பசிபிக�/நௌர�"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "பசிபிக�/நிய�"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "பசிபிக�/நோர�ஃலோக�"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "பசிபிக�/நௌமியா"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "பசிபிக�/பாகோ_பாகோ"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "பசிபிக�/பாலௌ"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "பசிபிக�/பிட�கார�ன�"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "பசிபிக�/பொனாப�"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "பசிபிக�/போர�ட�_மோர�ஸ�"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "பசிபிக�/ராரோடோங�கா"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "பசிபிக�/சாய�பான�"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "பசிபிக�/தஹிடி"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "பசிபிக�/தராவா"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "பசிபிக�/டோங�கடாப�"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "பசிபிக�/டர�க�"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "பசிபிக�/வேக�"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "பசிபிக�/வாலிஸ�"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "பசிபிக�/யேப�"
 
-#: ../composer/e-msg-composer-hdrs.c:570
-msgid "Posting destination"
-msgstr "சேர�மிடத�தில� சமர�பிக�கிறத�"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "தானியங�கியாக சேமித�த கோப�பை திறக�க ம�டியவில�லை"
 
-#: ../composer/e-msg-composer-hdrs.c:571
-msgid "Choose folders to post the message to."
-msgstr "செய�தியை சமர�பிப�பதற�கான அடைவை தேர�வ� செய�"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "தொக�ப�பியிலிர�ந�த� செய�தியை பெற ம�டியவில�லை"
 
-#: ../composer/e-msg-composer-hdrs.c:602
-msgid "Click here for the address book"
-msgstr "ம�கவரி ப�த�தகத�த�க�க� இங�கே க�ளிக� செய�யவ�ம�"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "இணைப�பினை ந�ழை"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:634
-msgid "_Reply-To:"
-msgstr "பதில� : (_R)"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "இணை (_t)"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:641
-msgid "Fr_om:"
-msgstr "அன�ப�ப�நர�: (_o)"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "தலைப�பில�லா செய�தி"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:648
-msgid "S_ubject:"
-msgstr "பொர�ள�: (_u)"
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "கோப�பை இணைக�கவ�ம�"
 
-#: ../composer/e-msg-composer-hdrs.c:657
-msgid "_To:"
-msgstr "பெற�நர�: (_T)"
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "(_C)மூட�"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "தற�போதைய கோப�பை தேர�வ� செய�யவ�ம�"
+
+#: ../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 "(_P)அச�சடி..."
+
+#: ../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 "(_v)அச�ச� ம�ன�தோற�றம�"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "தற�போதைய கோப�பை சேமி"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "(_A)எனச�சேமி..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "தற�போதைய கோப�பை வேற� பெயரில� சேமி"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "வரைவை சேமி (_D)"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "வரைவாக சேமி"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "_அன�ப�ப�க"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "இந�த செய�தியை அன�ப�ப�"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "அன�ப�ப� விர�ப�பங�களை சொர�க�க"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "ப�திய செய�தி (_M)"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "ப�திய செய�தி சாளரத�தை திறS)"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "(_E) எழ�த�த�ர� க�றிம�றை"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "(_S)பாத�காப�ப�"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "PGP மறையாக�க�"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "PGP யை பயன�பட�த�தி இந�த செய�தியை க�றிம�றையாக�கவ�ம�"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "PGP கையொப�பம�"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "PGP விசையை பயன�பட�த�தி இந�த செய�திக�க� கையொப�பமிடவ�ம�"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "ம�ன�ன�ரிமை செய�தி (_P)"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "செய�தி ம�ன�ன�ரிமையை உயர�ந�ததாக அமை"
+
+#: ../composer/e-qcomposer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "படிக�க பெற�றதற�க� சான�ற� கோரவ�ம� (_q)"
+
+#: ../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 "S/MIME En_crypt"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "S/MIME க�றிம�றையாக�க சான�றிதழை பயன�பட�த�தி இந�த செய�தியை க�றியாக�கவ�ம�"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "S/MIME கையொப�பம�"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "S/MIME கையொப�ப சான�றிதழ� பயன�பட�த�த� இந�த செய�திக�க� கையொப�பமிடவ�ம�"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "(_B)மறை நகல� ப�லம�"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "மறைநகல� ப�லம� காட�டப�பட வேண�ட�மா என�பதை மாற�ற"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "(_C)கரிநகல� ப�லம�"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "கரிநகல� ப�லம� காட�டப�படவேண�ட�மா என�பதை மாற�ற"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "(_F)ப�லத�திலிர�ந�த�"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "அன�ப�ப�நரை தேர�வ� செய�ய வேண�ட�மா ப�லத�தை மாற�ற"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "(_P) இங�க� அன�ப�ப�"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "செல�ல�மிடம�ப�நர� ப�லம� காட�டப�பட வேண�ட�மா என�பதை மாற�ற�ம��ப�ன"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "(_R) இங�க� பதிலலி"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "பதிலலிநர� ப�லம� காட�டப�படவேண�ட�மா என�பதை மாற�ற�ம�"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "(_S) பொர�ள� ப�லம�"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "பொர�ள�லை ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "(_T)ப�லத�தில�"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "ப�லங�கள� காட�டப�பட வேண�ட�மா என�பதை மாற�ற�"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "அன�ப�ப�வதற�கான செய�தியை உள�ளிடவ�ம�"
 
-#: ../composer/e-msg-composer-hdrs.c:661
-msgid "_Cc:"
-msgstr "நகல�: (_C)"
-
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "இதே செய�தியை கரிநகலாக அன�ப�ப வேண�டிய ம�கவரியை உள�ளிடவ�ம�"
 
-#: ../composer/e-msg-composer-hdrs.c:665
-msgid "_Bcc:"
-msgstr "மறைநகல�: (_B)"
-
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../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."
+"appearing in the recipient list of the message"
 msgstr "இதே செய�தியை மறை நகலாக அன�ப�ப வேண�டிய ம�கவரியை உள�ளிடவ�ம�"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "அன�ப�ப�நர�: (_o)"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "பதில� : (_R)"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "பெற�நர�: (_T)"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "நகல�: (_C)"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "மறைநகல�: (_B)"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "சமர�பி: (_P)"
 
-#: ../composer/e-msg-composer-hdrs.c:678
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr "பொர�ள�: (_u)"
+
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "கையொப�பம�: (_g)"
+
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "ம�கவரி ப�த�தகத�த�க�க� இங�கே க�ளிக� செய�யவ�ம�"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "சேர�மிடத�தில� சமர�பிக�கிறத�"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "செய�தியை சமர�பிப�பதற�கான அடைவை தேர�வ� செய�"
+
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "சமர�ப�பிக�க வேண�டிய அடைவை தேர�வ� செய�ய இங�கே க�ளிக� செய�யவ�ம�"
 
-#: ../composer/e-msg-composer-hdrs.c:683
-msgid "Post To:"
-msgstr "சமர�பி:"
-
-#: ../composer/e-msg-composer-select-file.c:82
-msgid "A_ttach"
-msgstr "இணை (_t)"
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "(_D) அண�மை ஆவணங�கள�"
 
-#: ../composer/e-msg-composer-select-file.c:243
-msgid "Insert Attachment"
-msgstr "இணைப�பினை ந�ழை"
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "இணைப�ப� பட�டைகளை காட�ட� (_A)"
 
-#: ../composer/e-msg-composer.c:835
+#: ../composer/e-msg-composer.c:872
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "வெளி செல�லிம� செய�திகளை கையொப�பமிட ம�டியாத�. இந�த கணக�கிற�கென சான�றிதழ� எத�வ�ம� இல�லை"
 
-#: ../composer/e-msg-composer.c:842
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10144,52 +10790,23 @@ msgstr ""
 "வெளியில� செல�ல�ம� செய�திகளை க�றிம�றையாக�க ம�டியாத� : இந�த கணக�கிற�க� க�றிம�றையாக�க "
 "சான�றிதழ� எத�வ�மில�லை"
 
-#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2614
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "இணைப�ப�"
+msgstr[1] "இணைப�ப�கள�"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "இணைப�ப� பட�டைகளை மறை (_A)"
 
-#: ../composer/e-msg-composer.c:1354 ../composer/e-msg-composer.c:2617
-#: ../composer/e-msg-composer.c:3985
-msgid "Show _Attachment Bar"
-msgstr "இணைப�ப� பட�டைகளை காட�ட� (_A)"
-
-#: ../composer/e-msg-composer.c:1386 ../composer/e-msg-composer.c:1420
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
-msgstr "தெரியாத காரணம�"
-
-#: ../composer/e-msg-composer.c:1458
-msgid "Could not open file"
-msgstr "கோப�பை திறக�க ம�டியவில�லை"
-
-#: ../composer/e-msg-composer.c:1466
-msgid "Unable to retrieve message from editor"
-msgstr "தொக�ப�பியிலிர�ந�த� செய�தியை பெற ம�டியவில�லை"
-
-#: ../composer/e-msg-composer.c:1751
-msgid "Untitled Message"
-msgstr "தலைப�பில�லா செய�தி"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1787
-msgid "Open File"
-msgstr "கோப�பினை திற"
-
-#: ../composer/e-msg-composer.c:2249 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "தானாக உர�வாக�கப�பட�ட"
-
-#: ../composer/e-msg-composer.c:2352
-msgid "Si_gnature:"
-msgstr "கையொப�பம�: (_g)"
-
-#: ../composer/e-msg-composer.c:2628 ../composer/e-msg-composer.c:3867
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "செய�தியை உர�வாக�க�"
 
-#: ../composer/e-msg-composer.c:5125
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10214,13 +10831,12 @@ msgid ""
 msgstr "தலைப�ப� '{0}',செய�தியை தவிர�க�க வேண�ட�மா தொக�க�கப�பட�ட?"
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "�னெனில� &quot;{0}&quot;, நீங�கள� வேற� மின�னஞ�சல� விர�ப�பங�களை தேர�வ� செய�ய வேண�ட�ம�."
+msgid "Because \"{0}\", you may need to select different mail options."
+msgstr "�னெனில� \"{0}\", நீங�கள� வேற� மின�னஞ�சல� விர�ப�பங�களை தேர�வ� செய�ய வேண�ட�ம�."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
-msgid "Because &quot;{1}&quot;."
-msgstr "�னெனில� &quot;{1}&quot;."
+#: ../composer/mail-composer.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "�னெனில� \"{1}\"."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -10240,16 +10856,16 @@ msgid "Could not create message."
 msgstr "செய�தியை உர�வாக�க ம�டியவில�லை"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "கையொப�ப கோப�ப� &quot;{0}&quot; � படிக�க ம�டியவில�லை"
+msgid "Could not read signature file \"{0}\"."
+msgstr "கையொப�ப கோப�ப� \"{0}\" � படிக�க ம�டியவில�லை"
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "{0} இணைப�பிலிர�ந�த� செய�திகளை பெற ம�டியாத�"
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; தானாக சேமிக�க�ம� கோப�பினை சேமிக�க ம�டியவில�லை."
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "\"{0}\" தானாக சேமிக�க�ம� கோப�பினை சேமிக�க ம�டியவில�லை."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
@@ -10264,8 +10880,8 @@ msgid "Download in progress. Do you want to send the mail?"
 msgstr "பதிவிறக�கம� நடைபெற�ற�க�கொண�டிர�க�கிறத�. நீங�கள� அஞ�சலை அன�ப�ப வேண�ட�மா?"
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "&quot;{1}&quot; தானாக சேமிக�க�ம� போத� பிழை."
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "\"{1}\" தானாக சேமிக�க�ம� போத� பிழை."
 
 #: ../composer/mail-composer.error.xml.h:16
 msgid ""
@@ -10328,31 +10944,33 @@ msgstr "கோப�ப� `{0}' � இந�த செய�திய�டன
 msgid "You need to configure an account before you can compose mail."
 msgstr "மின�னஞ�சலை எழ�த த�வங�க�ம� ம�ன� உங�கள� மின�னஞ�சல� கணக�கை அமைக�க வேண�ட�ம�"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "திர�த�தலை தொடர�க"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "மீட�காதே (_D)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "மீட�கவ�ம� (_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "செய�தியை சேமி (_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "(_S) வரைவை சேமி"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:512
-msgid "Evolution"
-msgstr "எவல�யூஷன�"
+msgid "Evolution Mail and Calendar"
+msgstr "எவல�யூஷன� மின�னஞ�சல� மற�ற�ம� நாள�காட�டி"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:593
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "க�ழ�க�கள�க�கான மென�பொர�ள�"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "எவல�யூஷன� PIM மற�ற�ம� மின�னஞ�சல�"
+msgid "Manage your email, contacts and schedule"
+msgstr "உங�கள� மின�னஞ�சல� தொடர�ப�கள� மற�ற�ம� கால ஒத�க�கீட�கள� ஆகியவற�றை மேலாளவ�ம�"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10362,64 +10980,142 @@ msgstr "ம�கவரி அட�டை"
 msgid "calendar information"
 msgstr "நாள�காட�டி தகவல�"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "எவல�யூஷன� பிழை"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "எவல�யூஷன� எச�சரிக�கை"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "எவல�யூஷன� தகவல�"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "எவல�யூஷன� கேள�வி"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "உள�ளார�ந�த பிழை, தெரியாத பிழை '%s' கோரப�பட�டத�"
 
-#: ../e-util/e-print.c:136
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "உள�ளடக�கம�"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "பதிவிட�ம� உள�ளடக�கத�தின� பெயர� "
+
+#: ../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
+msgid "Enabled"
+msgstr "செயலில� உள�ள"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "செர�க� பொதி  செயல�பட�த�தப�பட�டதா இல�லையா"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "அச�சிட�ம� போத� பிழை �ற�பட�ட�ள�ளத�"
 
-#: ../e-util/e-print.c:143
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "அச�ச� அமைப�ப� பிழை க�றித�த� பின�வர�ம� தகவல� தந�தத�."
 
-#: ../e-util/e-print.c:149
+#: ../e-util/e-print.c:173
 msgid "The printing system did not report any additional details about the error."
 msgstr "அச�ச� அமைப�ப� பிழை க�றித�த� மேல� தகவல� �த�ம� தரவில�லை"
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; கோப�பினை திறக�க ம�டியவில�லை ."
+msgid "Cannot open file \"{0}\"."
+msgstr "கோப�ப� \"{0}\" �. திறக�க ம�டியவில�லை"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; கோப�பினை சேமிக�க ம�டியவில�லை."
+msgid "Cannot save file \"{0}\"."
+msgstr "\"{0}\". கோப�பினை சேமிக�க ம�டியவில�லை."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "மேலெழ�த விர�ப�பமா?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; கோப�ப� �ற�கனவே உள�ளத�."
+msgid "File exists \"{0}\"."
+msgstr "\"{0}\". கோப�ப� �ற�கனவே உள�ளத�."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "கோப�பை மேலெழ�த வேண�ட�மா"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "(_O)மேலெழ�த�"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "எவலூஷன�க�க� உதவியை காட�ட ம�டியவில�லை."
+
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "ம�க�கியமானத� (_m)"
+
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "வேலை (_W)"
+
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "தனிப�பட�ட (_P)"
+
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "செய�ய வேண�டியவை (_T)"
+
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "பிறக� (_L)"
+
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
+msgstr "(_N)  க�றியீட�டின� பெயர�யர�:"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
+msgstr "க�றியீட�டை திர�த�த�க"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
+msgstr "க�றியீட�டை சேர�க�க"
+
+#: ../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
+#, c-format
+msgid "GConf error: %s"
+msgstr "ஜிகான�ஃப� பிழை: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "இனி வர�ம� பிழைகளை ம�னையத�தில� மட�ட�மே காட�டப�பட�ம�"
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10532,95 +11228,83 @@ msgstr "இப�போத�"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:449
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "ஒப�பிட வேண�டிய நேரத�தை தேர�வ� செய�யவ�ம�"
 
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "கோப�பை தேர�வ� செய�யவ�ம�"
 
-#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "ம�க�கியம�"
-
-#. forest green
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:150
-msgid "To Do"
-msgstr "செய�ய வேண�டியவை"
-
-#. blue
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "பிறக�"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "சோதனை"
 
-#: ../filter/filter-rule.c:800
-msgid "_Search name:"
-msgstr "தேடல� பெயர�: (_S)"
+#: ../filter/filter-rule.c:852
+msgid "R_ule name:"
+msgstr "(_u) விதியின� பெயர�"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "பின�வர�ம� சூழலை எதிர�கொள�ள�ம� உர�ப�படிகளை தேட�"
 
-#: ../filter/filter-rule.c:867
+#: ../filter/filter-rule.c:914
+msgid "A_dd Filter Criteria"
+msgstr "வடிகட�டி விதிம�றையை சேர� (_d) "
+
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "எல�லா ச�ழலில�ம�"
 
-#: ../filter/filter-rule.c:867
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "�தாவத� ஒர� ச�ழலில�"
 
-#: ../filter/filter-rule.c:869
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_த உர�ப�படிகளை தேட�க:"
 
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "எல�லா தொடர�ப�டைய"
 
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "பதில�கள�"
 
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "பதில�கள� மற�ற�ம� ம�ந�தையவை"
 
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "பதில� இல�லை அல�லத� பெற�றோர�"
 
-#: ../filter/filter-rule.c:893
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "_இழைகளை உள�ளடக�கி"
 
-#: ../filter/filter-rule.c:989 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "உள�வர�ம�"
 
-#: ../filter/filter-rule.c:989 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "வெளி செல�ல�ம�"
 
 #: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; மோசமான கூற�ற�"
+msgid "Bad regular expression \"{0}\"."
+msgstr "\"{0}\" மோசமான கூற�ற�"
 
 #: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "&quot;{1}&quot; இயல�பான கூற�றை தொக�க�க ம�டியவில�லை"
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "\"{1}\" இயல�பான கூற�றை தொக�க�க ம�டியவில�லை"
 
 #: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "கோப�ப� &quot;{0}&quot; கோப�ப� இல�லை அல�லத� அத� ஒர� இயல�பான கோப�பில�லை "
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "கோப�ப� \"{0}\" கோப�ப� இல�லை அல�லத� அத� ஒர� இயல�பான கோப�பில�லை "
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10630,13 +11314,13 @@ msgstr "தேதி காணவில�லை"
 msgid "Missing file name."
 msgstr "கோப�பின� பெயர� காணவில�லை"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "பெயர� காணவில�லை"
 
 #: ../filter/filter.error.xml.h:7
-msgid "Name &quot;{0}&quot; already used."
-msgstr "&quot;{0}&quot; பெயர� �ற�கனவே பயனில� உள�ளத�"
+msgid "Name \"{0}\" already used."
+msgstr "\"{0}\" பெயர� �ற�கனவே பயனில� உள�ளத�"
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
@@ -10679,7 +11363,7 @@ msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
-"செய�தியில� தேதி வடிகட�டல�t\n"
+"செய�தியில� தேதி வடிகட�டல�\n"
 "நிகழ�ந�த தேதியோட� ஒப�பிடப�பட�ம�."
 
 #: ../filter/filter.glade.h:9
@@ -10687,7 +11371,7 @@ msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
-"செய�தியில� தேதி வடிகட�டல�t\n"
+"செய�தியில� தேதி வடிகட�டல�\n"
 "நிகழ�ந�த நேரத�தோட� ஒப�பிடப�பட�ம�."
 
 #: ../filter/filter.glade.h:12
@@ -10706,7 +11390,7 @@ msgstr "எதிர�காலத�தின� உள�ளே"
 msgid "months"
 msgstr "மாதங�கள�"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "நிமிடம�"
 
@@ -10718,8 +11402,10 @@ msgstr "தற�போதைய நேரம�"
 msgid "the time you specify"
 msgstr "நீங�கள� க�றிப�பிட�ட நேரம�"
 
-#: ../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:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "வாரங�கள�"
 
@@ -10735,7 +11421,7 @@ msgstr "விதியை சேர�"
 msgid "Edit Rule"
 msgstr "விதியை திர�த�த�"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "விதியின� பெயர�"
 
@@ -10756,57 +11442,69 @@ msgid "Configure your email accounts here"
 msgstr "உங�கள� மின�னஞ�சல� கணக�கை இங�கே அமைக�கவ�ம�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "உங�கள�  வலை இணைப�ப� அமைப�பை  இங�கே அமைக�கவ�ம�"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "எவல�யூஷன� மின�னஞ�சல�"
 
-#: ../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 "எவல�யூஷன� மின�னஞ�சல� கணக�க� அமைக�க�ம� கர�வி"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "எவல�யூஷன� மின�னஞ�சல� கூற�கள�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "எவல�யூஷன� மின�னஞ�சல� தொக�ப�பி"
 
-#: ../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 "எவல�யூஷன� மின�னஞ�சல� தொக�ப�பி அமைப�ப� கர�வி"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "எவல�யூஷன� மின�னஞ�சல� ம�ன�ன�ரிமை கர�வி"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:568 ../mail/mail-component.c:569
-#: ../mail/mail-component.c:729
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "எவல�யூஷன� வலை இணைப�ப� அமைப�ப� கடட�ப�பாட�"
+
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "மின�னஞ�சல�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:535
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "மின�னஞ�சல� கணக�க�"
 
-#: ../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 "மின�னஞ�சல� ம�ன�ன�ரிமை"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "வலை இணைப�ப� ம�ன�ன�ரிமை"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "(_M)மின�னஞ�சல�"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ஒப�பந�தப�பத�திரம�"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10819,117 +11517,109 @@ msgstr ""
 "%s இல� காட�டப�பட�ட\n"
 "சோதனைப�பெட�டியை க�ளிக� செய�த� �ற�க�கவ�ம�\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:510
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "அடைவை தேர�வ� செய�"
 
-#: ../mail/em-account-editor.c:778
+#: ../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
+msgid "Autogenerated"
+msgstr "தானாக உர�வாக�கப�பட�ட"
+
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "ஒவ�வொர� செய�திக�க�ம� கேட�கவ�ம�"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "உற�ப�பினர�கள�"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "மின�னஞ�சல� பெறப�பட�கிறத�"
 
-#: ../mail/em-account-editor.c:2056
-msgid "Automatically check for _new mail every"
-msgstr "(_n)ப�திய மின�னஞ�சல�களை கால இடைவெளிக�க�ள� தானாக சோதி"
+#: ../mail/em-account-editor.c:2131
+msgid "Check for _new messages every"
+msgstr "ப�திய மின�னஞ�சல�களை கால இடைவெளிக�க�ள� தானாக சோதி"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2139
+msgid "minu_tes"
+msgstr "(_t) நிமிடங�கள�"
+
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "மின�னஞ�சல� அன�ப�பப�பட�கிறத�"
 
-#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "இயல�பானவைகள�"
 
 #. 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:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "பாத�காப�ப�"
 
 #. 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:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "பெற�ம� தேர�வ�கள�"
 
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
-msgid "Checking for New Mail"
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+msgid "Checking for New Messages"
 msgstr "ப�திய மின�னஞ�சல�க�காக சோதிக�கிறத�"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "கணக�க� தொக�ப�பி"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "எவல�யூஷன� கணக�க� உதவி"
 
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:412
-msgid "Di_sable"
-msgstr "செயல� நீக�க�"
-
-#: ../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 "(_n)செயலில� உள�ள"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:469
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[இயல�பான]"
 
-#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:949
-#: ../plugins/plugin-manager/plugin-manager.c:284
-#: ../plugins/publish-calendar/publish-calendar.c:493
-msgid "Enabled"
-msgstr "செயலில� உள�ள"
-
-#: ../mail/em-account-prefs.c:528
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "கணக�கின� பெயர�"
 
-#: ../mail/em-account-prefs.c:530
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "விதிம�றை"
 
-#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
-#: ../mail/mail-config.c:1029
+#: ../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 "பெயரில�லா"
 
-#: ../mail/em-composer-prefs.c:955
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "மொழி(கள�)"
 
-#: ../mail/em-composer-prefs.c:998
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "கையொப�ப நிரலை சேர�க�கவ�ம�"
 
-#: ../mail/em-composer-prefs.c:1018
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "கையொப�பம�(ங�கள�)"
 
-#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- அன�ப�ப�ம� செய�தி --------"
 
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "தெரியாத அன�ப�ப�நர�"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1739
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10937,18 +11627,18 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:1880
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----மூல செய�தி----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "(_F)வடிகட�டி விதிம�றைகள�"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
-msgstr "மதிப�பை மாற�ற�"
+msgstr "Adjust Score"
 
 #: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
@@ -10958,311 +11648,308 @@ msgstr "நிறத�தை ஒத�க�க�"
 msgid "Assign Score"
 msgstr "மதிப�பை ஒத�க�க�"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "இணைப�ப�கள�"
-
 #: ../mail/em-filter-i18n.h:6
-msgid "Beep"
-msgstr "ஒலி"
+msgid "BCC"
+msgstr "மறை நகல�"
 
 #: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "உள�ளத�"
+msgid "Beep"
+msgstr "ஒலி"
 
 #: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "நகல�"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "ம�டிந�த  தேதி"
+
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "அடைவில� நகலெட�"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "தகவல� பெறப�பட�டத�"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "தகவல� அன�ப�பபட�டத�"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "நீக�க�"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "நீக�கப�பட�டத�"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
-msgstr "இதில� இல�லை"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "இதில� ம�டியவில�லை"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "இதில� இல�லை"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "தரவில�லை"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "இத� போல� இல�லை"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "இத�போல� த�வங�கவில�லை"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "இத� இல�லை"
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "வரைவ�"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "ம�டிவ�"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr "உள�ளத�"
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "உள�ளத�"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "கூற�ற�"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "தொடர�"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "இல�"
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "ம�க�கியம�"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "பிறக�"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "ம�ன�"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "க�றிக�கப�பட�ட"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr "விடப�பெரிய"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
-msgstr "விட சிறிய"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
-msgstr "இல�லை"
-
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "க�றிக�கப�படாத"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "அமைக�கவில�லை"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "அமைக�கப�பட�டத�"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "தேவையற�ற"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "தேவையற�றவை சோதனை"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "விளக�கச�சீட�ட�"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "மின�னஞ�சல� பட�டியல�"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "அனைத�தைய�ம� ஒப�பிட�"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "செய�தி உள�ளடக�கம�"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "செய�தி தலைப�ப�"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "செய�தி தேவையற�றத�"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "செய�தி தேவையற�றத� இல�லை"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "அடைவிற�க� நகர�த�த�"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "நிரல�க�க� வழி"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "ஒலியை இயக�க�"
 
-#: ../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:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "படி"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "பெற�நர�"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "Regex பொர�த�தம�"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "பதிலலி"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "திர�ப�பவ�ம�"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "பெரியதை தந�தத�"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "சிறியதை தந�தத�"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "நிரலை இயக�க�"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "மதிப�ப�"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "அன�ப�பியவர�"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "விளக�கச�சீட�ட� அமை"
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "நிலையை அமை"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "அளவ�(kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "இத� போல"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "மூல கணக�க�"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "க�றிப�பிட�ட தலைப�ப�"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "த�வக�கம�"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "செயல�பட�த�த�வதை நிற�த�த�"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1688
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:855
-#: ../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
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
 msgstr "தலைப�ப�"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "அமைக�காத நிலை"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "பின�"
 
-#: ../mail/em-folder-browser.c:186
+#: ../mail/em-filter-rule.c:549
+msgid "Add Ac_tion"
+msgstr "(_t) செயலை சேர�"
+
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "தேடலிர�ந�த� தேட�ம� அடைவை உர�வாக�க�... (_r)"
 
-#: ../mail/em-folder-browser.c:208
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "ம�ழ�மையான செய�திகள�"
 
-#: ../mail/em-folder-browser.c:209
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "படிக�கப�படாத  செய�திகள�:"
 
-#: ../mail/em-folder-browser.c:211
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "விவரச�சீட�ட� இல�லை"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "படிக�கப�பட�ட செய�திகள�"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "ப�திதான செய�திகள�"
 
-#: ../mail/em-folder-browser.c:220
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "கடைசி 5 நாட�களின� செய�திகள�"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "இணைப�ப�டன� கூடிய செய�திகள�"
 
-#: ../mail/em-folder-browser.c:222
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr " ம�க�கியமான செய�திகள�"
 
-#: ../mail/em-folder-browser.c:223
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "பயனற�ற செய�திகள� எத�வ�ம� இல�லை"
 
-#: ../mail/em-folder-browser.c:1041
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "கணக�கை தேட�"
 
-#: ../mail/em-folder-browser.c:1085
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "அனைத�த� கணக�க�களைய�ம� தேட�"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "படிக�காத செய�திகள�:"
@@ -11270,60 +11957,72 @@ msgstr[1] "படிக�காத செய�திகள�:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "மொத�த செய�திகள�:"
 msgstr[1] "மொத�த செய�திகள�:"
 
-#: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../mail/em-folder-properties.c:195
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "ஒத�க�கீட� பயன� (%s):"
+
+#: ../mail/em-folder-properties.c:197
+#, c-format
+msgid "Quota usage"
+msgstr "ஒத�க�கீட� பயன� "
+
+#. 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
+msgid "Inbox"
+msgstr "உள�பெட�டி"
+
+#: ../mail/em-folder-properties.c:388
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "அடைவின� பண�ப�கள�"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<அடைவை தேர�வ� செய�ய இங�கே க�ளிக� செய�யவ�ம�>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "உர�வாக�க�"
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr "(_r) உர�வாக�க�"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "(_n) அடைவின� பெயர�"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#. load store to mail component at the end, when everything is loaded
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "தேட�ம� அடைவ�கள�"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "வரைவ�கள�"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2576
-#: ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "உள�பெட�டி"
-
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "செல� அஞ�சல�"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "அன�ப�ப�"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "�ற�ற�கிறத�..."
 
@@ -11342,363 +12041,363 @@ msgstr "�ற�ற�கிறத�..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:369
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:721
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "மின�னஞ�சல� அடைவ� கிளை"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s அடைவை நகர�த�த�கிறத�"
 
-#: ../mail/em-folder-tree.c:883
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s அடைவை நகலெட�க�கிறத�"
 
-#: ../mail/em-folder-tree.c:890 ../mail/message-list.c:1867
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s க�க� செய�திகளை நகர�த�த�கிறத�"
 
-#: ../mail/em-folder-tree.c:892 ../mail/message-list.c:1869
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s இல� செய�திகளை நகலெட�க�கிறத�"
 
-#: ../mail/em-folder-tree.c:908
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "மேல�மட�ட கிடங�கிற�க� செய�தி(களை) அன�ப�ப ம�டியாத�"
 
-#: ../mail/em-folder-tree.c:1004 ../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 "(_C)அடைவில� நகலெட�"
 
-#: ../mail/em-folder-tree.c:1005 ../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 "(_M)அடைவிற�க� நகர�த�த�"
 
-#: ../mail/em-folder-tree.c:1715 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" இல� உள�ள அடைவ�களை சோதிக�கிறத�"
 
-#: ../mail/em-folder-tree.c:2115 ../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 "(_V)பார�"
-
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "(_N)ப�திய சாளரத�தில� திற"
 
-#: ../mail/em-folder-tree.c:2120
-msgid "_Copy..."
-msgstr "(_C)நகல�..."
-
-#: ../mail/em-folder-tree.c:2121
-msgid "_Move..."
-msgstr "(_M)நகர�த�த�..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "(_N)ப�திய அடைவ�"
 
-#: ../mail/em-folder-tree.c:2128 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2107
+msgid "_Move..."
+msgstr "(_M)நகர�த�த�..."
+
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "(_R)மற�பெயரிட�"
 
-#: ../mail/em-folder-tree.c:2129
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_ப�த�ப�பி"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "அஞ�சல� வெளிபெட�டியை _காலி செய�க"
 
-#: ../mail/em-folder-tree.c:2136 ../mail/mail.error.xml.h:135
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "(_E)க�ப�பை தொட�டியை காலி செய�"
 
-#: ../mail/em-folder-utils.c:105
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' லிர�ந�த� `%s'க�க� நகலெட�க�கிறத�"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1114
-#: ../mail/em-folder-view.c:1129
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "அடைவை தேர�வ� செய�"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "(_o)நகலெட�"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' அடைவை உர�வாக�க�கிறத�"
 
-#: ../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:744
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "அடைவை உர�வாக�க�கிறத�"
 
-#: ../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:744
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "அடைவை உர�வாக�க வேண�ட�மா என க�றிப�பிடவ�ம�"
 
-#: ../mail/em-folder-view.c:1050 ../mail/mail.error.xml.h:68
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "அஞ�சல� நீக�கல� தோல�விய�ற�றத�"
 
-#: ../mail/em-folder-view.c:1051 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "நீங�கள�  இந�த அஞ�சலை நீக�க தேவையான அன�மதி இல�லை."
 
-#: ../mail/em-folder-view.c:1222 ../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 "(_R)அன�ப�பியவர�க�க� பதிலலி"
 
-#: ../mail/em-folder-view.c:1224 ../mail/em-popup.c:574 ../mail/em-popup.c:585
-#: ../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 "(_F)அன�ப�ப�"
 
 #. 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:1228 ../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 "(_E)ப�திய செய�தியாக தொக�"
 
-#: ../mail/em-folder-view.c:1234
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "(_n)நீக�கலை ரத�த� செய�"
 
-#: ../mail/em-folder-view.c:1235
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "(_M)அடைவிற�க� நகர�த�த�..."
 
-#: ../mail/em-folder-view.c:1236
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "(_C)அடைவில� நகலெட�"
 
-#: ../mail/em-folder-view.c:1239
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "(_k) படித�தத� என க�றி"
 
-#: ../mail/em-folder-view.c:1240
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "படிக�காதவை என க�றி (_U)"
 
-#: ../mail/em-folder-view.c:1241
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "ம�க�கியம� என க�றி (_I)"
 
-#: ../mail/em-folder-view.c:1242
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "ம�க�கியமில�லை என க�றிக�கவ�ம� (_i)"
 
-#: ../mail/em-folder-view.c:1243
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "பயனற�றத� என க�றிக�கவ�ம� (_J)"
 
-#: ../mail/em-folder-view.c:1244
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "பயனற�றத� இல�லை என க�றிக�கவ�ம� (_N)"
 
-#: ../mail/em-folder-view.c:1245
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "தொடர�தல�க�க� க�றிக�கவ�ம�... (_w)"
 
-#: ../mail/em-folder-view.c:1247
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "பெயர� (_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1248 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "ஒன�ற�மில�லை (_N)"
 
-#: ../mail/em-folder-view.c:1253
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr "(_N)ப�திய  விவரச�சீட�ட� "
+
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "(_g) க�றித�தல� ம�டிந�தத�"
 
-#: ../mail/em-folder-view.c:1254
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "(_e)க�றிப�பை நீக�க�"
 
-#: ../mail/em-folder-view.c:1257
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "(_t)செய�தியிலிர�ந�த� ப�திய விதிம�றையை உர�வாக�க�"
 
-#: ../mail/em-folder-view.c:1258
-msgid "Search Folder from _Subject"
-msgstr "பொர�ளில� இர�ந�த� அடைவினை தேட� (_S)"
+#. 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 "பொர�ளில� அடிப�படையில� அடைவினை தேட� (_S)"
 
-#: ../mail/em-folder-view.c:1259
-msgid "Search Folder from Se_nder"
-msgstr "அன�ப�ப�னரிடம� இர�ந�த� அடைவினை தேட� (_n)"
+#: ../mail/em-folder-view.c:1369
+msgid "Search Folder based on Se_nder"
+msgstr "அன�ப�ப�னர� அடிப�படையில� அடைவினை தேட� (_n)"
 
-#: ../mail/em-folder-view.c:1260
-msgid "Search Folder from _Recipients"
-msgstr "பெற�நரில� இர�ந�த� அடைவினை தேட� (_R)"
+#: ../mail/em-folder-view.c:1370
+msgid "Search Folder based on _Recipients"
+msgstr "பெற�நர� அடிப�படையில� அடைவினை தேட� (_R)"
 
-#: ../mail/em-folder-view.c:1261
-msgid "Search Folder from Mailing _List"
-msgstr "அஞ�சல� பட�டியலில� இர�ந�த� அடைவினை தேட� (_L)"
+#: ../mail/em-folder-view.c:1371
+msgid "Search Folder based on Mailing _List"
+msgstr "அஞ�சல� பட�டியல� அடிப�படையில�  அடைவினை தேட� (_L)"
 
-#: ../mail/em-folder-view.c:1265
-msgid "Filter on Sub_ject"
-msgstr "(_j)தலைப�பின� படி வடிகட�ட�"
+#. 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 "(_j) தலைப�பின� படி வடிகட�ட�"
 
-#: ../mail/em-folder-view.c:1266
-msgid "Filter on Sen_der"
-msgstr "(_d)அன�ப�ப�நர� படிவடிகட�ட�"
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
+msgstr "(_d) அன�ப�ப�நர� படி வடிகட�ட�"
 
-#: ../mail/em-folder-view.c:1267
-msgid "Filter on Re_cipients"
-msgstr "(_c)பெற�நர� படி வடிகட�ட�"
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
+msgstr "(_c )பெற�நர� படி வடிகட�ட�"
 
-#: ../mail/em-folder-view.c:1268
-msgid "Filter on _Mailing List"
-msgstr "(_M)மின�னஞ�சல� க�ழ�க�கள� படி வடிகட�ட�"
+#: ../mail/em-folder-view.c:1379
+msgid "Filter based on _Mailing List"
+msgstr "(_M) மின�னஞ�சல� க�ழ�க�கள� படி வடிகட�ட�"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2098 ../mail/em-folder-view.c:2142
+#. 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 "இயல�பான"
 
-#: ../mail/em-folder-view.c:2355
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "செய�தியை பெற ம�டியவில�லை"
 
-#: ../mail/em-folder-view.c:2374
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "செய�தி மீட�டல�..."
 
-#: ../mail/em-folder-view.c:2602
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_இவரை அழை..."
 
-#: ../mail/em-folder-view.c:2605
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "தேட�ம� அடைவினை உர�வாக�க�"
 
-#: ../mail/em-folder-view.c:2606
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "இந�த ம�கவரியிலிர�ந�த� (_F)"
 
-#: ../mail/em-folder-view.c:2607
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "இந�த ம�கவரிக�க� (_T)"
 
-#: ../mail/em-folder-view.c:2982
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s மின�னஞ�சல�க�க� க�ளிக� செய�யவ�ம�"
 
-#: ../mail/em-folder-view.c:2994
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "%s � அழைக�க சொட�க�க�"
 
-#: ../mail/em-folder-view.c:2999
+#: ../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:470
 #, c-format
 msgid "Matches: %d"
 msgstr "பொர�த�தம�: %d"
 
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
-msgstr "தேட�(_n:)"
+#: ../mail/em-format-html-display.c:614
+msgid "Fin_d:"
+msgstr "தேட�(_d):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "ம�ந�தைய (_P)"
 
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "அட�த�த� (_N)"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "நிகழ�ச�சி ஒப�பீட�_a"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:632
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "கையொப�பமிடாத"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "இந�த செய�தி கையொப�பமிடப�படவில�லை, இத� நம�பகமான செய�தி என�பதற�க� உத�திரவாதம� இல�லை"
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:633
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "சரியான கையொப�பம�"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:948
 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:940 ../mail/em-format-html.c:634
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "செல�லாத கையொப�பம�"
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:949
 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:635
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "சரியான கையொப�பம� ஆனால� அன�ப�பியவரை சரிபார�க�க ம�டியவில�லை"
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:950
 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:942 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:951 ../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:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "இத� சரியாக கையொப�பமிடப�பட�ட செய�தி  ஆனால� பொத� விசை இல�லை"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "க�றிம�றையாக�கப�படாத"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11706,11 +12405,11 @@ msgstr ""
 "இந�த செய�தி க�றிம�றையாக�கம� செய�யப�படவில�லை. இணைய பரிமாற�றத�தின� போத� அதன� உள�ளடக�கங�களை "
 "பார�க�கலாம�."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "க�றிம�றையாக�கப�பட�ட, மோசமான"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11720,21 +12419,21 @@ msgstr ""
 "இத� கடினமானத�, ஆனால� இந�த செய�தியின� உள�ளடக�கங�களை வெளியிலிர�ப�பவர�கள� பார�ப�பத� ஒன�ற�ம� "
 "கடினமான செயல� இல�லை."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "க�றிம�றையாக�கப�பட�ட"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:960
 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:952 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "சரியாக க�றிம�றையாக�கப�பட�ட"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11743,94 +12442,89 @@ msgstr ""
 "கடினமான க�றியாக�க கணிம�றையில�, இந�த செய�தி க�றிம�றையாக�கப�படட�ள�ளத�.இந�த செய�தியின� "
 "உள�ளடக�கங�களை வெளியிலிர�ப�பவர�கள� பார�ப�பத� அவ�வளவ� எளிமையானத� இல�லை."
 
-#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "சான�றிதழை பார�க�கவ�ம� (_V)"
 
-#: ../mail/em-format-html-display.c:1068
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "இந�த சான�றிதழை பார�க�க இயலாத�"
 
-#: ../mail/em-format-html-display.c:1387
+#: ../mail/em-format-html-display.c:1371
 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:1379
 msgid "Overdue:"
 msgstr "நில�வையில�"
 
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1382
 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:1460
 msgid "_View Inline"
 msgstr "(_V)உள�ளே பார�"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "(_H)மறை"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "அகலத�த�டன� பொர�த�தவ�ம� (_F)"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "அசல� அளவினை காட�ட� (_O)"
 
-#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2516
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "இணைப�ப�கள�"
-
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "_இணைப�பை இப�படி சேமி"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "அனைத�த� இணைப�ப�களைய�ம� சேமிக�க அடைவ� தேர�ந�தெட� "
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "தேர�ந�தெட�த�ததை சேமி... (_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2241
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d இணைப�ப� (_t)"
 msgstr[1] "%d இணைப�ப�கள� (_t)"
 
-#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "சேமி (_a)"
 
-#: ../mail/em-format-html-display.c:2259
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "அனைத�தைய�ம� சேமி (_a)"
 
-#: ../mail/em-format-html-display.c:2322
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "இணைப�ப� இல�லை"
 
-#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "_ஒழ�ங�க� செய�யாத காட�சி"
 
-#: ../mail/em-format-html-display.c:2455
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "_ஒழ�ங�க� செய�யாததை மறை"
 
-#: ../mail/em-format-html-display.c:2508
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "_உடன� திற"
 
-#: ../mail/em-format-html-display.c:2579
+#: ../mail/em-format-html-display.c:2473
 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 ""
 "இந�த மின�னஞ�சல� மிக பெரியதாக உள�ளதால� எவல�யூஷன� இதை வரைய இயலாத�. இதை ஒழ�ங�க� செய�யாமலோ "
@@ -11841,242 +12535,283 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "பக�கம� %d இல� %d"
 
-#: ../mail/em-format-html.c:486 ../mail/em-format-html.c:495
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "பெற�கிறத� `%s'"
 
-#: ../mail/em-format-html.c:907
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "தெரியாத வெளி உடல� பக�தி"
 
-#: ../mail/em-format-html.c:915
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "தவறான உள�ளடக�கம�"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP வலைமனைக�கான (%s) க�றி"
 
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "உள�கோப�பின� ச�ட�டிக�காட�டி (%s) \"%s\" இணயதளத�தில� செல�ல�ம�"
 
-#: ../mail/em-format-html.c:958
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "உள�கோப�பின� ச�ட�டிக�காட�டி (%s) "
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "தொலை தகவல�க�கான ச�ட�டிக�காட�டி (%s) "
 
-#: ../mail/em-format-html.c:990
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "வெளி தகவல�க�கான ச�ட�டிக�காட�டி (%s)"
 
-#: ../mail/em-format-html.c:1217
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "செய�தியை ஒழ�ங�க� செய�கிறத�"
 
-#: ../mail/em-format-html.c:1385
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "செய�தியை ஒழ�ங�க� செய�கிறத�..."
 
-#: ../mail/em-format-html.c:1517 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "அன�ப�ப�நர�"
-
-#: ../mail/em-format-html.c:1517 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
-msgid "Reply-To"
-msgstr "பதில�-பெற�நர�"
-
-#: ../mail/em-format-html.c:1517 ../mail/em-format-html.c:1532
-#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1618
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:853
-#: ../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 "கரிநகல�"
 
-#: ../mail/em-format-html.c:1517 ../mail/em-format-html.c:1533
-#: ../mail/em-format-html.c:1602 ../mail/em-format-html.c:1621
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:854
-#: ../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 "மறைநகல�"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1692 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1196
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "மின�னஞ�சல�"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1719
+#: ../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:1724
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1736 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:856 ../mail/em-mailer-prefs.c:93
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date"
-msgstr "தேதி"
-
-#: ../mail/em-format-html.c:1759 ../mail/em-format.c:857
-#: ../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:1849
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "செய�தி <b>%s</b> ஆல� அன�ப�பப�பட�டத� <b>%s</b> சார�பாக"
 
-#: ../mail/em-format.c:1121
+#: ../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 "அன�ப�ப�நர�"
+
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
+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
+msgid "Date"
+msgstr "தேதி"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "செய�தி க�ழ�க�கள�"
+
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s இணைப�ப�கள�"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME செய�தியை பக�க�க ம�டியவில�லை: தெரியாத பிழை"
 
-#: ../mail/em-format.c:1297 ../mail/em-format.c:1453
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME தகவலை பக�க�க ம�டியாத�. நிரலாக காட�ட�கிறத�"
 
-#: ../mail/em-format.c:1305
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ஆதரவில�லா க�றிம�றை வகை பலவழி/க�றிம�றை"
 
-#: ../mail/em-format.c:1315
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/மைம� செய�திகள� � பக�க�க இயலவில�லை"
 
-#: ../mail/em-format.c:1315
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/மைம� செய�திகள� � பக�க�க இயலவில�லை தெரியாத தவற�"
 
-#: ../mail/em-format.c:1472
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "ஆதரவ� இல�லாத கையொப�பம�"
 
-#: ../mail/em-format.c:1480 ../mail/em-format.c:1551
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "கையொப�பத�தை சரிபார�க�க�ம� போத� பிழை"
 
-#: ../mail/em-format.c:1480 ../mail/em-format.c:1542 ../mail/em-format.c:1551
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "கையொப�பத�தை சரிபார�க�க�ம� போத�  தெரியாத பிழை"
 
-#: ../mail/em-format.c:1622
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP செய�தியை பக�க�க இயலவில�லை"
 
-#: ../mail/em-format.c:1622
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP செய�தியை பக�க�க இயலவில�லை தெரியாத தவற�"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "ஒவ�வொர� ம�றைய�ம�"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "ஒவ�வொர� நாள�ம�  ஒர� ம�றை"
 
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "வாரம� ஒர�ம�றை"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "மாதம� ஒர� ம�றை"
 
+#: ../mail/em-mailer-prefs.c:326
+msgid "Add Custom Junk Header"
+msgstr "தனிப�பயன� க�ப�பை தலைப�ப� சேர�"
+
+#: ../mail/em-mailer-prefs.c:330
+msgid "Header Name:"
+msgstr "தலைப�பின� பெயர�:"
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Value Contains:"
+msgstr "தலைப�பின� மதிப�பில� உள�ளத�:"
+
+#: ../mail/em-mailer-prefs.c:436
+msgid "Contains Value"
+msgstr "உள�ள மதிப�ப�"
+
+#: ../mail/em-mailer-prefs.c:458
+msgid "Color"
+msgstr "நிறம�"
+
+#: ../mail/em-mailer-prefs.c:461
+msgid "Tag"
+msgstr "க�றி ஒட�ட�"
+
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:787 ../mail/em-mailer-prefs.c:841
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s சொர�க�ப�பொர�ள� இர�ப�பில� உள�ளத�. இர�மம� நிற�வப�பட�டத�."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:795 ../mail/em-mailer-prefs.c:850
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s சொர�க�ப�பொர�ள� இர�ப�பில� இல�லை. தயவ� செய�த� நிற�வப�பட�ட பொதியை சோதிக�க."
 
-#: ../mail/em-mailer-prefs.c:816
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "தேவையற�ற சொர�க�ப�பொர�ள� இல�லை "
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"எவல�யூஷன� மின�னஞ�சல� பெட�டியில� வரிசை மற�ற�ம� இடம� மாற�றப�பட�டத� எவல�யூஷன� 1 பதிப�ப�.x.\n"
-"\n"
-"எவல�யூஷன� அடைவ�களை நகர�த�திக�கொண�டிர�க�கிறத�..."
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "செய�ய வேண�டியவை"
 
-#: ../mail/em-migrate.c:1650
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "பிறக�"
+
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ப�திய அடைவை உர�வாக�க ம�டியவில�லை `%s': %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "அடைவ�`%s'� `%s' இல�  நகலெட�க�க ம�டியவில�லை: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "�ற�கெனவே உள�ள மின�னஞ�சல� பெட�டியில� தேட ம�டியவில�லை %s': %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"எவல�யூஷன� மின�னஞ�சல� பெட�டியில� வரிசை மற�ற�ம� இடம� மாற�றப�பட�டத� எவல�யூஷன� 1 பதிப�ப�.x.\n"
+"\n"
+"எவல�யூஷன� அடைவ�களை நகர�த�திக�கொண�டிர�க�கிறத�..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "பாப� சேவகனில� வைத�த தகவல�களை திறக�க ம�டியவில�லை`%s': %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "பாப�3 சேவகனில� வைத�த தகவல�களை திறக�க ம�டியவில�லை`%s': %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server தகவலை நகலெட�க�க ம�டியவில�லை `%s': %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "உள� மின�னஞ�சல� சேமிப�பை உர�வாக�க�வதில� தோல�வி`%s': %s"
 
-#: ../mail/em-migrate.c:2743
+#: ../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 ""
+"எவல�யூஷன� 2.24 பதிப�ப� ம�தல� எவல�யூஷன� மின�னஞ�சல� பெட�டி அடைவ�கள� எஸ� க�யூலட�ட�க�க� இடம� மாற�றப�பட�டத� \n"
+"\n"
+"எவல�யூஷன� அடைவ�களை நகர�த�த�கையில� சற�ற� பொற�மையாக இர�க�கவ�ம�..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "மின�னஞ�சல� அடைவை `%s' இடத�தில� உர�வாக�க ம�டியவில�லை: %s"
 
-#: ../mail/em-migrate.c:2762
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12084,111 +12819,138 @@ msgstr ""
 "ம�ந�தைய எவல�யூஷன� அமைப�பை படிக�க ம�டியவில�லை, `எவல�ஷன�/config.xmldb' இல�லை அல�லத� "
 "சிதைந�தத�"
 
-#: ../mail/em-popup.c:570 ../mail/em-popup.c:581
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "(_R)அன�ப�பியவர�க�க� பதிலலி"
 
-#: ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "(_L)க�ழ�விற�க� பதிலலி"
 
-#: ../mail/em-popup.c:635
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "ம�கவரி ப�த�தகத�தில� சேர� (_A)"
 
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "இந�த கிடங�க� உற�ப�பினர� சேர�க�கைக�க� ஆதரவ� தராத� அல�லத� இந�த வசதி செயல�பட�த�தப�படவில�லை"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "உற�ப�பினராக�கப�பட�டீர�"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "அடைவ�"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:837
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "சேவகனை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "சேவகன� எத�வ�ம� தேர�வ� செய�யப�படவில�லை"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
-msgid "Do not show this message again."
-msgstr "இந�த செய�தியை மீண�ட�ம� காட�டாதே."
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
+msgid "_Do not show this message again."
+msgstr "(_D) இந�த செய�தியை மீண�ட�ம� காட�டாதே."
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "செய�தி வடிப�பிகள�"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "செய�திகள�"
 
-#: ../mail/em-utils.c:563
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "செய�தியை சேமி"
 
-#: ../mail/em-utils.c:612
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "ம�கவரியை சேர�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1096
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr " %s லிர�ந�த� செய�தி"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "அடைவ�களை தேட� (_F)"
 
-#: ../mail/em-vfolder-rule.c:590
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "மூல அடைவினை தேட�"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-msgid "Allows evolution to display text part of limited size"
-msgstr "அளவான உரையை காட�ட எவலூஷனை அன�மதிக�கிறத�."
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"மின�னஞ�சலை அன�ப�ப� & பெற�\" சாளர உயரம�"
 
 #: ../mail/evolution-mail.schemas.in.h:2
-msgid "Automatic link recognition"
-msgstr "இணைப�பை தானாக உணர�"
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"மின�னஞ�சலை அன�ப�ப� & பெற�\"  சாளரம� பெரிதாக�க� நிலை"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "சிரிப�ப�னர�வை தானாக கண�ட�பிடி"
+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 "அளவான உரையை காட�ட எவலூஷனை அன�மதிக�கிறத�."
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Always request read receipt"
+msgstr "எப�போத�ம� படிக�க பெற�றவைக�க� ரசீத�  கோரவ�ம�"
+
+#: ../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
+msgid "Automatic emoticon recognition"
+msgstr "தானியங�கி சிரிப�பான� அடையாளம� காணல� "
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Automatic link recognition"
+msgstr "இணைப�பை தானாக உணர�"
+
+#: ../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 "கம�போசர� சாளரத�டின� இயல�பான அகலம�"
+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 " TO/CC/BCCல� உள�ள ம�கவரிகளை க�ற�க�கி காட�ட�"
 
-#: ../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."
@@ -12196,91 +12958,171 @@ msgstr ""
 "ம�கவரி எண�ணிக�கையில� க�றிப�பிட�ட எண�ணை கொண�ட�, TO/CC/BCCல� உள�ள ம�கவரிகளை க�ற�க�கி "
 "காட�ட�. (_c)"
 
-#: ../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 ""
+"தொலை சேவையகத�த�டன� எந�த இடைவெளியில� உள�ளமை மாற�தல�கள� ஒத�திசைக�கப�பட�கின�றன"
+" என�பதை கட�ட�ப�பட�த�த�கிறத�. இடைவெளி  க�றைந�தத� 30 நொடிகளாக இர�க�க வேண�ட�ம�."
+
+#: ../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 "க�ப�பை சோதனைக�க� பயன�பட�த�த  தனிப�பயன� தலைப�ப�கள�. பட�டியலில� உர�ப�கள� இந�த சர விதத�தில� இர�க�க வேண�ட�ம�. \"headername=value\""
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "செய�தி தொக�க�கப�பட வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "செய�தி தொக�க�கப�பட வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "செய�தி காட�டப�படவேண�டிய வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "செய�தி காட�டப�படவேண�டிய வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "இயல�பான ம�ன�னன�ப�ப�ம� பாணி"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "கம�போசர� சாளரத�தின� இயல�பான உயர,"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the Composer Window."
+msgstr "தொக�ப�பி சாளரத�தின� இயல�பான உயரம�."
 
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Default height of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the message window."
 msgstr "செய�தி சாளரத�தின� இயல�பான உயரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "உற�ப�பினர� சாளரத�தின� இயல�பான உயரம�"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default height of the subscribe dialog."
+msgstr "உற�ப�பினர� சேர�க�கை சாளரத�தின� இயல�பான உயரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "இயல�பான பதிலளிக�க�ம� பாங�க�"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "இழை விரிவ�க�க� ம�ன�னிர�ப�ப� மதிப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Default width of the Composer Window"
-msgstr "கம�போசர� சாளரத�தில� இயல�பான அகலம�"
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the Composer Window."
+msgstr "தொக�ப�பி சாளரத�தில� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Default width of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the message window."
 msgstr "செய�தி சாளரத�தின� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Default width of the Subscribe dialog"
-msgstr "உற�ப�பினர� சாளரத�தின� இயல�பான அகலம�"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default width of the subscribe dialog."
+msgstr "உற�ப�பினர� சேர�க�கை சாளரத�தின� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Directory for saving mail component files"
-msgstr "அஞ�சல� கூற�கள� கோப�ப�கள�க�க� அடைவ� "
+#: ../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
 msgid "Empty Junk folders on exit"
 msgstr "க�ப�பை அடைவ�களை வெற�றாக�க�"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "வெளியேற�ம� போத� க�ப�பை அடைவை காலி செய�"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "எவல�யூஷன� � விட�ட� வெளியேற�ம� போத� க�ப�பை அடைவை காலி செய�"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "எவல�யூஷன� � விட�ட� வெளியேற�ம� போத� க�ப�பை அடைவை காலி செய�"
 
-#: ../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
+msgid "Enable or disable magic space bar"
+msgstr "மாய வெற�றிட பலகத�தை செயல�பட�த�த� அல�லத� செயல�நீக�க�"
+
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
-msgstr "தேட�ம� அம�சத�தின� வகையை செயல�பட�த�த� அல�லத� செயல�நீக�க�"
+msgstr "உள�ளிட�ம�போதே தேட�ம� அம�சத�தின� வகையை செயல�பட�த�த� அல�லத� செயல�நீக�க�"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable search folders"
+msgstr "தேட�ம� அடைவ�கள� - செயல�பட�த�த� அல�லத� செயல�நீக�க�"
+
+#: ../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 "
@@ -12291,33 +13133,39 @@ 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
 msgid "Enable to render message text part of limited size."
 msgstr "அளவான செய�தி உரை பக�தியை வரைவை செயல�பட�த�த�"
 
-#: ../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."
@@ -12325,7 +13173,7 @@ msgstr ""
 "\"Preview\"  ம�ன�பார�வை பலகம� செயலில� இர�ப�பின�  அதை உயரவாக�கில� அல�லாத� பக�கத�த�க�க� "
 "பக�கம� காட�ட�க"
 
-#: ../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 "
@@ -12334,39 +13182,74 @@ 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 offline sync is "
-"required."
-msgstr ""
-"இணைப�ப� விலகிய பார�வைக�க� ஒர�ங�கிணைத�தல� தேவையா என மீண�ட�ம� மீண�ட�ம� கேட�க�ம� பண�ப�க�கூறை "
-"செயல� நீக�க�கிறத�."
+"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 ""
+"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: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:43
+#: ../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:44
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "கடைசியாக க�ப�பைகாலி இயக�கப�பட�ட நேரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../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:46
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "�ற�கப�பட�ட உரிமங�களின� பட�டியல�"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "கணக�க�களின� பட�டியல�"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../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."
@@ -12374,11 +13257,15 @@ msgstr ""
 "எவல�யூஷன�க�க� தெரித�த கணக�கின� பட�டியல� உப அடைவோட� தொடர�ப�டைய /apps/எவல�ஷன�/mail/"
 "accounts. சரங�கள�"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "தனிப�பயன� தலைப�ப�கள� மற�ற�ம� அவை செயலில� உள�ளதா என�பதை அறிவிக�க�ம� பட�டியல�"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "எழ�த�த�ப�பிழை சோதிக�க பயன�பட�ம� அகராதி மொழி க�றிப�ப� பட�டியல�."
+
+#: ../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."
@@ -12386,257 +13273,263 @@ msgstr ""
 "எவல�யூஷன� பொர�ள�க�க� தெரிந�த மின�னஞ�சல� பட�டியல� இதில� name:color நிறங�களின� HTML எண�ம "
 "மதிப�ப� ஆகியவை இர�க�க�ம�."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "போனபோ விற�காக  சோதிக�க வேண�டிய மைம�வகைகள�"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "உரிமம� �ற�கப�பட�ட விதிம�றைகளின� பட�டியல�"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
-msgstr "HTML செய�திக�கான பிம�பத�தை http வழியாக �ற�றவ�ம�"
+msgstr "HTML செய�திக�கான பிம�பத�தை ஹெச�டிடிபி வழியாக �ற�றவ�ம�"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 mail 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 ""
-"HTML செய�திகள�க�க� http(s) வழியாக பிம�பங�களை �ற�ற�க. மதிப�ப�கள�: 0 - ஒர�போத�ம� "
+"HTML செய�திகள�க�க� ஹெச�டிடிபி(s) வழியாக பிம�பங�களை �ற�ற�க. மதிப�ப�கள�: 0 - ஒர�போத�ம� "
 "வலையிலிர�ந�த� பிம�பங�களை �ற�றாதே. 1 - அஞ�சல� தொடர�ப�களிலிர�ந�த� பிம�பங�களை �ற�ற�. 2 - "
 "எப�போத�ம� பிம�பங�களை வலையிலிர�ந�த� �ற�ற�."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "வடிகட�டி செயல�களை பதிப�பி"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "க�றிப�பிட�ட கோப�பில� வடிகட�டி செயல�களை பதிப�பி"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "பதிப�ப�களை வடிகட�ட�ம� பதிப�பி கோப�பி"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "செயல�களை வடிகட�ட�ம� பதிப�ப� கோப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "க�றிப�பிட�ட நேரத�திற�க� பிறக� பார�க�கப�பட�டத� என க�றி"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "க�றிப�பிட�ட நேரத�திற�க� பிறக� பார�க�கப�பட�டத� என க�றி"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "செய�தி \"ம�ன�தோற�றத�தில�\"  அழைப�பை க�றி"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "செய�தி \"ம�ன�தோற�றத�தில�\"  அழைப�பை க�றி"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "செய�தி சாளரத�தின� இயல�பான உயரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "செய�தி சாளரத�தின� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "செய�தி தோன�ற�ம� தோற�றம� (\"இயல�பான\", \"ம�ழ� தலைப�ப�களை\", \"மூலம�\")"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "வெளியேற�ம�போத� க�ப�பையை காலி செய�ய இடையே க�றைந�தபட�ச தினங�கள� "
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "வெளியேற�ம� போத� க�ப�பையை காலி செய�ய தேவையான க�றைந�தபட�ச நாட�கள�."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../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:69
+#: ../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:70
-msgid "New Mail Notify sound file"
-msgstr "ப�திய மின�னஞ�சல� எனில� ஒலியெழ�ப�ப�"
-
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "New Mail Notify type"
-msgstr "ப�திய மின�னஞ�சல� அறிவிப�ப� வகை"
-
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC ல� தெரிய வேண�டிய ம�கவரிகளின� எண�ணிக�கை"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "தலைப�ப� காலியாக இர�ந�தால� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../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:75
+#: ../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:76
+#: ../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:77
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Prompt when deleting messages in search folder"
+msgstr "தேடல� அடைவிலிர�ந�த�  செய�தியை நீக�கினால� நினைவூட�ட�"
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "பயனர� ம�ட�வத�ம� அழிக�க�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "மறை நகல� அன�ப�ப�ம� போத� தெரியப�பட�த�த� "
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "பயனர� 10 அல�லத� அதற�க� மேற�பட�ட செய�திகளை ஒரே நேரத�தில� அன�ப�ப�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 "HTML மின�னஞ�சலை �ற�க விர�ம�பாதார�கள�க�க�HTML மின�னஞ�சல� அன�ப�பப�பட�ம� போத� தெரியப�பட�த�த�."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../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:82
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "தேவையற�ற HTML மின�னஞ�சலை பயனர� அன�ப�ப�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "பல செய�திகளை க�றிக�க�ம� போத� தெரிவிக�கவ�ம�"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "உரையில� சிரிப�ப� சித�திரங�களை உணர�ந�த� அவைகளை மாற�ற�"
+
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "உரையில� இணைப�பை உணர�ந�த� அவைகளை மாற�ற�"
 
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Recognize smileys in text and replace them with images."
-msgstr "உரையில� சிரிப�ப� சித�திரங�களை உணர�ந�த� அவைகளை மாற�ற�"
-
-#: ../mail/evolution-mail.schemas.in.h:86
-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:87
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "அடைவை சேமி"
 
-#: ../mail/evolution-mail.schemas.in.h:88
-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:89
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "இயல�பாக HTML மின�னஞ�சலை அன�ப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "இயல�பாக HTML மின�னஞ�சலை அன�ப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Sender email-address column in the message list"
+msgstr "செய�தி பட�டியலில�   அன�ப�ப�னர� மின�னஞ�சல� ம�கவரி  நிரல�"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "சேவையகத�த�டன� ஒர�ங�கிணைக�க�ம� இடைவெளி"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "இயங�க� சித�திரங�களை காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "இயங�க� சித�திரங�களை இயங�க� சித�திரங�களாக காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../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:94
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "நீக�கிய செய�திகளை செய�தி பட�டியலில� காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "அன�ப�ப�னர� உடைய படத�தைக� காட�ட� "
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "செய�திகள� பட�டியலில� கூட�ட� பத�தியில� அன�ப�ப�னரின� மின�னஞ�சலை காட�ட�க."
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "செய�திகள� பட�டியலில� தனி பத�தியில� அன�ப�ப�னரின� மின�னஞ�சலை காட�ட�க."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../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:100
-msgid "Show the sender email in the messages column in the message list"
-msgstr "செய�தி பட�டியலில� செய�திகள� நிரலில� அன�ப�ப�னர� மின�னஞ�சலை காட�டவ�ம�"
-
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid "Sound file to play when new mail arrives."
-msgstr "ப�திய மின�னஞ�சல� வர�ம�போத� இயக�க வேண�டிய ஒலி கோப�ப�"
-
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "பயனர� விர�ப�ப�ம� ப�திய மின�னஞ�சல� வர�கையை அறிவிக�க�ம� ம�றை"
-
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "எழ�த�த�ப�பிழை சோதி"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "எழ�த�த� பிழை திர�த�த வண�ணம�"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "எழ�த�த�ப�பிழை திர�த�த மொழி"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "உரையாடலின� இயல�பான உயரத�தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "உரையாடலின� இயல�பான அகலத�தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "ம�னைய எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "உரை செய�திக�க� வரையளவ�."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "ஜங�க� ஹூக� க�க� ம�ன�னிர�ப�ப� சொர�க�ப�பொர�ள�"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../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:110
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "epoch க�க� ம�ன� கடைசியா க�ப�பை காலி இயக�கப�பட�ட நேரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:111
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "The terminal font for mail display."
 msgstr "மின�னஞ�சல� காட�ட�வதற�கான ம�னைய எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "The variable width font for mail display."
 msgstr "மின�னஞ�சலை காட�ட மாற�ற அகல எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../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 "இதற�க� மூன�ற�  மதிப�ப�கள� இர�க�ககூட�ம�. \"0\" வழ�க�கள�. \"1\" எச�சரிக�கை. \"2\" வழ�நீக�கி செய�திகள� ."
+
+#: ../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."
@@ -12644,7 +13537,7 @@ msgstr ""
 "உரை ஒழ�ங�க� பட�த�தக�கூடிய அதிகபட�ச அளவ�. ம�ன�னிர�ப�ப�4MB / 4096 KB. KB இல� "
 "க�றிக�கப�பட�ம�."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../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 "
@@ -12653,13 +13546,15 @@ msgstr ""
 "செயற�பட�த�தியவை சொர�க�ப�பொர�ள� பல இர�ப�பின�ம� எரிதத�த�க�க� ம�ன�னிர�ப�ப� சொர�க�ப�பொர�ள�. "
 "இந�த ம�ன�னிர�ப�ப� சொர�க�ப�பொர�ளை ம�டக�கிய பின� மற�றவற�ற�க�க� மாறாத�."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../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 "இந�த விசை ஒர� ம�றை மட�ட�மே படிக�கப�பட�ம�. படித�த பின� இத� பொய� என மாற�றப�பட�ம�. இத� அஞ�சலை பட�டியலில� இர�ந�த� நீக�கி அந�த அடைவ�க�க� ம�ன�பார�வையைய�ம� நீக�க�ம�."
+"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:116
+#: ../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;"
@@ -12669,11 +13564,18 @@ msgstr ""
 "இந�த விசையில� உள�ள XML சரங�கள� தனி தலைப�பை க�றிக�க�ம�, அவைகள� காட�டப�பட வேண�ட�மா. "
 "XMLஅமைப�ப� &lt;header enabled&gt; - தலைப�பை காட�டப�பட வேண�ட�ம� எனில� அதை அமைக�கவ�ம� "
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../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:118
+#: ../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."
@@ -12681,149 +13583,174 @@ msgstr ""
 "ம�ன�னிர�ப�ப� செய�திகள� பட�டியல� காட�சியில� காட�ட�ம� ம�கவரிகள� எண�ணிக�கை. அதற�க� பின� '...' "
 "என காட�டப�பட�ம�. "
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../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:120
+#: ../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:150
 msgid "Thread the message list."
 msgstr "செய�தி பட�டியலின� இழையை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "செய�தி பட�டியலின� இழையை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "செய�தி பட�டியலின� இழையை தலைப�பின� படி அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
 msgstr "செய�தியை பார�க�கப�பட�டதாக மாற�ற செலவாக�ம� நேரத�தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:124
-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:125
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "இயல�பான சரத�தின� UID"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../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:127
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ஸ�பாம� அஸாஸின� கிங�கரன� மற�ற�ம� சார�ந�தோன� (spamc/spamd) � பயன�பட�த�த�."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "தனிப�பயன� எழ�த�ர�வை பயன�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Use custom fonts for displaying mail."
 msgstr "மின�னஞ�சலை காட�ட தனிப�பயன� எழ�த�த�ர�வை பயன�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "தனி ஸ�பாம� சோதனையை பயன�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "தனி ஸ�பாம� சோதனையை பயன�பட�த�த�(no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "பக�கங�களில� அல�லத� அகல அமைப�பில� பயன�பட�த�தவ�ம�"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "மாறி அகல எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "பார�/மறைநகல� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "பார�/மறைநகல� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "பார�/கரிநகல� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "பார�/கரிநகல� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "பார�/பெர�நர� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "பார�/பெர�நர� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "பார�/இவர�க�க� அன�ப�ப� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "பார�/இவர�க�க� அன�ப�ப� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "பார�/பதிலலி அன�ப�ப� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "பார�/பதிலலி அன�ப�ப� மென� உர�ப�படி தேர�வ� செய�யப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../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 "பதிலலி தலைப�ப� இல�லையெனில� தலைப�ப�கள� இழையாக�கப�ப�ட�வதை தவிர�க�கவ�ம�."
+msgstr "பதிலளி தலைப�ப� இல�லையெனில� தலைப�ப�கள� இழையாக�கப�ப�ட�வதை தவிர�க�கவ�ம�."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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 "செய�திகள� பட�டியல� பலகத�தின� அகலம� "
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "செய�தி-பட�டியல� பலகத�தில� அகலம�."
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm தகவலை �ற�ற�கிறத�"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "எவல�யூஷன� Elm �ற�றி"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm லிர�ந�த� அஞ�சலை இறக�க�."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "இலக�க� அடைவ�:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "�ற�ற வேண�டிய அடைவை தேர�வ� செய�"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "பெர�க�கேலே அஞ�சல� பெட�டி (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "இறக�கி பெர�கேலே அஞ�சல� பெட�டி வடிவ அடைவ�கள�"
 
@@ -12831,25 +13758,25 @@ msgstr "இறக�கி பெர�கேலே அஞ�சல� பெட
 msgid "Importing mailbox"
 msgstr "மின�னஞ�சல� பெட�டியை �ற�றவ�ம�"
 
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' �ற�ற�கிறத�"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:372
 #, c-format
 msgid "Scanning %s"
 msgstr "`%s' வர�ட�கிறத�"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "பைன� தகவலை �ற�ற�கிறத�"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "எவல�யூஷன� பைன� �ற�றி"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Pine லிர�ந�த� அஞ�சலை இறக�க�."
 
@@ -12877,146 +13804,185 @@ msgstr "%s மின�னஞ�சல� பட�டியல�"
 msgid "Add Filter Rule"
 msgstr "வடிகட�டி விதிம�றையை சேர�"
 
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "வார�ப�ப�ர�"
+
+#: ../mail/mail-component.c:550
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] " %d தேர�ந�தெட�க�கப�பட�டத�, "
+msgstr[1] " %d தேர�ந�தெட�க�கப�பட�டத�, "
+
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d நீக�கப�பட�டத�"
 msgstr[1] "%d நீக�கப�பட�டத�"
 
-#: ../mail/mail-component.c:532
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d க�ப�பை"
 msgstr[1] "%d க�ப�பை"
 
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ஆவணம�"
 msgstr[1] "%d ஆவணம�"
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d அன�ப�பப�பட�டத�"
 msgstr[1] "%d அன�ப�பப�பட�டத�"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d அன�ப�பப�படவில�லை"
 msgstr[1] "%d அன�ப�பப�படவில�லை"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d படிக�காதத�"
 msgstr[1] "%d படிக�காதத�"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d மொத�தம�"
 msgstr[1] "%d மொத�தம�"
 
-#: ../mail/mail-component.c:550
-#, c-format
-msgid " %d selected, "
-msgid_plural " %d selected, "
-msgstr[0] " %d தேர�ந�தெட�க�கப�பட�டத�, "
-msgstr[1] " %d தேர�ந�தெட�க�கப�பட�டத�, "
-
-#: ../mail/mail-component.c:880
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "ப�திய மின�னஞ�சல� செய�தி"
 
-#: ../mail/mail-component.c:881
+#: ../mail/mail-component.c:924
+# msgctxt "New"
 msgid "_Mail Message"
 msgstr "(_M)மின�னஞ�சல� செய�தி"
 
-#: ../mail/mail-component.c:882
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "ப�திய மின�னஞ�சல� செய�தியை தொக�"
 
-#: ../mail/mail-component.c:888
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "ப�திய மின�னஞ�சல� அடைவ�"
 
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:932
+# msgctxt "New"
 msgid "Mail _Folder"
 msgstr "(_F)மின�னஞ�சல� அடைவ�"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "ப�திய மின�னஞ�சல� அடைவை உர�வாக�க�"
 
-#: ../mail/mail-component.c:1037
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "மின�னஞ�சல� அமைப�ப�கள� அடைவை மேம�பட�த�த�தல� தோல�விய�ற�றத�"
 
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "ம�க�கியமானத� (_m)"
+#: ../mail/mail-component.c:1596
+msgid "Error"
+msgstr "பிழை"
 
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "வேலை (_W)"
+#: ../mail/mail-component.c:1596
+msgid "Errors"
+msgstr "தவற�கள�"
 
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "தனிப�பட�ட (_P)"
+#: ../mail/mail-component.c:1597
+msgid "Warnings and Errors"
+msgstr "எச�சரிக�கைகள� மற�ற�ம� தவற�கள�"
 
-#. forest green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "செய�ய வேண�டியவை (_T)"
+#: ../mail/mail-component.c:1598
+msgid "Debug"
+msgstr "பிழை நீக�க�"
 
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "பிறக� (_L)"
+#: ../mail/mail-component.c:1598
+msgid "Error, Warnings and Debug messages"
+msgstr "பிழை எச�சரிக�கைகள� மற�ற�ம� பிழை நீக�க� செய�திகள�"
+
+#: ../mail/mail-component.c:1725
+msgid "Debug Logs"
+msgstr "பிழை நீக�க� பதிவ�"
+
+#: ../mail/mail-component.c:1739
+msgid "Show _errors in the status bar for"
+msgstr "(_e) இதற�க� நிலைப�பட�டியில� பிழைகளை காட�ட�"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+msgid "second(s)."
+msgstr "வினாடி(கள�)"
+
+#: ../mail/mail-component.c:1761
+msgid "Log Messages:"
+msgstr "பதிவ� செய�திகள�"
+
+#: ../mail/mail-component.c:1802
+msgid "Log Level"
+msgstr "உள�ந�ழை நிலை"
+
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+msgid "Time"
+msgstr "நேரம�"
+
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "செய�திகள�"
+
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "இந�த சாளரத�தை மூடவ�ம�"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "(_e)ஆதரவ�ள�ள வகைகளை சோதிக�கவ�ம�"
 
-#: ../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
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>இந�த எவல�யூஷன� உர�வாக�கத�தில� SSL த�ணை இல�லை</b>"
 
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender  Photograph</b>"
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>அன�ப�ப�நர� படம�</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>கையொப�பங�கள� (_n)</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>மேலே பதில� எழ�த�ம� தேர�வ�</b> (பரிந�த�ரைக�கப�படவில�லை)"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>(_L)மொழிகள�</b>"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">கணக�க� தகவல�</span>"
 
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">அன�மதி வகை</span>"
-
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">அன�மதி</span>"
@@ -13038,12 +14004,12 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">மின�னஞ�சலை நீக�க�</span>"
 
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">(_H)மின�னஞ�சல� தலைப�பை காட�ட�</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">(_H)காட�டப�பட�ட செய�தி  தலைப�ப�கள� </span>"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">அடையாளம� மற�ற�ம� நிறங�கள�</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">க�றிசீட�ட�கள�</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13062,26 +14028,26 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">பெற�ற செய�திகள�</span>"
 
 #: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">ப�திய மின�னஞ�சல� அறிவிப�ப�</span>"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">அவசியமற�ற தகவல�</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">தேர�வ�கள�</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">நல�ல பாத�காப�ப� (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">அச�சடிக�கபப�ட�ட எழ�த�த�ர�</span>"
 
+#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">மாற�ற� அமைப�ப�கள�</span>"
+
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">தேவையான தகவல�</span>"
@@ -13102,99 +14068,103 @@ msgstr "<span weight=\"bold\">அன�ப�பிய மற�ற�ம� வ
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">சேவகன� அமைப�ப�</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">(_A) அன�மதி வகை</span>"
+
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "கணக�க� மேலாண�மை"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "(_w)ப�திய கையொப�பத�தை சேர�"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "(_S)சிற� நிரலை சேர�"
 
-#: ../mail/mail-config.glade.h:37
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "இந�த கணக�கில� வெளி போக�ம� செய�திகள�க�க� கையொப�பமிட�க"
-
 #: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "மறையாக�கம� செய�த அஞ�சல� அன�ப�ப�ம� போத� என� பிரதியைய�ம� மறையாக�கம� செய�க."
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "எப�போத�ம� இந�த கணக�கில� வெளி போக�ம� செய�திகள�க�க� கையொப�பமிட�க"
 
 #: ../mail/mail-config.glade.h:39
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "(_s) எப�போத�ம� கரிநகல� அன�ப�ப�:"
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "(_f) மறையாக�கம� செய�த அஞ�சல� அன�ப�ப�ம� போத� என� பிரதியைய�ம� மறையாக�கம� செய�க."
 
 #: ../mail/mail-config.glade.h:40
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "எப�போத� (_b) க�க� மறைநகல� அன�ப�ப�:"
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "(_s) எப�போத�ம� கரிநகல� அன�ப�ப�:"
 
 #: ../mail/mail-config.glade.h:41
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "(_t) வலையில� உள�ள விசைகளை க�றிம�றையாக�கத�தின� போத� பயன�பட�த�த�."
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "எப�போத�ம� (_b) க�க� மறைநகல� அன�ப�ப�:"
 
 #: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "எப�போத�ம� என� மின�னஞ�சல�களை அன�ப�ப�ம� போத� க�றிம�றையாக�கி அன�ப�ப� (_m)"
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "எப�போத�ம� (_t) வலையில� உள�ள விசைகளை க�றிம�றையாக�கத�தின� போத� பயன�பட�த�த�."
 
 #: ../mail/mail-config.glade.h:43
-msgid "Attach original message"
-msgstr "உண�மையான செய�தியை இணை"
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "எப�போத�ம� மறையாக�கம� செய�த அஞ�சல� அன�ப�ப�ம� போத� எனக�க�ம� பிரதியை மறையாக�கம� செய�க (_m)"
 
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
-msgstr "தானாக க�ற�நகைவி படங�களை ந�ழைக�கவ�ம�"
+#: ../mail/mail-config.glade.h:44
+msgid "Always request rea_d receipt"
+msgstr "எப�போத�ம� படிக�க பெற�றவற�ற�க�க� இரசீத�  கோரவ�ம� (_d)"
 
 #: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "(_e) தானியங�கியாக க�ற�நகைவி படங�களை ந�ழைக�கவ�ம�"
+
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "பால�டிக� (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "பால�டிக� (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "(_h)எழ�த�த�ர� வகை:"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "(_e)ஆதரவ�ள�ள வகைகளை சோதி"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Check in_coming mail for junk"
-msgstr "தேவையற�ற மின�னஞ�சல�களை சரிபார�க�கவ�ம�"
-
 #: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "(_s) தேவையற�ற மின�னஞ�சல�கள�க�க� தனிப�பயன� தலைப�ப�களை சோதிக�கவ�ம�"
+
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr "(_m) உள�வர�ம� செய�திகலில� தேவையற�ற மின�னஞ�சல�கள�க�க� சோதிக�கவ�ம�"
+
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "(_t)தட�டச�ச� செய�ய�ம� போதே சொல�பிழை உள�ளதா என சோதி"
 
-#: ../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
 msgid "Cle_ar"
 msgstr "த�டை (_a)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "த�டை (_r)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "(_m)பிழைய�ள�ள வார�த�தைகளின� நிறம�:"
 
-#: ../mail/mail-config.glade.h:56
-msgid "Colors"
-msgstr "நிறங�கள�"
-
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "(_w)அடைவ� ம�ழ�மையாக நீக�கப�பட�ம� போத� நினைவூட�ட�"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13210,141 +14180,173 @@ msgstr ""
 "\n"
 "\"செயல�பட�த�த�\" என�பதை க�ளிக� செய�த� சேமிக�கவ�ம�"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "(_f)இயல�பான"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "(_n)இயல�பான எழ�த�த�ர� க�றியீட�ட� ம�றை"
 
-#: ../mail/mail-config.glade.h:67
-msgid "Delete junk mails on e_xit"
-msgstr "வெளியேற�ம� போத� எரிதங�களை நீக�க�"
-
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "வெளி செல�ல�ம� செய�திகள�க�க� டிஜிட�டல� ம�றையில� கையொப�பமிட�(ம�ன�னிர�ப�பாக) (_s)"
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr "(_x) வெளியேற�ம� போத� எரிதங�களை நீக�க�"
 
 #: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in mails if the text si_ze exceeds"
-msgstr "உரை அளவ� இதற�க� மேல� போனால� அஞ�சல� உள�ளடக�கத�தை ஒழ�ங�க� செய�யாதே"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "(_u) வெளி செல�ல�ம� செய�திகள�க�க� டிஜிட�டல� ம�றையில� கையொப�பமிட� (ம�ன�னிர�ப�பாக)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not quote original message"
-msgstr "உண�மையான செய�தியை எட�த�த�க�காட�டாதே"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "(_z) உரை அளவ� இதற�க� மேல� போனால� அஞ�சல� உள�ளடக�கத�தை ஒழ�ங�க� செய�யாதே"
 
 #: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "(_k)அன�ப�ப�னர� என� ம�கவரி  ப�த�தகத�தில� இர�ந�தால� செய�தியை க�ப�பை என க�றியிடாதே"
+
+#: ../mail/mail-config.glade.h:73
+msgid "Do not quote"
+msgstr "மேற�கோள� காட�ட வேண�டாம�"
+
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "ம�டிந�தத�"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "(_F)வரைவ� அடைவ�:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "மின�னஞ�சல� ம�கவரிகள�"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "(_A)மின�னஞ�சல� ம�கவரிகள�:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "(_x)வெளியேற�ம� போத� க�ப�பை தொட�டி அடைவை காலி செய�"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr "மாய வெற�ற� இட விசையை செயல�பட�த�த� "
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "(_r) அடைவ�கள� தேடலை செயலாக�க�."
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "(_p)க�றிம�றையாக�க சான�றிதழ�:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "வெளி செல�ல�ம� செய�திகளை க�றிம�றையாக�க�(ம�ன�னிர�ப�பாக) (_g)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "(_x)நிலையான அகலம�:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
 msgid "Fix_ed width Font:"
 msgstr "_ந நிலையான அகல எழ�த�த�ர�:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "எழ�த�த�ர� பண�ப�கள�"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "(_H)செய�திகளை HTML மின�னஞ�சலாக அமை"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "ம�ழ�ப� பெயர�: (_e)"
 
-#: ../mail/mail-config.glade.h:87
-msgid "HTML Mail"
-msgstr "HTML மின�னஞ�சல�"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr "ஹெச� டிஎம� எல� செய�திகள�"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "(_T)ஹெச�டிடிபி பதிலாள�:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "தலைப�ப�கள�"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "(_q)க�றிப�பிட�டவைகலை தனிப�பட�த�தி காட�ட�"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "உள�ளே"
 
-#: ../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 "KB"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "விளக�கச�சீட�ட�கள�"
+
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "மொழிகள� அட�டவணை"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "மின�னஞ�சல� அமைப�ப�"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "அஞ�சல� தலைப�ப�கள� அட�டவணை"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "மின�னஞ�சல� பெட�டி இர�க�க�மிடம�"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "செய�தி தொக�ப�பி"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "(_P) பதிலாள� இல�லை இதற�க�:"
+
+#: ../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: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 "(_g)நிற�வனம�:"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG (_K)விசை அடையாளம�:"
 
-#: ../mail/mail-config.glade.h:108
-msgid "Play sound file when new mail arri_ves"
-msgstr "(_v) ப�திய மின�னஞ�சல� வர�ம� போத� ஒலிக�கோப�பை இயக�க�"
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "(_w)கடவ�ச�சொல�:"
 
-#: ../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."
@@ -13352,7 +14354,7 @@ msgstr ""
 "தயவ� செய�த� இந�த கணக�க�க�க� கீழ�ள�ள இடைவெளியில� விவரமான பெயரை\n"
 " உள�ளிட�க. இத� காட�ட�வதற�க� மட�ட�ம� பயன�பட�ம�."
 
-#: ../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."
@@ -13360,7 +14362,7 @@ msgstr ""
 "நீங�கள� மின�னஞ�சல� அன�ப�ப விர�ம�ப�ம� ம�றையை உள�ளிடவ�ம�தெரியவில�லை என�றால� உங�கள� கணினி "
 "மேலாளரை கேட�கவ�ம�."
 
-#: ../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 "
@@ -13370,133 +14372,121 @@ msgstr ""
 "செய�ய தேவையில�லை.விர�ப�பப�பட�டால� உங�கள� மின�னஞ�சலோட� செல�லவேண�டிய தகவல�களை பூர�த�தி "
 "செய�யவ�ம�."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "கீழ�ள�ள தேர�வ�களை ஒன�றை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/mail-config.glade.h:114
+#: ../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 "(_o)கரிநகலாக மட�ட�ம� மின�னஞ�சல� அன�ப�பபட�ம� போத� நினைவூட�ட�"
 
-#: ../mail/mail-config.glade.h:115
-msgid "Quote original message"
-msgstr "க�றிப�பிடப�பட�ட உண�மையான செய�தி"
-
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "க�றிப�பிடப�பட�ட"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "(_m)கடவ�ச�சொல�லை நினைவில� கொள�"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "(_p)பதில� தர�க:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "(_p)கடவ�ச�சொல�லை நினைவில� கொள�"
 
-#: ../mail/mail-config.glade.h:121
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "உள�ளமை ம�கவரி ப�த�தகங�களில� மட�ட�ம� அன�ப�ப�னர� படத�தை தேட�க"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "(_O) சாக�ஸ� வழங�கி:"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
+msgstr "(_e) உள�ளமை ம�கவரி ப�த�தகங�களில� மட�ட�ம� அன�ப�ப�னர� படத�தை தேட�க"
+
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "தேர�ந�தெட�... (_e)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "செய�திகள� கிடைத�த தகவலை அன�ப�ப�க"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "(_t)நிலையான எழ�த�த�ர�"
 
-#: ../mail/mail-config.glade.h:125
-msgid "Se_lect..."
-msgstr "தேர�ந�தெட�... (_l)"
-
-#: ../mail/mail-config.glade.h:127
-msgid "Select Drafts Folder"
-msgstr "மாதிரி வரைவ�கள� அடைவை தேர�வ� செய�க"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML நிலையான அகலம�ள�ள எழ�த�த�ர�வை தேர�வ� செய�"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "HTML நிலையான அகலம�ள�ள எழ�த�த�ர�வை அச�சடிப�பதற�காக தேர�வ� செய�"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML அகலம� மாற�ம� எழ�த�த�ர�வை தேர�வ� செய�"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "HTML அகலம� மாற�ம� எழ�த�த�ர�வை அச�சடிப�பதற�காக தேர�வ� செய�"
 
-#: ../mail/mail-config.glade.h:132
-msgid "Select Sent Folder"
-msgstr "அன�ப�பியவை அடைவை தேர�வ� செய�க"
-
-#: ../mail/mail-config.glade.h:133
-msgid "Select sound file"
-msgstr "ஒலி கோப�பினை தேர�ந�தெட�"
-
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "மின�னஞ�சல� அன�ப�ப�கிறத�"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "(_M)அன�ப�பப�பட�ட செய�தி உள�ள அடைவ�:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "(_v)சேவகனை அண�க அன�மதி தேவை"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "(_T)சேவகன� வகை:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "கையொப�பமிட�கிற சான�றிதழ�: (_n)"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "(_u)கையொப�பம�"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "கையொப�பம�"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "கையொப�பங�கள� அட�டவணை"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Specify _filename:"
-msgstr "(_f)கோப�பின� பெயரை உள�ளிடவ�ம�"
-
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "எழ�த�த� பிழை திர�த�தம�"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "(_t) பதில� உள�ளிட�ம�போத� கீழிர�ந�த�  த�வக�க� "
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "(_y)வகை"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "நீங�கள� நிற�விய�ள�ள அகராதி மொழிகள� மட�ட�மே இங�க�  பட�டியல� இடப�பட�டன."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13506,7 +14496,7 @@ msgstr ""
 "கையொப�பமாக கொள�ளப�பட�ம�. இதில� க�றிப�பிட�ம� பெயர�\n"
 "உங�கள� பெயராக காட�டப�பட�ம�."
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13514,15 +14504,26 @@ msgstr ""
 "இந�த கணக�க�க�க� என�ன பெயரிடவிர�ப�ப�கிறீர�கள� என�பதை உள�ளிடவ�ம� உதாரணமாக \"வேலை\" அல�லத� "
 "\"தனிப�பட�ட\""
 
-#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "(_e)பயனீட�டாளர� பெயர�"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "உண�மைபட�த�தலை பயன�செய�"
+
+#: ../mail/mail-config.glade.h:156 ../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 "(_n)பயனீட�டாளர� பெயர�"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "(_a)மாற�ற�-அகலம�"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13532,104 +14533,124 @@ msgstr ""
 "\n"
 "\"அட�த�த�\" என�பதை க�ளிக� செய�த� த�வங�கவ�ம�."
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "(_A)கையொப�பத�தை சேர�"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "(_A)இணையத�திலிர�ந�த� படங�களை பெற�ற�க�கொள�"
 
-#: ../mail/mail-config.glade.h:161
-msgid "_Beep when new mail arrives"
-msgstr "_ப ப�திய மின�னஞ�சல� வர�ம�போத� ஒலி எழ�ப�ப�"
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "(_A) தானியங�கி பதிலாள� உரல� அமைப�ப�:"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "ம�ன�னிர�ப�ப� எரித சொர�க�ப�பொர�ள�:"
 
-#: ../mail/mail-config.glade.h:163
-msgid "_Do not notify me when new mail arrives"
-msgstr "(_D)ப�திய மின�னஞ�சல� வந�தால� எனக�க� தெரியப�பட�த�த வேண�டாம�"
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "(_D) இணையத�த�க�க� நேரடி இணைப�ப�"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "சந�திப�ப� பற�றிய கோரிக�கைக�க� கையொப�பம� தேவை இல�லை(அவ�ட�ல�க�கில� வேலை செய�வதற�காக) (_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "(_F)ம�ன� அன�ப�ப�ம� பாணி:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "பதில� எழ�த�ம� போத� கையெழ�த�தை மூல செய�திக�க� மேலே வைக�கவ�ம�"
 
-#: ../mail/mail-config.glade.h:168
-msgid "_Load images in mail from contacts"
-msgstr "தொடர�களிலிர�ந�த� அஞ�சல�க�க� படங�களை �ற�ற� (_L)"
+#: ../mail/mail-config.glade.h:170
+msgid "_Load images in messages from contacts"
+msgstr "தொடர�ப�களிலிர�ந�த� அஞ�சல�க�க� படங�களை �ற�ற� (_L)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "(_L) உள� ம�கவரி ப�த�தக த�தில� மட�ட�ம� தேட�"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "(_M)இதை இயல�பான கணக�காக க�றிக�கவ�ம�"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "(_M) கைம�றை பதிலாள� அமைப�ப�"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "(_M) பிறக� படி என க�றிக�கவ�ம�"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "(_N)எப�போத�ம� இணையத�திலிர�ந�த� படங�களை �ற�றாதே"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "(_P)பாதை"
 
-#: ../mail/mail-config.glade.h:174
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "HTML செய�திகளை தொடர�ப�கள�க�க� அன�ப�ப�ம� போத� தேவை இல�லை எனில� நினைவூட�ட� (_P)"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr " HTML தேவை இல�லை என�போர�க�க� HTML செய�திகளை அன�ப�ப�ம� போத�  நினைவூட�ட� (_P)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "(_P)தலைப�பில�லாமல� செய�தி அன�ப�பினால� நினைவூட�ட�"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "(_R)பதில� பாணி:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "(_S)சிற�நிரல�:"
 
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "(_S) பாத�காப�பான ஹெச�டிடிபி பதிலாள�:"
+
+#: ../mail/mail-config.glade.h:183
+msgid "_Select..."
+msgstr "தேர�ந�தெட�... (_S)"
+
 #. 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:186
 msgid "_Show image animations"
 msgstr "இயங�க� படத�தை காட�ட� (_S)"
 
-#: ../mail/mail-config.glade.h:181
-msgid "_Show the photograph of sender in the email preview"
-msgstr "மின�னஞ�சல� ம�ன�பார�வையில� அன�ப�ப�னர� படத�தைக� காட�ட�"
+#: ../mail/mail-config.glade.h:187
+msgid "_Show the photograph of sender in the message preview"
+msgstr "(_S) மின�னஞ�சல� ம�ன�பார�வையில� அன�ப�ப�னர� படத�தைக� காட�ட�"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "அன�ப�ப�நர� / நகல� / மறைநகல� தலைப�ப�களை இங�க� இணைக�கவ�ம� (_S)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "பாத�காப�பான இணைப�பை பயன�பட�த�த�: (_U)"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "(_U)கணினி இயல�பானதை பயன�பட�த�த�"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "(_U)மற�ற பயன�பாட�கள� பயன�பட�த�த�ம� எழ�த�த�ர�வையே பயன�பட�த�த�"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "ம�கவரிகள�"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "நிறம�"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "விளக�கம�"
 
@@ -13669,43 +14690,43 @@ msgstr "எழ�த�த�ணர�வ� (_s)"
 msgid "Co_mpleted"
 msgstr "ம�டிவ�ற�றத� (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "தேட�: (_i)"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "செய�தியில� கண�ட�பிடி"
 
-#: ../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 "தொடர�வதற�காக க�றியிட�"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "அடைவ� உற�ப�பினர�கள�"
 
-#: ../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 "தேர�வ� செய�யாத"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "(_e)சேவகன�:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "பாத�காப�ப� தகவல�"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "க�றிப�பிட�ட அடைவ�கள�"
 
-#: ../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."
@@ -13713,23 +14734,23 @@ msgstr ""
 "தொடந�த� கவனிப�பதற�காக நீங�கள� தேர�வ� செய�த செய�தி பட�டியலிடப�பட�ட�ள�ளத�\n"
 "\"க�றி\" பட�டிலிர�ந�த� தொடர� தேர�வை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "அங�கீகாரத�தை �ற�ற�க�கொள� (_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "(_D)நில�வையில�:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "(_F)க�றி:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "ஒப�பந�த பத�திரத�தை �ற�க இங�க� சொட�க�கவ�ம�"
 
-#: ../mail/mail-folder-cache.c:877
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "தொடர�ப�கொள�கிறத� %s"
@@ -13738,17 +14759,17 @@ msgstr "தொடர�ப�கொள�கிறத� %s"
 msgid "Filtering Selected Messages"
 msgstr "தேர�ந�தெட�க�கப�பட�டத� செய�திகளை வடிக�கிறத�"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "மின�னஞ�சலை கொணர�கிறத�"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "வெளிசெல�ல�ம� வடிகட�டிக�க� அன�ப�ப�வதில� தோல�வி : %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13757,12 +14778,16 @@ msgstr ""
 "பினெழ�த�வதில� தோல�வி %s: %s\n"
 "உள� 'அன�ப�ப�' அடைவில� போய� சேர�ந�த�விட�டத�."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "உள� 'அன�ப�ப�' அடைவில� சேர�க�க�ம� போத� தோல�வி : %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "செய�தி அன�ப�ப�கிறத�"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d இல� %d அன�ப�பப�பட�கிறத�"
@@ -13772,99 +14797,102 @@ msgstr "%d இல� %d அன�ப�பப�பட�கிறத�"
 msgid "Failed to send %d of %d messages"
 msgstr "%d இல� %d செய�தி அன�ப�ப�வதில� தோல�வி"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:696
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "ரத�த� செய�யப�பட�டத�."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:698
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "ம�டிந�தத�"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "செய�தியை அடைவில� சேமிக�கிறத�"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s க�க� செய�தியை நகர�த�த�கிறத�"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s இல� செய�தியை நகலெட�க�கிறத�"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "செய�தியை ம�ன� அன�ப�ப�கிறத�"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "அடைவை திறக�கிறத� %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1272
+msgid "Retrieving quota information for folder %s"
+msgstr "அடைவ� %sக�க� ஒத�க�கீட�  தகவல� வாங�க�கிறத�"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "கிடங�கை திறக�கிறத� %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "அடைவை நீக�க�கிறத� %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "அடைவை சேமிக�கிறத�  '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "கணக�கை சேர�க�கிறத� மற�ற�ம� அழிக�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "கணக�கை சேர�க�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "அடைவை ப�த�ப�பிக�கிறத�"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "அடைவை அழிக�கிறத�"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "க�ப�பைதொட�டியை காலி செய�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "உள� அடைவ�கள�"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "செய�திகளை மீட�கிறத� %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d செய�திகளை மீட�கிறத�"
 msgstr[1] "%d செய�திகளை மீட�கிறத�"
 
-#: ../mail/mail-ops.c:1942
-#, c-format
+#: ../mail/mail-ops.c:1980
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "%d செய�திகளை சேமிக�கிறத�"
+msgid_plural "Saving %d messages"
+msgstr[0] "%d செய�தியை சேமிக�கிறத�"
 msgstr[1] "%d செய�திகளை சேமிக�கிறத�"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13873,11 +14901,11 @@ msgstr ""
 "செய�தியை சேமிக�க�ம� போத� பிழை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "இணைப�பை சேமிக�கிறத�"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13886,35 +14914,35 @@ msgstr ""
 "விளைவ�க�கோப�பை உர�வாக�க ம�டியவில�லை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "தகவலை எழ�த ம�டியவில�லை: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s லிர�ந�த� த�ண�டிக�கப�பட�கிறத�"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s இல� மீண�ட�ம� இணைக�கப�பட�கிறத�"
 
-#: ../mail/mail-ops.c:2361
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s'  கணக�க�க�க� தொடர�பில�லாத நிலைக�க� தயாராகிறத� "
 
-#: ../mail/mail-ops.c:2444
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "சேவைகளை சோதிக�கிறத�"
 
-#: ../mail/mail-send-recv.c:161
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "ரத�த� செய�கிறத�..."
 
-#: ../mail/mail-send-recv.c:387
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "மின�னஞ�சலை அன�ப�ப� & பெற�ற�க�கொள�"
 
@@ -13922,53 +14950,53 @@ msgstr "மினà¯�னஞà¯�சலை அனà¯�பà¯�பà¯� & பெறà¯�à®±à¯
 msgid "Cancel _All"
 msgstr "(_A)அனைத�தைய�ம� ரத�த� செய�"
 
-#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "மேம�பட�த�த�கிறத�..."
 
-#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:575
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "காத�திர�க�கிறத�...."
 
-#: ../mail/mail-send-recv.c:783
+#: ../mail/mail-send-recv.c:799
+#, c-format
 msgid "Checking for new mail"
 msgstr "ப�திய மின�னஞ�சல�க�காக சரிபார�க�கிறத�"
 
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s க�கான கடவ�ச�சொற�களை உள�ளிடவ�ம�"
 
-#: ../mail/mail-session.c:204
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "கடவ�ச�சொற�களை உள�ளிடவ�ம�"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s க�கான கடவ�ச�சொல�லை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
-#: ../mail/mail-session.c:251
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "செயலை பயனீட�டாளர� ரத�த� செய�த�விட�டார�"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "கையொப�பத�தை திர�த�த�"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "(_S) சேமி மற�ற�ம� மூட�"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "இந�த கையொப�பத�தின� பெயரை உள�ளிடவ�ம�"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "பின�னூட�டத�தை திர�த�த�"
 
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "பெயர�:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "(_S) பின�னூட�டத�தின�  பெயர�:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -13994,62 +15022,62 @@ msgstr "செய�திகளை அன�ப�ப�"
 msgid "Invalid folder: `%s'"
 msgstr "செல�லாத அடைவ�`%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "தேட� அடைவ�களை அமைக�கிறத� :%s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s க�கான தேட� அடைவ�களை மேம�பட�த�த�கிறத�:%s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr " '%s' க�கான  தேட� அடைவ�களை �ற�ற�கிறத�"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "தேட� அடைவை தொக�"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "ப�திய தேடல� அடைவ�"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "அடைவ�&quot;{0}&quot; �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "அடைவ� \"{0}\"  �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "அடைவ�&quot;{1}&quot; �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "அடைவ�\"{1}\"  �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
 
 #: ../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."
 msgstr ""
-"காலியில�லாத அடைவ� &quot;{1}&quot; �ற�கெனவே உள�ளத� \n"
+"காலியில�லாத அடைவ� \"{1}\"  �ற�கெனவே உள�ளத� \n"
 "\n"
 "நீங�கள� இந�த அடவை உதசீனப�பட�த�தலாம�, அடைவின� மேலெழ�தலாம�, அல�லத� அடக�கத�தை கூட�டலாம� அல�லத� "
 "வெளியேறலாம�."
 
 #: ../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 ""
-"படித�ததற�க� இரசீத� &quot;&quot; பெற�வத�?&quot;{1}&quot; க�க� கேட�கப�பட�கிறத�. {0} "
+"படித�ததற�க� இரசீத� \"{1}\" க�க� கேட�கப�பட�கிறத�. {0} "
 "க�க� இரசீத� அன�ப�பவா?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr " &quot;{0}&quot; பெயர�டன� கையெழ�த�த� �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr " \"{0}\" பெயர�டன� பின�னூட�டம� �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14084,8 +15112,8 @@ msgstr "இந�த அடைவில� உள�ள நீக�கப�ப
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot; அடைவில� உள�ள அனைத�த� செய�திகளைய�ம� நிரந�தரமாக நீக�க வேண�ட�மா?"
+"folder \"{0}\"?"
+msgstr "இந�த \"{0}\"  அடைவில� உள�ள நீக�கப�பட�ட செய�திகளை நிரந�தரமாக அழிக�க விர�ப�பமா?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14100,82 +15128,81 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "தலைப�ப� இல�லாமல� மின�னஞ�சல� அன�ப�ப விர�ப�பமா?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "�னெனில� &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "�னெனில� \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "�னெனில� &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "�னெனில� \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "வெற�மையான கையொப�பம�"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot;. தேட� அடைவை சேர�க�க ம�டியவில�லை"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "\"{0}\" தேடல� அடைவை சேர�க�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "அடைவ� &quot;{0}&quot; � &quot;{1}&quot; க�க� நகல� எட�க�க ம�டியவில�லை"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "அடைவ� \"{0}\". � \"{1}\". க�க� நகல� எட�க�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "அடைவ�  &quot;{0}&quot; � உர�வாக�க ம�டியவில�லை"
+msgid "Cannot create folder \"{0}\"."
+msgstr "அடைவ�  \"{0}\"  � உர�வாக�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "தற�காலிக சேமி அடைவை உர�வாக�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "சேமிக�க அடைவை உர�வாக�க ம�டியவில�லை. �னெனில� &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "சேமிக�க அடைவை உர�வாக�க ம�டியவில�லை. �னெனில� \"{1}\";"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "அடைவ� &quot;{0}&quot; � நீக�க ம�டியவில�லை"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "அடைவ� \"{0}\" � நீக�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; கணினி அமைப�ப� அடைவை நீக�க ம�டியவில�லை"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "\"{0}\" கணினி அமைப�ப� அடைவை நீக�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "தேட� அடைவ� &quot;{0}&quot; � திர�த�த ம�டியவில�லை. �னெனில� அத� இர�ப�பில� இல�லை."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "தேட� அடைவ� \"{0}\" � திர�த�த ம�டியவில�லை. �னெனில� அத� இர�ப�பில� இல�லை."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "அடைவ� &quot;{0}&quot; � &quot;{1}&quot; க�க� நகர�த�த ம�டியவில�லை"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "அடைவ� \"{0}\" � \"{1}\" க�க� நகர�த�த ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "மூலம� &quot;{1}&quot; � திறக�க ம�டியவில�லை"
+msgid "Cannot open source \"{1}\""
+msgstr "மூலம� \"{1}\" � திறக�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "மூலம� &quot;{2}&quot; � திறக�க ம�டியவில�லை"
+msgid "Cannot open source \"{2}\"."
+msgstr "மூலம� \"{2}\" � திறக�க ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "இலக�க� &quot;{2}&quot; � திறக�க ம�டியவில�லை"
+msgid "Cannot open target \"{2}\"."
+msgstr "இலக�க� \"{2}\" � திறக�க ம�டியவில�லை"
 
 #: ../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 ""
-"நிற�வல� பிரச�சினையால�  &quot;{0}&quot;; அன�மதி கோப�பை படிக�க இயலவில�லை. இந�த தர�வி "
-"யை அன�மதி கோப�பை படிக�க�ம� வரை  நீங�கள� பயன�பட�த�த இயலாத�."
+"நிற�வல� பிரச�சினையால�  \"{0}\"; அன�மதி கோப�பை படிக�க இயலவில�லை.  அன�மதி  "
+"கோப�பை படிக�க�ம� வரை  நீங�கள� இந�த தர�வியை பயன�பட�த�த இயலாத�."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; க�க� &quot;{1}&quot; ஆக மாற�ற�ப�பெயர� இட ம�டியவில�லை"
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" க�க� \"{1}\" ஆக மாற�ற�ப�பெயர� இட ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
-"கணினி அமைப�ப� அடைவ�  &quot;{0}&quot; க�க� மாற�ற�ப�பெயர� இடவோ அல�லத� நகர�த�தவோ "
+"கணினி அமைப�ப� அடைவ�  \"{0}\" க�க� மாற�ற�ப�பெயர� இடவோ அல�லத� நகர�த�தவோ "
 "ம�டியவில�லை"
 
 #: ../mail/mail.error.xml.h:37
@@ -14183,18 +15210,22 @@ msgid "Cannot save changes to account."
 msgstr "கணக�கில� மாற�றம� செய�ய ம�டியாத�."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "அடைவ� &quot;{0}&quot; க�க� சேமிக�க இயலாத�"
+msgid "Cannot save to directory \"{0}\"."
+msgstr "அடைவ� \"{0}\" க�க� சேமிக�க இயலாத�"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "கோப�ப� &quot;{0}&quot; க�க� சேமிக�க இயலாத�."
+msgid "Cannot save to file \"{0}\"."
+msgstr "கோப�ப� \"{0}\" க�க� சேமிக�க இயலாத�."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "கையெழ�த�த� ஸ�கிரிப�ட� &quot;{0}&quot; � அமைக�க ம�டியாத�."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "கையெழ�த�த� ஸ�கிரிப�ட� \"{0}\" � அமைக�க ம�டியாத�."
 
 #: ../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."
@@ -14202,91 +15233,95 @@ msgstr ""
 "கடவ�ச�சொல� சரியாக உள�ளிடப�பட�டதா என  சோதிக�கவ�ம�. பல கடவ�ச�சொற�கள� நிலை உணர�வ� கொண�டவை "
 "என�பதை நினைவ� கொள�க. உயர� நிலை விசை செய�ல�பட�த�தப�ப�ட�ட� இர�க�கலாம�."
 
-#: ../mail/mail.error.xml.h:42
-msgid "Could not save signature file."
-msgstr "கையொப�பதை சேமிக�க ம�டியாத�"
-
 #: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr " &quot;{0}&quot; நீக�க வேண�ட�மா?"
+msgid "Could not save signature file."
+msgstr "பின�னூட�ட கோப�பை சேமிக�க ம�டியாத�"
 
 #: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "\"{0}\" � நீக�கவா? "
+
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "கணக�கை நீக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "தேடல� அடைவ�  \"{0}\" இல�  உள�ள  செய�திகளை நீக�கவா?"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr "தேடல� அடைவில�  உள�ள  செய�திகளை நீக�கவா?"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "மாற�றத�தை அழிக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "நீ_க�காதே"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "அழிக�க வேண�டாம�"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "செயல� நீக�காதே"
 
-#: ../mail/mail.error.xml.h:49
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "த�ணை அடைவ�களில� கூட இந�த செயல�பாட�டினை செய�ய வேண�ட�மா?"
-
-#: ../mail/mail.error.xml.h:50
+#: ../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:51
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "அனைத�த� செய�திகளைய�ம� படித�ததாக க�றிக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "மாற�றங�களை சேம�மிக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "வடிகட�டி க�றிப�பை �ற�ற�ம�போத� பிழை"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "செயல�பட�ம� போத� பிழை"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "{0}.போத� பிழை"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "கோப�ப� �ற�கெனவே உள�ளத� மேலெழ�த ம�டியாத�."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "கோப�ப� உள�ளத� ஆனால� இயல�பான கோப�ப� இல�லை"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "தொடந�தால�, உங�களால� செய�தி எதைய�ம� மீட�க ம�டியாத�."
 
-#: ../mail/mail.error.xml.h:60
+#: ../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:61
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "தொடர�ந�தால� அனைத�த� பதிலாள� கணக�க�கள�ம� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14294,29 +15329,29 @@ msgstr ""
 "தொடர�ந�தால� கணக�க� விவரங�கள�ம� அனைத�த�\n"
 "பதிலாள� விவரங�கள�ம� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "தொடர�ந�தால�ம, இந�த கணக�க� தகவல�கள� நீக�கப�பட�ம�"
 
-#: ../mail/mail.error.xml.h:65
+#: ../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:66
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "தவிர�"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "செல�லாத அன�மதி ம�றைமை"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "மின�னஞ�சல� வடிகட�டி தானாக மேம�பட�த�தப�பட�டத�"
 
-#: ../mail/mail.error.xml.h:70
+#: ../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 "
@@ -14327,26 +15362,18 @@ msgstr ""
 "தலைப�பை பயன�பட�த�த�ம�. இந�த தலைப�பை தேர�வ� செய�தால� நீங�கள� மின�னஞ�சல� அன�ப�பியவர�களில� பட�டியல� "
 "தெரிய�ம�. இதை தவிர�க�க ஒர� பெற�நர� ம�கவரி மற�ற�ம� ஒர� கரிநகல� ம�கவரியை உள�ளிடவ�ம�."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "அனைத�த� செய�திகள�ம� படித�ததாக க�றிக�கவ�ம�."
 
-#: ../mail/mail.error.xml.h:72
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "அனைத�த� அடைவ�கள�, உப அடைவ�களில� உள�ள செய�திகள�ம� படித�ததாக க�றிக�கவா?"
-
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "அடைவை காணவில�லை"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "மூலம� எத�வ�ம� தேர�வ� செய�யப�படவில�லை"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Only on _Current Folder"
-msgstr "நடப�பில�ள�ள அடைவில� மட�ட�ம�"
-
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "ஒரே நேரத�தில� பல செய�திகளை திறக�க�ம� போத� நீண�ட நேரம� எட�க�க�ம�."
@@ -14371,62 +15398,69 @@ msgstr ""
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
 "கீழ�கண�ட பெற�நர� HTML மின�னஞ�சலை பெற விர�ம�ப�கிறாரா என�பதை உற�திப�பட�த�திக�கொள�ளவ�ம�\n"
-"{0}\n"
-"எப�படி இர�ந�தால�ம� அன�ப�பலாமா?"
+"HTML மின�னஞ�சல�:\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "இந�த கையெழ�த�த�க�க� தயவ� செய�த� தனிப�பட�ட பெயர� தர�க"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "காத�திர�க�கவ�ம�."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "பழைய மின�னஞ�சல� அடைவை நகர�த�த�வதில� சிக�கல� &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "பழைய மின�னஞ�சல� அடைவ� \"{0}\" �  நகர�த�த�வதில� சிக�கல� ."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "வினா எழ�ப�ப�ம� சேவையகம�"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ஆதரவ�ள�ள உண�மைப�பட�த�தல� இயக�க பட�டியல�க�க� வழங�கனை விசாரிக�கிறத�."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "படித�த இரசீத� கேட�கப�பட�கிறத�."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "உண�மையாகவே \"{0}\" அடைவைய�ம� உப அடைவ�களைய�ம� அழிக�க வேண�ட�மா?"
+
 #: ../mail/mail.error.xml.h:90
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "உண�மையாகவே &quot;{0}&quot; அடைவைய�ம� உப அடைவ�களைய�ம� அழிக�க வேண�ட�மா?"
+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 "தேட�ம� அடைவ�கள� தானாக மேம�பட�த�தப�பட�டத�"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "ரசீத� அன�ப�ப�"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "கையொப�பம� �ற�கனவே உள�ளத�"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "ஒத�திசைவ�"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr "வலை தொடர�பில�லாத பயன�க�க� அடைவ�களை ஒத�திசைவ� செய�யவா?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14434,7 +15468,7 @@ msgstr ""
 "எவல�யூஷன� சரியாக வேலை செய�ய கணினி அமைப�ப� அடைவ�கள� தேவை. அவற�றை மற�பெயரிட, நகர�த�த "
 "அல�லத� நீக�க இயலாத�."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14449,39 +15483,39 @@ msgstr ""
 "தலைப�பை பயன�பட�த�த�ம�. இந�த தலைப�பை தேர�வ� செய�தால� நீங�கள� மின�னஞ�சல� அன�ப�பியவர�களில� பட�டியல� "
 "தெரிய�ம�. இதை தவிர�க�க ஒர� பெற�நர� ம�கவரி மற�ற�ம� ஒர� கரிநகல� ம�கவரியை உள�ளிடவ�ம�."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 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 ""
 "கீழ�கண�ட தேட�ம� அடைவ�(கள�):\n"
 "{0}\n"
 "தற�போத� நீக�கப�பட�ட அடைவ�களை பயன�பட�த�த�கிறத�:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "மேல�ம� மேம�பட�த�தப�பட�கிறத�."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 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 ""
 "கீழ�கண�ட வடிப�பி விதிம�றை(கள�):\n"
 "{0}\n"
 "தற�போத� நீக�கிய அடைவ�களை பயன�பட�த�த�கிறத�\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "மற�ற�ம� மேம�பட�த�தப�பட�கிறத�."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "நிரல� கோப�ப� இர�க�க வேண�ட�ம� மற�ற�ம� இயக�கப�பட வேண�ட�ம�"
 
-#: ../mail/mail.error.xml.h:111
+#: ../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."
@@ -14489,17 +15523,17 @@ msgstr ""
 "அடைவ� கர�த�த� தொக�கி சேர�க�கப�பட�ட� இர�க�கலாம�. \n"
 "தேவையானால� தேட�தல� அடைவ� திர�த�திக�க� சென�ற� தெளிவாக சேர�க�கவ�ம�."
 
-#: ../mail/mail.error.xml.h:113
+#: ../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:114
+#: ../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:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14507,11 +15541,11 @@ msgstr ""
 "இந�த சேவகன� இத� போன�ற அன�மதி ம�றைக�க� ஆதரவ� தராத� அல�லத� எந�த  அன�மதி ம�றைக�க�ம� "
 "ஆதரவ� இல�லை."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "இந�த கையொப�பம� மாற�றப�பட�ட த� ஆனால� சேமிக�கப�படவில�லை"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14519,49 +15553,58 @@ msgstr ""
 "இத� தேர�ந�தெட�க�கப�பட�ட அடைவ� மற�ற�ம� அதன� த�ணை அடைவ�களில� அனைத�த� செய�திகளைய�ம� "
 "படித�ததாக க�றிக�க�ம�."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "க�ழ� வாரியான சேவையகத�தினை இணைக�க ம�டியவில�லை."
 
-#: ../mail/mail.error.xml.h:119
+#: ../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:120
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "அங�கீகார கோப�பினை படிக�க ம�டியவில�லை."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "(_D)இயல�பானதை பயன�பட�த�த�"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "இயல�பான வரைவ� அடைவை பயன�பட�த�தவா?"
 
 #: ../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 ""
+"எச�சரிக�கை: ஒர� தேடல� அடைவிலிர�ந�த� செய�திகளை நீக�க�வத� உண�மையில� உங�கள�டைய \n"
+" இன�னொர� உள�ளமை / தொலை அடைவிலிர�ந�த� செய�திகளை நீக�க�ம�.  இதை நிச�சயம� செய�ய வேண�ட�மா?"
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "தேவையான அனைத�த� தகவல�களைய�ம� உள�ளிடவ�ம�"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "அன�ப�பாத செய�தி உள�ளத�, வெளியேற விர�ப�பமா?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "ஒரே பெயரில� இரண�ட� கணக�க�களை உர�வாக�க ம�டியாத�"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "நீங�கள� இந�த தேட�ம� அடைவிற�க� பெயரிட வேண�ட�ம�."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "அடைவின� பெயரை க�றிப�பிட வேண�ட�ம�"
 
-#: ../mail/mail.error.xml.h:129
+#: ../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 "
@@ -14571,105 +15614,114 @@ msgstr ""
 "அடைவை தனியாக தேர�வ� செய�தோ மற�ற�ம�/அல�லத� அனைத�த� உள� அடைவ�களைய�ம�, தொலை அடைவ�களைய�ம� "
 "அல�லத� அனைத�தைய�ம� தேர�வ� செய�தோ க�றிப�பிடலாம�."
 
-#: ../mail/mail.error.xml.h:131
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "சேவையகத�தில� &quot;{0}&quot; as &quot;{0}&quot; உங�கள� உள� அன�மதி மற�க�கப�பட�டத�."
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr " \"{0}\" சேவையகத�தில� \"{0}\" ஆக உள� அன�மதி  உங�கள�க�க� மற�க�கப�பட�டத�."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "(_A)பின� எழ�த�"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "(_D)மாற�றத�தை நிராகரி"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "_ஒத�திசைவ� செய�யாதே"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "(_E)அழிக�கவ�ம�"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "செய�திகளை திற (_O)"
 
-#: ../mail/mail.error.xml.h:140
-msgid "on Current Folder and _Subfolders"
-msgstr "இப�போதைய அடைவ� மற�ற�ம� உப அடைவ�கள� மீத�"
-
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "பார�க�காத"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "பார�த�த"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "பதிலலிக�கப�பட�டத�"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "மேலன�ப�பப�பட�டத�"
+
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "பார�காத பல செய�திகள�"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "பல செய�திகள�"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "க�றைவான"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "க�றைந�த"
 
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "உயர�ந�த"
 
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "உயரமான"
 
-#: ../mail/message-list.c:1508 ../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:1515 ../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 "இன�ற� %l:%M %p"
 
-#: ../mail/message-list.c:1524 ../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 "நேற�ற� %b %d %l:%M %p"
 
-#: ../mail/message-list.c:1536 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1544 ../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 "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2306 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "செய�திகள�"
-
-#: ../mail/message-list.c:3752
+#. 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
 msgid "Generating message list"
 msgstr "செய�தி பட�டியலை உர�வாக�க�கிறத�"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"உங�கள� தேடல� க�றிப�ப�கள�க�க� �ற�ற செய�தி �த�ம� இல�லை. தேடலை Search-"
+">Clear menu item கட�டளையால� நிற�த�த�.  அல�லத� அதை மாற�ற�க."
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "இந�த அடைவில� எந�த செய�திய�ம� இல�லை."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "நில�வை"
@@ -14686,52 +15738,52 @@ msgstr "க�றிக�கப�பட�ட"
 msgid "Follow Up Flag"
 msgstr "தொடர�வதற�கான அடையாளம�"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "பெற�ற�க�கொள�ளப�பட�டத�"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "செய�திகளை அன�ப�ப�க"
 
-#: ../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 "அளவ�"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "அழை"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
-msgstr "அன�பாதே"
+msgstr "அன�ப�பாதே"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "தொடரவேண�ட�ம�"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "உங�கள� தகவல�க�காக"
 
-#: ../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 "அன�ப�ப�"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "பதில� தேவை இல�லை"
 
-#: ../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 "பதில�"
 
-#: ../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 "அனைவர�க�க�ம� பதிலலி"
+msgstr "அனைவர�க�க�ம� பதிலளி"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "மீள�பார�வை"
 
@@ -14741,21 +15793,25 @@ msgstr "உள�ளடக�கத�தில�"
 
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
-msgstr "செய�தியில�"
+msgstr "செய�தியில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
-msgstr "பெர�பவரில�"
+msgstr "பெர�பவரில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
-msgstr "அன�ப�பியவரில�"
+msgstr "அன�ப�பியவரில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
-msgstr "தலைப�பில�"
+msgstr "தலைப�பில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "பொர�ள� அல�லத� பெற�னர� கொண�டிர�ந�தால�"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "பொர�ள� அல�லத� அன�ப�ப�னர� கொண�டிர�ந�தால�"
 
@@ -14768,27 +15824,22 @@ msgid "Provides core functionality for local address books."
 msgstr "உள�ளமை ம�கவரி ப�த�தகங�கள�க�க� கோர� செயல�பாட�களை கொட�க�கிறத�."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "நினைவூட�டல� கூட�தல� வசதியை செயல�பட�த�த�க"
+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:376
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "திறவ�ச� சொற�கள�"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:422
-msgid "Attachment Reminder Preferences"
-msgstr "நினைவூட�டல� இணைப�பின� க�ணங�கள�"
-
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "_இல�லாத இணைப�ப�களை நினைவூட�ட�"
-
 #: ../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"
@@ -14812,9 +15863,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "செய�தியில� இணைப�ப�கள� இல�லை"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "திர�த�தலை தொடர�க"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "செய�தி திர�த�த� (_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -14828,27 +15879,27 @@ msgstr ""
 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 "பின�சேமிப�ப� செய�த பின� எவல�யூஷனை மீண�ட�ம� தொடங�க� (_R)"
 
-#: ../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 "மற�சேமிப�ப� செய�த பின� எவல�யூஷனை மீண�ட�ம� தொடங�கவ�ம� (_R)"
 
-#: ../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"
@@ -14858,98 +15909,122 @@ msgstr ""
 "க�றிப�ப�கள�/ ம�கவரி ப�த�தகம� அனைத�த�ம�\n"
 "மீட�டமைக�கலாம�. உங�கள� சொந�தமான அமைப�ப�கள�, அஞ�சல� வடிப�பிகள� ஆகியன கூட மீட�கலாம�."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "எவல�யூஷன� � காப�ப�க�கோப�பிலிர�ந�த� மீட�டமை"
 
-#: ../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
 msgid "Choose a file to restore"
 msgstr "மீட�டமைக�க கோப�பை தேர�ந�தெட�க�கவ�ம�."
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "எவல�யூஷன� அடைவினை பின�சேமிக�கவ�ம�"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "எவல�யூஷன� அடைவினை மற� சேமிக�கவ�ம�"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "எவல�யூஷன� காப�பை சோதிக�க"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "எவல�யூஷனை மீண�ட�ம� தொடங�க�"
 
-#: ../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
 msgid "Shutting down Evolution"
 msgstr "எவல�யூஷன� மூடப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "எவல�யூஷன� கணக�க�கள� மற�ற�ம� அமைப�ப�கள� பாத�காக�கப�பட�கிறன."
 
-#: ../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
 msgid "Backup complete"
 msgstr "காப�ப� ம�டிந�தத�"
 
-#: ../plugins/backup-restore/backup.c:92
-#: ../plugins/backup-restore/backup.c:133
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "எவல�யூஷன� மற� த�வக�கம� செய�யப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "இப�போதைய எவல�யூஷன� தரவ� காப�ப� எட�க�கப�பட�கிறத�."
 
-#: ../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
 msgid "Loading Evolution settings"
 msgstr "எவல�யூஷன� அமைப�ப�கள� �ற�றப�பட�கின�றன."
 
-#: ../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
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "காப�ப� அடைவ� %s க�க� எட�க�கப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "அடைவ� %s லிர�ந�த� மீட�டெட�க�கப�பட�கிறத�."
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "எவல�யூஷன� காப�ப�"
 
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "எவல�யூஷன� மீளமை"
 
+#: ../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 "எவல�யூஷன� தரவ� மற�ற�ம� அமைப�ப�களை காப�பெட�க�க மீட�டெட�க�க சொர�க�ப�பொர�ள� "
+msgstr "எவல�யூஷன� தரவ� மற�ற�ம� அமைப�ப�களை காப�பெட�க�க மற�ற�ம� மீட�டெட�க�க சொர�க�ப�பொர�ள� "
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -14976,14 +16051,22 @@ 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 "செல�லாத எவல�யூஷன� காப�ப�க�கோப�ப�"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "மீட�டமைக�க தயவ� செய�த� செல�ல�படியாக�ம� காப�ப� கோப�பை தேர�ந�தெட�க�கவ�ம�."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15008,43 +16091,41 @@ msgstr "அமைப�ப�களை மீட�டெட�..."
 msgid "_Backup Settings..."
 msgstr "அமைப�ப�களளை காப�ப� எட�..."
 
-#: ../plugins/bbdb/bbdb.c:451 ../plugins/bbdb/bbdb.c:460
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "தானியக�க தொடர�ப�கள�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:475
-msgid "_Automatically create entries in the addressbook when responding to mail"
-msgstr "அஞ�சல�க�க� பதில� தர�கையில� தானாகவே ம�கவரிப�ப�த�தகத�தில� உள�ளிட�கிறத�."
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "(_A) அஞ�சல�க�க� பதில� தர�கையில� தானாகவே ம�கவரிப�ப�த�தகத�தில� உள�ளிட�கிறத�."
 
-#: ../plugins/bbdb/bbdb.c:481
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr " தானியங�கி தொடர�ப�கள� க�க� ம�கவரிப�ப�த�தகம� தேர�ந�தெட�"
 
-#: ../plugins/bbdb/bbdb.c:496
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "உடனடி செய�தி தொடர�ப�கள�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:511
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "பிட�ஜின� நண�பர� பட�டியல� இலிர�ந�த� தொடர�ப� தகவல� மற�ற�ம� பிம�பங�களை அவ�வப�போத� ஒத�திசைக�கவ�ம�."
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "பிட�ஜின� நண�பர� பட�டியல� இலிர�ந�த� தொடர�ப� தகவல� மற�ற�ம� பிம�பங�களை  ஒத�திசைக�கவ�ம�."
 
-#: ../plugins/bbdb/bbdb.c:517
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "பிட�ஜின� அரட�டையாளர� பட�டியல�க�க� ம�கவரி ப�த�தகத�தை தேர�ந�தெட�க�கவ�ம�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:528
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "அரட�டையாளர� பட�டியலில� இப�போத� ஒர�ங�கிணைக�கவ�ம� (_b)"
 
 #: ../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 ""
@@ -15055,12 +16136,32 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:305
-msgid "Convert mail text to _Unicode"
-msgstr "_ய அஞ�சல� உரை � யூனிக�கோட�க�க� மாற�ற�க"
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+msgid "Error occurred while spawning %s: %s."
+msgstr "%s � த�வக�க�ம�போத�  பிழை �ற�பட�ட�ள�ளத�: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "போகோ வடிப�பி சேய� செயல� பதிலளிக�கவில�லை. ம�டிக�கிறத�..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "போகோ வடிப�பி சேய� செயல�க�க� காத�திர�ப�ப� மறிக�கப�பட�டத�.  நிற�த�த�கிறத�... "
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "போகோ வடிப�பிக�க� பைப� தர இயலவில�லை. தவற� க�றிப�ப� : %d. "
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+msgid "Convert message text to _Unicode"
+msgstr "_U உரையை யூனிக�கோட�க�க� மாற�ற�க"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail text to Unicode"
+msgid "Convert mail messages to Unicode"
 msgstr "அஞ�சல� உரை � யூனிக�கோட�க�க� மாற�ற�க"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
@@ -15076,19 +16177,25 @@ msgid "Bogofilter Options"
 msgstr "போகோவடிகட�டி தேர�வ�கள�"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "போகோவடிகட�டி க�ப�பை செர�கி"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
-msgstr "போகோ வடிப�பியை பயன�பட�த�தி எரிதம� செய�திகளை நீக�க�கிறத�."
+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
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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/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 "SSL பயன�பட�த�த� (_S)"
 
@@ -15108,26 +16215,28 @@ msgstr "வட�டார நாள�காட�டிகள�"
 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
-msgid "_Refresh:"
-msgstr "(_R) ப�த�ப�பி:"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "(_f) ப�த�ப�பி:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "பாத�காப�பான இணைப�ப� (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
-msgstr "_பயனீட�டாளர� பெயர�"
+msgstr "(_m) பயனீட�டாளர� பெயர�"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
-msgstr "HTTP நாள�காட�டிகள�"
+msgstr "ஹெச�டிடிபி நாள�காட�டிகள�"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr "webcal மற�ற�ம� http நாள�காட�டிகள�க�க� கோர� செயல�பாட�களை கொட�க�கிறத�."
+msgstr "webcal மற�ற�ம� ஹெச�டிடிபி நாள�காட�டிகள�க�க� கோர� செயல�பாட�களை கொட�க�கிறத�."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -15216,10 +16325,26 @@ msgstr "ம�ன�னிர�ப�ப� மின�அஞ�சல�"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "எவல�யூஷனை உங�கள� ம�ன�னிர�ப�ப� மின�னஞ�சல� கிளையனாக வைக�க வேண�ட�ம�?"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
-msgid "Mark as _default folder"
-msgstr "ம�ன�னிர�ப�ப� அடைவாக க�றி (_d)"
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:585
+msgid "Evolution"
+msgstr "எவல�யூஷன�"
+
+#: ../plugins/default-source/default-source.c:81
+msgid "Mark as _default address book"
+msgstr "ம�ன�னிர�ப�ப� ம�கவரி ப�த�தகமாக க�றி (_d)"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "ம�ன�னிர�ப�ப� நாள�காட�டியாக க�றி (_d)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "ம�ன�னிர�ப�ப� வேலையாக க�றி (_d)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "ம�ன�னிர�ப�ப� நினைவூட�ட� பட�டியலாக க�றி (_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15227,9 +16352,58 @@ msgstr "ம�ன�னிர�ப�ப� மூலங�கள�"
 
 #: ../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 "நாள�காட�டி அல�லத� ம�கவரிப�ப�த�தகம� ஆகியவற�றை ம�ன�னிர�ப�பாக க�றிக�க இயல�மை பட�த�த�கிறத�."
+msgstr "நாள�காட�டி அல�லத� ம�கவரிப�ப�த�தகம� ஆகியவற�றை ம�ன�னிர�ப�பாக க�றிக�க வசதி செய�கிறத�."
+
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "(_C) தனிப�பயன� தலைப�ப�"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "விசை"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 ""
+"தனிப�பயன� தலைப�ப�க�க� ம�க�கிய  விசையை க�றிக�க�ம� ஒழ�ங�க� :\n"
+"தனிப�பயன� தலைப�ப�க�க� ம�க�கிய  விசைகலின� பெயர�கள� இவற�றால� பிரிக�கப�பட�ம� \";\"."
+
+#: ../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 ""
+"இந�த விசை பட�டியல� வெளிச�செல�ல�ம�  செய�திகள�க�க� தனிப�பயன� தலைப�ப� சேர�க�க பயனாகிறத�. "
+" தலைப�ப�க�க�ம� தலைப�ப� மதிப�ப�க�க�ம� க�றிக�க�ம� ஒழ�ங�க� :\n"
+"தனிப�பயன� தலைப�பின� பெயர�, அதன� பின� \"=\" . இதன� மதிப�ப�கள�  \";\" ஆல� பிரிக�கப�பட�ம�  "
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15248,12 +16422,12 @@ msgid "_User:"
 msgstr "பயனர�: (_U)"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "பாத�காப�பான கடவ�ச�சொல�"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15261,21 +16435,21 @@ msgstr ""
 "இந�த விர�ப�பம� பாத�காப�பான கடவ�ச�சொல� (NTLM) அங�கீகாரத�தை பயன�பட�த�த�ப� பரிமாற�ற� "
 "சேவையத�தை இணைக�க�ம�."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "வெற�ற�உரை கடவ�ச�சொல�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "இந�த தேர�வ� IMAP சேவகனை சாதாரண உரை கடவ�ச�சொல�லை பயன�பட�த�தி இணைக�க�ம�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "அல�வலகத�திற�க� வெளியில�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15283,78 +16457,83 @@ msgstr ""
 "கீழே உள�ள செய�தி தானாக அனைவர�க�க�ம� அன�ப�பப�பட�ம�\n"
 "நீங�கள� அல�வலகத�தில� இல�லாத போத� அதை அறிவிக�க�ம�."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "நான� தற�போத� அல�வலகத�தில� இல�லை"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "நான� தற�போத� அல�வலகத�தில� இர�க�கிறேன�"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "பரிமாற�ற� கணக�கிற�க� கடவ�ச�சொல�லை மாற�ற�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "கடவ�ச�சொல�லை மாற�றவ�ம�"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "பரிமாற�ற� கணக�கிற�க� பேராளர� அமைவ�களை மேலாண�மை செய�யவ�ம�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "பிரதிநிதி உதவியாள�"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "மற�றவை"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "அனைத�த� பரிமாற�ற� அடைவ�களின� அளவினை பார�க�கவ�ம�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "அடைவ�கள� அளவ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../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:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:644
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "அங�கீகாரம� (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
-msgid "Authentication Type"
-msgstr "அங�கீகார வகை"
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "(_M)அஞ�சல�பெட�டி"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+msgid "_Authentication Type"
+msgstr "(_A) அங�கீகார வகை"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:851
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "த�ணையாக உள�ள வகைகளை சரிபார�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:957
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:959
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
@@ -15370,13 +16549,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 "இர� கடவ�ச�சொல�ல�ம� பொர�ந�த வில�லை, கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
@@ -15401,35 +16580,33 @@ msgstr "உஙà¯�களà¯� தறà¯�போதைய கடவà¯�சà¯�சொலà
 msgid "Your password will expire in the next %d days"
 msgstr "உங�கள� கடவ�ச�சொல� அட�த�த %d நாட�களில� ம�டிவ�ற�ம�"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "தனிபயன�"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "தொக�ப�பி (read, create, edit)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "ஆசிரியர� (read, create)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../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:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "பேராளர� அன�மதிகள�"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%sக�க� அன�மதி"
@@ -15437,7 +16614,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:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15448,66 +16625,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:364
 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:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 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:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "நீங�கள� %s க�க� பிரதிநிதியாக நியமிக�கப�பட�ள�ளீர�கள�."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "பேராளர�க�க�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "பேராளர� %s� நீக�க வேண�ட�மா?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "செயல� அடைவினை அண�க ம�டியவில�லை"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "நடப�பில� உள�ள அடைவ� உள�ளே தன�னை கண�ட�பிடிக�க ம�டியவில�லை."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "நடப�பில� உள�ள அடைவ� உள�ளே பிரதிநிதி %s � கண�ட�பிடிக�க ம�டியவில�லை."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "போராளர� %s� நீக�க ம�டியாத�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "பேராளர�கள� பட�டியலை மேம�பட�த�த ம�டியவில�லை."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "பேராளரை சேர�க�க ம�டியவில�லை %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "பேராளர�கள� பட�டியலை படிக�க�ம� போத� பிழை."
 
@@ -15555,20 +16732,25 @@ msgstr "அன�மதிகள� ச�ர�க�கம� தர�க"
 msgid "_Tasks:"
 msgstr "பணிகள�: (_T)"
 
-#: ../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
 msgid "Permissions..."
 msgstr "அன�மதிகள�..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "அடைவின� பெயர�"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "அடைவ� அளவ�"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. 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 "வேற� பயனர� அடைவ�க�க� சந�தாவாக�கவ�ம�"
@@ -15577,20 +16759,20 @@ msgstr "வேற� பயனர� அடைவ�க�க� சந�தா
 msgid "Exchange Folder Tree"
 msgstr "அடைவ� கிளையை மாற�ற�"
 
-#: ../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:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "அடைவிற�க� சந�தா நீக�க�..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "அடைவ� \"%s\" � சந�தா நீக�கம� செய�ய வேண�ட�மா?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr " \"%s\"லிர�ந�த� சந�தா நீக�கம� செய�யவ�ம�"
@@ -15654,15 +16836,18 @@ msgstr "உஙà¯�களà¯� கடவà¯�சà¯�சொலà¯� 7 நாடà¯�களà®
 msgid "_Change Password"
 msgstr "கடவ�ச�சொல�லை மாற�ற� (_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(அன�மதி மற�க�கப�பட�டத�.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "பயனரை சேர�:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../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
 msgid "Add User"
 msgstr "பயனரை சேர�"
 
@@ -15780,15 +16965,11 @@ msgstr "_உணர�வ�: "
 msgid "_User"
 msgstr "_பயனர�"
 
-#: ../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:138
 msgid "Select User"
 msgstr "பயனரை தேர�வ� செய�"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "ம�கவரி ப�த�தகம�..."
 
@@ -15802,7 +16983,7 @@ msgstr "வேறà¯� பயனரà¯�டைய நாளà¯�காடà¯�டிகà
 
 #: ../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 ""
 "தொக�ப�ப� பரிமாற�றம� கணக�க� க�றித�த செயல�கள� மற�ற�ம� சிறப�ப� அம�சங�கள� � கையாள�ம� ஒர� "
@@ -15895,10 +17076,14 @@ msgid "Could not update out-of-office state"
 msgstr "அல�வலகத�திற�க� வெளியே நிலையை மேம�பட�த�த ம�டியவில�லை"
 
 #: ../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 "பரிமாற�ற� கணக�க� இணைப�பில� இல�லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -15926,102 +17111,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "பேராளர�கள� மேம�பட�த�த ம�டியவில�லை:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "அடைவ� �ற�கனவே உள�ளத�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "அடைவ� இல�லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "அடைவ� இணைப�பில�லாமல�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1280
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "ப�த�வான பிழை"
 
-#: ../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 "Global Catalog Server � காண ம�டியவில�லை"
 
-#: ../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 "வேற� தடத�தில� OWA ஒட�கிறத� எனில� அதை கணக�க� வடிவமைப�ப�  உரையாடலில� க�றிப�பிட வேண�ட�ம�."
 
-#: ../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 "{0} க�கான அஞ�சல�பெட�டி இந�த வழங�கனில� இல�லை"
 
-#: ../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 "URL சரியா என பார�த�த� மீண�ட�ம� ம�யற�சி செய�க."
 
-#: ../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 "{1}ல� பயனர� {0}க�க� அஞ�சல� பெட�டி இல�லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "இத�போன�ற பயனர� இல�லை {0}"
 
-#: ../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
 msgid "Please restart Evolution for changes to take effect"
 msgstr "மாற�றங�கள� செயல�பட தயவ� செய�த� எவல�யூஷன� � மீள� த�வக�க�க"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "ஒர� பயனரை தேர�வ� செய�யவ�ம�"
 
-#: ../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."
@@ -16029,7 +17214,7 @@ msgstr ""
 "வழங�கன� இல� எக�ஸேஞ�ச� 5.5 ஒட�கிறத�. பரிமாற�றம� இணைப�பி மைக�ரோஸாப�ட� எக�ஸேஞ�ச� 2000 மற�ற�ம� "
 "2003 � மட�ட�மே ஆதரிக�கிறத�."
 
-#: ../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"
@@ -16043,69 +17228,70 @@ msgstr ""
 "\n"
 "அல�லத� நீங�கள� கடவ�ச�சொல�லை தவறாக உள�ளிட�ட� இர�க�கலாம�."
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "அண�கல� கட�ட�ப�பாட� பட�டியலில� பயனரை சேர�க�க ம�டியவில�லை:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "பேராளர�களை தொக�க�க ம�டியவில�லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "தெரியாத பிழையை தேட�கிறத� {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "தெரியாத பிழை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "தெரியாத வகை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "த�ணையில�லாத செயல�பாட�"
 
-#: ../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 "உங�கள� இப�போதைய பயன�பாட� : {0} KB. சில அஞ�சல�களை நீக�கி இடம� காலி செய�ய  ம�யற�சி செய�க."
 
-#: ../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 "உங�கள� இப�போதைய பயன�பாட� : {0} KB. நீங�கள� அஞ�சலை அன�ப�பவோ பெறவோ இயலாத�."
 
-#: ../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."
@@ -16113,19 +17299,19 @@ msgstr ""
 "உங�கள� இப�போதைய பயன�பாட� : {0} KB. நீங�கள� அஞ�சல� சிலவற�றை நீக�கி த�ப�ப�ரவாக�க�ம�  வரை  "
 "அஞ�சல� அன�ப�ப இயலாத�."
 
-#: ../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 "{0} அண�கல� கட�ட�ப�பாட� பட�டியலில� சேர�க�க ம�டியவில�லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} �ற�கனவே ஒர� பேராளர�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} �ற�கனவே பட�டியலில� உள�ளத�"
 
@@ -16137,36 +17323,94 @@ msgstr "வேற� பயனர� பணிகள�க�க� சந�த
 msgid "Check folder permissions"
 msgstr "அடைவ� அன�மதிகளை சரிபார�க�கவ�ம�"
 
-#: ../plugins/face/face.c:58
+#: ../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 "வெளியமை திர�த�தி"
+
+#: ../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 "(_E) வெளியமை திர�த�தியில� தொக�க�கவ�ம�."
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr "செய�திகளை வெளியமை திர�த�தியில� தொக�க�கவ�ம�"
+
+#: ../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 ""
+"ஈமாக�ஸ�க�க�  \"xemacs\"\n"
+"வி� க�க� \"gvim\""
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "(48*48) அளவில� < 700 பைட�ட�கள�க�க� க�றைவான பிஎன�ஜி � தேர�ந�தெட�."
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "பிஎன�ஜி கோப�ப�கள�"
 
-#: ../plugins/face/face.c:73
-msgid "Select a (48*48) png of size < 720bytes"
-msgstr "(48*48) அளவில� < 720 பைட�ட�கள�க�க� க�றைவான பிஎன�ஜி � தேர�ந�தெட�."
-
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_ம�கம�"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing mails. 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 mails that are sent further."
+"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 ""
 "வெளி செல�ல�ம� அஞ�சல�கள�க�க� ம�க தலைப�பை இணைக�கவ�ம�. ம�தல� ம�றை பயன�பட�த�த�ம� போத� பயனர� "
-"ஒர� 48*48 பிஎன�ஜி  பிம�பத�தை வடிவமைக�க வேண�ட�ம�. இத� 64"
+"ஒர� 48*48 பிஎன�ஜி  பிம�பத�தை வடிவமைக�க வேண�ட�ம�. இத� பேஸ� 64 இல� க�றியாக�கப�பட�டத�. ~/.evolution/faces இல� சேமிக�கப�பட�ட� உள�ளத�."
+"மேல�ம� அன�ப�ப�ம� செய�திகளில� இத� இணைக�கப�பட�ம�."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ம�கம�"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "அடைவ� \"%s\"லிர�ந�த� சந�தா நீக�க�கிறத�"
@@ -16183,7 +17427,55 @@ msgstr "சநà¯�தா நீகà¯�கபà¯�படà¯�ட அடைவà¯�களà
 msgid "_Unsubscribe"
 msgstr "(_U)உற�ப�பினர� நீக�கம�"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../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 "கூக�ள�"
+
+#: ../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 "பயனர� %s நாள�காட�டி  சந�தாதார�  பட�டியலை அண�க கடவ�ச�சொல�லை உள�ளிட�க."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"கூக�ள� சேவையகத�திலிர�ந�த� தரவை படிக�க இயலவில�லை\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+#,
+msgid "Cal_endar:"
+msgstr "நாள�காட�டி:(_C):"
+
+#: ../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 "<b>சேவையகம�</b>"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "A plugin to setup google calendar and contacts."
+msgstr "கூக�ள� நாள�காட�டி மற�ற�ம� தொடர�ப�களை அமைக�க ஒர� சொர�க�ப�பொர�ள� "
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "கூக�ள� மூலங�கள�"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "சோதனை பட�டியல�"
 
@@ -16195,7 +17487,7 @@ msgstr "கà¯�ரூபà¯�வைஸà¯� நாளà¯�காடà¯�டி மறà¯�à
 msgid "Groupwise Account Setup"
 msgstr "க�ழ� வாரியான கணக�க� அமைவ�"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16220,11 +17512,11 @@ msgstr ""
 "பகிர�ந�த அடைவை நிற�வ 'Forward'  � சொட�க�கவ�ம�.\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "பகிர�ந�த அடைவை நிற�வ�க."
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "பகிர�ந�த அடைவ� நிற�வல�"
 
@@ -16263,10 +17555,20 @@ msgid "_Junk List"
 msgstr "தேவையற�றவை பட�டியல� (_J)"
 
 #: ../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 "செய�தி வெற�றிகரமாக பின� வாங�கப�பட�டத�."
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "பின� வாங�கப�பட�ட அஞ�சல�"
 
@@ -16274,12 +17576,6 @@ msgstr "பின� வாங�கப�பட�ட அஞ�சல�"
 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"
-msgstr "அன�ப�ப� விர�ப�பங�கள�"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "க�ரூப�வைஸ� கணக�க�களின� சிறப�ப� அம�சங�கள�க�க� ஒர�  சொர�க�ப�பொர�ள�"
@@ -16288,7 +17584,72 @@ msgstr "கà¯�ரூபà¯�வைஸà¯� கணகà¯�கà¯�களினà¯� சிà
 msgid "Groupwise Features"
 msgstr "க�ழ� வாரியான சிறப�பியல�ப�கள�"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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 "செல�லாத பயனர�"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user \"{0}\""
+msgstr "பயனர� \"{0}\" க�க� பதிலாள� அண�கல� தர இயலாத�."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+msgid "You have already given proxy permissions to this user."
+msgstr "இந�த பயனர�க�க� �ற�கெனவே பதிலாள� அண�கல� தர  அன�மதித�த� உள�ளீர�கள�."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 \"{0}\" already exists. Please check your folder tree."
+msgstr "கணக�க�\"{0}\" �ற�கெனவே உள�ளத� தயவ� செய�த� உங�கள� அடைவ� கிளைகளை பார�க�க."
+
+#: ../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 \"{0}\" was unsuccessful. Please check your email "
+"address and try again."
+msgstr "\"{0}\" ஆக பதிலாள� உள�ந�ழைவ� தோற�றத�.  தயவ� செய�த� மின� அஞ�சல� ம�கவரியை சரி பார�த�த� மீண�ட�ம� ம�யற�சி செய�க."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "இத� ஒர�  ச�ர�ள� நிகழ�வ�"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "ஒப�ப�க�கொள�ள விர�ப�பமா?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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 \"{0}\""
+msgstr "க�றிப�பிட�ட பயனர� \"{0}\"  உடன�  கோப�பினை பகிர�ந�த� கொள�ள  ம�டியாத�"
+
+#: ../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 "நீங�கள�  பட�டியலில� சேர�க�க விர�ம�ப�ம� பயனர� பெயரை க�றிப�பிட  வேண�ட�ம�"
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "தற�காலிகமாக �ற�ற�க�கொள�"
 
@@ -16296,27 +17657,27 @@ msgstr "தற�காலிகமாக �ற�ற�க�கொள�"
 msgid "<b>Users:</b>"
 msgstr "<b>பயனர�கள�:</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "அறிவிப�ப� செய�தியை தனிபயன� ஆக�க�  (_u)"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:507
+msgid "Con_tacts..."
+msgstr "(_t) தொடர�ப�கள�...."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "செய�தி"
 
-#: ../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 "பங�க� பெற�வோர� பின� வர�ம� அறிவிப�பை பெற�வார�கள�.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "தொடர�ப�கள�... (_C)"
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "தனிபயன� அறிவிப�ப� செய�தி (_C)"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "பகிரப�படவில�லை (_N)"
@@ -16366,14 +17727,14 @@ msgid "Subscribe to my _notifications"
 msgstr "என� அறிவிப�ப�கள�க�க� சந�தாவாக�க� (_n)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "படி (_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "எழ�த� (_W)"
 
+#. 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 "(_R) படிக�க அன�மதி"
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "பதிலாள�"
@@ -16386,9 +17747,9 @@ msgstr "<b>கணக�கின� பெயர�</b>"
 msgid "Proxy Login"
 msgstr "பதிலாள� உள�அன�மதி"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16397,40 +17758,44 @@ msgstr "%s (பயனரà¯�கà¯�கான %s) %sகடவà¯�சà¯�சொலà¯�à
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "பதிலாள� பதிவ�... (_P)"
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "கணக�க� இணைப�பில� இர�க�க�ம� போத� மட�ட�மே பதிலாள� தத�தல� இர�க�க�ம�."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 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/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "பயனர�கள�"
 
-#: ../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 "ப�திய பகிரப�பட�ட அடைவ�... (_S)"
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "பகிர�கிறத�"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "தனிப�பயன� அறிவிப�ப�"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "சேர�   "
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "மாற�றியமை"
 
@@ -16451,37 +17816,37 @@ msgstr "அன�ப�ப�நர�:"
 msgid "Creation date:"
 msgstr "உர�வாக�கம� தேதி:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:187
 msgid "Recipient: "
 msgstr "பெற�நர�: "
 
-#: ../plugins/groupwise-features/status-track.c:193
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Delivered: "
 msgstr "வழங�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:200
 msgid "Opened: "
 msgstr "திறக�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:205
 msgid "Accepted: "
 msgstr "�ற�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:210
 msgid "Deleted: "
 msgstr "நீக�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Declined: "
 msgstr "நிராகரிக�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:220
 msgid "Completed: "
 msgstr "நிறைவேறியத�: "
 
-#: ../plugins/groupwise-features/status-track.c:224
-msgid "Un-delivered: "
-msgstr "வழங�கப�படவில�லை: "
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr "சேர�க�கப�படவில�லை: "
 
 #: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
@@ -16495,15 +17860,11 @@ msgstr "hula நாளà¯�காடà¯�டி மூலதà¯�தை அமைபà¯
 msgid "Hula Account Setup"
 msgstr "Hula கணக�க� அமைவ�"
 
-#: ../plugins/imap-features/imap-headers.c:134
-msgid "Custom Header"
-msgstr "தனிப�பயன� தலைப�ப�"
-
-#: ../plugins/imap-features/imap-headers.c:259
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "தனிப�பயன� தலைப�ப�கள�"
 
-#: ../plugins/imap-features/imap-headers.c:269
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP தலைப�ப�கள�"
 
@@ -16557,28 +17918,28 @@ msgstr "IMAP கணகà¯�கà¯�களினà¯� சிறபà¯�பà¯� à®…à®®à¯�à®
 msgid "IMAP Features"
 msgstr "IMAP சிறப�ப� அம�சங�கள�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "நாள�காட�டிக�க� இறக�க�மதி செய� (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "பணிகள�க�க� இறக�க�மதி செய� (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "ICS இறக�க�மதி செய�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "பணி பட�டியலை தேர�ந�தெட�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "நாள�காட�டியை தேர�ந�தெட�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "(_I)பதிவிறக�கம�"
 
@@ -16591,11 +17952,11 @@ msgstr "நாளà¯�காடà¯�டிகà¯�கà¯� இறகà¯�கà¯�மதி à
 msgid "Imports ICS attachments to calendar."
 msgstr "�சிஎஸ� இணைப�ப�களை நாள�காட�டிக�க� இறக�க�மதி செய�க."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:33
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "வண� பொர�ட�கள� பிரித�தெட�த�தல� அட�க�க� �ற�றப�படவில�லை"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -16603,11 +17964,11 @@ msgstr ""
 "\"hald\" சேவை தேவை ஆனால� இப�போத� அத� ஓடவில�லை.  தயவ� செய�த� இந�த சேவையை இயக�கி "
 "நிரலை மீண�ட�ம� த�வங�கவ�ம�. அல�லத� உங�கள� கணினி நிர�வாகியை தொடர�ப� கொள�ளவ�ம�."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:66
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
 msgstr "� பாடை தேட�தல� தோல�வியடைந�தத�."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:67
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
 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."
@@ -16615,145 +17976,145 @@ msgstr ""
 "�பாட�டன�  ஒத�திசைக�க எவலூஷன� அதை கண�ட� பிடிக�க ம�டியவில�லை. �பாட� இணைக�கப�படவில�லை "
 "அல�லத� அத� சக�தியூட�டப�படவில�லை."
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "�காலண�டர� பாங�க� (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "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
 msgid "Synchronize to iPod"
-msgstr "iPodக�க� ஒர�ங�கிணைத�தல�"
+msgstr "�பாட�  க�க� ஒர�ங�கிணைத�தல�"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "iPod ஒர�ங�கிணைத�தல�"
+msgstr "�பாட�   ஒர�ங�கிணைத�தல�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:428
-#: ../plugins/itip-formatter/itip-formatter.c:549
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "நாள�காட�டியை �ற�ற ம�டியவில�லை '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "நாள�காட�டி '%s'யில� ஒர� நேர ஒத�க�க �ற�பாட�, சந�திப�ப�டன� ம�ரணாக உள�ளத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:595
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "நாள�காட�டியில� நேர ஒத�க�கம� கண�ட�பிடிக�கப�பட�டத� '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:671
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "எந�த நாள�காட�டிகளைய�ம� காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "எந�த நாள�காட�டியில�ம� இந�த சந�திப�பினை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:682
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "எந�த பணி பட�டியலில�ம� இந�த பணியை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "எந�த க�றிப�ப� பட�டியலில�ம� இந�த க�றிப�பை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "இந�த நேர ஒத�க�கீட�ட�க�க� இர�ப�பில� உள�ள வடிவ நிலையை தேட�கிறத�. "
 
-#: ../plugins/itip-formatter/itip-formatter.c:922
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "உர�ப�படியை க�றிப�பிட ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "நாள�காட�டிக�க� உர�ப�படியை அன�ப�ப ம�டியவில�லை '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:992
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "நாள�காட�டி '%s' க�க� �ற�ற�க�கொள�ளப�பட�டத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "நாள�காட�டி '%s' க�க� தற�காலிகமானத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "நாள�காட�டி '%s' க�க� நிராகரிக�கப�பட�டத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1006
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "நாள�காட�டி '%s' க�க� ரத�தானத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ஒர�ங�கிணைப�பாளர� பேராளரை நீக�கிவிட�டார� %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "பேராளர�க�க� ரத�த� அறிக�கையை அன�ப�பவ�ம�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1109
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "பேராளர�க�க� ரத�த� அறிக�கையை அன�ப�ப ம�டியவில�லை?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1194
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "கலந�த� கொள�பவர�கள� நிலை தவறானத� அதனால� மேம�பட�த�த ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1221
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "கலந�த�கொள�பவர�களை மேம�பட�த�த ம�டியவில�லை. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1225
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "கலந�த� கொள�பவர�கள� நிலை மேம�பட�த�தப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "கூட�டம� பற�றிய தகவல� அன�ப�பப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "பணி தகவல� அன�ப�பப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1256
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "க�றிப�ப� தகவல� அன�ப�பப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1265
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "இந�த சந�திப�ப� தகவலை அன�ப�ப இயலவில�லை, சந�திப�பை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1268
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "இந�த பணி தகவலை அன�ப�ப இயலவில�லை, பணியை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "இந�த க�றிப�ப� தகவலை அன�ப�ப இயலவில�லை, க�றிப�பை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1346
-#: ../plugins/itip-formatter/itip-formatter.c:1361
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "இணைக�கப�பட�ட நாள�காட�டி தவறானத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1347
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16761,15 +18122,15 @@ msgstr ""
 "இந�த செய�தி ஒர� நாட�காட�டியை உள�ளடக�கியதாக சொல�ல�கிறத� ஆனால� அத� ஒர� செல�ல�படியாக�ம� "
 "�நாள�காட�டி அல�ல "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1397
-#: ../plugins/itip-formatter/itip-formatter.c:1415
-#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "நாள�காட�டியில� உள�ள உர�ப�படி தவறானத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
-#: ../plugins/itip-formatter/itip-formatter.c:1416
-#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16777,11 +18138,11 @@ msgstr ""
 "இந�த  செய�தியில� ஒர� நாள�காட�டி  உள�ளத�. ஆனால� அதில� எந�த நிகழ�வ�கள�, பணிகள� ஓய�வ�/ வேலை "
 "தகவல�கள� �த�ம� இல�லை........"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1427
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "இணைப�பட�ட�ள�ள நாள�காட�டி பல உர�ப�படிகளை கொண�ட�ள�ளத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16789,37 +18150,37 @@ msgstr ""
 "அனைத�த� உர�ப�படிகளைய�ம� செயலாக�க கோப�ப� சேமிக�கப�பட�ட� மற�ற�ம� நாள�காட�டி இறக�க�மதி "
 "செய�யப�பட வேண�ட�ம�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "இந�த சந�திப�ப� மீண�ட�ம� வந�த�ள�ளத� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2050
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "இந�த பணி மீண�ட�ம� வந�த�ள�ளத� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2053
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "இந�த க�றிப�ப� மீண�ட�ம� வர�ம�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2254
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "செயல�க�க� பின� செய�தியை அழிக�கவ�ம� (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2264
-#: ../plugins/itip-formatter/itip-formatter.c:2296
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "தேடல� ம�ரண�பாட�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2279
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 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:299
 msgid "Today"
 msgstr "இன�ற�"
 
@@ -17181,92 +18542,96 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> பின�வர�ம� பகிர�ந�த க�றிப�பை இரத�த� செய�கிறார�:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:815
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "நாள�காட�டியை திற (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:821
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../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 "நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:822
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../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 "�ற�ற�க�கொள� (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "அனைத�தைய�ம� நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "அனைத�த� தற�காலிகமான(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../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 "தற�காலிகமாக (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "அனைத�தைய�ம� �ற�ற�க�கொள� (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "தகவலை அன�ப�ப� (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "கலந�த� கொள�பவர�கள� நிலையை மேம�பட�த�த� (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "மேம�பட�த�த� (_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1006
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "த�வக�க நேரம�:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1015
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "ம�டிய�ம� நேரம�:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1031
-#: ../plugins/itip-formatter/itip-view.c:1081
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "க�றிப�ப�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1067
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "அன�ப�ப�னர�க�க� பதில� அன�ப�ப�க"
 
-#: ../plugins/itip-formatter/itip-view.c:1095
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "பங�க� கொள�வோர�க�க� இப�போதைய தகவல� அன�ப�ப�க."
 
-#: ../plugins/itip-formatter/itip-view.c:1104
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "அனைத�த�ம� நிகழ�வ�கள�க�க�ம� செயல�பட�த�த�க."
 
-#: ../plugins/itip-formatter/itip-view.c:1835
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr "(_f)ஓய�வாக உள�ள நேரம� எனக�காட�ட�"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "பணிகள� :"
 
-#: ../plugins/itip-formatter/itip-view.c:1837
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "க�றிப�ப�கள� :"
 
@@ -17280,10 +18645,10 @@ msgstr "Itip வடிவமைப�பி"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"\"{0}\" has delegated the meeting. Do you want to add the delegate "
+"\"{1}\"?"
 msgstr ""
-"&quot;{0}&quot; சந�திப�பினை வழங�க�கிறத�. நீங�கள� அதனை சேர�க�க வேண�ட�மா &quot;{1}"
+"\"{0}\" சந�திப�பினை வழங�க�கிறத�. நீங�கள� அதனை சேர�க�க வேண�ட�மா &quot;{1}"
 "&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -17307,69 +18672,162 @@ msgid "Disable Account"
 msgstr "கணக�கினை செயல�நீக�க�"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Enable libnotify notifications of new mail"
-msgstr "ப�திய அஞ�சல�கள�க�க� லிப�நாட�டிபை � செயல�பட�த�த�"
+msgid "Beep or play sound file."
+msgstr "பீப� அல�லத� ஒலி கோப�பை இயக�க�"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Every time a new mail arrives, pop up a libnotify notification."
-msgstr "ப�திய அஞ�சல� வர�ம�போதெல�லாம� லிப�நாட�டிபை அறிவிப�பை த�ள�ள� சாளரமாக காட�ட�"
+msgid "Blink icon in notification area."
+msgstr "அறிவிப�ப� இடத�தில� சின�னத�தை சிமிட�ட�."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Make the status icon blink"
-msgstr "இர�ப�ப� நிலை சின�னத�தை சிமிட�டிடச�செய�"
+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."
-msgstr "ப�திய அஞ�சல� இர�ப�ப� நிலை சின�னம� பார�க�கக�கூடியத� ஆனால� அதை சிமிட�டிடச� செய�."
+msgid "Enable icon in notification area."
+msgstr "அறிவிப�ப� இடத�தில� சின�னத�தை  செயல�பட�த�த�"
 
-#: ../plugins/mail-notification/mail-notification.c:132
-#, c-format
-msgid "You have received %d new message in %s."
-msgid_plural "You have received %d new messages in %s."
-msgstr[0] "நீங�கள� %d ப�திய தகவலை %s இல� பெற�ற�ள�ளீர�கள�."
-msgstr[1] "நீங�கள� %d ப�திய தகவல�களை %s இல� பெற�ற�ள�ளீர�கள�."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "ப�திய மின�னஞ�சல� வர�ம�போத� D-BUS செய�தியை உர�வாக�க�கிறத�."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+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 "உள�பெட�டிக�க� மட�ட�ம�  ப�திய செய�திகள� வந�தால� அறிவி."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "ப�திய மின�னஞ�சல� வர�ம� போத� ஒலிக�கோப�பை இயக�க�"
+
+#: ../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
+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 "வாசிக�க வேண�டிய ஒலி கோப�பின� பெயர� ."
+
+#: ../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/mail-notification.c:153
+#: ../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 "சின�னம� சிமிட�ட  வேண�ட�மா."
+
+#: ../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:254
+msgid "Generate a _D-Bus message"
+msgstr "ஒர�  D-BUS செய�தியை உர�வாக�க� "
+
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "எவலூஷன� அஞ�சல� அறிவிப�ப�"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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
+#,  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] ""
+"நீங�கள� %d ப�திய தகவலை\n"
+" %s இல� பெற�ற�ள�ளீர�கள�."
+msgstr[1] ""
+"நீங�கள� %d ப�திய தகவல�களை\n"
+" %s இல� பெற�ற�ள�ளீர�கள�."
+
+#: ../plugins/mail-notification/mail-notification.c:462
+#, , 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
 msgid "New email"
 msgstr "ப�திய மின�னஞ�சல�"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "அஞ�சல� அறிவிப�ப�"
+#: ../plugins/mail-notification/mail-notification.c:541
+msgid "Show icon in _notification area"
+msgstr "(_n) அறிவிப�ப� இடத�தில� சின�னத�தை  காட�ட�"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid ""
-"Notifies the user with an icon in notification area and a notification "
-"message whenever a new message has arrived."
-msgstr ""
-"ப�திய செய�தி வந�தவ�டன� பயனர�க�க� ஒர� பலக சின�னம� மற�ற�ம� ஒர� அறிவிப�ப� செய�தியால� "
-"அறிவிக�கிறத�"
+#: ../plugins/mail-notification/mail-notification.c:544
+msgid "B_link icon in notification area"
+msgstr "(_l) அறிவிப�ப� இடத�தில� சின�னத�தை சிமிட�ட� "
 
-#: ../plugins/mail-remote/client.c:30
-#, c-format
-msgid "System error: %s"
-msgstr "கணினி பிழை: %s"
+#: ../plugins/mail-notification/mail-notification.c:546
+msgid "Popup _message together with the icon"
+msgstr "(_m) வெளித�த�ள�ளல� செய�திகள� சின�னத�த�டன�."
 
-#: ../plugins/mail-remote/client.c:32
-#, c-format
-msgid "Camel error: %s"
-msgstr "Camel பிழை: %s"
+#: ../plugins/mail-notification/mail-notification.c:727
+msgid "_Play sound when new messages arrive"
+msgstr "(_P) ப�திய மின�னஞ�சல� வர�ம� போத� ஒலிக�கோப�பை இயக�க�"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "இந�த கணக�க� மின�னஞ�சலை அன�ப�ப ம�டியாத�"
+#: ../plugins/mail-notification/mail-notification.c:733
+msgid "_Beep"
+msgstr "(_B) பீப�"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "சேமிப�ப� இல�லை"
+#: ../plugins/mail-notification/mail-notification.c:734
+msgid "Play _sound file"
+msgstr "(_s) ஒலி கோப�பினை இசை"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "ஒர� கூட�தல� வசதி CORBA இடைம�கத�தால� அஞ�சலை தொலைவிலிர�ந�த� அண�க செயல�பட�கிறத�."
+#: ../plugins/mail-notification/mail-notification.c:745
+msgid "Specify _filename:"
+msgstr "(_f)கோப�பின� பெயரை உள�ளிடவ�ம�"
+
+#: ../plugins/mail-notification/mail-notification.c:746
+msgid "Select sound file"
+msgstr "ஒலி கோப�பினை தேர�ந�தெட�"
+
+#: ../plugins/mail-notification/mail-notification.c:747
+msgid "Pl_ay"
+msgstr "(l_) இசை"
+
+#: ../plugins/mail-notification/mail-notification.c:804
+msgid "Notify new messages for _Inbox only"
+msgstr "(_I) உள�பெட�டிக�க� மட�ட�ம�  ப�திய செய�திகள� வந�தால� அறிவி."
+
+#: ../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-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "தொலை அஞ�சல�"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "அஞ�சல� அறிவிப�ப�"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -17385,6 +18843,17 @@ msgstr "சந�திப�பாக மாற�ற� (_v)"
 msgid "Mail to meeting"
 msgstr "சந�திப�ப�க�க� அஞ�சல�"
 
+#: ../plugins/mail-to-task/mail-to-task.c:287
+#, , c-format
+msgid "Cannot open calendar. %s"
+msgstr "நாள�காட�டியை திறக�க ம�டியவில�லை %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 "
@@ -17485,7 +18954,7 @@ msgstr "செயà¯�தியை கà¯�à®´à¯�விறà¯�கà¯� மினà¯�னà
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17566,6 +19035,26 @@ msgstr "_ச பட�டியல�க�க� சந�தாதாராக
 msgid "_Unsubscribe from List"
 msgstr "_ந பட�டியல�க�க� சந�தாவை நிற�த�த�"
 
+#: ../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 "(_S) இப�போதைய அடைவ� மற�ற�ம� உப அடைவ�கள� மீத�"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "(_F) நடப�பில�ள�ள அடைவ� மட�ட�ம�."
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "அனைத�தைய�ம� படித�தத� என க�றிக�கவ�ம�"
@@ -17587,28 +19076,20 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "தேர�ந�தெட�த�த நாள�காட�டியை இணைப�பில�லாமல� பார�வையிட க�றிக�கிறத�."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "இர�க�க�ம� இணைப�பில�லாததை அமைக�க வேண�டாம�"
+msgid "_Do not make available for offline use"
+msgstr "(_D) இணைப�பில�லாத போத� பயன�க�க� என  அமைக�க வேண�டாம�"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "நாள�காட�டியை இணைப�பில�லாமல� பயன�பட�த�த க�றி (_M)"
+msgid "_Make available for offline use"
+msgstr "இணைப�பில�லாத போத� பயன�க�க� என  அமை (_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr "மோனே கூட�தல� வசதிகளை செயல�பட�த�த�ம� ஒர� கூட�தல� வசதி"
+msgstr "மோனோ கூட�தல� வசதிகளை செயல�பட�த�த�ம� ஒர� கூட�தல� வசதி"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
-msgstr "மோனே �ற�றி"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "ப�திய மின�னஞ�சல� வர�ம�போத� D-BUS செய�தியை உர�வாக�க�கிறத�."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "ப�திய மின�னஞ�சல� அறிவிப�ப�"
+msgstr "மோனோ �ற�றி"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
@@ -17618,7 +19099,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:223
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "கூட�தல� வசதி மேலாளர�"
 
@@ -17630,26 +19111,24 @@ msgstr "கூடà¯�தலà¯� வசதிகளை செயலà¯�படà¯�தà
 msgid "_Plugins"
 msgstr "கூட�தல� வசதிகள� (_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:55
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "ஆசிரியர�(கள�)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
-msgid "Description"
-msgstr "விவரணம�"
-
-#: ../plugins/plugin-manager/plugin-manager.c:226
-msgid "Configure"
-msgstr "வடிவமைக�கவ�ம�"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "வடிவமைப�ப�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "க�றிப�ப�: சில மாற�றங�கள� மீண�ட�ம� தொடங�க�ம� வரை மாறாத�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
-#: ../plugins/plugin-manager/plugin-manager.c:350
+#: ../plugins/plugin-manager/plugin-manager.c:275
+msgid "Overview"
+msgstr "மேல�பார�வை"
+
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "கூட�தல� வசதி"
 
@@ -17673,41 +19152,22 @@ msgstr "வெற�ற� உரை ம�றை"
 msgid "Prefer plain-text"
 msgstr "வெற�ற� உரை விர�ப�பம�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "இர�ந�தால�, HTML� காட�ட�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "வெற�ற� விர�ப�பம�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "எப�போத�ம� வெற�றை காட�ட�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "_ம HTML ம�றை"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "அஞ�சல� தொக�ப�பியிலிர�ந�த� அஞ�சலை அச�சிட விர�ப�பத�தைக� கொட�க�கிறத�"
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "செய�தியை அச�சடி"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "(_v)அச�ச� ம�ன�தோற�றம�"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "செய�திகளை அச�சிட�"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "எவல�யூஷன� விவரக�க�றிப�பி"
@@ -17732,7 +19192,7 @@ msgstr "இடங�கள�"
 msgid "_Publish Calendar Information"
 msgstr "நாள�காட�டி தகவலை வெளியிட� (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "இந�த URL � நீக�க வேண�ட�மா?"
 
@@ -17754,6 +19214,10 @@ msgstr ""
 "வாராந�திர\n"
 "கைம�றை (செயல�கள� பட�டி வழியாக)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "(_n)செயலில� உள�ள"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "த�றை: (_P)"
@@ -17780,8 +19244,8 @@ msgstr ""
 "பொத� FTP\n"
 "FTP (பதிவ�டன�)\n"
 "விண�டோஸ� பகிர�வ�\n"
-"WebDAV (HTTP)\n"
-"பாத�காப�பான WebDAV (HTTPS)\n"
+"WebDAV (ஹெச�டிடிபி)\n"
+"பாத�காப�பான WebDAV (ஹெச�டிடிபிS)\n"
 "தனிபயன� இடம�"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
@@ -17816,15 +19280,78 @@ msgstr ""
 "iCal\n"
 "ஓய�வ� /பணியில�"
 
+#: ../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:108
 msgid "SpamAssassin (built-in)"
 msgstr "ஸ�பாம� அஸாஸின� (உள�ளடக�கியத�.)"
 
-#: ../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:134
+#, , c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "ஸ�பாம� அஸாஸின� � காணவில�லை, க�றி: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#,  c-format
+msgid "Failed to create pipe: %s"
+msgstr "க�ழாயை  உர�வாக�க�வதில� தோல�வி`%s': %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#,  c-format
+msgid "Error after fork: %s"
+msgstr "பிளவ�க�க�ப�பின�  பிழை: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+#,
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "ஸ�பாம� அஸாஸின� சேய� செயல� பதிலளிக�கவில�லை. ம�டிக�கிறத�..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+#,
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "ஸ�பாம� அஸாஸின� சேய� செயல�க�க� காத�திர�ப�ப� மறிக�கப�பட�டத�.  நிற�த�த�கிறத�..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "ஸ�பாம� அஸாஸின� க�க� க�ழாய� இட  இயலவில�லை. தவற� %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#,  c-format
+msgid "SpamAssassin is not available."
+msgstr "ஸ�பாம� அஸாஸின�  இர�ப�பில� இல�லை"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#,
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "இத� ஸ�பாம� அஸாஸின� � மேல�ம� நம�பகமாக�க�ம�. ஆனால� மெத�வாக வேலை செய�ய�ம�."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "(_n)தொலை சோதனையை சேர�"
 
@@ -17852,7 +19379,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:314
 msgid "Save attachments"
 msgstr "இணைப�ப�களை சேமி"
 
@@ -17864,16 +19391,15 @@ msgstr "இணைப�ப�களை சேமிக�க..."
 msgid "Save all attachments"
 msgstr "அனைத�த� இணைப�ப�களைய�ம� சேமி"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "சேமிப�ப� அடிப�படை பெயரை தேர�ந�தெட�"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "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:347
 msgid "Save"
 msgstr "சேமி"
 
@@ -17881,79 +19407,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:171
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "விவர பட�டியல�"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "வகைகள� பட�டியல�"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "க�றிப�ப� பட�டியல�"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "உர�வாக�கப�பட�டத�"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "தொடர�ப� பட�டியல�"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "த�வக�க�"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "ம�டிவ�"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "சதவீதம� ம�டிந�தத�"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "கலந�த�கொள�பவர�கள� பட�டியல�"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "மாற�றப�பட�ட"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV வடிவத�திற�கான கூட�தல� விர�ப�பங�கள�"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Prepend a header"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "மதிப�ப� வரம�ப�க�க�றி:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "பதிவ� வரம�ப�க�க�றி:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "பொதிவ� மதிப�ப�:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value format (.csv)"
 
@@ -17974,16 +19500,15 @@ msgstr "வட�டில� சேமி (_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF வடிவம� (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "இலக�க� கோப�பினை தேர�ந�தெட�"
 
@@ -18000,26 +19525,31 @@ msgid "Show _only this Calendar"
 msgstr "இந�த நாள�காட�டியை மட�ட�ம� காட�ட�"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "(_o) இந�தப� நினைவூட�ட பட�டியலை மட�ட�ம� காட�ட�"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "இந�தப� பணி பட�டியலை மட�ட�ம� காட�ட�"
+msgstr "(_o) இந�தப� பணி பட�டியலை மட�ட�ம� காட�ட�"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "தொடக�க வழிகாட�டியை கையாள�ம� ஒர� கூட�தல� வசதி."
+#,
+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 "த�வங�க� வழிகாட�டி"
+msgid "Setup Assistant"
+msgstr "அமைப�ப� உதவியாள�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "எவல�யூஷன� அமைப�ப� உதவி"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "நல�வரவ�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18031,28 +19561,29 @@ msgstr ""
 "\n"
 "\"அட�த�த�\" பொத�தானை சொட�க�கி தொடரவ�ம�."
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "கோப�ப�களை இறக�க�மதி செய�கிறத�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "நீங�கள� பெறவிர�ம�ப�ம� தகவலை தேர�வ� செய�யவ�ம�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "அன�ப�ப�னர� %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
+#, c-format
 msgid "Importing data."
 msgstr "தரவினை �ற�ற�கிறத�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "தயவ� செய�த� காத�திர�க�கவ�ம�"
 
@@ -18069,10 +19600,32 @@ msgid "Thread messages by subject"
 msgstr "பொர�ளால� ப�ரியாக�க செய�திகள�"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "செய�திகளை பொர�ளால� இழையாக�கம� செய�ய மாற�ற�"
 
+#: ../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:615
+msgid "No title"
+msgstr "தலைப�ப� இல�லை"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "(_T) வார�ப�ப�ர�வாக  சேமி"
+
+#: ../plugins/templates/templates.c:745
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "டிஎன� ஈஎஃப� இணைப�ப�களை க�றிவிலக�க ஒய�டிஎன� ஈஎஃப� � பயன�பட�த�த�ம� ஒர� சொர�க�ப�பொர�ள�"
@@ -18081,6 +19634,28 @@ msgstr "டிஎன� ஈஎஃப� இணைப�ப�களை க�ற
 msgid "TNEF Attachment decoder"
 msgstr "டிஎன�ஈஎஃப� இணைப�ப� க�றிவிலக�கி"
 
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "(_A) இஃப�மேட�ச�ஹ� ஆனால� தவிர�. (அபாசே < 2.2.8 க�க� தேவை )"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "எவல�யூஷன� ஷெல�"
@@ -18089,67 +19664,143 @@ msgstr "எவல�யூஷன� ஷெல�"
 msgid "Evolution Shell Config factory"
 msgstr "Evolution Shell Config factory"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "எவல�யூஷன� சோதனை"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "எவல�யூஷன� சோதனை பொர�ள�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
-msgstr "இப�போதைய அச�ச� இயந�திர அமைப�ப� விவரங�களை க�றிக�க�ம� சரம�"
+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 "கட�டமைப�ப� பதிப�ப�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "பக�கப�பட�டையின� ம�ன�னிர�ப�ப� அகலம�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "சாளரத�தின� இயல�பான உயரம�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "ம�ன�னிர�ப�ப� சாளர நிலை"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "சாளரத�தின� இயல�பான அகலம�"
 
-#: ../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
+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 "அடையாலம� அல�லத� மாற�ற�ப�பெயராவத� த�வக�கத�திக� காட�டப�படவேண�ட�ம� "
+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 ""
+"உண�மை எனில� பதிலாள� சேவையகத�த�க�கான இணைப�ப�கள�க�க� உற�திப�பட�த�தல� "
+" தேவை. பயனர� பெயர� \"/apps/evolution/shell/network_config/authentication_user\" "
+"இலிர�ந�த� எட�த�த�க�கொள�ளப�பட�ம�. ஜிகான�ஃப� விசை  மற�ற�ம� கடவ�ச�சொல� க�னோம� கீரிங�கிலிர�ந�தோ அல�லத�"
+" ~/.gnome2_private/Evolution password file (எவல�யூஷன� கடவ�ச�சொல� கோப�ப�.) இலிர�ந�தோ எட�த�த�க�கொள�ளப�பட�ம�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "கடைசியாக மேம�பட�த�தப�பட�ட கட�டமைப�ப� பதிப�ப�"
 
-#: ../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
+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 ""
+"பதிலாள� அமைப�ப� ம�றைமையை தேந�தெட�க�கவ�ம�. ஆதரவ�ள�ள மதிப�ப�கள� 0, 1, 2, மற�ற�ம� 3"
+"அவை  ம�றையே  \" கணினி அமைப�பை பயன�பட�த�த� \",  \" பதிலாள� இல�லை \" ,  \" கைம�றை அமைப�ப�\" ,மற�ற�ம� \" தானியங�கி உரலில� உள�ள பதிலாள� அமைப�ப�   \"."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "பக�கப�பட�டை தெரிகிறத�"
 
-#: ../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 "இணையம� இல�லாமல� த�வக�க�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "நிலைப�பட�டை தெரிகிறத�"
 
-#: ../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\")."
@@ -18157,19 +19808,19 @@ msgstr ""
 "major/minor/configuration நிலையில�, எவல�யூஷனின� கட�டமைப�ப� பதிப�ப�(எட�த�த�க�காட�ட� "
 "\"2.6.0\")."
 
-#: ../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 "ம�தன�மை சாளரத�தின� ம�ன�னிர�ப�ப� உயரம�"
 
-#: ../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 "ம�தன�மை சாளரத�தின� ம�ன�னிர�ப�ப� அகலம�, பிக�சல�களில�."
 
-#: ../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 "பக�கப�பட�டையின� ம�ன�னிர�ப�ப� அகலம�, பிக�சல�களில�."
 
-#: ../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\")."
@@ -18177,7 +19828,42 @@ msgstr ""
 "பெர�ம�பால�ம�/க�றைந�த/ கட�டமைப�ப� நிலைகளில� எவல�யூஷனின� கடைசி மேம�பட�த�தப�பட�ட "
 "கட�டமைப�ப� ,  (எட�த�த�க�காட�ட� \"2.6.0\")."
 
-#: ../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 "கணினியில� \"/apps/evolution/shell/network_config/http_host\"ஆல� வரையற�க�கப�பட�ட பதிலாள� வழிக�கான த�றை   ."
+
+#: ../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 ""
+"கணினியில� \"/apps/evolution/shell/network_config/"
+"secure_host\"ஆல� வரையற�க�கப�பட�ட பதிலாள� வழிக�கான த�றை  ."
+
+#: ../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 ""
+"கணினியில� \"/apps/evolution/shell/network_config/"
+"socks_host\"ஆல� வரையற�க�கப�பட�ட பதிலாள� வழிக�கான த�றை  ."
+
+#: ../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 "
@@ -18187,43 +19873,67 @@ 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 "இந�த  விசையில� பதிலாள� செயலில� இர�ந�தால�ம�    நேரடியாக இணைக�க�ம� ப�ரவலன�களின� பட�டியல� உள�ளத�. இந�த மதிப�ப�கள� ப�ரவலன� பெயர�கள�. ( *.foo.com போல க�றிபில� க�றி பயன�பட�த�த�ம�) களப�பெயர�கள� (டொமெய�ன�),  �பி (�பி 4 மற�ற�ம� �பி6 )  ம�கமூடிய�டனான வலையக ம�கவரிகள� (192.168.0.0/24 போல )ஆக இர�க�கலாம�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "கர�விப�பட�டி தெரிகிறத�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../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:22
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "சாளரம� ம�ழ�மையாக�கப�பட வேண�டாம�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "பக�கப�பட�டை தெரிய வேண�ட�மா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "நிலைப�பட�டை தெரிய வேண�ட�மா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "கர�விப�பட�டி தெரிய வேண�ட�மா"
 
-#: ../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 "சாளரப� பொத�தான� தெரிய வேண�ட�மா."
 
-#: ../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 "சாளர பொத�தான�கள� தெரிகிறத�"
 
@@ -18239,28 +19949,23 @@ msgstr "செயலில� உள�ள இணைப�ப�கள�"
 msgid "Click OK to close these connections and go offline"
 msgstr "சரி பட�டனை க�ளிக� செய�த� இணையத�திலிர�ந�த� வெளியேறவ�ம�"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "இயக�க வேண�டிய இறக�கி வகையை தேர�வ� செய�யவ�ம�"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 "நீங�கள� எவல�யூஷனில� பெற வேண�டிய கோப�பை தேர�வ� செய�த�, பட�டியலிலிர�ந�த� கோப�பின� வகையை "
-"தேர�வ� செய�யவ�ம�\n"
-"\n"
-"\"தானாக\" பட�டனை க�ளிக� செய�தால� எவல�யூஷன� தானாகவே கோப�பை பெற�ற�க�கொள�ள�ம�"
+"தேர�வ� செய�யவ�ம�"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "இந�த கோப�ப�கள� சேர�மிடத�தை தேர�வ� செய�யவ�ம�"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -18272,129 +19977,132 @@ msgstr ""
 "�காலண�டர�. அத�தகைய அமைப�ப� �த�ம� இல�லை.\n"
 "மீண�ட�ம� ம�யற�சி செய�ய \"பின�\" பொத�தானை சொட�க�கவ�ம�.\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "(_i)கோப�பின� பெயர�:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "கோப�பை தேர�வ� செய�"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "(_t)கோப�ப� வகை:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "(_o)பழைய நிரலிலிர�ந�த� தகவலை பெற�கிறத�"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "(_s)ஒர� கோப�பை இறக�க�கிறத�"
 
-#: ../shell/e-shell-settings-dialog.c:319
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "எவல�யூஷன� ம�ன�ன�ரிமைகள�"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "அடைவின� பெயர� க�றிப�பிடப�படவில�லை"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "அடைவில� Return  எழ�த�த� இர�க�கக�கூடாத�."
+#. 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
+#,  c-format
+msgid "%s - Evolution"
+msgstr "%s - எவல�யூஷன�"
 
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "அடைவில� \"/\" எழ�த�த� இர�க�கக�கூடாத�."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "அடைவில� \"#\" எழ�த�த� இர�க�கக�கூடாத�."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' மற�ற�ம� '..' கணினி தொடர�பான அடைவ�கள�."
-
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "க�னோம� பைலட� கர�விகள� இந�த கணினியில� நிற�வப�படவில�லை."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "இயக�க�ம� போத� பிழை %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "பக� பட�டி நிற�வப�படவில�லை"
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "பக� பட�டியை இயக�க ம�டியவில�லை"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:584
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "மொழிபெயர�ப�பாளர�-சன�மானம�"
 
-#: ../shell/e-shell-window-commands.c:595
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "எவல�யூஷன� வலைத�தளம�"
 
-#: ../shell/e-shell-window-commands.c:803
+#: ../shell/e-shell-window-commands.c:758
+#,
+msgid "Error opening the FAQ webpage."
+msgstr "அடிக�கடி கேட�க�ம� கேள�விகள� பக�கத�தை திறக�க�ம� போத� பிழை"
+
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "(_W)இணையத�தில� வேலை செய�யவ�ம�"
 
-#: ../shell/e-shell-window-commands.c:816 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "(_W)இணையத�தொடர�ப� இல�லாமல� வேலை செய�யவ�ம�"
 
-#: ../shell/e-shell-window-commands.c:829
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "இணையத�தொடர�ப� இல�லாமல� வேலை செய�யவ�ம�"
 
 #: ../shell/e-shell-window.c:381
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "எவல�யூஷன� தற�சமயம� இணைப�பில� உள�ளத�. இந�தப� பொத�தானை பயன�பட�த�தி இணைப�பினை த�ண�டிக�கவ�ம�."
+#,
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"எவல�யூஷன� தற�சமயம� இணைப�பில� உள�ளத�.\n"
+" இந�தப� பொத�தானை பயன�பட�த�தி இணைப�பிலிர�ந�த� விலகவ�ம�."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "எவல�யூஷன� இணையத�திலிர�ந�த� விட�பட�ட�க�கொண�டிர�க�கிறத�"
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "எவல�யூஷன� தற�சமயம� இணைப�பில�லாமல� உள�ளத�. இந�தப� பொத�தானை பயன�பட�த�தி இணைப�பினை பெறவ�ம�."
+#: ../shell/e-shell-window.c:395
+#,
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"எவல�யூஷன� தற�சமயம� இணைப�பில�லாமல� உள�ளத�. \n"
+"இந�தப� பொத�தானை பயன�பட�த�தி இணைப�பினை பெறவ�ம�."
 
-#: ../shell/e-shell-window.c:823
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s க�க� மாற�"
 
-#: ../shell/e-shell.c:637
-msgid "Uknown system error."
+#: ../shell/e-shell.c:641
+#,
+msgid "Unknown system error."
 msgstr "தெரியாத கணினி பிழை"
 
-#: ../shell/e-shell.c:833 ../shell/e-shell.c:834
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1272 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "சரி"
 
-#: ../shell/e-shell.c:1274
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "செல�லாத அளவ�ர�க�கள�"
 
-#: ../shell/e-shell.c:1276
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF பதிவ� செய�ய ம�டியவில�லை"
 
-#: ../shell/e-shell.c:1278
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "அமைப�ப� தரவ�த�தளத�தை காணவில�லை"
 
@@ -18404,15 +20112,17 @@ msgstr "அமைபà¯�பà¯� தரவà¯�தà¯�தளதà¯�தை காணவà
 msgid "New"
 msgstr "ப�திய"
 
-#: ../shell/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "ப�திய சோதனை"
 
-#: ../shell/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#,
+msgctxt "New"
 msgid "_Test"
-msgstr "(_T)சோதி"
+msgstr "(_T)சோதனை"
 
-#: ../shell/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "ப�திய பணியை உர�வாக�க�"
 
@@ -18455,7 +20165,7 @@ msgstr ""
 "கோப�ப�களை பதிவிறக�கம� செய�த�கொள�ளலாம�."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18489,7 +20199,7 @@ msgstr ""
 "எங�கள� ம�யற�சி உங�கள�க�க� மகிழ�ச�சியை தர�ம� என நம�ப�கிறோம�.\n"
 "உங�கள� ஆதரவை ஆர�வத�த�டன� எதிர� பார�க�கிறோம�.\n"
 
-#: ../shell/main.c:243
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18497,43 +20207,43 @@ msgstr ""
 "நன�றி\n"
 "எவல�யூஷன� க�ழ�விற�க�\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "மீண�ட�ம� சொல�ல வேண�டாம�"
 
-#: ../shell/main.c:456
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "க�றிப�பிட�ட உர�ப�படியை த�வக�க�வதன� மூலம� எவல�யூஷனை த�வக�க�"
 
-#: ../shell/main.c:460
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "உள� அமை பாங�கில� த�வக�க�"
 
-#: ../shell/main.c:463
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "எல�லா எவல�யூஷன� கூற�களைய�ம� பணிநிற�த�தம� செய�கிறத�"
 
-#: ../shell/main.c:467
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "எவல�யூஷன� 1.4 லிர�ந�த� மீண�ட�ம� மாற�றப�பட�கிறத�"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "கோப�பின� எல�லா உர�ப�படிகள�க�க�ம� வழ�நீக�க விளைவை அன�ப�பவ�ம�"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "எந�த கூட�தல� வசதிகளை �ற�றலைய�ம� செயல�நீக�க�"
 
-#: ../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
 msgid "- The Evolution PIM and Email Client"
 msgstr "- எவல�யூஷன� PIM மற�ற�ம� மின�னஞ�சல�"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18674,7 +20384,7 @@ msgstr ""
 "\n"
 "தொடர�வதால� சில பழைய தகவல�களை அண�கம�டியாமல� போகலாம�.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -18685,7 +20395,7 @@ msgstr ""
 "\n"
 "நம�பக அமைப�பை திர�த�தவ�ம�:"
 
-#: ../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 "
@@ -18694,7 +20404,7 @@ 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 "
@@ -18703,58 +20413,55 @@ msgstr ""
 "இந�த சான�றிதழை வழங�கியவரை நீங�கள� �ற�காததால� ,சான�றிதழில� அன�மதியை க�றிப�பிடாமல� "
 "பயன�பட�த�த ம�டியாத�"
 
-#: ../smime/gui/certificate-manager.c:138
-#: ../smime/gui/certificate-manager.c:156
-#: ../smime/gui/certificate-manager.c:389
-#: ../smime/gui/certificate-manager.c:407
-#: ../smime/gui/certificate-manager.c:621
-#: ../smime/gui/certificate-manager.c:639
+#: ../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 "�ற�ற வேண�டிய சான�றிதழை தேர�ந�தெட�..."
 
-#: ../smime/gui/certificate-manager.c:147
+#: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
 msgstr "அனைத�த�ம� PKCS12 கோப�ப�கள�"
 
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:403
-#: ../smime/gui/certificate-manager.c:635
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
 msgid "All files"
 msgstr "எல�லா கோப�ப�கள�ம�"
 
-#: ../smime/gui/certificate-manager.c:279
-#: ../smime/gui/certificate-manager.c:496
-#: ../smime/gui/certificate-manager.c:726
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "சான�றிதழ� பெயர�"
 
-#: ../smime/gui/certificate-manager.c:288
-#: ../smime/gui/certificate-manager.c:514
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "காரணம�"
 
-#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "வரிசை எண�"
 
-#: ../smime/gui/certificate-manager.c:305
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "காலாவதியானத�"
 
-#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:389
 msgid "All email certificate files"
 msgstr "அனைத�த�ம� மின�னஞ�சல� சான�றிதழ� கோப�ப�கள�"
 
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "மின�னஞ�சல� ம�கவரிகள�"
 
-#: ../smime/gui/certificate-manager.c:630
+#: ../smime/gui/certificate-manager.c:613
 msgid "All CA certificate files"
 msgstr "அனைத�த�ம� சி� சான�றிதழ� கோப�ப�கள�"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "சான�றிதழ� காட�டி: %s"
@@ -18774,7 +20481,7 @@ msgid "Enter new password"
 msgstr "ப�திய கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
 #. 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"
@@ -18783,7 +20490,7 @@ msgstr ""
 "பெற�ற�க�கொண�டவர�:\n"
 "  தலைப�ப�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -18792,7 +20499,7 @@ msgstr ""
 "வழங�கியவர�:\n"
 "  தலைப�ப�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "சான�றிதழை தேர�வ� செய�"
 
@@ -18977,7 +20684,7 @@ msgid "_Edit CA Trust"
 msgstr "(_E) CA நம�பிக�கையை திர�த�த�"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "சான�றிதழ� �ற�கெனவே உள�ளத�"
 
@@ -19185,8 +20892,7 @@ msgstr "அனைதà¯�தà¯� தொடரà¯�பà¯�களையà¯�à®®à¯� நகà
 msgid "Contact _Preview"
 msgstr "தொடர�ப� ம�ன�பார�வை (_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "நகலெட�"
@@ -19208,11 +20914,11 @@ msgid "Copy to Folder..."
 msgstr "அடைவ�க�க�ல� படியெட�..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+#,
+msgid "Create a new address book folder"
 msgstr "ப�திய ம�கவரி ப�த�தக அடைவினை உர�வாக�க�"
 
-#: ../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 "வெட�ட�"
@@ -19253,8 +20959,7 @@ msgstr "தேரà¯�நà¯�தெடà¯�கà¯�கபà¯�படà¯�ட அடைவà®
 msgid "Move to Folder..."
 msgstr "அடைவை நகர�த�த�..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ஒட�ட�"
@@ -19277,23 +20982,25 @@ msgstr "தேரà¯�நà¯�தெடà¯�கà¯�கபà¯�படà¯�ட அடைவà®
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "ம�கவரிப�ப�த�தகத�தை VCard ஆக சேமி"
+msgstr "ம�கவரிப�ப�த�தகத�தை விகார�ட� ஆக சேமி"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "விகார�ட� என சேமிக�கப�பட�டத�..."
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
-msgstr "தேர�வ� செய�த தொடர�ப�களை VCard இல� சேமி."
+msgstr "தேர�வ� செய�த தொடர�ப�களை விகார�ட� இல� சேமி."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "தேர�ந�தெட�க�கப�பட�ட அடைவ� தொடர�ப�களை வீகார�ட� ஆக சேமிக�கவ�ம�."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2717
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "அனைத�தைய�ம� தேர�வ� செய�"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "(_A)அனைட�தைய�ம� தேர�வ� செய�"
 
@@ -19423,7 +21130,7 @@ msgid "Month"
 msgstr "மாதம�"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "அட�த�த�"
 
@@ -19432,7 +21139,7 @@ msgid "Previews the calendar to be printed"
 msgstr "அச�சடிக�கப�பட வேண�டிய நாள�காட�டியில� ம�ன�தோற�றத�தை பார�"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ம�ந�தைய"
 
@@ -19500,231 +21207,6 @@ msgstr "வார வேலை"
 msgid "_Open Appointment"
 msgstr "நேர ஒத�க�க �ற�பாட�டினை திற (_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "தேர�வ� செய�த உரையை தற�காலிக நினைவிடத�தில� நகலெட�க�கவ�ம�"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "தேர�வ�செய�தவைகளை ஒட�ட�ப�பலகத�தில� படியெட�"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "தேர�வ� செய�த உரையை ஒட�ட�ப�பலகத�தில� படியெட�"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "தேர�வ� செய�தவைகளை ஒட�ட�ப�பலகத�தில� படியெட�"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "இடையக சேமிப�பகத�திலிர�ந�த� ஒட�ட�"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "தற�காலிக நினைவிடத�தில� உள�ள உரையை ஒட�ட�"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "எல�லா உரையைய�ம� தேர�வ�செய�"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "இணைக�கவ�ம�"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "ஒர� கோப�பினை இணைக�க இங�க� சொட�க�கவ�ம�"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "நடப�ப� சாளரத�தை மூட இங�க� சொட�க�கவ�ம�"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "நடப�ப� சாளரத�தை சேமிக�க இங�க� சொட�க�கவ�ம�"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "உதவியை பெற இங�க� சொட�க�கவ�ம�"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "மூட�"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "ந�ழை (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "(_A)இணைப�ப�...."
-
-#: ../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 "(_C)மூட�"
-
-#: ../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 "(_F)கோப�ப�"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
-msgid "_Help"
-msgstr "(_H)உதவி..."
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "விர�ப�பங�கள� (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "அனைத�த� நாள� நிகழ�வ�"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "அனைத�த� நாள� நிகழ�வ�"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "நம�பகமானதாக வகைப�பட�த�த�க"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "தனிபட�டத� என வகைப�பட�த�த�"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "பொத� என வகைப�பட�த�த�"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "இந�த நிகழ�வ�க�க� எச�சரிக�கையை அமைக�க அல�லத� நீக�க இங�க� சொட�க�க�"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "கூட�தல� அன�ப�ப�ம� விர�ப�பங�களை ந�ழை"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "இந�த நிகழ�வை ச�ர�ள� நிகழ�வாகச� செய�"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "பொத� (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "பங�கேற�போர�க�க� வேலை அல�லத� ஓய�வ� தகவலை கேட�கவ�ம�"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "பங�க� ப�லம� (_o)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "தேர�வ�களை அன�ப�ப�க"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "(_b) வேலையில� உள�ள நேரம� எனக�காட�ட�"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "நேரம� மண�டலம�: (_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "கலந�த�கொள�பவர�கள� வகை ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "RSVP ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "பங�க� ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "நிலை ப�லம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "நேர மண�டலம� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "வகைகள� காட�டப�பட�மா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "அனைத�த� நாள� நிகழ�வ� வைத�த�க�கொள�ளலாமா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "பெற�வத� நேரத�தை வேலையில� என காட�டலாமா என�பதை மாற�ற�கிறத�."
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "அலாரங�கள� (_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "(_C)வகைகள�"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "பிரிவ�கள� (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "இரகசியமானத� (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "ஓய�வ�/பணியில� (_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "தனிப�பட�ட (_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "மீண�ட�ம� தோன�றல� (_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "நிலை ப�லம� (_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "வகை ப�லம� (_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "தற�போதைய மின�னஞ�சல� செயலை ரத�த� செய�"
@@ -19746,91 +21228,97 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "ப�திய மின�னஞ�சலை வடிகட�ட�வதற�கான விதியை உர�வாக�க� அல�லத� திர�த�த�"
 
 #: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages for Offline"
-msgstr "இணைப�ப� விலகி காண செய�திகள� � இறக�க�"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Download messages for offline"
-msgstr "இணைப�ப� விலகி காண செய�திகள� � இறக�க�"
-
-#: ../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 "(_T)க�ப�பை தொட�டியை காலி செய�"
 
-#: ../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 "(_o)அடைவ�"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "தேர�ந�தெட�க�கப�பட�ட அடைவை வேற� அடைவ�க�க� நகர�த�த� "
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "எல�லா அடைவில�ம� உள�ள எல�லா அழித�த செய�திகளைய�ம� நிரந�தரமாக நீக�க�"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "அடைவ�களை தேட� (_o)"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "செய�தி ம�ன�பார�வையை காட�ட�க"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "செய�திகள� பட�டியல� கீழ� செய�திகள� ம�ன�பார�வையை காட�ட�க"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../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:19
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "செய�தி ம�ன�பார�வை சாளரத�தை காட�ட�"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "தொலை சேவையகங�களில�ள�ள அடைவ�களை சந�தாப�பட�த�த� அல�லத� சந�தாநீக�க�"
 
-#: ../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
 msgid "_Classic View"
 msgstr "பழைமயான காட�சி"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "அடைவில� நகலெட�... (_C)"
 
+#: ../ui/evolution-mail-global.xml.h:22
+#,
+msgid "_Debug Logs"
+msgstr "வழ� நீக�க� பதிவ�கள� (_D)"
+
 #: ../ui/evolution-mail-global.xml.h:23
+#,
+msgid "_Download Messages for Offline Usage"
+msgstr "(_D) இணைப�ப� விலகி காண செய�திகளை இறக�க�"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "செய�தி வடிப�பிகள� (_M)"
 
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "அடைவை இங�க� நகர�த�த�க"
 
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "ப�திய... (_N)"
 
-#: ../ui/evolution-mail-global.xml.h:26
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "_ம ம�ன�பார�வை"
 
 #.
 #. <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 "சந�தாக�கள� (_S)"
 
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "செங�க�த�த� நிலை காட�சி"
 
@@ -19892,70 +21380,84 @@ msgid "Mar_k All Messages as Read"
 msgstr "அனைத�த� செய�திகளைய�ம� படித�ததாக க�றி (_k)"
 
 #: ../ui/evolution-mail-list.xml.h:17
+#,
+msgid "Mark all messages in the folder as read"
+msgstr "அடைவில� உள�ள அனைத�த� செய�திகள�ம� படித�ததாக க�றி"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "தற�காலிக நினைவிடத�திலிர�ந�த� செய�திகளை ஒட�டவ�ம�"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "இந�த அடைவில� உள�ள நீக�கிய கோப�ப�களை நிரந�தரமாக நீக�க�"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "இந�த அடைவினை நிரந�தரமாக நீக�க�"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
 msgstr "ப�த�ப�பிக�க..."
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "அடைவை ப�த�ப�பிக�கவ�ம�"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
+#,
+msgid "Select Message S_ubthread"
+msgstr "செய�தி த�ணை சரத�தை தேர�ந�தெட� (_u)"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
-msgstr "செய�தி ப�ரியை தேர�ந�தெட� (_T)"
+msgstr "செய�தி சரத�தை  தேர�ந�தெட� (_T)"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "அனைத�த� செய�திகளைய�ம� தேர�ந�தெட� (_A)"
 
-#: ../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 "தற�போத� தேர�வ� செய�யப�படாத செய�திகளை மட�ட�ம� தேர�வ� செய�யவ�ம�"
 
-#: ../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 "ஒரே இழையில� உள�ள தேர�வ� செய�த எல�லா செய�திகளைய�ம� தேர�வ� செய�யப�பட�டத� என க�றி"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr "இப�போத� தேர�வ� செய�த செய�தியின� எல�லா பதில�களைய�ம� தேர�வ� செய�க"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "ப�லப�பட�ம� அனைத�த� செய�திகளைய�ம� தேர�வ� செய�யவ�ம�"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "மறைத�த செய�திகளை காட�ட�க"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "தற�காலிகமாக மறைக�கப�பட�ட செய�திகளை காட�ட�"
 
-#: ../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 "�ற�கெனவே படித�த செய�திகளை தற�காலிகமாக மறை"
 
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "தேர�வ� செய�யப�பட�ட செய�தியை தற�காலிகமாக மறை"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "இழைய�டன� கூடிய செய�தி பட�டியல�"
 
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "ப�ரிகளால� க�ழ�வாக�க� (_G)"
 
-#: ../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 "செய�தி (_M)"
@@ -20281,7 +21783,7 @@ msgstr "அனைதà¯�தà¯� உரையையà¯�à®®à¯� தேரà¯�நà¯�தà
 msgid "Select all the text in a message"
 msgstr "செய�தியில� அனைத�த� உரையைய�ம� தேர�ந�தெட�க�கவ�ம�"
 
-#: ../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 "தற�போதைய அச�சியந�திரத�திற�காக பக�க அமைப�பை காட�ட�"
 
@@ -20290,101 +21792,102 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "செய�தியில� சிமிட�ட�ம� நிலைகாட�டியை காட�ட�"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "இயல�பான தோற�றத�தில� செய�திகளை காட�ட�"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "எல�லா மின�னஞ�சல� தலைப�ப�களோட�ம� செய�திகளை காட�ட�"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "மின�னஞ�சல� செய�தியின� மூலத�தை காட�ட�"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "தேர�ந�தெட�த�த செய�திகளை அழிக�க வேண�டாம�"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "ம�க�கியமில�லாத (_m)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "பெரிதாக�க� (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "இணைக�கப�பட�ட (_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "காரட� ம�றை (_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "கொடியை நீக�க� (_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "செய�தியை அழி (_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "செய�தியில� கண�ட�பிடி... (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "கொடி ம�டிந�தத� (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "(_G) இங�கே செல�"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "ம�க�கியம� (_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "உள�ளே (_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "தேவையற�றவை (_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "படங�களை �ற�ற� (_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "செய�தி மூலம� (_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "அட�த�த செய�தி (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "இயல�பாக அளவ� (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "தேவையற�றதல�ல (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "ப�திய சாளரத�தில� திற (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "(_P)ம�ந�தைய செய�தி"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "க�றிப�பிடப�பட�ட (_Q)"
 
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "படி (_R)"
+
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "செய�தியை சேமி... (_S)"
@@ -20405,11 +21908,11 @@ msgstr "அளவிட� (_Z)"
 msgid "_Zoom In"
 msgstr "சிறிதாக�க� (_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "இந�த சாளரத�தை மூடவ�ம�"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "மூட�"
 
-#: ../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 "ம�தன�மை கர�விப�பட�டை"
 
@@ -20445,290 +21948,6 @@ msgstr "தேரà¯�வà¯� செயà¯�யபà¯�படà¯�ட கà¯�றிபà¯�à
 msgid "_Open Memo"
 msgstr "க�றிப�பினை திற (_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "கோப�பை இணைக�கவ�ம�"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "தற�போதைய கோப�பை தேர�வ� செய�யவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "கையொப�பம� தவிர மற�றதை நீக�கவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "PGP யை பயன�பட�த�தி இந�த செய�தியை க�றிம�றையாக�கவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "S/MIME க�றிம�றையாக�க சான�றிதழை பயன�பட�த�தி இந�த செய�தியை க�றியாக�கவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "(_m)வடிவமைப�ப�"
-
-#: ../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
-msgid "Insert Send options"
-msgstr "அன�ப�ப� விர�ப�பங�களை சொர�க�க"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "கோப�பௌ திற"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP க�றிம�றையாக�கம�"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP க�றிம�றையாக�கம�"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP மறையாக�க�"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP கையொப�பம�"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "படிக�க பெற�றவைகளை கோரவ�ம� (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME En_crypt"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME மறையாக�க�"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME கையொப�பம�"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME கையொப�பம�"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "_அன�ப�ப�க"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "எனச�சேமி"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "வரைவை சேமி"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "(_A)எனச�சேமி..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "வரைவை சேமி (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "வரைவாக சேமி"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "அடைவில� சேமி..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "தற�போதைய கோப�பை சேமி"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "தற�போதைய கோப�பை வேற� பெயரில� சேமி"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "இந�த செய�தியை க�றிப�பிட�ட அடைவில� சேமிக�கவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "அன�ப�ப�"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "மின�னஞ�சலை HTML வடிவத�தில� அன�ப�ப�"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "இந�த செய�தியை அன�ப�ப�"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "செய�தி ம�ன�ன�ரிமையை உயர�ந�ததாக அமை"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "PGP விசையை பயன�பட�த�தி இந�த செய�திக�க� கையொப�பமிடவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "S/MIME கையொப�ப சான�றிதழ� பயன�பட�த�த� இந�த செய�திக�க� கையொப�பமிடவ�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "மறைநகல� ப�லம� காட�டப�பட வேண�ட�மா என�பதை மாற�ற"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "கரிநகல� ப�லம� காட�டப�படவேண�ட�மா என�பதை மாற�ற"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "அன�ப�ப�நரை தேர�வ� செய�ய வேண�ட�மா ப�லத�தை மாற�ற"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "செல�ல�மிடம�ப�நர� ப�லம� காட�டப�பட வேண�ட�மா என�பதை மாற�ற�ம��ப�ன"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "பதிலலிநர� ப�லம� காட�டப�படவேண�ட�மா என�பதை மாற�ற�ம�"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "ப�லங�கள� காட�டப�பட வேண�ட�மா என�பதை மாற�ற�"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "(_B)மறை நகல� ப�லம�"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "(_C)கரிநகல� ப�லம�"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "(_D)அனைத�தைய�ம� நீக�க�"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "(_F)ப�லத�திலிர�ந�த�"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "(_O)திற..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "(_P) இங�க� அன�ப�ப�"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "ம�ன�ன�ரிமை செய�தி (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "(_R) இங�க� பதிலலி"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "(_S)பாத�காப�ப�"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "அன�ப�ப�ம� விர�ப�பங�கள� (_S) "
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "(_T)ப�லத�தில�"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "(_l)மூட�"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "சேமி மற�ற�ம� மூட�"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "(_C)சேமி மற�ற�ம� மூட�"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "தற�போதைய கோப�பை சேமித�த� சாளரத�தை மூடவ�ம�"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "சந�தாதார� அடைவ� பட�டியலில� இந�த அடைவை சேர�"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "பட�டியலை ப�த�ப�பி"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "அடைவ� பட�டியலை ப�த�ப�பி"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "உங�கள� சாந�தாதார� அடைவ� பட�டியலிலிர�ந�த� இந�த அடைவை நீக�க�"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "சந�தாதாராக சேர�"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "உற�ப�பினர� நீக�கம�"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "(_I)தேர�வை தலைகீழாக�க�"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "பணியின� மாற�ற� / பார�வையிட� நிலையை சொட�க�கவ�ம�"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "நிலை விவரங�கள�"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "நேரம� மண�டலம�"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "நிலை விவரங�கள� (_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "தேர�வ� செய�த பணிகளை நகலெட�"
@@ -20814,127 +22033,147 @@ msgid "Display window buttons with text only"
 msgstr "உரைய�டன� மட�ட�ம� சாளர பொத�தான�களை காட�ட�"
 
 #: ../ui/evolution.xml.h:10
+#,
+msgid "Evolution _FAQ"
+msgstr "எவல�யூஷன� அகேகே (FAQ) ( _F)"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "நிரலிலிர�ந�த� வெளியேற�கிறத�"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "கடவ�ச�சொல� நினைவ�கொள�வதை மறக�கசெய�. இதனால� மீண�ட�ம� மீண�ட�ம� கடவ�ச�சொல� கேட�க�ம�"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "சாளர பொத�தான�களை மறை"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "இறக�க�மதி... (_m)"
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+#,
+msgid "Icons _and Text"
 msgstr "சின�னங�கள� மற�ற�ம� உரை (_a)"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "மற�ற  நிரலிலிர�ந�த� தகவலை பெற�ற�க�கொள�ளவ�ம�"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "_அமைப�ப�"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "(_W)ப�திய சாளரம�"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+#,
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "அடிக�கடி கேட�க�ம� கேள�விகள� - இணைய பக�கத�தை திற"
+
+#: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
 msgstr "_பக�க அமைப�ப�..."
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "ம�ன�ன�ரிமை (_n)"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "அன�ப�ப�/பெற�ற�க�கொள�"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "அன�ப�ப� / பெற� (_R)"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "ப�திய உர�ப�படிகளை பெற வரிசையாக உர�ப�படிகளை அன�ப�பவ�ம�"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "பைலட� அமைப�பை அமை"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "பக�கப� பட�டையை காட�ட� (_B)"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "நிலைப�பட�டையை காட�ட� (_S)"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "கர�விப�பட�டையை காட�ட� (_T)"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "எவல�யூஷனை பற�றிய தகவல�களை காட�ட�"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "பிழை அறிக�கை அன�ப�பப�பட�கிறத�"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "(_B)பிழை அறிக�கை அன�ப�பப�பட�கிறத�"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "பக� பட�டி(Bug buddy)யை பயன�பட�த�தி பிழை அறிக�கை அன�ப�பவ�ம�"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "நான� இணையத�தை பயன�பட�த�தவில�லையென�றான� மாறிக�கொள�ளவ�ம�"
 
-#: ../ui/evolution.xml.h:38
-msgid "Tool_bar style"
-msgstr "கர�விப�பட�டை தோற�றம� (_b)"
+#: ../ui/evolution.xml.h:36
+#,
+msgid "Tool_bar Style"
+msgstr "கர�விப�பட�டை பாங�க� (_b)"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
 msgstr "பக�க பட�டையை காட�ட�/மறை"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
 msgstr "நிலைப�பட�டையை காட�ட�/மறை"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:39
+#,
+msgid "Work _Offline"
+msgstr "(_O) இணையத�தொடர�ப� இல�லாமல� வேலை செய�யவ�ம�"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "பற�றி (_A)"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "சாளரத�தை மூடவ�ம� (_C)"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "கடவ�ச�சொற�கள� மறந�த�விட�டதா (_F)"
 
+#: ../ui/evolution.xml.h:45
+#,
+msgid "_Frequently Asked Questions"
+msgstr "(வ�) அடிக�கடி கேட�க�ம� கேள�விகள�  (அகேகே)"
+
 #: ../ui/evolution.xml.h:47
-msgid "_Hide buttons"
+#,
+msgid "_Hide Buttons"
 msgstr "பொத�தான�களை மறை (_H)"
 
 #: ../ui/evolution.xml.h:48
-msgid "_Icons only"
+#,
+msgid "_Icons Only"
 msgstr "சின�னங�கள� மட�ட�ம� (_I)"
 
 #: ../ui/evolution.xml.h:50
@@ -20954,7 +22193,8 @@ msgid "_Synchronization Options..."
 msgstr "ஒர�ங�கிணைக�க�ம� விர�ப�பங�கள�... (_S)"
 
 #: ../ui/evolution.xml.h:54
-msgid "_Text only"
+#,
+msgid "_Text Only"
 msgstr "உரை மட�ட�ம� (_T)"
 
 #: ../ui/evolution.xml.h:56
@@ -20969,9 +22209,9 @@ msgstr "(_C)நிற�வனம�"
 msgid "_Address Cards"
 msgstr "(_A)ம�கவரி அட�டை"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "(_P)தொலைபேசி பட�டியல�"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "(_L)பட�டியலை பார�"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20981,10 +22221,6 @@ msgstr "(_e)வார காட�சி"
 msgid "_Day View"
 msgstr "(_D)நாள� காட�சி"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "(_L)பட�டியலை பார�"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "(_M)மாதம� காட�சி"
@@ -21037,12 +22273,12 @@ msgstr "நில�வை தேதிய�டன� (_D)"
 msgid "With _Status"
 msgstr "(_S)நிலைய�டன�"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c: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:761
+#. 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"
 
@@ -21059,8 +22295,9 @@ msgid "Select a Time Zone"
 msgstr " ஒர� நேரம� மண�டலத�தை தேர�ந�தெட�"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "நேரம� மண�டல சேர�க�கைப�பெட�டி"
+#,
+msgid "Timezone drop-down combination box"
+msgstr "நேரம� மண�டலம� கீழிறங�க�ம� தொக�ப�ப� பெட�டி"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21071,19 +22308,19 @@ msgstr ""
 "வரைபடத�தில� க�றிப�பிட�ட பக�தியை பெரிதாக�க ச�ட�டியில� இடத� பொத�தானை பயன�பட�த�தவ�ம�\n"
 "சிறிதாக�க வலத� பொத�தானை பயன�பட�த�தவ�ம�."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 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 "%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 "காட�சிகளை க�றிப�பிட�"
 
@@ -21093,17 +22330,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\"க�க� காட�சிகளை க�றிப�பிட�"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1910
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:179
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "நிகழ�வ�கள�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "நடப�ப� பார�வையை சேமி"
 
@@ -21155,11 +22392,11 @@ msgstr "தறà¯�போதைய தனிபà¯�பயனà¯� காடà¯�சிà
 msgid "Create or edit views"
 msgstr "காட�சிகளை உர�வாக�க� அல�லத� திர�த�த�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "தொழிற�சாலை"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "ப�திய காட�சிகளை வரையற�"
 
@@ -21175,17 +22412,17 @@ msgstr "காட�சியின� வகை"
 msgid "Type of view:"
 msgstr "பார�வையின� வகை:"
 
-#: ../widgets/misc/e-attachment-bar.c:1031
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "இணைப�ப� பட�டை"
 
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "கோப�பை இணைக�க ம�டியவில�லை %s: %s"
 
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "கோப�பை இணைக�க ம�டியவில�லை%s: இயல�பான கோப�ப� இல�லை"
@@ -21206,44 +22443,33 @@ msgstr "MIME வகை:"
 msgid "Suggest automatic display of attachment"
 msgstr "இணைப�பை தானாக காட�ட வலிய�ற�த�த�"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
-
 #. 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:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "மாத நாள�காட�டி"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-entry.c:1230
-#: ../widgets/text/e-entry.c:1231 ../widgets/text/e-text.c:3637
-#: ../widgets/text/e-text.c:3638
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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-entry.c:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-entry.c:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653
+#: ../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
 msgid "GDK fill color"
 msgstr "GDK வண�ண நிரப�பி"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "ப�ள�ளிகளால� நிரப�ப�"
 
@@ -21268,29 +22494,29 @@ 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:3015
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "க�றைந�தபட�ச அகலம�"
 
 #: ../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:3016
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "க�றைந�தபட�ச அகலம�"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "இடைவெளி"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "இப�போத�"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "நேரம� இந�த வடிவத�தில� இர�க�க வேண�ட�ம�: %s"
@@ -21299,251 +22525,255 @@ msgstr "நேரம� இந�த வடிவத�தில� இர�க
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "சதவிகித மதிப�ப� 0 லிர�ந�த� 100 க�க�ள� இர�க�க வேண�ட�ம�"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "அராபிக�"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "பால�டிக�"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "மத�திய �ரோப�பிய"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "சீன"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "கைரலிக�"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "கிரேக�கம�"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "ஹிப�ரூ"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "ஜப�பானிய"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "கொரியன�"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "தாய�"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "த�ர�க�கி"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "யூனிக�கோட�"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "மேற�கதிய �ரோப�பிய"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "மேற�கதிய �ரோப�பிய ,ப�திய"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "பழமையான"
 
-#: ../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:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "எளிதாக�கப�பட�ட"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "உக�ரெயின�"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "காட�சி"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "தெரியாத எழ�த�த�ர�: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "எழ�த�த�ர� க�றிம�றை"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "பயன�பட�த�தவேண�டிய எழ�த�த�ர�வை உள�ளிடவ�ம�"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "மற�றவை..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "எழ�த�த�ர� க�றிம�றை (_a)"
 
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "நாள� மற�ற�ம� நேரம�"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "உள�ளீட� தேதிக�கான உரை உள�ளீட�"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "ஒர� நாள�காட�டியை காட�ட இந�தப� பொத�தானை சொட�க�கவ�ம�"
 
-#: ../widgets/misc/e-dateedit.c:384
-msgid "Combo box to select time"
-msgstr "நேரத�தை தேர�ந�தெட�க�க சேர�க�கை பெட�டி"
-
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "நேரம�"
+#: ../widgets/misc/e-dateedit.c:394
+#,
+msgid "Drop-down combination box to select time"
+msgstr "நேரத�தை தேர�ந�தெட�க�க கீழிறங�க�ம� தொக�ப�ப�  பெட�டி"
 
-#: ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_ப இப�போத�"
 
-#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_இன�ற�"
 
-#: ../widgets/misc/e-dateedit.c:1631
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "செல�லாத தேதி மதிப�ப�"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "செல�லாத நேர மதிப�ப�"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "விரிக�கப�பட�ட"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "விரிவாக�கி விரிக�கப�பட�டதா இல�லையா"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "விரிவாக�க விளக�கச�சீட�டில� உள�ள உரை"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "அடிக�கோட�டை பயன�பட�த�த�"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "அமைக�கப�பட�டால�, அடிகோடிட�ட உரை நிமோனிக� ஆக�சலரேட�டாராக செயல�பட�ம�"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "விளக�க சீட�ட� மற�ற�ம� த�ணைசீட�ட�க�க�ம� உள�ள இடைவெளி"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "சாளர அடையாளம�"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 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:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "விரிவாக�கியின� அளவ�"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "விரிவாக�க அம�ப�க�க�றியின� அளவ�"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "காட�டியின� இடைவெளி"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "விரிக�கப�பட�ட அம�பிக�க�றிகள�க�க�ள� இடம�விட�கிறத�"
 
 #. 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:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "மேம�பட�ட தேடல�"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:233
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "தேடலை சேமி"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "(_S)தேடல�கள�"
 
-#: ../widgets/misc/e-filter-bar.c:272
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "தேடல�கள�"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "(_S)தேடலை சேமி..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "(_E) சேமித�த தேடலை திர�த�த�..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "கூட�தல� தேடல�... (_A)"
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "அனைத�த� கணக�கீட�கள�"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "நடப�பில�ள�ள கணக�கீட�"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "நடப�பில�ள�ள அடைவ� "
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "வழக�கத�தில�ள�ள செய�திகள�"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "சித�திரத�தை தேர�வ�செய�"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "உலக வரைபடம�"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
+#,
 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:109
+msgid "Online"
+msgstr "இணைப�பில�"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "பொத�தான� இணைப�பில� நிலையில� உள�ளத�"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -21569,52 +22799,61 @@ msgstr "மற�பாய�வ� மாதிரி"
 msgid "Column width"
 msgstr "நிரல� அகலம�"
 
-#: ../widgets/misc/e-search-bar.c:596
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
+msgid "Search"
+msgstr "தேட�"
+
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
+msgid "Click here to change the search type"
+msgstr "தேடல� வகையை மாற�ற இங�க� சொட�க�கவ�ம�"
+
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "(_S)தேட�"
 
-#: ../widgets/misc/e-search-bar.c:602
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "(_N) இப�போத� தேட�"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "(_C)தூய�மை"
 
-#: ../widgets/misc/e-search-bar.c:858
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "உர�ப�படி ID"
 
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1216
-#: ../widgets/text/e-entry.c:1217 ../widgets/text/e-text.c:3559
-#: ../widgets/text/e-text.c:3560
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:999
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "ச�ட�டிகாட�ட�தல�_w:"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1016
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "தேட�(_c):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1028
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr "உள�ளே"
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "நிலைகாட�டி நிரை"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "நிலைகாட�டி நிரல�"
@@ -21631,7 +22870,7 @@ msgstr "தேர�ந�தெட�த�தல� ம�றை"
 msgid "Cursor Mode"
 msgstr "நிலைகாட�டி ம�றை"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "நீக�கப�பட�டத�"
 
@@ -21655,10 +22894,6 @@ msgstr "<b>நிலையை தேட�கிறத�</b>"
 msgid "A_uto-delete sent item"
 msgstr "அன�ப�பிய உர�ப�படியை தானாக அழி (_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "வகைப�பட�த�த�தல�"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "தகவலை தேட அன�ப�பிய உர�ப�படியை உர�வாக�க� (_e)"
@@ -21739,44 +22974,45 @@ msgstr "பின�: (_A)"
 msgid "_All information"
 msgstr "அனைத�த� தகவல�கள� (_A)"
 
-#: ../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 "தாமத செய�தி வழங�கல� (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "வழங�கப�பட�டத�(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "ம�டிவ�ற�ம� நாளினை அமை (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "வரை: (_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "�ற�ற போத� (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "திறந�திர�க�க�ம� போத�: (_W)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c: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%% ம�டிவ�ற�றத�)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URLக�க� செல�ல இங�க� சொட�க�கவ�ம�"
 
@@ -21804,166 +23040,156 @@ msgstr "மேல�மீட�ப� பட�டியல�"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "தேர�வ� செய�யப�பட�ட நெட�வரிசை"
 
-#: ../widgets/table/e-cell-pixbuf.c:390
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "க�றிப�பிடப�பட�ட நெட�வரிசை"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "தேர�வ� செய�யப�படாத நெட�வரிசை"
 
-#: ../widgets/table/e-cell-text.c:1803
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "அடிக�கப�பட�ட நெட�வரிசை"
 
-#: ../widgets/table/e-cell-text.c:1810
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "அடிக�கோடிட�ட நெட�வரிசை"
 
-#: ../widgets/table/e-cell-text.c:1817
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "பெரிதாக�கப�பட�ட நெட�வரிசை"
 
-#: ../widgets/table/e-cell-text.c:1824
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "நிற நெட�வரிசை"
 
-#: ../widgets/table/e-cell-text.c:1838
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG நிற நெட�வரிசை"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- நீக�க� (_R)"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "நிலை"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(�ற�வரிசை)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(இறங�க�கின�றத�)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "வரிசையாஇக�கவில�லை"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "தொக�த�தல� கிடையாத�"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "ப�லங�களை காட�ட�"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "இர�க�க�ம� ப�லங�கள�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "இர�க�க�ம� ப�லங�கள�: (_v)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "மேலேற�கின�றத�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "அனைத�தைய�ம� த�டை"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1579
+msgid "Clear _All"
+msgstr "(_A) அனைத�தைய�ம� த�டை"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "இறங�க�கின�றத�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "உர�ப�படிகளை க�ழ�ப�பட�த�த�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "கீழே நகர�த�த� (_D)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "மேலே நகர�த�த� (_U)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "இந�த ப�லங�களை வரிசையாக காட�ட�: (_o)"
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "(_f) பார�வையில� ப�லத�தை காட�ட�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:641
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "ப�லங�களை காட�ட�"
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "(_n) பார�வையில� ப�லத�தை காட�ட�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr "பார�வையில� ப�லத�தை காட�ட�"
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "(_V) பார�வையில� ப�லத�தை காட�ட�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "வரிசைப�பட�த�த�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "உர�ப�படிகளை வரிசைப�பட�த�த�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "பின�"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "சேர� -> (_A)"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "காட�டப�பட�ட ப�லங�கள�... (_F)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "வரிசைப�பட�த�த�... (_S)"
-
-#: ../widgets/table/e-table-config.c:152
-msgid "State"
-msgstr "நிலை"
-
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
-msgid "(Ascending)"
-msgstr "(�ற�வரிசை)"
-
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
-msgid "(Descending)"
-msgstr "(இறங�க�கின�றத�)"
-
-#: ../widgets/table/e-table-config.c:392
-msgid "Not sorted"
-msgstr "வரிசையாஇக�கவில�லை"
-
-#: ../widgets/table/e-table-config.c:433
-msgid "No grouping"
-msgstr "தொக�த�தல� கிடையாத�"
-
-#: ../widgets/table/e-table-config.c:662
-msgid "Available Fields"
-msgstr "இர�க�க�ம� ப�லங�கள�"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "க�ழ�வாக�க� (_G)"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "(_S) பார�வையில� ப�லத�தை காட�ட�"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "இந�த ப�லங�களை வரிசையாக காட�ட� (_S)"
 
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "வரிசைப�பட�த�த�... (_S)"
+
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:636
+#: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1875
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD அடையாளம�"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:643
+#: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1889
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "ம�ழ� தலைப�ப�"
 
@@ -21997,301 +23223,290 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d items)"
 msgstr[1] "%s (%d உர�ப�படி)"
 
-#: ../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:2973 ../widgets/table/e-table-item.c:2974
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "அட�த�தட�த�த வரிசை நிறங�கள�"
 
-#: ../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:2980 ../widgets/table/e-table-item.c:2981
-#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "கிடைமட�ட கட�டங�கள�"
 
-#: ../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:2987 ../widgets/table/e-table-item.c:2988
-#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "மேல�கீழ� கட�டங�கள�"
 
-#: ../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:2994 ../widgets/table/e-table-item.c:2995
-#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
+#: ../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
 msgid "Draw focus"
 msgstr "க�றிப�பை வரை"
 
-#: ../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:3001 ../widgets/table/e-table-item.c:3002
+#: ../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
 msgid "Cursor mode"
 msgstr "கர�சர� பாங�க�"
 
-#: ../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:2966 ../widgets/table/e-table-item.c:2967
+#: ../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
 msgid "Selection model"
 msgstr "தேர�வ� மாதிரி"
 
-#: ../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:3008 ../widgets/table/e-table-item.c:3009
-#: ../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: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
 msgid "Length Threshold"
 msgstr "த�வக�க நீளம�"
 
-#: ../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:3042 ../widgets/table/e-table-item.c:3043
-#: ../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: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
 msgid "Uniform row height"
 msgstr "ஒத�த வரிசை உயரங�கள�"
 
-#: ../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: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"
 msgstr "ம�டிவான"
 
-#: ../widgets/table/e-table-header-item.c:1456
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "தற�போதைய காட�சியை தனிப�பயனாக�க�..."
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "_�ற�வரிசையாக அட�க�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "_இறங�க� வரிசையாக அட�க�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_ந வரிசைப�பட�த�தல� நீக�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "இந�த ப�லம� வாராக க�ழ� செய�க"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "பெட�டி வாராக க�ழ� செய�க"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "_ந இந�த பத�தியை நீக�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "_ச ஒர� பத�தியை சேர�க"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "_ச சீர�மை"
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_நல�ல பொர�த�தம�"
 
-#: ../widgets/table/e-table-header-item.c:1488
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "நெட�வரிசையை ஒழ�ங�க� செய�க..."
 
-#: ../widgets/table/e-table-header-item.c:1490
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "நடப�ப� காட�சியை _தனிப�பயன� ஆக�க�க..."
 
-#: ../widgets/table/e-table-header-item.c:1540
-msgid "Sort By"
-msgstr "வரிசைப�பட�த�த�"
+#: ../widgets/table/e-table-header-item.c:1543
+msgid "_Sort By"
+msgstr "(_S) இதனால� வரிசைப�பட�த�த�"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1561
+msgid "_Custom"
+msgstr "(_C) தனிப�பயன�"
 
-#: ../widgets/table/e-table-header-item.c:1882
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "எழ�த�த�ர� விவரணம�"
 
-#: ../widgets/table/e-table-header-item.c:1903
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "வரிசைப�பட�த�திய தகவல�"
 
-#: ../widgets/table/e-table-header-item.c:1917
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "மரம�"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "அட�டவணை தலைப�ப�"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "அட�டவணை மாதிரி"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "நிலைகாட�டி நிரை"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
-#: ../widgets/table/e-tree.c:3341
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "எப�போத�ம� தேட�"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "சேர�க�க க�ளிக� செய�யவ�ம�"
 
-#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Eகிளை அட�டவணை �ற�பி"
 
-#: ../widgets/table/e-tree.c:3347
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "ப�திய பார�வை"
 
-#: ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "கோட�கள� +/- விரிவாக�கிகளை வரை"
 
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3552 ../widgets/text/e-text.c:3553
-msgid "Event Processor"
-msgstr "நிகழ�வ� செயல�ம�றைகள�"
-
-#: ../widgets/text/e-entry.c:1223 ../widgets/text/e-entry.c:1224
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
-msgid "Justification"
-msgstr "சீராக�க�"
-
-#: ../widgets/text/e-entry.c:1265 ../widgets/text/e-entry.c:1266
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
-msgid "Use ellipsis"
-msgstr "நீள�வட�டத�தை பயன�பட�த�த�"
-
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
-msgid "Ellipsis"
-msgstr "நீள�வட�டம�"
-
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
-msgid "Line wrap"
-msgstr "வரி மடக�கி"
-
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
-msgid "Break characters"
-msgstr "எழ�த�த� நிற�த�தம�"
-
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
-msgid "Max lines"
-msgstr "அதிகபட�ச வரிகள�"
-
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
-msgid "Allow newlines"
-msgstr "ப�திய வரிகளை அன�மதி"
-
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
-msgid "Draw borders"
-msgstr "ஓரங�களை வரை"
-
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
-msgid "Draw background"
-msgstr "பின�னனியை வரை"
-
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
-msgid "Draw button"
-msgstr "பட�டன�களை வரை"
-
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
-msgid "Cursor position"
-msgstr "கர�சர� நிலை"
-
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-msgid "Emulate label resize"
-msgstr "போன�ம பெயர� மற�அளவ�"
-
-#: ../widgets/text/e-text.c:2729
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "உள�ளிட�ம� ம�றைகள�"
 
-#: ../widgets/text/e-text.c:3566 ../widgets/text/e-text.c:3567
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+msgid "Event Processor"
+msgstr "நிகழ�வ� செயல�ம�றைகள�"
+
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "தடிமன�"
 
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "அடிக�கவ�ம�"
 
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "இணைப�ப�"
 
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+msgid "Justification"
+msgstr "சீராக�க�"
+
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "க�ளிப� அகலம�"
 
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "க�ளில� உயரம�"
 
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "க�ளிப�"
 
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "க�ளிக� செவ�வகத�தை நிரப�ப�"
 
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X ஒத�க�கம�"
 
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y ஒத�க�கம�"
 
-#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "உரை அகலம�"
 
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "உரை உயரம�"
 
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+msgid "Use ellipsis"
+msgstr "நீள�வட�டத�தை பயன�பட�த�த�"
+
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+msgid "Ellipsis"
+msgstr "நீள�வட�டம�"
+
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+msgid "Line wrap"
+msgstr "வரி மடக�கி"
+
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+msgid "Break characters"
+msgstr "எழ�த�த� நிற�த�தம�"
+
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+msgid "Max lines"
+msgstr "அதிகபட�ச வரிகள�"
+
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+msgid "Draw borders"
+msgstr "ஓரங�களை வரை"
+
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+msgid "Allow newlines"
+msgstr "ப�திய வரிகளை அன�மதி"
+
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+msgid "Draw background"
+msgstr "பின�னனியை வரை"
+
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+msgid "Draw button"
+msgstr "பட�டன�களை வரை"
+
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+msgid "Cursor position"
+msgstr "கர�சர� நிலை"
+
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM சூழல�"
 
-#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "மேல�மீட�பினை கையாள�"
 
diff --git a/po/te.po b/po/te.po
index 08429f5a18..d023465dd5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,40 +1,44 @@
+# translation of evolution.HEAD.te.po to Telugu
 # Telugu translation of evolution
 # Copyright (C) 2005 Free Software Foundation, Andhra Pradesh.
 # This file is distributed under the same license as the evolution package.
 #
+#: ../shell/main.c:589
 # Prajasakti Localisation Team <localisation@prajasakti.com>, 2005.
 # భరత� క�మార� <bharatfsf@gmail.com>, 2007.
 # Krishna Babu K <kkrothap@redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution\n"
+"Project-Id-Version: evolution.HEAD.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-12 11:29+0530\n"
-"PO-Revision-Date: 2008-02-01 20:49+0530\n"
+"POT-Creation-Date: 2008-09-06 16:13+0000\n"
+"PO-Revision-Date: 2008-09-09 20:27+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
-"Language-Team: Swecha Telugu Localisation Team <localisation@swecha.org>\n"
+"Language-Team: Telugu <en@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"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"\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:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "కొత�త  పరిచయం"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "కొత�త  పరిచయ జాబితా"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -42,7 +46,6 @@ msgstr[0] "à°ªà±�à°°à°¸à±�à°¤à±�à°¤ à°šà°¿à°°à±�నామా à°ªà±�à°¸à±�తకà
 msgstr[1] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�లన�"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "తెర�వ�మ�"
 
@@ -58,63 +61,63 @@ msgstr "పరిచయం: "
 msgid "evolution minicard"
 msgstr "ఎవల�యూషన�  యొక�క చిన�నపలకం"
 
-#: ../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 "ప�నరావృతి కావటం ఉన�నది"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "అది ఒక సమావేశం."
 
-#: ../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 "క�యాలెండర� ఘటన:%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 "క�యాలెండర� ఘటన : దీనికి సంక�షిప�తమ�లేద�"
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "క�యాలెండర� దర�శన ఘటన"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "దృష�టిని లాగ�మ�"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "కొత�త నియామకం"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "కొత�త  పూర�తి రోజ� ఘట"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "కొత�త సమావేశం"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "ఈ రోజ� క� వెళ�ళ�"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "తారీఖ� క� వెళ�ళ�"
 
-#: ../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 "ప�రస�త�త సమయ విస�తృతిని దర�శించి ఎంచ�కొనే పట�టిక"
 
 #. 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."
@@ -123,14 +126,14 @@ msgstr[1] "%d ఘటనలన� కలిగి ఉంది"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../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 "దీనికి � ఘటనల� లేవ�"
 
 #. 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 "పనివారమ� దర�శనం: %s. %s"
@@ -138,21 +141,21 @@ msgstr "పనివారమ� దర�శనం: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "రోజ� దర�శనం: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "ఒక వారానికి క�యాలెండర� దర�శనం"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "ఒకటి లేదా కొన�ని రోజ�లకి క�యాలెండర� దర�శనం"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,32 +165,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:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../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: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: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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -196,61 +197,59 @@ 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:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../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: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: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:766
 msgid "Gnome Calendar"
 msgstr "గ�నోమ� క�యాలెండర�"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "వెత�క� పట�టా"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "ఎవల�యూషన� క�యాలెండర� వెత�క� పట�టా"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "దూక� బటన�"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "ఇక�కడ  నొక�కండి, మీక� మరిన�ని ఘటనల� కనబడతాయి"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "నెల దర�శనం: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "వారప� దర�శనం: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "ఒక నెలక� క�యాలెండర� దర�శనం"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "ఒకటి లేదా మరిన�ని వారాలకి క�యాలెండర� దర�శనం"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr " ప�రత�యక�షమ�"
 
 #. 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 "చైల�డ� న� పాప�‌చేయి"
 
@@ -262,12 +261,12 @@ msgstr " సరిచేయ�"
 msgid "begin editing this cell"
 msgstr "ఈ అరన�  సరిచేయడం ప�రారంభించండి"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "మార�ప�"
 
 #. 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 "అరన� మార�చ�మ�"
 
@@ -287,48 +286,48 @@ msgstr "క�ప�పకూల�చ�మ�"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "అరన� కలిగిఉన�న ETree లోని అడ�డ�వర�సన� క�ప�పకూల�చ�మ�"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "పట�టికలో  అర"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c: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 "జతచేయ�టక� నొక�కండి"
 
-#: ../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 "మీటన� నొక�క�మ�"
 
-#: ../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 " చక�కదిద�ద�"
 
-#: ../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"
 
 # ద�, c-format
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "క�యాలెండర�: %s న�ండి %s వరక�"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "ఎవల�యూషన� క�యాలెండర� అంశమ�"
 
-#: ../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 "అప�రమేయాన�ని క�రియాశీలీకరించ�"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "ప�రత�యక�షమయ�యే జాబితా"
 
@@ -342,13 +341,12 @@ msgstr " క�రియాశీలీకరించ�"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{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}' చద�వ�ట-మాత�రమే చిర�నామా ప�స�తకం మరియ� సవరించలేమ�. ప�రక�కపట�టీలోని పరిచయాల "
+"దర�శనంన�ండి వేరొక చిర�నామాప�స�తకంన� యెంచ�కోండి."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -387,25 +385,25 @@ msgid "Could not get schema information for LDAP server."
 msgstr "LDAP సేవిక  క�  మ�ఖ�యాంశ సూచిక  సమాచారం రాలేద�"
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించలేమ�"
 
 #: ../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:12
 msgid "Delete address book '{0}'?"
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించండి '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "చిర�నామా ప�స�తకాన�ని నింపడంలో దోషమ�."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -418,7 +416,7 @@ msgstr "LDAP సేవిక తో à°ªà±�రామాణీకరించడà°
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "పరిచయాన�ని తొలగించడంలో విఫలమయినది"
 
@@ -431,27 +429,22 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP సేవిక    మ�ఖ�యాంశ సూచిక  సమాచారం తో స�పపందించలేద� "
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "అన�మతి తిరస�కరించబడినది."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "సేవిక వివరణమ�"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "మీ ప�రస�త�త  సేవికతో కొన�ని లక�షణాల� సరిగ�గా పనిచేయవ�"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "ఎవల�యూష�న� చిర�నామా ప�స�తకం ఊహించని విధంగా త�యజించబడినది."
 
-#: ../addressbook/addressbook.error.xml.h:23
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+#: ../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:24
+#: ../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 "
@@ -460,55 +453,55 @@ msgstr ""
 "ఈ LDAP సేవిక పాత LDAP వర�షన� న� ఉపయోగిస�త�ండవచ�చ�, �దైతే ఈ ఫంక�షనాలిటినికి మద�దత� నీయదో లేదా ఇది "
 "తప�ప�గాఆకృతీకరించి ఉండవచ�చ�. మద�దత�నిచ�చ� శోధన ఆధారాల కొరక� మీ నిర�వహణాధికారిని సంప�రదించండి."
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "ఈ చిర�నామా ప�స�తకం శాశ�వతంగా తొలగించబడ�త�ంది."
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేకపోయింది."
 
-#: ../addressbook/addressbook.error.xml.h:27
-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 "ఈ చిర�నామా ప�స�తక సేవికక�  తగ�గ వెత�క� మూలాల� లేవ�"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "ఈ చిర�నామా ప�స�తక సేవిక అంద�బాట�లో లేద� లేక సేవిక నామమ�ఉచ�ఛారణలో లోపం జరిగింది  లేక మీ అల�లిక బంధం "
 "డౌన� అయినది."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "ఈ చిర�నామా ప�స�తకం శాశ�వతంగా తొలగించబడ�త�ంది."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ఈ సేవికక� LDAPv3 మ�ఖ�యాంశ సూచిక  సమాచార సహకారం లేద�"
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "చిర�నామ ప�స�తకాన�ని తెరవలేకపోయింది"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "వెతకలేకపోయింది"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} న� దాయలేమ�."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "మీ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "మీర� పరిచయాన�ని ఒక చిర�నామాప�స�తకం న�ండి వేరొక దానికి కద�ల�చ�టక� ప�రయత�నిస�త�న�నార� అయితే ఇది మూలం "
 "న�ండి తొలగించబడద�. మీర� బద�ల�గా ఒక నకల� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -517,6 +510,10 @@ msgstr ""
 "మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� న� ఉపయోగించ�టలో "
 "సమస�యలన� ఎద�ర�కోవచ�చ�. మంచి ఫలితాలకొరక� సేవిక మద�దతీయబడ� వర�షన� క� నవీకరింబడవలెన�"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "ఈచిర�నామా ప�స�తకంన�ండి పరిచయాలన� తొలగించ�టక� మీర� అన�మతినికలిగిలేర�."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -524,11 +521,10 @@ msgid ""
 msgstr "ఈ పరిచయానికి మీర� సవరింప�ల� చేసార�. మీర� ఈ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ఎవాల�యూషన� ప�నఃప�రారంభించ�నంతవరక� {0} కొరక� మీ పరిచయాల� అంద�బాట�లోకి రావ�."
 
-#: ../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
@@ -551,9 +547,9 @@ msgstr "ప�న: పరిమాణమ�(_R)"
 msgid "_Use as it is"
 msgstr "ఎలా ఉందో అలా ఉపయోగించ�మ�(_U)"
 
-#. 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:44
-#: ../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}"
 
@@ -562,17 +558,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "అప�రమేయ కాలనియమిత చిర�నామా:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "చిర�నామా ప�స�తకాన�ని నింపలేకపోయింది"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "చ�క�కానిల చిర�నామా కార�యక�షేత�ర భాగమ�న� చదవలేకపోయినది"
 
@@ -594,10 +590,10 @@ msgstr "à°¸à±�వయంచాలకంగా పూరà±�తిచేయటాà°
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "పరిచయాల�"
 
@@ -606,7 +602,7 @@ msgid "Evolution Address Book"
 msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం చిర�నామా పాప�అప�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -622,7 +618,7 @@ msgid "Evolution Address Book component"
 msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం మూలకం"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "ఎవాల�యూషన� S/Mime దృవీకరణపత�రం నిర�వాహకి నియంత�రిక"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -637,12 +633,13 @@ msgstr "మీ S/MIME దృవీకరణపత�రాలన� ఇక�క
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:584 ../calendar/gui/migration.c:1098
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216
+#: ../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
 msgid "On This Computer"
 msgstr "ఈ కంప�యూటర� పైన"
 
@@ -655,122 +652,125 @@ msgstr "ఈ కంప�యూటర� పైన"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:592 ../calendar/gui/migration.c:1106
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "వ�యక�తిగత"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP సేవికలపై"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
-msgstr "పరిచయం(_C)"
+msgstr "పరిచయం (_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "కొత�త పరిచయాన�ని సృష�టించ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
-msgstr "పరిచయాల జాబితా(_L)"
+msgstr "పరిచయాల జాబితా (_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "కొత�త పరిచయ జాబితాని సృష�టించ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "కొత చిర�నామా ప�స�తకం"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
-msgstr "చిర�నామా ప�స�తకం(_B)"
+msgstr "చిర�నామా ప�స�తకం (_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "కొత చిర�నామా ప�స�తకాన�ని సృష�టించ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "చిర�నామా ప�స�తక అమరికల� లేక సంచయాలన� తాజాపర�చ�టలో విఫలం"
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "మూలం"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "à°°à°•à°‚(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
-msgstr "లైన�లో లేని కార�యమ� కై  స�థానికంగా ప�స�తక సారాన�ని నకల� తీయ�మ�(_b)"
+msgstr "ఆఫ�‌లైన� ఆపరేషన�‌కొరక� ప�సక�తం సారమ�న� స�థానికంగా నకల�తీయ�మ� (_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "సాధారణ"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "చిర�నామా ప�స�తకం"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "సేవిక సమాచారం"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "ప�రామాణీకరణ"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "వివరాల�"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "వెత�క�త�న�నది"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "దిగ�మతి అవ�త�న�నది"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "చిర�నామ ప�స�తకం లక�షణాల�"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "వలసపోతూ వ�న�న..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "వలసపోతూవ�న�న `%s':"
+msgid "Migrating '%s':"
+msgstr "వలసపోతూవ�న�న '%s':"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -821,71 +821,76 @@ msgstr ""
 "\n"
 "ఎవాల�యషన� మీ పైలెట� సింక� డాటా న� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" సంచయాన�ని దీనికి ప�నఃనామకరణ చేయ�మ�:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "సంచయాన�నిప�నర�నామకరణ చేయ�మ�"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "సంచయనామమ�ల� '/' న� కలిగిఉండలేవ�"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "కొత చిర�నామా ప�స�తకం(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
-msgstr "Vపలకంగా దాయ�మ�..."
+msgstr "Vకార�డ�� లాగా దాయ�మ�..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../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
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../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 "తొలగించ�(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "లక�షణాల�(_P)..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "లక�షణాల�(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "వనర�ల ఎంపికదార�న�ని సంప�రదించ�మ�"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP సేవికన� అనామకంగా సాంగత�యం చేస�త�న�నది"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../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 "ప�రమాణీకరించడంలో విఫలం.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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 "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "రహస�య పదమ�న� ప�రవేశపెట�టండి"
 
@@ -905,8 +910,7 @@ msgstr "పూర�తైన URIs జాబితా కొరక� EFolderLis
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr ""
-"కార�డ� మరియ� జాబితా దర�శని మరియ� ఉపదర�శనం తలం క� మద�య, నిల�వ�తలం యొక�క స�థానమ�, పిగ�జెల�స� లో."
+msgstr "కార�డ� మరియ� జాబితా దర�శని మరియ� ఉపదర�శనం తలం క� మద�య, నిల�వ�తలం యొక�క స�థానమ�, పిగ�జెల�స� లో."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
@@ -960,38 +964,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>ప�రామాణీకరణ</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>ప�రదర�శించ�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>దిగ�మతి అవ�త�న�నది</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>వెత�క�త�న�నది</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>సేవిక సమాచారం</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>à°°à°•à°‚:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "చిర�నామ ప�స�తకాన�ని జతచేయ�మ�"
 
-#: ../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:761
 msgid "Always"
 msgstr "యెల�లప�ప�డ�"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "అనామకంగా"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "పరిమితిని చేర�దాకా ఈప�స�తకంన� అన�వేషించ�మ� (_r)"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "మూలం"
@@ -1005,8 +1006,7 @@ msgid "Email address"
 msgstr "ఈ మెయిల� చిర�నామ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "సేవికతో మిమ�మ�లని ప�రామాణీకరించ�టక� ఎవల�యూషన� ఈ ఈ మెయిల� చిర�నామాన� ఉపయోగిస�త�ంది "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1018,14 +1018,14 @@ msgid "Lo_gin:"
 msgstr "ప�రవేశమ�(_g):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "ఎప�పటికివద�ద�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "ఎన�క�రిప�షన� లేద�"
 
@@ -1037,7 +1037,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL ఎన�క�రిప�షన�"
 
@@ -1103,7 +1103,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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS ఎన�క�రిప�షన�"
 
@@ -1195,8 +1195,8 @@ msgid "_Login method:"
 msgstr "ప�రవేశ పద�దతి(_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1211,7 +1211,7 @@ msgid "_Search scope:"
 msgstr "వెత�క� లక�ష�యం(_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "సేవిక(_S):"
@@ -1232,9 +1232,10 @@ msgstr "పలకాల�"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "నిమిషాల�"
 
@@ -1275,7 +1276,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1287,16 +1288,16 @@ msgid "Ca_tegories..."
 msgstr "విభాగాల�(_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "చిర�నామా"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "చిర�నామా సరిచేయ�నది"
 
@@ -1309,7 +1310,7 @@ msgid "Image"
 msgstr "ప�రతిరూపం"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN మెసేంజర�"
 
@@ -1318,12 +1319,11 @@ msgid "Mailing Address"
 msgstr "మెయిల� చేసే చిర�నామా"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#, fuzzy
 msgid "Nic_kname:"
-msgstr "మ�ద�ద� పేర�(_k):"
+msgstr "నిక� నేమ� (_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "సమూహరీతిగా Novell"
 
@@ -1337,11 +1337,11 @@ msgstr "దూర సంవాదక యంత�రమ�"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "పని"
 
@@ -1363,8 +1363,8 @@ msgid "_Birthday:"
 msgstr "ప�ట�టిన రోజ�(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "క�యాలెండర�(_C):"
@@ -1453,1119 +1453,1121 @@ msgstr "ఎక�కడ(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "జిప� కోడ�(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "చిర�నామా"
 
-#: ../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:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "సరిచేయగలిగినది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "య�నైటెడ� స�టేట�స� ఆఫ� అమెరికా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "ఆఫ�ఘనిస�తాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "అల�బేనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "అల�జీరియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "అమెరికన� సమోవా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "అండోరా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "అంగోలా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "అంగ�ల�లా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "అంటార�కిటికా"
 
-#: ../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 "అంటిగ�వా మరియ� బర�బ�డా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "అర�జెంటీనా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "అర�మేనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "అర�బా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "ఆస�ర�టేలియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "ఆస�ర�టియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "అజర� బైజాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "బహమాస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "బహ�రెయిన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "బంగ�లాదేశ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "బర�బడోస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "బెలారస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "బెల�జియం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "బిలైజ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "బెనిన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "బెర�మ�డా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "భూటాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "బొలీవియా"
 
-#: ../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 "బోస�నియా మరియ� హెర�జ�గొవినా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "బొత�స�వానా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "బావెట� దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "బ�రెజిల�"
 
-#: ../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 "హిందూ మహాసమ�ద�ర బ�రిటిష� ప�రాంతం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "బ�రూనీ దార�సలేం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "బల�గేరియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "బర�కినా ఫాసో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "బ�ర�ండి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "కాంబోడియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "కామెరూన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "కెనడా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "కేప� వెర�డే"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "కేమన� దీవ�ల�"
 
-#: ../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 "మధ�య ఆఫ�రికన� రిపబ�లిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "చాడ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "చిలీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "చైనా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "క�రిస�టమస� దీవ�ల�"
 
-#: ../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 "కోకోస� (కీలింగ�) దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "కొలంబియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "కొమరోస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "కాంగో"
 
-#: ../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 "కాంగో, ప�రజాతంత�ర రిపబ�లిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "క�క� దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "కోస�టారికా"
 
-#: ../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 "కోట� డి'�వోరి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "క�రోయేషియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "క�యూబా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "సైప�రస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "జెక� రిపబ�లిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "డెన�మార�క�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "డిజిబౌటి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "డొమినికా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "డొమినికన� రిపబ�లిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "ఈక�విడార�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "ఈజిప�ట�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "ఈ సాల�వేడర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "ఈక�వెటోరియల� గయానా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "ఎరిట�రియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "ఎస�టోనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "ఇథియోపియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "ఫాక�‌లాండ� దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "ఫార�వో దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "ఫిజీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "ఫిన�లాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "ఫ�రాన�స�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "ఫ�రెంచ�   గయానా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "ఫ�రెంచ�   పొలినేషియా"
 
-#: ../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 "ఫ�రెంచ�   దక�షిణ ప�రాంతాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "గాబన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "జాంబియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "జార�జియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "జర�మనీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "ఘనా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "గిబ�రాల�టర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "గ�రీస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "గ�రీన�‌లాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "గ�రెనడా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "గొడెలోపి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "గ�వామ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "గ�వటెమల"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "గ�ర�నెసె"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "గనీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "గనీ-బిసావ�"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "గ�య�నియా-బిస�సౌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "గయానా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "హైతీ"
 
-#: ../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 "హర�డ� మరియ� మెక�డోనాల�డ� దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "హోలీ సీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "హాండ�రస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "హాంగ� కాంగ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "హంగరీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "�స� లాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "ఇండియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "ఇండోనేషియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "ఇరాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "ఇరాక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "�ర�లాండ�"
 
-#: ../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 "�సల� ఆఫ� మ�యాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "ఇస�రాయెల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "ఇటలీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "జమైకా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "జపాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "జర�సీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "జోర�డాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "కజకిస�తాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "కెన�యా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "కిరిబాటి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "ఉత�తర కొరియా"
 
-#: ../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 "దక�షిణ కొరియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "క�వైట�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "కిర�గిస�తాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "లావోస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "లాత�వియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "లెబనాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "లెసోతో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "లిబెరియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "లిబియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "లైచెన�‌స�టయిన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "లిథూనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "లగ�జంబర�గ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "మకావో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "మెసిడోనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "మెడగాస�కర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "మలావి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "మలేషియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "మాల�‌దీవ�స�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "మాలి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "మాలతా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "మారసషల� దీవిల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "మార�‌టినిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "మౌరిషానియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "మారిషస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "మాయొటి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "మెక�సికో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "మైక�రోనేషియా"
 
-#: ../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 "మాల�‌డోవా, రిపబ�లిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "మొనాకో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "మంగోలియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "మాంట�‌సెరాట�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "మొరాకో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "మొజాంబిక�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "మ�యాన�‌మార�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "నమిబియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "నౌర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "నెపాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "నెదర�లాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "నెదర�లాండ�స�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "న�యూ కాలిడోనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "న�యూజిలాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "నికరాగోవా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "నైజెర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "నైజీరియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "నియూ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "నార�ఫోక� దీవ�ల�"
 
-#: ../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 "నార�తెన� మారియానా దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "నార�వే"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "ఒమాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "పాకిస�తాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "పలావ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "పాలస�తీన ప�రాంతం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "పనామా"
 
-#: ../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 "పపావ� న�యూ గయాని"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "పెర�గ�వే"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "పెర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "ఫిలిపైన�స�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "పిట�కెర�న�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "పోలాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "పోర�చగల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "పోర�టొ రికో"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "కతర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "రియ�నియన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "రొమానియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "రషియన� ఫెడరేషన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "ర�వాండా"
 
-#: ../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 "సేంట� కిట�స� మరయ� నెవీస�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "సేంట� లూసియా"
 
-#: ../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 "సేంట� విన�సెంట� మరయ� గ�రెనేడైన�స"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "సమొవా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "సాన� మారినో"
 
-#: ../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 "సావో టోమ� మరియ� ప�రింన�సిప�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "సౌది అరిబియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "సెనెగల�"
 
-#: ../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 "సెర�బియా మరియ� మౌంటినెగ�రొ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "సెషెల�స�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "సియరా లియొన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "సింగపూర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "స�లోవేకియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "స�లొవేనియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "సోలొమన� దీవూల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "సొమాలియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "సౌత� ఆఫ�రికా"
 
-#: ../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 "సౌత� జార�జియా మరియ� సౌత� సాండ�విచ�   దీవూల"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "స�పేయిన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "శ�రీ లంక"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "సేంట� హెలీనా"
 
-#: ../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 "సేంట�. పియారా మరియ� మకాలన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "స�డాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "స�రినేమ�"
 
-#: ../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 "స�వాలబర�డ� మరియూ జాన� దీవూల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "స�వాజిలాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "స�విడెన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "స�విట�జర�లాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "సిరియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "తైవాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "తజకిస�తాన�"
 
-#: ../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 "తాన�జానియా, య�నైటెడ� రిపబ�లిక� ఆఫ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "తైలాండ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "టైమర�-లెస�టి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "టోగొ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "టొకెలౌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "టాంగో"
 
-#: ../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 "ట�రినిడాడ� మరియూ టొబాగొ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "ట�నిషియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "టర�కీ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "త�ర�కమెనిస�తాన�"
 
-#: ../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 "త�ర�క�స మరియ� కైకోస� దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "త�వాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "ఉగాండా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "ఉక�రేయన�"
 
-#: ../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 "య�నైటెడ� అరబ� ఎమిరేట�స"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "య�నైటెడ� కింగ�-డం"
 
-#: ../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 "య�నైటెడ� స�టేట�స మైనర� ఔట�‌లైంగ� దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "ఉర�గ�వే"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "ఉజబేకిస�తాన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "వానౌట�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "వెనెజ�వేల"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "వియత�నాం"
 
-#: ../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 "వర�జిన� దీవ�ల�, బ�రిటీష�"
 
-#: ../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 "వర�జిన� దీవ�ల�, య�ఎస�"
 
-#: ../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 "వాలిస� మరియ� ఫ�టూనా దీవ�ల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "పశ�చిమ సహారా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "యెమన�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "జాంబియా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "జింబాబ�వే"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "నామమ�"
 
-#: ../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 "AOL తక�షణ మెసెంజర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "జాబర�"
 
-#: ../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
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu మెసేంజర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 " సేవ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "స�థానమ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "వినియోగదార�ని నామం"
 
-#: ../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:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "నివాసం"
 
-#: ../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:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "యాహూ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "గ�రూప�ల వారీగా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "వనర� ప�స�తకం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "గమ�య ప�స�తకం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "ఇది కొత�త  పరిచయం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "రాయదగ� క�షేత�రాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "అవసరమైన క�షేత�రాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "మార�చినది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "పరిచయాన�ని సరిచేయ�నది-%s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "ఈ పరిచయమ�నక�   దయచేసి ఒక ప�రతిరూపమ�న� ఎంపిక చేయండి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "ప�రతిరూపం లేద�(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2573,47 +2575,47 @@ msgstr ""
 "పరిచయాల దత�తాంశం నిస�సారమైనది:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' యొక�క రూపలావణ�యం నిస�సారమైనది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' యొక�క రూపలావణ�యం నిస�సారమైనది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ఖాళీ గా ఉంది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "నిస�సారమైన పరిచయం"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "పరిచయాన�ని త�వరితంగా-జతచేయ�నది"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "పూర�తిగా సరిచేయ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "పూర�తి నామం(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "ఈ-తపాలా(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "కొత చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2622,7 +2624,7 @@ msgstr ""
 "మీర� ఖచ�చితంగా పరిచయ\n"
 "జాబితాన� తొలగిద�దామన�క�ంట�న�నారా (%s)? "
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2630,7 +2632,7 @@ msgstr ""
 "మీర� ఖచ�చితంగా ఈ పరిచయ\n"
 "జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2639,7 +2641,7 @@ msgstr ""
 "మీర� ఖచ�చితంగా పరిచయాన�ని\n"
 "తొలగిద�దామ�న�క�ంట�న�నారా (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2747,7 +2749,7 @@ 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:242
+#: ../plugins/exchange-operations/exchange-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "స�థానమ�(_L):"
@@ -2757,14 +2759,13 @@ msgid "<b>Members</b>"
 msgstr "<b>సభ�య�ల�</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 "జాబీతా సరిచేయ�వాన�ని సంప�రదించ�మ�"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#, fuzzy
 msgid "Select..."
-msgstr "ఎంపికచేయ�మ�(_e)..."
+msgstr "ఎంపికచేయ�..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
@@ -2778,27 +2779,28 @@ msgstr "జాబితా పేర�(_L):"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ఈమెయిల� చిర�నామాన� రాయ�మ� లేదా దాన�ని పరిచయాన�ని క�రింది జాబితాలో కి జరపండి(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "పరిచయస�త�ల జాబితా సభ�య�ల�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "సభ�య�ల�(_M)"
+
+#: ../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:390
-#: ../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/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "ప�స�తకం"
 
-#: ../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 "కొత�త జాబీతా"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "సభ�య�ల�(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "మార�చిన చిర�నామా:"
@@ -2813,13 +2815,12 @@ msgid "Duplicate Contact Detected"
 msgstr "పరిచయం యొక�క నకల�న� కనిపెట�టింది"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-#, fuzzy
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"ఈ పరిచయం యొక�క నామమ� లేదా ఈమెయిల� చిర�నామా ఈ సంచయం\n"
-"నంద� ఇప�పటికే ఉంది.  మీర� దీనిని �విధంగానైనా జతచేయాలని అన�క�ంట�న�నారా?"
+"ఈపరిచయంయొక�క నామమ� లేదా ఈమెయిల� యిప�పటికే ఈఫోల�డర�‌నంద� వ�ంది.  అయినా మీర�దీనిని "
+"జతచేద�దామని అన�క�ంట�న�నారా?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2837,41 +2838,40 @@ msgstr ""
 "ఈ పరిచయం యొక�క నామమ� లేదా ఈమెయిల� చిర�నామా ఈ సంచయం\n"
 "నంద� ఇప�పటికే ఉంది.  మీర� దీనిని �విధంగానైనా జతచేయాలని అన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
+msgid "_Merge"
+msgstr "విలీనం (_M)"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "పరిచయాన�ని విలీనంచేయి"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
-#, fuzzy
-msgid "_Merge"
-msgstr "విలీనం(_M)"
-
-#: ../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:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ఈ-తపాలా"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81 ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "దీనితో ఈ-తపాలా మొదలౌత�ంది"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "దీనితో నామం మొదలౌత�ంది"
+msgid "Name contains"
+msgstr "దీనిని కలిగివ�న�ననామమ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2885,10 +2885,10 @@ msgstr[0] "%d చిర�నామా"
 msgstr[1] "%d చిర�నామాల�"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "ప�రశ�న"
 
@@ -2896,123 +2896,119 @@ msgstr "ప�రశ�న"
 msgid "Error getting book view"
 msgstr "ప�స�తక దర�శనం తీస�క�వచ�చ�టలో దోషమ�"
 
-#: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../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:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "ఆకృతి"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "పలకం మార�చ�ట లో దోషం"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "దీనితో నామం మొదలౌత�ంది"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "వనర�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "à°°à°•à°‚"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Vపలకంగా దాయ�మ�..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "తెర�వ�మ�(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "కొత�త పరిచయం(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "కొత�త చిర�నామాల జాబితా(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "Vపలకంగా దాయ�మ�(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "చిర�నామాన�ని మ�ందికిపంప�(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "చిర�నామాలని మ�ంద�క� పంప�(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "చిర�నామాక� సందేశం పంప�(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "జాబితాక� సందేశం పంప�(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "చిర�నామాలక� సందేశం పంప�(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "మ�ద�రణ(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "చిర�నామా ప�స�తకం క� నకల�తీయ�(_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "చిర�నామా ప�స�తకంక� కదిపించ�(_v)..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "కట�(_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3099 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../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
 #: ../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 "నకల�(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "అతికించ�(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../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
 msgid "Any Category"
 msgstr "�దైన విభాగం"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "ఇతర దోషమ�"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3044,7 +3040,7 @@ msgstr "కార� ఫోన�"
 
 #: ../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
@@ -3145,9 +3141,9 @@ msgid "Radio"
 msgstr "రేడియో"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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 "పాత�ర"
 
@@ -3183,38 +3179,38 @@ msgid "Web Site"
 msgstr "మయాతల ప�రదేశం"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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
 msgid "Width"
 msgstr "వెడల�ప�"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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
 msgid "Height"
 msgstr "ఎత�త�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "కేంద�రీకరించెన�"
 
@@ -3234,11 +3230,21 @@ msgstr "పాఠ�య నమూనా"
 msgid "Max field name length"
 msgstr "అత�యధిక క�షేత�ర నామపొడవ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "నిల�వ� పట�టీ వెడల�ప�"
 
-#: ../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"
+"పరిచయాలకొరక� శోధిస�త�న�నది..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3252,7 +3258,7 @@ msgstr ""
 "\n"
 "కొత�త చిర�నామా సృష�టించ�టక� ఇక�కడ రెండ�సార�ల�-నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3266,7 +3272,7 @@ msgstr ""
 "\n"
 "కొత�త చిర�నామా సృష�టించ�టక� ఇక�కడ రెండ�సార�ల� నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3282,7 @@ msgstr ""
 "\n"
 "చిర�నామా కొరక� వెత�క�మ�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3286,40 +3292,41 @@ msgstr ""
 "\n"
 "ఈ దర�శనిలో చూప�టక� అంశాల� లేవ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "ఇమ�డ�చ�నది"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "పని ఈమెయిల�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "నివాసం ఈమెయిల�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "ఇతర ఈమెయిల�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "ఎంపికచేయబడ�డ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "మ�ల�క� ఉన�నది"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "అన�వేషి లో జోడికన� తెర�వ�మ�(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "జోడిక స�థానాన�ని నకల� తీయ�మ�(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "కొత�త సందేశాన�ని ఇక�కడకి పంపించ�మ�(_S)..."
 
@@ -3341,7 +3348,7 @@ msgid "map"
 msgstr "పటం"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "సభ�య�ల జాబితా"
 
@@ -3362,25 +3369,23 @@ msgid "Video Chat"
 msgstr "దృశ�య మాటామంతి"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../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-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 "క�యాలెండర�"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "ఖాళీ/తీరిక లేని"
 
@@ -3402,152 +3407,164 @@ msgid "Web Log"
 msgstr "మహాతలంలో నమోద�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "వార�షీకోత�సవం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "కార�య శీర�షిక"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "నివాసప�ట"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "బ�లాగ�"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "విజయం"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "పూర�వరంగం తీరిగ�గాలేద�"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "ఉంచ�స�థలమ� లైన�లోలేద�"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "చిర�నామా ప�స�తకం లేద�"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "చిర�నామా కనబడ�టలేద�"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "చిర�నామా ID ఇదివరకే వ�న�నది"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "ఈ ప�రొటోకాల� క� సహకారంలేద�"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "రద�ద�చేయబడినది"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "రద�ద� చేయలేకపోయింది"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "ప�రామాణీకరణ విఫలం చెందింది"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "ప�రామాణీకరణ అవసరం"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS లభ�యంకావడంలేద�"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "ఇట�వంటి వనర� లేద�"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "లైన�వెల�పలి సంవిధానం అంద�బాట�లో లేద�"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "ఇతర దోషమ�"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "చెల�లని సేవిక వర�షన�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "మద�దతివ�వని ధృవీకరణ పద�దతి"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "మేమ� ఈ చిర�నామాప�స�తకాన�ని తెర�వలేమ�.  దయచేసి పాత� %s ఉందేమో మరియ� మీక� వాడ�కొన�టక� అన�మతి ఉందేమో "
 "పరిశీలించ�మ�."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�ధం మీర� సరికాని URI అయినా ప�రవేశపెట�టి ఉండాలి, లేదా LDAP "
 "సేవిక అంద�బాట�లో ఉండకపోవచ�చ�."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3556,77 +3573,81 @@ msgstr ""
 "ఈ వర�షన� ఎవాల�యూషన� LDAP సేవిక కంపైలేషన� న� కలిగిలేద�. మీర� ఎవాల�యూషన� న� LDAP నంద� ఉపయోగించాలి "
 "అన�క�ంటే, మీర� LDAP-చేతనపరిచిన ఎవాల�యూషన� న� సంస�థాపించాలి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�ధం మీర� సరికాని URI ని ప�రవేశపెట�టి ఉండాలి, లేదా సేవిక "
 "అంద�బాట� లో లేకపోయిఉండాలి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "విశదీకృత దోషమ�:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "ఈ క�వరీకి చాలా కార�డ�ల� జతక�దిరినవి సేవిక తిరిగిపంపించ�టక� ఆకృతీకరించి ఉండాలి\n"
 "లేదా ఎవాల�యూషన� ప�రదర�శన క� ఆకృతీకరించబడిఉండాలి. దయచేసి మీ శోధనన� ఎక�క�వ\n"
 "ప�రత�యేకం చేయాలి లేదా ఫలితాల పరిమితిని సంచయం సేవిక అభీష�టాలంద�\n"
 "ఈ చిర�నామాప�స�తకం కొరక� ఉచ�చమ� చేయండి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "ఈ క�వరీ ని నిర�వర�తించ�టక� సేవిక పరిమిత సమయంన� మించిపోయింది లేదా\n"
 "ఈ చిర�నామా ప�స�తకంక� మీర� ఆకృతీకరించిన పరిమితి మించిపోయింది. దయచేసి\n"
 "మీ శోధనన� ఎక�క�వ ప�రత�యేకం చేయ�మ� లేదా ఈ చిర�నామా ప�స�తకం కొరక� సంచయం సేవిక\n"
 "అభీష�టాల సమయ పరిమితిని ఉచ�చమ� చేయండి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "ఈ ప�రశ�న విజయవంతంగా పూర�తికాలేకపోయింది."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "జాబితాన� జతపర�చ�టలో దోషం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "చిర�నామాన� జతపర�చ�టలో దోషం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "జాబితాన� మార�చ�టలో దోషం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "చిర�నామా మార�చ�టలో దోషం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "జాబితాన� తీసివేయ�టలో దోషం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "చిర�నామా తీసివేయ�టలో దోషం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3641,16 +3662,16 @@ msgstr[1] ""
 "%dచిర�నామాలన� తెరచినప�ప�డ�  %dకొత�త గవాక�షాల� కూడా  తెరచ�క�ంటాయి.\n"
 "మీర� నిజంగా  ఈ చిర�నామాలన� ప�రదర�శించాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "ప�రదర�శించ వద�ద�(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "అన�ని పరిచయాలన� ప�రదర�శించ�మ�(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3659,70 +3680,70 @@ msgstr ""
 "%s ఇదివరకే వ�న�నది\n"
 "మీర� చెరిపి రాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "చిర�నామా"
 msgstr[1] "చిర�నామాల�"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "జాబితా"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "చిర�నామాన� ఇక�కడికి జర�ప�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "చిర�నామాన� ఇక�కడికి నకల�తీయ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "చిర�నామాలన� ఇక�కడికి జర�ప�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "చిర�నామాలన� ఇక�కడికి నకల� తీయ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
-msgstr "బహ�ళ Vపలకాల�"
+msgstr "బహ�ళ Vకార�డ�స��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#, c-format
 msgid "vCard for %s"
-msgstr "%s కొరక� Vపలకం"
+msgstr "%s కొరక� Vకార�డ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#, c-format
 msgid "Contact information"
 msgstr "చిర�నామా సమాచారం"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s కొరక� చిర�నామా సమాచారం"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr " చిర�నామా ప�స�తకాన�ని ప�రశ�నిస�త�న�నది......."
 
@@ -3735,72 +3756,68 @@ msgstr[1] "అక�కడ %d ఇతర చిర�నామాల� ఉన�
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
 #: ../addressbook/gui/widgets/eab-vcard-control.c:279
-#, fuzzy
 msgid "Show Full vCard"
 msgstr "పూర�తి Vకార�డ� చూపించ�మ�"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:232
-#, fuzzy
 msgid "Show Compact vCard"
 msgstr "సూక�ష�మ Vకార�డ� చూపించ�మ�"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "చిర�నామా ప�స�తకం లో దాచ�మ�"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr " పలక దర�శనం"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ఎగ�మతిచేస�త�న�నది..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "అవ�ట�‌ల�క� CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "అవ�ట�‌ల�క� CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "మొజిల�లా CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "మొజిల�లా CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ఎవాల�యూషన� CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "ఎవాల�యూషన� CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP దత�తాంశ పరస�పరమార�పిడి రూపలావణ�యం (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "ఎవల�యూషన� LDIF దిగ�మతిచేయ�నది"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-#, fuzzy
 msgid "vCard (.vcf, .gcrd)"
-msgstr "vపలకం (.vcf, .gcrd)"
+msgstr "vకార�డ�� (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-#, fuzzy
 msgid "Evolution vCard Importer"
-msgstr "ఎవల�యూషన� Vపలకం దిగ�మతిచేయ�నది"
+msgstr "ఎవల�యూషన� Vకార�డ�� దిగ�మతిచేయ�నది"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3843,12 +3860,12 @@ msgid "Format"
 msgstr "రూపలావణ�యం"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "పీఠిక"
 
@@ -3950,8 +3967,8 @@ msgstr "ఛాయవేయ�ట"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "పరిమాణమ�:"
@@ -3969,7 +3986,7 @@ msgid "Top:"
 msgstr "ఎగ�వన:"
 
 #: ../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 "రకమ�:"
 
@@ -3981,35 +3998,35 @@ msgstr "వెడల�ప�:"
 msgid "_Font..."
 msgstr "అక�షరశైలి(_F)..."
 
-#: ../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 " "
 
-#: ../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 "నకల� హక�క� (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 "చిర�నామా మ�ద�రించ� శైలి సరిచేయ� విడ�జెట� న� పరీక�షించాలి"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "చిర�నామా మ�ద�రణ పరీక�ష"
 
-#: ../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:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "దస�త�రమ�న� తెరవలేమ�"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "చిర�నామా ప�స�తకాల జాబితా రాలేద�"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4025,7 +4042,7 @@ msgid "OUTPUTFILE"
 msgstr "దిగ�బడి దస�త�రమ�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "స�థానిక చిర�నామా ప�స�తక సంచయాల జాబితాపర�చ�మ�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4051,8 +4068,7 @@ msgid "NUMBER"
 msgstr "సంఖ�య"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "ఆదేశవాక�య క�రమాన�గత సంకేతాల దోషం, దయచేసి వాడకాన�ని చూడటానికి --సహాయ ఇచ�చాపూర�వకాన�ని వాడండి"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:116
@@ -4073,15 +4089,23 @@ msgstr "సంభాలించని దోషం"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{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}' చద�వ�ట-మాత�రమే క�యాలెండర� మరియ� సవరించలేమ�. ప�రక�కపట�టీలోని క�యాలెండర� "
+"దర�శనంన�ండి వేరొక క�యాలెండర�‌న� యెంచ�కోండి."
 
-#: ../calendar/calendar.error.xml.h:3
+#. 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}' చద�వ�ట-మాత�రమే క�యాలెండర� మరియ� సవరించలేమ�. అపాయింట�‌మెంట�స��‌న� "
+"ఆమోదించే వేరొక క�యాలెండర�‌న� యెంచ�కొన�మ�."
+
+#: ../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."
@@ -4089,7 +4113,7 @@ msgstr ""
 "మీ నియామకంఅర�జీ నంద� అర�దవంతమైన సంక�షిప�తాన�ని జతచేసి నట�లైతే అది మీ అర�జీని స�వీకరించ� వారికి మీ నియామకం "
 "ఎంద�కొరకో ఒక అభిప�రాయాన�ని ఇస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -4097,280 +4121,278 @@ msgstr ""
 "మీ కర�తవ�యంక� అర�ధవంతమైన సంక�షిప�తాన�ని జతపరిచినట�లైతే అది మీ స�వీకరణదార�లక� మీ కర�తవ�యం గ�రించి ఒక "
 "అభిప�రాయం ఇస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:5
-#, fuzzy
+#: ../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:6
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr "ఈ మెమోలలోని సమాచారం అంతా తొలగించబడ�త�ంది మరియ� తిరిగినిల�వచేయబడద�."
+msgstr "ఈ మెమోలోని సమాచారం అంతా తొలగించబడ�త�ంది మరియ� తిరిగినిల�వచేయబడద�."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../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:8
+#: ../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:9
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"All information on this appointment will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:11
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "All information on this appointment will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "మీర� ఖచ�చితంగా '{0}' కర�తవ�యాన�ని తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "మీర� నియామకం శీర�షిక '{0}' న� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:15
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "మీర� ఖచ�చితంగా ఈ మెమోన� తొలగించ�దామని అన�క�ంట�న�నారా?"
+msgstr " మీర� నిజంగా మెమో '{0}' న� తొలగించాలని అక�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "మీర� ఖచ�చితంగా ఈ '{0}' నియామకాలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "మీర� ఖచ�చితంగా ఈ '{0}' మెమోలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "మీర� ఖచ�చితంగా ఈ '{0}' కర�తవ�యాలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "మీర� ఖచ�చితంగా ఈ నియామకాన�ని తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr " మీర� నిజంగా ఈ సమావేశాన�ని రద�ద� చేయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
+#, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "మీర� ఖచ�చితంగా ఈ మెమోన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని రద�ద� చేయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "మీర� ఖచ�చితంగా మెమోన� సంక�షిప�తం లేక�ండా దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "మీర� ఖచ�చితంగా సంక�షిప�తం లేక�ండా నియామకాన�ని పంపాలని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని సంక�షిప�తమ� లేక�ండా పంపించాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "కొత�త సంఘటనన� సృష�టించలేమ�"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "ఘటనన� భద�రపరచలేమ�"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "క�యాలెండర� న� తొలగించ�మ� '{0}'"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "మెమో జాబితా '{0}' న� తొలగించ�మ�?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "కర�తవ�యాల జాబితాన� తొలగించ�మ� '{0}'"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "పంపించ వద�ద�(_n)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "దిగ�మతి జర�గ�తోంది. మీర� నియామకాన�ని దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "దిగ�మతి ప�రోగమనంలో ఉంది. మీర� ఈ కర�తవ�యాన�ని దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "సరికూర�పరి లోడ�కాలేకపోయింది."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../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:35
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+#: ../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:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "క�యాలెండర� లోడింగ� లో దోషం"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "మెమో జాబితాన� నింప�టలో దోషం"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "కర�తవ�య జాబితాన� నింప�టలో దోషం"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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:40
-#, fuzzy
+#: ../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 "మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గొంట�న�న మిగతా వారికి కర�తవ�యం రద�దైన సంగతి తెలియద�."
+msgstr ""
+"మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గోంట�న�న మిగతావారికి మెమో రద�దయిన సంగతి "
+"తెలియకపోవచ�చ�."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr ""
-"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి క�యాలెండర�లన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
+msgstr "తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి క�యాలెండర�లన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr ""
-"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి కర�తవ�య జాబితాలన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
+msgstr "తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి కర�తవ�య జాబితాలన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "కొన�ని అన�భందాల� దిగ�మతైనవి. నియామకాల న� దాచ�ట ఈ అన�భందాల నష�టంలో ప�రతిఫలిస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "కొన�ని అన�భందాల� దిగ�మతైనవి. కర�తవ�యాన�ని దాచ�ట ఈ అన�భందాల నష�టంలో ప�రతిఫలిస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "మీ ప�రస�త�త సేవికతో కొన�ని లక�షణాల� సరిగ�గా పనిచేయవ�"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ఎవల�యూషన� క�యాలండర� ఊహించని విధంగా త�యజించబడినది."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ఎవాల�యూషన� మెమో ఊహించని విధంగా త�యజించబడింది."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ఎవల�యూషన� కర�తవ�యాల� ఊహించని విధంగా త�యజించబడ�డాయి."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "లైన� వెల�పలి ఉపయోగానికి క�యాలెండర� గ�ర�తించబడలేద�"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "మెమో జాబితా ఆఫ�‌లైన� ఉపయోగానికి సూచించబడలేద�"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "మెమో జాబితా ఆఫ�‌లైన� వ�పయోగానికి గ�ర�త�ంచబడిలేద�."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "లైన� వెల�పలి ఉపయోగానికి కర�తవ�యాల జాబితా గ�ర�తించబడలేద�"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "ఈ క�యాలెండర� శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "మెమో జాబితా శాశ�వతంగా తొలగించబడ�తోంది."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "ఈ కర�తవ�య జాబితా శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ఈ నియామకానికి మీ మార�ప�లన� దాయాలన� క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "ఈ మెమోక� మీర� చేసిన మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
 #
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "మీర� ఈ కర�తవ�యానికి మార�ప�లన� దాయదల�చ�క�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:59
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "మీర� రద�ద� నోటీస�న� ఈ మెమో కొరక� పంప�దామని అన�క�ంట�న�నరా?"
+msgstr "మీర� రద�ద� నోటీస�న� ఈమెమో కొరక� పంప�దామని అన�క�ంట�న�నరా?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "మీర� పాల�గొన�వారందరికి రద�ద� నోటీస�న� పంప�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "పాల�గొన�నవారికి సమావేశానికి ఆహ�వానాలన� పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "పాల�గొన�నవారికి మీర� ఈ  కర�తవ�యాన�ని పంప�తారా? "
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "పాల�గొన�నవారికి తాజా సమావేశ సమాచారాన�ని పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "పాల�గొన�నవారికి తాజా కర�తవ�య సమాచారాన�ని పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4379,107 +4401,107 @@ msgstr ""
 "మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� ఉపయోగించ�టలో సమస�యన� "
 "ఎద�ర�క�ంటార�. మంచి ఫలితాల కొరక�, సేవిక తప�పక మద�దతివ�వబడ� వర�షన� క� నవీకరించబడలి."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "మీర� ఈ నియామకాన�ని మార�చినార�, కాని ఇంతవరక� దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "మీర� ఈ  కర�తవ�యాన�ని మార�చార� కాని ఇంకా దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "మీర� ఈ మెమోక� మార�ప�ల� చేసినార�, అయితే ఇంతవరక� దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ఎవల�యూషన� ప�న:ప�రారంభమయ�యేవరక� మీ క�యాలెండర�స� అంద�బాట�లో ఉండవ�."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ఎవాల�యూషన� ప�నఃప�రారంభమయ�యేవరక� మీ మెమోల� అంద�బాట�లోకి రావ�."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ఎవల�యూషన� ప�న:ప�రారంభమయ�యేవరక� మీ కర�తవ�యాల� అంద�బాట�లో ఉండవ�."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "మార�ప�లన� తీసివేయ�మ�(_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "దాయ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "మార�ప�లన� దాయ�మ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "పంప�మ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "తాఖీద� ని పంప�మ� (_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "బహ�-రోజ� ఘటనలన� విభజించ�:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "ఎవల�య�షన�-దతాంశ-సేవిక న� ప�రారంభించలేకపోయింది"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "చ�క�కానీల క�యాలెండర� కార�యక�షేత�ర భాగమ�న� చదవలేకపోయింది"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "పైలట� యొక�క మెమో అన�వర�తనం భాగమ�న� చద�వలేకపోయింది"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "పైలట� యొక�క మెమో అన�వర�తనం భాగమ�న� వ�రాయలేక పోయింది"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "ఆప�రమేయ ప�రాధాన�యం:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "చ�క�కానీల చేయవలసిన కార�యక�షేత�ర భాగమ�న� చదవలేకపోయింది"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "పైలట� యొక�క చేయవలిసిన అన�వర�తనాల భాగమ�నక� వ�రాయలేకపోయింది"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "క�యాలెండర� మరియ� కర�తవ�యాల�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "క�యాలెండర� ల�"
 
@@ -4520,25 +4542,25 @@ msgid "Memo_s"
 msgstr "మెమోస�(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "మెమోస�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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: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 "కర�తవ�యాల�"
@@ -4556,25 +4578,26 @@ msgstr "కర�తవ�యాల�(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ఎవల�యూషన� క�యాలెండర� లో హెచ�చరిక జారీచేయ� సేవ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "నిమిషం"
 msgstr[1] "నిమిషాల�"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "à°—à°‚à°Ÿ"
 msgstr[1] "గంటల�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "ప�రారంభ సమయం"
 
@@ -4585,9 +4608,9 @@ msgstr "నియామకాల�"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "స�థానం:"
@@ -4597,17 +4620,15 @@ msgid "Snooze _time:"
 msgstr "వెళ�ళబ�చ�చ� సమయం(_t):"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "సరిచేయ�(_E)"
 
@@ -4619,32 +4640,32 @@ msgstr "వెళ�ళబ�చ�చ�(_S)"
 msgid "location of appointment"
 msgstr "నియామకం యొక�క స�థానమ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "సంక�షిప�తమ� అంద�బాట�లో లేద�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "వివరణ అంద�బాట�లో లేద�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "స�థానమ� యొక�క సమాచారం అంద�బాట� లో లేద�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "మీక� %d హెచ�చరికల�న�నాయి"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1516
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "హెచ�చరిక"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4656,7 +4677,7 @@ msgstr ""
 "పంప�టక� ఆకృతీకరించబడింది.  ఎవాల�యూషన� బద�ల�గా ఒక సాదారణ గర�తించ�దాని\n"
 "డైలాగ� పెట�టె న� ప�రదర�శిస�త�ంది."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4673,28 +4694,29 @@ msgstr ""
 "\n"
 "మీర� ఖచ�చితంగా ఈ ప�రోగ�రామ� న� నడ�పవలెనని అన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "ఈ కార�యక�రమం గ�రించి నన�న� మళ�ళీ అడగద�ద�"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "బొనొబొ న� సంసిద�ధపర�చలేక పోయింది"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
-#, fuzzy
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr "అలారం తాఖీద� సేవ గ�ణకాన�ని సృష�టించలేద�, బహశా అది ఇప�పటికే నడ�స�త�ండవచ�చ�..."
+msgstr ""
+"అలారం తాఖీద� సేవ గ�ణకాన�ని సృష�టించలేద�, బహశా అది ఇప�పటికే "
+"నడ�స�త�ండవచ�చ�..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "నిస�సార కాలం"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4702,8 +4724,8 @@ msgstr[0] "%d à°—à°‚à°Ÿ"
 msgstr[1] "%d గంటల�"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4713,8 +4735,8 @@ msgstr[1] "%d నిమిషాల�"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4742,8 +4764,7 @@ msgid "Calendars to run alarms for"
 msgstr "హెచ�చరికల� ఇచ�చ�టక� క�యాలెండర�ల�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "సమయ పట�టీ పై మార�కస� బైన�స� వర�సన� గీయ�టక� వర�ణమ� (అప�రమేయంగా ఖాళీ)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -4900,8 +4921,7 @@ msgstr "నిలà±�à°µà±� తలం యొకà±�à°• à°¸à±�థానమà±�, à°•à
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
-msgstr ""
-"నిల�వ� తలం యొక�క స�థానమ�, కర�తవ�యప� జాబితా మరియ� కర�తవ�యం ఉపదర�శనం తలం మధ�య, పిక�సెల�స� లో."
+msgstr "నిల�వ� తలం యొక�క స�థానమ�, కర�తవ�యప� జాబితా మరియ� కర�తవ�యం ఉపదర�శనం తలం మధ�య, పిక�సెల�స� లో."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
@@ -4952,12 +4972,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:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
 
@@ -5007,7 +5027,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:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "సమయక�షేత�రం"
 
@@ -5026,8 +5046,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "అప�రమేయంగా గ�ర�తించ�దాని యొక�క ప�రమాణంల�, \"నిమ�షాల�\", \"గంటల�\" లేదా \"రోజ�ల�\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో నిర�ధారించ�టక� ప�రమాణమ�ల�, \"నిమ�షాల�\", \"గంటల�\" లేదా "
 "\"రోజ�ల�\"."
@@ -5065,8 +5084,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "వారమ� మరియ� నెల దర�శనమ�లలో ఘటనల యొక�క మ�గియ�కాలాన�ని ప�రదర�శించవలెనా."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "క�యాలండర� నంద� మార�కస� బైన�స� వర�సన (ప�రస�త�త సమయం వద�ద వర�స) న� గీయవలెనా."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5094,8 +5112,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "స�థితి క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "సమయాన�ని am/pm విధానం బద�ల�గా ఇరవై నాల�గ� గంటల రూపంలో చూపించాలా."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5138,70 +5155,66 @@ msgstr "పనిరోజ� ప�రారంభ నిమిషం"
 msgid "daylight savings time"
 msgstr "పగటి మిగ�ల� సమయం"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "సంక�షిప�తమ� కలిగివ�ంది"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "వివరణ కలిగివ�ంది"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "విభాగం...."
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "వ�యాఖ�య కలిగివ�ంది"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "స�థానం కలిగివ�ంది"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "సరిఉజ�జీ కాలేద�"
 
-#: ../calendar/gui/cal-search-bar.c:634
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "తర�వాతి 7 రోజ�ల' కర�తవ�యాల�"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "చేతనమైన కర�తవ�యాల�"
 
-#: ../calendar/gui/cal-search-bar.c:642
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "సమయంమించిన కర�తవ�యాల�"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "పూర�తయిన కర�తవ�యాల�"
 
-#: ../calendar/gui/cal-search-bar.c:650
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "అన�బంధాలతో కర�తవ�యాల�"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "చేతనమైన నియామకాల�"
 
-#: ../calendar/gui/cal-search-bar.c:700
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "తర�వాతి 7రోజ�ల' నియామకాల�"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5210,16 +5223,17 @@ msgstr ""
 "ఎంపికచేసిన సమయ మెత�తానికి పూర�వమైన అన�ని ఘటనలన� ఈ ఆపరెషన� శాశ�వతంగా తొలగించివేస�త�ంది. మీర� "
 "కొనసాగించినట�లైతే, మీర� ఈ ఘటనలన� మరలా తిరిగిపొందలేర�."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "దీనికన�నా పాతవైన ఘటనలన� కొట�టివేయ�మ�"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "రోజ�ల�"
 
@@ -5228,132 +5242,330 @@ msgstr "రోజ�ల�"
 #. 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:512
-#: ../calendar/gui/migration.c:611 ../calendar/gui/migration.c:1125
+#: ../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:406
+#: ../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 "వాతావరణం"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "కొత�త క�యాలెండర�(_N)"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "నకల�తీయ�(_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3637 ../mail/em-folder-tree.c:2099
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "లక�షణాల�(_P)"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "క�యాలెండర� న� తాజాపర�చ�ట లో విఫలం ."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�ట కొరక� క�యాలెండర�'%s' న� తెరవలేకపోయింది"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�ట కొరక� క�యాలెండర� అంద�బాట� లొ లేద�"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "క�యాలెండర� వనర� ఎంపికచేసేది"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "కొత�త నియామకం"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
-msgstr "నియామకం(_A)"
+msgstr "నియామకం (_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "కొత�త నియామకమ�న� సృష�టించ�"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "కొత�త సమావేశం"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
-msgstr "సమావేశం(_e)"
+msgstr "సమావేశం (_e)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "కొత�త సమావేశ అభ�యర�థన న� సృష�టించ�"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "కొత�త పూర�తిరోజ� నియామకం"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "పూర�తిరోజ� నియామకం(_p)"
+msgstr "పూర�తిరోజ� నియామకం (_p)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "కొత�త పూర�తిరోజ� నియామకాన�ని సృష�టించ�"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "కొత�త క�యాలెండర�"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
-msgstr "క�యాలెండర�(_n)"
+msgstr "క�యాలెండర� (_n)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "కొత�త క�యాలెండర� న� సృష�టించ�"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "రోజ� దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "పని వారం దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "వారం దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "నెల దర�శనం"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
-#, fuzzy
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "అన�భందమ�ల�"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "హాజరైనవ�యక�తి"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "వ�యాపారం"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "వర�గమ�"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "వర�గీకరణ"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "పోటీ"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "గోప�యమైన"
+
+#: ../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 "విశదీకరణ"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "వివరణ కలిగివ�ంది"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
-#, fuzzy
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+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
+msgid "Exist"
+msgstr "ఉంది"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "ఇచ�ఛాల�"
+
+#: ../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
+msgid "Holiday"
+msgstr "సెలవ�"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "త�వరిత పరిచయాల�"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "ఆలోచనల�"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "అంతర�జాతీయ"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "కీ వినియోగదారి"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "ఇతరత�రా"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "తర�వాతి 7 రోజ�ల�"
+
+#: ../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 "నిర�వాహక�డ�"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "ఫోన� కాల�స��"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "స�వంత"
+
+#: ../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
+msgid "Public"
+msgstr "ప�రజా"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "ప�నరావృతి"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "స�స�థితి"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "విధానాల�"
+
+#: ../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:361
+msgid "Summary"
+msgstr "తాత�పర�యం"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
-msgstr "సంక�షిప�తం కలిగివ�ంది"
+msgstr "దీనినికలిగవ�న�న సంక�షిప�తం"
+
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "పంపిణీదార�ల�"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "సమయం &amp; ఖర�చ�ల�"
+
+#: ../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 "వేచిఉండ�ట"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+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
+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
+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
+msgid "is not"
+msgstr "ఇది కాద�"
 
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
@@ -5367,11 +5579,11 @@ msgstr "క�యాలెండర� తెర�స�త�ండగా, ప
 msgid "Permission denied to open the calendar"
 msgstr "క�యాలెండర� తెర�వటక� అన�మతి నిరాకరించబడినది"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "అపరిచిత దోషం"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "అలారమ�న� సరిచేయ�మ�"
 
@@ -5404,17 +5616,17 @@ msgid "Mes_sage:"
 msgstr "సందేశం(_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "ధ�వనిని ఆడించ�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "కార�యక�రమాన�ని నడిపించ�"
 
@@ -5427,7 +5639,7 @@ msgid "Send To:"
 msgstr "పంపించ�:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "ఒక ఈతపాలా పంప�"
 
@@ -5482,7 +5694,7 @@ msgstr "నిమిషమ�(ల�)"
 msgid "start of appointment"
 msgstr "నియామకం యొక�క ప�రారంభం"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "క�రియ/క�రియారంభంచేయ�"
 
@@ -5493,16 +5705,15 @@ msgstr "జతపర�చ�(_d)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "హెచ�చరికల�"
 
-#: ../calendar/gui/dialogs/cal-attachment-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
 msgid "_Suggest automatic display of attachment"
 msgstr "స�వయంచాలక అన�బంధ ప�రదర�శనాన�ని సూచించ�మ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "దస�త�రం(ల) న� అన�భందించ�"
 
@@ -5528,10 +5739,8 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:10
@@ -5573,8 +5782,8 @@ msgid "Display"
 msgstr "ప�రదర�శించ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "శ�క�రవారం"
 
@@ -5589,8 +5798,8 @@ msgstr ""
 "రోజ�ల�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "సోమవారం"
 
@@ -5613,7 +5822,7 @@ msgstr ""
 "ఆదివారం"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "వర�ణన� న� తీస�కొన�మ�"
 
@@ -5623,8 +5832,8 @@ msgid "S_un"
 msgstr "ఆది(_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "శనివారం"
 
@@ -5641,8 +5850,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "వారమ� సంఖ�యలన� తేది మార�చ�దానిలో చూప�మ�(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ఆదివారం"
 
@@ -5660,13 +5869,13 @@ msgid "Template:"
 msgstr "మాదిది:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "గ�ర�వారం"
 
 #: ../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 "కాల క�షేత�రం(_z):"
 
@@ -5675,14 +5884,14 @@ msgid "Time format:"
 msgstr "కాల రూపకం:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "బ�ధవారం"
 
@@ -5760,302 +5969,453 @@ msgstr "బ�ధ(_W)"
 msgid "before every appointment"
 msgstr "ప�రతి నియామకం మ�ంద�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� క�యాలెండర� సారమ�లన� నకల� తీయ�మ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� కర�తవ�య జాబితా సారమ�లన� నకల�తీయ�మ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� మెమో జాబితా సారమ�లన� స�థానికంగా నకల�తీయ�మ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "వర�ణమ�(_o):"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
+msgstr "వర�ణమ� (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "కర�తవ�యం జాబితా"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "మెమో జాబితా"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "క�యాలెండర� లక�షణాల�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "కొత�త క�యాలెండర�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "కార�య జాబితా లక�షణాల�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "కొత�త కర�తవ�యంజాబితా"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "మెమో జాబితా లక�షణాల�"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "కొత�త మెమో జాబితా"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "ఈ ఘటన తొలగించబడినది"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "ఈ కర�తవ�యం తొలగించబడినది."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "ఈ మెమో తొలగించబడినది"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేసినార�. ఆ మార�ప�లన� మర�చి సరిచేయ�దానిని మూసివేయ�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేయలేద�, సరిచేయ�దానిని మూసివేయ�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "ఈ ఘటన మార�చబడినది."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "ఈ కర�తవ�యం మార�చబడినది"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "ఈ మెమో మార�చబడినది."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేసినార�. ఆ మార�ప�లన� మర�చి సరిచేయ�దానిని తాజా పర�చవలెన?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేసార�, సరిచేయ�దానిని తాజా పర�చవలెన?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "వర�తింప�చేయ�ట లో దోషం: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " దానికి "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (పూర�తి చేయబడ�డ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "పూర�తి చేయబడ�డ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (అర�హమైంది"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "అర�హమైంది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2849
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "అన�భందించిన సందేశం - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2854
-#: ../composer/e-msg-composer.c:3036
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "అన�భందించబడిన సందేశం"
 msgstr[1] "%d అన�భందించబడిన సందేశాల�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3100
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "జర�ప�(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "లాగినదానిని రద�ద�చేయ�మ�(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "అన�బంధం"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "తాత�పర�యాన�ని తాజాపర�చలేకపోయింది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2486
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "నియామకాన�ని సరిచేయ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "సమావేశం - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "నియామకం- %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "అప�పగించబడిన కర�తవ�యం - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "కార�యం - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "మెమో - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "సంక�షిప�తం లేద�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "ప�రస�త�త గవాక�షాన�ని మూయ�టక� ఇక�కడ నొక�కండి"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "సహాయం అంద�బాట�లో ఉందోలేదో చూడటానికి ఇక�కడ నొక�కండి"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "క�లిప� పలకం న�ండి పాఠ�యాన�ని అతికించ�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "ప�రస�త�త గవాక�షాన�ని దాయ�టక� ఇక�కడ నొక�కండి"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "పాఠ�యమొత�తాన�ని ఎంచ�కొన�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "వర�గీకరణ(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "దస�త�రం(_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "సహాయం(_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "చేర�చ�మ� (_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "ఇచ�ఛాపూర�వకాల�(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "దర�శనం(_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "జతపర�చ�మ�(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "దస�త�రాన�ని జతపర�చ�టక� ఇక�కడ నొక�కండి"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "విభాగాల�(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "వర�గీకరణల� ప�రదర�శితమైతే మార�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "కాలక�షేత�రమ�(_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "సమయ క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "పబ�లిక�(_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "ప�రజామైనది గా వర�గీకరించ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "స�వంత(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "వ�యక�తిగతమైనదిగా వర�గీకరించ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "గోప�యమైన(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "గోప�యమైనదిగా వర�గీకరించ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "పాత�ర క�షేత�రం(_o)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "పాత�ర క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "RSVP క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "స�స�థితి క�షేత�రం(_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "స�థితి క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "క�షేత�ర రకం(_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "హాజరైనవాని రకం ప�రదర�శితమైతే మార�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "ఇటీవలి పత�రమ�ల� (_D)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "జతపర�చ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "అన�భందమ� పట�టీ ని మర�గ�పర�చ�మ�(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "అన�భందపట�టీని చూప�మ�(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3636
+#: ../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
 #: ../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 "తీసివేయ�(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3639
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "అన�భందంన� జతపర�చ�మ�(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "అన�భందమ�లన� చూప�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "అన�భందపట�టీని మార�చ�టక� స�పేస� కీన� వత�త�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "నియామకాన�ని సరిచేయ�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "సమావేశం - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "నియామకం- %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "అప�పగించబడిన కర�తవ�యం - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "కార�యం - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "మెమో - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "తాత�పర�యం లేద�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ఈ అంశాన�ని తాజాపరిస�తే మార�ప�ల� రద�ద� అవ�తాయి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "వర�తమాన వివరణన� వాడలేకపోత�ంది!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "వనర�న� తెరవలేకపోయింది"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "గమ�యాన�ని తెరవలేకపోయింది"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "గమ�యం కేవలం చదవదగినది"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ఇతర స�వీకరణదార�ల మెయిల�‌పెట�టెలన�నింటి న�ండి ఈ అంశమ�న� తొలగించాలా(_D)?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "కోర�బా దోషం మూలంగా ఘటనన� రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "కోర�బా దోషం మూలంగా కార�యాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "కోర�బా దోషం మూలంగా అంశాన�ని తొలగించలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "కోర�బా దోషం మూలంగా అంశాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న ఘటనన� రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న కార�యాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న అంశాన�ని తొలగించలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న అంశాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "ఒక దోషం మూలంగా ఘటనన� రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "ఒక దోషం మూలంగా కార�యాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "ఒక దోషం మూలంగా అంశాన�ని తొలగించలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "ఒక దోషం మూలంగా అంశాన�ని రద�ద�చేయలేకపోయింది"
 
@@ -6064,7 +6424,7 @@ msgid "Contacts..."
 msgstr "పరిచయాల�..."
 
 #: ../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 "క� ప�రతినిధి:"
 
@@ -6072,135 +6432,182 @@ msgstr "క� ప�రతినిధి:"
 msgid "Enter Delegate"
 msgstr "ప�రతినిధిని ప�రవేశపెట�ట�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "అలారమ�ల�(_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "ఈ ఘటనక� హెచ�చరికల� అమర�చ�టక� లేదా తీసివేయ�టక� ఇక�కడ నొక�కండి"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "ప�నరావృతి(_R)"
+
+#
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "ప�నఃసంభవమిస�త�న�న ఘటనగా దీన�ని చేయ�మ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../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
+msgid "Insert advanced send options"
+msgstr "ఉన�నతస�థితిగల పంపించే ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "పూర�తిరోజ� ఘటన(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "రోజ�మెత�తం ఘటన ఉంటే మార�మ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "సమయంన� తీరికలేనిదిగా చూప�మ� (_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "చూపించ� సమంయ తీరికలేక�ంటే మార�మ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "ఖాళీ/తీరిక లేని(_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "హాజరైనవారి కొరక� ఖాళీ/తీరికలేని సమాచారం న� ప�రశ�నించ�మ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "నియామకం(_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "ప�నరావృతి"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "ఈ ఘటన అలారమ�లన� కలిగిఉంది"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "నిర�వాహక�డ�(_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "ప�రాతినిధ�యంవహించే(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "హాజరైనవార�(_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "ప�రారంభ తారీఖ� లేని ఘటన"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "అంతం తారీఖ� లేని ఘటన"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "ప�రారంభ తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "అంతం తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "ప�రారంభ తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "అంతం తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "ఎంపికచేసిన వ�యస�థీకరింపచేసెదానికి ఖాతా లేద� "
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "వ�యస�థీకరింపచేసెది అవసరం"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "కనీసం ఒక హాజరయ�యెవార� అవసరం."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "కల�ప�మ�(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "క�యాలెండర� '%s'న� తెరవలేకపోయింది."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "మీర� %s తర�ప�న మీర� చేస�త�న�నార�"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "మల�చ�కొన�"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "�దికాద�"
 
@@ -6225,23 +6632,25 @@ msgid "Custom Alarm:"
 msgstr "మల�చ�కొన� అలారమ�:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "వివరణ(_e):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "ఘటన విశదీకరణ"
 
-#: ../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 "సంక�షిప�తమ�(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "అలారమ�(_A)"
 
+#: ../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 "వివరణ(_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "సమయం(_T):"
@@ -6272,28 +6681,24 @@ msgstr "నిర�వహక�ని మార�చ�మ�(_h)"
 msgid "Co_ntacts..."
 msgstr "చిర�నామాల�(_n)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "నిర�వాహక�డ�"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "నిర�వాహక�డ�:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "మెమో"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'లో మెమోలన� తెరవలేకపోయింది."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "క�"
 
@@ -6306,59 +6711,59 @@ msgstr "ప�రారంభ తేది(_r):"
 msgid "T_o:"
 msgstr "క�(_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "వివరణ(_D):"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "సమూహం(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "మీర� ప�నరావృతిచెందిన ఘటనన� మార�చ�త�న�నార�, మీర� మార�చాలని అన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "మీర� ప�నరావృతిచెందిన ఘటనక� ప�రాతినిధ�యంవహిస�త�న�నార�, మీర� ప�రాతినిధ�యంవహిస�తారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "మీర� ప�నరావృతిచెందిన కార�యాన�ని మార�చ�త�న�నార�, మార�చాలంన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "మీర� ప�నరావృతిచెందిన మెమో మార�చ�త�న�నార�, మార�చాలన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "ఈ ప�రత�యేకస�థితి మాత�రమే"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "ఇది మరియ� పూర�వప� ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "ఇది మరియ� భవిష�యత�త� ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "అన�ని ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ఎవల�య�షన� సర�చేయలేని ప�నరావృత�త�ల� ఈ నియామకం కలద�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "పైన"
 
@@ -6366,7 +6771,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "మొదటి"
 
@@ -6375,7 +6780,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "రెండోది"
 
@@ -6383,7 +6788,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "మూడవది"
 
@@ -6391,7 +6796,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "నాల�గోది"
 
@@ -6399,13 +6804,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "చివరిది"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "ఇతర తారీఖ�"
 
@@ -6413,7 +6818,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1 న�ండి 10 వరక�"
 
@@ -6421,7 +6826,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11 న�ండి 20 వరక�"
 
@@ -6429,45 +6834,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "పైన"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "సంభవించనవి"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "అక�షేపణన� కల�ప�మ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "సవరించ�టక� ఎంపికన� పొందలేకపోయింది."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "ఆక�షేపణన� సవరించ�మ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "తొలగించ�టక� ఎంపికన� పొందలేకపోయింది."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "తారీఖ�/సమయం"
 
@@ -6518,12 +6923,12 @@ msgstr "వారమ�(ల�)"
 msgid "year(s)"
 msgstr "సంవత�సరమ�(ల�)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "పూర�తి చేసిన తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "మహాతల ప�ట"
 
@@ -6538,51 +6943,55 @@ msgstr "<span weight=\"bold\">స�థతి</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "పూర�తిచేయబడిన"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "ఎక�క�వ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "ప�రోగమనంలొ ఉన�న"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "తక�క�వ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "మామూల�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ప�రారంభం కాలేద�"
 
@@ -6595,7 +7004,7 @@ msgid "Stat_us:"
 msgstr "స�స�థితి(_u):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "నిర�వచించబడలేద�"
 
@@ -6604,7 +7013,7 @@ msgid "_Date completed:"
 msgstr "తారీఖ� పూర�తి అయినది(_D):"
 
 #: ../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 "ప�రాధాన�యత(_P):"
 
@@ -6612,25 +7021,37 @@ msgstr "ప�రాధాన�యత(_P):"
 msgid "_Web Page:"
 msgstr "మహాతలం ప�ట(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "స�స�థితి వివరాల�(_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
+msgid "_Send Options"
+msgstr "పంప�టక� ఇచ�ఛాపూర�వకాలన�(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "కార�యం(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "కర�తవ�యం వివరణల�"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "నిర�వాహక�డ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "పూర�వనిర�ణిత రోజ� తప�పూ"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'లో కార�యాలన� తెరవలేకపోయింది."
@@ -6644,19 +7065,15 @@ msgid "Categor_ies..."
 msgstr "వర�గాల�(_i)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "వివరణమ�(_s):"
+msgid "D_ue date:"
+msgstr "నిర�దేశిత తేది (_D):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "సమయ క�షేత�రమ�:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "నిర�దేశిత తేది(_D):"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6664,142 +7081,126 @@ 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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d వారం"
 msgstr[1] "%d వారాల�"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "అపరిచిత కార�యాన�ని చెయ�యాలి"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s అపరిచిత క�రియారంభ రకం కొరక�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "%s తెర�వ�టక� నొకండి"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "శిర�షిక లేద�"
 
-#: ../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
+#: ../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 "ప�రారంభ తారీఖ�:"
 
-#: ../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-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 "విశదీకరణ:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "మహాతల ప�ట:"
 
-#: ../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 "తాత�పర�యం:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "ప�ర�వనిర�ణిత తారీఖ�:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "స�స�థితి:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "ప�రాధాన�యం:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "ప�రజా"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "స�వంత"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "గోప�యమైన"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "అంతం తారీఖ�"
@@ -6809,21 +7210,14 @@ msgstr "అంతం తారీఖ�"
 msgid "Start Date"
 msgstr " తారీఖ� మొదల�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "తాత�పర�యం"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "స�వతంత�ర"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "తీరికలేద�"
 
@@ -6837,199 +7231,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "అవ�న�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "కాద�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../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-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
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "ప�నరావృతికరణ"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "స�థానం ఇవ�వబడినది"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "ఇలా దాచ�..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 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:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "శీర�షికలేని చిత�రమ�(_i).%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "ఇలా దాయ�మ�(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "బ�యాక�‌గ�రౌండ� లా అమర�చ�మ�(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "ఎంపికచేయబడినదాన�ని దాయ�మ�(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "%s లో తెర�వ�మ�...."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "నిర�వాహకి: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "ప�రారంభించ�: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "మిగిలివ�న�న: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "ఎంపికచేసిన అంశాలన� తొలగించ�త�న�నది"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "అంశాలన� తాజా పర�చ�త�న�నది"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../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:277
 msgid "Save as..."
 msgstr "ఇలా దాయ�..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "కొత�త కార�యం(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "మహాతల ప�టన� తెర�వ�(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "మ�ద�రించ�(_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "కోయ�మ�(_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "అతికించ�(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "కర�తవ�యాన�ని అప�పగించ�మ�(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iక�యాలెండర� గా మ�ంద�క� పంపించ�(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ఎంపిక చేసిన కార�యాల� పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "ఎంపిక చేసిన కార�యాల� అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "ఎంపిక చేసిన కార�యాలన� తీసివేయ�(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "కర�తవ�యాన�ని జతపర�చ�టక� నొక�కండి"
@@ -7052,7 +7472,8 @@ msgid "Due date"
 msgstr "పూర�వ నిర�ణీత తేది"
 
 #: ../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:372
 msgid "Priority"
 msgstr "ప�రాధాన�యత"
 
@@ -7060,128 +7481,109 @@ msgstr "ప�రాధాన�యత"
 msgid "Start date"
 msgstr "ప�రారంభ తేది"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "స�స�థితి"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "అంశాలన� జర�ప�త�ంది"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "అంశాల నకల�తీస�త�ంది"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "కొత�త నియామకం(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "కొత�త రోజ� ఘటన(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "కొత�త సమావేశం(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "ప�రస�త�త దర�శనం(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "ఈ రోజ�న� గ�ర�తించ�(_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "తారీఖ� ఎంపికచేయ�(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "మ�ద�రణ(_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "క�యాలెండర� క� నకల�తీయ�(_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "క�యాలెండర� క� పంప�(_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "సమావేశాల కాలాన�ని నియమించ�(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "సమావేశాల కాలాన�ని నియమించ�(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "ప�రత�య�త�తరమ�(_R):"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "అందరికి ప�రత�య�త�తరమ�ఇవ�వ�(_A)"
 
 #
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "ఈ సంభవాన�ని కదిపించేది గా చేయ�(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "ఈ సంభవాన�ని తీసివేయ�(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "సంభవాలన�నింటి తీసివేయ�(_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "నిర�వాహకి: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "నిర�వాహకి: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "స�థానం: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a·%m/%d/%Y·%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a·%m/%d/%Y·%I:%M:%S·%p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7194,7 +7596,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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i నిమిష భాగాల�"
@@ -7205,46 +7607,34 @@ 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 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:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "అవ�న�. (క�లిష�టమైన ప�నరావృతి)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ప�రతి రోజ�"
 msgstr[1] "ప�రతి%d రోజ�ల�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7252,9 +7642,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "ప�రతి వారం"
 msgstr[1] "ప�రతి %d వారాల�"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7262,51 +7650,35 @@ msgstr[0] "ప�రతి వారం మొదల�"
 msgstr[1] "ప�రతి %d వారాల మొదల� "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " మరియ�"
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s రోజైన"
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr " %s %s అయిన "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ప�రతి %d నెల"
 msgstr[1] "ప�రతి %d నెలల�"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ప�రతి %d సంవత�సరం"
 msgstr[1] "ప�రతి %d సంవత�సరాల�"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7314,333 +7686,332 @@ msgstr[0] " %d మొత�తం సమయం"
 msgstr[1] "%d మొత�తం సమయాల�"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", పైన అంతం "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "మొదలౌత�ంది"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "అంతమౌత�ంది"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "పూర�వనిర�ణిత"
 
-#: ../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 "iక�యాలెండర� సమాచారం"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iక�యాలెండర� దోషం"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "అపరిచిత వ�యక�తి"
 
 #. 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> ఈ సమాచారమ�న� సమీక�షించి, కింది జాబితాన�ంచి క�రియన� ఎంపికచేస�కోండి"
 
-#: ../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:728
+#: ../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:2034
 msgid "Accepted"
 msgstr "ఆమొదించబడినది"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
 #: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "ప�రయోగాత�మకంగా ఆమొదించబడినది"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
+#: ../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:2040
 msgid "Declined"
 msgstr "తగించబడినది"
 
-#: ../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
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+#: ../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> సమావేశ సమాచారాన�ని మ�ద�రించినది"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "సమావేశ సమాచారం"
 
-#: ../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 "%s యొక�క హాజర� ఒక సమావేశం వద�ద <b>%s</b> అభ�యర�ధించింది"
 
-#: ../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> సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "సమావేశ ప�రతిపాదన"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> అభినందనల� ఉన�న సమావేశానికి కల�పబడతాయి."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "సమావేశ తాజా వివరం"
 
-#: ../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> సమావేశ తాజా సమాచారాన�ని కొర�త�ంది"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "సమావేశ తాజా వివరాల అభ�యర�ధన"
 
-#: ../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> సమావేశ అభ�యర�ధన క� జవాబ� చెపింది"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "సమావేశం యొక�క జవాబ�"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "సమావేశ రద�ద�"
 
-#: ../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> అవివేక సందేశాన�ని పంపినది"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "చెడ�డ సమావేశ సందేశం"
 
-#: ../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> కార�య సమాచారాన�ని ప�రచ�రించినది"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "కార�య సమాచారం"
 
-#: ../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 "%s ఒక కార�యాన�ని నిర�వతించాడినికి<b>%s</b> అభ�యర�ధించినది"
 
-#: ../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> ఒక కార�యాన�ని నిర�వతించాడినికి అభ�యర�ధించినది"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "కార�య ప�రతిపాదన"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> అభినందనల� ఉన�న కార�యానికి చెంద�తాయి."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "కార�య తాజా వివరం"
 
-#: ../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> తాజా కార�య సమాచారాన�ని పొంద దల�చినది"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "కార�యాన�ని తాజాపర�చ�టక� అభ�యర�ధన"
 
-#: ../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> కార�య కేటాయింప� జవాబ� ఇచ�చింది"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "కార�య జవాబ�"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>ఒక కార�తవ�యాన�ని రద�ద� చేసింది."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "కర�తవ�యం రద�ద�"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "చెడ�డ కార�య సందేశం"
 
-#: ../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> తీరక/తీరకలేద� సమాచారాన�ని ప�రచ�రించ�"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "తీరక/తీరకలేద� సమాచారం"
 
-#: ../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> తీరక/తీరకలేద� సమాచారాన�ని కోర�త�ంది"
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "తీరక/తీరకలేద� కోరండి"
 
-#: ../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> తీరక/తీరకలేద� కోరికక� జవాబ� ఇచ�చింది"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "తీరక/తీరకలేద� జవాబ�"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "తీరక/తీరకలేద� చెడ�డ సందేశం"
 
-#: ../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 "సందేశం సరిగ�గ �ర�పర�చినట�ట�లేద�"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "సహకారం లేని కోరికల� మాత�రమే సందేశం లో ఉన�నాయి"
 
-#: ../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 "అన�బంధం లో వర�తించ� క�యాలెండర� సందేశాల� లేవ�"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "అన�బంధం లో చూడదగ�గ క�యాలెండర� అంశాల� లేవ�"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "తాజాపర�చ�ట పూర�తియింది\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "అంశం వర�తించద� కన�క తాజాపర�చ�ట సాధ�యపడద�\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. జవాబ�దార�నిగా జోడించండి?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "వర�తించని స�థితి కారణంగా జవాబ�దార�ని స�థితి తాజాపరచబడలేద�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "జవాబ�దార�ని స�థితి తాజాపరచబడినది\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "అంశం లేనంద�న జవాబ�దార�ని స�థితి తాజాపరచబడలేద�"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "అంశం పంపబడినది!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "అంశాన�ని పంపిచలేకపోయింది!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "క�రియన� ఎంచ�కోండ:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "తాజా పర�చ�"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "ఆమోదించ�"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "తాత�కాలికంగా ఆమొదించ�"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "తిరస�కరించ�"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "తీరిక/తీరికలేద� సమాచారాన�ని పంప�"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "సమాధనం ఇచ�చెవారి స�ధితిని తాజాపర�చ�"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "తాజా సమాచారాన�ని పంప�"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "రద�ద�"
@@ -7669,112 +8040,112 @@ msgstr "క�యాలెండర� న� నింప�త�ంది..."
 msgid "Server Message:"
 msgstr "సేవిక సందేశం:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "అధ�యక�షవర�య�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "కావల�సిన పాల�పంచ�కొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "ఇచ�ఛాపూర�వక పాల�గొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "వనర�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "హాజరైనవార�"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "స�వతంత�రంగా"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "గ�రూప�"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "వనర�"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "గది"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "అధ�యక�ష�ల�"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "పాల�గొన�వార� కావాలి"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "ఇచ�ఛాపూర�వకంగా పాల�గొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "పాల�గొన�వార�-కాద�"
 
-#: ../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 "క�రియ అవసరం"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "తాత�కాలిక"
 
-#: ../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:737
+#: ../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
 msgid "Delegated"
 msgstr "ప�రాతినిధ�యంవహించే"
 
 #. 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:526
+#: ../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 "క�రమంలొఉన�న"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A,·%B·%d,·%Y"
 
@@ -7782,85 +8153,81 @@ 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a·%m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "కార�యాలయం న�ండి బయటక�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "సమాచారం లేద�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "హాజరైనవార�(_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "ఇచ�ఛాపూర�వకాల�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "పనికాలాన�ని మాత�రమే చూపించ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "జూమ� తగ�గించ�ట చూప�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "తీరిక/తీరికలేద� తాజాపర�చ�(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "స�వయంఎంపిక(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "అన�ని వనర�ల� మరియ� ప�రజల�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "ప�రజలందర� మరియ� ఒక�క వనర�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "ప�రజల� కావాలి(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "ప�రజల� మరియ� ఒక�క వనర� కావాలి(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "ప�రారంభ సమయం(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "సమయాంతం(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "హాజరైనవ�యక�తి"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "ఒక హాజరైనవ�యక�తిని జతచేయ�టక� ఇక�కడ నొక�క�మ�"
@@ -7893,8 +8260,8 @@ msgstr "ఎంపిక చేసిన మెమోలన� తొలగిం
 msgid "Click to add a memo"
 msgstr "మెమోన� జతచేయ�టక� నొక�క�మ�"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7903,85 +8270,80 @@ msgstr ""
 "%s పై దోషం:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "మెమోలన� నింప�త�ంది"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s వద�ద మెమోలన� తెర�స�తోంది"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "ఎంపిక చేసిన అంశాలన� రద�ద� చేస�తోంది..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "కార�తవ�యాలన� నింప�త�ంది"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s వద�ద కార�తవ�యాలన� తెర�స�తోంది"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "కర�తవ�యాలన� పూర�తిచేస�తోంది..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "కొట�టివేయ�చ�న�నది"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d·%B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "ప�రశ�నన� తాజాపర�స�త�ంది"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "మల�చ�కొనిన దర�శనం(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "మల�చ�కొనిన దర�శనంన� దాయ�మ�(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "దర�శనాలన� నిర�వచించ�(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "నియామాకాలన� నింప�త�ంది%s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%sకార�యాలన� నింప�త�ంది"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s వద�ద మెమోలన� నింప�త�ంది"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%sతెర�స�త�ంది"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "శాశ�వతంగా తొలగించ�త�ంది"
 
@@ -8041,57 +8403,57 @@ msgstr "సెప�టంబర�"
 msgid "_Select Today"
 msgstr "ఈ రోజ� న� ఎంచ�కొన�మ�(_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "వ�యవస�ధీకరణ చేసేదానిని అమరచాలి"
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "కనీసం ఒక జవాబ�దార�డ� అవసరం"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "ఘటన సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "కార�తవ�య సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "మెమో సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "తీరిక/తీరికలేద� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "క�యాలెండర� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "తాజాపరచబడిన"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "ప�నర�వికాసం"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "ప�రతీకూల-ప�రదిపాదన"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "తీరిక/తీరికలేద� సమాచారం(%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iక�యాలెండర� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "మీర� ఘటన హాజరవ�వాలి"
 
@@ -8130,47 +8492,54 @@ msgstr "మెమోలన� సృష�టించ�టక� � క�య
 msgid "Memo Source Selector"
 msgstr "మెమో మూలంన� ఎంపికచేయ�నది"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "కొత�త మెమో"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
-msgstr "మెమో(_o)"
+msgstr "మెమో (_o)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "కొత�త మెమోన� సృష�టించ�"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "కొత�త భాగస�వామ�య మెమో"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
-msgstr "భాగస�వామ�య మెమో(_S)"
+msgstr "భాగస�వామ�య మెమో (_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "కొత�త భాగస�వామ�య మెమోన� సృష�టించ�"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "కొత�త మెమో జాబితా"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
-msgstr "మెమో జాబితా(_s)"
+msgstr "మెమో జాబితా (_s)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "కొత�త మెమోజాబితా న� సృష�టించ�"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "మెమోలన� మ�ద�రించ�"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "తర�వాతి 7 రోజ�ల�"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8181,7 +8550,7 @@ msgstr ""
 "\n"
 "ఎవల�య�షన� మీ సంచయాలన� వలస పంప�త�ండగా దయచేసి ఆగండి..."
 
-#: ../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"
@@ -8194,26 +8563,27 @@ msgstr ""
 "Please be patient while Evolution migrates your folders..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:782 ../calendar/gui/migration.c:950
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "పాత అమరికలన� evolution/config.xmldb న�ండి మార�చలేమ�"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:811
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "క�యాలెండర� `%s' న� వలసపంపలేమ�"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:979
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "`%s' కర�తవ�యమ�లన� వలసపంపలేమ�"
 
-#: ../calendar/gui/migration.c:1234
-#: ../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
+#: ../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 "గమనికల�"
 
@@ -8370,57 +8740,52 @@ msgstr "శ�క�ర"
 msgid "Sa"
 msgstr "శని"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "నియామకం"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "కార�యం"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "తాత�పర�యం: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "హాజరైనవార�: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "స�స�థితి: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "ప�రాధాన�యం: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i: శాతం పూర�తియింది"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "%s: వర�గమ�ల�"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "చిర�నామాల�: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "కల�స�కొన� సమయం న� తెర�వ�మ�"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "కొత�త కర�తవ�యంజాబితా(_N)"
@@ -8449,39 +8814,46 @@ msgstr "కారà±�యాలà±� సృషà±�à°Ÿà°¿à°‚à°šà±�à°Ÿà°•à±� à°•à±�à°¯à
 msgid "Task Source Selector"
 msgstr "కర�తవ�యం మూల ఎంపికదారి"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "కొత�త కార�యం"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "కార�యం(_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "కొత�త కార�యాన�ని సృష�టించ�"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యం"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "స�థానం ఇవ�వబడ�డ కార�యం(_d)"
+msgstr "అప�పగించబడిన కార�తవ�యం (_d)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యాన�ని సృష�టించ�"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "కొత�త కార�యజాబితా"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "కార�య జాబితా(_k)"
+msgstr "కార�తవ�యం జాబితా (_k)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "కొత�త కార�యజాబితా న� సృష�టించ�"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8493,1704 +8865,1915 @@ msgstr ""
 "\n"
 "ఈ కర�తవ�యాలన�ని నింజంగా తొలిగించాలా?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "నన�న� మళ�ళీ అడగొద�ద�."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "కార�యాల� మ�ద�రించ�"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "u% పూర�తైంది"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "రద�ద�చేయబడినది"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "ప�రోగమనంలొ వ�న�న"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "దీని కన�నా పెద�దది"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "దీని కన�నా చిన�నది"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "నియామకాల� మరియ� సమావేశాల�"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "�క�యాలెండర� దస�త�రంల� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "ఎవాల�యూషన� iక�యాలెండర� దిగ�మతిదారి"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "గ�ర�త�చేయ�నది!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "విక�యాలెండర� దస�త�రంల�(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "ఎవాల�యాషన� vక�యాలెండర� దిగ�మతిదారి"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "క�యాలెండర� ఘటనల�"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 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)
+#. *
+#.
+#.
 #. * 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 "ఆఫ�రికా/అబిద�జన�"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "ఆఫ�రికా/అక�రా"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "ఆఫ�రికా/అడిస�‌అబబ(_A)"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "ఆఫ�రికా/అల�జిర�స�"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "ఆఫ�రికా/అస�మెరా"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "ఆఫ�రికా/బమాకొ"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "ఆఫ�రికా/బాంగ�య�"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "ఆఫ�రికా/బాంజ�ల�"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "ఆఫ�రికా/బిస�సావ�"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "ఆఫ�రికా/బ�లాంటైర�"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "ఆఫ�రికా/బ�రజావిల�లి"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "ఆఫ�రికా/బ�జ�ంబ�ర"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "ఆఫ�రికా/కైరో"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "ఆఫ�రికా/కసాబ�లాంకా"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "ఆఫ�రికా/సియ�టా"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "ఆఫ�రికా/కొనక�రయ�"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "ఆఫ�రికా/డకర�"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "ఆఫ�రికా/దార�_ఈ_ సలామ� "
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "ఆఫ�రికా/డిబౌటి"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "ఆఫ�రికా/దౌలా"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "ఆఫ�రికా/ఎల�అయ�న�(_A)"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "ఆఫ�రికా/ఫ�రీటౌన�"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "ఆఫ�రికా/గాబొరోన�"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "ఆఫ�రికా/హరారే"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "ఆఫ�రికా/జొహన�నెస�బర�గ� "
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "ఆఫ�రికా/కంపాలా"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "ఆఫ�రికా/ఖార�టౌమ�"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "ఆఫ�రికా/కిగాలి"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "ఆఫ�రికా/కిన�షస"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "ఆఫ�రికా/లాగొస�"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "ఆఫ�రికా/లిబ�రెవిల�లి"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "ఆఫ�రికా/లోమ�"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "ఆఫ�రికా/ల�యూండా"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "ఆఫ�రికా/ల�బ�ంబషి"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "ఆఫ�రికా/ల�సక"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "ఆఫ�రికా/మలబొ"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "ఆఫ�రికా/మప�టొ"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "ఆఫ�రికా/మసేర�"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "ఆఫ�రికా/బబానె"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "ఆఫ�రికా/మొగదిష�"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "ఆఫ�రికా/మొన�రోవియా"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "ఆఫ�రికా/నైరోభీ"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "ఆఫ�రికా/జమెనా"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "ఆఫ�రికా/నియమెయ�"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "ఆఫ�రికా/నౌక�చొట�ట�"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "ఆఫ�రికా/ఒగడౌగౌ"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "ఆఫ�రికా/పొర�టొ-నొవొ"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "ఆఫ�రికా/సౌటోమ�(_T)"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "ఆఫ�రికా/టింబ�క�ట�"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "ఆఫ�రికా/త�రిపోలి"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "ఆఫ�రికా/ట�నిస�"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "ఆఫ�రికా/విండ� హోక� "
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "అమెరికా/అడాక�"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "అమెరికా/అంచొరేజ�"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "అమెరికా/ఆంగ�ల�లా"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "అమెరికా/ఆంటిగ�వా"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "అమెరికా/అరాగైనా"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "అమెరికా/అర�బా"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "అమెరికా/అస�ంసియాన�"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "అమెరికా/బార�బాడోస�"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "అమెరికా/బెలెమ�"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "అమెరికా/బెలిజ�"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "అమెరికా/బొవావిస�తా(_V)"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "అమెరికా/బగోటా"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "అమెరికా/బాయిస�"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "అమెరికా/బ�యూనస��రీస�(_A)"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "అమెరికా/కాంబ�రిడ�జిబే(_B)"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "అమెరికా/కాన�కన�"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "అమెరికా/కారాకస�"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "అమెరికా/కటామార�కా"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "అమెరికా/కాయెన�ని"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "అమెరికా/కేమాన�"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "అమెరికా/చికాగో"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "అమెరికా/చిహ�వాహ�వా"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "అమెరికా/కార�డొబా"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "అమెరికా/కోస�తారికా(_R)"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "అమెరికా/క�యిబా"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "అమెరికా/క�రాకావో"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "అమెరికా/డాన�మార�క� శావ�న�"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "అమెరికా/డాసన�"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "అమెరికా/డాసన�‌క�రీక�(_C)"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "అమెరికా/డెన�వర�"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "అమెరికా/డెట�రాయిట�"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "అమెరికా/డొమినిక"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "అమెరికా/ఎడ�మాంటన�"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "అమెరికా/ఇర�నిపి"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "అమెరికా/ఎల�‌సాలవడార�(_S)"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "అమెరికా/ఫార�టలెజా"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "అమెరికా/గ�లేస�‌బే(_B)"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "అమెరికా/గోడ�థాబ�"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "అమెరికా/గూస�‌బే(_B)"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "అమెరికా/గ�రాండ�‌టర�క� (_T)"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "అమెరికా/గ�రెనెడా"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "అమెరికా/గాడెలోప�"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "అమెరికా/గాటేమెలా"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "అమెరికా/గ�వాకిల�"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "అమెరికా/గ�యానా"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "అమెరికా/హలిఫాక�స�"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "అమెరికా/హవానా"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "అమెరికా/హెర�మొసిల�లో"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "అమెరికా/ఇండియానా/ఇండియానాపోలిస�"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "అమెరికా/ఇండియానా/క�నాక�స�"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "అమెరికా/ఇండియానా/మారెంగో"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "అమెరికా/ఇండియానా/వేవాయ�"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "అమెరికా/ఇండియానాపోలిస�"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "అమెరికా/ఇన�విక�"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "అమెరికా/ఇకాలిట�"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "అమెరికా/జమైకా"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "అమెరికా/జ�జ�య�"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "అమెరికా/జ�నియా"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "అమెరికా/కెంట�క�కీ/లూయిస� విల�లీ"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "అమెరికా/కెంట�క�కీ/మొంటిసెల�లో"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "అమెరికా/లాపాజ�"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "అమెరికా/లిమా"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "అమెరికా/లాస�‌�ంజిల�స� (_A)"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "అమెరికా/లూయిస� విల�లీ"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "అమెరికా/మాసియో"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "అమెరికా/మనాగ�వా"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "అమెరికా/మనౌస�"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "అమెరికా/మార�టినిక�"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "అమెరికా/మజాట�లన�"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "అమెరికా/మెండొజ"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "అమెరికా/మెనోమినీ"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "అమెరికా/మెరిడా"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "అమెరికా/మెక�సికోసిటీ(_C)"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "అమెరికా/మిక�య�లెన�"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "అమెరికా/మాంటెర�రె"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "అమెరికా/మాంట� వీడియో"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "అమెరికా/మాంట�రియల�"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "అమెరికా/మాంట�సెర�రాట�"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "అమెరికా/నస�సావ�"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "అమెరికా/న�యూయార�క� (_Y)"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "అమెరికా/నిపిగాన�"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "అమెరికా/నోమ�"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "అమెరికా/నొరోన�హ"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "అమెరికా/ఉత�తరడకోటా/సెంటర�(_D)"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "అమెరికా/పనామా"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "అమెరికా/పాంగ�నిర�టంగ�"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "అమెరికా/పరామరిబొ"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "అమెరికా/ఫోనిక�స�"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "అమెరికా/పోర�ట�-ఆఫ�-ప�రిన�స�"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "అమెరికా/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "అమెరికా/పోర�టొవెలొ(_V)"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "అమెరికా/ప�య�ర�టొరికొ(_R)"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "అమెరికా/రైనీరివర�(_R)"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "అమెరికా/రాన� కిన�ఇన�లెట�(_I)"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "అమెరికా/రెకిఫ�"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "అమెరికా/రెజినా"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "అమెరికా/రియొబ�రాంకొ(_B)"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "అమెరికా/రొసారియొ"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "అమెరికా/సాంటియాగో"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "అమెరికా/సాంటోడొమింగో(_D)"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "అమెరికా/సాఒపాలో(_P)"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "అమెరికా/స�కోర�స� బైస�ండ�"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "అమెరికా/షిప�రాక�"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "అమెరికా/సెంట�‌జాన�స�(_J)"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "అమెరికా/సెంట�‌కిట�ట�స� (_K)"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "అమెరికా/సెంట�‌ల�సియ(_L)"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "అమెరికా/సెంట�‌తోమస�(_T)"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "అమెరికా/సెంట�‌విన� సెంట�(_V)"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "అమెరికా/స�విఫ�ట�‌కరంట�(_C)"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "అమెరికా/తెగ�సిగల�ప"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "అమెరికా/తూలె"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "అమెరికా/తండర�‌బే(_B)"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "అమెరికా/టిజ�వానా"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "అమెరికా/టోర�టొల"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "అమెరికా/వాంకౌవర�"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "అమెరికా/వైట�హార�స� "
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "అమెరికా/విన�నిపెగ�"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "అమెరికా/యక�టట�"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "అమెరికా/యెల�లోనైఫ�"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "అంటార�క�టికా/కాసెయ�"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "అంటార�క�టికా/డేవిస�"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "అంటార�క�టికా/డ�యూమౌంట� డ�ర�విల�లీ"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "అంటార�క�టికా/మౌసన�"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "అంటార�క�టికా/మెక� మ�ర�డొ"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "అంటార�క�టికా/పాల�మెర�"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "అంటార�క�టికా/సౌత�‌పోల�(_P)"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "అంటార�క�టికా/స�యోవా"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "అంటార�క�టికా/వోస�టాక�"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "ఆర�క�టిక�/లాంగ�ఇయర�బైన�"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "ఆసియా/ఆడెన�"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "ఆసియా/ఆల�మటి"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "ఆసియా/అమ�మన�"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "ఆసియా/అనాడిర�"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "ఆసియా/ఆక�వట�"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "ఆసియా/ఆక�వటొబె"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "ఆసియా/ఆష�‌గబాత�"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "ఆసియా/బాగ�దాద�"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "ఆసియా/బెహ�రైన�"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "ఆసియా/బాక�"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "ఆసియా/బాంకాంగ�"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "ఆసియా/బీరట�"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "ఆసియా/బిష�‌కెక�"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "ఆసియా/బ�రూనై"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "ఆసియా/కోల�కత�తా"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "ఆసియా/కొయ�‌బల�సన�"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "ఆసియా/కాంగ�‌క�వింగ�"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "ఆసియా/కొలొంబో"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "ఆసియా/డమాస�కస�"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "ఆసియా/ఢాకా"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "ఆసియా/ఢిల�లి"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "ఆసియా/ధ�బాయ�"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "ఆసియా/దష�‌హాన�‌బె"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "ఆసియా/గజా"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "ఆసియా/హర�‌బిన�"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "ఆసియా/హాంగ�‌కాంగ�(_K)"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "ఆసియా/హోడ�"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "ఆసియా/ఇర�క�ట�స�క�"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "ఆసియా/ఇస�తాంబ�ల�"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "ఆసియా/జకర�త"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "ఆసియా/జయప�రా"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "ఆసియా/జెర�సెలేమ�"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "ఆసియా/కాబ�ల�"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "ఆసియా/కాంచట�క"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "ఆసియా/కరాచి"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "ఆసియా/కష�గర�"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "ఆసియా/కాట�మండ�"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "ఆసియా/క�రస�నోయార�స�క�"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "ఆసియా/కౌలాలంపూర�(_L)"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "ఆసియా/క�చింగ�"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "ఆసియా/క�వైట�"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "ఆసియా/మకావో"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "ఆసియా/మకావ�"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "ఆసియా/మగాడన�"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "ఆసియా/మక�కస�సర�"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "ఆసియా/మనీలా"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "ఆసియా/మ�స�కట�"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "ఆసియా/నికోసియా"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "ఆసియా/నొవోసిబిర�స�క�"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "ఆసియా/ఓంస�క�"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "ఆసియా/ఓరల�"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "ఆసియా/ఫ�నోమ�‌పెన�హ� (_P)"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "ఆసియా/పోంటీయానాక�"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "ఆసియా/యోంగ� యాంగ�"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "ఆసియా/కాతర�"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "ఆసియా/జైలార�ద"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "ఆసియా/రంగూన�"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "ఆసియా/రియాద�"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "ఆసియా/సైగన�"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "ఆసియా/సఖలిన�"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "ఆసియా/సమర�కాండ�"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "ఆసియా/సియోల�"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "ఆసియా/శాంఘై"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "ఆసియా/సింగపూర�"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "ఆసియా/తైపే"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "ఆసియా/టాషకెంట�"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "ఆసియా/బిలిసి"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "ఆసియా/టెహరాన�"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "ఆసియా/తింఫ�"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "ఆసియా/టోక�యో"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "ఆసియా/ఉజ�ంగ�‌పండంగ�(_P)"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "ఆసియా/ఉలాంబాతర�"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "ఆసియా/ఉర�ంకి"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "ఆసియా/వీయంటైన�"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "ఆసియా/వ�లాడివోస�టాక�"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "ఆసియా/యాక�ట�స�క�"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "ఆసియా/యెకాటెరింబర�గ�"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "ఆసియా/యెరెవాన�"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "అట�లాంటిక�/అజోరెస�"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "అట�లాంటిక�/బెర�మ�డా"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "అట�లాంటిక�/కెనరి"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "అట�లాంటిక�/కేప�‌వర�డే(_V)"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "అట�లాంటిక�/ఫెయోరె"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "అట�లాంటిక�/జాన�‌మయెన�(_M)"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "అట�లాంటిక�/మెడైరా"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "అట�లాంటిక�/రేక�‌జవిక�"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "అట�లాంటిక�/దక�షిణజార�జియా(_G)"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "అట�లాంటిక�/Stహెలెనా(_H)"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "అట�లాంటిక�/స�టాన�లీ"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "ఆస�ట�రేలియా/అడెలెడి"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "ఆస�ట�రేలియా/బ�రిస�బేన�"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "ఆస�ట�రేలియా/బ�రోకెన�‌హిల�(_H)"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "ఆస�ట�రేలియా/డార�విన�"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "ఆస�ట�రేలియా/హోబర�ట�"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "ఆస�ట�రేలియా/లిండెమన�"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "ఆస�ట�రేలియా/లార�డ�‌హోవ�(_H)"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "ఆస�ట�రేలియా/మెల�‌బోర�న�"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "ఆస�ట�రేలియా/పెర�త�"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "ఆస�ట�రేలియా/సిడ�ని"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "యూరప�/ఆమ�‌స�టర�‌డామ�"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "యూరప�/అండోరా"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "యూరప�/�థెన�స�"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "యూరప�/బెల�‌ఫాస�ట�"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "యూరప�/బెల�‌గ�రేడ�"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "యూరప�/బెర�లిన�"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "యూరప�/బ�రెస�టిస�‌లావా"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "యూరప�/బ�రస�సెల�స�"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "యూరప�/బ�కారెస�ట�"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "యూరప�/బ�డాపెస�ట�"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "యూరప�/చిసినావ�"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "యూరప�/కొపెన�‌హాగన�"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "యూరప�/డబ�లిన�"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "యూరప�/గ�రిబ�రాల�టర�"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "యూరప�/హెసిన�‌కి"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "యూరప�/ఇస�తాంబ�ల�"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "యూరప�/కెలెనిన�‌గార�డ�"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "యూరప�/కైవ�"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "యూరప�/లిస�బన�"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "యూరప�/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "యూరప�/లండన�"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "యూరప�/లగ�జమ�‌బర�గ�"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "యూరప�/మాడ�రిడ�"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "యూరప�/మాల�టా"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "యూరప�/మిన�సక�"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "యూరప�/మోనాకో"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "యూరప�/మాస�కో"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "యూరప�/నికోసియా"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "యూరప�/ఆస�లో"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "యూరప�/పారిస�"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "యూరప�/ప�రాగ�యూ"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "యూరప�/రిగా"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "యూరప�/రోమ�"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "యూరప�/సమరా"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "యూరప�/సాన�‌మారినో(_M)"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "యూరప�/సరజీవో"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "యూరప�/సిమ�‌ఫరోపోల�"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "యూరప�/స�కోప�జీ"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "యూరప�/సోఫియా"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "యూరప�/స�టాక�‌హోమ�"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "యూరప�/టెల�లిన�"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "యూరప�/టిరేన�"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "యూరప�/అజ�‌గొరాడ�"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "యూరప�/వాద�జ�"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "యూరప�/వాటికన�"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "యూరప�/వియన�నా"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "యూరప�/విల�నియస�"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "యూరప�/వర�‌సా"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "యూరప�/జాగ�రెబ�"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "యూరప�/జప�రోజియే"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "యూరప�/జ�రిచ�"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "ఇండియా/అంటనానారివో"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "ఇండియా/చాగోస�"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "ఇండియా/క�రిస�టమస�"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "ఇండియా/కోకోస�"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "ఇండియా/కోమోరో"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "ఇండియా/కెర�‌గ�వీలెన�"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "ఇండియా/మహె"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "ఇండియా/మాల�దీవ�ల�"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "ఇండియా/మారిషస�"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "ఇండియా/మయొట�టె"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "ఇండియా/రెయూనియన�"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "ఫసిఫిక�/అపాయ�"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "ఫసిఫిక�/ఆక�‌లాండ�"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "ఫసిఫిక�/చాతమ�"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "ఫసిఫిక�/ఈస�టర�"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "ఫసిఫిక�/ఇఫేట�"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "ఫసిఫిక�/ఎండర�‌బ�య�రి"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "ఫసిఫిక�/ఫకాఫో"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "ఫసిఫిక�/ఫిజి"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "ఫసిఫిక�/ఫ�య�నాఫ�య�టి"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "ఫసిఫిక�/గలాపగోస�"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "ఫసిఫిక�/గాంబియర�"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "ఫసిఫిక�/గ�వాడాల�‌కెనాల�"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "ఫసిఫిక�/గ�వామ�"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "ఫసిఫిక�/హోనోల�ల�"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "ఫసిఫిక�/జాన�‌స�టన�"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "ఫసిఫిక�/కిరిట�‌మటి"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "ఫసిఫిక�/కొస�రే"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "ఫసిఫిక�/క�వాజాలియన�"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "ఫసిఫిక�/మజ�రో"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "ఫసిఫిక�/మార�క�వెసాస�"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "ఫసిఫిక�/మిడ�‌వే"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "ఫసిఫిక�/నార�"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "ఫసిఫిక�/నియ�యే"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "ఫసిఫిక�/నార�‌ఫోల�క�"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "ఫసిఫిక�/నౌమియా"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "ఫసిఫిక�/పాగోపాగో(_P)"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "ఫసిఫిక�/పలావ�"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "ఫసిఫిక�/పిట�‌కైర�న�"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "ఫసిఫిక�/పొనాపె"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "ఫసిఫిక�/పోర�ట�‌మోరెస�బీ(_M)"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "ఫసిఫిక�/రరోటోంగా"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "ఫసిఫిక�/సైపాన�"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "ఫసిఫిక�/తాహితి"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "ఫసిఫిక�/తరవా"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "ఫసిఫిక�/టోంగాటప�"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "ఫసిఫిక�/ట�రంక�"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "ఫసిఫిక�/వేక�"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "ఫసిఫిక�/వాల�లిస�"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "ఫసిఫిక�/యప�"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "చిర�నామా ప�స�తకం కొరక� ఇక�కడ నొక�క�మ�"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "స�వయంచాలకంగాదాయ� దస�త�రాన�ని తెర�వబడలేద�"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "సరికూర�పరిన�ండి సందేశాన�ని వెలికితీయలేద�"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "సందేశాన�ని పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�మ�."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "అన�భందమ�న� చేర�చ�మ�"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�టక� ఇక�కడ నొక�కండి"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "అన�భందమ�(_t)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "సంతకం(_g):"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "శీర�షికలేని సందేశం"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "ఒక దస�త�రాన�ని జతపర�చ�మ�"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "మూయ�మ�(_C)"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "ప�రస�త�త దస�త�రాన�ని మూయ�మ�"
+
+#: ../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 "మ�ద�రించ�(_P)..."
+
+#: ../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 "మ�ద�రణ ఉపదర�శనం(_v)"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "ఇలా దాయ�మ�(_A)..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "ప�రస�త�త దస�త�రాన�ని వేరే పేర�తో దాయ�మ�"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "డ�రాఫ�ట� న� దాయ�మ�(_D)"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "డ�రాఫ�ట� గా దాయ�మ�"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "పంపించ�(_e)"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "ఈ సందేశాన�ని పంప�మ�"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "పంప� ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "కొత�త సందేశం (_M)"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "కొత�త సందేశం విండోన� తెర�వ�మ�"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "అక�షర సంకేతరచన (_E)"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "రక�షణ(_S)"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "PGP ని రహస�యపర�చ�(_E)"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "PGP తో ఈ సందెశాన�ని రహస�యపర�చ�"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "PGP సంతకం(_S)"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "మీ PGP మీటతో ఈ సందేశాన�ని సంతకంచేయ�మ�"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "సందేశాన�ని ప�రాధాన�యపర�చ�(_P)"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "సందేశ ప�రాధాన�యతన� ఎక�క�వగా అమర�చ�మ�"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "చదివినదాని రశీద�న� అభ�యర�దించ� (_q)"
+
+#: ../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 "S/MIME ని రహస�యపర�చ�(_c)"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "మీ S/MIME ఎన�క�రిప�షన� దృవీకరణపత�రం తో ఈ సందేశంన� ఎన�క�రిప�ట�చేయ�మ�"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "S/MIME సంతకం(_n)"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "మీ S/MIME సంతకం దృవీకరణపత�రం తో ఈ సందేశంన� సంతకంచేయ�మ�"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "_Bcc క�షేత�రమ�"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "BCC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "_Cc క�షేత�రమ�"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "CC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "క�షేత�రమ� న�ండి(_F)"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "ఎంపికదారి న�ండి ప�రదర�శించబడితే మార�మ�"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "వీరికి-పోస�ట� క�షేత�రం(_P)"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "వీరికి-పోస�ట� క�షేత�రం ప�రదర�శించబడితే మార�మ�"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "క�షేత�రానికి సమాధానం(_R)"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "వీరికి-ప�రత�య�త�తరమ� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "సబ�జక�ట�� క�షేత�రమ� (_S)"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "సబ�జక�ట�� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "క�షేత�రానికి(_T)"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "క� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "సందేశం యొక�క స�వీకరణదార�లన� ప�రవేశపెట�టండి"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "సందేశం యొక�క నకల�న� పొంద� వారి చిర�నామాలన� ప�రవేశపెట�టండి"
+
+#: ../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 ""
+"సందేశం యొక�క నకల�న� స�వీకరణదార�ల జాబితానంద� కనబడక�ండా తీస�క�నే వారి "
+"చిర�నామాలన� ప�రవేశపెట�టండి"
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "న�ండి(_o):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "క�-ప�రత�య�త�తరమ�(_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "క�(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "సందేశం యొక�క స�వీకరణదార�లన� ప�రవేశపెట�టండి"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "సందేశం యొక�క నకల�న� పొంద� వారి చిర�నామాలన� ప�రవేశపెట�టండి"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-#, fuzzy
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-"సందేశం యొక�క నకల�న� స�వీకరణదార�ల జాబితానంద� కనబడక�ండా తీస�క�నే వారి చిర�నామాలన� ప�రవేశపెట�టండి"
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "క� పోస�ట� చేయ�మ�(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "సంగతి(_u):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "అన�భందమ�(_t)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "సంతకం(_g):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "అన�భందమ�న� చేర�చ�మ�"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "చిర�నామా ప�స�తకం కొరక� ఇక�కడ నొక�క�మ�"
 
-#: ../composer/e-msg-composer.c:819
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"బయటక� వెళ�ళ� సందేశానికి సంతకాన�ని పెట�టలేద�: ఈ ఖాతా క� ఎట�వంటి సంతక దృవీకరణపత�రం అమర�చలేద�"
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
 
-#: ../composer/e-msg-composer.c:826
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"బయటక� వెళ�ళ� సందేశాన�ని ఎన�క�రిప�ట� చేయలేద�: ఈ ఖాతా క� ఎట�వంటి ఎన�క�రిప�షన� దృవీకరణపత�రం అమర�చలేద�"
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "సందేశాన�ని పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�మ�."
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2515
-msgid "Hide _Attachment Bar"
-msgstr "అన�భంద పట�టీని మర�గ�పర�చ�మ�(_A)"
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�టక� ఇక�కడ నొక�కండి"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2518
-#: ../composer/e-msg-composer.c:3884
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "అన�భంద పట�టీని చూప�మ�(_A)"
 
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "తెలియని కారణం"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "దస�త�రాన�ని తెర�వలేద�"
+#: ../composer/e-msg-composer.c:872
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "బయటక� వెళ�ళ� సందేశానికి సంతకాన�ని పెట�టలేద�: ఈ ఖాతా క� ఎట�వంటి సంతక దృవీకరణపత�రం అమర�చలేద�"
 
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "సరికూర�పరిన�ండి సందేశాన�ని వెలికితీయలేద�"
+#: ../composer/e-msg-composer.c:879
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "బయటక� వెళ�ళ� సందేశాన�ని ఎన�క�రిప�ట� చేయలేద�: ఈ ఖాతా క� ఎట�వంటి ఎన�క�రిప�షన� దృవీకరణపత�రం అమర�చలేద�"
 
-#: ../composer/e-msg-composer.c:1819
-msgid "Untitled Message"
-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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "అన�భందమ�"
+msgstr[1] "అన�భందమ�"
 
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1855
-msgid "Open File"
-msgstr "దస�త�రాన�ని తెర�వ�మ�"
+#: ../composer/e-msg-composer.c:1556
+msgid "Hide _Attachment Bar"
+msgstr "అన�భంద పట�టీని మర�గ�పర�చ�మ�(_A)"
 
-#: ../composer/e-msg-composer.c:2529 ../composer/e-msg-composer.c:3764
-#: ../composer/e-msg-composer.c:3767
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "సందేశాన�ని కూర�చ�మ�"
 
-#: ../composer/e-msg-composer.c:5037
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10218,8 +10801,7 @@ msgstr "మీర� ఖచ�చితంగా సందేశాన�ని
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "ఎంచేతంటే &quot;{0}&quot;, మీర� వేరే మెయిల� �చ�చికాలన� ఎంచ�కోవలిసి రావచ�చ�."
 
-#: ../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 "ఎంచేతంటే &quot;{1}&quot;."
 
@@ -10280,8 +10862,7 @@ msgstr ""
 msgid ""
 "Send options available only for Novell Groupwise and Microsoft Exchange "
 "accounts."
-msgstr ""
-"పంపే �చ�చికాల� Novell సమూహతరహా మరియ� Microsoft మార�పిడి ఖాతాలక� మాత�రమే అంద�బాట�లో ఉంటాయి."
+msgstr "పంపే �చ�చికాల� Novell సమూహతరహా మరియ� Microsoft మార�పిడి ఖాతాలక� మాత�రమే అంద�బాట�లో ఉంటాయి."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -10330,23 +10911,27 @@ msgstr "మీరà±� దసà±�à°¤à±�à°°à°‚ `{0}' à°¨à±� à°ˆ సందేశంà°
 msgid "You need to configure an account before you can compose mail."
 msgstr " తపాలా న� రచించ�టక� మ�ంద� మీర� ఒక ఖాతా న� సరిచేయవలెన�."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "సరికూర�చ�ట కొనసాగించ�(_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "తిరిగిపొందవద�ద�(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "తిరిగిపొంద�మ�(_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "సందేశాన�ని దాయ�మ�(_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "డ�రాప�ట��‌న� దాయ�మ� (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "ఎవల�యూషన� క�యాలెండర� మరియ� మెయిల�"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "సమూహతరహా సమసమితి"
 
@@ -10362,56 +10947,78 @@ msgstr "చిర�నామా కార�డ�"
 msgid "calendar information"
 msgstr "క�యాలెండర� సమాచారం"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "ఎవాల�యూషన� దోషం"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "ఎవాల�యూషన� హెచ�చరిక"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "ఎవాల�యూషన� సమాచారం"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "ఎవాల�యూషన� క�వరి"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "అంతర�గత దోషం, తెలియని దోషం '%s' అభ�యర�దించబడింది"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "మూలకం"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "లాగ�అయిన మూలకంయొక�క నామమ�"
+
+#: ../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
+msgid "Enabled"
+msgstr "క�రియాశీలీకరించిన"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "ప�లగ�‌ఇన� చేతనం చేయాలా"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "మ�ద�రించ�చ�న�నప�ప�డ� ఒక దోషం ఎద�రైంది"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "మ�ద�రాణా వ�యవస�థ దోషం గ�రించి ఈ క�రింది వివరాలన� నివేదించింది:"
 
-#: ../e-util/e-print.c:151
-msgid ""
-"The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:173
+msgid "The printing system did not report any additional details about the error."
 msgstr "మ�ద�రణా వ�యవస�థ దోషం గ�రించి � అదనప� వివరాలన� నివేదించలేద�."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "ఎంచేతంటే \"{1}\"."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "దస�త�రం &quot;{0}&quot; న� తెరవలేకపోయింది."
+msgid "Cannot open file \"{0}\"."
+msgstr "దస�త�రమ�న� తెర�వలేద� \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "దస�త�రం &quot;{0}&quot; న� దాచలేకపోయింది."
+msgid "Cannot save file \"{0}\"."
+msgstr "దస�త�రమ�న� దాయలేద� \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "మీర� దీనిని మరల వ�రాయదల�చ�క�ంట�న�నారా?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "దస�త�రం ఉన�నది &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
+msgstr "దస�త�రమ� వ�ంది \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10421,49 +11028,64 @@ msgstr "దస�త�రాన�ని మరలావ�రాయాలా?"
 msgid "_Overwrite"
 msgstr "మరలావ�రాయండి(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "ఎవాల�యూషన� కొరక� సహాయంన� ప�రదర�శించ లేకపోయింది."
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "మ�ఖ�యమైన(_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "పని(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "వ�యక�తిగత(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "చేయ�టక�(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "తర�వాత(_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "లేబ�ల� నామమ�(_N):"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "లేబ�ల� నామమ�"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "లేబ�ల� న� జతచేయ�మ�"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "లేబ�ల� నామమ� ఖాళీగా ఉండకూడద�."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-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
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf దోషమ�: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "తద�పరి అన�ని దోషమ�ల� టెర�మినల�‌పై మాత�రమే చూపబడ�న�."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10581,65 +11203,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "సరిపోల�చ�టక� ఒక సమయాన�ని ఎంచ�కొన�మ�"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "దస�త�రాన�ని ఎంచ�కొన�మ�"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "పరీక�ష"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "నియమం నామమ�(_u):"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "క�రింది విధానాన�ని పోలిఉండ� అంశమ�లన� కన�గొన�మ�"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "వడపోత విదానాన�ని జతచేయ�మ�(_d)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "ఒకవేళ అన�ని విధానాల� సరితూగితే"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "� విధానం అయినా సరితూగితే"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "అంశాలన� కన�గొన�మ�(_F):"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "సంభందితమ�ల� అన�నీన�"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "ప�రత�య�త�తరమ�ల�"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "మాత�ర�కల� మరియ� ప�రత�య�త�తరమ�ల�"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "� ప�రత�య�తరమ� లేదా మాత�ర�క లేద�"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "తంత�లన� చేర�చ�మ�(_n)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "లోపలికివచ�చ�"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "బయటక� వెళ�ళ�"
 
@@ -10663,7 +11285,7 @@ msgstr "తప�పిపోయిన తేది."
 msgid "Missing file name."
 msgstr "తప�పిపోయిన దస�త�రం నామమ�."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "తప�పిపోయిన నామమ�."
 
@@ -10739,7 +11361,7 @@ msgstr "ఇకమ�ంద�"
 msgid "months"
 msgstr "నెలల�"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "సెకన�ల�"
 
@@ -10751,9 +11373,10 @@ msgstr "ప�రస�త�త సమయం"
 msgid "the time you specify"
 msgstr "మీర� తెలిపిన సమయం"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "వారమ�ల�"
 
@@ -10769,7 +11392,7 @@ msgstr "నియమాన�ని జతచేయ�మ�"
 msgid "Edit Rule"
 msgstr "నియమాన�ని సరిచేయ�మ�"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "నియమం నామమ�"
 
@@ -10778,8 +11401,7 @@ msgid "Composer Preferences"
 msgstr "కూర�పరి అభీష�టాల�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "మెయిల� అభీష�టాలన� ఆకృతీకరించ�మ�, రక�షణ మరియ� సందశ ప�రదర�శన తో కలిపి, ఇక�కడ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -10791,57 +11413,69 @@ msgid "Configure your email accounts here"
 msgstr "మీ ఈమెయిల� ఖాతాలన� ఇక�కడ ఆకృతీకరించ�మ�"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "మీనెట�వర�క�� అన�సంధానం అమరికలన� ఆకృతీకరించ�మ�"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "ఎవాల�యూషన� మెయిల�"
 
-#: ../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 "ఎవాల�యూషన� మెయిల� ఖాతా ఆకృతీకరణ సాధనమ�ల�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "ఎవాల�యూషన� మెయిల� మూలకం"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "ఎవాల�యూషన� మెయిల� కూర�పరి"
 
-#: ../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 "ఎవాల�యూషన� మెయిల� కూర�పరి ఆకృతీకరణ నియంత�రిక"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "ఎవాల�యూషన� మెయిల� అభిష�టాల నియంత�రిక"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:576 ../mail/mail-component.c:577
-#: ../mail/mail-component.c:741
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "ఎవల�యూషన� నెట�వర�క�� ఆకృతీకరణ నియంత�రణ"
+
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "మెయిల�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "మెయిల� ఖాతాల�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "మెయిల� అభీష�టాల�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "నెట�వర�క�� అభీష�టాల�"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "మెయిల�(_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s లైసెన�స� ఒప�పందం"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10853,116 +11487,109 @@ msgstr ""
 "%s కొరక� క�రింద ప�రదర�శించబడిన లైసెన�స� ఒప�పందంన�\n"
 "జాగ�రత�తగా చదవండి మరియ� దానిని ఆమోదించ�టక� చెక�‌బాక�స�న� గ�ర�త�పెట�టండి\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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
 msgid "Autogenerated"
 msgstr "స�వయంచాలకంగాఉద�భవించిన"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "ప�రతి సందేశం కొరక� అడ�గ�మ�"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "గ�ర�తింప�"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "మెయిల� న� తీస�క�ంటోంది"
 
-#: ../mail/em-account-editor.c:2053
-#, fuzzy
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
-msgstr "కొత�త సందేశాల కొరక� పరిశీలిస�త�న�నది"
+msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "నిమిషాల�(_t)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "ఈమెయిల� పంపిస�త�న�నది"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "అప�రమేయాల�"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "రక�షణ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "కొత�త సందేశాల కొరక� పరిశీలిస�త�న�నది"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ఖాతా కూర�పరి"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "ఎవాల�యూషన� ఖాతా సహాయక�డ�"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[అప�రమేయ]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "క�రియాశీలీకరించిన"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "ఖాతా నామమ�"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "నియమం"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1066
+#: ../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 "నామమ�లేని"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "భాష(ల�)"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "సతకం లిపిని జతపర�చ�మ�"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "సంతకమ�(ల�)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- మ�ంద�క� పంపబడినసందేశం --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "తెలియని పంపకదార�"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10970,11 +11597,11 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone} నాడ�, ${Sender} వ�రాశార�:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----వాస�తన సందేశం-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "వడపోత నియమాల�(_F)"
 
@@ -10991,10 +11618,6 @@ msgstr "వర�ణమ�న� చేర�చ�మ�"
 msgid "Assign Score"
 msgstr "స�కోర�న� చేర�చ�మ�"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "అన�భందమ�ల�"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11011,10 +11634,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "పై మ�గించబడింది"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "కలిగిఉన�న"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "సంచయాన�ని నకల�తీయ�మ�"
@@ -11028,7 +11647,7 @@ msgid "Date sent"
 msgstr "తారీఖ� పంపబడినది"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11039,10 +11658,6 @@ msgstr "తొలగించ�"
 msgid "Deleted"
 msgstr "తొలగించబడింది"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "కలిగిలేద�"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "తో మ�గియద�"
@@ -11063,10 +11678,6 @@ msgstr "అలా ఉండ�టలేద�"
 msgid "does not start with"
 msgstr "తో ప�రారంభమగ�టలేద�"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "ఉండకూడద�"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "డ�రాఫ�ట�"
@@ -11075,10 +11686,6 @@ msgstr "డ�రాఫ�ట�"
 msgid "ends with"
 msgstr "తో మ�గింప�"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "ఉంది"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "ఉన�నాయి"
@@ -11091,14 +11698,10 @@ msgstr "ఎక�సప�రెషన�"
 msgid "Follow Up"
 msgstr "అన�సరించ�"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "మ�ఖ�యమైన"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "ఇక"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "ఇక తర�వాత"
@@ -11111,18 +11714,6 @@ msgstr "ఇంతక�మ�ంద�"
 msgid "is Flagged"
 msgstr "ప�లాగ�‌డ�"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "దీని కన�నా పెద�దది"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "దీని కన�నా చిన�నది"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ఇది కాద�"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ప�లాగ�‌డ� కాద�"
@@ -11135,7 +11726,7 @@ msgstr "అమర�చ లేద�"
 msgid "is set"
 msgstr "అమర�చ బడింది"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "నిరర�దకమైన"
@@ -11144,7 +11735,7 @@ msgstr "నిరర�దకమైన"
 msgid "Junk Test"
 msgstr "నిరర�దకమైన పరిశీలన"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "లేబ�ల�"
 
@@ -11186,7 +11777,7 @@ 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "చద�వ�మ�"
 
@@ -11258,10 +11849,9 @@ msgstr "తో ప�రారంభం"
 msgid "Stop Processing"
 msgstr "కార�యక�రమాన�ని ఆప�మ�"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11272,64 +11862,64 @@ msgid "Unset Status"
 msgstr "అమర�చని స�థితి"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "అప�ప�డ�"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "చర�యన� జతచేయ�మ�(_t)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "శోధన కొరక� శోధన సంచయాన�ని సృష�టించ�మ�(_r)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "అన�ని సందేశాల�"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "చద�వని సందేశాల�"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "లేబ�ల� లేద�"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "చదివిన సందేశాల�"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "ఇటీవలి సందేశాల�"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "గత 5 రోజ�ల' సందేశాల�"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "అన�భందమ�లతో సందేశాల�"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "మ�ఖ�యమైన సందేశాల�"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "నిరర�ధకమ�కాని సందేశాల�"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "ఖాతా శోధన"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "అన�ని ఖాతాల శోధన"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "చద�వని సందేశం:"
@@ -11337,32 +11927,51 @@ msgstr[1] "చద�వని సందేశాల�:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "మొత�తం సందేశాల�:"
 msgstr[1] "మొత�తం సందేశాల�:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "కేటాయింప� వినియోగమ� (%s):"
+
+#: ../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:160
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "ఇన�‌బాక�స�"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "సంచయం లక�షణాల�"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<సంచయం న� ఎంపికచేస�కొన�టక� ఇక�కడ నొక�కండి>"
 
-#: ../mail/em-folder-selector.c:262
-#, fuzzy
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
-msgstr "సృష�టించ�మ�(_r)"
+msgstr "సృష�టించ�మ� (_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "సంచయం నామమ�(_n):"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "సంచయాలన� శోధించ�మ�"
 
@@ -11371,27 +11980,19 @@ msgstr "సంచయాలన� శోధించ�మ�"
 msgid "UNMATCHED"
 msgstr "జతకాని"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "డ�రాఫ�ట�"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "ఇన�‌బాక�స�"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "అవ�ట�‌బాక�స�"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "పంపిన"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "నింపబడ�త�న�న..."
 
@@ -11410,387 +12011,373 @@ msgstr "నింపబడ�త�న�న..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
-msgstr "సంచయం-ప�రదర�శన|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "మెయిల� సంచయం వృక�షం"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "కద�ల�త�న�న సంచయం %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "నకల�తీయ�త�న�న సంచయం %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "సందేశాలన� సంచయం %s లోకి కద�ప�త�న�నది"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "సందేశాలన� సంచయం %s లోకి కద�ప�త�న�నది"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "సందేశమ�(ల)న� పైస�థాయి నిల�వక� వద�లలేమ�"
 
-#: ../mail/em-folder-tree.c:994 ../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 "సంచయంక� నకల�తీయ�మ�(_C)"
 
-#: ../mail/em-folder-tree.c:995 ../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 "సంచయంక� నకల�తీయ�మ�(_M)"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "దర�శనం(_V)"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "కొత�త విండో నంద� తెర�వ�మ�(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "కొత�త సంచయం(_N)..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "కద�ప�మ�(_M)..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "ప�నఃనామకరణ(_R)..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "రీఫ�రెష�(_f)"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "అవ�ట�‌బాక�స�  న� త�డిచివేయ�మ�(_u)"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "చెత�తక�ండీని ఖాళీచేయ�మ�(_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' న�ండి `%s' క� నకల�తీయ�చ�న�నది"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../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:83
 msgid "Select folder"
 msgstr "సంచయంన� ఎంపికచేస�కొన�మ�"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "నకల�తీయ�మ�(_o)"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "సంచయం `%s' న� సృష�టించ�ట"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "సంచయంన� సృష�టించ�ట"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "సంచయంన� ఎక�కడ సృష�టించాలో తెలియజేయ�మ�:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "మెయిల� న� తొలగించ�ట విఫలమైంది"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ఈ మెయిల� న� తొలగించ�టక� మీర� సరిపోవ�నంత అన�మత�లన� కలిగిలేర�."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "పంపకందార�క� ప�రత�య�త�తరం(_R)"
 
-#: ../mail/em-folder-view.c:1337 ../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 "మ�ంద�క�పంప�(_F)"
 
 #. 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:1341 ../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 "కొత�త సందేశం లాగా సరిచేయ�మ�(_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "మ�ద�రించ�(_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "తొలగించని(_n)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "సంచయంక� కద�ప�మ�(_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "సంచయంక� నకల�తీయ�మ�(_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "చదివినదానివలె గ�ర�తించ�మ�(_k)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "చదవనిదానివలె గర�తించ�మ�(_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "మ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "అమ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_i)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "నిరర�ధకమైన దానివలె గ�ర�తించ�మ�(_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "నిరర�ధకం కానిదానివలె గ�ర�తించ�మ�(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "అన�సరించ�ట కొరక� గ�ర�త�ంచ�మ�(_w)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "లెబ�ల�(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "�దికాద�(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "కొత�త లేబ�ల�(_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "ప�లాగ� పూర�తైనది(_g)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ప�లాగ� న� చెరిపివేయ�మ�(_e)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "సందేశంన�ండి నియమాన�ని సృష�టించ�మ�(_t)"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "అట�వంటి సంచయం సంగతి మీద ఆధారపడిఉంట�ంది(_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�(_n)..."
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�(_L)"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "సంగతి మీద ఆధారపడి వడపోయ�మ�(_j)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "పంపినవాని పై ఆధారపడి వడపోయ�మ�(_d)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "స�వీకరణదార�ల పై ఆధారపడి వడపోయ�మ�(_c)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "మెయిలింగ� జాబితా పై ఆధారపడి వడపోయ�మ�(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "అప�రమేయం"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "సందేశాన�ని వెలికితీయలేద�."
 
-#: ../mail/em-folder-view.c:2548
-#, fuzzy
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "సందేశాన�ని తిరిగి వెలికితీస�తోంది..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "క� కాల�‌చేయ�మ�(_a)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "శోధన సంచయాన�ని సృష�టించ�మ�(_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "ఈ చిర�నామా న�ండి(_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "ఈ చిర�నామాక�(_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s క� మెయిల� చేయ�టక� నొక�క�మ�"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "%s క� కాల�‌చేయ�టక� నొక�క�మ�"
 
-#: ../mail/em-folder-view.c:3326
+#: ../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:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "జోడీల�: %d"
 
-#: ../mail/em-format-html-display.c:659
-#, fuzzy
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
-msgstr "కన�గొన�మ�(_d):"
+msgstr "కన�గొన�మ� (_d):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "మ�ందలి(_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "తర�వాతి(_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "జోడీ కేస�(_a)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "సంతకంచేయని"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ఈ సందేశం సంతకంచేసినది కాద�. ఈ సందేశం దృవీకరించినదని � హామీ లోద�."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "విల�వైన సంతకం"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 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:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "చెల�లని సంతకం"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ఈ సందేశం యొక�క సంతకం నిర�ధారించబడిలేద�, బదిలీకరణలో మర�ప�చేందబడి ఉండవచ�చ�."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
-#, fuzzy
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "విల�వైన సంతకం, అయితే పంపకందారిని నిర�దారించలేమ�"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr ""
-"ఈ సందేశం విల�వైన సంతంకం తో సంతకంచేయ బడిఉంది, అయితే సందేశం యొక�క పంపకందార� నిర�దారించబడలేద�."
+msgstr "ఈ సందేశం విల�వైన సంతంకం తో సంతకంచేయ బడిఉంది, అయితే సందేశం యొక�క పంపకందార� నిర�దారించబడలేద�."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "సంతకం ఉంది, అయితే పబ�లిక� కీ అవసరం"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ఈ సందేశం సంతకంత పెట�టబడిఉంది, అయితే సభందిత పబ�లిక� కీ లేద�."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "అన�‌ఎన�క�రిప�టెడ�"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ఈ సందేశం ఎన�క�రిప�టెడ� కాద�. ఇంటర�నెట� నంద� దీని సారం సందర�శించబడి ఉండవచ�చ�."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "ఎన�క�రిప�టెడ�, బలహీనంగా"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11799,22 +12386,21 @@ msgstr ""
 "ఈ సందేశం ఎన�క�రిప�టెడ�, అయితే బలహీన ఎన�క�రిప�షన� అల�గార�ధెమ� తో. అది కష�టం కావచ�చ�, అయితే బయటివ�యక�తికి ఈ "
 "సందేశం సారాలన� అన�భవసిద�ద సమయంలో దర�శించ�ట అసాధ�యం కాకపోవచ�చ�."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "ఎన�క�రిప�టెడ�"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr ""
-"ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది.  బయటి వారికి ఈ సందేశం నందలి సారమ�న� చూడ�ట�క కష�టంగాఉంట�ంది."
+msgstr "ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది.  బయటి వారికి ఈ సందేశం నందలి సారమ�న� చూడ�ట�క కష�టంగాఉంట�ంది."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "ఎన�క�రిప�టెడ�, బలంగా"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11823,376 +12409,377 @@ msgstr ""
 "ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది, గట�టి ఎన�క�రిప�షన� అల�గార�ధెమ� తో, బయటవారికి ఈ సందేశంన� అవ�భవసిద�ద "
 "సమయంలో దర�శించ�ట చాలా కష�టంగా ఉంట�ంది."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "దృవీకరణపత�రం న� దర�శించ�(_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "ఈ దృవీకరణపత�రం దర�శించ�నట�ల� లేద�"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "వీటి పై పూర�తైనది %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "కాలమ�దాటిన:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ద�వారా"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "ఇన�‌లైన� న� దర�శించ�(_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "మర�గ�పర�చ�(_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "వెడల�ప�క� అమర�చ�మ�(_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "వాస�తవ పరిమాణంన� చూప�మ�(_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "అన�భందమ�"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "అన�భందమ�న� ఇలా దాచ�మ�"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "అన�ని అన�భందాలన� దాయ�టక� సంచయంన� ఎంచ�కొన�మ�"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "ఎంపికచేయబడ�డదానిని దాయ�మ�(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d అన�భందమ�(_t)"
 msgstr[1] "%d అన�భందమ�ల�(_t)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "దాయ�మ�(_a)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "అన�నిటినీ దాయ�మ�(_a)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "� అన�భందమ�లేద�"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "రూపీకరించని దర�శనం(_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "రూపీకరించనిదానిని మర�గ�పర�చ�మ�(_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "దీనితో తెర�వ�మ�(_p)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2473
 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 ""
-"సంభాలించ�టక� మరీ పెద�దదిగా ఉండ�టవలన ఈ ఇమెయిల� న� ఎవాల�యూషన� చూపించలేక పోయింది. మీర� దీనిని "
-"రూపీకరించనివిధంగా లేదా బాహ�య పాఠ�య కూర�పరి ద�వరా దర�శించవచ�చ�."
+"సంభాలించ�టక� మరీ పెద�దదిగా ఉండ�టవలన ఈ ఇమెయిల�‌న� ఎవాల�యూషన� చూపించలేక పోయింది. మీర� దీనిని "
+"రూపీకరించనివిధంగా లేదా బాహ�య పాఠ�యకూర�పరి ద�వారా దర�శించవచ�చ�."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d యొక�క ప�ట %1$d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' వెలికితీస�తోంది"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "అపరిచిత బాహ�య-మ�ఖ�యమైన భాగమ�."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "తప�ప�గాఉన�న బాహ�య-మ�ఖ�యమైన భాగమ�."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP సైట� (%s) క� సూచిక"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "స�థానిక దస�త�రం(%s)క� సూచిక సైట� \"%s\" వద�ద నిర�ధారించబడింది"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "స�థానిక దస�త�రం (%s) క� సూచిక"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "దూరస�థ డాటా (%s)క� సూచిక"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "తెలియని బహిర�గత డాటా క� సూచిక (\"%s\" రకం)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "రూపీకరిస�త�న�న సందేశం"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "రూపీకరిస�త�న�న సందేశం..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "మెయిలర�"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
-#, fuzzy
+#: ../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:1738
-#, fuzzy
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "తారీఖ�"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "సందేశం <b>%2$s</b> తర�ప�న <b>%1$s</b> ద�వారా పంపబడింది "
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "న�ండి"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 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
+msgid "Date"
+msgstr "తారీఖ�"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "వార�తాసమూహాల�"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s అన�భందమ�"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME సందేశంన� పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME సందేశంన� పార�శ� చేయలేకపోయింది. మూలంలాగా ప�రదర�శిస�తోంది."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "మల�టీపార�ట�/ఎన�క�రిప�టెడ� కొరక� మద�దతీయని ఎన�క�రిప�షన� రకం"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME సందేశాన�ని పార�శ� చేయలేకపోయింది"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME సందేశాన�ని పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "మద�దతీయని సంతకం రూపం"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "సంతకాన�ని నిర�దారించ�టలో దోషం"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "సంతకాన�ని నిర�దారించ�టలో తెలియని దోషం"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది: తెలియని దోషం"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "ప�రతి సారి"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "రోజ�క� ఒక సారి"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "వారమ�నక� ఒక సారి"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "నెలక� ఒక సారి"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "మ�ల�చ�క�న�న నిరర�దకప� పీఠికన� జతచేయ�మ�"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "పీఠిక నామమ�:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "పీఠిక విల�వ కలిగిఉండ�న�:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "కలిగిఉండ� విల�వ"
 
-#: ../mail/em-mailer-prefs.c:473
-#, fuzzy
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "వర�ణమ�"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "టాగ�"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ప�లగ�ఇన� అంద�బాట�లోఉంది మరియ� బైనరీ సంస�థాపించబడెన�."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ప�లగ�ఇన� అంద�బాట�లో లేద�. దయచేసి ప�యాకేజి సంస�థాపించబడిందేమో పరీక�షించండి."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "� నిరర�ధక ప�లగ�ఇన� అంద�బాట�లో లేద�"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "చేయ�టక�"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "తర�వాత"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"ఎనాల�యూషన� 1.x న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క స�థానమ� మరియ� పారంపరమ� మర�చబడింది.\n"
-"\n"
-"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఒర�ప�తో ఉండండి..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "కొత�త సంచయం సృష�టించలేక పోయింది `%s': %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "సచయం `%s' న� `%s' క� నకల�తీయలేక పోయింది: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' వద�ద ఉన�న మెయిల�‌పెట�టెల కొరక� స�కాన� తీయలేకపోయింది: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"ఎనాల�యూషన� 1.x న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క స�థానమ� మరియ� పారంపరమ� మర�చబడింది.\n"
+"\n"
+"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఒర�ప�తో ఉండండి..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "పాత POP సేవిక-లో-ఉంచ� డాటా `%s' న� తెర�వలేకపోయింది: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 సేవిక-లో-ఉంచ� డాటా సంచయం `%s' న� సృష�టించలేక పోయింది: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 సేవిక-లో-ఉంచ� డాటా `%s' న� నకల�తీయ లోకపోయింది: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "స�థానిక మెయిల� నిల�వ `%s' న� సృష�టించ�టలో విఫలమైంది: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"ఎనాల�యూషన� 2.24 న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క సంక�షిప�త రూపంన� "
+"sqliteక� మార�చబడింది.\n"
+"\n"
+"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి వోర�ప�తో వ�ండండి..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "స�థానిక మెయిల� సంచయాలన� `%s' వద�ద సృష�టించలేక పోయింది: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12200,208 +12787,243 @@ msgstr ""
 "మ�న�పటి ఎవాల�యూషన� సంస�థాపన న�ండి అమరికలన� చద�వలేక పోయింది. `ఎవాల�య�షన�/ config.xmldb' లేద� "
 "లేదా పాడైనది."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "పంపకందార� కి ప�రత�య�త�తరం(_R)"
 
-#: ../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 "జాబితాకి ప�రత�య�త�తరం(_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "చిర�నామా ప�స�తకంక� కల�ప�మ�(_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ఈ నిల�వ చందాలక� మద�దత�నీయద�, లేదా అవి చేతనంకాబడిలేవ�."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "చందాకాబడిన"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "సంచయం"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "దయచేసి ఒక సేవికన� ఎంపికచేయ�మ�."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "�సేవిక ఎంపికకాబడలేద�"
 
-#: ../mail/em-utils.c:121
-#, fuzzy
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
-msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద�(_D)."
+msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద� (_D)."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "సందేశం వడపోతల�"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "సందేశం"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "సందేశంన� దాయ�మ�..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "చిర�నామాన� జతచేయ�మ�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s న�ండి సందేశాల�"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "సంచయాలన� శోధించ�మ�(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "సంచయం మూలంన� శోధించ�"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"మెయిల�‌న� పంపించ� మరియ� స�వీకరించ�\" విండో ఎత�త�"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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 "పరిమిత పరిమాణం యొక�క పాఠ�య భాగమ�న� ప�రదర�శించ�టక� ఎవాల�యూషన� న� అన�మతించ�"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "చదివిన రిసిప�ట�న� ఎల�లప�ప�డ� అభ�యర�దించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "దోషం న� స�థితిపట�టీ పై చూపించవలిసిన సమయం సెకన�లలో"
+msgstr "దోషంన� స�థితిపట�టీపై చూపించవలిసిన సమయం సెకన�లలో."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "emoticon న� స�వయంచాలకంగా గ�ర�తించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "స�వయంచాలక జోడి గ�ర�తింప�"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "లోనికవస�త�న�న మెయిల� నిరర�ధకం అగ�టన� పరిశీలించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "సిటేషన� ఉద�దీపన వర�ణమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "సిటేషన� ఉద�దీపన వర�ణమ�."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "కూర�పరి విండో అప�రమేయ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "కూర�పరి విండో అప�రమేయ ‌వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "కూర�పరి నింప�/అన�భందం సంచయం"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� క�చింప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� address_count నంద� తెలిపినవిధంగా క�చింప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 ""
+"రిమోట� మెయిల� సేవికతో స�థానిక మార�ప�ల� ఎంతతరచ�గా సింక�రనైజ� చేయబడతాయో నియత�రిస�త�ంది. "
+"విరామం తప�పక 30 సెకన�ల� వ�ండాలి."
+
+#: ../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 ""
+"నిరర�ధకం కొరక� పరిశీలిస�త�న�నప�ప�డ� వ�పయోగించ�టక� మల�చ�క�న�న పీఠికల�. "
+"\"headername=value\" రూపకంలో జాబితా మూలకంల� స�ట�రింగ�."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "సందేశాలన� దేనితో కూర�చాలో ఆ అప�రమేయ అక�షరసమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "సందేశాలన� దేనితో కూర�చలో ఆ అప�రమేయ అక�షరసమితి."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "సందేశాలన� దేనితో ప�రదర�శించాలో ఆ అప�రమేయ అక�షరసమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "సందేశాలన� దేనితో ప�రదర�శించాలో ఆ అప�రమేయ అక�షరసమితి."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "మ�ంద�క�పంప�టక� అప�రమేయ శైలి"
 
-#: ../mail/evolution-mail.schemas.in.h:19
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:20
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "సందేశ విండో యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:21
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
-msgstr "చందాదార� డైలాగ� యొక�క అప�రమేయ ఎత�త�."
+msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "అప�రమేయ ప�రత�య�త�తరమ� శైలి"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "తంతి విస�తరింప� స�థితి కొరక� అప�రమేయ విల�వ"
 
-#: ../mail/evolution-mail.schemas.in.h:24
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:25
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "సందేశం విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
-msgstr "చందా డైలాగ� యొక�క అప�పమేయ వెడల�ప�."
+msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�పమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../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:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "పంపకందార� ఇమెయిల� కొరక� చిర�నామా ప�స�తంకంనంద� చూడాలేమో నిర�ధారిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "చిర�నామా ప�స�తకంలో పంపకందార� ఈమెయిల� న� చూడాలేమో నిర�ణయిస�త�ంది. కనబడితే, ఇది స�పామ� కాద�. ఇది "
 "స�వయంచాలకమ�గింప�క� గ�ర�త�ంచిన ప�స�తకంలంద� కనిపిస�త�ంది. ఇది నెమ�మది అవ�వచ�చ�, ఒకవేళ దూరస�థ "
 "చిర�నామాప�స�తకాల� (ldap వంటివి) స�వయంచాలకమ�గింప� క� గ�ర�త�ంచబడితే."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../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:30
+#: ../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 "
@@ -12410,62 +13032,67 @@ msgstr ""
 "నిరర�ధకం న� పరిశీలించ�ట కొరక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో నిర�ధారిస�త�ంది. ఈ �చ�చికం చేతనం "
 "అయ�యి పీఠికలన� తెల�పబడితే, ఇది నిరర�ధకం న� పరిశీలించే వేగంన� మెర�గ�పర�స�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../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:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "కూర�పరికి దస�త�రాలన� నింప�టక�/అన�భందించ�టక� సంచయం."
 
-#: ../mail/evolution-mail.schemas.in.h:33
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "మెయిల� మూలకం దస�త�రాలన� దాయ�టక� సంచయం."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� నిరర�ధక సంచయాలన� ఖాళీచేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� చెత�తక�ండీ సంచయాలన� ఖాళీ చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ఎవాల�య�షన� బయటక� వచ�చ�నప�ప�డ� అన�ని నిరర�ధక సంచయాలన� ఖాళీ చేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ఎవాల�యూషన� బయటక� వచ�చ�నప�ప�డ� అన�ని చెత�తక�ండి సంచయాలన� ఖాళీచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../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:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "మాయా స�పేస� పట�టీని చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "టైప�చేయ�దానికి మ�ంది శోధన సౌలబ�యాన�ని చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "శోధన సంచయాలన� చేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "శోధన సంచయాలన� ప�రారంభంనంద� చేతనంచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12476,7 +13103,7 @@ msgstr ""
 "ప�రారంభిచవచ�చ�. దీవి ఉపయోగం �మిటంటే మీర� ప�రక�కపట�టీ లో సంచయ నామమ� న� టైప� చేయ�టద�వరా సంచయంన� "
 "కన�గోనవచ�చ� మరియ� ఎంపిక స�వయంచాలకంగా ఆ సంచయంక� దూక�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12484,27 +13111,27 @@ msgstr ""
 "సందేశం ఉపదర�శనం నంద� స�పేస� బార� కీని స�క�రాల� చేయ�టక� ఉపయోగించ�టక� దీనిని చేతనంచేయ�మ�, సందేశం జాబితా "
 "మరియ� సంచయాల�."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "పరిమిత పరిమాణం యొక�క సందేశం పాఠ�య విభాగం చూప�టక� చేతనంచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "అక�షరరీతిని చేతనం/అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "సందేశ-జాబితా తలం యొక�క ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "సందేశ-జాబితా తలం యొక�క ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ఒక�కో-సంచయంక� ఉపదర�శనంన� మర�గ�పర�చ�మ� మరియ� ఎంపికన� తీసివేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12512,14 +13139,13 @@ msgstr ""
 "వినియోగదారి 10 లేదా ఎక�క�వ సందేశాలన� ఒక సమయంనంద� తెర�వ�టక� ప�రయత�నిస�తే, వినియోగదారిని నిజంగా "
 "చేయాలన�క�ంట�న�నారేమో అడ�గ�."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
-msgstr ""
-"ఒకవేళ \"ఉపదర�శనం\" తలం చేతనంగాఉంటే, అప�పడ� దానిని ప�రక�క-ప�రక�కనే చూప�మ� నిల�వ�గా చూప�టకంటే."
+msgstr "ఒకవేళ \"ఉపదర�శనం\" తలం చేతనంగాఉంటే, అప�పడ� దానిని ప�రక�క-ప�రక�కనే చూప�మ� నిల�వ�గా చూప�టకంటే."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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 "
@@ -12529,20 +13155,48 @@ msgstr ""
 "రకాల� GNOME యొక�క mime-రంకం డాటాబేస� బొనోబొ-మూలకం దర�శని కి సూచించబడినవో దానిని ప�రదర�శనకొరక� "
 "ఉపయోగించ�కొనవచ�చ�."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� "
+"మార�చినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
+
+#: ../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 ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి విండోన� "
+"పెద�దది లేదా చిన�నది చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" "
+"విండో పెద�దది చేయ�నంతవరక� ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ "
+"అభివృద�ద వివరంగా మాత�రమేవ�ంది."
+
+#: ../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:55
-#, fuzzy
+#: ../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:56
+#: ../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 "
@@ -12551,31 +13205,31 @@ msgstr ""
 "శోధన సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది చేతనం/అచేతనం "
 "చేస�త�ంది, శోధన ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "గతసారి ఖాళీ నిరర�ధకం నడ�పబడింది"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "చివరిసారి ఖాళీ చెత�తక�ండి నడ�పబడింది"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "� స�థాయి కి క�రింద సందేశం లాగిన� అవ�వాలో."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "లేబ�ళ�ళ యొక�క జాబితా మరియ� సంభందిత వర�ణమ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "ఆమోదించిన లైసెన�సెస� యొక�క జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "ఖాతాల యొక�క జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12583,11 +13237,15 @@ msgstr ""
 "ఎవాల�య�షన� యొక�క మెయిల� మూలకంక� తెలిసిన ఖాతాల జాబితా. ఆ జాబితా /apps/evolution/mail/accounts క� "
 "సారూప�యంగాఉన�న ఉపసంచయాల నామాలన� కలిగిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "మల�చ�క�న�న పీఠికల జాబితా మరియ� అవి చేతనంగా ఉన�నాయా."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "స�పెల� పరిశీలనకొరక� పదకోశప� భాషా కొడ�‌ల జాబితా వ�పయోగించబడింది."
+
+#: ../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."
@@ -12595,128 +13253,125 @@ msgstr ""
 "ఎవాల�యూషన� యొక�క మెయిల� మూలకంక� తెలిసిన లేబ�ల�స� యొక�క జాబితా. ఆ జాబితా ఈ నామాలన� కలిగిఉన�న స�ట�రింగ�స�న� "
 "కలిగిఉంట�ంది: వర�ణమ� ల� HTML hex ఎన�కోడింగ� న� వాడతాయో ఆవర�ణాల."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "బొనాబో మూలకం దర�శక�ల కొరక� పరిశీలించ�టక� mime రకాల జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "ఎవరి లైసెన�స� ఆమోదించబడిందో వారి నియమం నామాల జాబితా."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "http పై HTML సందేశాలకొరక� చిత�రాలన� నింప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
-#, fuzzy
+#: ../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 ""
-"http(s) నంద� HTML సందేశాల కొరక� చిత�రాలన� నింప�మ�. సాధ�యమగ� విల�వల�: 0 - ఎప�పడూ నెట� న�ండి "
-"చిత�రాలన� నింపద�. 1 - పరిచయాలన�ండి చిత�రాలన� సందేశాల నంద� నింప�త�ంది. 2 - ఎప�ప�డ� చిత�రాలన� నెట� "
+"http(s) నంద� HTML సందేశాల కొరక� చిత�రాలన� నింప�మ�. సాధ�యమగ� విల�వల�: \"0\" - ఎప�పడూ నెట� న�ండి "
+"చిత�రాలన� నింపద�. \"1\" - పరిచయాలన�ండి చిత�రాలన� సందేశాల నంద� నింప�త�ంది. \"2\" - ఎప�ప�డ� చిత�రాలన� నెట� "
 "న�ండి నింప�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "వడపోత చర�యలన� లాగిన�‌చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "తెల�పబడినట�వంటి లాగ� దస�త�రమ�లక� వడపోత చర�యలన� లాగ� చేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "లాగ� వడపోత చర�యలక� లాగ�‌దస�త�రం"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "లాగ� వడపోత చర�యలక� లాగ�‌దస�త�రం."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "తెల�పబడిన సమయనియమితి తర�వాత చూచినట�ల� గ�ర�త�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "తెల�పబడిన సమయనియమితి తర�వాత చూచినట�ల� గ�ర�త�ంచ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "సందేశం \"ఉపదర�శనం\" లో సిటేషన�లన� గర�త�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "సందేశం \"ఉపదర�శనం\" లో సిటేషన�లన� గర�త�ంచ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "సందేశ విండో అప�రమేయ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "సందేశ విండో అప�రమేయ వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "సందేశ-ప�రదర�శన శైలి (\"సాదారణ\", \"పూర�తి పీఠికల�\", \"మూలం\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "బయటక�వచ�చిన తర�వాత నిరర�ధకంన� ఖాళీచేయ�టక� మధ�యలో కనీస రోజ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "బయటక�వచ�చిన తర�వాత చెత�తక�ండీన� ఖాళీచేయ�టక� మధ�యలో కనీస రోజ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC లో ప�రదర�శితమగ�టక� చిర�నామాల సంఖ�య"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "ఖాళీ సంగతి పై అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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:88
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../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:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "శోధన సంచయంలో సందేశాలన� తొలగించ�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "వినియోగదారి కొట�టివేయబడ�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "వినియోగదారి మాత�రమే Bcc ని నింప�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"వినియోగదారి 10 లేక అంతకన�నా ఎక�క�వ సందేశాలన� ఒకేసారి తెర�చ�టక� ప�రయత�నిస�త�న�నప�ప�డ� అడ�గ�మ�"
+msgstr "వినియోగదారి 10 లేక అంతకన�నా ఎక�క�వ సందేశాలన� ఒకేసారి తెర�చ�టక� ప�రయత�నిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
@@ -12724,145 +13379,141 @@ msgstr ""
 "HTML మెయిల� న� స�వీకరించనబోనట�వంటి స�వీకరణదార�లక� వినియోగదారి HTML మెయిల� న� పంప�టక� ప�రయత�నిస�త�ంటే "
 "అడ�గ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"వినియోగదారి To లేదా Cc స�వీకరణదార�లన� లేక�ండా సందేశంన� పంప�టక� వినియోగదారి ప�రయత�నిస�త�ంటే అడ�గ�మ�."
+msgstr "వినియోగదారి To లేదా Cc స�వీకరణదార�లన� లేక�ండా సందేశంన� పంప�టక� వినియోగదారి ప�రయత�నిస�త�ంటే అడ�గ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "వినియోగదారి కొరనట�వంటి HTML న� పంప�టక� ప�రయత�నిస�త�ంటే అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:98
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "పాఠ�యమ�లోని emoticons న� గ�ర�తించి మరియ� వాటిని చిత�రమ�లతో ప�నఃస�థాపించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "పాఠ�యమ�లోని లింక�లన� గ�ర�తించి మరియ� వాటిని ప�నఃస�థాపించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:100
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
-msgstr "లోనికివస�త�న�న మెయిల� పై నిరర�ధకమైనదేమో పరిశీలనజర�ప�మ�."
+msgstr "లోనికివస�త�న�న మెయిల� నిరర�ధకమైనదేమో పరిశీలనజర�ప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "సంచయంన� దాయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-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:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "అప�రమేయంగా HTML మెయిల� న� పంప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "అప�రమేయంగా HTML మెయిల� న� పంప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:105
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
-msgstr "సందేశ జాబితాలో సందేశాల నిల�వ�వర�స లోపంపకందార� ఇమెయిల� న� చూప�మ�"
+msgstr "సందేశ జాబితాలో పంపినవాని ఈమెయిల�-చిర�నామా కాలమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "సేవిక సింక�రనైజేషన� విరామం"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "యానిమేషన�లన� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "యానిమేషన�లలాగా యానిమేటెడ� చిత�రాలన� చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "తొలిగించిన సందేశాలన� సందేశ-జాబితా నంద� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "పంపకందార� యొక�క ఛాయాచిత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "సందేశ జాబితా లో సందేశాల మిశ�రమ నిల�వ�వర�స లో పంపకందార� ఇమెయిల� న� చూప�మ�."
+msgstr "సందేశ జాబితాలో ప�రత�యేక కాలమ�‌నంద� పంపినవానియొక�క ఈమెయిల�-చిర�నామాన� చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr "నిరర�ధకం కొరక� పరిశీలించ�టక� పీఠికన� తెల�ప�మ�."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr "నిరర�ధకం కొరక� పరిశీలించ�టక� పీఠికన� తెల�ప�మ�. రూపం పీఠికనామమ�=విల�వ gconf లో."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "ఇన�‌లైన� లో స�పెల�‌ పరిశీలన"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "స�పెల� పరిశీలన వర�ణమ�"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "స�పెల� పరిశీలన భాషల�"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "చందా డైలాగ� అప�రమేయ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "చందా డైలాగ� అప�రమేయ వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "టెర�మినల� ఫాంట�"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "పాఠ�య సందేశ భాగప� పరిమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "నిరర�ధక హ�క� కొరక� అప�రమేయ ప�లగ�ఇన�"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "గతసారి ఖాళీ నిరర�ధకం నడ�స�త�న�నది, రోజ�లలో epoch న�ండి."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "గతసారి ఖాళీ చెత�తక�ండి నడ�స�త�న�నది, రోజ�లలో epoch న�ండి."
 
-#: ../mail/evolution-mail.schemas.in.h:125
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
-msgstr "టెర�మినల� ఫాంట� మెయిల� ప�రదర�శన కొరక�."
+msgstr "మెయిల� ప�రదర�శన కొరక� టెర�మినల� ఫాంట�."
 
-#: ../mail/evolution-mail.schemas.in.h:126
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "మెయిల� ప�రదర�శన కొరక� వేరియబ�ల� వెడల�ప� ఫాంట�."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"ఇది మూడ� విల�వ�లన� కలిగిఉండవచ�చ�. దోషమ�ల కొరక� 0.హెచ�చరికల కొరక� 1. డీబగ� సందేశాల కొరక� 2."
+"ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� \"0\". "
+"హెచ�చరికల కొరక� \"1\". డీబగ� సందేశాల కొరక� \"2\"."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -12870,25 +13521,26 @@ msgstr ""
 "ఎవాల�యూషన� క�రింది రూపీకరించబడే పాఠ�యమ� యొక�క గరిష�ట పరిమాణంన� ఇది నిర�ధారిస�త�ంది. అప�రమేయ 4MB / 4096 "
 "KB మరియ� KB ల రూపంలో తెల�పబడింది."
 
-#: ../mail/evolution-mail.schemas.in.h:129
-#, fuzzy
+#: ../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:130
+#: ../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:131
+#: ../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;"
@@ -12899,11 +13551,21 @@ msgstr ""
 "XML ఆకృతి యొక�క రూపం &lt;పీఠిత చేతనమైంది&gt; - పీఠిక మెయిల� దర�శనం లో ప�రదర�శించాలంటే చేతనం "
 "అమర�చండి."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "ఈ �చ�చికం సంగ�రహం యొక�క వేగంన� మెర�గ�పరచ�టక� దోహదపడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../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."
@@ -12911,16 +13573,15 @@ msgstr ""
 "అప�రమేయ సందేశ జాబితా దర�శనంలో చూపవలిసిన చిర�నామాల సంఖ�యన� ఇది అమర�చ�త�ంది, వెన�క �దైతే '...' "
 "చూపబడ�త�ందో."
 
-#: ../mail/evolution-mail.schemas.in.h:134
-#, fuzzy
+#: ../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 ""
-"తంత�ల� విస�తరింప�లో ఉండాలో లేదా అప�రమేయంగా కూల�చిన స�థితినంద� ఉడాలో ఈ అమరిక తెల�ప�త�ంది. ఎవాల�యూషన� "
-"క� ప�నఃప�రారంభం అవసరం."
+"తంత�ల� అప�రమేయంగా విస�తరింప�లో వ�ండాలో లేదా కూల�చిన స�థితినంద� వ�ండాలో "
+"ఈ అమరిక తెల�ప�త�ంది. ఎవాల�యూషన�‌క� ప�నఃప�రారంభం అవసరం."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
@@ -12929,111 +13590,117 @@ msgstr ""
 "ప�రతి తంతినంద� సందేశమ�ల తేదీలపై ఆధారపడ�ట కన�నా సరికొత�త సందేశం లపై ఆధారపడి తంత�ల� క�రమపరచాలేమో, ఈ "
 "అమర�ప� తెలియజేస�త�ంది. ఎవాల�య�షన� క� ప�నఃప�రారంభం అవసరం."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "సందేశ జాబితాన� తంతిచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "సందేశ-జాబితాన� తంతిచేయ�మ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "సంగతి పై ఆదారపడి సందేశ-జాబితాన� తంతిచేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:139
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
-msgstr "సందేశాన�ని దృశ�యంలాగా గ�ర�త�ంచ�టక� సమయంమించినది"
+msgstr "సందేశాన�ని చూసినదానిలా గ�ర�త�ంచ�టక� సమయంమించినది"
 
-#: ../mail/evolution-mail.schemas.in.h:140
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
-msgstr "చూచినట�ల�గా సందేశాలన� గ�ర�తించ�టక� సమయం మించిపోయింది."
+msgstr "చూచినట�ల�గా సందేశాన�ని గ�ర�త�ంచ�టక� సమయం మించిపోయింది."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "అప�రమేయ ఖాతా యొక�క UID స�ట�రింగ�."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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:143
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార�(spamc/spamd)న� ఉపయోగించ�మ�."
+msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార� (spamc/spamd)న� వ�పయోగించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "మల�చ�క�న�న ఫాంట�లన� ఉపయోగించ�"
 
-#: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
-msgstr "మెయిల� న� ప�రదర�శించ�టక� మల�చ�క�న�న ఫాంట�లన� ఉపయోగించ�."
+msgstr "మెయిల�‌న� ప�రదర�శించ�టక� మల�చ�క�న�న ఫాంట�లన� వ�పయోగించ�."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే ఉపయోగించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే పరిశీలించ�మ� (DNS కాద�)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "ప�రక�క-ప�రక�కగా-ఉండ� లేదా వెడల�పాటి వాస�త�న� ఉపయోగించ�"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "వేరియబ�ల� వెడల�ప� ఫాంట�"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "దర�శించ�/Bcc మెనూ అంశమ� చెక�‌చేయబడిఉంది"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "దర�శించ�/Bcc మెనూ అంశమ� చెక�‌చేయబడిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "దర�శించ�/cc మెనూ అంశమ� చెక�‌చేయబడిఉంది"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "దర�శించ�/cc మెనూ అంశమ� చెక�‌చేయబడిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "దర�శించ�/న�ండి మెనూ అంశమ� చెక�‌చేయబడిఉంది"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "దర�శించ�/న�ండి మెనూ అంశమ� చెక�‌చేయబడిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "దర�శించ�/పోస�ట� మెనూ అంశమ� చెక�‌చేయబడిఉంది"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "దర�శించ�/పోస�ట� మెనూ అంశమ� చెక�‌చేయబడిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "దర�శించ�/ప�రత�య�త�తరమ� మెనూ అంశమ� చెక�‌చేయబడిఉంది"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "దర�శించ�/ప�రత�య�త�తరమ� మెనూ అంశమ� చెక�‌చేయబడిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../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:161
+#: ../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."
@@ -13041,43 +13708,43 @@ msgstr ""
 "సందేశం దీనికి-ప�రత�య�త�తరంగా లేదా సంప�రదించ�చూ పీఠికలన� కలిగిలేనప�ప�డ� సంగత�ల ద�వారా తంతీకరణ పై "
 "వెన�కక� వేళ�ళాలా వద�దా."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../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:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "సందేశ-జాబితా తలం యొక�క వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "సందేశ-జాబితా తలం యొక�క వెడల�ప�."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm డాటాన� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "ఎవాల�యూషన� Elm దిగ�మతిదారి"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm న�ండి మెయిల� న� దిగ�మతి చేయ�మ�."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "గమ�యస�థాన సంచయం:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "దీనిలోకి దిగ�మతిచేయ�టక� సంచయంన� ఎంపికచేయ�మ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "బెర�కెలి మెయిల�‌బాక�స� (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "దిగ�మతిదారి బెర�కెలి మెయిల�‌పెట�టె రూపం సంచయాల�"
 
@@ -13085,7 +13752,7 @@ msgstr "దిగà±�మతిదారి బెరà±�కెలి మెయిà
 msgid "Importing mailbox"
 msgstr "మెయిల�‌పెట�టెన� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' న� దిగ�మతిచేస�తోంది"
@@ -13095,191 +13762,205 @@ msgstr "`%s' న� దిగ�మతిచేస�తోంది"
 msgid "Scanning %s"
 msgstr "%s న� స�కానింగ� చేస�తోంది"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "పైన� డాటాన� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "ఎవాల�యూషన� పైన� దిగ�మతిదారి"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "పైన� న�ండి మెయిల� దిగ�మతిచేయ�మ�."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "%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 "%s న�ండి మెయిల�"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "సంగతి %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s మెయిలింగ� జాబితా"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "వడపోత నియమాన�ని జతచేయ�మ�"
 
-#: ../mail/mail-component.c:537
-#, fuzzy, c-format
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "మాదిరిల�"
+
+#: ../mail/mail-component.c:550
+#, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d ఎంపికచేయబడెన�, "
 msgstr[1] "%d ఎంపికచేయబడెన�, "
 
-#: ../mail/mail-component.c:541
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d తొలగించబడెన�"
 msgstr[1] "%d తొలగించబడెన�"
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d నిరర�ధకమైన"
 msgstr[1] "%d నిరర�ధకమైన"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d డ�రాఫ�ట�స�"
 msgstr[1] "%d డ�రాఫ�ట�స�"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d పంపిన"
 msgstr[1] "%d పంపిన"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d పంపని"
 msgstr[1] "%d పంపని"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d చదవని, "
 msgstr[1] "%d చదవని, "
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d మొత�తం"
 msgstr[1] "%d మొత�తం"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "సరికొత�త తపాలా సందేశం"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
-msgstr "తపాలా సందేశం(_M)"
+msgstr "తపాలా సందేశం (_M)"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "కొత�త మెయిల� సందేశం న� కూర�చ�మ�"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "కొత�త మెయిల� సంచయం"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
-msgstr "మెయిల� సంచయం(_F)"
+msgstr "మెయిల� ఫోల�డర� (_F)"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "కొత�త మెయిల� సంచయంన� సృష�టించ�మ�"
 
-#: ../mail/mail-component.c:1054
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "మెయిల� అమరికలన� లేదా సంచయాలన� నవీకరించ�టలో విఫలమైంది."
 
-#: ../mail/mail-component.c:1515
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "దోషం"
 
-#: ../mail/mail-component.c:1515
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "దోషాల�"
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "హెచ�చరికల� మరియ� దోషాల�"
 
-#: ../mail/mail-component.c:1517
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "డీబగ�"
 
-#: ../mail/mail-component.c:1517
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "దోషం, హెచ�చరికల� మరియ� డీబగ� సందేశాల�"
 
-#: ../mail/mail-component.c:1627
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "డీబగ� లాగ�‌ల�"
 
-#: ../mail/mail-component.c:1631
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "దీని కొరక� స�థితపట�టీ నంద� దోషాలన� చూప�మ�(_e)"
 
-#: ../mail/mail-component.c:1638
-msgid "seconds."
-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
+msgid "second(s)."
+msgstr "సెకన�(ల�)."
 
-#: ../mail/mail-component.c:1648
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "లాగ� సందేశాల�:"
 
-#: ../mail/mail-component.c:1700
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "లాగ� స�థాయి"
 
-#: ../mail/mail-component.c:1707 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "సమయం"
 
-#: ../mail/mail-component.c:1714 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "సందేశాల�"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "ఈ గవాక�షాన�ని మూయ�మ�"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "మద�దతిచ�చే రకాలకొరక� పరిశీలించ�మ�(_e) "
 
 #: ../mail/mail-config.glade.h:2
-#, fuzzy
 msgid "(Note: Requires restart of the application)"
-msgstr "(గమనిక: ప�నఃప�రారంభం అవసరం)"
+msgstr "(గమనిక: అన�వర�తనం ప�నఃప�రారంభం అవసరం)"
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ఈ ఎవాల�యూషన� నిర�మాణంలో మద�దత�నీయద�</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
-msgstr "<b>పంపకందార�  ఛాయాచిత�రం</b>"
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>పంపకందార� ఛాయాచిత�రం</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
@@ -13318,14 +13999,12 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">మెయిల� తొలగించ�</span>"
 
 #: ../mail/mail-config.glade.h:16
-#, fuzzy
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">ప�రదర�శించిన సదేశం పీఠికల�(_H)</span>"
+msgstr "<span weight=\"bold\">ప�రదర�శించిన సదేశం పీఠికల� (_H)</span>"
 
 #: ../mail/mail-config.glade.h:18
-#, fuzzy
 msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">హెచ�చరికల�</span>"
+msgstr "<span weight=\"bold\">లేబ�ళ�ళ�</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13361,80 +14040,76 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">మ�ద�రించిన ఫాంట�స�</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">అవసరమగ� సమాచారం</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">రక�షితమైన MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">రక�షణ</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">పంపిన మరియ� డ�రాఫ�ట�  సందేశాల�</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">సేవిక ఆకృతీకరణ</span>"
 
-#: ../mail/mail-config.glade.h:32
-#, fuzzy
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">దృవీకరణ రకం(_A)</span>"
+msgstr "<span weight=\"bold\">దృవీకరణం రకమ� (_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "ఖాతా నిర�వహణ"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "కొత�త సంతకాన�ని కల�ప�మ�(_w)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "లిపిని కల�ప�మ�(_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ఈ ఖాతాన� ఉపయోగించ�నప�ప�డ� ఎప�ప�డూ బయటక�వెళ�ళ� సందేశాలన� సంతకంచేయి(_w)"
 
-#: ../mail/mail-config.glade.h:38
-#, fuzzy
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� స�వతంక� ఎన�క�రిప�ట� అవ�వ�మ�(_f)"
+msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� స�వతంక� ఎన�క�రిప�ట� అవ�వ�మ� (_f)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ఎప�ప�డ� వీరకి కార�బన�-నకలే (cc)(_s):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "(_b) ఎప�ప�డూ బ�లైండ� కార�బన�-నకలే (bcc):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ఎన�క�రిప�టింగ� చేయ�చ�న�నప�పడ� ఎప�పడూ నా కీరింగ� లోని కీలన� నమ�మ�మ�(_t)"
 
-#: ../mail/mail-config.glade.h:42
-#, fuzzy
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� ఎప�ప�డూ నన�నూ ఎన�క�రిప�ట�చేయ�మ�(_m)"
+msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� ఎప�ప�డూ నన�నూ ఎన�క�రిప�ట�చేయ�మ� (_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "ఎప�ప�డూ చదివిన రశీద� న� అభ�యర�ధించ�మ�(_d)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "వాస�తవ సందేశాన�ని అన�భందించ�మ�"
-
 #: ../mail/mail-config.glade.h:46
-#, fuzzy
 msgid "Automatically insert _emoticon images"
-msgstr "స�వయంచాలకంగా emoticon చిత�రాలన� చేర�చ�మ�(_e)"
+msgstr "స�వయంచాలకంగా emoticon చిత�రాలన� చేర�చ�మ� (_e)"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -13449,13 +14124,13 @@ msgid "C_haracter set:"
 msgstr "అక�షర సమితి(_h):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "మ�ల�చ�క�న�న పీఠికలన� నిరర�ధకం కొరక� పరిశీలించ�మ�(_h)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "మద�దత�నిచ�చ� రకాల కొరక� పరిశీలించ�మ�(_e)"
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "నిరర�ధకం కొరక� మ�ల�చ�క�న�న పీఠికలన� పరిశీలించ�మ� (_s)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "లోనిక వస�త�న�న సందేశాలన� నిరర�ధకం కొరక� పరిశీలించ�మ�"
@@ -13509,27 +14184,24 @@ msgid "Default character e_ncoding:"
 msgstr "అప�రమేయ అక�షర ఎన�కోడింగ�(_n):"
 
 #: ../mail/mail-config.glade.h:68
-#, fuzzy
 msgid "Delete junk messages on e_xit"
-msgstr "బయటక�వచ�చ�నప�పడ� నిరర�ధక సందేశాలన� తొలగించ�మ�(_x)"
+msgstr "బయటక�వచ�చ�నప�పడ� నిరర�ధక సందేశాలన� తొలగించ�మ� (_x)"
 
 #: ../mail/mail-config.glade.h:70
-#, fuzzy
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "బయటక� వెళ�ళ� సందేశాలన� డిజిటల� గా సంతకంచేయ�మ�(_u)(అప�రమేయంగా)"
+msgstr "బయటక� వెళ�ళ� సందేశాలన� (అప�రమేయంగా) డిజిటల� సంతకంచేయ�మ� (_u)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "పంపకందార� నా చిర�నామా ప�స�తంకంలో ఉంటే సందేశంన� నిరర�ధకంగా గ�ర�తించవద�ద�"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "పాఠ�య పరిమాణం మించితే సందేశాలన� రూపీకరించవద�ద� (_z)"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "పాఠ�య సారాలన� సందేశాలనంద� రూపీకరించ వద�ద� ఒకవేళ పాఠ�య పరిమాణం మించితే(_z)"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "పంపకందార� నాచిర�నామా ప�స�తంకంలో వ�ంటే సందేశాలన� నిరర�ధకంగా గ�ర�తించవద�ద� (_k)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "వాస�తవ సందేశాన�ని కోట� చేయవద�ద�"
+msgid "Do not quote"
+msgstr "కోట� చేయవద�ద�"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13572,9 +14244,8 @@ msgid "Fi_xed-width:"
 msgstr "నిర�దేశిత-వెడల�ప�(_x):"
 
 #: ../mail/mail-config.glade.h:85
-#, fuzzy
 msgid "Fix_ed width Font:"
-msgstr "నిర�దేశిత వెడల�ప� ఫాంట�(_e):"
+msgstr "నిర�దేశిత వెడల�ప� ఫాంట� (_e):"
 
 #: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
@@ -13589,75 +14260,88 @@ msgid "Full Nam_e:"
 msgstr "పూర�తి నామం(_e):"
 
 #: ../mail/mail-config.glade.h:90
-#, fuzzy
 msgid "HTML Messages"
-msgstr "లాగ� సందేశాల�:"
+msgstr "HTML సందేశాల�"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "H_TTP ప�రోక�సీ:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "పీఠికల�"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "కొటేషన�లన� వీటితో ఉద�దీపనంచేయ�మ�(_q)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "ఇన�‌లైన�"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "ఇన�‌లైన� వాస�తవిక సందేశం (అవ�ట�‌ల�క� శైలి)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "ఇన�‌లైన� (అవ�ట�‌ల�క� శైలి)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "లేబ�ళ�ళ�"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "భాషాల పట�టిక"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "మెయిల� ఆకృతీకరణ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "మెయిల� పీఠికల పట�టిక"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "మెయిల�‌పెట�టె స�థానమ�"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "సందేశం కూర�పరి"
 
-#: ../mail/mail-config.glade.h:105
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"గమనిక: లేబ�ల� నామమ�నంద� ఉన�న క�రిందిగీత మెనూ నంద� సంభందిత గ�ర�తింప�దారి గా ఉపయోగపడ�త�ంది."
-
 #: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "(_P) దీనికొరక� ప�రోక�సీలేద�:"
+
+#: ../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:107
+#: ../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 "నిర�వహణాసంస�థ(_g):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG à°•à±€ ID(_K):"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "సంకేతపదం (_w):"
+
+#: ../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."
@@ -13665,7 +14349,7 @@ msgstr ""
 "క�రింద ఉన�న ఖాళీ నంద� ఈ ఖాతా కొరక� వివరణపూరిత నామమ�న� దయచేసి ప�రవేశపెట�ట�మ�.\n"
 "ఈ నామమ� ప�రదర�శన వినియోగార�దం మాత�రమే ఉపయోగించబడ�త�ంది."
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13673,7 +14357,7 @@ msgstr ""
 "మీర� మెయిల� పంపించ� విధానం గ�రించి దయచేసి సమాచారంన� ప�రవేశపెట�టండి. మీక� ఖచ�చితంగా తెలియకపోతే, మీ సిస�టమ� "
 "నిర�వాహక�ని గాని లేక ఇంటర�నెట� సేవా దార�నిగాని అడగండి."
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13682,114 +14366,121 @@ msgstr ""
 "దయచేసి క�రింద మీ నామమ� మరియ� ఈమెయిల� చిర�నామాన� ప�రవేశపెట�ట�మ�. క�రిందన ఉన�న \"�చ�చిక\" క�షేత�రాల� "
 "నింపవలిసిన అవసరంలేద�, మీర� ఈ సమాచారంన� కూడా మీర� పంపే ఈమెయిల� నంద� చేర�చాలి అన�క�ంటే తప�ప."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "దయచేసి క�రిందన ఉన�న �చ�చికాలలోంచి ఎంపికచేస�కోండి"
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "వాస�తవ సందేశాన�ని కోట� చేయ�మ�"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "కోటెడ�"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "సంకేతపదాన�ని గ�ర�త�ంచ�కొన�మ�(_m)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "వీరికి-ప�రత�య�త�తరమ�(_p):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "సంకేతపదాన�ని గ�ర�త�ంచ�కొన�మ�(_p)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "స�థానిక చిర�నామా ప�స�తకమ�లంద� పంపకందార� ఛాయాచిత�రమ�ల కొరక� మాత�రమే శోధించ�మ�(_e)"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "S_OCKS హోస�ట��:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
+msgstr "స�థానిక చిర�నామా ప�స�తకమ�లంద� పంపకందార� ఛాయాచిత�రమ�ల కొరక� మాత�రమే శోధించ�మ� (_e)"
+
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "ఎంపికచేయ�మ�(_e)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "సందేశ రశీద�లన� పంప�మ�(_e):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "ప�రామాణిక ఫాంట�(_t):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "మ�ద�రణ కొరక� HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "మ�ద�రణ కొరక� HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "మెయిల� న� పంప�త�న�నది"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "సందేశాల సంచయంన� పంపినది(_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "సేవికక� దృవీకరణ అవసరం(_v)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "సేవిక రకం(_T):"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "దృవీకరణపత�రం న� సతకంచేయ�చ�న�నది(_n):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "సతకం(_u):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "సంతకాల�"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "సంతకాల పట�టిక"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "స�పెల� పరిశీలన"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "జవాబ�యిచ�చ�నప�ప�డ� క�రిందన టైప�చేయ�ట ప�రారంభించ�మ� (_t)"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "రకమ�(_y):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"మీర� � భాషల కొరకైతే నిఘంట�వ�లన� సంస�థాపించారో ఆ భాషల� మాత�రమే ఈ భాషల జాబితానంద� ప�రతిబింబిస�తాయి."
+msgstr "మీర� � భాషల కొరకైతే నిఘంట�వ�లన� సంస�థాపించారో ఆ భాషల� మాత�రమే ఈ భాషల జాబితానంద� ప�రతిబింబిస�తాయి."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13799,12 +14490,7 @@ msgstr ""
 "ఉపయోగించబడ�త�ంది. మీర� తెలిపిన నామమ� ప�రదర�శన\n"
 "వినియోగార�దం మాత�రమే ఉపయోగించబడ�త�ంది."
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr "మల�చ�క�న�న నిరర�ధకం పీఠికలక� జోడి కనబడినట�లైతే ఈ �చ�చికం తిరిగివ�రాయబడ�త�ంది."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13812,16 +14498,26 @@ msgstr ""
 "దేనిద�వారా మీర� ఈ ఖాతా న� సంప�రదించాలి అన�క�ంట�న�నారో ఆ నామాన�ని టైప�చేయండి.\n"
 "ఉదాహరణక�: \"పని\" లేదా \"వ�యక�తిగత\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "(_e) వినియోగదారి నామమ�:"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "ధృవీకరణన� వ�పయోగించ�మ� (_n)"
+
+#: ../mail/mail-config.glade.h:156 ../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 "వినియోగదారి నామమ�(_n):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "వేరియబ�ల�-వెడల�ప�(_a):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13831,103 +14527,124 @@ msgstr ""
 "\n"
 "ప�రారంభించ�టక� \"మ�ంద�క�పంప�\" న� నొక�క�మ�. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "సంతకాన�ని కల�ప�మ�(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "ఎల�లప�ప�డ� చిత�రాలన� ఇంటర�నెట� న�ండి లోడ�చేయ�మ�(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "స�వయంచాలక ప�రోక�సీ ఆకృతీకరణ URL (_A):"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "అప�రమేయ నిరర�ధక ప�లగ�ఇన�(_D):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "ఇంటర�నెట�‌క� నేర�గా అన�సంధానం (_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "సమావేశ అభ�యర�దనలన� సతంకం చేయవద�ద�(_D) (అవ�ట�‌ల�క� సారూప�యతకొరక�)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "మ�ంద�క�పంప� శైలి(_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "ప�రత�య�త�తరమ� ఇచ�చ�నప�ప�డ� సంతకాన�ని వాస�తవ సందేశంపైన ఉంచ�మ�(_K)"
 
-#: ../mail/mail-config.glade.h:161
-#, fuzzy
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
-msgstr "సందేంమ�లనంద� చిత�రాలన� పరిచయాలన�ండి నింప�మ�(_L)"
+msgstr "సందేంశమ�లనంద� చిత�రాలన� పరిచయాలన�ండి నింప�మ� (_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "స�థానిక చిర�నామా ప�స�తకంనంద� మాత�రమే చూడ�మ� (_L)"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "దీనిని నా అప�రమేయ ఖాతా లా చేయ�మ�(_M)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "మానవీయ ప�రోక�సీ ఆకృతీకరణ (_M):"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "దీనితర�వాత సందేశాలన� చదివినట�ల� గర�త�ంచ�(_M)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "చిత�రాలన� ఇంటర�నెట� న�ండి ఎప�ప�డ� నింపవద�ద�(_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "పాత�(_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "HTML సందేశాలన� వాటిని కోరని పరిచయాలక� పంప�త�న�నప�ప�డ� అడ�గ�మ�(_P)"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "HTML సందేశాలన� వాటిని కోరని పరిచయాలక� పంప�త�న�నప�ప�డ� అడ�గ�మ� (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "సందేశాలన� ఖాళీ సంగతిపంక�తి తో పంప�త�న�నప�ప�డ� అడ�గ�మ�(_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "ప�రత�య�త�తరమ� శైలి(_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "లిపి(_S):"
 
-#: ../mail/mail-config.glade.h:171
-#, fuzzy
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "రక�షిత HTTP ప�రోక�సీ (_S):"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
-msgstr "ఎంపికచేయ�మ�(_e)..."
+msgstr "ఎంపికచేయి (_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "చిత�రమ� యానిమేషన�‌లన� చూప�మ�(_S)"
 
-#: ../mail/mail-config.glade.h:175
-#, fuzzy
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
-msgstr "సందేశం ఉపదర�శనంలో పంపకందారి యొక�క ఛాయాచిత�రంన� చూప�మ�(_S)"
+msgstr "సందేశం ఉపదర�శనంలో పంపకందారి యొక�క ఛాయాచిత�రంన� చూప�మ� (_S)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "To / Cc / Bcc పీఠికల� కూడా ష�రింక�‌చేయ�మ�(_S)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "రక�షిత అన�సంధానంన� ఉపయోగించ�మ�(_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "సిస�టమ� అప�రమేయాలన� వ�పయోగించ� (_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ఇతర అన�వర�తనంలలాగా అవే ఫాంట�లన� ఉపయోగించ�మ�(_U)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "చిర�నామాల�"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "వర�ణమ�"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "వివరణ"
 
@@ -13967,43 +14684,43 @@ msgstr "చిన�నపెద�దబడి తేడా(_s)"
 msgid "Co_mpleted"
 msgstr "పూర�తేనది(_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "వెత�క�మ�(_F):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "సందేశమ�లో కన�గొన�మ�"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "అన�సరించ�టక� ప�లాగ�"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "సచయం చందాల�"
 
-#: ../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 "�దీ ఎంపికకాలేద�"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "సేవిక(_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "రక�షణ సమాచారం"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "నిర�దేశిత సంచయాల�"
 
-#: ../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."
@@ -14011,23 +14728,23 @@ msgstr ""
 "అన�సరించ�టక� మీర� ఎంచ�క�న�న సందేశాల� క�రిందన జాబితా చేయబడినవి.\n"
 "\"ఫ�లాగ�\" మెనూ న�ండి అన�సరించవలిసిన చర�యన� దయచేసి ఎంపికచేయ�మ�."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "లైసెన�స� ని ఆమోదించ�(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "పూర�వ నిర�ణీతం(_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ప�లాగ�(_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "లైసెన�స� ఒప�పందాన�ని ఆమోదించ�టక� దీనిని టిక�‌చేయ�మ�(_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "పింగింగ� %s"
@@ -14074,99 +14791,104 @@ msgstr "%2$d యొక�క %1$d సందేశాన�ని పంప�త
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d యొక�క %1$d సందేశాలన� పంప�టలో విఫలమైంది"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "రద�ద�చేయబడిన."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "పూర�తయినది."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "సందేశాన�ని సంచయంక� దాయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "సందేశాలన� %s క� కద�ప�చ�న�నది"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s క� సందేశాలన� నకల�తీస�త�న�నది"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "మ�ంద�క�పంపిన సందేశాల�"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s సంచయాన�ని తెర�స�త�ంది"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s ఫోల�డర� కొరక� కోటా సమాచారాన�ని వెలికితీస�తోంది"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "నిల�వ %s న� తెర�స�త�న�నది"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s సంచయాన�ని తొలగిస�త�న�నది"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' సంచయాన�ని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ఖాతా '%s' న� కొట�టివేయ�చ�న�నది మరియ� నిల�వచేయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' ఖాతాని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "సంచయాన�ని ప�నర�వికాసపర�స�త�ంది"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "సంచయాన�ని కొట�టివేయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' నందలి చెత�తన� ఖాళీచేస�తోంది"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "స�థానిక సంచయాల�"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s సందేశాన�ని వెలికితీస�త�ంది"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d సందేశాన�ని వెలికితీస�త�ంది"
 msgstr[1] "%d సందేశాలన� వెలికితీస�త�ంది"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "%d సందేశాన�ని దాస�త�ంది"
-msgstr[1] "%d సందేశాలన� దాస�త�ంది"
+msgstr[1] "%d సందేశాన�ని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14175,11 +14897,11 @@ msgstr ""
 "సందేశాన�ని దీనికి దాయ�టలో దోషం: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "అన�బంధాన�ని దాస�త�న�నది"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14188,88 +14910,89 @@ msgstr ""
 "అవ�ట�‌ప�ట� దస�త�రాన�ని సృష�టించలేకపోయింది: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "దత�తాంశాన�ని రాయలేకపోయింది: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s న�ండి అనన�సంధానిస�తోంది"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s క� తిరిగిఅన�సంధానించబడ�తోంది"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "సేవన� పరిశీలిస�తోంది"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "రద�ద�చేస�తోంది..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "మెయిల� న� పంప� & స�వీకరించ�"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "అన�నిటిని రద�ద�చేయి(_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "తాజాపర�చ�మ�..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "వేచిఉంది..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
+#, c-format
 msgid "Checking for new mail"
 msgstr "కొత�త మెయిల� కొరక� పరిశీలిస�తోంది"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "రహస�యపదమ�న� ప�రవేశపెట�టండి"
 
-#: ../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 "%s క� రహస�యపద ప�రవేశ"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "రహస�యపదాన�ని ప�రవేశించ�"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "వినియోగదార�డ� రద�ద�చేసిన కార�యం"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "సంతకాన�ని సరిచేయ�"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "దాయి మరియ� మూయ�మ� (_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "ఈ సంతకానికి నామాన�ని ప�రవేశపెట�టండి"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "సంతకాన�ని సరిచేయి"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "నామం:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "సంతకమ� నామమ� (_S):"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14310,48 +15033,45 @@ msgstr "శోధన సంచయాలనà±� '%s:%s' కొరకà±� నవీà
 msgid "Updating Search Folders for '%s'"
 msgstr "శోధన సంచయాలన� '%s' కొరక� నవీకరిస�తోంది"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "శోధన సంచయాన�ని సరిచేస�తోంది"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "కొత�త శోధన సంచయం"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "&quot;{0}&quot; నామమ�గల సంచయం ఇప�పటికే ఉంది. దయచేసి వేరొక నామమ�న� ఉపయోగించండి."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "\"{0}\" నామమ�గల సంచయం యిప�పటికేవ�ంది. దయచేసి వేరొక నామమ�న� వ�పయోగించండి."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "&quot;{1}&quot; నామమ�గల సంచయం ఇప�పటికే ఉంది. దయచేసి వేరొక నామమ�న� ఉపయోగించండి."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"{1}\" నామమ�గల సంచయం యిప�పటికే వ�ంది. దయచేసి వేరొక నామమ�న� వ�పయోగించండి."
 
 #: ../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."
 msgstr ""
-"non-empty సంచయం &quot;{1}&quot; వద�ద ఇప�పటికే ఉంది.\n"
+"non-empty సంచయం \"{1}\" వద�ద యిప�పటికే వ�ంది.\n"
 "\n"
-"మీర� ఈ సంచయంన� వదిలివేయ�ట ఎంచ�కొనవచ�చ�, దీని సారాలన� తిరిగివ�రాయవచ�చ� లేదా కల�పవచ�చ�, లేదా "
+"మీర� ఈ సంచయంన� వదిలివేయ�ట యెంచ�కొనవచ�చ�, దీని సారాలన� తిరిగివ�రాయవచ�చ� లేదా కల�పవచ�చ�, లేదా "
 "బహష�కరించవచ�చ�."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
-msgstr ""
-"చదివినదాని రశీద� నోటీస� &quot;{1}&quot; కొరక� అభ�యర�దించబడింది. రశీద� నోటీస�న� {0} క� పంపాలా?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr "చదివినదాని రశీద� నోటీస� \"{1}\" కొరక� అభ�యర�దించబడింది. రశీద� నోటీస�న� {0}క� పంపండి?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "సంతకం ఇప�పటికే నామమ� &quot;{0}&quot; తో ఉంది. దయచేసి వేరొకనామమ�న�తెల�ప�మ�."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "ఒక సంతకం యిప�పటికే నామమ� \"{0}\"తో వ�ంది. దయచేసి వేరొకనామమ�న� తెల�ప�మ�."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14372,8 +15092,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "మీర� ఖచ�చితంగా ఈ ఖాతాన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "మీర� ఖచ�చితంగా ఈ ఖాతాన� అచేతనం మరియ�\n"
 "దీని అన�ని ప�రాక�సీలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
@@ -14391,9 +15110,10 @@ msgstr "సంచయాలలోని à°…à°¨à±�ని తొలగించిà
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"మీర� సంచయం &quot;{0}&quot; లోని అన�ని తొలగించిన సందేశాలన� శాశ�వతంగా తొలగించ�దాం అన�క�ంట�న�నారా?"
+"ఫోల�డర� \"{0}\"లోని అన�ని తొలగించిన సందేశాలన� ఖచ�చితంగా మీర� శాశ�వతంగా "
+"తీసివేద�దామన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14408,99 +15128,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "మీర� ఖచ�చితంగా సంగతి లేక�ండా ఒక సందేశాన�ని పంపాలని అన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "ఎంచేతంటే &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "ఎంచేతంటే \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "ఎంచేతంటే &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "ఎంచేతంటే \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "బ�లింక� సంతకం"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "శోధన సంచయం &quot;{0}&quot; న� కల�పలేక పోయింది."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "శోధన సంచయం \"{0}\"న� జతచేయలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "సంచయం &quot;{0}&quot; న� &quot;{1}&quot; క� నకల�తీయ లేకపోయింది."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "సంచయం \"{0}\"న� \"{1}\"క� నకల�తీయలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "సంచయం &quot;{0}&quot; న� సృష�టించలేకపోయింది."
+msgid "Cannot create folder \"{0}\"."
+msgstr "సంచయం \"{0}\"న� సృష�టించలేకపోయింది."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "తాత�కాలికంగా దాయ� సంచయాన�ని సృష�టించలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "దాయ� సంచయంన� సృష�టించలేక పోయింది, ఎంచేతంటే &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "దాయ� సంచయంన� సృష�టించలేక పోయింది, ఎంచేతంటే \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "సంచయం &quot;{0}&quot; న� తొలగించలేక పోయింది."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "సంచయం \"{0}\"న� తొలగించలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "సిస�టమ� సంచయం &quot;{0}&quot; న� తొలగించలేక పోయింది."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "సిస�టమ� సంచయం \"{0}\"న� తొలగించలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "శోధన సంచయం &quot;{0}&quot; న� సరికూర�చ లేకపోయింది అది లేని కారణంగా."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "శోధన సంచయం \"{0}\"న� సరికూర�చలేక పోయింది అదిలేని కారణంగా."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "సంచయం &quot;{0}&quot; న� &quot;{1}&quot; క� కదల�చలేక పోయింది."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "సంచయం \"{0}\"న� \"{1}\"క� కదల�చలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "మూలం &quot;{1}&quot; న� తెర�వలేకపోయింది."
+msgid "Cannot open source \"{1}\""
+msgstr "మూలం \"{1}\"న� తెర�వలేక పోయింది"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "మూలం &quot;{2}&quot; న� తెర�వలేకపోయింది."
+msgid "Cannot open source \"{2}\"."
+msgstr "మూలం \"{2}\"న� తెర�వలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "లక�ష�యం &quot;{2}&quot; న� తెర�వలేక పోయింది."
+msgid "Cannot open target \"{2}\"."
+msgstr "లక�ష�యం \"{2}\"న� తెర�వలేక పోయింది."
 
 #: ../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 ""
-"లైసెన�స� దస�త�రం &quot;{0}&quot; న� చద�వలేకపోయింది, సంస�థాపనా సమస�యవలన. మీర� ఈ ఉత�పాదక�డన� "
-"వాని లైసెన�స� ఆమోదించ�నంత వరకూ ఉపయోగించ�కోలేర�."
+"లైసెన�స� దస�త�రం \"{0}\"న� చద�వలేక పోయింది, సంస�థాపనా సమస�యవలన. మీర� ఈ ఉత�పాదక�డన� "
+"వాని లైసెన�స� ఆమోదించ�నంతవరకూ వ�పయోగించ�కోలేర�."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; న� &quot;{1}&quot; క� ప�నఃనామకరణ చేయలేమ�."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\"న� \"{1}\"క� ప�నఃనామకరణ చేయలేమ�."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "సిస�టమ� సంచయం &quot;{0}&quot; న� ప�నఃనామకరణ లేదా కదల�ప� చేయలేమ�."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "సిస�టమ� సంచయం \"{0}\"న� ప�నఃనామకరణ చేయలేమ� లేదా కదల�చలేమ�."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "ఖాతా క� చేసిన మార�ప�లన� దాయలేమ�."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "సంచయం &quot;{0}&quot; క� దాయలేమ�."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "డైరెక�టరి \"{0}\"క� దాయలేమ�."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "దస�త�రం &quot;{0}&quot; క� దాయలేద�."
+msgid "Cannot save to file \"{0}\"."
+msgstr "దస�త�రం \"{0}\"క� దాయలేద�."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "సంతకం స�క�రిప�ట� &quot;{0}&quot; న� అమర�చలేద�."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "సంతకం స�క�రిప�ట� \"{0}\"న� అమర�చలేద�."
 
 #: ../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."
@@ -14508,47 +15231,42 @@ msgstr ""
 "మీ సంకేతపదం సరిగా స�పెల�‌చేయబడిందేమో పరిశీలించ�మ�. సంకేతపదాల� చిన�నపెద�దబడి తేడాన� కిలిగఉన�నాయని "
 "గర�త�ంచ�కోండి; మీ కాప�స� లాక� ఆన�అయి ఉండవచ�చ�."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "సంతకం దస�త�రాన�ని దాయలేకపోయింది."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot; న� తొలగించాలా?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "ఖాతా తొలగించాలా?"
+msgid "Delete \"{0}\"?"
+msgstr "తొలగించ�మ� \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "శోధన సంచయం &quot;{0}&quot; లో ఉన�న సందేశాలన� తొలగించాలా?"
+msgid "Delete account?"
+msgstr "ఖాతా తొలగించాలా?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "మార�ప�లన� తీసివేయాలా?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "తొలగించవద�ద�(_e)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "తొలగించవద�ద�"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "అచేతన పరచవద�ద�"
 
-#: ../mail/mail.error.xml.h:51
-#, fuzzy
-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 "
@@ -14595,8 +15313,7 @@ msgstr "మీరà±� కొనసాగించితే, మీరà±� à°ˆ à°¸à
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr ""
-"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
+msgstr "మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -14648,34 +15365,26 @@ msgid "Mark all messages as read"
 msgstr "అన�ని సందేశాలన� చదివినవాటిలా గ�ర�తించ�మ�"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "ఈ సంచయంనందలి అన�ని సందేశాలన� మరియ� ఉపసంచయాలన� చదివినవాటిలా గ�ర�త�ంచాలా?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "కనబడని సంచయం"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "� వనర�లన� ఎంచ�కోలేద�"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "ప�రస�త�త సంచయం పైన మాత�రమే(_C)"
-
-#: ../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."
@@ -14683,44 +15392,51 @@ msgstr ""
 "దయచేసి సరైన ఈమెయిల� చిర�నామాన� క�: క�షేత�రమ�నంద� ప�రవేశపెట�ట�మ�. మీర� ఈమెయిల� చిర�నామా కొరక� "
 "శోధించవచ�చ� దీనిపై నొక�క�ట ద�వారా క�: ప�రవేశ పెట�టెక� తర�వాతనే ఉన�న బటన�."
 
-#: ../mail/mail.error.xml.h:83
-#, fuzzy
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
-"దయచేసి క�రిందని ఉన�న స�వీకరణదార�ల� HTML ఈమెయిల�‌న� పొందగల�గ�నట�ల� మరియ� పొందగోర�నట�ల� "
-"చూస�కొన�మ�:\n"
+"దయచేసి క�రిందని ఉన�న స�వీకరణదార�ల� HTML ఈమెయిల�‌న� పొందగల�గ�నట�ల� మరియ� "
+"పొందగోర�నట�ల� చూస�కొన�మ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "ఈ సంతకాన�ని గ�ర�తించ�టక� దయచేసి ఒక �కమైన నామమ�న� ప�రవేశపెట�ట�మ�."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "దయచేసి ఆగ�మ�"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "పాత మెయిల� సంచయం &quot;{0}&quot; న� వలసపంప�త�న�నప�ప�డ� సమస�య."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "పాత మెయిల� సంచయం \"{0}\"న� వలసపంప�త�న�నప�ప�డ� సమస�య."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "సేవిక న� ప�రశ�నిస�త�న�నది"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "మద�దత�ఇచ�చ�నట�వంటి దృవీకరణ యంత�రమ�ల జాబితా కొరక� సేవికన� ప�రశ�నిస�త�న�నది."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "చదివినదాని రశీద� అభ�యర�దించబడింది."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "నిజంగా సంచయం \"{0}\" మరియ� దానియొక�క అన�ని ఉపసంచయాలన� తొలగించాలా?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "వైఫల�యమైన నిరర�ధకాన�ని నివేదించ�మ�"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "నిజంగా సంచయం &quot;{0}&quot; మరియ� దానియొక�క అన�ని ఉపసంచయాలన� తొలగించాలా?"
+msgid "Report Not Junk Failed"
+msgstr "నిరర�ధకం వైఫల�యం కానిదాన�ని నివేదించ�మ�"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14770,13 +15486,13 @@ 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 ""
 "ఈ క�రింది శోధన సంచయమ�(ల�):\n"
 "{0}\n"
 "ఇప�ప�డ� తొలగించిన సంచయం ఉపయోగించబడింది:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "మరియ� నవీకరించబడింది."
 
 #: ../mail/mail.error.xml.h:106
@@ -14784,13 +15500,13 @@ 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 ""
 "ఈ క�రింది వడపోత నియమమ�(ల�):\n"
 "{0}\n"
 "ఇప�ప�డ� తొలగించబడిన సంచయం ఉపయోగించబడింది:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "మరియ� నవీకరించబడింది."
 
 #: ../mail/mail.error.xml.h:111
@@ -14812,8 +15528,7 @@ msgid ""
 msgstr "ఈ సందేశం పంపబడద� ఎంచేతంటే పంప�టక� ఎంచ�క�న�న ఖాతా చేతనంగా లేద�"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "ఈ సందేశం పంపబడలేద� ఎంచేతంటే మీర� � స�వీకరణదార�ల నామమ�న� తెల�పలేద�"
 
 #: ../mail/mail.error.xml.h:116
@@ -14830,8 +15545,7 @@ msgstr "à°ˆ సంతకం మారà±�చబడింది, అయితే à
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
-"ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�త�ంది."
+msgstr "ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�త�ంది."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
@@ -14841,8 +15555,7 @@ msgstr "సమూహతరహా సేవికకà±� à°…à°¨à±�సంధానà
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr ""
-"డ�రాఫ�ట�స� సంచయాలన� ఈ ఖాతా కొరక� తెర�వలేక పోయింది. బద�ల�గా సిస�టమ� డ�రాఫ�ట�స� సంచయాలన� ఉపయోగించాలా?"
+msgstr "డ�రాఫ�ట�స� సంచయాలన� ఈ ఖాతా కొరక� తెర�వలేక పోయింది. బద�ల�గా సిస�టమ� డ�రాఫ�ట�స� సంచయాలన� ఉపయోగించాలా?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -14897,8 +15610,8 @@ msgstr ""
 "సంచయాలన� ఎంచ�ట ద�వారా,లేదా రెండూ."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "మీ సేవిక &quot;{0}&quot; క� &quot;{0}&quot; లాగా మీ లాగిన� విఫలమైంది."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "మీ సేవిక \"{0}\"క� \"{0}\"లాగా మీలాగిన� విఫలమైంది."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14920,22 +15633,22 @@ msgstr "కొట�టివేయ�మ�(_E)"
 msgid "_Open Messages"
 msgstr "సందేశాలన� తెర�వ�మ�(_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "ప�రస�త�త సంచయం మరియ� ఉపసంచంయంల పైన(_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "చూడని"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "చూసి"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "సమాధానమిచ�చిన"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "పంపబడిన"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "చూడనట�వంటి బహ�ళ సందేశాల�"
@@ -14960,37 +15673,50 @@ msgstr "ఎక�క�వ"
 msgid "Highest"
 msgstr "అతిఎక�క�వ"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "ఈ రోజ�·%l:%M·%p"
 
-#: ../mail/message-list.c:1630 ../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 "నిన�న·%l:%M·%p"
 
-#: ../mail/message-list.c:1642 ../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·%l:%M·%p"
 
-#: ../mail/message-list.c:1650 ../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 "%b·%d·%l:%M·%p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b·%d·%Y"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "సందేశ జాబితాన� సంభనింపచేయ�ట"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"మీ శోధన విధానాన�ని � సందేశం తృప�తిపర�చ�టలేద�. శోధన->శ�భ�రంచేయి మెనూ "
+"అంశంద�వారా శోధనన� శ�భ�రంచేయ�మ� లేదా దానిని మార�చ�టద�వారా చేయ�మ�."
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "ఈ సంచయంనంద� సందేశాల� లేవ�."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "పూర�వ నిర�ణీతం"
@@ -15020,39 +15746,39 @@ msgstr "పంపిన సందేశాల�"
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "à°•à°¾"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "మ�ంద�క� పంపవద�ద�"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "అన�సరించ�"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "మీ సమాచారం కొరక�"
 
-#: ../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 "మ�ంద�"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "� ప�రతిస�పందన అవసరంలేద�"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "సమాధానం"
 
-#: ../mail/message-tag-followup.c:84 ../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 "అన�నిట�టికి సమాధానం ఇవ�వ�"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "పరిశీలించ�"
 
@@ -15077,6 +15803,10 @@ msgid "Subject contains"
 msgstr "సంగతి కలిగిఉంటే"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "సంగతి లేదా పంపినవార� కలిగిఉంటే"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "సంగతి లేదా పంపినవార� కలిగిఉంటే"
 
@@ -15089,33 +15819,22 @@ msgid "Provides core functionality for local address books."
 msgstr "స�థానిక చిర�నామా ప�స�తకంక� ప�రాదమిక కార�యక�రమాన�ని ఇస�త�ంది."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "అన�భందంన� గ�ర�త�చేయ� ప�లగ�ఇన� న� చేతనంచేయ�మ�"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "అన�భందంన� గ�ర�త�చేయ� ప�లగ�ఇన� న� చేతనం చేయ�మ�."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 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:4
+#: ../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/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "కీపదాల�"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "తప�పిపోయిన అన�బంధాన�ని గ�ర�త�చేయి(_m)"
-
 #: ../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"
@@ -15125,8 +15844,7 @@ msgstr "అన�బంధం న� గ�ర�త�చేయ�నది"
 msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
-msgstr ""
-"అన�భందం తప�పిపోతే అన�భందాల� మరియ� హెచ�చరికలన� తెల�ప�టక� అనవాళ�ళ కొరక� సందేశంలో వెత�క�తోంది"
+msgstr "అన�భందం తప�పిపోతే అన�భందాల� మరియ� హెచ�చరికలన� తెల�ప�టక� అనవాళ�ళ కొరక� సందేశంలో వెత�క�తోంది"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -15140,146 +15858,163 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "సందేశం � అన�భందాలన� కలిగిలేద�"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "సరికూర�చ�ట కొనసాగించ�(_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "సందేశాన�ని సరిచేయి (_E)"
 
 #: ../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 ""
-"ఎవాల�యూషన� న�ండి సూటిగా ఆడియో అన�భందాలన� ప�రదర�శించ�టక� మరియ� ప�లేచేయ�టక� ఒక రూపీకరణ ప�లగ�ఇన�."
+msgstr "ఎవాల�యూషన� న�ండి సూటిగా ఆడియో అన�భందాలన� ప�రదర�శించ�టక� మరియ� ప�లేచేయ�టక� ఒక రూపీకరణ ప�లగ�ఇన�."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "ఆడియో ఇన�‌లైన� ప�లగ�ఇన�"
 
-#: ../plugins/backup-restore/backup-restore.c:96
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
-msgstr "ఎవాల�యూషన� బ�యాక�అప� దస�త�రం యొక�క నామమ� న� ఎంపికచేయ�మ�"
+msgstr "ఎవాల�యూషన� బ�యాక�అప� దస�త�రం యొక�క నామమ�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "బ�యాక�అప� తర�వాత ఎవాల�యూషన� న� ప�నఃప�రారంభించ�మ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
-#, fuzzy
+#: ../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 "ఎవాల�యూషన� న� తిరిగినిల�వ చేసినతర�వాత ప�నఃప�రారంభిచ�మ�(_R)"
 
-#: ../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
-#, fuzzy
+#: ../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 ""
-"మీర� ఎవాల�యూషన� మీ బ�యాక�అప� న�ండి తిరిగినిల�వ చేస�కొనవచ�చ�. ఇది అన�ని మెయిల�స�, క�యాలెండర�ల�, కర�తవ�యాల�, "
-"మెమోస�, పరిచయాలన� తిరిగినిల�వచేస�త�ంది.\n"
-"ఇది మీ వ�యక�తిగత అమరికల�, మెయిల� వడపోతల� మెద. వాటిని తిరిగినిల�వఉంచ�త�ంది."
+"మీర� ఎవాల�యూషన� మీ బ�యాక�అప� న�ండి తిరిగినిల�వ చేస�కొనవచ�చ�. ఇది అన�ని మెయిల�స�, "
+"క�యాలెండర�ల�, కర�తవ�యాల�, మెమోస�, పరిచయాలన� తిరిగినిల�వచేస�త�ంది.\n"
+"ఇది మీ వ�యక�తిగత అమరికల�, మెయిల� వడపోతల� మెద. వాటిని తిరిగినిల�వ ఉంచ�త�ంది."
 
-#: ../plugins/backup-restore/backup-restore.c:244
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
-msgstr "ఎవాల�యూషన� న� బ�యాక�అప� దస�త�రమ�లన�ండి తిరిగినిల�వ చేయ�మ�(_R)"
+msgstr "ఎవాల�యూషన�‌న� బ�యాక�అప� దస�త�రమ�లన�ండి తిరిగినిల�వ చేయ�మ� (_R)"
 
-#: ../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
 msgid "Choose a file to restore"
 msgstr "తిరిగినిల�వఉంచ�కొన�టక� ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "ఎవాల�యూషన� సంచయాన�ని బ�యాక�అప� తీయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "ఎవాల�యూషన� సంచయాన�ని తిరిగినిల�వఉంచ�మ�"
 
-#: ../plugins/backup-restore/backup.c:44
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
-msgstr "ఎవాల�యూషన� బ�యాక�అప�"
+msgstr "ఎవాల�యూషన� బ�యాక�అప�‌న� పరిశీలించ�మ�"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "ఎవల�యూషన� న� ప�న:ప�రారంభించ�"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "చిత�రసంభంద వినియోగదారి ఇంటర�‌ఫేస� తో"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "ఎవల�యూషన� న� మూయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "ఎవాల�యూషన� ఖాతాలన� మరియ� అమరికలన� వెన�కక�తెస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ఎవాల�యూషన� డాటాన� వెన�కక� తెస�తోంది (మెయిల�స�, పరిచయాల�, క�యాలెండర�, కర�తవ�యాల�, మెమోస�)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "బ�యాక�అప� పూర�తిఅయినది"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "ఎవాల�యూషన� న� ప�నఃప�రారంభిస�త�న�నది"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "ప�రస�త�త ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:119
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "దస�త�రాలన� బ�యాక�అప� న�ండి బయటక�తీస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "ఎవాల�యూషన� అమరికలన� నింప�తోంది"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "తాత�కాలికంగా దాయబడిన దస�త�రాలన� తొలగిస�త�న�నది"
 
-#: ../plugins/backup-restore/backup.c:249
-#, fuzzy, c-format
+#: ../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 "సంచయం %s న� వెన�కక� తీస�తోంది"
+msgstr "ఫోల�డర� %sక� బ�యాక�అప� తీస�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:254
-#, fuzzy, c-format
+#: ../plugins/backup-restore/backup.c:460
+#, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s సంచయం న�ండి తిరిగినిల�వచేస�తోంది"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "ఎవాల�యూషన� బ�యాక�అప�"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "ఎవల�యూషన� తిరిగినిల�వచేయ�మ�"
 
+#: ../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 "ఎవాల�యూషన� డాటా మరియ� అమరికలన� తిరిగినిల�వచేయ�టక� మరియ� వెన�కక� తీయ�టక� ఒక ప�లగ�ఇన�."
@@ -15294,9 +16029,7 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "మీర� ఖచ�చితంగా ఎవాల�యూషన� మూయాలని అన�క�ంట�న�నారా?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "మీర� ఎంపికచేసిన బ�యాక�అప� దస�త�రంన�ండి ఎవాల�యూషన� న� తిరిగినిల�వ ఉంచ�దామని అన�క�ంట�న�నారా?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -15311,16 +16044,22 @@ msgstr ""
 "దయచేసి మార�ప�బటన� చేతనంచేయ�మ�."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "సరిపోని అన�మత�ల�"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "సరికాని ఎవాల�యూషన� బ�యాక�అప� దస�త�రం"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "తిరిగినిల�వ చేయ�టక� దయచేసి విల�వైన బ�యాక�అప� దస�త�రాన�ని ఎంపికచేయ�మ�"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15345,47 +16084,41 @@ msgstr "అమరికలన� తిరిగినిల�వఉంచ�(_
 msgid "_Backup Settings..."
 msgstr "బ�యాక�అప� అమరికల�(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "స�వయంచాలక పరిచయాల�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-#, fuzzy
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr "సందేశాలక� స�పందిస�త�న�నప�పడే స�వయంచాలకంగా చిర�నామాప�స�తకం నంద� ప�రవేశాలన� సృష�టించ�మ�(_A)"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "సందేశాలక� స�పందిస�త�న�నప�పడే స�వయంచాలకంగా చిర�నామాప�స�తకం నంద� ప�రవేశాలన� సృష�టించ�మ� (_A)"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "స�వయంచాలక పరిచయాల కొరక� చిర�నామా ప�స�తంకంన� ఎంపికచేయ�మ�"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "త�వరిత సందేశ పరిచయాల�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-#, fuzzy
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "పిడిగిన� మిత�ర జాబితాన�ండి పరిచయాల మరియ� చిత�రాల సమాచారాన�ని క�రమంగా కాలనియమత చేయ�మ�"
 
-#: ../plugins/bbdb/bbdb.c:607
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "పిడిగిన� మిత�ర జాబితా కొరక� చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "మిత�ర జాబితా తో ఇప�ప�డ� కాలనియమత చేయ�మ�(_b)"
 
 #: ../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 ""
@@ -15396,10 +16129,30 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
-#, fuzzy
+#. 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
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "%s స�పానింగ�‌లో వొకదోషమ� సంభవించింది: %s"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�మ�, సమాప�తంచేయబడ�తోంది..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "బోగోఫిల�టర� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
-msgstr "సందేశ పాఠ�యమ�న� యూనికోడ� క� మార�చ�మ�(_U)"
+msgstr "సందేశ పాఠ�యమ�న� యూనికోడ�‌క� మార�చ�మ� (_U)"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
@@ -15418,20 +16171,25 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter �చ�చికాల�"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter నిరర�ధక ఫిల�టర�"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Bogofilter న� ఉపయోగించి నిరర�దక సందేశాలన� వడపోయ�మ�."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "·_SSL న� ఉపయోగించ�మ�"
 
@@ -15451,17 +16209,18 @@ msgstr "స�థానిక క�యాలెండర�‌ల�"
 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:375
-msgid "_Refresh:"
-msgstr "ప�నర�వికాసం(_R):"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "రీఫ�రెష� (_f):"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "రక�షణ బంధమ�(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "వినియోగదార�డి నామమ�(_m):"
 
@@ -15530,8 +16289,7 @@ msgstr "వాతావరణ క�యాలెండర�‌ల�"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
-"మిమ�మ�ల�ని విషయాలన� క�లిప�‌బోర�డ�క� నకల�తీయ�యనిచ�చే పాప�అప� మెనూ ప�లగ�ఇన� న� వివరించే పరిశీలన ప�లగ�ఇన�."
+msgstr "మిమ�మ�ల�ని విషయాలన� క�లిప�‌బోర�డ�క� నకల�తీయ�యనిచ�చే పాప�అప� మెనూ ప�లగ�ఇన� న� వివరించే పరిశీలన ప�లగ�ఇన�."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -15542,8 +16300,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "ఎవాల�యూషన� అప�రమేయ మెయిలర� �మో పరిశీలించ�మ�"
 
 #: ../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."
+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
@@ -15559,14 +16316,25 @@ 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:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "ఎవాల�యూషన�"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "అప�రమేయ సంచయంగా గ�ర�త�ంచ�మ�(_d)"
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr "అప�రమేయ చిర�నామా ప�స�తకంగా గ�ర�త�ంచ�మ� (_d)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr "అప�రమేయ క�యాలెండర�‌గా గ�ర�త�ంచ�మ� (_d)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr "అప�రమేయ కర�తవ�య జాబితాగా గ�ర�త�ంచ�మ� (_d)"
+
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr "అప�రమేయ మెమో జాబితాగా గ�ర�త�ంచ�మ� (_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15574,10 +16342,58 @@ msgstr "అప�రమేయ మూలాల�"
 
 #: ../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:558
+msgid "_Custom Header"
+msgstr "మల�చ�కొనిన పీఠిక (_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "à°•à±€"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 ""
-"క�యాలెడర� న� గాని లేదా చిర�నామాప�స�తకంన� గాని అప�రమేయమైన దానిగా గర�త�ంచ�టలో కార�యక�రమాన�ని అందిస�త�ంది."
+"మల�చ�కొనిని పీఠిక కీవిల�వక� తెల�పబడిన విధానం:\n"
+"మల�చ�కొనిని పీఠిక కీవిల�వల నామమ� \";\" చేత వేర�చేయబడతాయి."
+
+#: ../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"
@@ -15596,12 +16412,12 @@ msgid "_User:"
 msgstr "వినియోగదారి(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "రక�షిత సంకేతపదం"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15609,22 +16425,21 @@ msgstr ""
 "ఈ �చ�చికం ఇచ�చిప�చ�చ�కొన� సేవిక క� రక�షిత సంకేతపదం (NTLM) దృవీకరణన� ఉపయోగించి "
 "అన�సంధానించబడ�త�ంది."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "సాదాపాఠ�యమ� సంకేతపదం"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr ""
-"ఈ �చ�చికం ఇచ�చిప�చ�చ�కొన� సేవికక� సాదాపాఠ�యమ� సంకేతపదం దృవీకరణన� ఉపయోగించి అన�సంధానించ బడ�త�ంది."
+msgstr "ఈ �చ�చికం ఇచ�చిప�చ�చ�కొన� సేవికక� సాదాపాఠ�యమ� సంకేతపదం దృవీకరణన� ఉపయోగించి అన�సంధానించ బడ�త�ంది."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "కార�యాలయం న�ండి బయటక�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15632,83 +16447,87 @@ msgstr ""
 "మీర� ఆఫీస�‌బయట ఉన�నప�ప�డ మీక� ఎవరైతే సందేశం పంపారో వారందరికి\n"
 "క�రిందన తెల�పబడిన సందేశం స�వయంచాలకంగా పంపబడ�త�ంది."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "నేన� ఆఫీస� బయట ఉన�నాన�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "నేన� కార�యాలయంలో ఉన�నాన�"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "ఖాతాన� ఇచ�చిప�చ�చ�కొన�టక� సంకేతపదాన�ని మార�చ�మ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "సంకేతపదాన�ని మార�చండి"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "ఇచ�చిప�చ�చ�కొన� ఖాతా కొరక� ప�రాతినిధ�య అమరికలన� నిర�వహించ�మ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "ప�రాతినిధ�యప� సహాయక�డ�"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "వివిధమైన"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "అన�ని ఇచ�చిప�చ�చ�కొన� సంచయాల పరిమాణంన� దర�శించ�మ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "సంచయాల పరిణామం"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ఇచ�చిప�చ�చ�కొన� అమరికల�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "దృవీకరించ�(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "మెయిల�‌బాక�స�� (_M):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
-msgstr "దృవీకరణ రకం(_A)"
+msgstr "దృవీకరణ రకం (_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "మద�దతివ�వబడ� రకమ�ల కొరక� పరిశీలించ�మ�(_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15720,7 +16539,7 @@ 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"
@@ -15728,7 +16547,7 @@ 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 "ఆ రెండ� సంకేతపదాల� సరిపోలడం లేద�. దయచేసి సంకేతపదాన�ని మరలా ప�రవేశపెట�టండి."
 
@@ -15748,38 +16567,38 @@ msgstr "కొత�త సంకేతపదం:"
 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 "మీ సంకేతపదం తర�వాతి %d రోజ�లలో కాలమ�తీరబోతోంది"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "మలచ�కొన�"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "సరికూర�పరి(చద�వ�, సృష�టించ�, సరిచేయ�)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "ఆథర�(చద�వ�, సృష�టించ�)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "పరిదర�శక�డ�(చద�వ�ట-మాత�రమే)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "ప�రతినిధి అన�మత�ల�"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s కొరక� అన�మత�ల�"
@@ -15787,79 +16606,76 @@ 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:353
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "�మైనప�పటికి మీర� నా వ�యక�తిగత అంశమ�లన� చూడ�టక� అన�మతింపబడర�."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
-#, fuzzy, c-format
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "మీర� %s కొరక� ప�రతినిధిగా గ�ర�తించబడ�డార�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "క� ప�రతినిదిగా"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "ప�రతినిధి %s న� తొలగించాలా?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "క�రియాశీల సంచయాన�ని వాడ�కొనలేక పోయింది"
 
-#: ../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 "క�రియాశీల సంచయం నంద� ప�రతినిధి %s న� క�న�గొనలేకపోయింది"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ప�రతినిది %s న� తొలగించలేక పోయింది"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "ప�రతినిధ�ల జాబితాన� నవీకరించలేక పోయింది."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ప�రతినిది %s న� చేర�చలేకపోయింది"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "ప�రతినిధ�ల జాబితాన� చద�వ�టలో దోషం."
 
@@ -15907,20 +16723,25 @@ msgstr "à°…à°¨à±�మతà±�లనà±� సకà±�à°·à°¿à°‚à°ªà±�తంచేయà±�à°
 msgid "_Tasks:"
 msgstr "కర�తవ�యాల�(_T):"
 
-#: ../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
 msgid "Permissions..."
 msgstr "అన�మత�ల�..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "సంచయం నామమ�"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "సంచయం పరిమాణం"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. 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 "ఇతర వినియోగదార�ల సంచయానికి చందాదార� కమ�మ�"
@@ -15929,20 +16750,20 @@ msgstr "ఇతర వినియోగదారà±�à°² సంచయానికà
 msgid "Exchange Folder Tree"
 msgstr "ఇచ�చిప�చ�చ�కొన� సంచయం వృక�షం"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "సంచయానకి చందాదార�కావద�ద�..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "నిజంగా సంచయం \"%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" న�ండి చందాదార�గా తొలగ�మ�"
@@ -16006,15 +16827,18 @@ msgstr "ఇంకా 7 రోజ�ల�లో మీ రహస�యపదం
 msgid "_Change Password"
 msgstr "సంకేతపదాన�ని మార�చండి(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(అన�మతి తిరస�కరించబడినది.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "వినియోగదార�డిని జతచేయ�మ�:"
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "వినియోగదార�ని జతచేయ�మ�"
 
@@ -16132,15 +16956,11 @@ msgstr "స�న�నితత�వం(_S): "
 msgid "_User"
 msgstr "వినియోగదారి(_U)"
 
-#: ../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:138
 msgid "Select User"
 msgstr "వినియోగదారిని ఎంపికచేయ�మ�"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "చిర�నామా ప�స�తకం..."
 
@@ -16154,9 +16974,9 @@ msgstr "ఇతరవినియోగదారà±�à°² à°•à±�యాలెండà°
 
 #: ../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 "ఇచ�చిప�చ�చ�కొన� ఖాతా యొక�క ఆపరేషన�‌ల మరియ� సౌలభ�యాల యొక�క సంప�టం న� సంభాలించ� ప�లగ�ఇన�."
+msgstr "ఎక�స��‌చేంజ� ఖాతా యొక�క ఆపరేషన�‌ల మరియ� సౌలభ�యాల యొక�క సంప�టంన� సంభాలించ� ప�లగ�ఇన�."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16245,10 +17065,16 @@ msgid "Could not update out-of-office state"
 msgstr "ఆఫీస�-క�-బయట స�థితిని నవికరించలేక పోయింది"
 
 #: ../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 "ఇచ�చిప�చ�చ�కొన� ఖాతా అఫ�‌లైన� గా ఉంది."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16275,103 +17101,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "ప�రతినిధ�లన� నవీకరించ�ట లో విఫలమైంది:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "సంచయం ఇప�పటికే ఉంది"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "సంచయం లేద�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "సంచయం ఆఫ�‌లైన�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "సాదారణ దోషం"
 
-#: ../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 ""
-"ఒకవేళ OWA భిన�నమైన పాత� నంద� నడ�స�త�ంటే, మీర� తప�పక దానిని ఖాతా ఆకృతీకరణ డైలాగ� నంద� తెల�పవలెన�."
+msgstr "ఒకవేళ OWA భిన�నమైన పాత� నంద� నడ�స�త�ంటే, మీర� తప�పక దానిని ఖాతా ఆకృతీకరణ డైలాగ� నంద� తెల�పవలెన�."
 
-#: ../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 "మెయిల�‌పెట�టె {0} కొరక� ఈ సేవికనంద� లేద�."
 
-#: ../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 "ఆ URL సరైనదేమో పరిశీలించ�కొని మరలా ప�రయత�నించండి."
 
-#: ../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 "{1} పైన వినియోగాదారి {0} కొరక� � మెయిల�‌పెట�టె లేద�."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "ఇట�వంటి వినియోగదారి లేద� {0}"
 
-#: ../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 "దయచేసి ప�రతినిధి యొక�క ID ని ప�రవేశపెట�టండి లేదా పంపటం న� ప�రతినిధి �చ�చికంగా ఎంపికచేయవద�ద�."
 
-#: ../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
 msgid "Please restart Evolution for changes to take effect"
 msgstr "మార�ప�ల� ప�రభావితం కావ�టక� దయచేసి ఎవాల�యూషన� ప�నఃప�రారంభించ�మ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "దయచేసి వినియోగదారిని ఎంపికచేస�కొన�మ�."
 
-#: ../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."
@@ -16379,7 +17204,7 @@ msgstr ""
 "ఈ సేవిక ఎక�సేంజ� 5.5 న� నడ�ప�తోంది. ఎక�సేంజ� అన�సంధాని\n"
 "Microsoft ఎక�సేంజ� 2000 మరియ� 2003 మాత�రమే మద�దతిస�తోంది."
 
-#: ../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"
@@ -16393,88 +17218,88 @@ msgstr ""
 "\n"
 "లేదా మీర� మీ సంకేతపదాన�ని తప�ప�గా టైప�చేసిఉంటార�."
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "నియంత�రణ జాబితాన� వాడ�కొన�టక� వినియోగదారిని కల�పలేమ�:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "ప�రతినిధ�లన� సరిచేయ లేక పోయింది."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "అపరిచిత దోషం చూడ�టలో {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "అపరిచిత దోషం."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "అపరిచిత రకమ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "మద�దతివ�వని ఆపరేషన�"
 
-#: ../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 "మీ ప�రస�త�త ఉపయోగం : {0} KB. �దో మెయిల� తొలగించ�ట ద�వారా కొంతఖాళీ చేయ�టక� ప�రయత�నించండి."
 
-#: ../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 "మీ ప�రస�త�త ఉపయోగం: {0} KB. మీర� ఇప�ప�డ� మెయిల� న� పంపలేర� లేదా తిరిగిపొందలేర�."
 
-#: ../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 ""
-"మీ ప�రస�త�త ఉపయోగం: {0} KB. మీర� �దో మెయిల� న� తొలగించి కొంత ఖాళీ చేసేదాక మీర� మెయిల� న� పంపలేర�."
+msgstr "మీ ప�రస�త�త ఉపయోగం: {0} KB. మీర� �దో మెయిల� న� తొలగించి కొంత ఖాళీ చేసేదాక మీర� మెయిల� న� పంపలేర�."
 
-#: ../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 "{0} వాడిక నియంత�రణ జాబితా క� జతచేయలేమ�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ఇప�పటికే ఒక ప�రతినిధి"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} ఇప�పటికే జాబితా నంద�ఉంది"
 
@@ -16486,35 +17311,78 @@ msgstr "ఇతర వినియోగదారà±�à°² à°•à°°à±�తవà±�యాà
 msgid "Check folder permissions"
 msgstr "సంచయం అన�మత�లన� పరిశీలించ�మ�"
 
+#: ../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 ""
-"బహిర�గత సరికూర�పరిని కూర�పరిగా ఉపయోగించ�టక� ప�లగ�ఇన�. మీర� సాదాపాఠ�యప� సందేశాలన� మాత�రమే పంపగలర�."
+msgstr "బహిర�గత సరికూర�పరిని కూర�పరిగా ఉపయోగించ�టక� ప�లగ�ఇన�. మీర� సాదాపాఠ�యప� సందేశాలన� మాత�రమే పంపగలర�."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "బహిర�గత కూర�పరి"
 
+#: ../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 "బహిర�గత కూర�పరి నంద� కూర�చ�మ�"
+msgid "Compose in _External Editor"
+msgstr "బహిర�గత సరికూర�పరి నంద� కూర�చ�మ� (_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "బహిర�గత సరికూర�పరిని ఉపయోగించి సందేశాలన� కూర�చ�మ�"
 
-#: ../plugins/face/face.c:58
+#: ../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 ""
+"Emacs వ�పయోగంకొరక� \"xemacs\"\n"
+"VI వ�పయోగంకొరక� \"gvim\""
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "(48*48) png పరిమాణం న� ఎంపికచేయ�మ� < 700bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG దస�త�రాల�"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "మ�ఖమ�(_F)"
 
@@ -16549,20 +17417,56 @@ msgstr "సంచయాలక� చందావిరమించ�మ�"
 msgid "_Unsubscribe"
 msgstr "చందావిరమించ�మ�(_U)"
 
-#: ../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
 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 ""
+"సబ�‌స�క�రైబ� అయిన క�యాలెండర�స�� జాబితాన� వాడ�కొన�టక� %s వినియోగదారి "
+"సంకేతపదమ�న� ప�రవేశపెట�టండి."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"గూగ�ల� సేవికన�ండి డాటాన� చద�వలేద�.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "క�యాలెండర� (_e):"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "జాబితాన� వెలికితీయి (_l)"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
-msgstr "గూగ�ల� క�యాలెండర� న� అమర�చ�టక� ఒక ప�లగ�ఇన�."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "గూగ�ల� క�యాలెండర�‌న� మరియ� పరిచయాలన� అమర�చ�టక� ప�లగ�ఇన�."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google వనర�ల�"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "పరిశీలనజాబితా"
 
@@ -16607,16 +17511,16 @@ msgstr "భాగసà±�వామà±�à°¯ సంచయంనà±� సంసà±�థాà
 msgid "Shared Folder Installation"
 msgstr "భాగస�వామ�య సంచయం సంస�థాపన"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "నిరర�ధకంక� అమరికల�"
 
-#: ../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 "నిరర�దక మెయిల� అమరికల�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "నిరర�ధకం మెయిల� అమరికల�..."
 
@@ -16642,10 +17546,22 @@ msgid "_Junk List"
 msgstr "నిరర�ధకం జాబితా(_J)"
 
 #: ../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 "సందేశం సమర�దవంతంగా తిరిగిగమనించబడింది"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "మెయిల� న� తిప�ప�కొన�ట"
 
@@ -16653,12 +17569,6 @@ msgstr "మెయిల� న� తిప�ప�కొన�ట"
 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"
-msgstr "పంపించ� �చ�చికాల�"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "సమూహతరహా ఖాతాలలో సౌలభ�యాలకొరక� ప�లగ�ఇన�."
@@ -16667,7 +17577,77 @@ msgstr "సమూహతరహా ఖాతాలలో సౌలభà±�యాలà
 msgid "Groupwise Features"
 msgstr "సమూహతరహా సౌలభ�యాల�"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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 "చెల�లని వినియోగదారి"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "ప�రోక�సీ యాక�సిస� వినియోగదారి &quot;{0}&quot;క� యివ�వబడద�"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+msgid "You have already given proxy permissions to this user."
+msgstr "ఈవినియోగదారికి మీర� యిప�పటికే ప�రోక�సీ అన�మత�లన� యిచ�చివ�న�నార�."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "&quot;{0}&quot; ఖాతా యిప�పటికే వ�ంది. దయచేసి మీసంచయం ట�రీన� పరిశీలించండి."
+
+#: ../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 ""
+"&quot;{0}&quot;లా ప�రోక�సీ లాగిన� విఫలమైంది. దయచేసి మీఈమెయిల� చిర�నామాన� పరిశీలించి "
+"మరలా ప�రయత�నించండి."
+
+#
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "ఇది ప�నఃసంభవమిస�త�న�న వొక సమావేశం"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "మీర� దీనిని ఆమోందించ�టక� యిష�టపడతారా?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "మీర� జాబితాక� జతచేయాలన�క�ంట�న�న వినియోగదారి నామమ�న� తెల�పవలెన�"
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "పరిశీలనాత�మకంగా ఆమోదించ�మ�"
 
@@ -16676,16 +17656,15 @@ msgid "<b>Users:</b>"
 msgstr "<b>వినియోగదార�ల�:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-#, fuzzy
 msgid "C_ustomize notification message"
-msgstr "ప�రకటన సందేశాన�ని మల�చ�కొన�మ�(_u)"
+msgstr "ప�రకటన సందేశాన�ని మల�చ�కొన�మ� (_u)"
 
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Con_tacts..."
 msgstr "పరిచయాల�(_t)..."
 
 #: ../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 "సందేశం"
 
@@ -16751,9 +17730,8 @@ msgstr "వ�రాయ�మ�(_W)"
 
 #. 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 "అన�మతి తిరస�కరించబడినది"
+msgstr "చద�వ�టక� అన�మతి|_Read"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
@@ -16767,9 +17745,9 @@ msgstr "<b>ఖాతానామమ�</b>"
 msgid "Proxy Login"
 msgstr "ప�రాక�సీ లాగిన�"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16778,40 +17756,44 @@ msgstr "%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:509
 msgid "_Proxy Login..."
 msgstr "ప�రాక�సీ లాగిన�(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ఖాతా ఆన�‌లైన� లో ఉన�నప�పడ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ఖాతా చేతనంగా ఉన�నప�ప�డ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "వినియోగదార�ల�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "వినియోగదార�లన� ప�రవేశపెట�టండి మరియ� అన�మత�లన� అమర�చండి"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "కొత�త భాగస�వామ�య సంచయం(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "పంచ�కొన�చ�న�న"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "మల�చ�కొనిన నోటీస�"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "జతచేయ�మ�   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "సవరించ�"
 
@@ -16821,16 +17803,14 @@ msgstr "సందేశం స�థితి"
 
 #. Subject
 #: ../plugins/groupwise-features/status-track.c:119
-#, fuzzy
 msgid "Subject:"
-msgstr "సంగతి(_u):"
+msgstr "సంగతి:"
 
 #: ../plugins/groupwise-features/status-track.c:133
 msgid "From:"
 msgstr "న�ండి:"
 
 #: ../plugins/groupwise-features/status-track.c:148
-#, fuzzy
 msgid "Creation date:"
 msgstr "సృష�టించిన నాటి తేది:"
 
@@ -16863,7 +17843,6 @@ msgid "Completed: "
 msgstr "పూర�తైనది: "
 
 #: ../plugins/groupwise-features/status-track.c:225
-#, fuzzy
 msgid "Undelivered: "
 msgstr "పంపబడని: "
 
@@ -16879,11 +17858,11 @@ msgstr "హ�లా క�యాలెండర� మూలాలన� అమ
 msgid "Hula Account Setup"
 msgstr "హ�లా ఖాతా అమరిక"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "మల�చ�కొనిన పీఠికల�"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP పీఠికల�"
 
@@ -16936,28 +17915,28 @@ msgstr "IMAP ఖాతాలలోని సౌలభà±�యమà±�à°² కొరà°
 msgid "IMAP Features"
 msgstr "IMAP సౌలభ�యాల�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "క�యాలెండర� క� దిగ�మతిచేయ�మ�(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "కర�తవ�యమ�లక� దిగ�మతి చేయ�మ�(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS క� దిగ�మతిచేయ�మ�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "కర�తవ�యంజాబితాన� ఎంపికచేయ�మ�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "మ�ఖ�యమైన(_I)"
 
@@ -16987,22 +17966,20 @@ msgid "Search for an iPod failed"
 msgstr "iPod కొరక� శోధన విఫలమైంది"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-#, fuzzy
 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 ""
-"ఎవాల�యూషన� iPod న� కన�గొనలేక పోయింది దానితో కాలనియమత అగ�టక�.బహ�శా iPod సిస�టమ� క� అన�సంధానించబడి "
-"ఉండకపోవచ�చ� లేదా దాని పవర� ఆన� చేసి ఉండకపోవచ�చ�."
+"ఎవాల�యూషన� iPod న� కన�గొనలేక పోయింది దానితో కాలనియమత అగ�టక�.బహ�శా iPod "
+"సిస�టమ� క� అన�సంధానించబడి ఉండకపోవచ�చ� లేదా దాని పవర� ఆన� చేసి ఉండకపోవచ�చ�."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "�క�యాలెండర� రూపం(.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-#, fuzzy
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr "ఎంపికచేసిన కర�తవ�యం/క�యాలెండర�/చిర�నామాప�స�తకం/మెమో న� iPod తో కాలనియమత చేయ�మ�"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -17013,142 +17990,142 @@ msgstr "iPod క� �కకాలంచేయ�మ�"
 msgid "iPod Synchronization"
 msgstr "iPod కాలనియమత"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "క�యాలెండర� '%s'న� లోడ�చేయలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "క�యాలెండర� '%s' నందలి ఒక నియామకం ఈ సమావేశం తో విభేదిస�త�న�నది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "క�యాలెండర� '%s' నంద� ఒక నియామకాన�ని కన�గొన�మ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "� క�యాలెండర�లన� కన�గోనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "ఈ సమావేశాన�ని � క�యాలెండర� నందూ కన�గొనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "� కర�తవ�య జాబితాలోన� ఈ కర�తవ�యమ�న� కన�గొనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "ఈ మెమోన� � మెమో జాబితానంద� కన�గొనలేక పోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "ఈ నియామకం యొక�క ఉన�న వర�షన� కొరక� శోధిస�త�న�నది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "అంశమ�న� పార�శ చేయలేకపోతోంది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "అంశమ�న� క�యాలెండర� '%s' క� పంపలేకపోయింది.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ఆమోదించినట�ల�గా క�యాలెండర� '%s' క� పంపినది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "పరిశీలించినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "తిరస�కరించినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "రద�ద�చేసినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "నిర�వాహకి ప�రతినిధి %s న� తీసివేసింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ప�రతినిధికి రద�ద� నొటీస�న� పంపినది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "రద�ద� నోటీస�న� ప�రతినిదికి పంపలేక పోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "హాజరైనవారి స�థితి నవీకరించబడలేద� ఎంచేతంటే ఆ స�థితి చెల�లనిది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "హాజరైనవ�యక�తిని ని నవీకరించలేమ�. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "హజరైనవ�యక�తి స�థితి నవీకరించబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr " సమావేశ సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "కర�తవ�య సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "మెమో సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "సమావేశం సమాచారాన�ని పంపలేక పోయింది, సమావేశం లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "కర�తవ�యం సమాచారాన�ని పంపలేకపోయింది, కర�తవ�యం లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "మెమో సమాచరాన�ని పంపలేకపోయింది, మెమో లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "అన�భందించిన క�యాలెండర� విల�వైనది కాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "క�యాలెండర� కలిగిఉండ�టక� సందేశం ఉంది, అయితే క�యాలెండర� విల�వైన �క�యాలెండర� కాద�."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "క�యాలెండర� నంద� ఉన�న అంశమ� విల�వైనది కాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17156,11 +18133,11 @@ msgstr ""
 "సందేశం క�యాలెండర�న� కలిగిఉంది, అయితే క�యాలెండర� � ఘటనలన�, కర�తవ�యాలన� లేదా ఖాళీ/తీరికలేని సమాచారంన� "
 "కలిగిలేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "అన�భందించిన క�యాలెండర� బహ�ళ అంశమ�లన� కలిగిఉంది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17180,437 +18157,434 @@ msgstr "మెమో ప�నరావృతి"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "సందేశాన�ని స�పందిచిన తర�వాత తొలగించమ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "విభేందించ� శోధన"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "సమావేశ విభేదాలన� శోధించ�టక� క�యాలెండర� న� ఎంపికచేస�కొన�మ�"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "ఈరోజ�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "ఈరోజ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "ఈరోజ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "ఈరోజ� %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "మర�నాడ�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "మర�నాడ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "మర�నాడ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "మర�నాడ� %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "మర�నాడ� %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../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:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "<b>%s</b> తర�ప�న ప�రతిస�పందించ�మ�"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "<b>%s</b> తర�ప�న స�వీకరించింది"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> గ�ండా %s ఈ క�రింది సమావేశ సమాచారాన�ని ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ సమాచారాన�ని ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశాన�ని మీక� ప�రాతినిధ�యవహించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> గ�ండా %s ఉన�న సమావేశాన�ని జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ఉన�న సమావేశాన�ని జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b> గ�ండా %s ఈ క�రింది సమాశం కొరక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం కొరక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> గ�ండా %s ఈ క�రింది సమావేశం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశాన�ని రద�ద� చేసింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> గ�ండా %s ఈ క�రింది సమావేశ మార�పలన� ప�రస�తావించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ మార�ప�లన� ప�రస�తావించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశ మార�ప�లన� తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ మార�ప�లన� తిరస�కరించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యాన�ని ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యాన�ని ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> ఈ క�రింది కర�తవ�యమ�నక� %s యొక�క చెరికన� అభ�యర�దించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> గ�ండా %s మీక� ఒక కర�తవ�యాన�ని అప�పగిస�త�ంది:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> మీక� ఒక కర�తవ�యాన�ని అప�పగించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> గ�ండా %s  ఉన�న కార�తవ�యాన�ని జోడించిదల�చింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ఉన�న కార�తవ�యాన�ని జోడించిదల�చింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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 "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించన కర�తవ�యమ�నక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యానికి తాజా కార�య సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యం రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యం రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యాన�ని తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> క�రింది అప�పగించిన కర�తవ�యాన�ని తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> న�ండి %s క�రింది మెమోన� ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> క�రింది మెమోన� ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> గ�ండా %s ఉన�న మెమో న� జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ఉన�న మెమో న� జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> గ�ండా %s ఈక�రింది భాగస�వామ�య మెమోన� రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>ఈక�రింది భాగస�వామ�య మెమోన� రద�ద�చేసినది:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "క�యాలెండర�‌న� తెర�వ�మ�(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "తిరస�కరించ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "ఆమోదించ�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "అన�నీ తిరస�కరించ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "అన�నిటిని పరిశీలించ�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "పరిశీలకంగా(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "అన�నీ ఆమోదించ�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "సమాచారాన�ని పంప�(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "హాజరైనవాని స�థితిని నవీకరించ�మ�(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "నవీకరించ�మ�(_U)"
 
@@ -17675,8 +18649,7 @@ msgid "This meeting has been delegated"
 msgstr "ఈ సమావేశం ప�రాతినిధ�యం వహించబడింది"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. పంపినవానిని జవాబ�దార�నిగా జోడించండి?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -17704,30 +18677,26 @@ msgid "Enable D-Bus messages."
 msgstr "D-Bus సందేశాలన� చేతనంచేయ�మ�."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-#, fuzzy
 msgid "Enable icon in notification area."
-msgstr "ప�రకటన ప�రదేశంనంద� ప�రతిమన� బ�లింక�‌చేయ�మ�."
+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 "కొత�త మెయిల� సందేశం వచ�చినప�ప�డ� D-Bus సందేశం న� సంభవింపచేస�త�ంది."
+msgstr "కొత�త మెయిల� సందేశం వచ�చినప�ప�డ� D-Bus సందేశంన� సంభవింపచేస�త�ంది."
 
 #: ../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."
+"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
-#, fuzzy
 msgid "Notify new messages for Inbox only."
-msgstr "ఇన�‌బాక�స� క� కొత�త సందేశాలన� మాత�రమే ప�రకటింట�మ�(_I)"
+msgstr "ఇన�‌బాక�స��‌క� మాత�రమే కొత�త సందేశాల ప�రకటనన�యివ�వ�."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-#, fuzzy
 msgid "Play sound when new messages arrive."
-msgstr "కొత�తసందేశం వచ�చనప�ప�డ� శబ�దం ప�లే చేయాలా లేదా బీప� ప�లే చేయాలా."
+msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ�."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
@@ -17742,7 +18711,6 @@ msgid "Sound file name to be played."
 msgstr "ప�లే చేయ�టక� శబ�దప� దస�త�రం నామమ�."
 
 #: ../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 "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� దస�త�రం ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
 
@@ -17766,9 +18734,17 @@ msgstr "ఇన�‌బాక�స� సంచయం నందలి కొత
 msgid "Generate a _D-Bus message"
 msgstr "_D-Bus సందేశాన�ని సంభంవింపచేయ�మ�"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "ఎవాల�యూషన�‌యొక�క మెయిల� ప�రకటన"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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:363
-#, fuzzy, c-format
+#: ../plugins/mail-notification/mail-notification.c:457
+#, c-format
 msgid ""
 "You have received %d new message\n"
 "in %s."
@@ -17776,73 +18752,71 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] ""
-"మీర� %2$s నంద� %1$d కొత�త సందేశాలన�\n"
-"స�వీకరించార�"
+"మీర� %d కొత�త సందేశంన�\n"
+"%sనంద� పొందార�."
 msgstr[1] ""
-"మీర� %2$s నంద� %1$d కొత�త సందేశాలన�\n"
-"స�వీకరించార�"
+"మీర� %d కొత�త సందేశంన�\n"
+"%sనంద� పొందార�."
 
-#: ../plugins/mail-notification/mail-notification.c:368
-#, fuzzy, c-format
+#: ../plugins/mail-notification/mail-notification.c:462
+#, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "మీర� %d కొత�త సందేశాలన� స�వీకరించార�."
-msgstr[1] "మీర� %d కొత�త సందేశాలన� స�వీకరించార�."
+msgstr[0] "మీర� %d కొత�త సందేశాన�ని పొందార�."
+msgstr[1] "మీర� %d కొత�త సందేశాన�ని పొందార�."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "కొత�త ఈమెయిల�"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "ప�రకటన ప�రదేశంలో ప�రతిమన� చూప�మ�(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "ప�రకటన ప�రదేశం లో ప�రతిమన� బ�లింక� చేయ�మ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "ప�రతిమతో కూడి సందేశాన�ని పాప�అప� చేయ�మ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
-msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ�."
+msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ� (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "బీప�(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "శబ�దప� దస�త�రాన�ని ప�లే చేయ�మ�(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "దస�త�రనామమ� న� తెలియజేయ�మ�(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "శబ�దప� దస�త�రాన�ని ఎంపికచేయ�మ�"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "ప�లే(_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "ఇన�‌బాక�స� క� కొత�త సందేశాలన� మాత�రమే ప�రకటింట�మ�(_I)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-#, fuzzy
 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 ""
-"కొత�త సందేశం వచ�చినప�ప�డ� D-Bus సందేశంన� సంభవింపచేయ�మ� లేదా వినియోగదారికి ప�రకటన ప�రదేశంలో ప�రతిమతో "
-"మరియ� ప�రకటన సందేశంతో తెలియజెప�ప�మ�."
+"కొత�త సందేశం వచ�చినప�ప�డ� D-Bus సందేశంన� సంభవింపచేయ�మ� లేదా వినియోగదారికి "
+"ప�రకటన ప�రదేశంలో ప�రతిమతో మరియ� ప�రకటన సందేశంతో తెలియజెప�ప�మ�."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -17862,12 +18836,12 @@ msgstr "సమావేశంక� మార�చ�మ�(_v)"
 msgid "Mail to meeting"
 msgstr "సమావేశంక� మెయిల�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "క�యాలెండర� న� తెర�వలేద�. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -17916,8 +18890,7 @@ msgid "Mailing _List"
 msgstr "మెయిలింగ� జాబితా(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr "ఉమ�మడి మెయిలింగ� జాబితా ఆదేశాలక� చర�యలన� అందిస�త�ంది(చందాదార�కమ�మ�,చందావిరమించ�...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -17976,7 +18949,7 @@ msgstr "మెయిలింగ� జాబితాక� ఈ-మెయిల
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18056,6 +19029,26 @@ msgstr "జాబితాక� చందాదార� కమ�మ�(_S)"
 msgid "_Unsubscribe from List"
 msgstr "జాబితాన�ండి చందావిరమించ�కొన�మ�(_U)"
 
+#: ../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 "ప�రస�త�త సంచయం మరియ� వ�పసంచంయంల పైన (_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "ప�రస�త�త సంచయం మాత�రమే (_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "అన�ని చదివినవిగా గ�ర�తించ�"
@@ -18077,14 +19070,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "ఎంపికచేసిన క�యాలెండర� న� ఆఫ�‌లైన� గా దర�శించ�టక� గ�ర�త�ంచ�త�ంది."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-#, fuzzy
 msgid "_Do not make available for offline use"
-msgstr "ఆఫ�‌లైన� ఉపయోగం క� అంద�బాట� చేయవద�ద�(_D)"
+msgstr "ఆఫ�‌లైన� వ�పయోగం కొరక� అంద�బాట� చేయవద�ద� (_D)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-#, fuzzy
 msgid "_Make available for offline use"
-msgstr "ఆఫ�‌లైన� ఉపయోగార�దం అంద�బాట�చేయ�మ�(_M)"
+msgstr "ఆఫ�‌లైన� ఉపయోగార�దం అంద�బాట�చేయ�మ� (_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -18100,7 +19091,7 @@ msgstr "à°� à°ªà±�లగà±�ఇనà±�à°¸à±�  చేతనంగా లేదా à
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "ప�లగ�గిన� అభికర�త"
 
@@ -18112,33 +19103,24 @@ msgstr "à°ªà±�లగà±�ఇనà±�à°¸à±� à°¨à±� చేతనం మరియà±� à°
 msgid "_Plugins"
 msgstr "ప�లగ�ఇన�స�(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "ఆథర�(ల�)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "విశదీకరణ"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "ఆకృతీకరణ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "గమనిక: ప�నఃప�రారంభించ� నంతవరక� కొన�ని మార�ప�ల� ప�రభావితం కావ�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "అవలోకనం"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "ఆకృతీకరణ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "ఈ ప�లగ�ఇన� కొరక� అక�కడ � ఆకృతీకరణ �చ�చికం లేద�."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "ప�లగ�ఇన�"
 
@@ -18162,42 +19144,21 @@ msgstr "సాదా పాఠ�యమ� రీతి"
 msgid "Prefer plain-text"
 msgstr "సాదా-పాఠ�యమ�న� ఇష�టపడ�త�ంది"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "ఉన�నట�లైతే HTML న� చూప�మ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "సాదా న� ఇష�టపడతాన�"
 
-#: ../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
-#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
-msgstr "HTML రీతి(_M)"
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-#, fuzzy
-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 "సందేశాన�ని మ�ద�రించ�"
-
-#: ../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 "మ�ద�రణ ఉపదర�శనం(_v)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "సందేశంన� మ�ద�రించ�మ�"
+msgstr "HTML రీతి (_M)"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
@@ -18223,13 +19184,7 @@ msgstr "స�థానమ�ల�"
 msgid "_Publish Calendar Information"
 msgstr "క�యాలెండర� సమాచారంన� మ�ద�రించ�మ�(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' క� రహస�యపదాన�ని ప�రవేశపెట�టండి"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "మీర� ఖచ�చితంగా సాససె న� తీసివేయాలన�క�ంట�న�నారా?"
 
@@ -18317,15 +19272,75 @@ msgstr ""
 "iCal\n"
 "ఖళి/తీరికలేని"
 
+#: ../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:108
 msgid "SpamAssassin (built-in)"
 msgstr "స�పామ�ఎస�సైన� (బ�ల�ట�-ఇన�)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "ఇది స�పామ�ఎస�సైన� న� నమ�మదగినది గా చేస�త�ంది, అయితే నెమ�మదిగా"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "స�పామ�ఎస�సాసిన� కనబడలేద�, కోడ�: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "పైప� సృష�టించ�టలో విఫలమైంది: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "ఫోర�క�� తర�వాత దోషమ�: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "స�పామ�‌యెస�సాసిన� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "స�పామ�‌యెస�సాసిన� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�, సమాప�తం చేయబడ�తోంది..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "స�పామ�‌యెస�సాసిన� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "స�పామ�‌యెస�సాసిన� అంద�బాట�లో లేద�."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "ఇది స�పామ�‌యెస�సాసిన�‌న� నమ�మదగినదిగా చేస�త�ంది, అయితే నిదానమైనది"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "ద�రస�థ పరిశీలనలన� చేర�చ�త�ంది(_n)"
 
@@ -18333,8 +19348,7 @@ msgstr "à°¦à±�à°°à°¸à±�à°¥ పరిశీలనలనà±� చేరà±�à°šà±�à°¤à
 msgid ""
 "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
-msgstr ""
-"స�పామ�ఎస�సైన� ఉపయోగించి నిరర�ధక సందేశాలన� వడపోస�త�ంది. ఈ ప�లగ�ఇన� క� స�పామ�ఎస�సైన� సంస�థాపించ వలసి ఉంది."
+msgstr "స�పామ�ఎస�సైన� ఉపయోగించి నిరర�ధక సందేశాలన� వడపోస�త�ంది. ఈ ప�లగ�ఇన� క� స�పామ�ఎస�సైన� సంస�థాపించ వలసి ఉంది."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin junk plugin"
@@ -18350,7 +19364,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:314
 msgid "Save attachments"
 msgstr "అన�భందమ�లన� దాయ�మ�"
 
@@ -18362,16 +19376,15 @@ msgstr "అన�భందమ�లన� దాయ�మ�..."
 msgid "Save all attachments"
 msgstr "అన�బంధాలన�నిటిని దాయ�మ�"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "దాయ�టక� సామాన�య నామమ�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "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:347
 msgid "Save"
 msgstr "దాయ�మ�"
 
@@ -18379,79 +19392,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "వివరణ జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "వర�గమ�ల జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "వ�యాఖ�యానం జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "సృష�టించబడింది"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "పరిచయమ�ల జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "ప�రారంభమౌత�ంది"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "మ�గ�స�త�ంది"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "శాతం పూర�తైంది"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "హాజరైనవారి జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "సవరించబడింది"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV రూపలావణ�యానికి ఉన�నతమైన ఇచ�ఛాపూర�వకాల�"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "పీఠికన� మ�ంద� చేర�చ�"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "విల�వ నిర�ధారికి:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "రికార�డ�  నిర�దారకి:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "విల�వలన� దీనితో చ�ట�టిఉంచ�:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "కామా తో విభజించిన విల�వ రూపం (.csv)"
 
@@ -18472,15 +19485,15 @@ msgstr "డిస�క�క� దాస�త�ంది(_S)"
 #. * 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:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF రూపం (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "గమ�య దస�త�రాన�ని ఎంపికచేయ�మ�"
 
@@ -18505,22 +19518,22 @@ msgid "Show _only this Task List"
 msgstr "ఈ కర�తవ�య జాబితా మాత�రమే చూప�మ�(_o)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "ప�రారంభ విజార�డ�న� సంభాలించే ప�లగ�ఇన�."
+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 "ప�రారంభ విజార�డ�"
+msgid "Setup Assistant"
+msgstr "అమర�ప� సహాయక�డ�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "ఎవాల�యూషన� అమర�ప� సహాయకి"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "స�వాగతం"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18532,28 +19545,29 @@ msgstr ""
 "\n"
 "దయచేసి \"మ�ంద�క�పంప�\" బటన� న� కొనసాగించ�టక� నొక�క�మ�. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "దస�త�రాలన� దిగ�మతిచేస�తోంది"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "మీర� దిగ�మతి చేయ�టక� ఇష�టపడే సమాచారాన�ని దయచేసి ఎంచ�కొన�మ�:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "%s న�ండి:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
+#, c-format
 msgid "Importing data."
 msgstr "డాటాన� దిగ�మతిచేస�తోంది."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "దయచేసి వేచిఉండండి"
 
@@ -18570,10 +19584,33 @@ msgid "Thread messages by subject"
 msgstr "సంగతి ద�వారా తంతి సందేశాల�"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
-#, fuzzy
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
-msgstr "సంగతి ద�వారా తంతీకరణ సందేశాలక� తిరిగివెళ�ళ�మ�(_a)"
+msgstr "సంగతి ద�వారా తంతీకరణ సందేశాలక� తిరిగివెళ�ళ�మ� (_a)"
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"సందేశం బాడీనంద� ప�రతిక�షేపించ�టక� టెంప�లేట�స�� ప�లగ�ఇన� కొరక� కీబోర�డ��/విల�వ జో�డీల "
+"జాబితా."
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "శీర�షిక లేద�"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "మాదిరిలా దాయ�మ� (_T)"
+
+#: ../plugins/templates/templates.c:745
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
@@ -18583,6 +19620,28 @@ msgstr "tnef à°…à°¨à±�భందాలనà±� డీకోడà±� చేయà±�à°Ÿà°
 msgid "TNEF Attachment decoder"
 msgstr "TNEF అన�భందం డీకోడర�"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV పరిచయాలన� అమర�చ�టక� ప�లగ�ఇన�."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV పరిచయాల�"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+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 నంద� అవసరం) (_A)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "ఎవాల�యూషన� షెల�"
@@ -18600,18 +19659,16 @@ msgid "Evolution Test component"
 msgstr "ఎవాల�యాషన� పరిశీలన మూలకం"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-#, fuzzy
-msgid "A string description of the current printer settings."
-msgstr "ప�రస�త�త మూద�రణ అమరిక యొక�క స�ట�రింగ� వివరణ."
+msgid "Authenticate proxy server connections"
+msgstr "ప�రోక�సీ సేవిక అన�సంధానమ�లన� దృవీకరించ�మ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "ఆకృతీకరణ వర�షన�"
+msgid "Automatic proxy configuration URL"
+msgstr "స�వయంచాలక ప�రోక�సీ ఆకృతీకరణ URL"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-#, fuzzy
-msgid "Decides whether the crash detection should be run or not."
-msgstr "క�రాష� అయినది తిరిగిపొంద� దాన�ని నడపోలో లేదో నిర�ణయిస�త�ంది."
+msgid "Configuration version"
+msgstr "ఆకృతీకరణ వర�షన�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18630,65 +19687,167 @@ msgid "Default window width"
 msgstr "అప�రమేయ విండో వెడల�ప�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "ఇంటర�నెట�‌నంద� HTTP/Secure HTTPన� వాడ�కొన�చ�న�నప�ప�డ� ప�రోక�సీ అమరికలన� చేతనం చేస�త�ంది."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr "HTTP ప�రోక�సీ హోస�ట�� నామమ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr "HTTP ప�రోక�సీ సంకేతపదమ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP ప�రోక�సీ పోర�ట��"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "HTTP ప�రోక�సీ వినియోగదారినామమ�"
+
+#: ../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 లేదా మరియొకనామమ� ప�రారంభంనంద� అప�రమేయంగా చూపించబడాలి."
 
+#: ../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 ""
+"నిజమైతే, ప�రోక�సీ సేవికక� అన�సంధానాలక� ధృవీకరణ అవసరమ�. వినియోగదారినామమ� "
+"\"/apps/evolution/shell/network_config/authentication_user\" GConf కీన�ండి "
+"తీస�కోబడ�త�ంది, మరియ� సంకేతపదమ� gnome-keyring న�ండిగాని లేదా "
+"~/.gnome2_private/Evolution సంకేతపదమ� దస�త�రమ�న�ండిగాని తీస�కోబడ�త�ంది."
+
 #
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "చివరిగా నవీకరించబడిన ఆకృతీకరణ వర�షన�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../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:11
+#: ../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 "HTTP ప�రోక�సీంగ� చేస�త�న�నప�ప�డ� ధృవీకరణ ‌వ�త�తీర�ణతక� సంకేతపదమ�."
+
+#: ../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 "SOCKS ప�రోక�సీ హోస�ట�� నామమ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr "SOCKS ప�రోక�సీ పోర�ట��"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr "స�రక�షిత HTTP ప�రోక�సీ హోస�ట�� నామమ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr "స�రక�షిత HTTP ప�రోక�సీ పోర�ట��"
+
+#: ../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 ""
+"ప�రోక�సీ ఆకృతీకరణ రీతిని ఎంపికచేయ�మ�. మద�దత�నిచ�చ� విల�వల� 0,1,2, మరియ� 3 "
+"అవి వర�సగా వీటిని \"సిస�టమ� అమరికలన� వ�పయోగించ�మ�\", \"ప�రోక�సీ లేద�\", \"మానవీయ ప�రోక�సీ "
+"ఆకృతీకరణన� వ�పయోగించ�మ�\" మరియ� \"autoconfig urlనంద� యివ�వబడిన ప�రోక�సీ "
+"ఆకృతీకరణన� వ�పయోగించ�మ�\" ప�రస�ప�టంచేస�తాయి."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "ప�రక�కపట�టి దర�శితం అవ�త�ంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "అభివృద�ది హెచ�చరిక డైలాగ� న� వదిలివేస�త�ంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "తిరిగిపొంద�ట గ�రించిన హెచ�చరిక డైలాగ� వదిలివేయ�మ�"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "ఆఫ�‌లైన� రీతినంద� ప�రారంభించ�మ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "స�థితిపట�టీ దర�శితమౌతోంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../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 "ఎవాల�యూషన� యొక�క ఆకృతీకరణ వర�షన�, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణ క� \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "మ�ఖ�య విండో కొరక� అప�రమేయ ఎత�త�, పిగ�జెల�స�నంద�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "మ�ఖ�య విండో కొరక� అప�రమేయ వెడల�ప�, పిగ�జెల�స� నంద�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "ప�రక�కపట�టీ కొరక� అప�రమేయ వెడల�ప�, పిగ�జెల�స� నంద�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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 "చివిరగా నవీకరించిన ఎవాల�యూషన� యొక�క ఆకృతీకరణ, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణక� \"2.6.0\")."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr "HTTP ప�రోక�సీ చేయ�టక� మిషన� నామమ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr "స�రక�షిక HTTP ప�రోక�సీ చేయ�టక� మిషన� నామమ�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr "socks ప�రోక�సీ చేయ�టక� మిషన� నామమ�."
+
+#: ../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 ""
-"చివిరగా నవీకరించిన ఎవాల�యూషన� యొక�క ఆకృతీకరణ, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణక� \"2.6.0\")."
+"మీర� ప�రోక�సీ చేయ� \"/apps/evolution/shell/network_config/"
+"http_host\" చేత నిర�వచించబడిన మిషన�‌నందలి పోర�ట��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../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 ""
+"మీర� ప�రోక�సీ చేయ�  \"/apps/evolution/shell/network_config/"
+"secure_host\" చేత నిర�వచించబడిన మిషన�‌నందలి పోర�ట��."
+
+#: ../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 ""
+"మీర� ప�రోక�సీ చేయ� \"/apps/evolution/shell/network_config/"
+"socks_host\" చేత నిర�వచించబడిన మిషన�‌నందలి పోర�ట��."
+
+#: ../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 "
@@ -18697,53 +19856,68 @@ msgstr ""
 "విండో బటన�స� యొక�క శైలి. అవి \"text\", \"icons\", \"both\", \"toolbar\" కావచ�చ�. ఒకవేళ "
 "\"toolbar\" అమర�చితే, బటన�స� యొక�క శైలి GNOME సాధనమ�లపట�టీ అమరికల ద�వారా నిర�ణయించబడ�త�ంది."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 ""
+"ప�రోక�సీ(క�రియాశీలంగా వ�ంటే) ద�వారాకాక , నేర�గా అన�సంధానించబడివ�న�న హోస�ట�స�� జాబితాన� "
+"ఈకీ కలిగివ�ంది. ఆవిల�వల� హోస�ట�� నామమ�ల� కావచ�చ�, డొమైన�స�� కావచ�చ� (ప�రాధమిక వైల�డ��‌కార�డ�� "
+"*.foo.com వంటివి), IP హోస�ట�� చిర�నామాల� (IPv4 మరియ� IPv6) కావచ�చ� మరియ� నెట�‌మాస�క�� "
+"(192.168.0.0/24 లాంటి) వాటితో నెట�‌వర�క�� చిర�నామాల� కావచ�చ�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "సాధనమ�లపట�టీ దర�శితం అవ�తోంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "URL that provides proxy configuration values."
+msgstr "ప�రోక�సీ ఆకృతీకరణ విల�వలన� అందించ� URL."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr "HTTP ప�రోక�సీ వ�పయోగించ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "HTTP ప�రోక�సీంగ� చేస�త�న�నప�ప�డ� ధృవీకరణ వ�త�తీర�ణమ�కొరక� వినియోగదారినామమ�."
+
+#: ../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:24
-#, fuzzy
-msgid "Whether crash detection should be done or not"
-msgstr "క�రాష� అయినది తిరిగిపోంద�ట జరగాలా వద�దా"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "విండో పెద�దదిగా ఉండ�ట జరగాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "ప�రక�కపట�టీ దర�శితం కావాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "స�థితిపట�టీ తప�పక ప�రదర�శిత మవ�వాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "సాధనమ�ల పట�టీ ప�రదర�శితమవ�వాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../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:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "ఎవాల�యూషన� యొక�క తిరిగిపొంద�క� హెచ�చరిక డైలాగ� న� వదిలివేయాలా."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "విండోబటన�స� దర�శితమవ�వాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "గవాక�ష బొత�తమ� శైలి"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "గవాక�ష బొత�తమ�ల� కనబడ�త�న�నాయి"
 
@@ -18759,29 +19933,23 @@ msgstr "క�రియాశీలమైన బంధాల�"
 msgid "Click OK to close these connections and go offline"
 msgstr "ఈ బంధాలన� మూసి లైన�బయటక� వెళ�ళడానికి సరే బొత�తాన�ని నొక�క�మ�"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "నడ�చ�టక� దిగ�మతిచేయ� రకాన�ని ఎంచ�కొన�మ�:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
 "ఎవాల�యూషన� క� దిగ�మతి చేయాలన�క�ంట�న�న దస�త�రాన�ని ఎంచ�కొన�మ�, మరియ� జాబితాన�ండి � రకమైన దస�త�రమో "
-"ఎంచ�కొన�మ�.\n"
-"\n"
-"మీక� తెలిసిఉండకపోతే మీర� \"స�వయంచాలకం\" న� ఎంచ�కొనవచ�చ�, మరియ� ఎవాల�యూషన� దానిని చేయ�టక� "
-"ప�రయత�నిస�త�ంది."
+"ఎంచ�కొన�మ�."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "ఈ దిగ�మతికి గమ�యాన�ని ఎంచ�కొన�మ�"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -18793,23 +19961,23 @@ msgstr ""
 "అమరికల� కనబడలేద�. మీర� మరలా ప�రయత�నించ�టక�\n"
 "ఇష�టపడితే, దయచేసి \"వెన�కక�\" బటన� న� నొక�కండి.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "దస�త�రనామమ�(_i):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "దస�త�రం రకం(_t):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "పాత కార�యక�రమాలన�ండి దత�తాంశాన�ని మరియ� అమరికలన� దిగ�మతి చేయ�మ�"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "ఒకేఒక దస�త�రాన�ని దిగ�మతిచేయ�(_s)"
 
@@ -18817,117 +19985,104 @@ msgstr "ఒకేఒక దసà±�à°¤à±�రానà±�ని దిగà±�మతిà
 msgid "Evolution Preferences"
 msgstr "ఎవల�యూషన� అభీష�టాల�"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "సంచయ నామం �దీ నిర�దేశించబడలేద�."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "సంచయ నామం  రిటర�న� అక�షరాన�ని కలిగి ఉండకూడద�."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "సంచయ నామం  \"/\" అక�షరాన�ని కలిగి ఉండకూడద�."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "సంచయ నామం  \"#\" అక�షరాన�ని కలిగి ఉండకూడద�."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' మరియ� '..' ఇప�పటికే ఉన�న సంచయనామాల�."
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ఎవాల�యూషన�"
 
-#: ../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 "గ�నోమ� చ�క�కానిల పనిమ�ట�ల� ఈ వ�యవస�థలో ప�రతిష�టించినట�ల� కన�బడ�టలేద�."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s నిర�వర�తించ�టలో దోషమ�."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "బగ� బడ�డీ ప�రతిష�టించిలేద�"
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "బగ� బడ�డీ నడవడం క�దరద�"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "అన�వాదకర�త పరపత�ల�"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "ఎవల�యూషన� వెబ�‌సైట�"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ వెబ�‌ప�ట తెర�వ�టలో దోషం."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "లైన�లో పనిచేయ�మ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "లైన�వెల�పల పనిచేయ�మ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "లైన�వెల�పల పనిచేయ�మ�"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "ఎవల�యూషన� ప�రస�త�తం లైన�లో ఉంది. లైన� వెల�పల పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆన�‌లైన�లో వ�ంది.\n"
+"ఆఫ�‌లైన�‌గా పనిచేయ�టక� ఈబటన�‌పై నొక�క�మ�."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "లైన� బయటక� వెళ�ళే క�రమంలో ఎవల�యూషన� ఉన�నది"
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "ఎవల�యూషన� ప�రస�త�తం లైన�లో లేద�. లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
+"ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s క� మార�మ�"
 
-#: ../shell/e-shell.c:640
-#, fuzzy
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
-msgstr "అపరిచిత సిస�టమ� దోషం."
+msgstr "తెలియని సిస�టమ� దోషం."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "సరే"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "సరికాని ఆర�గ�మెంట�స�"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF ళో నమోద� క�దరద�"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "రూపకరణ దత�తాంశస�థానమ� కన�బడలేద�"
 
@@ -18937,15 +20092,16 @@ msgstr "రూపకరణ దతà±�తాంశసà±�థానమà±� à°•à°¨à±�à
 msgid "New"
 msgstr "కొత�త"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "కొత�త పరీక�ష"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
-msgstr "పరీక�ష(_T)"
+msgstr "పరీక�ష (_T)"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "కొత�త పరీక�షా అంశాన�ని సృష�టించ�మ�"
 
@@ -18988,7 +20144,7 @@ msgstr ""
 "కార�యక�రమం నంద� మార�గదర�శనం చేయబడతార�."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19023,7 +20179,7 @@ msgstr ""
 "మీర� మా శ�రమ యొక�క ఫలితాలన� ఆనందిస�తారని నమ�మ�త�న�నామ�, మరియ� మేమ�\n"
 "మీ సహకారం కొరక� ఎద�చూస�త�న�నామ�!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19031,67 +20187,43 @@ msgstr ""
 "ధన�యవాదమ�ల�\n"
 "ఎవల�యూషన� టీం\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "నాక� మళ�ళీ చెప�పవద�ద�"
 
-#: ../shell/main.c:314
-#, fuzzy
-msgid "Evolution Crash Detection"
-msgstr "పతనం న�ండి ఎవల�యూషన� తిరిగిపొంద�ట"
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "వదిలివేయ�మ�(_n)"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"చివిరి సారి నడిచినప�ప�డ� ఎవాల�యూషన� అన�కొక�ండా ఉద�దీపనంచెందినట�ల�\n"
-"అనిపిస�తోంది.  మ�ంద�జాగ�రత�త చర�యగా, అన�ని ఉపదర�శనం పలకాల� మర�గ�పడ�త�న�నాయి.\n"
-"మీర� ఉపదర�శనం పలకాలన� దర�శనం మెనూ న�ండి తిరిగిపొందవచ�చ�.\n"
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "ఈ సందేశంన� మరలా చూపవద�ద�(_D)"
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "ఎవల�యూషన� నిర�దేశిత భాగాన�ని క�రియాశీలీకరించడాన�ని ప�రారంభించ�"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "ఎవల�యూషన� భాగాలన� బలవంతంగా మూసివేయ�మ�"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ఎవాల�యూషన� 1.4 న�ండి బలవంతంగా తిరిగి-వలసపంప�"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "అన�ని మూలకాల డీబగ�గింగ� అవ�ట�‌ప�ట� న� దస�త�రం క� పంప�మ�."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "ప�లగ�గిన� ల� నింపబడడాన�ని క�రియాహీనం చేయ�మ�."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "మెయిల� యొక�క ఉపదర�శనం పలకాన�ని, పరిచయాలన� మరియ� కర�తవ�యాలన� అచేతనం చేయ�మ�."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ఎవల�యూషన� PIM మరియ� ఈ మెయిల� క�లైంట�"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19230,7 +20362,7 @@ msgstr ""
 "\n"
 "మీర� కొనసాగించ�ట ఎంచ�కొన�నట�లైతే, మీర� కొంత మీ పాత డాటా న� వాడ�కొనలేక పోవచ�చ�.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19241,7 +20373,7 @@ msgstr ""
 "\n"
 "నమ�మిక అమర�ప�లన� సరిచేయ�మ�:"
 
-#: ../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 "
@@ -19250,7 +20382,7 @@ 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 "
@@ -19307,22 +20439,27 @@ msgstr "ఈ మెయిల� చిర�నామా"
 msgid "All CA certificate files"
 msgstr "యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణ కలిగిన అన�ని దస�త�రాల�"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "యోగ�యతాపత�రిక దర�శిని:%s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%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 "యోగ�యతాపత�రిక దత�తాంశస�థానం కొరక� కొత�త రహస�యపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "కొత�త రహస�యపదాన�ని ప�రవేశపెట�ట�మ�"
 
 #. 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"
@@ -19331,7 +20468,7 @@ msgstr ""
 "క� జారీఅయింది:\n"
 "  సంగతి: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19340,7 +20477,7 @@ msgstr ""
 "ద�వారా జారీఅయింది:\n"
 "  సంగతి: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "యోగ�యతాపత�రమ�న� ఎంచ�కొన�మ�"
 
@@ -19509,8 +20646,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "మిమ�మల�ని గ�ర�తించ�టక� ఈ సంస�థల న�ండి మీక� యోగ�యతాపత�రికల� ఉన�నాయి:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "యోగ�యతాపత�రికల అధికార�లన� గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� దస�త�రం పై ఉన�నాయి:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -19526,7 +20662,7 @@ msgid "_Edit CA Trust"
 msgstr "CA నమ�మికన� సరిచేయ�మ�(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "యోగ�యతాపత�రిక మ�ందే ఉన�న"
 
@@ -19693,15 +20829,15 @@ msgstr "విషయం �కైక ID"
 msgid "Certificate Signature Value"
 msgstr "యోగ�యతాపత�రిక సంతకం విల�వ"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 దస�త�ర రహస�యపదం"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 దస�త�రానికి రహస�యపదమ�న� ప�రవేశపెట�టండి:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "దిగ�మతి అయిన యోగ�యతాపత�రిక"
 
@@ -19734,8 +20870,7 @@ msgstr "à°…à°¨à±�ని పరిచయాలనà±� నకలà±�తీయà±�à°®à
 msgid "Contact _Preview"
 msgstr "పరిచయం ఉపదర�శనం(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "నకల�"
@@ -19757,11 +20892,10 @@ msgid "Copy to Folder..."
 msgstr "సంచయమ�క� నకల� తీయ�మ�..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "కొత�త చిర�నామా ప�స�తక సంచయాన�ని సృష�టించ�"
 
-#: ../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 "కత�తిరించ�మ�"
@@ -19802,8 +20936,7 @@ msgstr "ఎంచ�క�న�న సంచయమ� యొక�క పరి
 msgid "Move to Folder..."
 msgstr "సంచయమ�నక� జర�గ�మ�..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "అతికించ�"
@@ -19840,13 +20973,11 @@ msgstr "ఎంపికచేసిన పరిచయాలన� Vకార�
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ఎంపికచేసిన సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "అన�నిటిని ఎంచ�కొన�మ�"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "అన�నిటిని ఎంచ�కొన�మ�(_A)"
 
@@ -19915,7 +21046,7 @@ msgstr "పరిచయాలన� దీనికి కద�ప�మ�(_M)
 msgid "_Move Folder Contacts To"
 msgstr "సంచయం పరిచయాలన� క� కద�ప�మ�(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "కొత�త(_N)"
 
@@ -19976,7 +21107,7 @@ msgid "Month"
 msgstr "నెల"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "తర�వాతి"
 
@@ -19985,7 +21116,7 @@ msgid "Previews the calendar to be printed"
 msgstr "మ�ద�రించాల�సిన క�యాలెండర� న� ఉపదర�శనమిస�త�ంది"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "పూర�వప�"
 
@@ -20053,233 +21184,6 @@ msgstr "పని వారం"
 msgid "_Open Appointment"
 msgstr "నియామకాన�ని తెర�వ�మ�(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "ఎంపికన� క�లిప� పలకానికి నకల� తీయ�మ�"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "ఎంపికన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "క�లిప� పలకం న�ండి అతికించ�మ�"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "క�లిప� పలకం న�ండి పాఠ�యాన�ని అతికించ�మ�"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "పాఠ�యమొత�తాన�ని ఎంచ�కొన�మ�"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "జతపర�చ�"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "దస�త�రాన�ని జతపర�చ�టక� ఇక�కడ నొక�కండి"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "ప�రస�త�త గవాక�షాన�ని మూయ�టక� ఇక�కడ నొక�కండి"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "ప�రస�త�త గవాక�షాన�ని దాయ�టక� ఇక�కడ నొక�కండి"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "సహాయం అంద�బాట�లో ఉందోలేదో చూడటానికి ఇక�కడ నొక�కండి"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "మూయ�మ�"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "చేర�చ�మ�(_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "జతపర�చ�మ�(_A)..."
-
-#: ../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 "మూయ�మ�(_C)"
-
-#: ../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:42
-msgid "_File"
-msgstr "దస�త�రం(_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "సహాయం(_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "ఇచ�ఛాపూర�వకాల�(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "పూర�తిరోజ� ఘటన"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "పూర�తిరోజ� ఘటన(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "గోప�యమైనదిగా వర�గీకరించ�"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "స�వంతమైనది గా వర�గీకరించ�"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "ప�రజామైనది గా వర�గీకరించ�"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "ఈ ఘటనక� హెచ�చరికల� అమర�చ�టక� లేదా తీసివేయ�టక� ఇక�కడ నొక�కండి"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "ఉన�నతస�థితిగల పంపించే ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
-
-#
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "ప�నఃసంభవమిస�త�న�న ఘటనగా దీన�ని చేయ�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "పబ�లిక�(_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "హాజరైనవారి కొరక� ఖాళీ/తీరికలేని సమాచారం న� ప�రశ�నించ�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "పాత�ర క�షేత�రం(_o)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "పంపించ�టక� ఇచ�ఛాపూర�వకాల�(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "సమయం న� తీరికలేనిదిగా చూప�మ�(_b)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "కాలక�షేత�రమ�(_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "హాజరైనవాని రకం క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "RSVP క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "పాత�ర క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "స�థితి క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "సమయ క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "వర�గీకరణల� ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "రోజ�మెత�తం ఘటన ఉంటే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "చూపించ� సమంయ తీరికలేక�ంటే మార�మ�"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "అలారమ�ల�(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "విభాగాల�(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "వర�గీకరణ(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "గోప�యమైన(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "ఖాళీ/తీరిక లేని(_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "స�వంత(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "ప�నరావృతి(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "స�స�థితి క�షేత�రం(_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "క�షేత�ర రకం(_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ప�రస�త�త మెయిల�  కార�యమ�న� రద�ద�చేయ�మ�"
@@ -20309,7 +21213,6 @@ msgid "Empty _Trash"
 msgstr "చెత�తన� ఖాళీ చేయ�(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "సంచయం(_o)"
 
@@ -20363,9 +21266,8 @@ msgid "_Debug Logs"
 msgstr "డీబగ� లాగ�స�(_D)"
 
 #: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
 msgid "_Download Messages for Offline Usage"
-msgstr "ఆఫ�‌లైన� ఉపయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ�(_D)"
+msgstr "ఆఫ�‌లైన� వ�పయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ� (_D)"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -20444,8 +21346,7 @@ msgid "Hide _Read Messages"
 msgstr "చదివిన సందేశాలన� అదృశ�యపర�చ�మ�(_R)"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "సందేశాలగ�ండా ఒక లైన� కొట�టివేసినట�ల� చూపించటం కన�నా వాటిని మర�గ�పర�చ�మ� తీసివేయ�మ�"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -20453,7 +21354,6 @@ msgid "Mar_k All Messages as Read"
 msgstr "అన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�(_k)"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Mark all messages in the folder as read"
 msgstr "సంచయంలోనిఅన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�"
 
@@ -20529,7 +21429,7 @@ msgstr "తంతీకరణ సందేశ జాబితా"
 msgid "_Group By Threads"
 msgstr "సమూహం ద�వారా తంత�ల�(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "సందేశం(_M)"
@@ -20864,129 +21764,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ప�రదర�శించబడిన సందేశాల మ�ఖ�యభాగమ�లో మిణ�గ�ర� మ�ల�క�న� చూపించ�మ�"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "సాధారణ శైలిలో సందేశాలన� చూప�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "ఈ మెయిల� పీఠికలతో సందేశాలన� చూప�మ�"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "సందేశం మ�డివనర�ని ఈ మెయిల� ద�వారా చూప�మ�"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "ఎంపిక చేస�క�న�న సందేశాలని తొలగించవద�ద�"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "సాధారణమైన(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "జూమ� వెల�పలకి(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "జతపర�చిన(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "అక�షరరీతి(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "ప�లాగ� శ�బ�రంచేయ�మ�(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "సందేశంలో కన�గొన�మ�(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "ఫ�లాగ� పూర�తయినది(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "వెళ�ళ�(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "మ�ఖ�యమైన(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "ఇన�‌లైన�(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "నిరర�ధకం(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "చిత�రమ�లన� నింప�మ�(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "సందేశం మూలం(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "తర�వాతి సందేశం(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "సాధారణ పరిమాణం(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "నిరర�ధకంకాద�(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr " కొత�త గవాక�షమ� లో తెర�వ�మ�(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "పూర�వప� సందేశం(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "కోటెడ�(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "చద�వ�మ�(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "సందేశాన�ని దాయ�మ�(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "సందేశాన�ని తొలగించవద�ద�(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "చదవక�ండా ఉన�నవి(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "జూమ�(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "జూమ� లోపలికి(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "ఈ గవాక�షాన�ని మూయ�మ�"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "మూయ�మ�"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21024,290 +21920,6 @@ msgstr "ఎంపికచేసిన మెమోలనà±� దరà±�శింà
 msgid "_Open Memo"
 msgstr "మెమోన� తెర�వ�మ�(_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "ఒక దస�త�రాన�ని జతపర�చ�మ�"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "ప�రస�త�త దస�త�రాన�ని మూయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "సంతకం తప�ప అన�నిటిని తొలగించ�"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "PGP తో ఈ సందెశాన�ని రహస�యపర�చ�"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "మీ S/MIME ఎన�క�రిప�షన� దృవీకరణపత�రం తో ఈ సందేశంన� ఎన�క�రిప�ట�చేయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "రూపలావణ�యం"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "మీ సందేశం చదవబడిన తర�వాత  చేరినట�ట� తాఖీద� పొంద�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr " HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "పంప� ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "దస�త�రాన�ని తెర�వ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP ని రహస�యపర�చ�"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP సంతకం"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP ని రహస�యపర�చ�(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP సంతకం(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "చదివినదాని రశీద� న� అభ�యర�దించ�(_e)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME ని రహస�యపర�చ�(_c)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME ని రహస�యపర�చ�"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME సంతకం(_n)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME సంతకం"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "పంపించ�(_e)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "ఇలా దాయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "డ�రాఫ�ట� న� దాయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "ఇలా దాయ�మ�(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "డ�రాఫ�ట� న� దాయ�మ�(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "డ�రాఫ�ట� గా దాయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "సంచయంలో దాయ�మ�..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "ప�రస�త�త దస�త�రాన�ని వేరే పేర�తో దాయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "నిర�దేశిత సంచయంలో  సందేశాన�ని దాయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "పంప�"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "HTML రూపలావణ�యంలో తపాలాన� పంప�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "ఈ సందేశాన�ని పంప�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "సందేశ ప�రాధాన�యతన� ఎక�క�వగా అమర�చ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "మీ PGP మీటతో ఈ సందేశాన�ని సంతకంచేయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "మీ S/MIME సంతకం దృవీకరణపత�రం తో ఈ సందేశంన� సంతకంచేయ�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "BCC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "CC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "ఎంపికదారి న�ండి ప�రదర�శించబడితే మార�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "వీరికి-పోస�ట� క�షేత�రం ప�రదర�శించబడితే మార�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "వీరికి-ప�రత�య�త�తరమ� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "క� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Bcc క�షేత�రమ�"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Cc క�షేత�రమ�"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "అన�నిటినీ తొలగించ�(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "క�షేత�రమ� న�ండి(_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "తెర�వ�మ�(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "వీరికి-పోస�ట� క�షేత�రం(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "సందేశాన�ని ప�రాధాన�యపర�చ�(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "క�షేత�రానికి సమాధానం(_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "రక�షణ(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "పంప�టక� ఇచ�ఛాపూర�వకాలన�(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "క�షేత�రానికి(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "మూయ�మ�"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "దాచి తర�వాత మూయ�మ�"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "దాచి తర�వాత మూయ�మ�"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "ప�రస�త�త దస�త�రాన�ని దాచి తర�వాత గచాక�షాన�ని మూయ�మ�"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "మీర� చందాదార� అయిన సంచయాల జాబితాక� సంచయంన� జతచేయ�మ�"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "జాబితాన� ప�నర�వికాసపర�చ�మ�"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "సంచయాల జాబితాన� ప�నర�వికాసపర�చ�మ�"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "మీర� చందాదార� అయిన సంచయాల జాబితాన�ండి సంచయంన� తీసివేయ�మ�"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "చందా"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "చందావిరమించ�"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "తిరగబడ�డ ఎంపిక(_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "కర�తవ�యమ� యొక�క స�స�థితి వివరాల ఇచ�చాపూర�వకాలైన మార�చ�మ�/దృశ�యం న� నొక�క�మ�"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "స�స�థితి వివరాల�"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "కాలక�షేత�రమ�"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "స�స�థితి వివరాల�(_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "ఎంపిక చేసిన కర�తవ�యాలన� నకల�తీయ�మ�"
@@ -21413,9 +22025,8 @@ msgid "I_mport..."
 msgstr "దిగ�మతి(_m)..."
 
 #: ../ui/evolution.xml.h:15
-#, fuzzy
 msgid "Icons _and Text"
-msgstr "చిత�రాల� మరియ� పాఠ�యమ�(_a)"
+msgstr "ప�రతిమల� మరియ� పాఠ�యమ� (_a)"
 
 #: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
@@ -21490,9 +22101,8 @@ msgid "Toggle whether we are working offline."
 msgstr "మనమ� ఆఫ�‌లైన� లో పనిచేస�త�ంటే మార�మ�."
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "Tool_bar Style"
-msgstr "పనిమ�ట�ల పట�టా శైలి(_b)"
+msgstr "పనిమ�ట�ల పట�టీ శైలి (_b)"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -21503,53 +22113,54 @@ msgid "View/Hide the Status Bar"
 msgstr "స�స�థితి  పట�టీ ని దర�శించ�/దాయ�మ�"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "ఆఫ�‌లైన�‌గా పనిచేయ�మ� (_O)"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "గ�రించి(_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "గవాక�షమ�న� మూయ�మ�(_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "రహస�య పదమ�లన� మర�చిపోండి(_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "తర�చూ అడ�గ� ప�రశ�నల�(_F)"
 
-#: ../ui/evolution.xml.h:46
-#, fuzzy
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
-msgstr "బొత�తమ�లన� దాయ�మ�(_H)"
+msgstr "బొత�తమ�లన� మర�గ�పరచ�మ� (_H)"
 
-#: ../ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
-msgstr "ప�రతిమల� మాత�రమే(_I)"
+msgstr "ప�రతిమల� మాత�రమే (_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "చ�ర�కైన నివేదన(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "త�యజించ�(_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "స�విచ�చర� కనిపించ�విదం(_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "కాలనియమత ఇచ�చాపూర�వకాల�(_S)..."
 
-#: ../ui/evolution.xml.h:53
-#, fuzzy
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
-msgstr "పాఠ�యమ� మాత�రమే(_T)"
+msgstr "పాఠ�యమ� మాత�రమే (_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "గవాక�షమ�(_W)"
 
@@ -21626,11 +22237,11 @@ msgid "With _Status"
 msgstr "స�స�థితి తో(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21647,8 +22258,8 @@ msgid "Select a Time Zone"
 msgstr "ఒక కాలక�షేత�రమ�న� ఎంపిక చేయ�మ�"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "కాలక�షేత�ర కాంబోపేటిక"
+msgid "Timezone drop-down combination box"
+msgstr "సమయక�షేత�రం డ�రాప�-డౌన� య�గళ పెట�టె"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21660,19 +22271,19 @@ msgstr ""
 "ఎంచ�కొన�మ�.\n"
 "జూమ� తగ�గించ�టక� మౌస� క�డి బటన� న� ఉపయోగించ�మ�."
 
-#: ../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 "%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 "దర�శనాలన� నిర�వచించ�"
 
@@ -21682,17 +22293,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\" క� దర�శనాలన� నిర�వచించ�"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "ఇన�‌స�టాన�స�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "ప�రస�త�త దర�శనాన�ని దాయ�మ�"
 
@@ -21706,7 +22317,7 @@ msgstr "ఉన�న దర�శనమ�న� ప�న:స�థాపిం
 
 #. 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 "మలచిన దర�శనమ�"
 
@@ -21715,40 +22326,40 @@ msgid "Save Custom View"
 msgstr "మలచిన దర�శనమ�న� దాయ�మ�"
 
 #: ../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 "దర�శనమ�లన� నిర�వచించ�..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "ప�రస�త�త దర�శనం(_u)"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "దర�శనంన� ఎంపికచేయ�మ�: %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 "మలచిన దర�శనమ�న� దాయ�మ�..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "ప�రస�త�త మలచిన దర�శనమ�న� దాయ�మ�"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "దర�శనాలన� సృష�టించ� లేదా సరిచేయ�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "కార�మాగారం"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "కొత�త దర�శనమ�న� నిర�వచించ�"
 
@@ -21764,17 +22375,17 @@ msgstr "దర�శనం రకం"
 msgid "Type of view:"
 msgstr "దర�శన రకం:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "అన�బంధం పట�టా"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "దస�త�రం %s న� అన�భందించలేమ�: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s దస�త�రాన�ని అన�భందిచంలేమ�: సాదారణ దస�త�రం కాద�"
@@ -21796,33 +22407,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "అన�బంధాన�ని స�వయం ప�రదర�శనక� సూచించ�మ�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "నెల క�యాలెండర�"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 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:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "చ�క�కలతో నింప�మ�"
 
@@ -21846,30 +22456,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "కనిష�ఠ వెడెల�ప�"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "కనిష�ఠ వెడల�ప�"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "స�పేసింగ�"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "ఇప�ప�డ�"
 
-#: ../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 "సమయం %s రూపలావణ�యంలో ఉండాలి:"
@@ -21878,152 +22488,150 @@ msgstr "సమయం %s రూపలావణ�యంలో ఉండాలి:
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "శాతం విల�వ తప�పక 0 మరియ� 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 "బాల�టిక�"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "సెంట�రల� యూరోపియన�"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "చైనీస�"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "సిరిల�లిక�"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "గ�రీక�"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "హెబ�రివ�"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "జపనీస�"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "కొరియన�"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "థాయ�"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "టర�కిష�"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "యూనికోడ�"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "వెస�త�రన� యూరోపియన�"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "వెస�త�రన� యూరోపియన�, కొత�త"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "సంప�రదాయమైన"
 
-#: ../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 "సరళీకరించిన"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "ఉక�రేనియన�"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "దార�శనీక"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "అపరిచిత %s అక�షర సంకేతరచన:"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "అక�షర సంకేతరచన"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "ఉపయోగించడానికి అక�షరమాలన� ఎక�కించ�మ�"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "ఇతర..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "అక�షర సంకేతరచన(_a)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "తేది మరియ� సమయం"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "ఎగ�బడి తేదీని పాఠ�యమ� గా ఎక�కించ�మ�"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "క�యాలెండర� ని చూపించ�టక� బొత�తం న� నొక�కండి"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "సమయంన� ఎంచ�కొన�టక� కాంబోపెట�టె"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "సమయంన� ఎంచ�కొన�టక� డ�రాప�-డౌన� య�గళ పెట�టె"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "ఇప�ప�డ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "ఈ రోజ�(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "నిస�సార తారీఖ� విల�వ"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "చెల�లని కాలం విల�వ"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "విస�తరించబడిన"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "విస�తరించ�నది విస�తరించిన కాకపోయినా కూడా"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "విస�తరిణి లేబ�ల� యొక�క పాఠ�యమ�"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "కిందగీతన� ఉపయోగించ�"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22031,107 +22639,115 @@ msgstr ""
 "ఒకవేళ అమర�చినట�లైతే, పాఠ�యమ� క�రింది ఉంచిన గీత తర�వాతి అక�షరం మెన�‌మోనిక� �గ�జలరేటర� కీ గా సూచించ�ట కొరక� "
 "ఉపయోగపడ�త�ంది"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "లేబ�ల� మరియ� చైల�డ�  మధ�య ఉంచ�టక� ఖాళి"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "లేబ�ల� విడ�జెట�"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "సాదారణ విస�తరిణి లేబ�ల� స�థలమ�నంద� ప�రదర�శించ�టక� విడ�జట�"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "విస�తరిణి పరిమాణం"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "విస�తరిణి బాణం యొక�క పరిమాణం"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "సూచిక స�పేసింగ�"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "విస�తరిణి బాణం చ�ట�టూ స�పేసింగ�"
 
 #. 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:748
+#: ../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 "ఉన�నతమైన వెత�క�"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "వెతికిన దానిని దాచ�మ�"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "వెత�క�ట(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "శోధనల�"
 
-#: ../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 "వెత�క�న� దాయ�మ�(_S)..."
 
-#: ../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 "దాచిన వెత�క�ఫలితాలన� సరిచేయ�(_E)..."
 
-#: ../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 "అద�నాతన శోధన(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "అన�ని ఖాతాల�"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "ప�రస�త�త ఖాతా"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "ప�రస�త�త సంచయం"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "ప�రస�త�త సందేశం"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr " ప�రతిరూపాన�ని ఎంపికచేయ�"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "ప�రపంచ పట�టా"
 
-#: ../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:109
+msgid "Online"
+msgstr "ఆన�‌లైన�"
+
+#: ../widgets/misc/e-online-button.c:110
+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 "కాలనియమంతో:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "కాలనియమిత స�వంత రికార�డ�ల�:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "కాలనియమిత విభాగాల�:"
 
@@ -22147,74 +22763,74 @@ msgstr "తిరిగివేళ�ళ� రీతి"
 msgid "Column width"
 msgstr "నిల�వ� పట�టీ వెడల�ప�"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "శోధించ�"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "శోధన రకాన�ని మార�చ�టక� ఇక�కడ నొక�కండి"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "వెత�క�(_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "ఇప�ప�డ� కన�గొన�మ�(_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "శ�బ�రం చేయ�(_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "అంశం  యొక�కID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "శోధించ�(_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr "లోపల(_n)"
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "కర�సర� అడ�డ�వర�స"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "మ�ల�క� లిల�వ�పట�టీ"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "క�రమమ�చేయ�నది"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "ఎంపిక సంవిధానం"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "మ�ల�క� సంవిధానం"
 
@@ -22242,10 +22858,6 @@ msgstr "<b>స�స�థితిని గమనించ�ట</b>"
 msgid "A_uto-delete sent item"
 msgstr "పంపించిన అంశాన�ని స�వయంచాలకంగా తొలగించ�మ�(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "వర�గీకరణ"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "సమాచార గమనికక� పంపించిన అంశాన�ని సృష�టించ�మ�(_e)"
@@ -22326,44 +22938,45 @@ msgstr "తర�వాత(_A):"
 msgid "_All information"
 msgstr "సమాచారం అంతా(_A)"
 
-#: ../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 "ఆలస�య సందేశం చేరినది(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "చేరినది(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "కాలంచెల�లే తేదీని ఆమర�చ�(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "అప�పటివరక�(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "అన�కూలమైనప�ప�డ�(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "తెరచినప�ప�డ�(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% పూర�తి అయినది)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL క� వెళ�ళ�టక� ఇక�కడ నొక�కండి"
 
@@ -22383,7 +22996,7 @@ msgstr "అంద�బాట�లోవ�న�న విభాగాల�(_
 msgid "categories"
 msgstr "విభాగాల�"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "ప�రత�యక�ష జాబితా"
 
@@ -22403,23 +23016,23 @@ msgstr "కేందà±�రీకరించబడిన నిలà±�à°µà±�à°ªà°
 msgid "Unselected Column"
 msgstr "ఎంపికకాని నిల�వ�పట�టీ"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "నిల�వ�పట�టీ ని కొట�టిపారవేయ�మ�"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "నిల�వ�పట�టీకి క�రిందగీత"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "మందమ� పట�టీ"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "వర�ణ పట�టీ"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG వర�ణ నిల�వ�పట�టీ"
 
@@ -22457,7 +23070,7 @@ msgid "A_vailable Fields:"
 msgstr "అంద�బాట�లోవ�న�న క�షేత�రాల�(_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "ఆరోహణాక�రమం"
 
@@ -22470,7 +23083,7 @@ msgid "Clear _All"
 msgstr "అన�నిటిని శ�బ�రం చేయ�(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "అవరోహణాక�రమం"
 
@@ -22487,9 +23100,8 @@ msgid "Move _Up"
 msgstr "పైకి జర�ప�(_U)"
 
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Show _field in View"
-msgstr "దర�శనం లో క�షేత�రాన�ని చూపించ�మ�(_f)"
+msgstr "దర�శనంలో క�షేత�రాన�ని చూపించ�మ� (_f)"
 
 #: ../widgets/table/e-table-config.glade.h:13
 msgid "Show field i_n View"
@@ -22534,14 +23146,14 @@ msgstr "క�రమపద�దతి(_S)..."
 #: ../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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "పూర�తి పీఠిక"
 
@@ -22561,866 +23173,304 @@ msgstr ""
 "మీర� � స�థానమ�లో అయితే చూపాలన�క�ంట�న�నారో,\n"
 "అక�కడికి మీర� పట�టికక� జతపర�చిన నిల�వ� పట�టీని జర�ప�మ�."
 
-#: ../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 అంశమ�)"
 msgstr[1] "%s : %s (%d అంశమ�ల�)"
 
-#: ../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 అంశం)"
 msgstr[1] "%s (%d అంశాల�)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "అడ�డపట�టీ  వర�ణాలన� ప�రత�యామ�నయపర�స�త�ంది"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "సమతలంగా గీసిన గ�రిడ�"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "నిల�వ�గా గీసిన గ�రిడ�"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "కేంద�రీకరించెన�"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "మ�ల�క� సంవిధానం"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "ఎంపిక నమూనా"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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: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
 msgid "Length Threshold"
 msgstr "పొడవ� ఉపక�రమణ"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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: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
 msgid "Uniform row height"
 msgstr "పొందికగల అడ�డపట�టీ ఎత�త�"
 
-#: ../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 "ఫ�రోజన�"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "ప�రస�త�త దర�శనాన�ని మల�చ�కొన�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "ఆరోహణాక�రమం లో  చేయ�మ�(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "అవరోహణాక�రమం లో చేయ�మ�(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "అక�రమపద�దతి(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "ఈ క�షేత�రమ� ద�వారా సమూహం(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "పెట�టె ద�వారా సమూహం(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "ఈ నిల�వ� పట�టీని తొలగించ�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "నిల�వ� పట�టీని జతచేయ�మ�..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "కేటాయింప�"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "సరి తగిన"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "నిల�వ� పట�టిలన� రూపలావణ�యం చేయ�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "ప�రస�త�త దర�శనమ�న� మల�చ�కొన�మ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
-msgstr "ఈ క�రమపద�దతిలో(_S)"
+msgstr "దీనితో క�రమపర�చ� (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "మలచ�కొన�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "అక�షరశైలి వివరణ"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "సమాచారాన�ని క�రమపద�దతిచేయ�"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "వృక�షం"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "పట�టీ పీఠిక"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "పాఠ�య నమూనా"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "మ�ల�క� ఉన�న అడ�డపట�టీ"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "ఎల�లప�ప�డ� వెత�క�మ�"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "జతచేయ�టక� మీటన� నొక�కండి"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree పట�టీని ఇమ�డ�చ�నది"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "రిట�రో చూప�"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "గీతలన� గీయ�మ� +/- విస�తరణిల�."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "ఎగ�బడి పద�దత�ల�"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ఘటన క�రమణిక"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "మందం"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "కొట�టిపారేయ�మ�"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "లంగర�"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "న�యాయం"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "క�లిప� వెడెల�ప�"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "క�లిప� ఎత�త�"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "క�లిప�"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "క�లిప� దీర�ఘచత�రస�రాన�ని నింప�మ�"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X ఆఫ�‌సెట�"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y ఆఫ�‌సెట�"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "పాఠ�య వెడెల�ప�"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "పాఠ�య ఎత�త�"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "ఎలిప�సిస� న� ఉపయోగించ�మ�"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "ఎలిప�సిస�"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "గీత వ�రాప�"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "అక�షరమ�లన� విడదీయ�మ�"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "పెద�ద గీతల�"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "సరిహద�ద�లన� గీయ�మ�"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "కొత�త గీతలన� అన�మతించ�"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "పూర�వరంగాన�ని గీయ�మ�"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "బొత�తమ�న� గీయ�మ�"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "మ�ల�క� స�థానం"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr " IM సందర�భం"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "ప�రత�యక�షజాబితాని చేప"
 
-#, fuzzy
-#~ msgid "A Folder with this name already exists"
-#~ msgstr "సంచయం ఇప�పటికే ఉంది"
-
-#, fuzzy
-#~ msgid "Save As Vcard..."
-#~ msgstr "Vపలకం లాగా దాయ�మ�..."
-
-#, fuzzy
-#~ msgid "_Categories..."
-#~ msgstr "విభాగాల�(_t)..."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Add an email to the List"
-#~ msgstr "జాబితాక� ఈ మెయిల� న� జతపర�చ�మ�"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "చిర�నామా ప�స�తకం న�ండి ఈ మెయిల� చిర�నామాలని అమర�చ�మ�"
-
-#, fuzzy
-#~ msgid "Members"
-#~ msgstr "సభ�య�ల�(_M)"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "ఈ మెయిల� చిర�నామా  న� జాబితా న�ండి తొలగించ�మ�"
-
-#, fuzzy
-#~ msgid "_Select"
-#~ msgstr "ఎంపికచేయ�(_S)..."
-
-#, fuzzy
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "ఒక పైచయం ఈ చిర�నామాతో మ�ందే ఉన�నది. మీర� ఈ చిర�నామాతోనే కొత�త పలకానికి జతచేయాలన�క�ంట�న�నారా?"
-
-#, fuzzy
-#~ msgid "_Save as VCard..."
-#~ msgstr "Vపలకంగా దాయ�మ�..."
-
-#, fuzzy
-#~ msgid ""
-#~ "All information in these journal entries will be deleted and can not be "
-#~ "restored."
-#~ msgstr "ఈ మెమోలలోని సమాచారం అంతా తొలగించబడ�త�ంది మరియ� తిరిగినిల�వచేయబడద�."
-
-#, fuzzy
-#~ msgid ""
-#~ "All information in this journal will be deleted and can not be restored."
-#~ msgstr "ఈ మెమోలోని సమాచారం అంతా తొలగించబడ�త�ంది మరియ� తిరిగినిల�వచేయబడద�."
-
-#, fuzzy
-#~ msgid ""
-#~ "All information on this journal entry will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "All information on this appointment will be deleted and can not be "
-#~ "restored."
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr " మీర� నిజంగా మెమో '{0}' న� తొలగించాలని అక�ంట�న�నారా?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "మీర� ఖచ�చితంగా ఈ '{0}' నియామకాలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "మీర� ఖచ�చితంగా ఈ ఖాతాన� తొలగించ�దామని అన�క�ంట�న�నారా?"
-
-#, fuzzy
-#~ msgid ""
-#~ "If you do not send a cancelation notice, the other participants may not "
-#~ "know the journal has been deleted."
-#~ msgstr "మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గోంట�న�న మిగతావారికి మెమో రద�దయిన సంగతి తెలియకపోవచ�చ�."
-
-#, fuzzy
-#~ msgid "This journal entry has been deleted."
-#~ msgstr "ఈ ఘటన తొలగించబడినది"
-
-#, fuzzy
-#~ msgid "This journal entry has been changed."
-#~ msgstr "ఈ ఘటన మార�చబడినది."
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "పత�రిక ప�రవేశి - %s"
-
-#, fuzzy
-#~ msgid "The journal entry could not be deleted due to a corba error"
-#~ msgstr "కోర�బా దోషం మూలంగా ఘటనన� రద�ద�చేయలేకపోయింది"
-
-#, fuzzy
-#~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr "అన�మతి తిరస�కరించబడినంద�న ఘటనన� రద�ద�చేయలేకపోయింది"
-
-#, fuzzy
-#~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr "ఒక దోషం మూలంగా ఘటనన� రద�ద�చేయలేకపోయింది"
-
-#, fuzzy
-#~ msgid ""
-#~ "You are modifying a recurring journal entry. What would you like to "
-#~ "modify?"
-#~ msgstr "మీర� ప�నరావృతిచెందిన ఘటనన� మార�చ�త�న�నార�, మీర� మార�చాలని అన�క�ంట�న�నారా?"
-
-#, fuzzy
-#~ msgid "Or_ganiser:"
-#~ msgstr "నిర�వాహక�డ�(_g):"
-
-#, fuzzy
-#~ msgid "Task sort"
-#~ msgstr "కర�తవ�యం జాబితా"
-
-#, fuzzy
-#~ msgid "Memo sort"
-#~ msgstr "మెమో జాబితా"
-
-#, fuzzy
-#~ msgid "Journal information"
-#~ msgstr "చిర�నామా సమాచారం"
-
-#~ msgid "SMTWTFS"
-#~ msgstr "ఆసోమబ�గ�శ�శ"
-
-#, fuzzy
-#~ msgid "Post To:"
-#~ msgstr "క� పోస�ట� చేయ�మ�(_P):"
-
-#, fuzzy
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "- ఎవల�యూషన� PIM మరియ� ఈ మెయిల� క�లైంట�"
-
-#, fuzzy
-#~ msgid "_Search name:"
-#~ msgstr "వెత�క� మూలం(_b):"
-
-#, fuzzy
-#~ msgid "Automatically check for _new mail every"
-#~ msgstr "కొత�త సందేశాల కొరక� వెత�క�మ�(_n)"
-
-#, fuzzy
-#~ msgid "Checking for New Mail"
-#~ msgstr "కొత�త మెయిల� కొరక� పరిశీలిస�తోంది"
-
-#, fuzzy
-#~ msgid "Di_sable"
-#~ msgstr "అచేతనపర�చ�మ�(_D)"
-
-#, fuzzy
-#~ msgid "<b>Then</b>"
-#~ msgstr "<b>à°°à°•à°‚:</b>"
-
-#, fuzzy
-#~ msgid "Search Folder from _Subject"
-#~ msgstr "సంగతి న�ండి సంచయాన�ని వెత�క�మ�(_u)..."
-
-#, fuzzy
-#~ msgid "Search Folder from Se_nder"
-#~ msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�..."
-
-#, fuzzy
-#~ msgid "Search Folder from _Recipients"
-#~ msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_t).."
-
-#, fuzzy
-#~ msgid "Search Folder from Mailing _List"
-#~ msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�..."
-
-#, fuzzy
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "సంగతి పై వడపోత(_S)..."
-
-#, fuzzy
-#~ msgid "Filter on Sen_der"
-#~ msgstr "పంపైవాని పై వడపోత(_n)..."
-
-#, fuzzy
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "స�వీకరించ�వారి పై వడపోత(_R)..."
-
-#, fuzzy
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "మెయిలింగ� జాబితా పై వడపోత(_L)..."
-
-#, fuzzy
-#~ msgid "Valid signature, cannot verify sender"
-#~ msgstr "విల�వైన సంతకం, అయితే పంపకందారిని నిర�దారించలేమ�"
-
-#, fuzzy
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "స�వయంచాలక జోడి గ�ర�తింప�"
-
-#, fuzzy
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "శబ�దప� దస�త�రాన�ని ఎంపికచేయ�మ�"
-
-#, fuzzy
-#~ msgid "New Mail Notify type"
-#~ msgstr "కొత�త మెయిల� సంచయం"
-
-#, fuzzy
-#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
-#~ msgstr "<span weight=\"bold\">లేబ�ళ�ళ�</span>"
-
-#, fuzzy
-#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
-#~ msgstr "<span weight=\"bold\">స�థానమ�</span>"
-
-#, fuzzy
-#~ msgid "Beep w_hen new mail arrives"
-#~ msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ�."
-
-#, fuzzy
-#~ msgid "Check in_coming mail for junk"
-#~ msgstr "లోనికవస�త�న�న మెయిల� నిరర�ధకం అగ�టన� పరిశీలించ�మ�"
-
-#, fuzzy
-#~ msgid "HTML Mail"
-#~ msgstr "HTML సందేశాల�"
-
-#, fuzzy
-#~ msgid "Se_lect..."
-#~ msgstr "ఎంపికచేయ�..."
-
-#, fuzzy
-#~ msgid "_Do not notify me when new mail arrives"
-#~ msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ�(_P)"
-
-#, fuzzy
-#~ msgid "Mark as _Read"
-#~ msgstr "చదివినదానివలె గ�ర�తించ�మ�(_k)"
-
-#, fuzzy
-#~ msgid "_Do not Mark as Read"
-#~ msgstr "చదివినదానివలె గ�ర�తించ�మ�(_k)"
-
-#, fuzzy
-#~ msgid "Check Evolution archive"
-#~ msgstr "ఎవాల�యూషన� బ�యాక�అప� న� పరిశీలించ�మ�"
-
-#, fuzzy
-#~ msgid "With GUI"
-#~ msgstr "వెడల�ప�"
-
-#, fuzzy
-#~ msgid "Convert mail text to Unicode"
-#~ msgstr "సందేశ పాఠ�యమ�న� యూనికోడ� క� మార�చ�మ�(_U)"
-
-#, fuzzy
-#~ msgid "<b>Junk Mail Settings</b>"
-#~ msgstr "నిరర�దక మెయిల� అమరికల�"
-
-#, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "పరిచయాల�..."
-
-#, fuzzy
-#~ msgid "<b>Subject</b> :"
-#~ msgstr "సంగతి:"
-
-#, fuzzy
-#~ msgid "<b>From</b> :"
-#~ msgstr "<b>నివాసం</b>"
-
-#, fuzzy
-#~ msgid "Custom Header"
-#~ msgstr "మల�చ�కొనిన పీఠికల�"
-
-#, fuzzy
-#~ msgid "Unable to find this journal entry in any journal"
-#~ msgstr "ఈ సమావేశాన�ని � క�యాలెండర� నందూ కన�గొనలేకపోయింది"
-
-#, fuzzy
-#~ msgid "Enable libnotify notifications of new mail"
-#~ msgstr "ప�రకటన ప�రదేశంనంద� ప�రతిమన� చేతనంచేయ�మ�."
-
-#, fuzzy
-#~ msgid "System error: %s"
-#~ msgstr "వర�తింప�చేయ�ట లో దోషం: %s"
-
-#, fuzzy
-#~ msgid "Camel error: %s"
-#~ msgstr "వర�తింప�చేయ�ట లో దోషం: %s"
-
-#, fuzzy
-#~ msgid "No store available"
-#~ msgstr "సంక�షిప�తమ� అంద�బాట�లో లేద�."
-
-#, fuzzy
-#~ msgid "Mail Remote"
-#~ msgstr "మెయిల� సంచయం(_F)"
-
-#, fuzzy
-#~ msgid "New Mail Notification"
-#~ msgstr "మెయిల� ప�రకటన"
-
-#, fuzzy
-#~ msgid "Download messages for offline"
-#~ msgstr "ఆఫ�‌లైన� ఉపయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ�(_D)"
-
-#, fuzzy
-#~ msgid "_Phone List"
-#~ msgstr "నిరర�ధకం జాబితా(_J)"
-
-#~ msgid "MTWTFSS"
-#~ msgstr "MTWTFSS"
-
-#, fuzzy
-#~ msgid "<- _Remove"
-#~ msgstr "తీసివేయ�(_R)"
-
-#, fuzzy
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "ఈ క�షేత�రాలన� క�రమపద�దతిలో చూప�మ�(_S):"
-
-#, fuzzy
-#~ msgid "_Add ->"
-#~ msgstr "కల�ప�మ�(_A)"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "లేబ�ల� ప�న:పరిణామాన�ని అన�సరించ�"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#, fuzzy
-#~ msgid "E-_mail:"
-#~ msgstr "ఈ-తపాలా(_m)"
-
-#, fuzzy
-#~ msgid "Print cards"
-#~ msgstr "కార�యాల� మ�ద�రించ�"
-
-#, fuzzy
-#~ msgid "Organization"
-#~ msgstr "నిర�వహణాసంస�థ(_g):"
-
-#, fuzzy
-#~ msgid "E-mail"
-#~ msgstr "ఈ-తపాలా"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "వీడియో కాన�ఫరెన�సింగ�"
-
-#, fuzzy
-#~ msgid "personal"
-#~ msgstr "వ�యక�తిగత"
-
-#, fuzzy
-#~ msgid "Select target addressbook."
-#~ msgstr "చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
-
-#, fuzzy
-#~ msgid "(none)"
-#~ msgstr "�దికాద�"
-
-#, fuzzy
-#~ msgid "Primary Email"
-#~ msgstr "ప�రాధమిక ఫోన�"
-
-#, fuzzy
-#~ msgid "Select an Action"
-#~ msgstr "ఒక స�థానమ�న� ఎంపికచేయ�మ�"
-
-#, fuzzy
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "కొత�త పరిచయాన�ని సృష�టించ�"
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "మ�ంద�గానే ఉన�న సంపర�కమ�నక� చిర�నామా కూడ�డ� \"%s\""
-
-#, fuzzy
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "ఈ మెయిల� చిర�నామా"
-
-#, fuzzy
-#~ msgid "GTK Tree View"
-#~ msgstr "వారం దర�శనం"
-
-#, fuzzy
-#~ msgid "Print envelope"
-#~ msgstr "మ�ద�రణ ఉపదర�శనం(_v)"
-
-#, fuzzy
-#~ msgid "Print contacts"
-#~ msgstr "ఎంచ�క�న�న పరిచయాలన� మ�ద�రించ�"
-
-#, fuzzy
-#~ msgid "Print contact"
-#~ msgstr "ఎంచ�క�న�న పరిచయాలన� మ�ద�రించ�"
-
-#, fuzzy
-#~ msgid "Error loading default addressbook."
-#~ msgstr "చిర�నామా ప�స�తకాన�ని నింపడంలో దోషమ�."
-
-#, fuzzy
-#~ msgid "Input File"
-#~ msgstr "దస�త�రాన�ని దిగ�మతి చేయ�మ�"
-
-#, fuzzy
-#~ msgid "No filename provided."
-#~ msgstr "సంచయ నామం �దీ నిర�దేశించబడలేద�."
-
-#~ msgid "Dismiss"
-#~ msgstr "పంపివేయ�"
-
-#~ msgid "Dismiss All"
-#~ msgstr "అన�నింటిని పంపివేయ�"
-
-#~ msgid ""
-#~ "Alarm on %s\n"
-#~ "%s\n"
-#~ "Starting at %s\n"
-#~ "Ending at %s"
-#~ msgstr ""
-#~ "%s పై హెచ�చరిక\n"
-#~ "%s\n"
-#~ "%s వద�ద ప�రారంభం\n"
-#~ "%s వద�ద మ�గింప�"
-
-#, fuzzy
-#~ msgid "Remove"
-#~ msgstr "తీసివేయ�(_R)"
-
-#, fuzzy
-#~ msgid "Enable"
-#~ msgstr "క�రియాశీలీకరించిన"
-
-#, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>నివాసం</b>"
-
-#, fuzzy
-#~ msgid "Scheduling"
-#~ msgstr "ఛాయవేయ�ట"
-
-#, fuzzy
-#~ msgid "Invitations"
-#~ msgstr "ప�నశ�ఛరణ"
-
-#, fuzzy
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>ఈ మెయిల�</b>"
-
-#, fuzzy
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "తేది మరియ� సమయం"
-
-#, fuzzy
-#~ msgid "Assignment"
-#~ msgstr "కేటాయింప�"
-
-#~ msgid "<b>Free/Busy C_alendars</b>"
-#~ msgstr "<b>ఖాళీ/పనిలో క�యాలెండర� ల�</b>"
-
-#, fuzzy
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "తీరిక/తీరికలేద� సమాచారం"
-
-#, fuzzy
-#~ msgid "Task Table"
-#~ msgstr "కార�య తాజా వివరం"
-
-#, fuzzy
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "తీరక/తీరకలేద� సమాచారం"
-
-#, fuzzy
-#~ msgid "Removal Complete"
-#~ msgstr "% పూర�తి"
-
-#, fuzzy
-#~ msgid "Timezone Button"
-#~ msgstr "సమయక�షేత�రం"
-
-#~ msgid "Selected day (%a %b %d %Y)"
-#~ msgstr "ఎంపిక చేసిన రోజ� (%a %d %b %Y)"
-
-#~ msgid "Selected week (%s - %s)"
-#~ msgstr "ఎంపిక చేసిన వారం (%s - %s)"
-
-#~ msgid "Selected month (%b %Y)"
-#~ msgstr "ఎంపిక చేసిన నెల (%b %Y)"
-
-#, fuzzy
-#~ msgid "Selected year (%Y)"
-#~ msgstr "వినియోగదారిని ఎంపికచేయ�మ�"
-
-#, fuzzy
-#~ msgid "Automatic contacts"
-#~ msgstr "స�వయంచాలక పరిచయాల�"
-
-#, fuzzy
-#~ msgid "Plugin manager"
-#~ msgstr "ప�లగ�గిన� అభికర�త"
-
-#, fuzzy
-#~ msgid "Printer settings"
-#~ msgstr "నిరర�ధకంక� అమరికల�"
-
-#, fuzzy
-#~ msgid "Date Button"
-#~ msgstr "బొత�తమ�న� గీయ�మ�"
-
-#, fuzzy
-#~ msgid "Subitem ID"
-#~ msgstr "అంశం  యొక�కID"
-
-#, fuzzy
-#~ msgid "Find _Now"
-#~ msgstr "ఇప�ప�డ� కన�గొన�మ�(_F)"
-
-#, fuzzy
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d అంశం)"
-
-#, fuzzy
-#~ msgid "Fontset"
-#~ msgstr "అక�షరశైలిల�"
-
-#, fuzzy
-#~ msgid "Always Search"
-#~ msgstr "ఎల�లప�ప�డ� వెత�క�మ�"
-
-#, fuzzy
-#~ msgid "This should test the minicard canvas item"
-#~ msgstr "చిర�నామా మ�ద�రణ సంకేతమ�న� పరీక�షించ�మ�"
-
-#, fuzzy
-#~ msgid "Font"
-#~ msgstr "అక�షరశైలిల�"
-
-#, fuzzy
-#~ msgid "_Address: "
-#~ msgstr "చిర�నామా(_A):"
-
-#, fuzzy
-#~ msgid "The Evolution calendar has quit."
-#~ msgstr "ఎవల�యూషన� క�యాలండర� ఊహించని విధంగా త�యజించబడినది."
-
-#, fuzzy
-#~ msgid "Select Drafts Folder"
-#~ msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
-
-#, fuzzy
-#~ msgid "Select Sent Folder"
-#~ msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
-
-#~ msgid ""
-#~ "The address book {0} is read only, thus you cannot add contacts there. "
-#~ "Select other address book, please."
-#~ msgstr ""
-#~ "చిర�నామా ప�స�తకం {0} చ�ద�వ�టక� మాత�రమే, కన�క మీర� ఇచట పరిచయాలన� జతచేయలేర�. దయచేసి, వేరే "
-#~ "చిర�నామాప�స�తకాన�ని ఎంచ�కొన�మ�."
-
-#~ msgid "Notify messages in Inbox only."
-#~ msgstr "సందేశాలన� ఇన�‌బాక�స� నంద� తెల�పవలెన�."
diff --git a/po/th.po b/po/th.po
index 8ceda02f92..2006de0c07 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,12 +9,13 @@
 # messages like "Every day" and "Every %d days", which will sound better
 # if translated differently.
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-2.4\n"
+"Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-13 10:48+0700\n"
-"PO-Revision-Date: 2008-05-18 12:29+0700\n"
+"POT-Creation-Date: 2008-09-05 10:14+0700\n"
+"PO-Revision-Date: 2008-09-10 11:49+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -24,21 +25,21 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "สมุดที่อยู่ evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "ที่อยู่ติดต่อใหม่"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "รายชื่อที่อยู่ติดต่อใหม่"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -46,7 +47,6 @@ msgstr[0] "โฟลเดอร์สมุดที่อยู่ %s มีà¸
 msgstr[1] "โฟลเดอร์สมุดที่อยู่ %s มีนามบัตร %d ใบ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "เปิด"
 
@@ -62,63 +62,63 @@ msgstr "ที่อยู่ติดต่อ: "
 msgid "evolution minicard"
 msgstr ""
 
-#: ../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 "มี�ารเวียนซ้ำ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "คือ�ารประชุม"
 
-#: ../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 "ป�ิทินเหตุ�ารณ์: สรุปคือ %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 "ป�ิทินเหตุ�ารณ์: ไม่มีราย�ารสรุป"
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "เหตุ�ารณ์�ารดูป�ิทิน"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "ยึดโฟ�ัส"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "นัดหมายใหม่"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "เหตุ�ารณ์ตลอดทั้งวันใหม่"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "ประชุมใหม่"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "ไปที่วันนี้"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "ไปยังวันที่"
 
-#: ../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 "ตารางเพื่อดู�ละเลือ�ช่วงระยะเวลา ณ ปัจจุบัน"
 
 #. 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."
@@ -127,14 +127,14 @@ msgstr[1] "มี %d เหตุ�ารณ์"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../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 "ไม่มีเหตุ�ารณ์"
 
 #. 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 "รายสัปดาห์ทำงาน: %s, %s"
@@ -142,21 +142,21 @@ msgstr "รายสัปดาห์ทำงาน: %s, %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "รายวัน: %s, %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "มุมมองสำหรับหนึ่งสัปดาห์ทำงาน"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "มุมมองป�ิทินสำหรับวันเดียวหรือหลายวัน"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Ey"
 
@@ -166,32 +166,30 @@ msgstr "%A %d %b %Ey"
 #. %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:750
-#: ../calendar/gui/e-day-view-top-item.c:1358
-#: ../calendar/gui/e-day-view.c:2158
-#: ../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: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
 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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Ey"
 
-#: ../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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Ey"
 
@@ -200,61 +198,59 @@ msgstr "%d %b %Ey"
 #. 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:776
-#: ../calendar/gui/e-day-view-top-item.c:1362
-#: ../calendar/gui/e-day-view.c:2174
-#: ../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: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
 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:766
 msgid "Gnome Calendar"
 msgstr "ป�ิทิน Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "�ถบค้นหา"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "�ถบค้นหาป�ิทิน evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "ปุ่ม�ระโดด"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "คุณสามารถดูเหตุ�ารณ์มา��ว่านี้ โดยคลิ�ที่นี่"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "รายเดือน: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "รายสัปดาห์: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "ป�ิทินสำหรับหนึ่งเดือน"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "ป�ิทินดูภายใน 1 สัปดาห์ หรือมา��ว่า"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "หน้าต่างผุดขึ้น"
 
 #. 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 "ผุดหน้าต่างลู�"
 
@@ -266,12 +262,12 @@ msgstr "��้ไข"
 msgid "begin editing this cell"
 msgstr "เริ่ม��้ไขช่องนี้"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "สลับค่า"
 
 #. 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 "สลับค่าในช่อง"
 
@@ -291,47 +287,47 @@ msgstr "ยุบ"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ยุบ�ถบใน ETree ที่ช่องนี้อยู่"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "ช่องตาราง"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c: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 "คลิ�เพื่อเพิ่ม"
 
-#: ../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 "คลิ�"
 
-#: ../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 "เรียงลำดับ"
 
-#: ../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 %Ey"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "ป�ิทิน: จา� %s ถึง %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "ราย�ารป�ิทิน 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 "ใช้ค่าปริยาย"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "เมนู�บบผุดขึ้น"
 
@@ -346,11 +342,11 @@ msgstr "เปิดใช้"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' เป็น�หล่งสมุดที่อยู่ที่อ่านได้อย่างเดียว �รุณาย้ายไปที่มุมมองที่อยู่ติดต่อ "
-"�ล้วเลือ�สมุดที่อยู่ที่สามารถรับที่อยู่ติดต่อได้"
+"'{0}' เป็นสมุดที่อยู่ที่อ่านได้อย่างเดียว ��้ไขไม่ได้ �รุณาเลือ�สมุดที่อยู่อื่นจา��ถบข้างในมุมมอง "
+"\"ที่อยู่ติดต่อ\""
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -388,25 +384,25 @@ msgid "Could not get schema information for LDAP server."
 msgstr "ไม่สามารถดูข้อมูล schema สำหรับเซิร์ฟเวอร์ LDAP"
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "ไม่สามารถลบสมุดที่อยู่"
 
 #: ../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 ""
-"ขณะนี้ Evolution สามารถเข้าใช้สมุดที่อยู่ของระบบของ GroupWise เท่านั้น "
+"ขณะนี้ Evolution สามารถเข้าใช้สมุดที่อยู่ของระบบเท่านั้นสำหรับ GroupWise "
 "�รุณาใช้โปร��รมอ่านเมลของ GroupWise โปร��รมอื่นครั้งหนึ่ง�่อน "
-"เพื่ออ่านโฟลเดอร์ที่อยู่ติดต่อที่ใช้บ่อย �ละที่อยู่ติดต่อส่วนตัวจา� GroupWise"
+"เพื่อให้ได้โฟลเดอร์ที่อยู่ติดต่อที่ใช้บ่อย �ละที่อยู่ติดต่อส่วนตัวจา� GroupWise"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "ลบสมุดที่อยู่ '{0}' หรือไม่?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "เ�ิดข้อผิดพลาดขณะโหลดสมุดที่อยู่"
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -419,7 +415,7 @@ msgstr "ตรวจสอบสิทธิ์ด้วยเซิร์ฟเ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "ไม่สามารถลบที่อยู่ติดต่อ"
 
@@ -432,27 +428,23 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "เซิร์ฟเวอร์ LDAP ไม่ตอบสนอง�ับข้อมูล schema ที่ถู�ต้อง"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "ไม่ได้รับอนุ�าต"
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "รุ่นเซิร์ฟเวอร์"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "คุณลั�ษณะบางอย่างอาจจะไม่เหมาะ�ับเซิร์ฟเวอร์ปัจจุบันของคุณ"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "สมุดที่อยู่ Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../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:24
+#: ../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 "
@@ -461,55 +453,55 @@ msgstr ""
 "เซิร์ฟเวอร์ LDAP นี้อาจจะใช้ LDAP รุ่นเ�่า ซึ่งไม่รองรับ�ารทำงานนี้ "
 "หรืออาจจะมี�าร�ำหนดค่าผิดพลาด �รุณาสอบถามผู้ดู�ลระบบของคุณ เ�ี่ยว�ับจุดตั้งต้นค้นหาที่รองรับ"
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "สมุดที่อยู่นี้จะถู�ลบไป�บบถาวร"
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "สมุดที่อยู่นี้ไม่สามารถเปิดได้"
 
-#: ../addressbook/addressbook.error.xml.h:27
-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 "เซิร์ฟเวอร์สมุดที่อยู่ไม่มี�าน�ารค้นที่�นะนำเลย"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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 ""
 "สมุดที่อยู่นี้อาจจะไม่สามารถเข้าถึงได้ หรืออาจจะสะ�ดชื่อเซิร์ฟเวอร์ผิด "
 "หรือ�ารเชื่อมต่อเครือข่ายของคุณหลุดไป"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "สมุดที่อยู่นี้จะถู�ลบไป�บบถาวร"
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "เซิร์ฟเวอร์นี้ไม่รองรับข้อมูล schema ของ LDAPv3"
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "ไม่สามารถเปิดสมุดที่อยู่"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "ไม่สามารถดำเนิน�ารค้นหา"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "ไม่สามารถบันทึ� {0}"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงหรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "คุณ�ำลังพยายามย้ายที่อยู่ติดต่อจา�สมุดที่อยู่หนึ่งไปยังอี�ที่หนึ่ง �ต่ไม่สามารถลบออ�จา�ต้นทางได้ "
 "คุณต้อง�ารจะเปลี่ยนเป็น�ารบันทึ�ที่อยู่ติดต่อนี้�ทน�ารย้ายหรือไม่?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -518,6 +510,10 @@ msgstr ""
 "คุณ�ำลังเชื่อมต่อ�ับเซิร์ฟเวอร์ GroupWise รุ่นที่ไม่ได้รองรับ อาจจะทำให้เ�ิดปั�หา�ารใช้ "
 "Evolution ทางที่ดีที่สุดคือเซิร์ฟเวอร์ควรปรับปรุงให้ใช้�ับรุ่นที่รองรับ"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "คุณไม่มีสิทธิ์ลบที่อยู่ติดต่อในสมุดที่อยู่นี้"
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -529,7 +525,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ที่อยู่ติดต่อ {0} นี้จะยังไม่สามารถใช้ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../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
@@ -552,9 +548,9 @@ msgstr "_ปรับขนาด"
 msgid "_Use as it is"
 msgstr "ใ_ช้ตามนั้น"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../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}"
 
@@ -563,17 +559,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "ที่อยู่สำหรับ sync ปริยาย:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "ไม่สามารถโหลดสมุดที่อยู่"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รมสมุดที่อยู่ของ pilot ได้"
 
@@ -595,10 +591,10 @@ msgstr "�ำหนดค่าเติมเต็มคำอัตโนม
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../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:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "ที่อยู่ติดต่อ"
 
@@ -607,8 +603,8 @@ msgid "Evolution Address Book"
 msgstr "สมุดที่อยู่ Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "ที่อยู่ในสมุดที่อยู่ผุดขึ้น"
+msgid "Evolution Address Book address popup"
+msgstr "ที่อยู่ผุดขึ้นจา�สมุดที่อยู่ Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -623,8 +619,8 @@ msgid "Evolution Address Book component"
 msgstr "องค์ประ�อบสมุดที่อยู่ของ Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "�ารควบคุม�ารจัด�าร�ารตรวจสอบ S/Mime ของ Evolution"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "�ารควบคุม�ารจัด�ารใบรับรอง S/MIME ของ Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -637,13 +633,14 @@ msgstr "จัดà¸�ารà¸�ารตรวจสอบ S/MIME ของคุà
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c: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:305
-#: ../mail/mail-vfolder.c:216
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
 msgid "On This Computer"
 msgstr "ในคอมพิวเตอร์นี้"
 
@@ -653,134 +650,138 @@ msgstr "ในคอมพิวเตอร์นี้"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../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 ../mail/em-migrate.c:1056
+#: ../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 "ส่วนบุคคล"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "ในเซิร์ฟเวอร์ LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "ที่อยู่_ติดต่อ"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "สร้างที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "ราย_ชื่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "สร้างรายชื่อที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "สมุดที่อยู่ใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_สมุดที่อยู่"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "สร้างสมุดที่อยู่ใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�ารปรับรุ่นค่าตั้งหรือโฟลเดอร์สมุดที่อยู่ล้มเหลว"
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "จุดเริ่มต้น"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "ประเ_ภท:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "คัดลอ�เนื้อหา_สมุดที่อยู่ไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "สมุดที่อยู่"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "ข้อมูลเซิร์ฟเวอร์"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "�ารยืนยันตัวบุคคล"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "รายละเอียด"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "�ารค้นหา"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "�ารดาวน์โหลด"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "คุณสมบัติสมุดที่อยู่"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
-msgstr "�ำลังเคลื่อนย้าย..."
+msgstr "�ำลังถ่ายโอน..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "�ำลังเคลื่อนย้าย `%s':"
+msgid "Migrating '%s':"
+msgstr "�ำลังถ่ายโอน '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "เซิร์ฟเวอร์ LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "�ารตั้งค่า�ารเติมเต็มคำอัตโนมัติ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -791,7 +792,7 @@ msgstr ""
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -801,7 +802,7 @@ msgstr ""
 "\n"
 "�รุณารอ ในขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -811,7 +812,7 @@ msgstr ""
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -821,77 +822,90 @@ msgstr ""
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนข้อมูล�าร sync pilot ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "เปลี่ยนชื่อโฟลเดอร์ \"%s\" เป็น:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "เปลี่ยนชื่อโฟลเดอร์"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "ชื่อโฟลเดอร์มี '/' ไม่ได้"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "สมุดที่อยู่ใ_หม่"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "บันทึ�เป็น vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1349
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
+#: ../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
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
+#: ../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 "_ลบ"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "คุณ_สมบัติ"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "�ล่องเลือ��หล่งที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "�ำลังเข้าใช้เซิร์ฟเวอร์ LDAP �บบนิรนาม"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../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 "�ารยืนยันตัวบุคคลล้มเหลว\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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 "ป้อนรหัสผ่านสำหรับ %s (ผู้ใช้ %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:49
+msgid "Enter password"
+msgstr "ป้อนรหัสผ่าน"
+
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "ความยาวเติมเต็มคำอัตโนมัติ"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML สำหรับราย�ารเติมเต็ม URI"
+msgstr "EFolderList XML สำหรับรายชื่อ URI สำหรับเติมเต็ม"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML สำหรับราย�ารเติมเต็ม URI"
+msgstr "EFolderList XML สำหรับรายชื่อ URI สำหรับเติมเต็ม"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
@@ -953,38 +967,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>�ารยืนยันตัวบุคคล</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>�สดง</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>�ารดาวน์โหลด</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>�ารค้นหา</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>ข้อมูลเซิร์ฟเวอร์</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>ชนิด:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "เพิ่มสมุดที่อยู่"
 
-#: ../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:761
 msgid "Always"
 msgstr "ใช้เสมอ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "นิรนาม"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../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 "พื้น�าน"
@@ -1011,14 +1022,14 @@ msgid "Lo_gin:"
 msgstr "เ_ข้าระบบ:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "ไม่ใช้"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "ไม่มี�ารเข้ารหัสลับ"
 
@@ -1030,7 +1041,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "เข้ารหัสลับด้วย SSL"
 
@@ -1096,7 +1107,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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "เข้ารหัสลับด้วย TLS"
 
@@ -1190,8 +1201,8 @@ msgid "_Login method:"
 msgstr "_วิธี�ารเข้าระบบ:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1206,7 +1217,7 @@ msgid "_Search scope:"
 msgstr "_ขอบเขต�ารค้นหา:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "เ_ซิร์ฟเวอร์:"
@@ -1227,9 +1238,10 @@ msgstr "นามบัตร"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "นาที"
 
@@ -1270,7 +1282,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1282,16 +1294,16 @@ msgid "Ca_tegories..."
 msgstr "ห_มวด..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "ที่อยู่ติดต่อ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "เครื่องมือ��้ไขที่อยู่ติดต่อ"
 
@@ -1304,7 +1316,7 @@ msgid "Image"
 msgstr "รูป"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1317,7 +1329,7 @@ msgid "Nic_kname:"
 msgstr "ชื่อเ_ล่น:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1331,11 +1343,11 @@ msgstr "โทรศัพท์"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "งาน"
 
@@ -1357,8 +1369,8 @@ msgid "_Birthday:"
 msgstr "วันเ_�ิด:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_ป�ิทิน:"
@@ -1447,1119 +1459,1121 @@ msgstr "�_หล่ง:"
 msgid "_Zip/Postal Code:"
 msgstr "_รหัสไปรษณีย์:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "ที่อยู่"
 
-#: ../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:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
 #: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "��้ไขได้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "สหรั�อเมริ�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "อัฟ�านิสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "�อลเบเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "�อลจีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "อเมริ�ันซามัว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "อันดอร์รา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "�องโ�ลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "�อง�วิลลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "�อนตาร์�ติ�า"
 
-#: ../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 "�อนติ�า�ละบาร์บูดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "อาร์เจนตินา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "อาร์เมเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "อารูบา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "ออสเตรเลีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "ออสเตรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "อาร์เซอร์ไบจาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "บาฮามาส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "บาห์เรน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "บังคลาเทศ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "บาร์เบโดส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "เบลารุส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "เบลเยียม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "เบลีซ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "เบนิน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "เบอร์มิวดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "ภู�าน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "โบลิเวีย"
 
-#: ../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 "บอสเนีย�ละเฮอร์เซโ�วีนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "บอตสวานา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "เ�าะบูเวต์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "บราซิล"
 
-#: ../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 "บริติชอินเดียนโอเชียนเทร์ริทอรี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "บรูไนดารุสซาลาม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "บัล��เรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "เบอร์�ินาฟาโซ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "บุรุนดี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "�ัมพูชา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "�คเมอรูน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "�คนาดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "เคปเวิร์ด"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "หมู่เ�าะเคย์�มน"
 
-#: ../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 "สาธารณรั��อฟริ�า�ลาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "ชาด"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "ชิลี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "จีน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "เ�าะคริสมาสต์"
 
-#: ../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 "หมู่เ�าะ (คีลิง) โคโคส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "โคลัมเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "คอโมโรส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "คองโ�"
 
-#: ../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 "สาธารณรั�คองโ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "หมู่เ�าะคุ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "คอสตาริ�า"
 
-#: ../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 "โ�ตดิวัวร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "โครเอเชีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "คิวบา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "ไซปรัส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "สาธารณรั�เช็�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "เดนมาร์�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "จิบูตี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "โดมินิ�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "สาธารณรั�โดมินิ�ัน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "เอ�วาดอร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "อียิปต์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "เอลซัลวาดอร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "อิเควทอเรียล�ินี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "เอริเทรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "เอสโตเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "เอธิโอเปีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "หมู่เ�าะฟอล์��ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "หมู่เ�าะ�ฟโร"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "ฟิจิ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "ฟิน�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "�รั่งเศส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "เฟรนช์เ�ียนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "เฟรนช์โปลินีเซีย"
 
-#: ../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 "เฟรนช์เซาเทิร์นเทร์ริทอรีส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "�าบอง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "��มเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "จอร์เจีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "เยอรมนี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "�านา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "ยิบรอลตาร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "�รีซ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "�รีน�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "เ�รเนดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "�วาเดอลูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "�วม"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "�ัวเตมาลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "เ�ิร์นซีย์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "�ินี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "�ินีบิสเซา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "�ายอานา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "เฮติ"
 
-#: ../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 "เ�าะเฮิร์ด�ละหมู่เ�าะ�ม�ดอนัลด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "นครรั�วาติ�ัน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "ฮอนดูรัส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "ฮ่อง�ง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "ฮัง�ารี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "ไอซ์�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "อินเดีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "อินโดนีเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "อิหร่าน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "อิรั�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "ไอร์�ลนด์"
 
-#: ../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 "เ�าะ�มน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "อิสราเอล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "อิตาลี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "จาเม�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "�ี่ปุ่น"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "เจอร์ซีย์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "จอร์�ดน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "คาซัคสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "เคนยา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "คิริบาส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "เ�าหลี, สาธารณรั�ประชาชน"
 
-#: ../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 "เ�าหลี, สาธารณรั�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "คูเวต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "คีร์�ีซสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "ลาว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "ลัตเวีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "เลบานอน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "เลโซโท"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "ไลบีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "ลิเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "ลิ�เตนสไตน์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "ลิทัวเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "ลั�เซมเบิร์�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "มาเ�๊า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "มาซิโดเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "มาดา�ัส�าร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "มาลาวี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "มาเลเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "มัลดีฟส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "มาลี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "มอลตา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "หมู่เ�าะมาร์�ชล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "มาร์ตินี�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "มอริเตเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "มอริเชียส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "มาย็อต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "เม็�ซิโ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "ไมโครนีเซีย"
 
-#: ../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 "มอลโดวา, สาธารณรั�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "โมนาโ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "มองโ�เลีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "มอนต์เซอร์รัต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "โมร็อ�โ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "โมซัมบิ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "พม่า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "นามิเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "นาอูรู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "เนปาล"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "เนเธอร์�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "เนเธอร์�ลนด์�อนทิลลิส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "หมู่เ�าะนิว�คลิโดเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "นิวซี�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "นิ�ารา�ัว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "ไนเจอร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "ไนจีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "นีอูเอ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "เ�าะนอร์ฟอล์�"
 
-#: ../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 "หมู่เ�าะนอร์เทิร์นมาเรียนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "นอร์เวย์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "โอมาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "ปา�ีสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "ปาเลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "ดิน�ดนยึดครองปาเลสไตน์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "ปานามา"
 
-#: ../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 "ปาปัวนิว�ินี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "ปารา�วัย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "เปรู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "ฟิลิปปินส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "เ�าะพิต�คร์น"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "โป�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "โปรตุเ�ส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "เปอร์โตริโ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "�าตาร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "เรอูนียง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "โรมาเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "สหพันธรั�รัสเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "รวันดา"
 
-#: ../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 "เซนต์คิตส์�ละเนวิส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "เซนต์ลูเซีย"
 
-#: ../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 "เซนต์วินเซนต์�ละเ�รนาดีนส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "ซามัว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "ซานมาริโน"
 
-#: ../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 "เซาโตเม �ละ ปรินซิเป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "ซาอุดีอาระเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "เซเน�ัล"
 
-#: ../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 "เซอร์เบีย�ละมอนเตเนโ�ร"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "เซเชลส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "เซียร์ราลีโอน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "สิงคโปร์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "สโลวะเ�ีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "สโลวีเนีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "หมู่เ�าะโซโลมอน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "โซมาเลีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "�อฟริ�าใต้"
 
-#: ../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 "เ�าะเซาท์จอร์เจีย�ละหมู่เ�าะเซาท์�ซนด์วิช"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "สเปน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "ศรีลัง�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "เซนต์เฮเลนา"
 
-#: ../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 "�ซงปี�ยร์�ละมีเ�อลง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "ซูดาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "ซูรินาเม"
 
-#: ../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 "หมู่เ�าะสฟาลบาร์�ละยานไมเอน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "สวาซิ�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "สวีเดน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "สวิตเซอร์�ลนด์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "ซีเรีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "ไต้หวัน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "ทาจิ�ิสถาน"
 
-#: ../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 "�ทนซาเนีย, สหสาธารณรั�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "ไทย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "ติมอร์-เลสเต"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "โตโ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "โตเ�เลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "ตอง�า"
 
-#: ../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 "ตรินิ�ดด�ละโตเบโ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "ตูนิเซีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "ตุร�ี"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "เติร์�เมนิสถาน"
 
-#: ../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 "หมู่เ�าะเติ�ส์�ละหมู่เ�าะเคคอส"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "ตูวาลู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "ยู�ันดา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "ยูเครน"
 
-#: ../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 "สหรั�อาหรับเอมิเรตส์"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "สหราชอาณาจั�ร"
 
-#: ../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 "เ�าะเล็�รอบนอ�ของสหรั�อเมริ�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "อุรุ�วัย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "อุซเบ�ิสถาน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "วานูอาตู"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "เวเนซุเอลา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "เวียดนาม"
 
-#: ../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 "หมู่เ�าะบริติชเวอร์จิน"
 
-#: ../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 "หมู่เ�าะเวอร์จินของสหรั�อเมริ�า"
 
-#: ../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 "หมู่เ�าะวาลลิส�ละหมู่เ�าะฟุตูนา"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "ซาฮาราตะวันต�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "เยเมน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "�ซมเบีย"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "ซิมบับเว"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "ชื่อ"
 
-#: ../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 "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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 "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "บริ�าร"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "สถานที่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
-#: ../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:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "บ้าน"
 
-#: ../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:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "สมุดต้นทาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "สมุดปลายทาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "เป็นที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "เขตข้อมูลที่เขียนได้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "เขตข้อมูลบังคับ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "มี�ารเปลี่ยน�ปลง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "เครื่องมือ��้ไขที่อยู่ติดต่อ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "�รุณาเลือ�รูปสำหรับที่อยู่ติดต่อนี้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "ไ_ม่มีรูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2567,47 +2581,47 @@ msgstr ""
 "ข้อมูลที่อยู่ติดต่อผิดพลาด:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' มีรูป�บบที่ไม่ถู�ต้อง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' มีรูป�บบที่ไม่ถู�ต้อง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ว่างเปล่า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "ที่อยู่ติดต่อผิดพลาด"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "�ารเพิ่มที่อยู่ติดต่ออย่างเร็ว"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "�_�้ไขเต็มรูป�บบ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_ชื่อเต็ม"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "อีเ_มล"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "เ_ลือ�สมุดที่อยู่"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2616,7 +2630,7 @@ msgstr ""
 "คุณ�น่ใจหรือไม่ว่า\n"
 "จะลบรายชื่อที่อยู่ติดต่อ (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2624,7 +2638,7 @@ msgstr ""
 "คุณ�น่ใจหรือไม่ว่า\n"
 "จะลบรายชื่อที่อยู่ติดต่อเหล่านี้?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2633,7 +2647,7 @@ msgstr ""
 "คุณ�น่ใจหรือไม่ว่า\n"
 "จะลบที่อยู่ติดต่อ (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2741,7 +2755,7 @@ 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:242
+#: ../plugins/exchange-operations/exchange-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "สถาน_ที่:"
@@ -2751,7 +2765,7 @@ msgid "<b>Members</b>"
 msgstr "<b>สมาชิ�</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 "เครื่องมือ��้ไขรายชื่อที่อยู่ติดต่อ"
 
@@ -2769,29 +2783,30 @@ msgstr "_รายชื่อ:"
 
 #: ../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 "_พิมพ์ที่อยู่อีเมล หรือลา�ที่อยู่ติดต่อมาวางที่ราย�ารด้านล่างนี้:"
+msgstr "_พิมพ์ที่อยู่อีเมล หรือลา�ที่อยู่ติดต่อมาวางที่รายชื่อด้านล่างนี้:"
 
-#: ../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 "สมาชิ�รายชื่อผู้ติดต่อ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "_สมาชิ�"
+
+#: ../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: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/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "สมุด"
 
-#: ../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 "เป็นรายชื่อใหม่"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_สมาชิ�"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "ที่อยู่ติดต่อที่เปลี่ยน:"
@@ -2828,40 +2843,40 @@ msgstr ""
 "มีชื่อหรือที่อยู่อีเมลสำหรับที่อยู่ติดต่อนี้ในโฟลเดอร์นี้เรียบร้อย�ล้ว\n"
 "คุณยังต้อง�ารจะเพิ่มเข้าไปอี�หรือไม่?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "ผสานที่อยู่ติดต่อ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_ผสาน"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "ผสานที่อยู่ติดต่อ"
+
+#: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "อีเมล"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "อีเมลขึ้นต้นด้วย"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "ชื่อขึ้นต้นด้วย"
+msgid "Name contains"
+msgstr "ชื่อมีคำว่า"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2875,10 +2890,10 @@ msgstr[0] "ที่อยู่ติดต่อ %d ราย�าร"
 msgstr[1] "ที่อยู่ติดต่อ %d ราย�าร"
 
 #: ../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-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "คำค้น"
 
@@ -2886,123 +2901,119 @@ msgstr "คำค้น"
 msgid "Error getting book view"
 msgstr "เ�ิดข้อผิดพลาดขณะสร้างช่อง�สดงสมุด"
 
-#: ../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:3550
-#: ../widgets/text/e-text.c:3551
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../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
 msgid "Model"
 msgstr "ข้อมูลโครงสร้าง"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ปลงนามบัตร"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "ชื่อขึ้นต้นด้วย"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "�หล่ง"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "ชนิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "บันทึ�เป็น vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1134
-#: ../calendar/gui/e-calendar-table.c:1327
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "เ_ปิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "ที่อยู่ติดต่อใ_หม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
-msgstr "_ราย�ารที่อยู่ติดต่อใหม่..."
+msgstr "_รายชื่อที่อยู่ติดต่อใหม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_บันทึ�เป็น vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "ส่ง_ข้อความไปยังลิสต์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_พิมพ์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_คัดลอ�ไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_ย้ายไปยังสมุดที่อยู่..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "_ตัด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1335
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
-#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2062
+#: ../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
 #: ../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 "_คัดลอ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_�ปะ"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "หมวดใด�็ได้"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "ข้อผิดพลาดอื่นๆ"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3034,7 +3045,7 @@ msgstr "โทรศัพท์รถ"
 
 #: ../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
@@ -3135,9 +3146,9 @@ msgid "Radio"
 msgstr "วิทยุสื่อสาร"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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 "บทบาท"
 
@@ -3173,38 +3184,38 @@ msgid "Web Site"
 msgstr "เว็บไซต์"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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
 msgid "Width"
 msgstr "�ว้าง"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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
 msgid "Height"
 msgstr "สูง"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "มีโฟ�ัส"
 
@@ -3224,11 +3235,21 @@ msgstr "ข้อมูลข้อความ"
 msgid "Max field name length"
 msgstr "ความยาวสูงสุดของชื่อเขตข้อมูล"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "ความ�ว้างคอลัมน์"
 
-#: ../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"
+"�ำลังค้นหาที่อยู่ติดต่อ..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3239,9 +3260,10 @@ msgstr ""
 "\n"
 "\n"
 "ค้นหาที่อยู่ติดต่อ\n"
-"หรือดับเบิลคลิ�ตรงนี้เพื่อสร้างที่อยู่ติดต่อใหม่"
+"\n"
+"หรือดับเบิลคลิ�ที่นี่เพื่อสร้างที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3255,7 +3277,7 @@ msgstr ""
 "\n"
 "ดับเบิลคลิ�ตรงนี้เพื่อสร้างที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3265,7 +3287,7 @@ msgstr ""
 "\n"
 "ค้นหาที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3275,40 +3297,41 @@ msgstr ""
 "\n"
 "ไม่มีราย�าร�สดงในนี้"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "ตัว�ปลง"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "อีเมลที่ทำงาน"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "อีเมลบ้าน"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "อีเมลอื่นๆ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "เลือ�อยู่"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "มีเคอร์เซอร์"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "เปิดลิง�์ในเ_บราว์เซอร์"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "คัด_ลอ�ที่อยู่ลิง�์"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "ส่งข้อความใ_หม่ไปถึง..."
 
@@ -3330,7 +3353,7 @@ msgid "map"
 msgstr "�ผนที่"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "สมาชิ�ในรายชื่อ"
 
@@ -3351,25 +3374,23 @@ msgid "Video Chat"
 msgstr "�ารสนทนาภาพ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../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
+#: ../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-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 "ป�ิทิน"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "ว่าง/ไม่ว่าง"
 
@@ -3391,150 +3412,163 @@ msgid "Web Log"
 msgstr "เว็บล็อ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "วันครบรอบ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "ตำ�หน่งงาน"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "โฮมเพจ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "เว็บล็อ�"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "สำเร็จ"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "�บ็�เอนด์ไม่ว่าง"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "�หล่งเ�็บข้อมูลไม่ได้เชื่อมต่ออยู่"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "ไม่มีสมุดที่อยู่"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "ไม่พบที่อยู่ติดต่อ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "รหัสที่อยู่ติดต่อมีอยู่�ล้ว"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "โพรโทคอลที่ไม่รองรับ"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:403 ../calendar/gui/print.c:2521
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "ย�เลิ�"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "ไม่สามารถย�เลิ�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "�ารยืนยันตัวบุคคลล้มเหลว"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "ต้องยืนยันตัวบุคคล"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS ใช้งานไม่ได้"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "ไม่มี�หล่งดัง�ล่าว"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "ใช้ในโหมดออฟไลน์ไม่ได้"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "ข้อผิดพลาดอื่นๆ"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "รุ่นเซิร์ฟเวอร์ใช้ไม่ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "ไม่รองรับวิธียืนยันตัวบุคคลวิธีนี้"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "ไม่สามารถเปิดสมุดที่อยู่นี้ได้ �รุณาตรวจสอบว่ามีพาธ %s อยู่ หรือดูว่าคุณมีสิทธิ์ใน�ารเข้าถึงหรือไม่"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
 "ไม่สามารถเปิดสมุดที่อยู่นี้ได้ ซึ่งเป็นไปได้ว่าคุณอาจจะป้อน URI ที่ไม่ถู�ต้อง "
 "หรืออาจจะไม่สามารถเข้าไปยังเซิร์ฟเวอร์ LDAP ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3543,75 +3577,79 @@ msgstr ""
 "Evolution รุ่นนี้ ไม่ได้มี�ารคอมไพล์เพื่อรองรับ LDAP ถ้าคุณต้อง�ารใช้ LDAP ใน Evolution "
 "คุณจะต้องติดตั้ง�พ็�เ�จของ Evolution ที่เปิดใช้งาน LDAP"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "ไม่สามารถเปิดสมุดที่อยู่นี้ได้ ซึ่งเป็นไปได้ว่าคุณอาจจะป้อน URI ที่ไม่ถู�ต้อง "
 "หรืออาจจะไม่สามารถเข้าไปยังเซิร์ฟเวอร์ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "รายละเอียดข้อผิดพลาด:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
 "พบนามบัตรจำนวนมา��ว่าที่�ำหนดให้เซิร์ฟเวอร์คืนผลลัพธ์ หรือที่�ำหนดให้\n"
 "Evolution �สดงผล �รุณาค้นหาดวยคำค้นที่เฉพาะเจาะจง�ว่านี้\n"
 "หรือเพิ่มขีดจำ�ัดในหน้าต่างปรับ�ต่งเซิร์ฟเวอร์สารบบสำหรับสมุดที่อยู่นี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
 "เวลาหมด คำถามนี้เ�ินจำ�ัดเวลาของเซิร์ฟเวอร์ หรือค่าที่คุณ�ำหนดไว้\n"
 "สำหรับสมุดที่อยู่นี้ �รุณาค้นหาดวยคำค้นที่เฉพาะเจาะจง�ว่านี้\n"
 "หรือเพิ่มค่าจำ�ัดเวลา ในหน้าต่างปรับ�ต่งเซิร์ฟเวอร์สารบบสำหรับสมุดที่อยู่นี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr "�บ็�เอนด์สำหรับสมุดที่อยู่นี้ไม่สามารถ�จงคำค้นนี้ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr "�บ็�เอนด์สำหรับสมุดที่อยู่นี้ป�ิิเสธที่จะค้นคำค้นนี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "คำค้นนี้ไม่สำเร็จสมบูรณ์"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "เ�ิดข้อผิดพลาดขณะเพิ่มรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "เ�ิดข้อผิดพลาดขณะเพิ่มที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ปลงรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ปลงที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "เ�ิดข้อผิดพลาดขณะลบรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "เ�ิดข้อผิดพลาดขณะลบที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3626,16 +3664,16 @@ msgstr[1] ""
 "ใน�ารเปิดที่อยู่ติดต่อ %d ราย�าร จะเปิดในหน้าต่างใหม่ %d หน้าต่าง\n"
 "คุณต้อง�ารให้�สดงที่อยู่ติดต่อทั้งหมดนี้จริงหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "ไ_ม่�สดง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "�สดงที่อยู่ติดต่อ_ทั้งหมด"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3644,70 +3682,70 @@ msgstr ""
 "%s มีอยู่�ล้ว\n"
 "คุณต้อง�ารเขียนทับหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ที่อยู่ติดต่อ"
 msgstr[1] "ที่อยู่ติดต่อ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "เลือ�สมุดที่อยู่"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "รายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "คัดลอ�ที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "คัดลอ�ที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "vCard หลายราย�าร"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard สำหรับ %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "ข้อมูลที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "ข้อมูลที่อยู่ติดต่อของ %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:297
 msgid "Querying Address Book..."
 msgstr "�ำลังค้นสมุดที่อยู่..."
 
@@ -3728,50 +3766,50 @@ msgid "Show Compact vCard"
 msgstr "�สดง vCard �บบ�ระชับ"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "บันทึ�ในสมุดที่อยู่"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "มุมมองนามบัตร"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "�ำลังนำเข้า..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV ของ Outlook หรือ�ท็บ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "เครื่องมือนำเข้า Outlook CSV �ละ�ท็บ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV หรือ�ท็บ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "เครื่องมือนำเข้า Mozilla CSV �ละ�ท็บ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV หรือ�ท็บ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "เครื่องมือนำเข้า CSV �ละ�ท็บของ Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 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:666
 msgid "Evolution LDIF importer"
 msgstr "เครื่องมือนำเข้า LDIF ของ Evolution"
 
@@ -3824,12 +3862,12 @@ msgid "Format"
 msgstr "รูป�บบ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "หัว�ระดาษ"
 
@@ -3931,8 +3969,8 @@ msgstr "�าร�รเงา"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "ขนาด:"
@@ -3950,7 +3988,7 @@ msgid "Top:"
 msgstr "บน:"
 
 #: ../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 "ชนิด:"
 
@@ -3962,36 +4000,36 @@ msgstr "�ว้าง:"
 msgid "_Font..."
 msgstr "�_บบอั�ษร..."
 
-#: ../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 "�ารทดสอบเครื่องมือ��้ไขสไตล์�ารพิมพ์ที่อยู่ติดต่อ"
 
-#: ../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 "Copyright (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 "ทดสอบวิดเจ็ต��้ไขสไตล์�ารพิมพ์ที่อยู่ติดต่อ"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "�ารทดสอบ�ารพิมพ์ที่อยู่ติดต่อ"
 
-#: ../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:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "ไม่สามารถเปิด�ฟ้ม"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "ไม่สามารถดูราย�ารของสมุดที่อยู่"
+msgid "Couldn't get list of address books"
+msgstr "ไม่สามารถอ่านรายชื่อของสมุดที่อยู่"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4006,8 +4044,8 @@ msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
-msgstr "รายชื่อของโฟลเดอร์สมุดที่อยู่บนเครื่อง"
+msgid "List local address book folders"
+msgstr "รายชื่อของโฟลเดอร์สมุดที่อยู่ในเครื่อง"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
@@ -4055,294 +4093,304 @@ msgstr "ข้อผิดพลาดที่ไม่ได้รองรั
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' เป็น�หล่งป�ิทินที่อ่านได้อย่างเดียว �รุณาย้ายไปที่มุมมองป�ิทิน "
-"�ล้วเลือ�ป�ิทินที่สามารถรับนัดหมายได้"
+"'{0}' เป็นป�ิทินที่อ่านได้อย่างเดียว ��้ไขไม่ได้ �รุณาเลือ�ป�ิทินอื่นจา��ถบข้างในมุมมอง \"ป�ิทิน\""
 
-#: ../calendar/calendar.error.xml.h:3
+#. 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}' เป็นป�ิทินที่อ่านได้อย่างเดียว ��้ไขไม่ได้ �รุณาเลือ�ป�ิทินอื่นที่สามารถรับนัดหมายได้"
+
+#: ../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:4
+#: ../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 "�ารเพิ่มสรุปใจความสำคั�ของงาน จะช่วยให้ผู้รับเข้าใจเ�ี่ยว�ับงานของคุณ"
+msgstr "�ารเพิ่มสรุปใจความสำคั�ของภาร�ิจ จะช่วยให้ผู้รับเข้าใจเ�ี่ยว�ับภาร�ิจของคุณ"
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../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:6
+#: ../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:7
+#: ../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:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "ข้อมูลทั้งหมดของงานเหล่านี้จะถู�ลบทิ้งไป �ละไม่สามารถนำ�ลับมาได้อี�"
+msgstr "ข้อมูลทั้งหมดของภาร�ิจเหล่านี้จะถู�ลบทิ้งไป �ละไม่สามารถนำ�ลับมาได้อี�"
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "ข้อมูลทั้งหมดของงานนี้จะถู�ลบทิ้งไป �ละไม่สามารถนำ�ลับมาได้อี�"
+msgstr "ข้อมูลทั้งหมดของภาร�ิจนี้จะถู�ลบทิ้งไป �ละไม่สามารถนำ�ลับมาได้อี�"
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบงาน '{0}'?"
+msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบภาร�ิจ '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "คุณ�น่ใจหรือไม่ว่าจะลบนัดหมายเรื่อง '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบบันทึ�ช่วยจำ '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบนัดหมายทั้ง {0} ชิ้นนี้?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบบันทึ�ช่วยจำทั้ง {0} ชิ้นนี้?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบงานทั้ง {0} ชิ้นนี้?"
+msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบภาร�ิจทั้ง {0} ชิ้นนี้?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบนัดหมายนี้?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบ�ารประชุมนี้?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบบันทึ�ช่วยจำนี้?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
-msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบงานนี้?"
+msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบภาร�ิจนี้?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารบันทึ�บันทึ�ช่วยจำโดยไม่ต้องมีสรุป?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารส่งนัดหมายโดยไม่ต้องมีสรุป?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารส่งงานไปโดยไม่ต้องมีสรุป?"
+msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารส่งภาร�ิจไปโดยไม่ต้องมีสรุป?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "ไม่สามารถสร้างเหตุ�ารณ์ใหม่"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "ไม่สามารถบันทึ�เหตุ�ารณ์"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "ลบป�ิทิน '{0}' หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "ลบราย�ารบันทึ�ช่วยจำ '{0}' หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
-msgstr "ลบราย�ารงาน '{0}' หรือไม่?"
+msgstr "ลบราย�ารภาร�ิจ '{0}' หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "ไ_ม่ส่ง"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "�ำลังดาวน์โหลด คุณต้อง�ารบันทึ�นัดหมายหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
-msgstr "�ำลังดาวน์โหลด คุณต้อง�ารบันทึ�งานหรือไม่?"
+msgstr "�ำลังดาวน์โหลด คุณต้อง�ารบันทึ�ภาร�ิจหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "ไม่สามารถโหลดเครื่องมือ��้ไข"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "�ารเชิ�อีเมลจะส่งไปยังผู้มีส่วนร่วม �ละจะอนุ�าตให้ทุ�คนยอมรับงานนี้"
+msgstr "จะส่งอีเมลเชิ�ไปยังผู้มีส่วนร่วมทั้งหมด �ละจะอนุ�าตให้ทุ�คนรับภาร�ิจนี้"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
-msgstr "จะส่งอีเมลเชิ�ไปยังผู้ร่วมประชุมทั้งหมด �ละให้พว�เขาตอบ�ลับมาได้"
+msgstr "จะส่งอีเมลเชิ�ไปยังผู้ร่วมประชุมทั้งหมด �ละให้ทุ�คนตอบ�ลับมาได้"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ดูป�ิทิน"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ดูราย�ารบันทึ�ช่วยจำ"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
-msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ดูราย�ารงาน"
+msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ดูราย�ารภาร�ิจ"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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:40
+#: ../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:41
+#: ../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 "ถ้าคุณไม่ส่งประ�าศ�จ้ง�ารย�เลิ� ผู้มีส่วนร่วมคนอื่นๆ จะไม่ทราบว่าได้มี�ารลบงาน�ล้ว"
+msgstr "ถ้าคุณไม่ส่งประ�าศ�จ้ง�ารย�เลิ� ผู้มีส่วนร่วมคนอื่นๆ จะไม่ทราบว่าได้มี�ารลบภาร�ิจ�ล้ว"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "�ารส่งข้อมูลที่ปรับปรุงสามารถให้ผู้มีส่วนร่วมคนอื่นได้ปรับปรุงข้อมูลที่ป�ิทินด้วย"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "�ารส่งข้อมูลที่ปรับปรุงสามารถให้ผู้มีส่วนร่วมคนอื่นได้ปรับปรุงราย�ารงานด้วย"
+msgstr "�ารส่งข้อมูลที่ปรับปรุงสามารถให้ผู้มีส่วนร่วมคนอื่นได้ปรับปรุงราย�ารภาร�ิจด้วย"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 "�ำลังอยู่ระหว่างดาวน์โหลดเอ�สาร�นบบางชิ้น ถ้าคุณบันทึ�นัดหมายตอนนี้ จะสู�เสียเอ�สาร�นบดัง�ล่าว"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
-"�ำลังอยู่ระหว่างดาวน์โหลดเอ�สาร�นบบางชิ้น ถ้าคุณบันทึ�งานตอนนี้ จะสู�เสียเอ�สาร�นบดัง�ล่าว"
+"�ำลังอยู่ระหว่างดาวน์โหลดเอ�สาร�นบบางชิ้น ถ้าคุณบันทึ�ภาร�ิจตอนนี้ จะสู�เสียเอ�สาร�นบดัง�ล่าว"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "คุณลั�ษณะบางอย่างอาจทำงานไม่สมบูรณ์ในเซิร์ฟเวอร์ปัจจุบันของคุณ"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ป�ิทิน Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "บันทึ�ช่วยจำ Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "งาน Evolution หยุดทำงาน�ระทันหัน"
+msgstr "ภาร�ิจ Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "ไม่ได้ทำเครื่องหมายที่ป�ิทินเพื่อ�ารใช้งาน�บบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
 msgstr "ไม่ได้ทำเครื่องหมายที่ราย�ารบันทึ�ช่วยจำเพื่อ�ารใช้งาน�บบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
-msgstr "ไม่ได้ทำเครื่องหมายที่ราย�ารงานเพื่อ�ารใช้งาน�บบออฟไลน์"
+msgstr "ไม่ได้ทำเครื่องหมายที่ราย�ารภาร�ิจเพื่อ�ารใช้งาน�บบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
-msgstr "ป�ิทินจะถู�ลบออ�อย่างถาวร"
+msgstr "ป�ิทินนี้จะถู�ลบออ�อย่างถาวร"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
-msgstr "บันทึ�ช่วยจำนี้จะถู�ลบออ�อย่างถาวร"
+msgstr "ราย�ารบันทึ�ช่วยจำนี้จะถู�ลบออ�อย่างถาวร"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
-msgstr "งานจะถู�ลบออ�อย่างถาวร"
+msgstr "ราย�ารภาร�ิจนี้จะถู�ลบออ�อย่างถาวร"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงนัดหมายนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงของคุณในบันทึ�ช่วยจำนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
-msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงของคุณในงานนี้หรือไม่?"
+msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงของคุณในภาร�ิจนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "คุณต้อง�ารส่งประ�าศ�ารย�เลิ�สำหรับบันทึ�ช่วยจำนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "คุณต้อง�ารส่งประ�าศ�จ้ง�ารย�เลิ�ไปยังผู้มีส่วนร่วมทุ�คนหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "คุณต้อง�ารส่ง�ารเชิ�ประชุมไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
-msgstr "คุณต้อง�ารส่งงานนี้ไปยังผู้มีส่วนร่วมหรือไม่?"
+msgstr "คุณต้อง�ารส่งภาร�ิจนี้ไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "คุณต้อง�ารส่งข้อมูล�ารประชุมที่ปรับปรุงไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
-msgstr "คุณต้อง�ารส่งข้อมูลที่ปรับปรุงของงานไปยังผู้มีส่วนร่วมหรือไม่?"
+msgstr "คุณต้อง�ารส่งข้อมูลที่ปรับปรุงของภาร�ิจไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4351,123 +4399,117 @@ msgstr ""
 "คุณ�ำลังเชื่อมต่อ�ับเซิร์ฟเวอร์ GroupWise รุ่นที่ไม่ได้รองรับ อาจจะทำให้เ�ิดปั�หา�ารใช้ "
 "Evolution ทางที่ดีที่สุดคือควรปรับรุ่นเซิร์ฟเวอร์ให้เป็นรุ่นที่รองรับ"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "คุณได้เปลี่ยน�ปลงนัดหมายนี้ �ต่ยังไม่ได้บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
-msgstr "คุณได้เปลี่ยน�ปลงงานนี้ �ต่ยังไม่ได้บันทึ�"
+msgstr "คุณได้เปลี่ยน�ปลงภาร�ิจนี้ �ต่ยังไม่ได้บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "คุณได้เปลี่ยน�ปลงบันทึี�ข้อความนี้ �ต่ยังไม่ได้บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ป�ิทินของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "บันทึ�ช่วยจำของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "ข้อมูลงานของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
+msgstr "ข้อมูลภาร�ิจของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ไ_ม่สนใจ�ารเปลี่ยน�ปลง"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_บันทึ��ารเปลี่ยน�ปลง"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_ส่งประ�าศ"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "ป้อนรหัสผ่าน"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "�ย�เหตุ�ารณ์ที่�ินเวลาหลายวัน:"
 
-#: ../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:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "ไม่สามารถเริ่มเซิร์ฟเวอร์ข้อมูล evolution"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รมป�ิทินของ pilot ได้"
 
-#: ../calendar/conduits/memo/memo-conduit.c:910
-#: ../calendar/conduits/memo/memo-conduit.c:913
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รมบันทึ�ช่วยจำของ pilot ได้"
 
-#: ../calendar/conduits/memo/memo-conduit.c:957
-#: ../calendar/conduits/memo/memo-conduit.c:960
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "ไม่สามารถเขียนบล็อคโปร��รมบันทึ�ช่วยจำของ pilot ได้"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "ระดับความสำคั�โดยปริยาย:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รม ToDo ของปาล์มได้"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 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:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
-msgstr "ป�ิทิน�ละงาน"
+msgstr "ป�ิทิน�ละภาร�ิจ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "ป�ิทิน"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr "�ำหนดค่าเวลาในประเทศ ป�ิทิน �ละราย�ารงานของคุณที่นี่"
+msgstr "�ำหนดค่าเวลาในประเทศ ป�ิทิน �ละราย�ารภาร�ิจของคุณที่นี่"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
-msgstr "ป�ิทิน Evolution �ละงาน"
+msgstr "ป�ิทิน�ละภาร�ิจ Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
@@ -4479,7 +4521,7 @@ msgstr "เครื่องมือ�สดงข้อความ�าร
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
-msgstr "เครื่องมือ��้ไข ป�ิทิน/งาน Evolution"
+msgstr "เครื่องมือ��้ไข ป�ิทิน/ภาร�ิจ Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
@@ -4491,35 +4533,35 @@ msgstr "องค์ประ�อบบันทึ�ช่วยจำขอ
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
-msgstr "องค์ประ�อบงานของ Evolution"
+msgstr "องค์ประ�อบภาร�ิจของ Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "บันทึ�_ช่วยจำ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "บันทึ�ช่วยจำ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1435
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../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/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: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 "งาน"
+msgstr "ภาร�ิจ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
@@ -4528,31 +4570,32 @@ msgstr "_ป�ิทิน"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
-msgstr "_งาน"
+msgstr "_ภาร�ิจ"
 
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "บริ�าร�ารประ�าศ�จ้งเตือนป�ิทิน Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "นาที"
 msgstr[1] "นาที"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ชั่วโมง"
 msgstr[1] "ชั่วโมง"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "เวลาเริ่ม"
 
@@ -4563,9 +4606,9 @@ msgstr "นัดหมาย"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "สถานที่:"
@@ -4575,17 +4618,15 @@ msgid "Snooze _time:"
 msgstr "ช่วงเ_วลาผัดผ่อน:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "�_�้ไข"
 
@@ -4597,32 +4638,32 @@ msgstr "_ผัดผ่อน"
 msgid "location of appointment"
 msgstr "สถานที่นัดหมาย"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "ไม่มีสรุป"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "ไม่มีคำอธิบายรายละเอียดอยู่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "ไม่มีข้อมูลสถานที่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "คุณมี�ารเตือน %d ราย�าร"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4633,7 +4674,7 @@ msgstr ""
 "�ต่�ารเตือนความจำนี้ได้�ำหนดค่าให้ส่งอีเมล\n"
 "Evolution จะ�สดง�ล่องโต้ตอบเตือนความจำตามป�ติ�ทน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4650,27 +4691,27 @@ msgstr ""
 "\n"
 "คุณ�น่ใจหรือไม่ ที่จะเรีย�โปร��รมนี้?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "ไม่ต้องถามเ�ี่ยว�ับโปร��รมนี้อี�ครั้ง"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "ไม่สามารถเริ่มใช้งาน Bonobo ได้"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr "ไม่สามารถสร้างโรงงานบริ�าร�จ้งเตือนได้ บางทีโรงงานอาจเปิดทำงานอยู่�ล้ว..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "เวลาไม่ถู�ต้อง"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4678,8 +4719,8 @@ msgstr[0] "%d ชั่วโมง"
 msgstr[1] "%d ชั่วโมง"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4689,8 +4730,8 @@ msgstr[1] "%d นาที"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4707,11 +4748,11 @@ msgstr "ถามเพื่อ�ารยืนยันเมื่อ�ำ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "สีพื้นหลังของงานที่มี�ำหนดเสร็จวันนี้ ในรูป�บบ \"#rrggbb\""
+msgstr "สีพื้นหลังของภาร�ิจที่มี�ำหนดเสร็จวันนี้ ในรูป�บบ \"#rrggbb\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "สีพื้นหลังของงานที่เลยเวลา�ำหนด ในรูป�บบ \"#rrggbb\""
+msgstr "สีพื้นหลังของภาร�ิจที่เลยเวลา�ำหนด ในรูป�บบ \"#rrggbb\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
@@ -4776,15 +4817,15 @@ msgstr "�ารไล่ระดับสีของช่อง�สดง
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
-msgstr "ซ่อนงานที่เสร็จ�ล้ว"
+msgstr "ซ่อนภาร�ิจที่เสร็จ�ล้ว"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
-msgstr "ซ่อนหน่วยของงาน"
+msgstr "ซ่อนหน่วยของภาร�ิจ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
-msgstr "ซ่อนค่าของงาน"
+msgstr "ซ่อนค่าของภาร�ิจ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
@@ -4792,15 +4833,15 @@ msgstr "ตำ�หน่งของเส้น�ั้นช่อง�น
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "ชั่วโมงสิ้นสุดวันทำงานในรูป�บบ 24 ชั่วโมง 0 to 23"
+msgstr "ชั่วโมงสิ้นสุดวันทำงานในรูป�บบ 24 ชั่วโมง มีค่าตั้ง�ต่ 0 ถึง 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 "ชั่วโมง�ารเริ่มต้นวันทำงานในรูป�บบ 24 ชั่วโมง 0 to 23"
+msgstr "ชั่วโมงเริ่มต้นวันทำงานในรูป�บบ 24 ชั่วโมง มีค่าตั้ง�ต่ 0 ถึง 23"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "ช่วงในวัน�ละสัปดาห์ทำงาน�สดงเป็น�บบนาที"
+msgstr "ช่วงเวลาที่จะ�สดงในมุมมองวัน�ละสัปดาห์ทำงาน เป็นนาที"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
@@ -4844,19 +4885,19 @@ msgstr "จำนวนของหน่วยสำหรับ�ำหนด
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
-msgstr "จำนวนของหน่วยสำหรับ�าร�ำหนดเมื่อต้อง�ารซ่อนงาน"
+msgstr "จำนวนหน่วยสำหรับ�ำหนด�ารซ่อนภาร�ิจ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
-msgstr "สีของงานที่เลย�ำหนด"
+msgstr "สีของภาร�ิจที่เลย�ำหนด"
 
 #: ../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 ""
-"ตำ�หน่งของเส้น�ั้นช่อง�นวนอน ระหว่างป�ิทินเลือ�วันที่�ับราย�ารงาน เมื่อไม่ได้อยู่ในมุมมองรายเดือน "
-"ในหน่วยพิ�เซล"
+"ตำ�หน่งของเส้น�ั้นช่อง�นวนอน ระหว่างป�ิทินเลือ�วันที่�ับราย�ารภาร�ิจ "
+"เมื่อไม่ได้อยู่ในมุมมองรายเดือน ในหน่วยพิ�เซล"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
@@ -4876,7 +4917,7 @@ msgstr "ตำ�หน่งของเส้น�ั้นช่อง�น
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
-msgstr "ตำ�หน่งของเส้น�ั้นช่อง�นวดิ่ง ระหว่างช่องราย�ารงาน�ับช่อง�สดงตัวอย่าง ในหน่วยพิ�เซล"
+msgstr "ตำ�หน่งของเส้น�ั้นช่อง�นวดิ่ง ระหว่างช่องราย�ารภาร�ิจ�ับช่อง�สดงตัวอย่าง ในหน่วยพิ�เซล"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
@@ -4891,7 +4932,7 @@ msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"ตำ�หน่งของเส้น�ั้นช่อง�นวดิ่ง ระหว่างช่อง�สดงข้อมูล�ับช่องป�ิทินเลือ�วันที่�ละราย�ารงาน "
+"ตำ�หน่งของเส้น�ั้นช่อง�นวดิ่ง ระหว่างช่อง�สดงข้อมูล�ับช่องป�ิทินเลือ�วันที่�ละราย�ารภาร�ิจ "
 "เมื่ออยู่ในมุมมองรายเดือน ในหน่วยพิ�เซล"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
@@ -4904,11 +4945,11 @@ msgstr "ไดเร�ทอรีสำหรับบันทึ�เสี
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "�สดงช่องข้อมูล RSVP ในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุม"
+msgstr "�สดงช่องข้อมูล RSVP ในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "�สดงช่องข้อมูลบทบาทในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุม"
+msgstr "�สดงช่องข้อมูลบทบาทในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
@@ -4916,7 +4957,7 @@ msgstr "�สดงเวลาสิ้นสุดนัดหมายใน
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "�สดงช่องข้อมูลหมวดหมู่้ในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุม"
+msgstr "�สดงช่องข้อมูลหมวดหมู่้ในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
@@ -4924,25 +4965,25 @@ msgstr "�สดง�ารเตือนในถาด�จ้งเตื
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
-msgstr "�สดงช่องข้อมูลสถานะในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุม"
+msgstr "�สดงช่องข้อมูลสถานะในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "�สดงช่อง \"�สดงตัวอย่าง\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "�สดงช่อง \"�สดงตัวอย่าง\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
-msgstr "�สดงช่องข้อมูลเขตเวลาในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุม"
+msgstr "�สดงช่องข้อมูลเขตเวลาในเครื่องมือ��้ไขเหตุ�ารณ์/�ารประชุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
-msgstr "�สดงช่องข้อมูลชนิดในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุม"
+msgstr "�สดงช่องข้อมูลชนิดในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
@@ -4950,11 +4991,11 @@ msgstr "�สดงสัปดาห์ที่ในป�ิทินเล
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
-msgstr "สีของงานที่ถึง�ำหนดวันนี้"
+msgstr "สีของภาร�ิจที่ถึง�ำหนดวันนี้"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
-msgstr "ตำ�หน่งเส้น�ั้นช่อง�นวดิ่ง ในมุมมองงาน"
+msgstr "ตำ�หน่งเส้น�ั้นช่อง�นวดิ่ง ในมุมมองภาร�ิจ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
@@ -4975,14 +5016,14 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
-msgstr "�ารจำ�น�เวลา"
+msgstr "ช่วงเวลา"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
-msgstr "เวลาที่�ารเตือนครั้ง�่อนทำงาน เป็นชนิด time_t"
+msgstr "เวลาของ�ารเตือนครั้ง�่อน เป็นชนิด time_t"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "เขตเวลา"
 
@@ -5004,7 +5045,7 @@ msgstr "หน่วยสำหรับ�ารเตือนความจ
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "หน่วยของ�าร�ำหนดเมื่อจะซ่อนงาน \"นาที\", \"ชั่วโมง\" หรือ \"วัน\""
+msgstr "หน่วยของ�าร�ำหนด�ารซ่อนภาร�ิจ เป็น \"นาที\", \"ชั่วโมง\" หรือ \"วัน\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -5020,11 +5061,11 @@ msgstr "�ำหนดว่าจะใช้ถาด�จ้งเตือ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "�ำหนดว่าจะถามยืนยัน�่อนลบนัดหมายหรืองานหรือไม่"
+msgstr "�ำหนดว่าจะถามยืนยัน�่อนลบนัดหมายหรือภาร�ิจหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "�ำหนดว่าจะถามยืนยันเมื่อจะเ�็บ�วาดนัดหมาย�ละงานที่สั่งลบหรือไม่"
+msgstr "�ำหนดว่าจะถามยืนยันเมื่อจะเ�็บ�วาดนัดหมาย�ละภาร�ิจที่สั่งลบหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
@@ -5044,7 +5085,7 @@ msgstr "�ำหนดว่าจะวาดเส้น Marcus Bains (เส
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "�ำหนดว่าจะซ่อนงานที่เสร็จ�ล้วในมุมมองงานหรือไม่"
+msgstr "�ำหนดว่าจะซ่อนภาร�ิจที่เสร็จ�ล้วในมุมมองภาร�ิจหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
@@ -5052,19 +5093,19 @@ msgstr "�ำหนดว่าจะตั้งค่าเตือนคว
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "�ำหนดว่า�สดงช่องข้อมูล RSVP ในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุมหรือไม่"
+msgstr "�ำหนดว่า�สดงช่องข้อมูล RSVP ในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุมหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "�ำหนดว่า�สดงช่องข้อมูลหมวดหมู่ในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุมหรือไม่"
+msgstr "�ำหนดว่า�สดงช่องข้อมูลหมวดหมู่ในเครื่องมือ��้ไขเหตุ�ารณ์/�ารประชุมหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "�ำหนดว่า�สดงช่องข้อมูลบทบาทในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุมหรือไม่"
+msgstr "�ำหนดว่า�สดงช่องข้อมูลบทบาทในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุมหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "�ำหนดว่า�สดงช่องข้อมูลสถานะในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุมหรือไม่"
+msgstr "�ำหนดว่า�สดงช่องข้อมูลสถานะในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุมหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -5073,11 +5114,11 @@ msgstr "�ำหนดว่าจะใช้�าร�สดงเวลา
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "�ำหนดว่า�สดงช่องข้อมูลเขตเวลาในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุมหรือไม่"
+msgstr "�ำหนดว่า�สดงช่องข้อมูลเขตเวลาในเครื่องมือ��้ไขเหตุ�ารณ์/�ารประชุมหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "�ำหนดว่า�สดงช่องข้อมูลชนิดในเครื่องมือ��้ไขเหตุ�ารณ์/งาน/�ารประชุมหรือไม่"
+msgstr "�ำหนดว่า�สดงช่องข้อมูลชนิดในเครื่องมือ��้ไขเหตุ�ารณ์/ภาร�ิจ/�ารประชุมหรือไม่"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
@@ -5111,66 +5152,66 @@ msgstr "นาทีเริ่มต้นวันทำงาน"
 msgid "daylight savings time"
 msgstr "ปรับเวลาหน้าร้อน"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "สรุปมีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "คำอธิบายมีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "อยู่ในหมวด"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "มีความคิดเห็น"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "สถานที่มีคำว่า"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "ไม่ตรง�ัน"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
-msgstr "งานของ 7 วันข้างหน้า"
+msgstr "ภาร�ิจของ 7 วันข้างหน้า"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
-msgstr "งานที่�ำลังทำอยู่"
+msgstr "ภาร�ิจที่�ำลังทำอยู่"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
-msgstr "งานที่เลย�ำหนด"
+msgstr "ภาร�ิจที่เลย�ำหนด"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
-msgstr "งานที่เสร็จ�ล้ว "
+msgstr "ภาร�ิจที่เสร็จ�ล้ว "
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
-msgstr "งานที่มีเอ�สาร�นบ"
+msgstr "ภาร�ิจที่มีเอ�สาร�นบ"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "นัดหมายที่มีผลอยู่"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "นัดหมายของ 7 วันข้างหน้า"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5179,16 +5220,17 @@ msgstr ""
 "ป�ิบัติ�ารนี้จะลบเหตุ�ารณ์ทุ�อย่างที่เ�่า�ว่าเวลาที่�ำหนดไว้ หา�คุณดำเนิน�ารต่อไป "
 "จะไม่สามารถเรีย�ข้อมูลเหตุ�ารณ์เหล่านี้ได้�ลับคืนมาได้อี�"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "ลบเหตุ�ารณ์ที่เ�่า�ว่า"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "วัน"
 
@@ -5197,148 +5239,348 @@ msgstr "วัน"
 #. 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 "รายงานอา�าศ"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "ป�ิทินใ_หม่"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_คัดลอ�..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1136
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_คุณสมบัติ"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�ารปรับปรุงรุ่นป�ิทินล้มเหลว"
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดป�ิทิน '%s' เพื่อ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ไม่มีป�ิทินที่จะใช้ได้สำหรับ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "ช่องเลือ��หล่งป�ิทิน"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "นัดหมายใหม่"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_นัดหมาย"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "สร้างนัดหมายใหม่"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "�ารประชุมใหม่"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "�าร_ประชุม"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "สร้าง�ารขอ�ารประชุมใหม่"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "นัดหมายตลอดทั้งวันใหม่"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "นัดหมาย_ตลอดทั้งวัน"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "สร้าง�ารประชุมตลอดทั้งวันใหม่"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "ป�ิทินใหม่"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_ป�ิทิน"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "สร้างป�ิทินใหม่"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "มุมมองวัน"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "มุมมองสัปดาห์ทำงาน"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "มุมมองสัปดาห์"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "มุมมองเดือน"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "เอ�สาร�นบ"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "ผู้เข้าประชุม"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "ธุร�ิจ"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "หมวด"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "ประเภท"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "เป็นความลับ"
+
+#: ../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 "คำบรรยาย"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "คำอธิบายมีคำว่า"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "มี"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "ราย�ารโปรด"
+
+#: ../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
+msgid "Holiday"
+msgstr "วันหยุด"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "ที่อยู่ติดต่อยอดนิยม"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "�นวคิด"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "นานาชาติ"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "ลู�ค้าสำคั�"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "เบ็ดเตล็ด"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "7 วันข้างหน้า"
+
+#: ../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 "ผู้ประสานงาน"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+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/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
+msgid "Public"
+msgstr "เปิดเผย"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "�ารเวียนซ้ำ"
+
+#: ../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:69 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "สถานะ"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "�ลยุทธ์"
+
+#: ../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:361
+msgid "Summary"
+msgstr "สรุป"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "สรุปมีคำว่า"
 
-#: ../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
+msgid "Suppliers"
+msgstr "ผู้ผลิตป้อน"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "เวลา &amp; ค่าใช้จ่าย"
+
+#: ../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
+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
+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
+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
+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
+msgid "is not"
+msgstr "ไม่ใช่"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "เ�ิดข้อผิดพลาดขณะเปิดป�ิทิน"
 
-#: ../calendar/gui/comp-editor-factory.c:410
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "เรีย�เมธอดที่ไม่รองรับขณะเปิดป�ิทิน"
 
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "ไม่อนุ�าตให้เปิดป�ิทิน"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "��้ไข�ารเตือน"
 
@@ -5371,17 +5613,17 @@ msgid "Mes_sage:"
 msgstr "_ข้อความ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "เล่นเสียง"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "เรีย�โปร��รม"
 
@@ -5394,7 +5636,7 @@ msgid "Send To:"
 msgstr "ส่งไปยัง:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "ส่งอีเมล"
 
@@ -5449,9 +5691,9 @@ msgstr "นาที"
 msgid "start of appointment"
 msgstr "เริ่มนัดหมาย"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
-msgstr "ป�ิบัติ�าร/�ารเรีย�โปร��รม"
+msgstr "ป�ิบัติ�าร/�ารสะ�ิด"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
@@ -5460,16 +5702,15 @@ msgstr "เ_พิ่ม"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "�ารเตือน"
 
-#: ../calendar/gui/dialogs/cal-attachment-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
 msgid "_Suggest automatic display of attachment"
 msgstr "ให้�_สดงเอ�สาร�นบนี้โดยอัตโนมัติ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "�นบ�ฟ้ม"
 
@@ -5514,7 +5755,7 @@ msgstr "<span weight=\"bold\">ทั่วไป</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">ราย�ารงาน</span>"
+msgstr "<span weight=\"bold\">ราย�ารภาร�ิจ</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
@@ -5537,8 +5778,8 @@ msgid "Display"
 msgstr "�สดง"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ศุ�ร์"
 
@@ -5553,8 +5794,8 @@ msgstr ""
 "วัน"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "จันทร์"
 
@@ -5577,7 +5818,7 @@ msgstr ""
 "วันอาทิตย์"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "เลือ�สี"
 
@@ -5587,8 +5828,8 @@ msgid "S_un"
 msgstr "อ_า."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "เสาร์"
 
@@ -5605,14 +5846,14 @@ msgid "Show week _numbers in date navigator"
 msgstr "�สดงสัป_ดาห์ที่ในป�ิทิน"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "อาทิตย์"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
-msgstr "_งานที่ถึง�ำหนดวันนี้"
+msgstr "_ภาร�ิจที่ถึง�ำหนดวันนี้"
 
 #. Thursday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
@@ -5624,13 +5865,13 @@ msgid "Template:"
 msgstr "รูป�บบข้อความ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "พฤหัสบดี"
 
 #: ../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 "เ_ขตเวลา:"
 
@@ -5639,14 +5880,14 @@ msgid "Time format:"
 msgstr "รูป�บบเวลา:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "พุธ"
 
@@ -5686,7 +5927,7 @@ msgstr "_ศ."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
-msgstr "_ซ่อนงานที่เสร็จ�ล้วหลังจา�"
+msgstr "_ซ่อนภาร�ิจที่เสร็จ�ล้วหลังจา�"
 
 #. Monday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
@@ -5695,7 +5936,7 @@ msgstr "_จ."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Overdue tasks:"
-msgstr "งานที่เ_ลย�ำหนด:"
+msgstr "ภาร�ิจที่เ_ลย�ำหนด:"
 
 #. Saturday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
@@ -5724,303 +5965,454 @@ msgstr "_พ."
 msgid "before every appointment"
 msgstr "�่อนนัดหมายทุ�ครั้ง"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "คัดลอ_�เนื้อหาป�ิทินไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
-msgstr "คัดลอ_�เนื้อหาราย�ารงานไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
+msgstr "คัดลอ_�เนื้อหาราย�ารภาร�ิจไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "คัดลอ_�เนื้อหาราย�ารบันทึ�ช่วยจำไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
 msgstr "_สี:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
-msgstr "ราย�ารงาน"
+msgstr "ราย�ารภาร�ิจ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "ราย�ารบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "คุณสมบัติป�ิทิน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "ป�ิทินใหม่"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
-msgstr "คุณสมบัติราย�ารงาน"
+msgstr "คุณสมบัติราย�ารภาร�ิจ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "ราย�ารภาร�ิจใ_หม่"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "คุณสมบัติราย�ารบันที�ช่วยจำ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "ราย�ารบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "เหตุ�ารณ์นี้ถู�ลบไป�ล้ว"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
-msgstr "งานนี้ถู�ลบไป�ล้ว"
+msgstr "ภาร�ิจนี้ถู�ลบไป�ล้ว"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "บันทึ�ช่วยจำนี้ถู�ลบไป�ล้ว"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s คุณได้เปลี่ยน�ปลงข้อมูลบางอย่าง จะละเลย�ละปิดเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s คุณไม่ได้��้ไขข้อมูลใดๆ จะปิดเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "เหตุ�ารณ์นี้มี�ารเปลี่ยน�ปลง"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
-msgstr "งานนี้มี�ารเปลี่ยน�ปลง"
+msgstr "ภาร�ิจนี้มี�ารเปลี่ยน�ปลง"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "บันทึ�ช่วยจำนี้มี�ารเปลี่ยน�ปลง"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s คุณได้��้ไขข้อมูลบางอย่าง จะละเลย�ารเปลี่ยน�ปลงนี้ �ละปรับข้อมูลเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  คุณไม่ได้��้ไขข้อมูลใดๆ จะปรับข้อมูลเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "พบข้อผิดพลาดของข้อมูล: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2338
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " ถึง "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2342
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr "(เสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "เสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (�ำหนดเสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "�ำหนดเสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "ข้อความที่�นบมา - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3040
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ข้อความที่�นบมา"
 msgstr[1] "ข้อความที่�นบมา %d ข้อความ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_ย้าย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "ย�เลิ��าร_ลา�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:669
-#: ../calendar/gui/dialogs/comp-editor.c:2827 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "เอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:831
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "ไม่สามารถปรับข้อมูลอ็อบเจ�ต์"
 
-#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "��้ไขนัดหมาย"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "�ารประชุม - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "นัดหมาย - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "ภาร�ิจที่ได้รับมอบหมาย - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "ภาร�ิจ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "บันทึ�ช่วยจำ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "ไม่มีสรุป"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "คลิ�ที่นี่เพื่อปิดหน้าต่างปัจจุบัน"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "คัดลอ�ข้อความที่เลือ�เข้าคลิปบอร์ด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "ตัดข้อความที่เลือ�เข้าคลิปบอร์ด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "คลิ�ที่นี่เพื่อดูวิธีใช้"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "�ปะข้อความจา�คลิปบอร์ด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "คลิ�ที่นี่เพื่อบันทึ�หน้าต่างปัจจุบัน"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "เลือ�เนื้อความทั้งหมด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "ประเ_ภท"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../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
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "�_ทร�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_ตัวเลือ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "�ฟ้ม�_นบ..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "คลิ�ที่นี่เพื่อ�นบ�ฟ้ม"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_หมวด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "ซ่อน/�สดงช่องข้อมูลหมวดหมู่"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "เ_ขตเวลา"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "ซ่อน/�สดงช่องข้อมูลเขตเวลา"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "เ_ปิดเผย"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "�ำหนดเป็นประเภทเปิดเผย"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "ส่วน_ตัว"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "�ำหนดเป็นประเภทส่วนตัว"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "เป็นความ_ลับ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "�ำหนดเป็นประเภทความลับ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "ช่องข้อมูล_บทบาท"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "ซ่อน/�สดงช่องข้อมูลบทบาท"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "ซ่อน/�สดงช่องข้อมูล RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "ช่องข้อมูล_สถานะ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "ซ่อน/�สดงช่องข้อมูลสถานะ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "ช่องข้อมูล_ชนิด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+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"
+msgstr "เอ�สาร_ล่าสุด"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "�นบ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1013
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "ซ่อน�_ถบเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/comp-editor.c:1564
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "�สดง�_ถบเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
+#: ../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
 #: ../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:1138
-#: ../composer/e-msg-composer.c:3636
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "เ_พิ่มเอ�สาร�นบ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1588
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "�สดงเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "�ด�คร่เว้นวรรคเพื่อซ่อน/�สดง�ถบเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-msgid "Edit Appointment"
-msgstr "��้ไขนัดหมาย"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Meeting - %s"
-msgstr "�ารประชุม - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Appointment - %s"
-msgstr "นัดหมาย - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2207
-#: ../calendar/gui/dialogs/comp-editor.c:2250
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "งานที่ได้รับมอบหมาย - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2209
-#: ../calendar/gui/dialogs/comp-editor.c:2252
-#, c-format
-msgid "Task - %s"
-msgstr "งาน - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2212
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#, c-format
-msgid "Memo - %s"
-msgstr "บันทึ�ช่วยจำ - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2223
-#: ../calendar/gui/dialogs/comp-editor.c:2265
-msgid "No summary"
-msgstr "ไม่มีสรุป"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2916
-#: ../calendar/gui/dialogs/comp-editor.c:2970
-#: ../calendar/gui/dialogs/comp-editor.c:2994
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ความเปลี่ยน�ปลงในราย�ารนี้อาจถู�ละเลยถ้ามี�ารปรับข้อมูลเข้ามา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "ไม่สามารถใช้รุ่นปัจจุบัน"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "ไม่สามารถเปิด�หล่งได้"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "ไม่สามารถเปิดที่ปลายทาง"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "ที่ปลายทางใช้อ่านได้เท่านั้น"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_ลบราย�ารนี้ออ�จา��ล่องจดหมายของผู้รับอื่นทั้งหมดหรือไม่?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบเหตุ�ารณ์ได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
-msgstr "ไม่สามารถลบงานได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
+msgstr "ไม่สามารถลบภาร�ิจได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบบันทึ�ช่วยจำได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบราย�ารได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบเหตุ�ารณ์ได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
-msgstr "ไม่สามารถลบงานได้ เพราะไม่ได้รับอนุ�าต"
+msgstr "ไม่สามารถลบภาร�ิจได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบบันทึ�ช่วยจำได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบราย�ารได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "ไม่สามารถลบเหตุ�ารณ์ได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
-msgstr "ไม่สามารถลบงานได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
+msgstr "ไม่สามารถลบภาร�ิจได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "ไม่สามารถลบบันทึ�ช่วยจำได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "ไม่สามารถลบราย�ารได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
@@ -6029,7 +6421,7 @@ msgid "Contacts..."
 msgstr "ที่อยู่ติดต่อ..."
 
 #: ../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 "มอบฉันทะให้:"
 
@@ -6037,135 +6429,181 @@ msgstr "มอบฉันทะให้:"
 msgid "Enter Delegate"
 msgstr "ป้อนผู้รับมอบฉันทะ"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "�ารเ_ตือน"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "คลิ�ที่นี่เพื่อ�ำหนดหรือย�เลิ��าร�จ้งเตือนของเหตุ�ารณ์นี้"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "�ารเ_วียนซ้ำ"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "ทำให้เป็นเหตุ�ารณ์เวียนซ้ำ"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../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
+msgid "Insert advanced send options"
+msgstr "�ทร�ตัวเลือ�ขั้นสูงของ�ารส่ง"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "เหตุ�ารณ์_ตลอดวัน"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "เลือ�ให้มี/ไม่มีเหตุ�ารณ์ตลอดวัน"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "�สดงเวลาว่าไ_ม่ว่าง"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "เลือ��สดงเวลาเป็นว่าง/ไม่ว่าง"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_ว่าง/ไม่ว่าง"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "สอบถามข้อมูล�ารว่าง/ไม่ว่างของผู้เข้าประชุม"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_นัดหมาย"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "�ารเวียนซ้ำ"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "เหตุ�ารณ์นี้มี�าร�จ้งเตือน"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "ผู้_รับฉันทะ"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "ผู้เ_ข้าประชุม"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "เหตุ�ารณ์ที่ไม่บอ�วันเริ่มต้น"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "เหตุ�ารณ์ที่ไม่บอ�วันสิ้นสุด"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "วันเริ่มต้นไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "วันสิ้นสุดไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "เวลาเริ่มต้นไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "เวลาสิ้นสุดไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "ผู้ประสานงานที่เลือ�ไม่มีบั�ชีผู้ใช้อี��ล้ว"
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "ต้องมีผู้ประสานงานด้วย"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "ต้อง�ารผู้เข้าประชุมอย่างน้อยหนึ่งคน"
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "เ_พิ่ม"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ไม่สามารถเปิดป�ิทิน '%s'"
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "คุณ�ำลังดำเนิน�ารในนามของ %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "ปรับ�ต่ง"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2006
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "ไม่"
 
@@ -6190,23 +6628,25 @@ msgid "Custom Alarm:"
 msgstr "เสียงเตือนเลือ�เอง"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_คำอธิบาย:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "คำบรรยายเหตุ�ารณ์"
 
-#: ../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 "สรุ_ป:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "�_จ้งเตือน"
 
+#: ../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 "_คำอธิบาย:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "เ_วลา:"
@@ -6237,28 +6677,24 @@ msgstr "เ_ปลี่ยนผู้ประสานงาน"
 msgid "Co_ntacts..."
 msgstr "ที่อยู่_ติดต่อ..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "ผู้ประสานงาน"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "ผู้ประสานงาน:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2446
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "บันทึ�ช่วยจำ"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ไม่สามารถเปิดบันทึ�ช่วยจำใน '%s'"
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1539
-#: ../mail/em-format-html.c:1597 ../mail/em-format-html.c:1623
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "ถึง"
 
@@ -6271,63 +6707,59 @@ msgstr "วันเ_ริ่มต้น:"
 msgid "T_o:"
 msgstr "_ถึง:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_คำอธิบาย:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "�ลุ่_ม:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "คุณ�ำลังเปลี่ยน�ปลงเหตุ�ารณ์เวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "คุณ�ำลังมอบฉันทะเหตุ�ารณ์เวียนซ้ำ คุณต้อง�ารมอบฉันทะสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "คุณ�ำลังเปลี่ยน�ปลงงานเวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
+msgstr "คุณ�ำลังเปลี่ยน�ปลงภาร�ิจเวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "คุณ�ำลังเปลี่ยน�ปลงบันทึ�ช่วยจำเวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "�รณีนี้โดยเฉพาะ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "�รณีนี้�ละ�่อนหน้านี้"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "�รณีนี้�ละต่อไป"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "ทุ��รณี"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "นัดหมายนี้มี�ารเวียนซ้ำที่ Evolution ไม่สามารถ��้ไขได้"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "ใน"
 
@@ -6335,7 +6767,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "วัน�ร�"
 
@@ -6344,7 +6776,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "วันที่สอง"
 
@@ -6352,7 +6784,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "วันที่สาม"
 
@@ -6360,7 +6792,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "วันที่สี่"
 
@@ -6368,13 +6800,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "วันสุดท้าย"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "วันอื่น"
 
@@ -6382,7 +6814,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "วันที่ 1 ถึงวันที่ 10"
 
@@ -6390,7 +6822,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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "วันที่ 11 ถึงวันที่ 20"
 
@@ -6398,45 +6830,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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "เมื่อ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ครั้ง"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "เพิ่มข้อย�เว้น"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "ไม่สามารถอ่านส่วนที่เลือ�เพื่อ��้ไขได้"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "��้ไขข้อย�เว้น"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "ไม่สามารถอ่านส่วนที่เลือ�เพื่อลบได้"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "วัน/เวลา"
 
@@ -6487,12 +6919,12 @@ msgstr "สัปดาห์"
 msgid "year(s)"
 msgstr "ปี"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "วันที่เสร็จไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "เว็บเพจ"
 
@@ -6507,48 +6939,55 @@ msgstr "<span weight=\"bold\">สถานภาพ</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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: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:2518 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "เสร็จ�ล้ว"
 
 #: ../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:1065
+#: ../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
 msgid "High"
 msgstr "สูง"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:748
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2515
+#: ../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
 msgid "In Progress"
 msgstr "�ำลังดำเนิน�าร"
 
 #: ../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:1063
+#: ../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
 msgid "Low"
 msgstr "ต่ำ"
 
 #: ../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:1064
+#: ../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
 msgid "Normal"
 msgstr "ป�ติ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:400 ../calendar/gui/print.c:2512
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ยังไม่เริ่ม"
 
@@ -6561,7 +7000,7 @@ msgid "Stat_us:"
 msgstr "_สถานะ:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "ไม่ได้�ำหนด"
 
@@ -6570,7 +7009,7 @@ msgid "_Date completed:"
 msgstr "_วันที่ทำเสร็จ:"
 
 #: ../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 "_ระดับความสำคั�:"
 
@@ -6578,28 +7017,40 @@ msgstr "_ระดับความสำคั�:"
 msgid "_Web Page:"
 msgstr "เ_ว็บเพจ:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "รายละเอียด_สถานะ"
+
+#: ../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
+msgid "_Send Options"
+msgstr "ตัวเ_ลือ�ของ�ารส่ง"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
-msgstr "_งาน"
+msgstr "_ภาร�ิจ"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
-msgstr "รายละเอียดงาน"
+msgstr "รายละเอียดภาร�ิจ"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ผู้ประ_สานงาน:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "วัน�ำหนดเสร็จงานไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "ไม่สามารถเปิดงานใน '%s'"
+msgstr "ไม่สามารถเปิดภาร�ิจใน '%s'"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
@@ -6610,19 +7061,15 @@ msgid "Categor_ies..."
 msgstr "ห_มวด..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "คำ_อธิบาย:"
+msgid "D_ue date:"
+msgstr "วัน�ำห_นดเสร็จ:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "เขตเวลา:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "วัน�ำห_นดเสร็จ:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6630,142 +7077,126 @@ 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:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d สัปดาห์"
 msgstr[1] "%d สัปดาห์"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "ไม่ระบุป�ิบัติ�ารที่จะ�ระทำ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, 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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
-msgstr "%s สำหรับสำหรับ�ารทำงานตาม�ำหนดเวลาที่ไม่ทราบชนิด"
+msgstr "%s สำหรับ�ารสะ�ิดที่ไม่ทราบชนิด"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3327
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "คลิ�เพื่อเปิด %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "ไม่มีชื่อเรื่อง"
 
-#: ../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
+#: ../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 "วันเริ่มต้น:"
 
-#: ../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-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 "คำอธิบาย:"
 
-#: ../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
 msgid "Web Page:"
 msgstr "เว็บเพจ:"
 
-#: ../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 "สรุป:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "วัน�ำหนดเสร็จ:"
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "สถานะ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "ระดับความสำคั�:"
 
-#: ../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 "เปิดเผย"
-
-#: ../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 "ส่วนตัว"
-
-#: ../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 "เป็นความลับ"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "วันสิ้นสุด"
@@ -6775,21 +7206,14 @@ msgstr "วันสิ้นสุด"
 msgid "Start Date"
 msgstr "วันเริ่มต้น"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "สรุป"
-
-#: ../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:619
 msgid "Free"
 msgstr "ว่าง"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "ไม่ว่าง"
 
@@ -6803,202 +7227,228 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1023 ../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:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "ต�ลง"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1023 ../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:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "ไม่ต�ลง"
 
 #. 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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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-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
+#: ../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:967
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "เวียนซ้ำ"
 
-#: ../calendar/gui/e-cal-model.c:969
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "มอบหมาย"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "บันทึ�เป็น..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 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:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1329
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
-#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../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:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "ตั้งเป็น_พื้นหลัง"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_บันทึ�สิ่งที่เลือ�"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "เปิดใน %s..."
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "ผู้ประสานงาน: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "เริ่ม: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "�ำหนดเสร็จ: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:350
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:635
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "�ำลังลบวัตถุที่เลือ�"
 
-#: ../calendar/gui/e-calendar-table.c:917
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "�ำลังปรับข้อมูลออบเจ็�ต์ต่างๆ"
 
-#: ../calendar/gui/e-calendar-table.c:1101
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
-#: ../composer/e-msg-composer.c:1472
+#: ../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:277
 msgid "Save as..."
 msgstr "บันทึ�เป็น..."
 
-#: ../calendar/gui/e-calendar-table.c:1324
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
-msgstr "งานใ_หม่"
+msgstr "ภาร�ิจใ_หม่"
 
-#: ../calendar/gui/e-calendar-table.c:1328 ../calendar/gui/e-memo-table.c:922
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "เปิด_เว็บเพจ"
 
-#: ../calendar/gui/e-calendar-table.c:1330
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_พิมพ์..."
 
-#: ../calendar/gui/e-calendar-table.c:1334
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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:1336
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "�_ปะ"
 
-#: ../calendar/gui/e-calendar-table.c:1340 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
-msgstr "_มอบหมายงาน"
+msgstr "_มอบหมายภาร�ิจ"
 
-#: ../calendar/gui/e-calendar-table.c:1341 ../calendar/gui/e-memo-table.c:934
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ส่ง_ต่อเป็น iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1342
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_ทำเครื่องหมายว่าเสร็จ�ล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1343
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
-msgstr "_ทำเครื่องหมายงานที่เลือ�ว่าเสร็จ�ล้ว"
+msgstr "_ทำเครื่องหมายภาร�ิจที่เลือ�ว่าเสร็จ�ล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1344
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_ทำเครื่องหมายว่ายังไม่เสร็จ"
 
-#: ../calendar/gui/e-calendar-table.c:1345
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_ทำเครื่องหมายงานที่เลือ�ว่ายังไม่เสร็จ"
+msgstr "_ทำเครื่องหมายภาร�ิจที่เลือ�ว่ายังไม่เสร็จ"
 
-#: ../calendar/gui/e-calendar-table.c:1350
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
-msgstr "ลบ_งานที่เลือ�"
+msgstr "ลบ_ภาร�ิจที่เลือ�"
 
-#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
-msgstr "คลิ�เพื่อเพิ่มงาน"
+msgstr "คลิ�เพื่อเพิ่มภาร�ิจ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -7018,7 +7468,8 @@ msgid "Due date"
 msgstr "วัน�ำหนดเสร็จ"
 
 #: ../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:372
 msgid "Priority"
 msgstr "ระดับความสำคั�"
 
@@ -7026,127 +7477,108 @@ msgstr "ระดับความสำคั�"
 msgid "Start date"
 msgstr "วันเริ่มต้น"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "สถานะ"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
-msgstr "�ำลังลบราย�าร"
+msgstr "�ำลังย้ายราย�าร"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "�ำลังคัดลอ�ราย�าร"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "นัดหมายใ_หม่"
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
-msgstr "เหตุ�ารณ์ทั้งวันใหม่"
+msgstr "เ_หตุ�ารณ์ทั้งวันราย�ารใหม่"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "�ารประชุมใ_หม่"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_มุมมองปัจจุบัน"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "เลือ�_วันนี้"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "เ_ลือ�วัน..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "พิ_มพ์..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "_คัดลอ�ไปยังป�ิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "_ย้ายไปยังป�ิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "มอบหมายประชุม�_ทน..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_จัดเวลาประชุม..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "ส่ง_ต่อเป็น iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_ตอบ�ลับ"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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:1700
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "ให้เหตุ�ารณ์นี้เ_คลื่อนย้ายได้"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_ลบเหตุ�ารณ์นี้"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "ลบ_ทุ�เหตุ�ารณ์"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "ผู้ประสานงาน: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "ผู้ประสานงาน: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2475
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "สถานที่: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:115
 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:119
+#: ../calendar/gui/e-cell-date-edit-text.c:118
 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:127
+#: ../calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7159,7 +7591,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:807
+#: ../calendar/gui/e-day-view-time-item.c:587
 #, c-format
 msgid "%02i minute divisions"
 msgstr "ความละเอียด %02i นาที"
@@ -7170,46 +7602,34 @@ 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:1354
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 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:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. 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:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ใช่ (�ารเวียนซ้ำ�บบซับซ้อน)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ทุ�วัน"
 msgstr[1] "ทุ� %d วัน"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7217,9 +7637,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "ทุ�สัปดาห์"
 msgstr[1] "ทุ� %d สัปดาห์"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7227,51 +7645,35 @@ msgstr[0] "ทุ�สัปดาห์ในวัน"
 msgstr[1] "ทุ� %d สัปดาห์ในวัน"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr "�ละ"
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "วัน %s ของ"
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ของ"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ทุ�เดือน"
 msgstr[1] "ทุ� %d เดือน"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ทุ�ปี"
 msgstr[1] "ทุ� %d ปี"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7279,333 +7681,333 @@ msgstr[0] "ทั้งหมด %d ครั้ง"
 msgstr[1] "ทั้งหมด %d ครั้ง"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr "สิ้นสุด "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "เริ่ม"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "สิ้นสุด"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "ถึง�ำหนด"
 
-#: ../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 "ข้อมูล iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "ข้อผิดพลาด 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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "บุคคลที่ไม่รู้จั�"
 
 #. 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> �รุณาดูข้อมูลข้างล่างนี้ �ล้วเลือ�ป�ิบัติ�ารจา�เมนูข้างล่าง "
 
-#: ../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:728
-#: ../plugins/itip-formatter/itip-formatter.c:2019
+#: ../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:2034
 msgid "Accepted"
 msgstr "ตอบรับ�ล้ว"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "อาจตอบรับ"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2025
+#: ../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:2040
 msgid "Declined"
 msgstr "ป�ิเสธ"
 
-#: ../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 "มี�ารสั่งย�เลิ�งาน �ต่หาไม่พบในราย�ารงาน"
+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> ได้ประ�าศข้อมูล�ารประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "ข้อมูล�ารประชุม"
 
-#: ../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> ขอให้ %s เข้าร่วมประชุม"
 
-#: ../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> ขอให้คุณเข้าร่วมประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "เค้าโครง�ารประชุม"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> ต้อง�ารเข้าร่วม�ารประชุมที่มีอยู่"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "ปรับปรุงข้อมูล�ารประชุม"
 
-#: ../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> ต้อง�ารรับข้อมูล�ารประชุมล่าสุด"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "ต้อง�าร�ารปรับข้อมูล�ารประชุม"
 
-#: ../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> ได้ตอบ�ลับ�ารร้องขอเ�ี่ยว�ับ�ารประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "�ารตอบ�ลับ�ารประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ได้ย�เลิ��ารประชุม"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "�ารย�เลิ��ารประชุม"
 
-#: ../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> ได้ส่งข้อความที่อ่านไม่ได้มาให้"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "ข้อความ�ารประชุมผิดพลาด"
 
-#: ../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> ได้ประ�าศข้อมูลของงาน"
+msgstr "<b>%s</b> ได้ประ�าศข้อมูลของภาร�ิจ"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
-msgstr "ข้อมูลงาน"
+msgstr "ข้อมูลภาร�ิจ"
 
-#: ../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> ขอให้ %s ป�ิบัติงาน"
+msgstr "<b>%s</b> ขอให้ %s ป�ิบัติภาร�ิจ"
 
-#: ../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> ขอให้คุณทำงาน"
+msgstr "<b>%s</b> ขอให้คุณป�ิบัติภาร�ิจ"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
-msgstr "ข้อเสนองาน"
+msgstr "ข้อเสนอภาร�ิจ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> ต้อง�ารเข้าร่วมในงานที่มีอยู่"
+msgstr "<b>%s</b> ต้อง�ารเข้าร่วมในภาร�ิจที่มีอยู่"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
-msgstr "ปรับข้อมูลงาน"
+msgstr "ปรับข้อมูลภาร�ิจ"
 
-#: ../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> ต้อง�ารรับข้อมูลงานล่าสุด"
+msgstr "<b>%s</b> ต้อง�ารรับข้อมูลภาร�ิจล่าสุด"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
-msgstr "ต้อง�าร�ารปรับข้อมูลงาน"
+msgstr "ต้อง�าร�ารปรับข้อมูลภาร�ิจ"
 
-#: ../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> ได้ตอบ�ลับไปยัง�ารมอบหมายงาน"
+msgstr "<b>%s</b> ได้ตอบ�ลับไปยัง�ารมอบหมายภาร�ิจ"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
-msgstr "�ารตอบ�ลับเ�ี่ยว�ับงาน"
+msgstr "�ารตอบ�ลับเ�ี่ยว�ับภาร�ิจ"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> ได้ย�เลิ�งาน"
+msgstr "<b>%s</b> ได้ย�เลิ�ภาร�ิจ"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
-msgstr "�ารย�เลิ�งาน"
+msgstr "�ารย�เลิ�ภาร�ิจ"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
-msgstr "ข้อความงานผิดพลาด"
+msgstr "ข้อความภาร�ิจผิดพลาด"
 
-#: ../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> ได้ประ�าศข้อมูลสถานะว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "ข้อมูล ว่าง/ไม่ว่าง"
 
-#: ../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> ต้อง�ารข้อมูล ว่าง/ไม่ว่าง ของคุณ"
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "�ารร้องขอสถานะว่าง/ไม่ว่าง"
 
-#: ../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> ได้ตอบ�ลับ�ารร้องขอเ�ี่ยว�ับสถานะว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "�ารตอบสถานะว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "ข้อความสถานะว่าง/ไม่ว่างผิดพลาด"
 
-#: ../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 "ข้อความไม่อยู่ในรูป�บบที่เหมาะสม"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "ข้อความมี�ต่ราย�ารร้องขอที่ไม่รองรับ"
 
-#: ../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 "เอ�สาร�นบไม่มีข้อความป�ิทินที่ใช้ได้"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "เอ�สาร�นบไม่มีราย�ารป�ิทินที่สามารถดูได้"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "�ารปรับข้อมูลเสร็จสมบูรณ์\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 "ออบเจ็�ต์ไม่ถู�ต้อง �ละไม่สามารถปรับข้อมูลได้\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 "คำตอบนี้ไม่ได้มาจา�ผู้ร่วมประชุมปัจจุบัน  จะเพิ่มเข้าเป็นผู้ร่วมประชุมหรือไม่?"
 
-#: ../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 "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจา�สถานะเป็นค่าที่ใช้ไม่ได้!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "ปรับข้อมูลผู้เข้าร่วมเรียบร้อย�ล้ว\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจา�ราย�ารหายไป�ล้ว"
 
-#: ../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 "ส่งราย�ารไป�ล้ว!\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 "ไม่สามารถส่งราย�ารได้!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "เลือ�ป�ิบัติ�าร:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "ปรับข้อมูล"
 
-#: ../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 "ตอบรับ"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "อาจตอบรับ"
 
-#: ../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 "ป�ิเสธ"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "ส่งข้อมูล ว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "ปรับข้อมูลสถานะ�ารตอบรับ"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "ส่งข้อมูลล่าสุด"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ย�เลิ�"
@@ -7634,112 +8036,112 @@ msgstr "�ำลังโหลดป�ิทิน..."
 msgid "Server Message:"
 msgstr "ข้อความจา�เซิร์ฟเวอร์"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "ประธาน"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "ผู้เข้าประชุมหลั�"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "ผู้เข้าประชุมเสริม"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "ทรัพยา�ร"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "ผู้เข้าประชุม"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "ส่วนบุคคล"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "�ลุ่ม"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "ทรัพยา�ร"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "ห้อง"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "ประธาน"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "ผู้ร่วมประชุมที่ต้องเข้า"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "ผู้ร่วมประชุมเสริม"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "ไม่ใช่ผู้ร่วมประชุม"
 
-#: ../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 "ต้องดำเนิน�าร"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "ไม่�น่"
 
-#: ../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:737
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../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
 msgid "Delegated"
 msgstr "ส่งผู้�ทนเข้าประชุม"
 
 #. 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:526
+#: ../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 "�ำลังดำเนิน�าร"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -7747,85 +8149,81 @@ 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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "ไม่มีข้อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "ผู้เ_ข้าประชุม..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_ตัวเลือ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "�สดง_ชั่วโมงทำ�ารเท่านั้น"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "�สดงภาพขยาย_ออ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_ปรับปรุงข้อมูล ว่าง/ไม่ว่าง "
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "เลือ�_อัตโนมัติ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_ทุ�คน ทุ�ทรัพยา�ร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "ทุ�_คน �ละทรัพยา�รชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "ผู้เข้าประชุมห_ลั�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "ผู้เข้าประชุมหลั� �ละ_ทรัพยา�รชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "เวลาเ_ริ่มต้น:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "เวลา_สิ้นสุด:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "ผู้เข้าประชุม"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "คลิ�ที่นี่เพื่อเพิ่มผู้เข้าประชุม"
@@ -7850,16 +8248,16 @@ msgstr "ภาษา"
 msgid "Member"
 msgstr "สมาชิ�"
 
-#: ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "ลบบันทึ�_ช่วยจำที่เลือ�"
 
-#: ../calendar/gui/e-memo-table.c:1090 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "คลิ�เพื่อเพิ่มบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2867
+#: ../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"
@@ -7868,85 +8266,80 @@ msgstr ""
 "เ�ิดข้อผิดพลาดที่ %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "�ำลังโหลดบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "�ำลังเปิดบันทึ�ช่วยจำที่ %s"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1327
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "�ำลังลบสิ่งที่เลือ�..."
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
-msgstr "�ำลังโหลดงาน"
+msgstr "�ำลังโหลดภาร�ิจ"
 
-#: ../calendar/gui/e-tasks.c:1059
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "�ำลังเปิดงานที่ %s"
+msgstr "�ำลังเปิดภาร�ิจที่ %s"
 
-#: ../calendar/gui/e-tasks.c:1304
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
-msgstr "�ำลังจบงาน..."
+msgstr "�ำลังจบภาร�ิจ..."
 
-#: ../calendar/gui/e-tasks.c:1354
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "�ำลังเ�็บ�วาด"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:347 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "�ำลังปรับข้อมูล�ารสืบค้น"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "มุมมอง_�ำหนดเอง"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_บันทึ�มุมมองที่�ำหนดเอง"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_�ำหนดมุมมอง..."
 
-#: ../calendar/gui/gnome-cal.c:2691
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "�ำลังโหลดนัดหมายจา� %s"
 
-#: ../calendar/gui/gnome-cal.c:2710
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
-msgstr "�ำลังโหลดงานจา� %s"
+msgstr "�ำลังโหลดภาร�ิจจา� %s"
 
-#: ../calendar/gui/gnome-cal.c:2719
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "�ำลังโหลดบันทึ�ช่วยจำที่ %s"
 
-#: ../calendar/gui/gnome-cal.c:2826
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "�ำลังเปิด %s"
 
-#: ../calendar/gui/gnome-cal.c:3783
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "�ำลังเ�็บ�วาด"
 
@@ -8006,57 +8399,57 @@ msgstr "�ันยายน"
 msgid "_Select Today"
 msgstr "เลือ�_วันนี้"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "ต้อง�ำหนดผู้ประสานงานด้วย"
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "ต้องมีผู้เข้าร่วมประชุมอย่างน้อยหนึ่งคน"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "ข้อมูลเหตุ�ารณ์"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
-msgstr "ข้อมูลงาน"
+msgstr "ข้อมูลภาร�ิจ"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "ข้อมูลบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "ข้อมูล ว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "ข้อมูลป�ิทิน"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "เพิ่มเติม"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "ปรับ�สดง"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "เสนอ�ย้ง"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ข้อมูล ว่าง/ไม่ว่าง (%s ไปยัง %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "ข้อมูล iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "คุณต้องเป็นผู้เข้าร่วมในเหตุ�ารณ์"
 
@@ -8095,58 +8488,65 @@ msgstr "ไม่มีป�ิทินที่ใช้ได้สำหร
 msgid "Memo Source Selector"
 msgstr "เครื่องมือเลือ��หล่งบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "บันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "บันทึ�_ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "สร้างบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "บันทึ�ช่วยจำใช้ร่วมชิ้นใหม่"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "บันทึ�ช่วยจำใช้_ร่วม"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "สร้างบันทึ�ช่วยจำใช้ร่วมชิ้นใหม่"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "ราย�ารบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "_ราย�ารบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "สร้างราย�ารบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "พิมพ์บันทึ�ช่วยจำ"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "7 วันข้างหน้า"
+
+#: ../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 ""
-"ตำ�หน่ง�ละโครงสร้างของโฟลเดอร์งานของ Evolution มี�ารเปลี่ยน�ปลงจา�รุ่น 1.x\n"
+"ตำ�หน่ง�ละโครงสร้างของโฟลเดอร์ภาร�ิจของ Evolution มี�ารเปลี่ยน�ปลงจา�รุ่น 1.x\n"
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../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"
@@ -8158,27 +8558,27 @@ msgstr ""
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
 #. 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 "ไม่สามารถถ่ายโอน�ารตั้งค่าเ�่าจา� evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ไม่สามารถถ่ายโอนป�ิทิน `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "ไม่สามารถถ่ายโอนงาน `%s'"
+msgstr "ไม่สามารถถ่ายโอนภาร�ิจ `%s'"
 
-#: ../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
+#: ../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 "บันทึ�ข้อความ"
 
@@ -8335,1823 +8735,2043 @@ msgstr "ศ."
 msgid "Sa"
 msgstr "ส."
 
-#: ../calendar/gui/print.c:2442
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "นัดหมาย"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2474
 msgid "Task"
-msgstr "งาน"
+msgstr "ภาร�ิจ"
 
-#: ../calendar/gui/print.c:2466
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "สรุป: %s"
 
-#: ../calendar/gui/print.c:2488
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "ผู้เข้าประชุม: "
 
-#: ../calendar/gui/print.c:2528
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "สถานะ: %s"
 
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "ระดับความสำคั�: %s"
 
-#: ../calendar/gui/print.c:2557
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "เปอร์เซ็นต์ที่เสร็จ: %i"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2582
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "หมวด: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "ที่อยู่ติดต่อ:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2695
-msgid "Upcoming Appointments"
-msgstr "นัดหมายที่จะถึง"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
-msgstr "ราย�ารงานใ_หม่"
+msgstr "ราย�ารภาร�ิจใ_หม่"
 
 #: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d งาน"
-msgstr[1] "%d งาน"
+msgstr[0] "%d ภาร�ิจ"
+msgstr[1] "%d ภาร�ิจ"
 
 #: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
-msgstr "ปรับรุ่นข้อมูลงานไม่สำเร็จ"
+msgstr "ปรับรุ่นข้อมูลภาร�ิจไม่สำเร็จ"
 
 #: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "ไม่สามารถเปิดราย�ารงาน '%s' สำหรับ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
+msgstr "ไม่สามารถเปิดราย�ารภาร�ิจ '%s' สำหรับ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
 #: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
-msgstr "ไม่มีป�ิทินที่ใช้ได้สำหรับ�ารสร้างงาน"
+msgstr "ไม่มีป�ิทินที่ใช้ได้สำหรับ�ารสร้างภาร�ิจ"
 
 #: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
-msgstr "เครื่องมือเลือ��หล่งข้อมูลงาน"
+msgstr "เครื่องมือเลือ��หล่งข้อมูลภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
-msgstr "งานใหม่"
+msgstr "ภาร�ิจใหม่"
+
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_ภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
-msgstr "สร้างงานใหม่"
+msgstr "สร้างภาร�ิจใหม่"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
-msgstr "งานที่ได้รับมอบหมายใหม่"
+msgstr "ภาร�ิจที่ได้รับมอบหมายใหม่"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "งานที่ได้รับ_มอบหมาย"
+msgstr "ภาร�ิจที่ได้รับ_มอบหมาย"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
-msgstr "สร้างงานที่ได้รับมอบหมายใหม่"
+msgstr "สร้างภาร�ิจที่ได้รับมอบหมายใหม่"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
-msgstr "ราย�ารงานใหม่"
+msgstr "ราย�ารภาร�ิจใหม่"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "ราย�าร_งาน"
+msgstr "_ราย�ารภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
-msgstr "สร้างราย�ารงานใหม่"
+msgstr "สร้างราย�ารภาร�ิจใหม่"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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 ""
-"ป�ิบัติ�ารนี้จะลบงานทั้งหมดที่มี�ารทำเครื่องหมายไว้ว่าเสร็จ�ล้ว ถ้าคุณต้อง�ารทำต่อไป "
-"จะไม่สามารถเรีย�งานทั้งหมดนั้นคืนมาได้อี�\n"
+"ป�ิบัติ�ารนี้จะลบภาร�ิจทั้งหมดที่มี�ารทำเครื่องหมายไว้ว่าเสร็จ�ล้ว ถ้าคุณทำต่อไป "
+"จะไม่สามารถเรีย�ภาร�ิจทั้งหมดนั้นคืนมาได้อี�\n"
 "\n"
-"คุณต้อง�ารลบงานทั้งหมดนี้จริงๆ หรือไม่?"
+"คุณต้อง�ารลบภาร�ิจทั้งหมดนี้จริงๆ หรือไม่?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ไม่ต้องถามอี�ครั้ง"
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
-msgstr "พิมพ์งาน"
+msgstr "พิมพ์ภาร�ิจ"
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% ความสมบูรณ์"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "ย�เลิ�"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "�ำลังดำเนิน�าร"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "มา��ว่า"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "น้อย�ว่า"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "นัดหมาย�ละ�ารประชุม"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "�ำลังเปิดป�ิทิน"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "�ฟ้ม iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "เครื่องมือนำเข้า iCalendar ของ Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "เตือนความจำ!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "�ฟ้ม vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "เครื่องมือนำเข้า vCalendar ของ Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "เหตุ�ารณ์�บบป�ิทิน"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "เครื่องมือนำเข้าข้อมูลอัจฉริยะสำหรับป�ิทินของ 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 "�อฟริ�า/อาบิดจัน"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�อฟริ�า/อั��รา"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�อฟริ�า/�อดดิสอาบาบา"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�อฟริ�า/�อลเจียร์"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�อฟริ�า/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�อฟริ�า/บามาโ�"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�อฟริ�า/บัง�ี"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�อฟริ�า/บันจูล"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�อฟริ�า/"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "�อฟริ�า/บิสเซา"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�อฟริ�า/บราซซาวิล"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�อฟริ�า/บูจุมบูรา"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�อฟริ�า/ไคโร"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�อฟริ�า/คาซาบลัง�า"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�อฟริ�า/เซวตา"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�อฟริ�า/โ�นา�รี"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�อฟริ�า/ดา�าร์"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "�อฟริ�า/ดาร์-เอส-ซาลาม"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�อฟริ�า/จิบูตี"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "�อฟริ�า/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "�อฟริ�า/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�อฟริ�า/ฟรีทาวน์"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�อฟริ�า/�าโบโรเน"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�อฟริ�า/ฮาราเร"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�อฟริ�า/โจฮันเนสเบิร์�"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�อฟริ�า/�ัมปาลา"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�อฟริ�า/คาร์ทูม"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�อฟริ�า/คิ�าลี"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�อฟริ�า/�ินชาซา"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�อฟริ�า/ลา�อส"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�อฟริ�า/ลีเบรอวิล"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�อฟริ�า/โลเม"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�อฟริ�า/ลูอันดา"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "�อฟริ�า/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�อฟริ�า/ลูซา�า"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�อฟริ�า/มาลาโบ"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�อฟริ�า/มาปูโต"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�อฟริ�า/มาเซรู"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�อฟริ�า/อัมบาบาเน"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "�อฟริ�า/โม�าดิชู"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�อฟริ�า/มันโรเวีย"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�อฟริ�า/ไนโรบี"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�อฟริ�า/เอ็นจาเมนา"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�อฟริ�า/นีอาเม"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�อฟริ�า/นู�อ�ชอต"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�อฟริ�า/วา�าดู�ู"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�อฟริ�า/ปอร์โต-โนโว"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "�อฟริ�า/เซา_โตเม"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�อฟริ�า/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�อฟริ�า/ตริโปลี"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�อฟริ�า/ตูนิส"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�อฟริ�า/วินด์ฮุ�"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "อเมริ�า/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "อเมริ�า/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "อเมริ�า/�อง�วิลลา"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "อเมริ�า/�อนติ�า"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "อเมริ�า/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "อเมริ�า/อารูบา"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "อเมริ�า/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "อเมริ�า/บาร์เบโดส"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "อเมริ�า/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "อเมริ�า/เบลีซ"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "อเมริ�า/บัววีชตา"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "อเมริ�า/โบโ�ตา"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "อเมริ�า/บอยซี"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "อเมริ�า/บัวโนสไอเรส"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "อเมริ�า/เคมบริดจ์_เบย์"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "อเมริ�า/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "อเมริ�า/�ารา�ัส"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "อเมริ�า/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "อเมริ�า/�า�ยน"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "อเมริ�า/เคย์�มน"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "อเมริ�า/ชิคาโ�"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "อเมริ�า/ชีวาวา"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "อเมริ�า/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "อเมริ�า/คอสตาริ�า"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "อเมริ�า/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "อเมริ�า/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "อเมริ�า/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "อเมริ�า/ดอว์สัน"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "อเมริ�า/ดอว์สัน_ครี�"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "อเมริ�า/เดนเวอร์"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "อเมริ�า/ดีทรอยต์"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "อเมริ�า/โดมินิ�า"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "อเมริ�า/เอดมันตัน"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "อเมริ�า/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "อเมริ�า/เอลซัลวาดอร์"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "อเมริ�า/ฟอร์ตาเลซา"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "อเมริ�า/เ�ลซ_เบย์"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "อเมริ�า/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "อเมริ�า/�ูส_เบย์"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "อเมริ�า/��รนด์เติร์�"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "อเมริ�า/เ�รเนดา"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "อเมริ�า/�วาเดอลูป"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "อเมริ�า/�ัวเตมาลา"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "อเมริ�า/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "อเมริ�า/�ายอานา"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "อเมริ�า/�ฮลิ�ฟ�ซ์"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "อเมริ�า/ฮาวานา"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "อเมริ�า/เอร์โมซีโย"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "อเมริ�า/อินดี�อนา/อินเดีย�นโพลิส"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "อเมริ�า/อินดี�อนา/น็อ�ซ์"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "อเมริ�า/อินดี�อนา/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "อเมริ�า/อินดี�อนา/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "อเมริ�า/อินเดีย�นโพลิส"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "อเมริ�า/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "อเมริ�า/อี�วาลิต"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "อเมริ�า/จาเม�า"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "อเมริ�า/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "อเมริ�า/จูโน"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "อเมริ�า/เคนทั��ี/ลุยส์วิลล์"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "อเมริ�า/เคนทั��ี/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "อเมริ�า/ลาปาซ"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "อเมริ�า/ลิมา"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "อเมริ�า/ลอส_�องเจลีส"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "อเมริ�า/ลุยส์วิลล์"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "อเมริ�า/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "อเมริ�า/มานา�ัว"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "อเมริ�า/มาเนาส์"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "อเมริ�า/มาร์ตินี�"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "อเมริ�า/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "อเมริ�า/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "อเมริ�า/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "อเมริ�า/เมรีดา"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "อเมริ�า/เม็�ซิโ�ซิตี"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "อเมริ�า/มีเ�อลง"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "อเมริ�า/มอนเตร์เรย์"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "อเมริ�า/มอนเตวิเดโอ"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "อเมริ�า/มอนทรีออล"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "อเมริ�า/มอนต์เซอร์รัต"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "อเมริ�า/�นสซอ"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "อเมริ�า/นิวยอร์�"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "อเมริ�า/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "อเมริ�า/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "อเมริ�า/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "อเมริ�า/นอร์ทดาโคตา/เซ็นเตอร์"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "อเมริ�า/ปานามา"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "อเมริ�า/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "อเมริ�า/ปารามาริโบ"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "อเมริ�า/ฟินิ�ซ์"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "อเมริ�า/ปอร์โต�ปรงซ์"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "อเมริ�า/พอร์ต-ออฟ-สเปน"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "อเมริ�า/ปอร์ตูเวลโย"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "อเมริ�า/เปอร์โตริโ�"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "อเมริ�า/เรนนี_ริเวอร์"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "อเมริ�า/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "อเมริ�า/เรซีเฟ"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "อเมริ�า/ริไจนา"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "อเมริ�า/รีโอบรังโ�"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "อเมริ�า/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "อเมริ�า/ซันติอาโ�"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "อเมริ�า/ซันโตโดมิงโ�"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "อเมริ�า/เซาเปาลู"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "อเมริ�า/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "อเมริ�า/ชิปร็อ�"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "อเมริ�า/เซนต์จอห์นส์"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "อเมริ�า/เซนต์คิตส์"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "อเมริ�า/เซนต์ลูเซีย"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "อเมริ�า/เซนต์โทมัส"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "อเมริ�า/เซนต์วินเซนต์"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "อเมริ�า/สวิฟต์_เคอร์เรนต์"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "อเมริ�า/เต�ูซิ�ัลปา"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "อเมริ�า/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "อเมริ�า/ธันเดอร์_เบย์"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "อเมริ�า/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "อเมริ�า/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "อเมริ�า/�วนคูเวอร์"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "อเมริ�า/ไวต์ฮอร์ส"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "อเมริ�า/วินนิเพ�"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "อเมริ�า/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "อเมริ�า/เยลโลว์ไนฟ์"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "�อนตาร์�ติ�า/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "�อนตาร์�ติ�า/เดวิส"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "�อนตาร์�ติ�า/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "�อนตาร์�ติ�า/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "�อนตาร์�ติ�า/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "�อนตาร์�ติ�า/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "�อนตาร์�ติ�า/ขั้วโล�ใต้"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "�อนตาร์�ติ�า/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "�อนตาร์�ติ�า/วอสต็อ�"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "อาร์�ติ�/ลองเยียร์เบียน"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "เอเชีย/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "เอเชีย/อัลมาตี"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "เอเชีย/อัมมาน"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "เอเชีย/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "เอเชีย/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "เอเชีย/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "เอเชีย/อาช�าบัต"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "เอเชีย/�บ��ดด"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "เอเชีย/บาห์เรน"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "เอเชีย/บา�ู"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "เอเชีย/�รุงเทพฯ"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "เอเชีย/เบรุต"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "เอเชีย/บิชเค�"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "เอเชีย/บรูไน"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "เอเชีย/�ัล�ัตตา"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "เอเชีย/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "เอเชีย/ฉงชิ่ง"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "เอเชีย/โคลัมโบ"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "เอเชีย/ดามัส�ัส"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "เอเชีย/ธา�า"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "เอเชีย/ดิลี"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "เอเชีย/ดูไบ"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "เอเชีย/ดูชานเบ"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "เอเชีย/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "เอเชีย/ฮาร์บิน"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "เอเชีย/ฮ่อง�ง"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "เอเชีย/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "เอเชีย/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "เอเชีย/อิสตันบูล"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "เอเชีย/จา�าร์ตา"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "เอเชีย/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "เอเชีย/เยรูซาเล็ม"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "เอเชีย/คาบูล"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "เอเชีย/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "เอเชีย/�าราจี"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "เอเชีย/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "เอเชีย/�า�มาณฑุ"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "เอเชีย/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "เอเชีย/�ัวลาลัมเปอร์"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "เอเชีย/�ูชิง"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "เอเชีย/คูเวต"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "เอเชีย/มาเ�๊า"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "เอเชีย/มาเ�๊า"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "เอเชีย/มา�าดาน"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "เอเชีย/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "เอเชีย/มะนิลา"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "เอเชีย/มัส�ัต"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "เอเชีย/นิโคเซีย"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "เอเชีย/โนโวสิเบียรส�์"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "เอเชีย/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "เอเชีย/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "เอเชีย/พนมเป�"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "เอเชีย/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "เอเชีย/เปียงยาง"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "เอเชีย/�าตาร์"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "เอเชีย/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "เอเชีย/ร่าง�ุ้ง"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "เอเชีย/ริยาด"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "เอเชีย/ไซ่ง่อน"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "เอเชีย/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "เอเชีย/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "เอเชีย/โซล"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "เอเชีย/เซี่ยงไฮ้"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "เอเชีย/สิงคโปร์"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "เอเชีย/ไทเป"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "เอเชีย/ทาชเคนต์"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "เอเชีย/ทบิลิซี"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "เอเชีย/เตหะราน"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "เอเชีย/ทิมพู"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "เอเชีย/โตเ�ียว"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "เอเชีย/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "เอเชีย/อูลานบาตอร์"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "เอเชีย/อุรุมชี"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "เอเชีย/เวียงจันทน์"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "เอเชีย/วลาดีวอสต็อ�"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "เอเชีย/ยาคุตสค์"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "เอเชีย/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "เอเชีย/เยเรวาน"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "�อต�ลนติ�/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "�อต�ลนติ�/เบอร์มิวดา"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "�อต�ลนติ�/Canary"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "�อต�ลนติ�/เคปเวิร์ด"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "�อต�ลนติ�/�ฟโร"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "�อต�ลนติ�/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "�อต�ลนติ�/มาเดรา"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "�อต�ลนติ�/เรคยาวิ�"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "�อต�ลนติ�/เซาท์จอร์เจีย"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "�อต�ลนติ�/เซนต์เฮเลนา"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "�อต�ลนติ�/ส�ตนลีย์"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "ออสเตรเลีย/�อดิเลด"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "ออสเตรเลีย/บริสเบน"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "ออสเตรเลีย/โบรเคน_ฮิลล์"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "ออสเตรเลีย/ดาร์วิน"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "ออสเตรเลีย/โฮบาร์ต"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "ออสเตรเลีย/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "ออสเตรเลีย/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "ออสเตรเลีย/เมลเบิร์น"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "ออสเตรเลีย/เพิร์ท"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "ออสเตรเลีย/ซิดนีย์"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "ยุโรป/อัมสเตอร์ดัม"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "ยุโรป/อันดอร์รา"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "ยุโรป/เอเธนส์"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "ยุโรป/เบลฟัสต์"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "ยุโรป/เบลเ�รด"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "ยุโรป/เบอร์ลิน"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "ยุโรป/บราติสลาวา"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "ยุโรป/บรัสเซลส์"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "ยุโรป/บูคาเรสต์"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "ยุโรป/บูดาเปสต์"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "ยุโรป/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "ยุโรป/โคเปนเฮเ�น"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "ยุโรป/ดับลิน"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "ยุโรป/ยิบรอลตาร์"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "ยุโรป/เฮลซิง�ิ"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "ยุโรป/อิสตันบูล"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "ยุโรป/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "ยุโรป/เคียฟ"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "ยุโรป/ลิสบอน"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "ยุโรป/ลูบลิยานา"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "ยุโรป/ลอนดอน"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "ยุโรป/ลั�เซมเบิร์�"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "ยุโรป/มาดริด"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "ยุโรป/มอลตา"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "ยุโรป/มินส�์"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "ยุโรป/โมนาโ�"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "ยุโรป/มอสโ�"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "ยุโรป/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "ยุโรป/ออสโล"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "ยุโรป/ปารีส"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "ยุโรป/ปรา�"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "ยุโรป/ริ�า"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "ยุโรป/โรม"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "ยุโรป/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "ยุโรป/ซานมารีโน"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "ยุโรป/ซาราเยโว"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "ยุโรป/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "ยุโรป/สโ�เปีย"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "ยุโรป/โซเฟีย"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "ยุโรป/สตอ�โฮล์ม"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "ยุโรป/ทาลลินน์"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "ยุโรป/ติรานา"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "ยุโรป/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "ยุโรป/วาดุซ"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "ยุโรป/วาติ�ัน"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "ยุโรป/เวียนนา"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "ยุโรป/วิลนีอุส"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "ยุโรป/วอร์ซอ"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "ยุโรป/ซาเ�ร็บ"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "ยุโรป/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "ยุโรป/ซูริ�"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "มหาสมุทรอินเดีย/อันตานานาริโว"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "มหาสมุทรอินเดีย/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "มหาสมุทรอินเดีย/คริสต์มาส"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "มหาสมุทรอินเดีย/โคโคส"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "มหาสมุทรอินเดีย/คอโมโรส"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "มหาสมุทรอินเดีย/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "มหาสมุทรอินเดีย/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "มหาสมุทรอินเดีย/มัลดีฟส์"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "มหาสมุทรอินเดีย/มอริเชียส"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "มหาสมุทรอินเดีย/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "มหาสมุทรอินเดีย/เรอูนียง"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "�ปซิฟิ�/อาปีอา"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "�ปซิฟิ�/โอ๊ค�ลนด์"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "�ปซิฟิ�/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "�ปซิฟิ�/อีสเตอร์"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "�ปซิฟิ�/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "�ปซิฟิ�/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "�ปซิฟิ�/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "�ปซิฟิ�/ฟิจิ"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "�ปซิฟิ�/ฟูนะฟูตี"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "�ปซิฟิ�/�าลาปา�อส"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "�ปซิฟิ�/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "�ปซิฟิ�/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "�ปซิฟิ�/�วม"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "�ปซิฟิ�/โฮโนลูลู"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "�ปซิฟิ�/จอห์นส์ตัน"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "�ปซิฟิ�/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "�ปซิฟิ�/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "�ปซิฟิ�/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "�ปซิฟิ�/มาจูโร"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "�ปซิฟิ�/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "�ปซิฟิ�/มิดเวย์"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "�ปซิฟิ�/นาอูรู"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "�ปซิฟิ�/นีอูเอ"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "�ปซิฟิ�/นอร์ฟอล์�"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "�ปซิฟิ�/นูเมอา"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "�ปซิฟิ�/ปาโ�ปาโ�"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "�ปซิฟิ�/ปาเลา"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "�ปซิฟิ�/พิต�คร์น"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "�ปซิฟิ�/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "�ปซิฟิ�/พอร์ต_มอร์สบี"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "�ปซิฟิ�/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "�ปซิฟิ�/ไซปัน"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "�ปซิฟิ�/ตาฮิติ"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "�ปซิฟิ�/ตาระวา"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "�ปซิฟิ�/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "�ปซิฟิ�/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "�ปซิฟิ�/เว�"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "�ปซิฟิ�/วาลลิส"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "�ปซิฟิ�/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "คลิ�ที่นี่ถ้าต้อง�ารสมุดที่อยู่"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "ไม่สามารถเปิด�ฟ้มบันทึ�อัตโนมัติ"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "ที่ที่จะ�ปะประ�าศ"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "ไม่สามารถดึงข้อความจา�เครื่องมือ��้ไข"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "เลือ�โฟลเดอร์ที่จะ�ปะประ�าศข้อความ"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "�ทร�เอ�สาร�นบ"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "คลิ�ที่นี่เพื่อเลือ�โฟลเดอร์ที่จะประ�าศ"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "�_นบ"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "ลายเซ็_น:"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "จดหมายไม่มีชื่อเรื่อง"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "�นบ�ฟ้ม"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "ปิ_ด"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "ปิด�ฟ้มปัจจุบัน"
+
+#: ../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 "_พิมพ์..."
+
+#: ../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 "ตัวอ_ย่าง�่อนพิมพ์"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "บันทึ��ฟ้มปัจจุบัน"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "บันทึ�เ_ป็น..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "บันทึ��ฟ้มปัจจุบันในชื่ออื่น"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "บันทึ�ฉบับ_ร่าง"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "บันทึ�เป็นฉบับร่าง"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "_ส่ง"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "ส่งข้อความนี้"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "�ทร�ตัวเลือ�ของ�ารส่ง"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "_ข้อความใหม่"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "เปิดหน้าต่างข้อความใหม่"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "รหัส_อั�ขระ"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "_ระบบรั�ษาความปลอดภัย"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "เ_ข้ารหัส PGP"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "เข้ารหัสข้อความนี้ด้วย PGP"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "เ_ซ็น PGP"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "เซ็น�ำ�ับข้อความนี้ด้วย�ุ��จ PGP ของคุณ"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "จัด_ลำดับความสำคั�ของข้อความ"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "�ำหนดลำดับความสำคั�ของข้อความเป็นสำคั�สูง"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "ร้อง_ขอ�าร�จ้งรับข้อความ"
+
+#: ../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 "เข้า_รหัส S/MIME"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "เข้ารหัสข้อความนี้ด้วย�ารตรวจสอบ�ารเข้ารหัส S/MIME ของคุณ"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "เซ็_น S/MIME"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "เซ็น�ำ�ับข้อความนี้ด้วยใบรับรองลายเซ็น S/MIME ของคุณ"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "ช่องสำเนา_ลับถึง"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "ซ่อน/�สดงช่อง สำเนาลับถึง (BCC)"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "ช่อง_สำเนาถึง"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "ซ่อน/�สดงช่อง สำเนาถึง (CC)"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "ช่อง_จา�"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "ซ่อน/�สดงตัวเลือ�ผู้ส่ง"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "ช่อง_ประ�าศที่"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "ซ่อน/�สดงช่อง ประ�าศที่ (Post-To)"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "ช่อง_ที่อยู่ตอบ�ลับ"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "ซ่อน/�สดงช่อง ที่อยู่ตอบ�ลับ (Reply-To)"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "ช่องชื่อเ_รื่อง"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "ซ่อน/�สดงช่องข้อมูลชื่อเรื่อง"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "ช่อง_ถึง"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "ซ่อน/�สดงช่อง ถึง (To)"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "ป้อนชื่อผู้รับจดหมาย"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "ป้อนที่อยู่ที่จะส่งสำเนาจดหมาย"
+
+#: ../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 "ป้อนที่อยู่ที่จะส่งสำเนาจดหมายโดยไม่�สดงในรายชื่อผู้รับของจดหมายนั้น"
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "_จา�:"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "_ที่อยู่ตอบ�ลับ:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "_ถึง:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "ป้อนชื่อผู้รับจดหมาย"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "_สำเนาถึง:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "ป้อนที่อยู่ที่จะส่งสำเนาจดหมาย"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "สำเนา_ลับถึง:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr "ป้อนที่อยู่ที่จะส่งสำเนาจดหมาย โดยไม่�สดงในรายชื่อผู้รับจดหมายของจดหมายนั้น"
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_ประ�าศที่:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "เ_รื่อง:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "�_นบ"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "ลายเซ็_น:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "�ทร�เอ�สาร�นบ"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "คลิ�ที่นี่ถ้าต้อง�ารสมุดที่อยู่"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "ที่ที่จะ�ปะประ�าศ"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "เลือ�โฟลเดอร์ที่จะ�ปะประ�าศข้อความ"
+
+#: ../composer/e-composer-post-header.c:172
+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
+msgid "Show _Attachment Bar"
+msgstr "�สดง�_ถบเอ�สาร�นบ"
+
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ไม่สามารถเซ็น�ำ�ับข้อความขาออ�: ไม่ได้�ำหนดใบรับรอง�ารเซ็น�ำ�ับสำหรับบั�ชีนี้"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ไม่สามารถเข้ารหัสลับข้อความขาออ�: ไม่ได้�ำหนดใบรับรอง�ารเข้ารหัสลับสำหรับบั�ชีนี้"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "เอ�สาร�นบ"
+msgstr[1] "เอ�สาร�นบ"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "ซ่อน�_ถบเอ�สาร�นบ"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3881
-msgid "Show _Attachment Bar"
-msgstr "�สดง�_ถบเอ�สาร�นบ"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "ไม่ทราบสาเหตุ"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "ไม่สามารถเปิด�ฟ้ม"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "ไม่สามารถดึงข้อความจา�เครื่องมือ��้ไข"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "จดหมายไม่มีชื่อเรื่อง"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "เปิด�ฟ้ม"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
-#: ../composer/e-msg-composer.c:3764
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "เขียนจดหมาย"
 
-#: ../composer/e-msg-composer.c:5034
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10179,8 +10799,7 @@ msgstr "คุณ�น่ใจหรือไม่ว่าจะทิ้ง
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "เนื่องจา� &quot;{0}&quot; คุณอาจต้องเลือ�ตัวเลือ�เมลอย่างอื่น"
 
-#: ../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 "เนื่องจา� &quot;{1}&quot;"
 
@@ -10292,23 +10911,27 @@ msgstr "คุณไม่สามารถà¹�นบà¹�ฟ้ม `{0}' ไปà¸
 msgid "You need to configure an account before you can compose mail."
 msgstr "คุณจะต้อง�ำหนดค่าบั�ชีผู้ใช้�่อนที่คุณจะสามารถเขียนเมลได้"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "��้ไข_ต่อไป"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "ไ_ม่เรีย�คืน"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:310
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "เ_รีย�คืน"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_บันทึ�ข้อความ"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_บันทึ�ฉบับร่าง"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "เมล�ละป�ิทินของ 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:738
 msgid "Groupware Suite"
 msgstr "ชุด�รุ๊ป�วร์"
 
@@ -10324,56 +10947,79 @@ msgstr "นามบัตรที่อยู่"
 msgid "calendar information"
 msgstr "ข้อมูลป�ิทิน"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "ข้อผิดพลาดใน Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "คำเตือนของ Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "ข้อมูล Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "คำถามจา� Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ข้อผิดพลาดภายในไม่ทราบสาเหตุ ขณะมี�ารร้องขอ '%s'"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "องค์ประ�อบ"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "ชื่อขององค์ประ�อบที่�ำลังบันทึ�ปูม"
+
+#: ../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
+msgid "Enabled"
+msgstr "เปิดใช้งาน"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "ระบุว่าปลั๊�อินเปิดใช้งานอยู่หรือไม่"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "เ�ิดข้อผิดพลาดขณะสั่งพิมพ์"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "ระบบ�ารพิมพ์รายงานรายละเอียดเ�ี่ยว�ับข้อผิดพลาดดังนี้:"
 
-#: ../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 "ระบบ�ารพิมพ์ไม่ได้รายงานรายละเอียดเพิ่มเติมเ�ี่ยว�ับข้อผิดพลาด"
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "เนื่องจา� \"{1}\""
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "ไม่สามารถเปิด�ฟ้ม &quot;{0}&quot;"
+msgid "Cannot open file \"{0}\"."
+msgstr "ไม่สามารถเปิด�ฟ้ม \"{0}\""
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "ไม่สามารถบันทึ��ฟ้ม &quot;{0}&quot;"
+msgid "Cannot save file \"{0}\"."
+msgstr "ไม่สามารถบันทึ��ฟ้ม \"{0}\""
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "คุณต้อง�ารเขียนทับใช่หรือไม่?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "มี�ฟ้ม &quot;{0}&quot; อยู่�่อน�ล้ว"
+msgid "File exists \"{0}\"."
+msgstr "มี�ฟ้ม \"{0}\" อยู่�่อน�ล้ว"
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10383,49 +11029,64 @@ msgstr "เขียนทับ�ฟ้มหรือไม่?"
 msgid "_Overwrite"
 msgstr "เ_ขียนทับ"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "ไม่สามารถ�สดงวิธีใช้สำหรับ Evolution"
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_สำคั�"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_งาน"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "ส่วน_บุคคล"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "จะ_ทำ"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "ไว้ทีห_ลัง"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "ป้าย_ชื่อ:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "��้ไขป้ายชื่อ"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "เพิ่มป้ายชื่อ"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "ป้ายชื่อว่างเปล่าไม่ได้"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-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
+#, c-format
+msgid "GConf error: %s"
+msgstr "ข้อผิดพลาดใน GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "รายละเอียดข้อผิดพลาดอื่นๆ อยู่ในเทอร์มินัลเท่านั้น"
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10543,65 +11204,65 @@ msgstr "%d-%b-%Ey"
 msgid "Select a time to compare against"
 msgstr "เลือ�เวลาที่จะใช้เป็นค่าเปรียบเทียบ"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "เลือ��ฟ้ม"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "ทดสอบ"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "ชื่อ_�ฎ:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "หาราย�ารที่สอดคล้อง�ับเงื่อนไขต่อไปนี้"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "เ_พิ่ม�ฎ�าร�รอง"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "ถ้าตรงทุ�เงื่อนไข"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "ถ้าตรงเงื่อนไขใดเงื่อนไขหนึ่ง"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_หาราย�าร:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "ทั้งหมดที่เ�ี่ยวข้อง"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "ตอบ"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "ตอบ�ละต้นเรื่อง"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "ไม่มีข้อความตอบหรือต้นเรื่อง"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "_รวม�ระทู้ด้วย"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "เข้า"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "ออ�"
 
@@ -10625,7 +11286,7 @@ msgstr "ไม่มีวันที่"
 msgid "Missing file name."
 msgstr "ไม่มีชื่อ�ฟ้ม"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "ไม่มีชื่อ"
 
@@ -10701,7 +11362,7 @@ msgstr "ข้างหน้า"
 msgid "months"
 msgstr "เดือน"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "วินาที"
 
@@ -10713,9 +11374,10 @@ msgstr "เวลาปัจจุบัน"
 msgid "the time you specify"
 msgstr "เวลาที่คุณระบุ"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "สัปดาห์"
 
@@ -10731,7 +11393,7 @@ msgstr "เพิ่ม�ฎ"
 msgid "Edit Rule"
 msgstr "��้ไข�ฎ"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "ชื่อ�ฎ"
 
@@ -10753,57 +11415,69 @@ msgid "Configure your email accounts here"
 msgstr "ตั้งค่าบั�ชีอีเมลของคุณที่นี่"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "ตั้งค่า�ารเชื่อมต่อเครือข่ายของคุณที่นี่"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "เมล 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 "เครื่องมือควบคุม�ารตั้งค่าบั�ชีเมลของ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "องค์ประ�อบเมลของ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "เครื่องมือเขียนเมลของ 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 "เครื่องมือควบคุม�ารตั้งค่าเครื่องมือเขียนเมลของ Evolution"
+msgstr "เครื่องมือควบคุมค่าตั้งเครื่องมือเขียนเมลของ 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 "เครื่องมือควบคุม�ารปรับ�ต่งเมลของ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
-#: ../mail/mail-component.c:737
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "เมล"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "บั�ชีเมล"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "ปรับ�ต่งระบบเมล"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "ปรับ�ต่งเครือข่าย"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "เ_มล"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "ข้อต�ลง�ารใช้สิทธิ์ %s "
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10816,115 +11490,109 @@ msgstr ""
 "สำหรับ %s ที่�สดงด้านล่างนี้\n"
 "�ละทำเครื่องหมายที่�ล่อง�าเครื่องหมายเพื่อ�สดง�ารยอมรับ\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "เลือ�โฟลเดอร์"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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
 msgid "Autogenerated"
 msgstr "สร้างโดยอัตโนมัติ"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "ถามสำหรับ�ต่ละข้อความ"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "ข้อมูลบุคคล"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "�ารรับอีเมล"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "_ตรวจเมลใหม่ทุ� ๆ"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "นา_ที"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "�ารส่งอีเมล"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
-msgstr "ค่าป�ติ"
+msgstr "ค่าปริยาย"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "�ารรั�ษาความปลอดภัย"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "ตัวเลือ��ารรับเมล"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "�ารตรวจสอบข้อความใหม่"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "หน้าต่าง��้ไขบั�ชี"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "เครื่องมือช่วยตั้งค่าบั�ชี Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[บั�ชีหลั�]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "เปิดใช้งาน"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "ชื่อบั�ชี"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "โพรโทคอล"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "ไม่มีชื่อ"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "ภาษา"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "เพิ่มสคริปต์สำหรับลายเซ็น"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "ลายเซ็น"
 
-#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ข้อความส่งต่อ --------"
 
-#: ../mail/em-composer-utils.c:1702
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "ผู้ส่งที่ไม่รู้จั�"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1749
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10932,11 +11600,11 @@ msgstr ""
 "เมื่อ ${AbbrevWeekdayName} ${Year}-${Month}-${Day} เวลา ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} เขียนว่า:"
 
-#: ../mail/em-composer-utils.c:1890
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- ข้อความเดิม --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_�ฎ�าร�รอง"
 
@@ -10953,10 +11621,6 @@ msgstr "�ต้มสี"
 msgid "Assign Score"
 msgstr "ให้คะ�นน"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "เอ�สาร�นบ"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -10973,10 +11637,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "เสร็จเมื่อ"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "มีคำว่า"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "คัดลอ�ไปยังโฟลเดอร์"
@@ -10990,7 +11650,7 @@ msgid "Date sent"
 msgstr "วันส่ง"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11001,10 +11661,6 @@ msgstr "ลบ"
 msgid "Deleted"
 msgstr "ลบไป�ล้ว"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ไม่มีคำว่า"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ไม่ได้ลงท้ายด้วย"
@@ -11025,10 +11681,6 @@ msgstr "ไม่ได้ออ�เสียงคล้าย�ับ"
 msgid "does not start with"
 msgstr "ไม่ได้เริ่มด้วย"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "ไม่มี"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "จดหมายร่าง"
@@ -11037,10 +11689,6 @@ msgstr "จดหมายร่าง"
 msgid "ends with"
 msgstr "ลงท้ายด้วย"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "มี"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "มีอยู่"
@@ -11053,14 +11701,10 @@ msgstr "นิพจน์"
 msgid "Follow Up"
 msgstr "�ารตาม�ระทู้"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "สำคั�"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "คือ"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "หลัง"
@@ -11073,18 +11717,6 @@ msgstr "�่อน"
 msgid "is Flagged"
 msgstr "ปั�ธงไว้"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "มา��ว่า"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "น้อย�ว่า"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ไม่ใช่"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ไม่ได้ปั�ธงไว้"
@@ -11097,7 +11729,7 @@ msgstr "ไม่ถู�เลือ�ไว้"
 msgid "is set"
 msgstr "ถู�เลือ�ไว้"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "เมลขยะ"
@@ -11106,7 +11738,7 @@ msgstr "เมลขยะ"
 msgid "Junk Test"
 msgstr "ทดสอบเมลขยะ"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "ป้าย"
 
@@ -11146,152 +11778,150 @@ msgstr "ส่งให้โปร��รม"
 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "อ่าน�ล้ว"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ผู้รับ"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "ค้นด้วย Regex"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "ตอบไป�ล้ว"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "คืนค่า"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "คืนค่ามา��ว่า"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "คืนค่าน้อย�ว่า"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "เรีย�โปร��รม"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "คะ�นน"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ผู้ส่ง"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:62
 msgid "Set Label"
 msgstr "�ำหนดป้ายชื่อ"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Status"
 msgstr "�ำหนดสถานะ"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:64
 msgid "Size (kB)"
 msgstr "ขนาด (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:65
 msgid "sounds like"
 msgstr "ออ�เสียงคล้าย�ับ"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:66
 msgid "Source Account"
 msgstr "บั�ชีต้นทาง"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:67
 msgid "Specific header"
 msgstr "ข้อมูลส่วนหัว"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:68
 msgid "starts with"
 msgstr "เริ่มด้วย"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:70
 msgid "Stop Processing"
 msgstr "หยุดประมวลผลต่อ"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1696
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:71 ../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
 msgid "Subject"
 msgstr "เรื่อง"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:72
 msgid "Unset Status"
 msgstr "ย�เลิ�สถานะ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "�ล้ว"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "เพิ่ม�าร_�ระทำ"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "_สร้างโฟลเดอร์ค้นหาจา��ารค้นหา..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "ทุ�ข้อความ"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "ข้อความที่ยังไม่ได้อ่าน"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "ไม่มีป้าย"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "ข้อความที่อ่าน�ล้ว"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "ข้อความล่าสุด"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "ข้อความภายใน 5 วัน�่อน"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "ข้อความที่มีเอ�สาร�นบ"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "ข้อความสำคั�"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "ข้อความที่ไม่ใช่เมลขยะ"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "�ารค้นหาบั�ชี"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "�ารค้นหาบั�ชีทั้งหมด"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ข้อความที่ยังไม่ได้อ่าน:"
@@ -11299,31 +11929,51 @@ msgstr[1] "ข้อความที่ยังไม่ได้อ่าน
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ข้อความทั้งหมด:"
 msgstr[1] "ข้อความทั้งหมด:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "�ารใช้โควต้า (%s):"
+
+#: ../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:160
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "จดหมายเข้า"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "คุณสมบัติโฟลเดอร์"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<คลิ�ที่นี่เพื่อเลือ�โฟลเดอร์>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_สร้าง"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "ชื่อโ_ฟลเดอร์:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "โฟลเดอร์ค้นหา"
 
@@ -11332,27 +11982,19 @@ msgstr "โฟลเดอร์ค้นหา"
 msgid "UNMATCHED"
 msgstr "ไม่ตรง"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "จดหมายร่าง"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "จดหมายเข้า"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "จดหมายออ�"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "ส่ง�ล้ว"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "�ำลังโหลด..."
 
@@ -11371,383 +12013,373 @@ msgstr "�ำลังโหลด..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "ลำดับชั้นโฟลเดอร์เมล"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "�ำลังย้ายโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "�ำลังคัดลอ�โฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1971
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "�ำลังย้ายข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1973
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "�ำลังคัดลอ�ข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ไม่สามารถวางข้อความลงใน�หล่งเ�็บระดับบนสุดได้"
 
-#: ../mail/em-folder-tree.c:1011 ../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 "_คัดลอ�ไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:1012 ../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 "_ย้ายไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "�ำลังตรวจโฟลเดอร์ต่างๆ ใน \"%s\""
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_มุมมอง"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "เ_ปิดในหน้าต่างใหม่"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "โ_ฟลเดอร์ใหม่..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_ย้าย..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "เปลี่ยน_ชื่อ..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "ปรับ�_สดง"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "_จัดส่งจดหมายออ�"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "เ_ทขยะ"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "�ำลังคัดลอ� `%s' ไปยัง `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
-#: ../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:83
 msgid "Select folder"
 msgstr "เลือ�โฟลเดอร์"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_คัดลอ�"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "�ำลังสร้างโฟลเดอร์ `%s'"
 
-#: ../mail/em-folder-utils.c:745
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:743
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "สร้างโฟลเดอร์"
 
-#: ../mail/em-folder-utils.c:745
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:743
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ระบุที่ที่จะสร้างโฟลเดอร์"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ลบเมลไม่สำเร็จ"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "คุณไม่มีสิทธิ์เพียงพอที่จะลบเมลนี้"
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_ตอบ�ลับผู้ส่ง"
 
-#: ../mail/em-folder-view.c:1336 ../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 "ส่ง_ต่อ"
 
 #. 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:1340 ../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 "�_�้ไขเป็นข้อความใหม่..."
 
-#: ../mail/em-folder-view.c:1342
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_พิมพ์..."
-
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ไ_ม่ลบ"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_ย้ายไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_คัดลอ�ไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "ทำเครื่องหมาย_อ่าน�ล้ว"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "ทำเครื่องหมายว่า_ยังไม่อ่าน"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "ทำเครื่องหมายว่า_สำคั�"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "ทำเครื่องหมายว่าไ_ม่สำคั�"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "ทำเครื่องหมายเป็นเมล_ขยะ"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "ทำเครื่องหมายว่าไม่ใช่เม_ลขยะ"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "ทำเครื่องหมายว่าจะ_ตอบ�ระทู้..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "ติด_ป้าย"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "ไ_ม่ทำอะไร"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "ป้ายชื่อใ_หม่"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "ปั�ธ_งว่าเสร็จ�ล้ว"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ล้_างธง"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "สร้าง_�ฎจา�ข้อความ"
 
 #. 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:1373
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "สร้างโฟลเดอร์ค้นหาจา�ชื่อเ_รื่อง..."
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "สร้างโฟลเดอร์ค้นหาจา�ชื่อผู้_ส่ง"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "สร้างโฟลเดอร์ค้นหาจา�ชื่อผู้_รับ"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "สร้างโฟลเดอร์ค้นหาจา�เ_มลลิงลิสต์"
 
 #. 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:1381
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "�รองที่ชื่อเ_รื่อง"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "�รองที่ชื่อผู้_ส่ง"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "�รองที่ชื่อผู้_รับ"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "�รองที่เ_มลลิงลิสต์"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
+#. 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 "ปริยาย"
 
-#: ../mail/em-folder-view.c:2528
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "ดึงข้อความไม่สำเร็จ"
 
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "�ำลังดึงข้อความ..."
 
-#: ../mail/em-folder-view.c:2806
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "เ_รีย�ไป..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "สร้างโฟลเดอร์_ค้นหา"
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_จา�ที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "ไ_ปที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "คลิ�เพื่อส่งเมลไปยัง %s"
 
-#: ../mail/em-folder-view.c:3320
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "คลิ�เพื่อเรีย�ไปยัง %s"
 
-#: ../mail/em-folder-view.c:3325
+#: ../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:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "หาพบ: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_หา:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_�่อนหน้า"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_ถัดไป"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "ตัว_พิมพ์ให�่-เล็�ตรง�ัน"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "ไม่มีลายเซ็น�ำ�ับ"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ข้อความนี้ไม่มีลายเซ็น�ำ�ับ ไม่มีอะไรประ�ันได้เลยว่าข้อความนี้เป็นมาจา�ผู้ส่งจริง"
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "ลายเซ็นถู�ต้อง"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 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:994 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "ลายเซ็นไม่ถู�ต้อง"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ลายเซ็น�ำ�ับข้อความนี้ตรวจสอบ�ล้วไม่ผ่าน เป็นไปได้ว่าข้อความอาจถู���้ไขระหว่างทาง"
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:638
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "ลายเซ็นถู�ต้อง �ต่ไม่สามารถตรวจสอบผู้ส่ง"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 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:996 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "มีลายเซ็น �ต่ไม่มี�ุ��จสาธารณะ"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ข้อความนี้มีลายเซ็น�ำ�ับ �ต่ไม่มี�ุ��จสาธารณะที่จะใช้ตรวจสอบ"
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "ไม่ได้เข้ารหัส"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ข้อความนี้ไม่ได้เข้ารหัส เนื้อหาอาจถู�ดั�อ่านระหว่างทางในอินเทอร์เน็ตได้"
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "เข้ารหัส�บบอ่อน"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11756,21 +12388,21 @@ msgstr ""
 "ข้อความนี้ถู�เข้ารหัส �ต่ใช้อัล�อริทึมเข้ารหัสที่อ่อน บุคคลอื่นอาจดั�อ่านได้ยา��็จริง "
 "�ต่�็ไม่ใช่เป็นไปไม่ได้ โดยใช้เวลาไม่มา�เ�ินไป"
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "เข้ารหัส"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 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:1006 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "เข้ารหัส�บบ�น่นหนา"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11778,94 +12410,89 @@ msgid ""
 msgstr ""
 "ข้อความนี้ถู�เข้ารหัสด้วยอัล�อริทึมเข้ารหัสที่�น่นหนา บุคคลอื่นดั�อ่านเนื้อหาได้ยา�มา� ด้วยเวลาป�ติ"
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_ดูใบรับรอง"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "ใบรับรองนี้เปิดดูไม่ได้"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "เสร็จเมื่อ %d %B %Ey %H:%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "เลย�ำหนด:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ภายใน %d %B %Ey %H:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "�_สดงในบรรทัด"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_ซ่อน"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_พอดีความ�ว้าง"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "�สดงขนาด_จริง"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "เอ�สาร�นบ"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "บันทึ�เอ�สาร�นบเป็น"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "เลือ�โฟลเดอร์ที่จะบันทึ�เอ�สาร�นบทั้งหมด"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_บันทึ�ราย�ารที่เลือ�..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "เอ�สาร�_นบ %d ฉบับ"
 msgstr[1] "เอ�สาร�_นบ %d ฉบับ"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "_บันทึ�"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "บันทึ�ทั้งห_มด"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "ไม่มีเอ�สาร�นบ"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "�สดง�บบไ_ม่จัดรูป�บบ"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "ซ่อน�าร�สดง�บบไ_ม่จัดรูป�บบ"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "เ_ปิดด้วย"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2473
 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 ""
 "Evolution ไม่สามารถ�สดงเมลฉบับนี้ได้ เนื่องจา�มีขนาดให�่เ�ินไป "
@@ -11876,275 +12503,285 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "หน้า %d จา� %d"
 
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "�ำลังดึง `%s'"
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "ข้อความส่วนภายนอ�ที่ไม่รู้จั�"
 
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "ข้อความส่วนภายนอ�ผิดรูป�บบ"
 
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "ตัวชี้ไปยัง�หล่ง FTP (%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 "ตัวชี้ไปยัง�ฟ้มในเครื่อง (%s) ใช้ได้สำหรับเครื่อง \"%s\""
 
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ตัวชี้ไปยัง�ฟ้มในเครื่อง (%s)"
 
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ตัวชี้ไปยังข้อมูลในเครือข่าย (%s)"
 
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ตัวชี้ไปยังข้อมูลภายนอ�ที่ไม่รู้จั� (ชนิด \"%s\")"
 
-#: ../mail/em-format-html.c:1221
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "�ำลังจัดเรียงข้อความ"
 
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "�ำลังจัดเรียงข้อความ..."
 
-#: ../mail/em-format-html.c:1540 ../mail/em-format-html.c:1604
-#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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 "สำเนาถึง"
 
-#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1629 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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 "สำเนาลับถึง"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1700 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "โปร��รมส่งเมล"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1727
+#: ../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:1732
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "วันที่"
-
-#: ../mail/em-format-html.c:1767 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-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:1860
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "ข้อความนี้ถู�ส่งโดย <b>%s</b> ในนามของ <b>%s</b>"
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "จา�"
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 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
+msgid "Date"
+msgstr "วันที่"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "�ลุ่มข่าว"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "เอ�สาร�นบ %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ไม่สามารถ�จงข้อความ S/MIME: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ไม่สามารถ�จงข้อความ MIME จะ�สดงข้อความต้นฉบับ"
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ชนิด�ารเข้ารหัสลับที่ไม่รองรับสำหรับ multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "ไม่สามารถ�จงข้อความ PGP/MIME"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ไม่สามารถ�จงข้อความ PGP/MIME: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "รูป�บบลายเซ็นที่ไม่รองรับ"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "เ�ิดข้อผิดพลาดขณะตรวจสอบลายเซ็น"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "เ�ิดข้อผิดพลาดไม่ทราบสาเหตุขณะตรวจสอบลายเซ็น"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "ไม่สามารถ�จงข้อความ PGP"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "ไม่สามารถ�จงข้อความ PGP: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "ทุ�เวลา"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "หนึ่งครั้งต่อวัน"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "หนึ่งครั้งต่อสัปดาห์"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "หนึ่งครั้งต่อเดือน"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "เพิ่มข้อมูลส่วนหัว�ำหนดเองของขยะ"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "ชื่อข้อมูลส่วนหัว:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "ข้อมูลส่วนหัวมีคำว่า:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "มีคำว่า"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "สี"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "ป้าย"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "มีปลั๊�อิน %s �ละได้ติดตั้งไบนารีไว้�ล้ว"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "ไม่มีปลั๊�อิน %s �รุณาตรวจสอบว่าได้ติดตั้ง�พ�เ�จหรือไม่"
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "ไม่มีปลั๊�อินตรวจขยะ"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "จะทำ"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "ไว้ทีหลัง"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"ตำ�หน่ง�ละโครงสร้างของโฟลเดอร์�ล่องเมลของ Evolution มี�ารเปลี่ยน�ปลงจา�รุ่น 1.x\n"
-"\n"
-"�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ไม่สามารถสร้างโฟลเดอร์ใหม่ `%s': %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ไม่สามารถคัดลอ�โฟลเดอร์ `%s' ไปยัง `%s': %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ไม่สามารถตรวจหา�ล่องเมลที่มีอยู่ที่ `%s': %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"ตำ�หน่ง�ละโครงสร้างของโฟลเดอร์�ล่องเมลของ Evolution มี�ารเปลี่ยน�ปลงจา�รุ่น 1.x\n"
+"\n"
+"�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ไม่สามารถเปิดข้อมูล POP เ�่า `%s' ชนิดเ�็บไว้ที่เซิร์ฟเวอร์: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "ไม่สามารถสร้างไดเร�ทอรีข้อมูล POP3 `%s' ชนิดเ�็บไว้ที่เซิร์ฟเวอร์: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "ไม่สามารถคัดลอ�ข้อมูล POP3 `%s' ชนิดเ�็บไว้ที่เซิร์ฟเวอร์: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ไม่สามารถสร้างที่เ�็บเมลท้องถิ่น `%s': %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"โครงสร้างสรุปของโฟลเดอร์�ล่องเมลของ Evolution เปลี่ยนไปใช้ sqlite ตั้ง�ต่ Evolution "
+"2.24\n"
+"\n"
+"�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "ไม่สามารถสร้างโฟลเดอร์เมลท้องถิ่น `%s': %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12152,123 +12789,138 @@ msgstr ""
 "ไม่สามารถอ่านค่าตั้งจา��ารติดตั้งครั้ง�่อนของ Evolution ไม่มี�ฟ้ม `evolution/config.xmldb' "
 "หรือ�ฟ้มเสียหาย"
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_ตอบไปยังผู้ส่ง"
 
-#: ../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 "ตอบ�ลับเข้า_ลิสต์"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "เ_พิ่มในสมุดที่อยู่"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�หล่งเ�็บนี้ไม่รองรับ�ารบอ�รับ หรือไม่ได้เปิดให้บอ�รับได้"
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "บอ�รับ�ล้ว"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "โฟลเดอร์"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "�รุณาเลือ�เซิร์ฟเวอร์"
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "ไม่ได้เลือ�เซิร์ฟเวอร์"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "ไ_ม่ต้อง�สดงข้อความนี้อี�"
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "ตัว�รองข้อความ"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "ข้อความ"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "บันทึ�ข้อความ..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "เพิ่มที่อยู่"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "ข้อความจา� %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "โ_ฟลเดอร์ค้นหา"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "�หล่งสำหรับโฟลเดอร์ค้นหา"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "ความสูงของหน้าต่าง \"รับ�ละส่งเมล\""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "สถานะ�ารขยายเต็มของหน้าต่าง \"รับ�ละส่งเมล\""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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 �สดงบางส่วนของข้อความในขนาดจำ�ัดได้"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "ร้องขอให้ส่ง�าร�จ้งรับข้อความเสมอ"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../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:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "ตรวจรู้หน้า�สดงอารมณ์์โดยอัตโนมัติ"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "ตรวจรู้ลิง�์โดยอัตโนมัติ"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "ตรวจสอบจดหมายเข้าว่าเป็นเมลขยะหรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "สีเน้น�ารอ้างคำพูด"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "สีสำหรับเน้น�ารอ้างคำพูด"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "ความสูงปริยายของหน้าต่างเขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "ความ�ว้างปริยายของหน้าต่างเขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "ไดเร�ทอรีสำหรับอ่าน/�นบเอ�สารสำหรับเครื่องมือเขียนข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "จำ�ัด�าร�สดงราย�ารที่อยู่ในช่อง ถึง/สำเนาถึง/สำเนาลับถึง"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12276,78 +12928,103 @@ msgstr ""
 "จำ�ัด�าร�สดงราย�ารที่อยู่ในช่อง ถึง/สำเนาถึง/สำเนาลับถึง ไม่ให้เ�ินจำนวนที่ระบุใน "
 "address_count"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 ""
+"�ำหนดความถี่ของ�ารปรับข้อมูลระหว่าง�ารเปลี่ยน�ปลงในเครื่อง�ับเซิร์ฟเวอร์เมลในเครือข่ายให้ตรง�ัน "
+"ช่วงเวลาต้องไม่ต่ำ�ว่า 30 วินาที"
+
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "รหัสอั�ขระปริยายที่จะใช้เขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "รหัสอั�ขระปริยายที่จะใช้เขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "รหัสอั�ขระปริยายที่จะใช้�สดงจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "รหัสอั�ขระปริยายที่จะใช้�สดงจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "รูป�บบปริยายของ�ารส่งต่อข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "ความสูงปริยายของหน้าต่างเขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "ความสูงปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "ความสูงปริยายของ�ล่องโต้ตอบบอ�รับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "รูป�บบปริยายของ�ารตอบจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "สถานะปริยายของ�ารขยาย�ระทู้"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "ความ�ว้างปริยายของหน้าต่างเขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "ความ�ว้างปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "ความ�ว้างปริยายของ�ล่องโต้ตอบบอ�รับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
+#: ../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:34
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "�ำหนดว่าจะเปิดหาที่อยู่ผู้ส่งในสมุดที่อยู่หรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "�ำหนดว่าจะเปิดหาที่อยู่ผู้ส่งในสมุดที่อยู่หรือไม่ ถ้าหาพบ ข้อความนั้น�็ไม่ควรเป็นขยะ �ารเปิดหานี้ "
 "จะเปิดในสมุดที่ถู�เลือ�ไว้สำหรับเติมเต็มที่อยู่�บบอัตโนมัติ ซึ่งอาจจะช้าถ้าสมุดดัง�ล่าวอยู่ในเครือข่าย "
 "(เช่น LDAP)"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../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:30
+#: ../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 "
@@ -12356,7 +13033,7 @@ msgstr ""
 "�ำหนดว่าจะใช้ข้อมูลส่วนที่หัว�ำหนดเองสำหรับตรวจขยะหรือไม่ ถ้าเปิดใช้ตัวเลือ�นี้ "
 "�ละข้อความมีข้อมูลส่วนหัวนี้�ำ�ับมา �็จะช่วยให้�ารตรวจขยะทำได้รวดเร็วขึ้น"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../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."
@@ -12364,55 +13041,59 @@ msgstr ""
 "�ำหนดว่าจะใช้�บบอั�ษรเดียว�ันสำหรับทั้งบรรทัด \"จา�\" �ละ \"เรื่อง\" ในช่อง \"ข้อความ\" "
 "ในมุมมอง�บบตั้งหรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "ไดเร�ทอรีสำหรับอ่าน/�นบ�ฟ้มสำหรับเครื่องมือเขียนข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "ไดเร�ทอรีสำหรับบันทึ��ฟ้มส่วนประ�อบต่างๆ ของเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "เทโฟลเดอร์ข้อความขยะ�่อนออ�"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "เทถังขยะ�่อนออ�"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "เทขยะในโฟลเดอร์ข้อความขยะทั้งหมด�่อนออ�จา� Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "เทขยะในโฟลเดอร์ถังขยะทั้งหมด�่อนออ�จา� Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../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:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "เปิดหรือปิด�ารใช้�คร่เว้นวรรคเป็นปุ่มทำงานลัด"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "เปิดหรือปิดความสามารถใน�ารค้น�บบพิมพ์ล่วงหน้า"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "เปิดใช้โฟลเดอร์ค้นหา"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "เปิดใช้โฟลเดอร์ค้นหาเมื่อเริ่มทำงาน"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12423,7 +13104,7 @@ msgstr ""
 "ด้วย�ารพิมพ์ข้อความ ประโยชน์�็คือ คุณสามารถหาโฟลเดอร์ใน�ถบข้างได้โดยเพียงพิมพ์ชื่อโฟลเดอร์ "
 "�ล้ว�ถบเลือ��็จะ�ระโดดไปยังโฟลเดอร์นั้นโดยอัตโนมัติขณะพิมพ์"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12431,27 +13112,27 @@ msgstr ""
 "เปิดใช้ตัวเลือ�นี้ถ้าต้อง�ารใช้�คร่เว้นวรรคใน�ารเลื่อนหน้าในช่องตัวอย่างข้อความ ราย�ารข้อความ "
 "�ละในโฟลเดอร์ต่างๆ"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "เปิดใช้เพื่อ�สดงบางส่วนของข้อความในขนาดที่จำ�ัด"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "เปิด/ปิด�ารใช้เคอร์เซอร์"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "ความสูงของช่องราย�ารข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "ความสูงของช่องราย�ารข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ซ่อน�าร�สดงตัวอย่างอีเมลของโฟลเดอร์�ละย�เลิ��ารเลือ�"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12459,13 +13140,13 @@ msgstr ""
 "ถ้าผู้ใช้พยายามเปิดข้อความตั้ง�ต่ 10 ข้อความขึ้นไปพร้อม�ันทีเดียว จะถามผู้ใช้�่อน "
 "ว่าต้อง�ารเปิดจริงหรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../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:53
+#: ../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 "
@@ -12475,17 +13156,43 @@ msgstr ""
 "ที่ปรา��ในรายชื่อนี้ จะถู�ค้นหาองค์ประ�อบ bonobo สำหรับ�สดง จา��านข้อมูลชนิด mime ของ "
 "GNOME"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 "ความสูงตั้งต้นของหน้าต่าง \"รับ�ละส่งเมล\" ค่านี้จะเปลี่ยนตาม�ารปรับขนาดหน้าต่างของผู้ใช้"
+
+#: ../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 ""
+"ค่าตั้งต้นของสถานะ�ารขยายเต็มของหน้าต่าง \"รับ�ละส่งเมล\" "
+"ค่านี้จะปรับตาม�ารขยายหรือเลิ�ขยายหน้าต่างเต็มของผู้ใช้ สังเ�ตว่าค่านี้ไม่ได้ใช้โดย Evolution "
+"เนื่องจา�หน้าต่าง \"รับ�ละส่งเมล\" ไม่สามารถขยายเต็มได้ "
+"�ต่คีย์นี้มีไว้ด้วยเหตุผลเรื่องรายละเอียดทางเทคนิค"
+
+#: ../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:55
+#: ../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:56
+#: ../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 "
@@ -12494,31 +13201,31 @@ msgstr ""
 "ปิดหรือเปิด�ารเตือนซ้ำๆ ว่า�ารลบข้อความในโฟลเดอร์ค้นหาจะเป็น�ารลบข้อความอย่างถาวรด้วย "
 "ไม่ใช่�ค่�ารลบจา�ผล�ารค้นหาเท่านั้น"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "เวลาเทข้อความขยะครั้งสุดท้าย"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "เวลาเทขยะครั้งสุดท้าย"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "ระดับของข้อความที่จะบันทึ�ในปูม"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "รายชื่อป้าย�ละสีที่ใช้"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "รายชื่อของสั��าอนุ�าตที่ยอมรับ"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "รายชื่อบั�ชีเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12526,11 +13233,15 @@ msgstr ""
 "รายชื่อบั�ชีที่องค์ประ�อบเมลของ Evolution รู้จั�  รายชื่อนี้เป็นสตริงเ�็บชื่อไดเร�ทอรีย่อยเทียบ�ับ /"
 "apps/evolution/mail/accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "รายชื่อข้อมูลส่วนหัว�ำหนดเอง พร้อม�ำหนดว่าเปิดใช้หรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "รายชื่อรหัสภาษาของพจนานุ�รมที่จะใช้ตรวจตัวสะ�ด"
+
+#: ../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."
@@ -12538,262 +13249,266 @@ msgstr ""
 "รายชื่อของป้ายที่ใช้ในองค์ประ�อบเมลของ Evolution  รายชื่อนี้เป็นราย�ารของสตริงในรูป ชื่อ:สี "
 "โดย�ทนสีด้วยรูป�บบ�านสิบห��บบ HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "ราย�ารชนิด mime ที่จะตรวจหาองค์ประ�อบ bonobo สำหรับ�สดง"
+msgstr "รายชื่อชนิด mime ที่จะตรวจหาองค์ประ�อบ bonobo สำหรับ�สดง"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "รายชื่อโพรโทคอลที่ใช้สั��าอนุ�าตที่ยอมรับ"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "โหลดรูปภาพในข้อความ HTML ผ่าน http"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../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 ""
-"โหลดรูปภาพในข้อความ HTML ผ่าน http(s) ค่าที่เป็นไปได้คือ: 0 = "
-"ไม่ต้องโหลดรูปภาพผ่านเครือข่าย, 1 = โหลดรูปภาพในเมลจา�ผู้ติดต่อ, 2 = "
+"โหลดรูปภาพในข้อความ HTML ผ่าน http(s) ค่าที่เป็นไปได้คือ: \"0\" = "
+"ไม่ต้องโหลดรูปภาพผ่านเครือข่าย, \"1\" = โหลดรูปภาพในเมลจา�ผู้ติดต่อ, \"2\" = "
 "โหลดรูปภาพผ่านเครือข่ายเสมอ"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "บันทึ�ปูม�าร�รองข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "บันทึ�ปูม�าร�รองข้อความลงใน�ฟ้มปูม"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "�ฟ้มปูมที่จะบันทึ��าร�รองข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "�ฟ้มปูมที่จะบันทึ��าร�รองข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "ทำเครื่องหมายว่าอ่าน�ล้วหลังระยะเวลาที่�ำหนด"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "ทำเครื่องหมายว่าอ่าน�ล้วหลังระยะเวลาที่�ำหนด"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "เน้น�ารอ้างคำพูดในตัวอย่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "เน้น�ารอ้างคำพูดในตัวอย่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "ความสูงปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "ความ�ว้างปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "รูป�บบ�าร�สดงข้อความ (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "จำนวนวันที่น้อยที่สุดระหว่าง�ารเทข้อความขยะ�่อนออ��ต่ละครั้ง"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "จำนวนวันที่น้อยที่สุดระหว่าง�ารเทขยะ�่อนออ��ต่ละครั้ง"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "จำนวนราย�ารที่อยู่ที่จะ�สดงในช่อง ถึง/สำเนาถึง/สำเนาลับถึง"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "ถามเมื่อหัวเรื่องข้อความว่างเปล่า"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "ถาม�่อนลบข้อความในโฟลเดอร์ค้นหา"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "ถามเมื่อผู้ใช้สั่งเ�็บ�วาด"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "ถามเมื่อผู้ใช้ระบุ�ต่สำเนาลับ"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ถาม�่อนถ้าผู้ใช้พยายามเปิดข้อความตั้ง�ต่ 10 ข้อความขึ้นไปพร้อม�ัน"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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 "ถามเมื่อผู้ใช้พยายามส่งเมลในรูป HTML ไปยังผู้รับที่อาจไม่ต้อง�ารรับเมลในรูป HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../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:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ถามเมื่อผู้ใช้พยายามส่ง HTML โดยที่ผู้รับไม่ต้อง�าร"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "ถามเมื่อผู้ใช้ทำเครื่องหมายข้อความหลายราย�าร"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ตรวจรู้หน้า�สดงอารมณ์ในข้อความ�ละ�ทนที่ด้วยรูปภาพให้"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "ตรวจรู้ลิง�์ในข้อความ�ละ�ทนที่ให้"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "ตรวจความเป็นขยะในจดหมายเข้าทุ�ฉบับ"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "ไดเร�ทอรีสำหรับบันทึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-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:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "ส่งเมลในรูป HTML โดยปริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "ส่งเมลในรูป HTML โดยปริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "�สดงคอลัมน์ที่อยู่อีเมลผู้ส่งในราย�ารข้อความด้วย"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "ช่วงเวลา�ารปรับข้อมูล�ับเซิร์ฟเวอร์"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "�สดงภาพเคลื่อนไหว"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "�สดงภาพที่มี�ารเคลื่อนไหวโดยเคลื่อนไหวภาพ"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "�สดงข้อความที่ลบ�ล้วในราย�ารข้อความด้วย"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "�สดงรูปของผู้ส่ง"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../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:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr "�ำหนดข้อมูลส่วนหัวที่จะใช้ตรวจหาขยะ"
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr "�ำหนดข้อมูลส่วนหัวที่จะใช้ตรวจหาขยะ รูป�บบคือ ชื่อส่วนหัว=ค่าใน gconf"
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "ตรวจตัวสะ�ดขณะพิมพ์"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "สีของ�ารตรวจตัวสะ�ด"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "ภาษาที่ตรวจตัวสะ�ด"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "ความสูงปริยายของหน้าต่างบอ�รับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "ความ�ว้างปริยายของหน้าต่างบอ�รับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "�บบอั�ษรเทอร์มินัล"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "ขนาดส่วนของข้อความสูงสุด"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "ปลั๊�อินปริยายสำหรับ�ารตรวจข้อความขยะ"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../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:124
+#: ../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:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "�บบอั�ษรเทอร์มินัลสำหรับ�สดงข้อความเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "�บบอั�ษรความ�ว้างไม่คงที่สำหรับ�สดงข้อความเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../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 "ค่าที่เป็นไปได้มีสามค่า คือ 0 สำหรับข้อผิดพลาด, 1 สำหรับคำเตือน �ละ 2 สำหรับข้อความดีบั๊�"
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"ค่าที่เป็นไปได้มีสามค่า คือ \"0\" สำหรับข้อผิดพลาด, \"1\" สำหรับคำเตือน �ละ \"2\" "
+"สำหรับข้อความดีบั๊�"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -12801,7 +13516,7 @@ msgstr ""
 "ค่านี้�ำหนดขนาดสูงสุดของส่วนของข้อความที่จะสามารถจัดรูป�บบใน evolution ได้ ค่าปริยายคือ 4 "
 "MB หรือ 4096 KB �ละ�ำหนดค่าในหน่วย KB"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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 "
@@ -12810,15 +13525,15 @@ msgstr ""
 "�ม้จะเปิดใช้ปลั๊�อินตรวจข้อความขยะไว้หลายตัว นี่เป็นปลั๊�อินปริยาย ถ้าปลั๊�อินปริยายถู�ปิด "
 "�็จะไม่พยายามถอยไปใช้ปลั๊�อินอื่น�ทน"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../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 ""
-"ค่านี้จะถู�อ่านเพียงครั้งเดียว �ล้วล้างค่าเป็นเท็จทันทีหลังจา�อ่าน หน้าที่ของคีย์นี้ "
+"ค่านี้จะถู�อ่านเพียงครั้งเดียว �ล้วล้างค่าเป็น \"false\" ทันทีหลังจา�อ่าน หน้าที่ของคีย์นี้ "
 "คือย�เลิ��ารเลือ�เมลในราย�าร �ละย�เลิ��าร�สดงตัวอย่างอีเมลสำหรับโฟลเดอร์นั้นๆ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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;"
@@ -12829,11 +13544,21 @@ msgstr ""
 "พร้อม�ำหนดด้วยว่าจะ�สดงหรือไม่ รูป�บบของโครงสร้าง XML คือ &lt;header enabled&gt; "
 "โดย�ำหนด enabled ถ้าต้อง�ารให้�สดง header ในมุมมองเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 ""
+"ตัวเลือ�นี้เ�ี่ยวข้อง�ับคีย์ lookup_addressbook "
+"�ละใช้�ำหนดว่าจะเปิดหาที่อยู่ในสมุดที่อยู่ในเครื่องเท่านั้นหรือไม่ "
+"เพื่อข้าม�ารตรวจขยะในเมลที่ส่งมาจา�ที่อยู่ติดต่อที่รู้จั�"
+
+#: ../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:133
+#: ../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."
@@ -12841,13 +13566,13 @@ msgstr ""
 "�ำหนดจำนวนราย�ารที่อยู่ที่จะ�สดงในมุมมองราย�ารข้อความปริยาย ซึ่งราย�ารที่เ�ินนั้น จะถู��ทนด้วย "
 "'...'"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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 "ค่านี้�ำหนดว่าจะขยายหรือยุบ�ระทู้โดยปริยาย ต้องเปิด Evolution ใหม่จึงจะมีผล"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
@@ -12856,107 +13581,115 @@ msgstr ""
 "ค่านี้�ำหนดว่าจะเรียง�ระทู้ตามลำดับ�่อนหลังใน�ต่ละสาย �ทน�ารเรียงตามวันที่ ต้องเปิด Evolution "
 "ใหม่จึงจะมีผล"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "เรียง�ระทู้ในราย�ารข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "เรียง�ระทู้ในราย�ารข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "เรียง�ระทู้ในราย�ารข้อความตามหัวเรื่อง"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "�ำหนดเวลาที่จะทำเครื่องหมายข้อความว่าอ่าน�ล้ว"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "�ำหนดเวลาที่จะทำเครื่องหมายข้อความว่าอ่าน�ล้ว"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "สตริง UID ของบั�ชีปริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 "ใช้ดีมอน�ละไคลเอนต์ของ SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ใช้ดีมอน�ละไคลเอนต์ของ SpamAssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "ใช้�บบอั�ษร�ำหนดเอง"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "ใช้�บบอั�ษร�ำหนดเองสำหรับ�สดงผลเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "ทดสอบส�ปม�บบไม่ใช้เครือข่ายเท่านั้น"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ทดสอบส�ปม�บบไม่ใช้เครือข่ายเท่านั้น (ไม่ใช้ DNS)"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "เรียงช่องหน้าต่าง�บบวางข้าง�ันใน�นวนอน"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "�บบอั�ษรความ�ว้างไม่คงที่"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "เมนู มุมมอง/สำเนาลับ �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "เมนู มุมมอง/สำเนาลับ �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "เมนู มุมมอง/สำเนาถึง �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "เมนู มุมมอง/สำเนาถึง �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "เมนู มุมมอง/จา� �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "เมนู มุมมอง/จา� �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "เมนู มุมมอง/ประ�าศที่ �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "เมนู มุมมอง/ประ�าศที่ �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "เมนู มุมมอง/ที่อยู่ตอบ�ลับ �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "เมนู มุมมอง/ที่อยู่ตอบ�ลับ �าอยู่"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../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:161
+#: ../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."
@@ -12964,43 +13697,43 @@ msgstr ""
 "�ำหนดว่าจะถอย�ลับไปใช้�ารเรียง�ระทู้ข้อความโดยอาศัยหัวเรื่องเมื่อข้อความไม่มีข้อมูลส่วนหัว In-"
 "Reply-To หรือ Reference หรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../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:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "ความ�ว้างของช่องราย�ารข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "ความ�ว้างของช่องราย�ารข้อความ"
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "�ำลังขำเข้าข้อมูล Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "เครื่องมือนำเข้าข้อมูล Elm ของ Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "นำเข้าเมลจา� Elm"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "โฟลเดอร์ปลายทาง:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "เลือ�โฟลเดอร์ที่จะให้นำเข้า"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "�ล่องเมลของเบิร์�ลีย์ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "เครื่องมือนำเข้าโฟลเดอร์ในรูป�บบ mailbox ของ Berkeley"
 
@@ -13008,7 +13741,7 @@ msgstr "เครื่องมือนำเข้าโฟลเดอร์
 msgid "Importing mailbox"
 msgstr "�ำลังนำเข้า�ล่องจดหมาย"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "�ำลังนำเข้า `%s'"
@@ -13018,175 +13751,190 @@ msgstr "�ำลังนำเข้า `%s'"
 msgid "Scanning %s"
 msgstr "�ำลังตรวจสอบ %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "�ำลังนำเข้าข้อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "เครื่องมือนำเข้าข้อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "นำเข้าเมลจา� Pine"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "เมลไปยัง %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "เมลจา� %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "เรื่อง %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "เมลลิงลิสต์ %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:371
 msgid "Add Filter Rule"
 msgstr "เพิ่ม�ฎ�าร�รอง"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "�ม่�บบ"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "เลือ�อยู่ %d ราย�าร, "
 msgstr[1] "เลือ�อยู่ %d ราย�าร, "
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "ลบข้อความไป %d ฉบับ"
 msgstr[1] "ลบข้อความไป %d ฉบับ"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "เมลขยะ %d ฉบับ"
 msgstr[1] "เมลขยะ %d ฉบับ"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "จดหมายร่าง %d ฉบับ"
 msgstr[1] "จดหมายร่าง %d ฉบับ"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "ส่ง�ล้ว %d ฉบับ"
 msgstr[1] "ส่ง�ล้ว %d ฉบับ"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "ยังไม่ส่ง %d ฉบับ"
 msgstr[1] "ยังไม่ส่ง %d ฉบับ"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ยังไม่อ่าน %d, "
 msgstr[1] "ยังไม่อ่าน %d, "
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "รวม %d"
 msgstr[1] "รวม %d"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "ข้อความเมลใหม่"
 
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "ข้อความเ_มล"
 
-#: ../mail/mail-component.c:892
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "เขียนเมลฉบับใหม่"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "โฟลเดอร์เมลใหม่"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "โ_ฟลเดอร์เมล"
 
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "สร้างโฟลเดอร์เมลใหม่"
 
-#: ../mail/mail-component.c:1047
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ปรับรุ่นค่าตั้งหรือโฟลเดอร์เมลไม่สำเร็จ"
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "ข้อผิดพลาด"
 
-#: ../mail/mail-component.c:1517
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "คำเตือน�ละข้อผิดพลาด"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "ข้อความดีบั๊�"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "ข้อผิดพลาด คำเตือน �ละข้อความดีบั๊�"
 
-#: ../mail/mail-component.c:1628
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "บันทึ�สำหรับ�ารดีบั๊�"
 
-#: ../mail/mail-component.c:1632
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "�สดง_ข้อผิดพลาดใน�ถบสถานะเป็นเวลา"
 
-#: ../mail/mail-component.c:1639
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+msgid "second(s)."
 msgstr "วินาที"
 
-#: ../mail/mail-component.c:1649
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "ข้อความบันทึ�:"
 
-#: ../mail/mail-component.c:1701
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "ระดับ�ารบันทึ�"
 
-#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "เวลา"
 
-#: ../mail/mail-component.c:1715 ../mail/message-list.c:2403
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ข้อความ"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "ปิดหน้าต่างนี้"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_ตรวจสอบหาชนิดที่รองรับ"
@@ -13200,7 +13948,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>ไม่รองรับ SSL ใน Evolution ที่คอมไพล์มานี้</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>รูปผู้ส่ง</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13281,73 +14029,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">�บบอั�ษรสำหรับพิมพ์</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">�ารตั้งค่าพร็อ�ซี</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">ข้อมูลจำเป็น</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME นิรภัย (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">ระบบนิรภัย</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">จดหมายออ��ละจดหมายร่าง</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">�าร�ำหนดค่าเซิร์ฟเวอร์</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">ชนิดของ�าร_ยืนยันตัวบุคคล</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "�ารจัด�ารบั�ชีผู้ใช้"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "เพิ่มลายเซ็นใ_หม่..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "เพิ่ม_สคริปต์"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "เซ็น�ำ�ับข้อความออ�เ_สมอเมื่อใช้บั�ชีนี้"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "เข้ารหัสถึงตนเอง_ด้วยเมื่อส่งข้อความเข้ารหัส"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ส่ง_สำเนา (cc) ทุ�ครั้ง ถึง:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ส่งสำเนา_ลับ (bcc) ทุ�ครั้ง ถึง:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "เ_ชื่อถือ�ุ��จในพวง�ุ��จของข้าพเจ้าเสมอเมื่อจะเข้ารหัส"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "เข้ารหัสถึง_ข้าพเจ้าเสมอเมื่อส่งข้อความเข้ารหัส"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "ร้องขอ�าร�_จ้งรับข้อความเสมอ"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "�นบข้อความเดิม"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "�ทร�รูป�สดง_อารมณ์โดยอัตโนมัติ"
@@ -13365,13 +14113,13 @@ msgid "C_haracter set:"
 msgstr "ชุด_อั�ขระ:"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "ตรวจ_สอบขยะด้วยข้อมูลส่วนที่หัว�ำหนดเอง"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_ตรวจสอบชนิดที่รองรับ"
 
+#: ../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 "ตรวจสอบข้อความขาเ_ข้าว่าเป็นเมลขยะหรือไม่"
@@ -13432,16 +14180,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "เ_ซ็นลายเซ็นดิจิทัล�ำ�ับข้อความออ� (โดยปริยาย)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "ไ_ม่ต้องทำเครื่องหมายข้อความว่าเป็นขยะถ้าผู้ส่งอยู่ในสมุดที่อยู่"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "ไม่ต้องจัดรูป�บบข้อความถ้าขนาดเ_�ิน"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "ไม่ต้องจัดรูป�บบเนื้อหาในข้อความถ้าขนาดเ_�ิน"
+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 original message"
-msgstr "ไม่อ้างคำพูดเดิม"
+msgid "Do not quote"
+msgstr "ไม่อ้างคำพูด"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13504,69 +14252,85 @@ msgid "HTML Messages"
 msgstr "ข้อความ HTML"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "_พร็อ�ซี HTTP:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "ส่วนหัว"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "เน้น�ารอ้าง_คำพูดด้วยสี"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "ในข้อความ"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "�ทร�ข้อความเดิมทั้งดุ้น (�บบ Outlook)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "ในบรรทัด (�บบ Outlook)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ป้าย"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "ตารางภาษา"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "�าร�ำหนดค่าเมล"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "ตารางข้อมูลส่วนหัวของเมล"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "ตำ�หน่ง�ล่องเมล"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "�ารเขียนข้อความ"
 
-#: ../mail/mail-config.glade.h:105
+#: ../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:106
+#: ../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:107
+#: ../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 "_องค์�ร:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ชื่อ_�ุ��จ PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../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."
@@ -13574,7 +14338,7 @@ msgstr ""
 "�รุณาป้อนชื่อที่บรรยายบั�ชีนี้ในช่องว่างข้างล่าง\n"
 "ชื่อนี้จะใช้เพื่อ�าร�สดงผลเท่านั้น"
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13582,7 +14346,7 @@ msgstr ""
 "�รุณาป้อนข้อมูลเ�ี่ยว�ับวิธี�ารส่งเมลของคุณ ถ้าไม่มั่นใจให้ลองถามผู้ดู�ลระบบ "
 "หรือผู้ให้บริ�ารอินเทอร์เน็ตของคุณ"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13591,113 +14355,121 @@ msgstr ""
 "�รุณาป้อนข้อมูลชื่อ�ละที่อยู่อีเมลของคุณด้านล่างนี้ ส่วนในช่อง \"ข้อมูลเสริม\" นั้น "
 "คุณไม่จำเป็นต้องเติมข้อมูล เว้นเสีย�ต่ว่าคุณอยา�จะให้ข้อมูลนั้นปรา��อยู่ในอีเมลที่คุณส่ง"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "�รุณาเลือ�ตัวเลือ�ใน�ลุ่มข้างล่างนี้"
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "ถาม�่อนส่งข้อความที่มี�ต่ผู้รับสำเนา_ลับล้วนๆ"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "อ้างคำพูดเดิม"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "อ้างคำพูด"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_จำรหัสผ่าน"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_ที่อยู่ตอบ�ลับ:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "จำ_รหัสผ่าน"
 
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "โฮสต์ S_OCKS:"
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "ค้น_หารูปของผู้ส่งจา�สมุดที่อยู่ในเครื่อง"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "เ_ลือ�..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_ส่ง�าร�จ้งรับข้อความ:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "�บบอั�ษร_มาตร�าน:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "เลือ��บบอั�ษรความ�ว้างคงที่สำหรับ HTML"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "เลือ��บบอั�ษรความ�ว้างคงที่สำหรับพิมพ์ HTML"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "เลือ��บบอั�ษรความ�ว้างไม่คงที่สำหรับ HTML"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "เลือ��บบอั�ษรความ�ว้างไม่คงที่สำหรับพิมพ์ HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "�ารส่งเมล"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "โ_ฟลเดอร์ข้อความออ�:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "เซิร์ฟเวอร์ต้อง�าร�าร_ยืนยันตัวบุคคล"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_ชนิดเซิร์ฟเวอร์:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "ใบ_รับรองลายเซ็น:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_ลายเซ็น:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "ลายเซ็น"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "ตารางลายเซ็น"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "�ารตรวจตัวสะ�ด"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "เริ่มพิมพ์ตอบที่_ท้ายข้อความ"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_ชนิด:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "รายชื่อภาษาในที่นี้ จะมีเฉพาะภาษาที่คุณติดตั้งพจนานุ�รมไว้เท่านั้น"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13706,12 +14478,7 @@ msgstr ""
 "ผลลัพธ์ของสคริปต์นี้จะถู�ใช้เป็นลายเซ็นของคุณ\n"
 "ชื่อที่คุณ�ำหนด จะใช้เพื่อ�สดงเมื่ออ้างอิงถึงเท่านั้น"
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr "ตัวเลือ�นี้จะไม่มีผลถ้าตรวจพบข้อมูลส่วนหัวที่�ำหนดไว้ให้บ่งชี้ความเป็นขยะ"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13719,16 +14486,26 @@ msgstr ""
 "�รุณาป้อนชื่อที่คุณต้อง�ารใช้เรีย�บั�ชีนี้\n"
 "ตัวอย่างเช่น: \"งาน\" หรือ \"ส่วนบุคคล\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "_ชื่อผู้ใช้:"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "ใช้�ารยืนยัน_ตัวบุคคล"
+
+#: ../mail/mail-config.glade.h:156 ../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:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "ความ�ว้างไ_ม่คงที่:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13738,102 +14515,128 @@ msgstr ""
 "\n"
 "คลิ� \"ถัดไป\" เพื่อเริ่ม "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "เ_พิ่มลายเซ็น"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "โหลดรูปภาพจา�อินเทอร์เน็ตเ_สมอ"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "URL สำหรับตั้งค่าพร็อ�ซี_อัตโนมัติ:"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_ปลั๊�อินตรวจขยะปริยาย:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "เชื่อมต่ออินเทอร์เน็ตโดย_ตรง"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ไ_ม่ต้องเซ็น�ำ�ับ�ารร้องขอเ�ี่ยว�ับ�ารประชุม (เพื่อความเข้า�ันได้�ับ Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "รูป�บบ�ารส่งเมล_ต่อ:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "ให้_ลายเซ็นอยู่เหนือข้อความเดิมใน�ารตอบ"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "โ_หลดรูปภาพเฉพาะในข้อความที่มาจา�ผู้ติดต่อ"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "_เปิดหาที่อยู่จา�สมุดที่อยู่ในเครื่องเท่านั้น"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_�ำหนดให้เป็นบั�ชีหลั�"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "ค่าพร็อ�ซี_�ำหนดเอง:"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "ทำเครื่องหมายข้อความว่า_อ่าน�ล้วหลังจา�"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ไ_ม่โหลดรูปภาพจา�อินเทอร์เน็ต"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_พาธ:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_ถาม�่อนส่งข้อความ HTML ไปยังผู้ที่ไม่ต้อง�าร"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ถาม�่อนส่งข้อความที่ไม่มี_หัวข้อเรื่อง"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "รูป�บบ�ารตอ_บ:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_สคริปต์:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "พร็อ�ซี HTTP _นิรภัย:"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "เ_ลือ�..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "�_สดงภาพเคลื่อนไหว"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�_สดงรูปของผู้ส่งในช่อง�สดงตัวอย่างข้อความด้วย"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_จำ�ัดที่อยู่ส่วนหัว ถึง / สำเนาถึง / สำเนาลับถึง ไม่เ�ิน"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ใ_ช้�ารเชื่อมต่อ�บบนิรภัย:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "ใช้ค่า_ปริยายของระบบ"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ใ_ช้�บบอั�ษรเหมือนโปร��รมอื่นๆ"
 
 # in "_Shrink To / Cc / Bcc headers to ... addresses"
 # -> "_จำ�ัดที่อยู่ส่วนหัว ถึง / สำเนาถึง / สำเนาลับถึง ไม่เ�ิน ... ราย�าร"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "ราย�าร"
 
-#: ../mail/mail-config.glade.h:180
+# in "Highlight _quotations with ... color"
+# -> "เน้น�ารอ้าง_คำพูดด้วยสี ... "
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "คำอธิบาย"
 
@@ -13873,43 +14676,43 @@ msgstr "ตัวพิมพ์ให�่-เ_ล็�ตรง�ัน"
 msgid "Co_mpleted"
 msgstr "เ_สร็จ�ล้ว"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_หา:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "หาในข้อความ"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "ปั�ธงเพื่อตาม�ระทู้"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "�ารบอ�รับข้อมูลของโฟลเดอร์"
 
-#: ../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 "ไม่ได้เลือ�"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "เ_ซิร์ฟเวอร์:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "ข้อมูลระบบรั�ษาความปลอดภัย"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "เจาะจงโฟลเดอร์"
 
-#: ../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."
@@ -13917,23 +14720,23 @@ msgstr ""
 "ข้อความต่อไปนี้ คือข้อความที่คุณเลือ�ไว้เพื่อติดตาม�ระทู้\n"
 "�รุณาเลือ�ป�ิบัติ�ารติดตาม�ระทู้จา�เมนู \"ธง\""
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_ยอมรับสั��าอนุ�าต"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "�ระทำ_ภายใน:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_ธง:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_�าที่นี่เพื่อยอมรับข้อต�ลงในสั��าอนุ�าต"
 
-#: ../mail/mail-folder-cache.c:823
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "�ำลัง ping %s"
@@ -13980,99 +14783,104 @@ msgstr "�ำลังส่ง %d ข้อความ จา� %d ข้อ
 msgid "Failed to send %d of %d messages"
 msgstr "ไม่สามารถส่ง %d ข้อความ จา� %d ข้อความ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "ย�เลิ�"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "เสร็จ�ล้ว"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "�ำลังบันทึ�ข้อความไปยังโฟลเดอร์"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�ำลังย้ายข้อความไปยัง %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�ำลังคัดลอ�ข้อความไปยัง %s"
 
-#: ../mail/mail-ops.c:1161
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "ข้อความส่งต่อ"
 
-#: ../mail/mail-ops.c:1202
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ำลังเปิดโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1267
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "�ำลังดึงข้อมูลโควต้าสำหรับโฟลเดอร์ %s"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "�ำลังเปิด�หล่งเ�็บ %s"
 
-#: ../mail/mail-ops.c:1338
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ำลังลบโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ำลังเ�็บข้อมูลของโฟลเดอร์ '%s'"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "�ำลังเ�็บ�วาด�ละเ�็บข้อมูลของบั�ชี '%s'"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "�ำลังเ�็บข้อมูลของบั�ชี '%s'"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "�ำลังโหลดโฟลเดอร์ใหม่"
 
-#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "�ำลังเ�็บ�วาดโฟลเดอร์"
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "�ำลังเทขยะใน '%s' ทิ้ง"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "โฟลเดอร์ในเครื่อง"
 
-#: ../mail/mail-ops.c:1711
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�ำลังดึงข้อความ %s"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "�ำลังดึง %d ข้อความ"
 msgstr[1] "�ำลังดึง %d ข้อความ"
 
-#: ../mail/mail-ops.c:1903
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "�ำลังบันทึ� %d ข้อความ"
 msgstr[1] "�ำลังบันทึ� %d ข้อความ"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14081,11 +14889,11 @@ msgstr ""
 "เ�ิดข้อผิดพลาดขณะบันทึ�ข้อความไปยัง: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2045
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "�ำลังบันทึ�เอ�สาร�นบ"
 
-#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14094,89 +14902,89 @@ msgstr ""
 "ไม่สามารถสร้าง�ฟ้มผลลัพธ์: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2073
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ไม่สามารถเขียนข้อมูล: %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�ำลังตัด�ารเชื่อมต่อจา� %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "�ำลังเชื่อมต่อใหม่ไปยัง %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ำลังเตรียมออฟไลน์บั�ชี '%s'"
 
-#: ../mail/mail-ops.c:2401
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "�ำลังตรวจสอบบริ�าร"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "�ำลังย�เลิ�..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "รับ & ส่งเมล"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "ย�เ_ลิ�ทั้งหมด"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "�ำลังปรับข้อมูล..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "�ำลังรอ..."
 
-#: ../mail/mail-send-recv.c:792
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "�ำลังตรวจสอบเมลใหม่"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "ป้อนวลีรหัสผ่านสำหรับ %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "ป้อนวลีรหัสผ่าน"
 
-#: ../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:713
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ป้อนรหัสผ่านสำหรับ %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "ป้อนรหัสผ่าน"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "ผู้ใช้ย�เลิ�ป�ิบัติ�าร"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "��้ไขลายเซ็น"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_บันทึ��ละปิด"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "�รุณาป้อนชื่อสำหรับลายเซ็นนี้"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "��้ไขลายเซ็น"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "ชื่อ:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "_ชื่อลายเซ็น:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14217,46 +15025,44 @@ msgstr "�ำลังปรับข้อมูลโฟลเดอร์ค
 msgid "Updating Search Folders for '%s'"
 msgstr "�ำลังปรับข้อมูลโฟลเดอร์ค้นหาสำหรับ '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "��้ไขโฟลเดอร์ค้นหา"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "สร้างโฟลเดอร์ค้นหาใหม่"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "มีโฟลเดอร์ชื่อ &quot;{0}&quot; อยู่�ล้ว �รุณาใช้ชื่ออื่น"
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "มีโฟลเดอร์ชื่อ \"{0}\" อยู่�ล้ว �รุณาใช้ชื่ออื่น"
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "มีโฟลเดอร์ชื่อ &quot;{1}&quot; อยู่�ล้ว �รุณาใช้ชื่ออื่น"
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "มีโฟลเดอร์ชื่อ \"{1}\" อยู่�ล้ว �รุณาใช้ชื่ออื่น"
 
 #: ../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."
 msgstr ""
-"มีโฟลเดอร์ซึ่งมีข้อมูลอยู่ที่ &quot;{1}&quot; อยู่�่อน�ล้ว\n"
+"มีโฟลเดอร์ซึ่งมีข้อมูลอยู่ที่ \"{1}\" อยู่�่อน�ล้ว\n"
 "\n"
-"คุณสามารถข้ามโฟลเดอร์นี้ไป เขียนทับ หรือเขียนต่อท้ายข้อมูลเดิมหรือเลิ�ทำ�็ได้"
+"คุณสามารถข้ามโฟลเดอร์นี้ไป เขียนทับ หรือเขียนต่อท้ายข้อมูลเดิม หรือเลิ�ทำ�็ได้"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
-msgstr "&quot;{1}&quot; ร้องขอ�าร�จ้งรับข้อความ จะ�จ้ง�ลับไปยัง {0} หรือไม่?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr "\"{1}\" ร้องขอ�าร�จ้งรับข้อความ จะ�จ้ง�ลับไปยัง {0} หรือไม่?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "มีลายเซ็นชื่อ &quot;{0}&quot; อยู่�ล้ว �รุณาใช้ชื่ออื่น"
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "มีลายเซ็นชื่อ \"{0}\" อยู่�ล้ว �รุณาใช้ชื่ออื่น"
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14290,8 +15096,8 @@ msgstr "คุณà¹�น่ใจหรือไม่ ว่าจะà¸�วาà¸
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "คุณ�น่ใจหรือไม่ ว่าจะ�วาดข้อความที่สั่งลบไว้ในโฟลเดอร์ &quot;{0}&quot; ทิ้งอย่างถาวร?"
+"folder \"{0}\"?"
+msgstr "คุณ�น่ใจหรือไม่ ว่าจะ�วาดข้อความที่สั่งลบไว้ในโฟลเดอร์ \"{0}\" ทิ้งอย่างถาวร?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14306,99 +15112,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "คุณ�น่ใจหรือไม่ ว่าต้อง�ารส่งข้อความโดยไม่มีชื่อเรื่อง?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "เพราะ &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "เพราะ \"{0}\""
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "เพราะ &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "เพราะ \"{2}\""
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "ลายเซ็นเปล่า"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "ไม่สามารถเพิ่มโฟลเดอร์ค้นหา &quot;{0}&quot;"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "ไม่สามารถเพิ่มโฟลเดอร์ค้นหา \"{0}\""
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ไม่สามารถคัดลอ�โฟลเดอร์ &quot;{0}&quot; ไปยัง &quot;{1}&quot;"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "ไม่สามารถคัดลอ�โฟลเดอร์ \"{0}\" ไปยัง \"{1}\""
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "ไม่สามารถสร้างโฟลเดอร์ &quot;{0}&quot;"
+msgid "Cannot create folder \"{0}\"."
+msgstr "ไม่สามารถสร้างโฟลเดอร์ \"{0}\""
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "ไม่สามารถสร้างไดเร�ทอรีบันทึ�ชั่วคราว"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "ไม่สามารถสร้างไดเร�ทอรีบันทึ� เนื่องจา� &quot;{0}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "ไม่สามารถสร้างไดเร�ทอรีบันทึ� เนื่องจา� \"{0}\""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "ไม่สามารถลบโฟลเดอร์ &quot;{0}&quot;"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "ไม่สามารถลบโฟลเดอร์ \"{0}\""
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "ไม่สามารถลบโฟลเดอร์ระบบ &quot;{0}&quot;"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "ไม่สามารถลบโฟลเดอร์ระบบ \"{0}\""
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "ไม่สามารถ��้ไขโฟลเดอร์ค้นหา &quot;{0}&quot; เพราะไม่มีโฟลเดอร์ที่ว่า"
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "ไม่สามารถ��้ไขโฟลเดอร์ค้นหา \"{0}\" เพราะไม่มีโฟลเดอร์ที่ว่า"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ไม่สามารถย้ายโฟลเดอร์ &quot;{0}&quot; ไปยัง &quot;{1}&quot;"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "ไม่สามารถย้ายโฟลเดอร์ \"{0}\" ไปยัง \"{1}\""
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "ไม่สามารถเปิด�หล่ง &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
+msgstr "ไม่สามารถเปิด�หล่ง \"{1}\""
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "ไม่สามารถเปิด�หล่ง &quot;{2}&quot;"
+msgid "Cannot open source \"{2}\"."
+msgstr "ไม่สามารถเปิด�หล่ง \"{2}\""
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "ไม่สามารถเปิด�หล่งปลายทาง &quot;{2}&quot;"
+msgid "Cannot open target \"{2}\"."
+msgstr "ไม่สามารถเปิด�หล่งปลายทาง \"{2}\""
 
 #: ../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 ""
-"ไม่สามารถอ่าน�ฟ้มสั��าอนุ�าต &quot;{0}&quot; เนื่องจา�ปั�หาเ�ี่ยว�ับ�ารติดตั้ง "
+"ไม่สามารถอ่าน�ฟ้มสั��าอนุ�าต \"{0}\" เนื่องจา�ปั�หาเ�ี่ยว�ับ�ารติดตั้ง "
 "คุณจะไม่สามารถใช้�บ็�เอนด์นี้ได้ จน�ว่าคุณจะยอมรับเงื่อนไขสั��าอนุ�าตนี้"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ไม่สามารถเปลี่ยนชื่อ &quot;{0}&quot; เป็น &quot;{1}&quot;"
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "ไม่สามารถเปลี่ยนชื่อ \"{0}\" เป็น \"{1}\""
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "ไม่สามารถเปลี่ยนชื่อหรือย้ายโฟลเดอร์ระบบ &quot;{0}&quot; ได้"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "ไม่สามารถเปลี่ยนชื่อหรือย้ายโฟลเดอร์ระบบ \"{0}\" ได้"
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "ไม่สามารถบันทึ�ความเปลี่ยน�ปลงในบั�ชี"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "ไม่สามารถบันทึ�ในไดเร�ทอรี &quot;{0}&quot;"
+msgid "Cannot save to directory \"{0}\"."
+msgstr "ไม่สามารถบันทึ�ในไดเร�ทอรี \"{0}\""
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "ไม่สามารถบันทึ�ลง�ฟ้ม &quot;{0}&quot;"
+msgid "Cannot save to file \"{0}\"."
+msgstr "ไม่สามารถบันทึ�ลง�ฟ้ม \"{0}\""
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "ไม่สามารถ�ำหนดสคริปต์ลายเซ็น &quot;{0}&quot;"
+msgid "Cannot set signature script \"{0}\"."
+msgstr "ไม่สามารถ�ำหนดสคริปต์ลายเซ็น \"{0}\""
 
 #: ../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."
@@ -14407,46 +15216,42 @@ msgstr ""
 "อย่าลืมว่ารหัสผ่านส่วนให�่�ย�ความ�ต�ต่างระหว่างตัวพิมพ์ให�่-เล็� "
 "บางทีปุ่มล็อค�คร่ของคุณอาจจะถู��ดค้างอยู่"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "ไม่สามารถบันทึ��ฟ้มลายเซ็นได้"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "ลบ &quot;{0}&quot; หรือไม่?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "ลบบั�ชีหรือไม่?"
+msgid "Delete \"{0}\"?"
+msgstr "ลบ \"{0}\" หรือไม่?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "ลบข้อความในโฟลเดอร์ค้นหา &quot;{0}&quot; หรือไม่?"
+msgid "Delete account?"
+msgstr "ลบบั�ชีหรือไม่?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "ลบข้อความในโฟลเดอร์ค้นหา \"{0}\" หรือไม่?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "ลบข้อความในโฟลเดอร์ค้นหาหรือไม่?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "ละเลย�ารเปลี่ยน�ปลงหรือไม่?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "ไ_ม่ลบ"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "ไม่ลบ"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "ไม่ปิดใช้งาน"
 
-#: ../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 "
@@ -14547,34 +15352,26 @@ msgid "Mark all messages as read"
 msgstr "ทำเครื่องหมายว่าทุ�ข้อความอ่าน�ล้ว"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "ทำเครื่องหมายทุ�ข้อความในโฟลเดอร์นี้�ละโฟลเดอร์ย่อยว่าอ่าน�ล้วหรือไม่?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "โฟลเดอร์ขาดหายไป"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "ไม่ได้เลือ��หล่งไว้"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "ในโฟลเดอร์_ปัจจุบันเท่านั้น"
-
-#: ../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."
@@ -14582,7 +15379,7 @@ msgstr ""
 "�รุณาป้อนที่อยู่อีเมลที่จะส่งในช่อง \"ถึง:\" คุณสามารถค้นที่อยู่อีเมลได้โดย�ดปุ่ม \"ถึง:\" "
 "ที่อยู่ถัดจา�ช่องเติมข้อความ"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14591,33 +15388,41 @@ msgstr ""
 "�รุณาตรวจสอบดูให้�น่ใจ ว่าผู้รับในรายชื่อเหล่านี้สมัครใจ�ละสามารถรับเมลในรูป�บบ HTML ได้:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "�รุณาตั้งชื่อที่ไม่ซ้ำ�ับชื่ออื่นสำหรับลายเซ็นนี้"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "�รุณารอสั�ครู่"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "เ�ิดปั�หาขณะถ่ายโอนโฟลเดอร์เมล &quot;{0}&quot;"
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "เ�ิดปั�หาขณะถ่ายโอนโฟลเดอร์เมลเ�่า \"{0}\""
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "�ำลังสอบถามเซิร์ฟเวอร์"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "�ำลังสอบถามราย�าร�ลไ��ารยืนยันตัวบุคคลที่เซิร์ฟเวอร์รองรับ"
+msgstr "�ำลังสอบถามรายชื่อ�ลไ��ารยืนยันตัวบุคคลที่เซิร์ฟเวอร์รองรับ"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "ร้องขอ�าร�จ้งรับข้อความ�ล้ว"
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "ลบโฟลเดอร์ \"{0}\" �ละโฟลเดอร์ย่อยทั้งหมดหรือไม่?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "รายงานข้อความขยะไม่สำเร็จ"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "ลบโฟลเดอร์ &quot;{0}&quot; �ละโฟลเดอร์ย่อยทั้งหมดหรือไม่?"
+msgid "Report Not Junk Failed"
+msgstr "รายงานข้อความไม่ใช่ขยะไม่สำเร็จ"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14656,7 +15461,7 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"ราย�ารที่อยู่ติดต่อที่คุณ�ำลังส่งถู�ตั้งค่าไว้ให้ซ่อนชื่อผู้รับราย�าร\n"
+"รายชื่อที่อยู่ติดต่อที่คุณ�ำลังส่งถู�ตั้งค่าไว้ให้ซ่อนชื่อผู้รับ\n"
 "\n"
 "ระบบอีเมลหลายระบบจะเพิ่มข้อมูลส่วนหัว Apparently-To ในข้อความที่มี�ต่ผู้รับสำเนาลับล้วนๆ "
 "ซึ่งข้อมูลนี้จะ�สดงผู้รับทั้งหมดของข้อความอยู่ดี คุณสามารถเลี่ยง�าร�สดงข้อมูลดัง�ล่าวได้ "
@@ -14667,13 +15472,13 @@ 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 ""
 "โฟลเดอร์ค้นหาต่อไปนี้:\n"
 "{0}\n"
 "ใช้โฟลเดอร์ต่อไปนี้ ซึ่งถู�ลบไป�ล้ว:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "�ละได้ปรับข้อมูลใหม่�ล้ว"
 
 #: ../mail/mail.error.xml.h:106
@@ -14681,13 +15486,13 @@ 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 ""
 "�ฎ�าร�รองต่อไปนี้:\n"
 "{0}\n"
 "ใช้โฟลเดอร์ต่อไปนี้ ซึ่งถู�ลบไป�ล้ว:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "�ละได้ปรับข้อมูลใหม่�ล้ว"
 
 #: ../mail/mail.error.xml.h:111
@@ -14793,9 +15598,8 @@ msgstr ""
 "โฟลเดอร์ในเครือข่ายทั้งหมด หรือทั้งสองอย่าง"
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"�ารลงบันทึ�เข้าใช้เซิร์ฟเวอร์ &quot;{0}&quot; ของคุณในชื่อ &quot;{0}&quot; ล้มเหลว"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "�ารลงบันทึ�เข้าใช้เซิร์ฟเวอร์ \"{0}\" ของคุณในชื่อ \"{0}\" ล้มเหลว"
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14817,22 +15621,22 @@ msgstr "เ_�็บ�วาด"
 msgid "_Open Messages"
 msgstr "เ_ปิดข้อความ"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "ในโฟลเดอร์ปัจจุบัน�ละโฟลเดอร์_ย่อย"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "ยังไม่อ่าน"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "อ่าน�ล้ว"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "ตอบ�ล้ว"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "ส่งต่อ�ล้ว"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "ข้อความยังไม่อ่านหลายฉบับ"
@@ -14857,37 +15661,50 @@ msgstr "สูง�ว่า"
 msgid "Highest"
 msgstr "สูงที่สุด"
 
-#: ../mail/message-list.c:1611 ../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:1618 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "วันนี้ %l:%M %p"
 
-#: ../mail/message-list.c:1627 ../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 "เมื่อวาน %l:%M %p"
 
-#: ../mail/message-list.c:1639 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1647 ../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 %l:%M %p"
 
-#: ../mail/message-list.c:1649 ../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 %Ey"
 
-#: ../mail/message-list.c:3846
+#. 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
 msgid "Generating message list"
 msgstr "�ำลังสร้างราย�ารข้อความ"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"ไม่มีข้อความที่ตรง�ับเงื่อนไข�ารค้นหาของคุณ �รุณาล้าง�ารค้นหาด้วยเมนู ค้นหา->ล้าง "
+"หรือเปลี่ยนเงื่อนไข"
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "ไม่มีข้อความในโฟลเดอร์นี้"
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "�ำหนดเสร็จใน"
@@ -14917,39 +15734,39 @@ msgstr "ข้อความที่ส่ง"
 msgid "Size"
 msgstr "ขนาด"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "เรีย�"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "ไม่ส่งต่อ"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "�ปะประ�าศตอบ"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "สำหรับข้อมูลของคุณ"
 
-#: ../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 "ส่งต่อ"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "ไม่จำเป็นต้องตอบ"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ตอบ�ลับ"
 
-#: ../mail/message-tag-followup.c:84 ../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 "ตอบ�ลับทั้งหมด"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "ตรวจทาน"
 
@@ -14974,6 +15791,10 @@ msgid "Subject contains"
 msgstr "ชื่อเรื่องมีคำว่า"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "ชื่อเรื่องหรือผู้รับมีคำว่า"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "ชื่อเรื่องหรือผู้ส่งมีคำว่า"
 
@@ -14986,33 +15807,22 @@ msgid "Provides core functionality for local address books."
 msgstr "องค์ประ�อบพื้น�านสำหรับสมุดที่อยู่ในเครื่อง"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "เปิดใช้ปลั๊�อินเตือน�าร�นบเอ�สาร"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "เปิดใช้ปลั๊�อินเตือน�าร�นบเอ�สาร"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 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:4
+#: ../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/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "คำหลั�"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "เตือนเมื่อ_ขาดเอ�สาร�นบ"
-
 #: ../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"
@@ -15035,9 +15845,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "ข้อความขาดเอ�สาร�นบ"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "��้ไข_ต่อไป"
+#: ../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 ""
@@ -15051,125 +15861,149 @@ msgstr ""
 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 "เลือ�ชื่อของ�ฟ้มสำรองข้อมูลของ Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "เ_ริ่ม Evolution ใหม่หลัง�ารสำรอง"
 
-#: ../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 "เลือ��ฟ้มสำรองข้อมูลของ Evolution ที่จะเรีย�คืน"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "เ_ริ่ม Evolution ใหม่หลัง�ารเรีย�คืน"
 
-#: ../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 ""
-"คุณสามารถฟื้น Evolution คืนโดยใช้�ฟ้มสำรองข้อมูลของคุณ โดยจะฟื้นทั้งข้อมูล เมล, ป�ิทิน, งาน, "
-"บันทึ�ช่วยจำ, สมุดที่อยู่ \n"
+"คุณสามารถฟื้น Evolution คืนโดยใช้�ฟ้มสำรองข้อมูลของคุณ โดยจะฟื้นทั้งข้อมูล เมล, ป�ิทิน, "
+"ภาร�ิจ, บันทึ�ช่วยจำ, สมุดที่อยู่ \n"
 "�ละยังฟื้นค่าตั้งส่วนตัว ตัว�รองเมล ฯลฯ ต่างๆ ของคุณด้วย"
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_ฟื้น Evolution จา��ฟ้มสำรองข้อมูล"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "�รุณาเลือ��ฟ้มจัดเ�็บข้อมูลเ�่าของ Evolution ที่จะฟื้นคืน:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "เลือ��ฟ้มที่จะฟื้น"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "สำรองไดเร�ทอรี Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "ฟื้นไดเร�ทอรี Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "ตรวจสอบ�ฟ้มสำรองข้อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "เริ่มเปิด Evolution ใหม่"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "ใช้ส่วนติดต่อผู้ใช้�บบ�ราฟิ�ส์"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "�ำลังปิด Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "�ำลังสำรองบั�ชี�ละค่าตั้งของ Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "�ำลังสำรองข้อมูลของ Evolution (เมล, ที่อยู่ติดต่อ, ป�ิทิน, งาน, บันทึ�ช่วยจำ)"
+msgstr "�ำลังสำรองข้อมูลของ Evolution (เมล, ที่อยู่ติดต่อ, ป�ิทิน, ภาร�ิจ, บันทึ�ช่วยจำ)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "สำรองข้อมูลเสร็จสมบูรณ์"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "�ำลังเริ่มเปิด Evolution ใหม่"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "สำรองข้อมูลปัจจุบันของ Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "�ำลัง�ต��ฟ้มจา��ฟ้มสำรองข้อมูล"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "�ำลังอ่านค่าตั้งของ Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "�ำลังลบ�ฟ้มสำรองชั่วคราว"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../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 "�ำลังสำรองไว้ที่โฟลเดอร์ %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "�ำลังฟื้นโดยใช้โฟลเดอร์ %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "สำรองข้อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "ฟื้นข้อมูล Evolution"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "�ำลังสำรองข้อมูลของ Evolution"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "โปรดรอสั�ครู่ Evolution �ำลังสำรองข้อมูลของคุณ"
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "�ำลังฟื้นข้อมูล Evolution คืน"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "โปรดรอสั�ครู่ Evolution �ำลังฟื้นข้อมูลของคุณคืน"
+
+#: ../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 "ปลั๊�อินสำหรับสำรอง�ละฟื้นข้อมูล�ละค่าตั้งของ Evolution"
@@ -15200,14 +16034,22 @@ msgstr ""
 "ถ้าคุณต้อง�ารให้เริ่มเปิด Evolution ใหม่โดยอัตโนมัติหลัง�ารสำรองข้อมูล �รุณา�าที่�ล่อง�า"
 
 #: ../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 "�ฟ้มสำรองข้อมูล Evolution ใช้�ารไม่ได้"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "�รุณาเลือ��ฟ้มสำรองข้อมูลของ Evolution ที่จะฟื้นคืน"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15233,55 +16075,73 @@ msgstr "_ฟื้นค่าตั้ง..."
 msgid "_Backup Settings..."
 msgstr "_สำรองค่าตั้ง..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ติดต่ออัตโนมัติ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "เพิ่มราย�ารในสมุดที่อยู่โดย_อัตโนมัติเมื่อตอบข้อความ"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "เลือ�สมุดที่อยู่สำหรับที่อยู่ติดต่ออัตโนมัติ"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "ที่อยู่ติดต่อสำหรับข้อความทันใจ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "ปรับข้อมูลที่อยู่ติดต่อ�ละรูปภาพ�ับราย�ารของ Pidgin เป็นระยะ"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "ปรับข้อมูลที่อยู่ติดต่อ�ละรูปภาพ�ับรายชื่อคู่สนทนาของ Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "เลือ�สมุดที่อยู่สำหรับคู่สนทนาของ Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 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 ""
 "เติมชื่อ�ละที่อยู่อีเมลลงในสมุดที่อยู่โดยอัตโนมัติขณะที่คุณตอบเมล "
-"รวมทั้งเติมข้อมูลที่อยู่ติดต่อข้อความทันใจจา�ราย�ารคู่สนทนาของคุณด้วย"
+"รวมทั้งเติมข้อมูลที่อยู่ติดต่อข้อความทันใจจา�รายชื่อคู่สนทนาของคุณด้วย"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 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:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างโพรเซส %s: %s"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "โพรเซสลู� Bogofilter ไม่ตอบสนอง จะฆ่าทิ้ง..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "�ารคอยโพรเซสลู� Bogofilter ถู�ขัดจังหวะ จะจบโปร��รม..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "สร้างไปป์ไปยัง Bogofilter ไม่สำเร็จ รหัสข้อผิดพลาด: %d"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "�ปลงอั�ขระในข้อความเป็น_ยูนิโค้ด"
 
@@ -15302,20 +16162,25 @@ msgid "Bogofilter Options"
 msgstr "ตัวเลือ�สำหรับ Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "ปลั๊�อิน�รองขยะ Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "�รองเมลขยะโดยใช้ Bogofilter"
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "ใช้ _SSL"
 
@@ -15335,17 +16200,18 @@ msgstr "ป�ิทินท้องถิ่น"
 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:375
-msgid "_Refresh:"
+#: ../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:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "ใ_ช้�ารเชื่อมต่อ�บบนิรภัย"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_ชื่อผู้ใช้:"
 
@@ -15443,14 +16309,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "คุณต้อง�าร�ำหนดให้ Evolution เป็นโปร��มอ่าน-เขียนเมลปริยายของคุณหรือไม่?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:624
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "ทำเครื่องหมายเป็นโฟลเดอร์_ปริยาย"
+#: ../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"
@@ -15458,9 +16335,58 @@ msgstr "�หล่งปริยาย"
 
 #: ../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 "องค์ประ�อบพื้น�านสำหรับเลือ��ำหนดป�ิทินหรือสมุดที่อยู่เป็นราย�ารป�ติ"
+msgstr "องค์ประ�อบพื้น�านสำหรับเลือ��ำหนดป�ิทินหรือสมุดที่อยู่เป็นราย�ารปริยาย"
+
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "ข้อมูลส่วนหัว_�ำหนดเอง"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "คีย์"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 ""
+"รูป�บบ�าร�ำหนดค่าข้อมูลส่วนหัวคือ:\n"
+"ชื่อของค่าข้อมูลส่วนหัว คั่นด้วย \";\""
+
+#: ../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"
@@ -15479,34 +16405,34 @@ msgid "_User:"
 msgstr "_ชื่อผู้ใช้:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "รหัสผ่านนิรภัย"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 "ตัวเลือ�นี้จะเชื่อมต่อไปยังเซิร์ฟเวอร์ Exchange โดยใช้�ารยืนยันตัวตนด้วยรหัสผ่านนิรภัย (NTLM)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "รหัสผ่านข้อความเปล่า"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 "ตัวเลือ�นี้จะเชื่อมต่อไปยังเซิร์ฟเวอร์ Exchange โดยใช้�ารยืนยันตัวตนด้วยรหัสผ่านข้อความเปล่า"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15514,83 +16440,87 @@ msgstr ""
 "ข้อความที่ระบุด้านล่างนี้จะถู�ส่งอัตโนมัติ \n"
 "ไปยัง�ต่ละคนที่ส่งเมลถึงคุณ ในขณะที่คุณไม่อยู่ที่สำนั�งาน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "ฉันไม่อยู่ที่สำนั�งาน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "ฉันอยู่ที่สำนั�งาน"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "เปลี่ยนรหัสผ่านสำหรับบั�ชี Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "จัด�ารค่าตั้งของ�ารมอบฉันทะสำหรับบั�ชี Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "เครื่องมือช่วยมอบฉันทะ"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "เบ็ดเตล็ด"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "ดูขนาดของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "ขนาดของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ค่าตั้ง Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "ยื_นยันตัวบุคคล"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "�ล่องเ_มล:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "ชนิดของ�าร_ยืนยันตัวบุคคล"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_ตรวจสอบชนิดที่รองรับ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:974
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:976
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15602,13 +16532,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 "รหัสผ่านทั้งสองอันไม่ตรง�ัน �รุณาป้อนรหัสผ่านใหม่"
 
@@ -15628,38 +16558,38 @@ msgstr "รหัสผ่านใหม่:"
 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:665
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "รหัสผ่านของคุณจะหมดอายุลงในอี� %d วัน"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "�ำหนดเอง"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../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:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "ผู้เขียน (อ่าน, สร้าง)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../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:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "สิทธิ์ของผู้รับมอบฉันทะ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "�าร�ำหนดสิทธิ์สำหรับ %s"
@@ -15667,7 +16597,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:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15677,68 +16607,68 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:364
 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:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 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:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "คุณได้รับ�ารมอบฉันทะให้เป็นตัว�ทนของ %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "มอบฉันทะให้�ับ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "ลบ�ารมอบฉันทะให้�ับ %s หรือไม่?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "ไม่สามารถเข้าใช้ Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "ไม่พบตัวผู้ใช้ใน Active Directory"
 
-#: ../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 "ไม่พบผู้รับมอบฉันทะ %s ใน Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ไม่สามารถลบผู้รับมอบฉันทะ %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "ไม่สามารถปรับข้อมูลรายชื่อผู้รับมอบฉันทะ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ไม่สามารถเพิ่มผู้รับมอบฉันทะ %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
-msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ดูราย�ารผู้รับมอบฉันทะ"
+msgstr "เ�ิดข้อผิดพลาดขณะอ่านรายชื่อผู้รับมอบฉันทะ"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
@@ -15782,22 +16712,27 @@ msgstr "_สรุป�ารอนุ�าตสิทธิ์"
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
-msgstr "_งาน:"
+msgstr "_ภาร�ิจ:"
 
-#: ../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
 msgid "Permissions..."
 msgstr "�าร�ำหนดสิทธิ์"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "ชื่อโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "ขนาดของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. 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 "บอ�รับข้อมูลจา�โฟลเดอร์ผู้ใช้อื่น"
@@ -15806,20 +16741,20 @@ msgstr "บอ�รับข้อมูลจา�โฟลเดอร์ผ
 msgid "Exchange Folder Tree"
 msgstr "ลำดับชั้นโฟลเดอร์ Exchange"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "เลิ�บอ�รับข้อมูลโฟลเดอร์..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "เลิ�บอ�รับข้อมูลจา�โฟลเดอร์ \"%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "เลิ�บอ�รับข้อมูลจา� \"%s\""
@@ -15883,15 +16818,18 @@ msgstr "รหัสผ่านของคุณจะหมดอายุล
 msgid "_Change Password"
 msgstr "เ_ปลี่ยนรหัสผ่าน"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(ไม่ได้รับอนุ�าต)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "เพิ่มผู้ใช้:"
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "เพิ่มผู้ใช้"
 
@@ -16009,15 +16947,11 @@ msgstr "ระดับความ_ป�ปิด:"
 msgid "_User"
 msgstr "ผู้ใ_ช้"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "เลือ�ผู้ใช้"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "สมุดที่อยู่..."
 
@@ -16031,7 +16965,7 @@ msgstr "บอ�รับข้อมูลป�ิทินของผู้
 
 #: ../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 "ปลั๊�อินจัด�ารป�ิบัติ�าร�ละคุณลั�ษณะต่างๆ ที่ใช้เฉพาะ�ับบั�ชี Exchange"
 
@@ -16122,10 +17056,14 @@ msgid "Could not update out-of-office state"
 msgstr "ไม่สามารถปรับข้อมูลสถานะ�ารไม่อยู่ที่ทำงาน"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Evolution ต้องเริ่มทำงานใหม่เพื่อจะโหลด�ล่องเมลของผู้ใช้ที่บอ�รับข้อมูลไว้"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "บั�ชี Exchange ทำงานออฟไลน์อยู่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16149,102 +17087,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "ไม่สามารถปรับข้อมูล�ารมอบฉันทะ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "มีโฟลเดอร์อยู่�ล้ว"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "ไม่มีโฟลเดอร์ที่อ้าง"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "โฟลเดอร์ออฟไลน์อยู่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "ข้อผิดพลาดทั่วไป"
 
-#: ../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 "ติดต่อเซิร์ฟเวอร์ Global Catalog ไม่ได้"
 
-#: ../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 "ถ้า OWA �ำลังทำงานในพาธอื่น คุณต้องระบุพาธดัง�ล่าวใน�ล่องโต้ตอบตั้งค่าบั�ชี"
 
-#: ../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 "�ล่องเมลสำหรับ {0} ไม่อยู่ในเซิร์ฟเวอร์นี้"
 
-#: ../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 "�รุณาตรวจสอบให้�น่ใจว่า URL ถู�ต้อง �ล้วลองใหม่อี�ครั้ง"
 
-#: ../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 "ไม่ได้ตั้งค่าเซิร์ฟเวอร์ Global Catalog สำหรับบั�ชีนี้ไว้"
 
-#: ../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 "ไม่มี�ล่องเมลสำหรับผู้ใช้ {0} ที่ {1}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "ไม่มีผู้ใช้ {0} ที่อ้าง"
 
-#: ../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 "�รุณาตรวจดูให้�น่ใจว่าชื่อเซิร์ฟเวอร์ Global Catalog ถู�ต้อง"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "�รุณาเริ่ม Evolution ใหม่ เพื่อให้�ารเปลี่ยน�ปลงมีผล"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "�รุณาเลือ�ผู้ใช้"
 
-#: ../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 "บั�ชี Exchange จะถู�ปิดเมื่อคุณออ�จา� Evolution"
 
-#: ../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 "บั�ชี Exchange จะถู�ลบเมื่อคุณออ�จา� Evolution"
 
-#: ../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 "เซิร์ฟเวอร์ Exchange เข้า�ันไม่ได้�ับปลั๊�อินเชื่อมต่อ Exchange"
 
-#: ../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."
@@ -16252,7 +17190,7 @@ msgstr ""
 "เซิร์ฟเวอร์ใช้ Exchange 5.5 ในขณะที่ปลั๊�อินเชื่อมต่อ Exchange \n"
 "รองรับ Microsoft Exchange 2000 �ละ 2003 เท่านั้น"
 
-#: ../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"
@@ -16265,69 +17203,70 @@ msgstr ""
 "\n"
 "หรือคุณอาจ�ค่ป้อนรหัสผ่านผิดเท่านั้นเอง"
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "ไม่สามารถเพิ่มผู้ใช้ในราย�ารควบคุม�ารเข้าถึง:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "ไม่สามารถ��้ไข�ารมอบฉันทะ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "เ�ิดข้อผิดพลาดไม่ทราบสาเหตุขณะเปิดหา {0}"
 
-#: ../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
 msgid "Unknown error."
 msgstr "เ�ิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "ชนิดไม่รู้จั�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "ผู้ใช้ย�เลิ�ป�ิบัติ�าร"
 
-#: ../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 "คุณ�ำหนดค่าบั�ชี Exchange ได้เพียงบั�ชีเดียวเท่านั้น"
 
-#: ../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 "�ารใช้งานของคุณขณะนี้คือ: {0} KB  �รุณาเคลียร์เนื้อที่โดยลบเมลบางส่วน"
 
-#: ../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 "�ารใช้งานของคุณขณะนี้คือ: {0} KB  คุณจะไม่สามารถรับหรือส่งเมลได้"
 
-#: ../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."
@@ -16335,30 +17274,38 @@ msgstr ""
 "�ารใช้งานของคุณขณะนี้คือ: {0} KB  คุณจะไม่สามารถส่งเมลได้ "
 "จน�ว่าจะเคลียร์เนื้อที่โดยลบเมลบางส่วน"
 
-#: ../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 "ไม่สามารถเพิ่ม {0} ลงในราย�ารควบคุม�ารเข้าถึงได้"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} เป็นผู้รับมอบฉันทะประชุมอยู่�ล้ว"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} อยู่ในรายชื่ออยู่�ล้ว"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr "บอ�รับข้อมูลงานของผู้ใช้อื่น"
+msgstr "บอ�รับข้อมูลภาร�ิจของผู้ใช้อื่น"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
 msgstr "ตรวจสอบ�าร�ำหนดสิทธิ์ของโฟลเดอร์"
 
+#: ../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 "
@@ -16372,23 +17319,57 @@ msgstr ""
 msgid "External Editor"
 msgstr "เครื่องมือ��้ไขข้อความภายนอ�"
 
+#: ../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 "Evolution ไม่สามารถสร้าง�ฟ้มชั่วคราวเพื่อบันทึ�เมลของคุณได้ �รุณาลองใหม่ภายหลัง"
+
+#: ../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 "เขียนข้อความด้วยเครื่องมือเขียนข้อความภายนอ�"
+msgid "Compose in _External Editor"
+msgstr "เขียนข้อความด้วยเครื่องมือ��้ไขภาย_นอ�"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "เขียนข้อความโดยใช้เครื่องมือเขียนข้อความภายนอ�"
 
-#: ../plugins/face/face.c:57
+#: ../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 ""
+"สำหรับ Emacs ใช้ \"xemacs\"\n"
+"สำหรับ VI ใช้ \"gvim\""
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "เลือ�รูป png ขนาด 48x48 จุด ที่ให�่ไม่เ�ิน 700 ไบต์"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "�ฟ้ม PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "รูป_ถ่าย"
 
@@ -16423,20 +17404,54 @@ msgstr "เลิ�บอ�รับข้อมูลโฟลเดอร์
 msgid "_Unsubscribe"
 msgstr "เ_ลิ�บอ�รับ"
 
-#: ../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
 msgid "Google"
 msgstr "�ูเ�ิล"
 
+#: ../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 "ป้อนรหัสผ่านสำหรับผู้ใช้ %s เพื่อเข้าถึงราย�ารป�ิทินที่บอ�รับไว้"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"ไม่สามารถอ่านข้อมูลจา�เซิิร์ฟเวอร์ของ�ูเ�ิล\n"
+"%s"
+
+#: ../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 "<b>เซิร์ฟเวอร์</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "ปลั๊�อินตั้งค่าป�ิทิน�ูเ�ิล"
+msgid "A plugin to setup google calendar and contacts."
+msgstr "ปลั๊�อินตั้งค่าป�ิทิน�ละที่อยู่ติดต่อ�ูเ�ิล"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "�หล่ง�ูเ�ิล"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "ราย�ารตรวจสอบ"
 
@@ -16448,7 +17463,7 @@ msgstr "ปลั๊�อินตั้งค่าป�ิทิน�ละ
 msgid "Groupwise Account Setup"
 msgstr "�ารตั้งค่าบั�ชี Groupwise"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16473,24 +17488,24 @@ msgstr ""
 "คลิ� 'ถัดไป' เพื่อติดตั้งโฟลเดอร์ที่ใช้ร่วม\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "ติดตั้งโฟลเดอร์ใช้ร่วม"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "�ารติดตั้งโฟลเดอร์ใช้ร่วม"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "ตั้งค่าเมลขยะ"
 
-#: ../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 "ตั้งค่าเมลขยะ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "ตั้งค่าเมลขยะ..."
 
@@ -16516,10 +17531,21 @@ msgid "_Junk List"
 msgstr "ราย�ารเมล_ขยะ"
 
 #: ../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 "ถอนข้อความ�ลับสำเร็จ�ล้ว"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "ถอนเมล�ลับ"
 
@@ -16527,12 +17553,6 @@ msgstr "ถอนเมล�ลับ"
 msgid "Add Send Options to groupwise messages"
 msgstr "เพิ่มตัวเลือ��ารส่งในข้อความ groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "ตัวเลือ�ของ�ารส่ง"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "ปลั๊�อินสำหรับ�ารใช้งานบั�ชี Groupwise"
@@ -16541,7 +17561,72 @@ msgstr "ปลั๊�อินสำหรับ�ารใช้งานบ
 msgid "Groupwise Features"
 msgstr "�ารใช้งาน Groupwise"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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 "ผู้ใช้ไม่ถู�ต้อง"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "ไม่สามารถให้ผู้ใช้ &quot;{0}&quot; เข้าใช้พร็อ�ซีได้"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+msgid "You have already given proxy permissions to this user."
+msgstr "คุณได้อนุ�าตให้ผู้ใช้นี้เข้าใช้พร็อ�ซีไป�ล้ว"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "มีบั�ชี &quot;{0}&quot; อยู่�ล้ว �รุณาตรวจสอบโครงสร้างโฟลเดอร์ของคุณ"
+
+#: ../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 "ลงชื่อเข้าใช้พร็อ�ซีในนาม &quot;{0]&quot; ไม่สำเร็จ �รุณาตรวจสอบที่อยู่อีเมลของคุณ"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "นี่เป็น�ารประชุมที่มี�ารเวียนซ้ำ"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "คุณจะรับหรือไม่?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "คุณต้องระบุชื่อผู้ใช้ที่คุณต้อง�ารเพิ่มเข้าในรายชื่อ"
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "อาจตอบรับ"
 
@@ -16558,7 +17643,7 @@ msgid "Con_tacts..."
 msgstr "ที่อยู่_ติดต่อ..."
 
 #: ../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 "ข้อความ"
 
@@ -16639,9 +17724,9 @@ msgstr "<b>ชื่อบั�ชี</b>"
 msgid "Proxy Login"
 msgstr "ลงบันทึ�เข้าใช้ใน�านะตัว�ทน"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16650,40 +17735,44 @@ 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:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "ลงบันทึ�เข้าใช้ใน�านะ_ตัว�ทน..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "�ท็บตัว�ทนจะใช้ได้�็ต่อเมื่อบั�ชีออนไลน์อยู่"
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "�ท็บตัว�ทนจะใช้ได้�็ต่อเมื่อบั�ชีเปิดใช้"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "ผู้ใช้"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "�รุณาป้อนชื่อผู้ใช้�ละตั้งค่า�ารอนุ�าตใช้สิทธิ์"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "โฟลเดอร์ใ_ช้ร่วมอันใหม่..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "�ารใช้ร่วม"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "�าร�จ้งเหตุ�ำหนดเอง"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "เพิ่ม   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "เปลี่ยน�ปลง"
 
@@ -16748,11 +17837,11 @@ msgstr "ปลั๊�อินตั้งค่า�หล่งป�ิท
 msgid "Hula Account Setup"
 msgstr "ตั้งค่าบั�ชี Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "ข้อมูลส่วนหัว�ำหนดเอง"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "ข้อมูลส่วนหัว IMAP"
 
@@ -16766,7 +17855,7 @@ msgstr "<b>ข้อมูลส่วนหัว IMAP</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
-msgstr "ข้อมูลส่วนหัวพื้น�าน�ละที่เ�ี่ยว�ับเ_มลลิงลิสต์ (ค่าป�ติ)"
+msgstr "ข้อมูลส่วนหัวพื้น�าน�ละที่เ�ี่ยว�ับเ_มลลิงลิสต์ (ค่าปริยาย)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
 msgid "Fetch A_ll Headers"
@@ -16805,28 +17894,28 @@ msgstr "ปลั๊�อินสำหรับ�ารใช้งานบ
 msgid "IMAP Features"
 msgstr "�ารใช้งาน IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "นำเ_ข้าไปยังป�ิทิน"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
-msgstr "นำเ_ข้าไปยังงาน"
+msgstr "นำเ_ข้าไปยังภาร�ิจ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "นำเข้า ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
-msgstr "เลือ�ราย�ารงาน"
+msgstr "เลือ�ราย�ารภาร�ิจ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "เลือ�ป�ิทิน"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:262
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_นำเข้า"
 
@@ -16862,14 +17951,15 @@ msgid ""
 msgstr ""
 "Evolution หาไอพอดที่จะ sync ด้วยไม่พบ อาจจะไม่ได้เชื่อมต่ออยู่ หรืออาจจะไม่ได้เปิดสวิตช์"
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "รูป�บบ iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "ปรับข้อมูลงาน/บันทึ�ช่วยจำ/ป�ิทิน/สมุดที่อยู่ ให้ตรง�ับ Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr "ปรับข้อมูลภาร�ิจ/บันทึ�ช่วยจำ/ป�ิทิน/สมุดที่อยู่ ให้ตรง�ับ Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16879,602 +17969,602 @@ msgstr "ปรับข้อมูลให้ตรง�ับ iPod"
 msgid "iPod Synchronization"
 msgstr "�ารปรับข้อมูลให้ตรง�ับ iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ไม่สามารถเปิดป�ิทิน '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "มีนัดหมายในป�ิทิน '%s' ชน�ับ�ารประชุมนี้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "พบนัดหมายในป�ิทิน '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "ไม่พบป�ิทินใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "ไม่พบ�ารประชุมนี้ในป�ิทินใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
-msgstr "ไม่พบงานนี้ในราย�ารงานใดเลย"
+msgstr "ไม่พบภาร�ิจนี้ในราย�ารภาร�ิจใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "ไม่พบบันทึ�ช่วยจำนี้ในราย�ารบันทึ�ช่วยจำใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "�ำลังค้นหานัดหมายนี้ที่บันทึ�ไว้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "ไม่สามารถ�จงราย�ารได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ไม่สามารถส่งราย�ารไปยังป�ิทิน '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าตอบรับ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าอาจตอบรับ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าป�ิเสธ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าย�เลิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ผู้ประสานงานได้ลบผู้รับมอบฉันทะ %s ออ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ส่งประ�าศ�ารย�เลิ�ไปยังผู้รับมอบฉันทะ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ไม่สามารถส่งประ�าศ�ารย�เลิ�ไปยังผู้รับมอบฉันทะ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจา�สถานะเป็นค่าที่ใช้ไม่ได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ไม่สามารถปรับข้อมูลผู้เข้าร่วม %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "ปรับข้อมูลผู้เข้าร่วมเรียบร้อย�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "ส่งข้อมูล�ารประชุม�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
-msgstr "ส่งข้อมูลงาน�ล้ว"
+msgstr "ส่งข้อมูลภาร�ิจ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "ส่งข้อมูลบันทึ�ช่วยจำ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ไม่สามารถส่งข้อมูล�ารประชุมได้ เนื่องจา�ไม่มี�ารประชุมนี้อยู่"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
-msgstr "ไม่สามารถส่งข้อมูลงานได้ เนื่องจา�ไม่มีงานนี้อยู่"
+msgstr "ไม่สามารถส่งข้อมูลภาร�ิจได้ เนื่องจา�ไม่มีภาร�ิจนี้อยู่"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ไม่สามารถส่งข้อมูลบันทึ�ช่วยจำได้ เนื่องจา�ไม่มีบันทึ�ช่วยจำนี้อยู่"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "ป�ิทินใช้�ารไม่ได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ข้อความอ้างว่ามีป�ิทิน �ต่ตัวป�ิทินไม่ใช่ iCalendar ที่ใช้�ารได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "ราย�ารในป�ิทินไม่ถู�ต้อง"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr "ข้อความมีป�ิทินมาด้วย �ต่ตัวป�ิทินไม่มีข้อมูลเหตุ�ารณ์ งาน หรือสถานะว่าง/ไม่ว่างใดๆ เลย"
+msgstr "ข้อความมีป�ิทินมาด้วย �ต่ตัวป�ิทินไม่มีข้อมูลเหตุ�ารณ์ ภาร�ิจ หรือสถานะว่าง/ไม่ว่างใดๆ เลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "ป�ิทินที่�นบมามีราย�ารหลายราย�าร"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "เพื่อจะดำเนินงานราย�ารทั้งหมด ควรบันทึ��ฟ้ม�ล้วนำเข้าป�ิทิน"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2133
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "�ารประชุมนี้เวียนซ้ำเป็นรอบๆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2136
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
-msgstr "งานนี้เวียนซ้ำเป็นรอบๆ"
+msgstr "ภาร�ิจนี้เวียนซ้ำเป็นรอบๆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2139
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "บันทึ�ช่วยจำนี้เวียนซ้ำเป็นรอบๆ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2354
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_ลบข้อความหลังจา�ทำ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2364
-#: ../plugins/itip-formatter/itip-formatter.c:2396
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "�ารค้นหา�ารชน�ัน"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2379
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "เลือ�ป�ิทินที่จะค้นหา�ารประชุมที่ชน�ัน"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "วันนี้"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "วันนี้ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "วันนี้ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "วันนี้ %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "พรุ่งนี้"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "พรุ่งนี้ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "พรุ่งนี้ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "พรุ่งนี้ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "พรุ่งนี้ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Ey"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Ey %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Ey %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:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Ey %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Ey %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "�รุณาตอบ�ลับในนามของ <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "ได้รับในนามของ <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> ได้�จ้งผ่าน %s ประ�าศข้อมูล�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ได้ประ�าศข้อมูล�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ได้มอบฉันทะ�ารประชุมต่อไปนี้ให้�ับคุณ:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> �จ้งผ่าน %s ขอให้คุณเข้าร่วม�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ขอให้คุณเข้าร่วม�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> �จ้งผ่าน %s ขอเพิ่มเติมข้อมูลใน�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลใน�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b> �จ้งผ่าน %s ขอข้อมูลล่าสุดของ�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ต้อง�ารข้อมูลล่าสุดของ�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> โดยผ่าน %s ได้ส่งคำตอบสำหรับ�ารประชุม�ลับมาดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ได้ส่งคำตอบสำหรับ�ารประชุม�ลับมาดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> �จ้งผ่าน %s ขอย�เลิ��ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ได้ย�เลิ��ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> �จ้งผ่าน %s เสนอขอเปลี่ยน�ปลง�ารประชุมดังนี้"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ได้เสนอขอเปลี่ยน�ปลง�ารประชุมดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ได้เสนอผ่าน %s ขอเปลี่ยน�ปลง�ารประชุมดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ได้ป�ิเสธ�ารเปลี่ยน�ปลง�ารประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> ได้�จ้งผ่าน %s ประ�าศงานต่อไปนี้:"
+msgstr "<b>%s</b> ได้�จ้งผ่าน %s ประ�าศภาร�ิจต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> ได้ประ�าศงานต่อไปนี้:"
+msgstr "<b>%s</b> ได้ประ�าศภาร�ิจต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> ร้องขอ�ารมอบหมายงานของ %s ให้�ับงานต่อไปนี้:"
+msgstr "<b>%s</b> ร้องขอ�ารมอบหมายภาร�ิจของ %s ให้�ับภาร�ิจต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> ได้�จ้งผ่าน %s ขอมอบหมายงานให้�ับคุณ:"
+msgstr "<b>%s</b> ได้�จ้งผ่าน %s ขอมอบหมายภาร�ิจให้�ับคุณ:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> ได้มอบหมายงานให้�ับคุณ:"
+msgstr "<b>%s</b> ได้มอบหมายภาร�ิจให้�ับคุณ:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> �จ้งผ่าน %s ขอเพิ่มเติมข้อมูลในงานต่อไปนี้:"
+msgstr "<b>%s</b> �จ้งผ่าน %s ขอเพิ่มเติมข้อมูลในภาร�ิจต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลในงานต่อไปนี้:"
+msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลในภาร�ิจต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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 "<b>%s</b> �จ้งผ่าน %s ขอข้อมูลล่าสุดของงานที่มี�ารมอบหมายต่อไปนี้:"
+msgstr "<b>%s</b> �จ้งผ่าน %s ขอข้อมูลล่าสุดของภาร�ิจที่มี�ารมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> ต้อง�ารข้อมูลล่าสุดของงานที่มี�ารมอบหมายต่อไปนี้:"
+msgstr "<b>%s</b> ต้อง�ารข้อมูลล่าสุดของภาร�ิจที่มี�ารมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> โดยผ่าน %s ได้ส่งคำตอบสำหรับงานที่มี�ารมอบหมาย�ลับมาดังนี้:"
+msgstr "<b>%s</b> โดยผ่าน %s ได้ส่งคำตอบสำหรับภาร�ิจที่มี�ารมอบหมาย�ลับมาดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> ได้ส่งคำตอบสำหรับงานที่มี�ารมอบหมาย�ลับมาดังนี้:"
+msgstr "<b>%s</b> ได้ส่งคำตอบสำหรับภาร�ิจที่มี�ารมอบหมาย�ลับมาดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> ได้�จ้งผ่าน %s ย�เลิ�งานที่มี�ารมอบหมายต่อไปนี้:"
+msgstr "<b>%s</b> ได้�จ้งผ่าน %s ย�เลิ�ภาร�ิจที่มี�ารมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> ได้ย�เลิ�งานที่มี�ารมอบหมายต่อไปนี้:"
+msgstr "<b>%s</b> ได้ย�เลิ�ภาร�ิจที่มี�ารมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> �จ้งผ่าน %s เสนอเปลี่ยน�ปลงงานที่มี�ารมอบหมายดังนี้:"
+msgstr "<b>%s</b> �จ้งผ่าน %s เสนอเปลี่ยน�ปลง�ารมอบหมายภาร�ิจดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ได้เสนอเปลี่ยน�ปลงงานที่มี�ารมอบหมายดังนี้:"
+msgstr "<b>%s</b> ได้เสนอเปลี่ยน�ปลง�ารมอบหมายภาร�ิจดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> ได้เสนอผ่าน %s ขอเปลี่ยน�ปลงงานที่มี�ารมอบหมายดังนี้:"
+msgstr "<b>%s</b> ได้เสนอผ่าน %s ขอเปลี่ยน�ปลงภาร�ิจที่มี�ารมอบหมายดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> ได้ป�ิเสธ�ารมอบหมายงานต่อไปนี้:"
+msgstr "<b>%s</b> ได้ป�ิเสธ�ารมอบหมายภาร�ิจต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ได้�จ้งผ่าน %s ประ�าศบันทึ�ช่วยจำต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ได้ประ�าศบันทึ�ช่วยจำต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> �จ้งผ่าน %s ขอเพิ่มเติมข้อมูลในบันทึ�ช่วยจำต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลในบันทึ�ช่วยจำต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> �จ้งผ่าน %s ขอย�เลิ�บันทึ�ช่วยจำใช้ร่วมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ได้ย�เลิ�บันทึ�ช่วยจำต่อไปนี้:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_เปิดป�ิทิน"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_ป�ิเสธ"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "ตอบ_รับ"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_ป�ิเสธทั้งหมด"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "ตอบรับไ_ม่ยืนยันทั้งหมด"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "ตอบรับไ_ม่ยืนยัน"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "ตอบ_รับทั้งหมด"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_ส่งข้อมูล"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_ปรับข้อมูลสถานะผู้เข้าร่วมประชุม"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_ปรับข้อมูล"
 
@@ -17512,7 +18602,7 @@ msgstr "�สดงเวลาว่า_ว่าง"
 
 #: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
-msgstr "_งาน :"
+msgstr "_ภาร�ิจ :"
 
 #: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
@@ -17577,8 +18667,9 @@ msgstr "ส่งข้อความ D-BUS เมื่อมีเมลใà¸
 
 #: ../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 "ถ้า�ำหนดเป็นจริง จะใช้เสียงบี๊ป มิฉะนั้น �็จะเล่น�ฟ้มเสียงเมื่อมีข้อความใหม่เข้ามา"
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "ถ้า�ำหนดเป็น \"true\" จะใช้เสียงบี๊ป มิฉะนั้น �็จะเล่น�ฟ้มเสียงเมื่อมีข้อความใหม่เข้ามา"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17624,8 +18715,16 @@ msgstr "�ำหนดว่าจะ�จ้งข้อความใหม
 msgid "Generate a _D-Bus message"
 msgstr "ส่งข้อความ _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "�าร�จ้งเมลของ Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17636,58 +18735,59 @@ msgid_plural ""
 msgstr[0] ""
 "คุณได้รับข้อความใหม่ %d ข้อความ\n"
 "ใน %s"
-msgstr[1] "คุณได้รับข้อความใหม่ %d ข้อความ\n"
+msgstr[1] ""
+"คุณได้รับข้อความใหม่ %d ข้อความ\n"
 "ใน %s"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "อีเมลใหม่"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "�สดงไอคอนในพื้นที่�_จ้งเหตุ"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_�ะพริบไอคอนในพื้นที่�จ้งเหตุ"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "ผุด_ข้อความขึ้นพร้อม�ับไอคอนด้วย"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "ส่งเ_สียงเมื่อมีข้อความเข้ามาใหม่"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "เสียง_บี๊ป"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "เล่น�_ฟ้มเสียง"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "_ระบุชื่อ�ฟ้ม:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "เลือ��ฟ้มเสียง"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "เ_ล่น"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "�จ้งข้อความใหม่เฉพาะสำหรับ�ล่องจดหมายเ_ข้าเท่านั้น"
 
@@ -17717,36 +18817,36 @@ msgstr "�_ปลงไปเป็น�ารประชุม"
 msgid "Mail to meeting"
 msgstr "จา�เมลเป็น�ารประชุม"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ไม่สามารถเปิดป�ิทิน  %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../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 "ปลั๊�อินช่วยสร้างงานจา�เนื้อหาข้อความในเมล"
+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 "�_ปลงไปเป็นงาน"
+msgstr "�_ปลงไปเป็นภาร�ิจ"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
-msgstr "จา�เมลเป็นงาน"
+msgstr "จา�เมลเป็นภาร�ิจ"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 msgid "Convert the selected message to a new task"
-msgstr "�ปลงข้อความที่เลือ�เป็นงานชิ้นใหม่"
+msgstr "�ปลงข้อความที่เลือ�เป็นภาร�ิจชิ้นใหม่"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -17830,7 +18930,7 @@ msgstr "ส่งอีเมลไปยังเมลลิงลิสต์
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17911,6 +19011,26 @@ msgstr "ส_มัครเข้าลิสต์"
 msgid "_Unsubscribe from List"
 msgstr "เ_ลิ�บอ�รับข้อมูลจา�ลิสต์"
 
+#: ../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 "ทำเครื่องหมายอ่าน�ล้วทั้งหมด"
@@ -17953,7 +19073,7 @@ msgstr "ปลั๊�อินสำหรับจัด�ารเปิด
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "ผู้จัด�ารปลั๊�อิน"
 
@@ -17965,33 +19085,24 @@ msgstr "เปิดหรือปิดใช้งานปลั๊�อิ
 msgid "_Plugins"
 msgstr "_ปลั๊�อิน"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "ผู้เขียน"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "คำบรรยาย"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "ค่าตั้ง"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "หมายเหตุ: �ารเปลี่ยน�ปลงบางอย่างจะยังไม่มีผลจน�ว่าจะเริ่ม�ารทำงานใหม่"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "ภาพรวม"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "ค่าตั้ง"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "ไม่มีตัวเลือ�ค่าตั้งสำหรับปลั๊�อินนี้"
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "ปลั๊�อิน"
 
@@ -18015,41 +19126,22 @@ msgstr "โหมดข้อความล้วน"
 msgid "Prefer plain-text"
 msgstr "ชอบใช้ข้อความล้วน"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "�สดง HTML ถ้าส่งมาด้วย"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "�สดงข้อความล้วนถ้าเป็นไปได้"
 
-#: ../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
 msgid "HTML _Mode"
 msgstr "โ_หมด HTML"
 
-#: ../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 "พิมพ์ข้อความ"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "ตัวอ_ย่าง�่อนพิมพ์"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "พิมพ์ข้อความ"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "เครื่องมือวัดประสิทธิภาพ Evolution"
@@ -18074,13 +19166,7 @@ msgstr "ตำ�หน่ง"
 msgid "_Publish Calendar Information"
 msgstr "ข้อมูล�าร�ปะ_ประ�าศป�ิทิน"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "ป้อนรหัสผ่านสำหรับ `%s'"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "คุณ�น่ใจหรือไม่ว่า ต้อง�ารลบ URL นี้?"
 
@@ -18168,15 +19254,75 @@ msgstr ""
 "iCal\n"
 "ว่าง/ไม่ว่าง"
 
+#: ../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 "ปลั๊�อินทดสอบสำหรับตัวโหลด EPlugin ไพธอน"
+
+#: ../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:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (�ังในตัว)"
 
-#: ../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:134
+#, 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
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "ไม่สามารถสร้างไปป์: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "เ�ิดข้อผิดพลาดหลัง fork: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "โพรเซสลู� SpamAssassin ไม่ตอบสนอง จะฆ่าทิ้ง..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "�ารคอยโพรเซสลู� Spamassassin ถู�ขัดจังหวะ จะจบโปร��รม..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "สร้างไปป์ไปยัง SpamAssassin ไม่สำเร็จ รหัสข้อผิดพลาด: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "ไม่มี SpamAssassin"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ารทดสอบนี้จะทำให้ SpamAssassin น่าเชื่อถือขึ้น �ต่ทำงานช้าลง"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "_ทดสอบโฮสต์ระยะไ�ลด้วย"
 
@@ -18200,7 +19346,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:314
 msgid "Save attachments"
 msgstr "บันทึ�เอ�สาร�นบ"
 
@@ -18212,16 +19358,15 @@ msgstr "บันทึ�เอ�สาร�นบ..."
 msgid "Save all attachments"
 msgstr "บันทึ�เอ�สาร�นบทั้งหมด"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "เลือ�ชื่อต้นสำหรับ�ารบันทึ�"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "ชนิด 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:347
 msgid "Save"
 msgstr "บันทึ�"
 
@@ -18229,79 +19374,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "ราย�ารคำบรรยาย"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "รายชื่อหมวด"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "ราย�ารหมายเหตุ"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "สร้าง"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "รายชื่อที่อยู่ติดต่อ"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "เริ่ม"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "สิ้นสุด"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "ร้อยละที่เสร็จ"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "รายชื่อผู้เข้าร่วมประชุม"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "เปลี่ยน�ปลง"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "ตัวเลือ�ขั้นสูลสำหรับรูป�บบ CSV"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "เติมข้อมูลส่วนหัว"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "เครื่องหมายคั่นระหว่างค่า:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "เครื่องหมายคั่นระเบียน:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "ครอบค่าด้วย:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "รูป�บบคั่นด้วยจุลภาค (.csv)"
 
@@ -18311,7 +19456,7 @@ msgstr "บันทึ�สิ่งที่เลือ�"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
-msgstr "บันทึ�ป�ิทินหรือราย�ารงานที่เลือ�ลงดิส�์"
+msgstr "บันทึ�ป�ิทินหรือราย�ารภาร�ิจที่เลือ�ลงดิส�์"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -18322,15 +19467,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:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "รูป�บบ RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "เลือ��ฟ้มปลายทาง"
 
@@ -18340,7 +19485,7 @@ msgstr "เลือ��หล่งเดียว"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
-msgstr "เลือ��หล่งป�ิทินหรืองานเพียง�หล่งเดียวเพื่อดู"
+msgstr "เลือ��หล่งป�ิทินหรือภาร�ิจเพียง�หล่งเดียวเพื่อดู"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -18352,25 +19497,25 @@ msgstr "à¹�สดงเฉพาะ_บันทึà¸�ช่วยจำนีà¹
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "�สดงเฉพาะราย�าร_งานนี้"
+msgstr "�สดงเฉพาะราย�าร_ภาร�ิจนี้"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "ปลั๊�อินจัด�ารเครื่องมืออัตโนมัติขณะเริ่มโปร��รม"
+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 "เครื่องมืออัตโนมัติขณะเริ่มโปร��รม"
+msgid "Setup Assistant"
+msgstr "ผู้ช่วยตั้งค่า"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "ผู้ช่วยตั้งค่า Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "ยินดีต้อนรับ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18382,29 +19527,29 @@ msgstr ""
 "\n"
 "�รุณา�ดปุ่ม \"ถัดไป\" เพื่อทำงานต่อ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "�ารนำเข้า�ฟ้ม"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "�รุณาเลือ�ข้อมูลที่คุณต้อง�ารนำเข้า:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "จา� %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "�ำลังนำเข้าข้อมูล"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "�รุณารอสั�ครู่"
 
@@ -18421,10 +19566,32 @@ msgid "Thread messages by subject"
 msgstr "จัด�ระทู้ข้อความด้วยหัวข้อเรื่อง"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "พยายามจัด_�ระทู้ด้วยหัวข้อเรื่อง"
 
+#: ../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:615
+msgid "No title"
+msgstr "ไม่มีชื่อ"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "บันทึ�เป็น�_ม่�บบ"
+
+#: ../plugins/templates/templates.c:745
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "ปลั๊�อินอย่างง่ายที่ใช้ ytnef อ่านเอ�สาร�นบ tnef"
@@ -18433,6 +19600,28 @@ msgstr "ปลั๊�อินอย่างง่ายที่ใช้ yt
 msgid "TNEF Attachment decoder"
 msgstr "ปลั๊�อินอ่านเอ�สาร�นบ TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "ปลั๊�อินตั้งค่าที่อยู่ติดต่อ WebDAV"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "ที่อยู่ติดต่อ WebDAV"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+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)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "เชลล์ Evolution"
@@ -18450,16 +19639,16 @@ msgid "Evolution Test component"
 msgstr "องค์ประ�อบทดสอบ Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "ข้อความบรรยายค่าตั้งเครื่องพิมพ์ปัจจุบัน"
+msgid "Authenticate proxy server connections"
+msgstr "ยืนยันตัวบุคคลใน�ารเชื่อมต่อไปยังเซิร์ฟเวอร์พร็อ�ซี"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "รุ่นของค่าตั้ง"
+msgid "Automatic proxy configuration URL"
+msgstr "URL สำหรับตั้งค่าพร็อ�ซีอัตโนมัติ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "�ำหนดว่าจะเรีย�ทำงานส่วนตรวจจับ�ารพังหรือไม่"
+msgid "Configuration version"
+msgstr "รุ่นของค่าตั้ง"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18478,57 +19667,124 @@ msgid "Default window width"
 msgstr "ความ�ว้างของหน้าต่างโดยปริยาย"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "เปิดใช้ค่าตั้งพร็อ�ซีเมื่อติดต่อ HTTP/HTTP นิรภัย ในอินเทอร์เน็ต"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr "ชื่อโฮสต์พร็อ�ซี่ HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr "รหัสผ่านพร็อ�ซี HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "พอร์ตพร็อ�ซี HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "ชื่อผู้ใช้พร็อ�ซี HTTP"
+
+#: ../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 หรือชื่อเล่นขององค์ประ�อบที่จะ�สดงโดยปริยายเมื่อเริ่มโปร��รม"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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 ""
+"ถ้าเป็นค่าจริง �ารเชื่อมต่อมายังเซิร์ฟเวอร์พร็อ�ซีจะต้องมี�ารยืนยันตัวบุคคล ชื่อผู้ใช้จะดึงมาจา�คีย์ \"/"
+"apps/evolution/shell/network_config/authentication_user\" ของ GConf "
+"�ละรหัสผ่านจะดึงมาจา� gnome-keyring หรือไม่�็�ฟ้มรหัสผ่าน ~/.gnome2_private/Evolution"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "รุ่นล่าสุดของ�ารปรับรุ่นค่าตั้ง"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "ราย�ารของพาธของโฟลเดอร์ที่จะปรับข้อมูลลงดิส�์ให้ตรง�ัน เพื่อใช้งาน�บบออฟไลน์"
+msgstr "รายชื่อพาธของโฟลเดอร์ที่จะปรับข้อมูลลงดิส�์ให้ตรง�ัน เพื่อใช้งาน�บบออฟไลน์"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../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 "รหัสผ่านที่จะส่งเพื่อยืนยันตัวบุคคลเมื่อจะใช้พร็อ�ซี HTTP"
+
+#: ../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 "ชื่อโฮสต์พร็อ�ซี SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr "พอร์ตพร็อ�ซี SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr "ชื่อโฮสต์พร็อ�ซี HTTP นิรภัย"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr "พอร์ตพร็อ�ซี HTTP นิรภัย"
+
+#: ../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 ""
+"เลือ�โหมด�ารตั้งค่าพร็อ�ซี ค่าที่ใช้ได้คือ 0, 1, 2, �ละ 3 ซึ่งหมายความถึง \"ใช้ค่าตั้งของระบบ"
+"\", \"ไม่ใช้พร็อ�ซี\", \"ใช้�ารตั้งค่าพร็อ�ซี�บบ�ำหนดเอง\" �ละ \"ใช้�ารตั้งค่าที่ได้จา� URL "
+"ค่าตั้งอัตโนมัติ\" ตามลำดับ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "�สดง�ถบข้าง"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "ข้าม�ล่องโต้ตอบเตือนสถานะ�ำลังพัฒนา"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "ข้าม�ล่องโต้ตอบเตือน�ารฟื้นตัว"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:569
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "เริ่มในโหมดออฟไลน์"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "�สดง�ถบสถานะ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../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 "รุ่นของค่าตั้งของ Evolution ในรูป�บบ รุ่นให�่.รุ่นย่อย.ระดับค่าตั้ง (เช่น \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "ความสูงปริยายของหน้าต่างหลั� เป็นพิ�เซล"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "ความ�ว้างปริยายของหน้าต่างหลั� เป็นพิ�เซล"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "ความ�ว้างปริยายของ�ถบข้าง เป็นพิ�เซล"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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\")."
@@ -18536,7 +19792,43 @@ msgstr ""
 "รุ่นล่าสุดของ�ารปรับรุ่นค่าตั้งของ Evolution ในรูป�บบ รุ่นให�่.รุ่นย่อย.ระดับค่าตั้ง (เช่น \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr "ชื่อเครื่องที่จะใช้เป็นพร็อ�ซี HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr "ชื่อเครื่องที่จะใช้เป็นพร็อ�ซี HTTP นิรภัย"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr "ชื่อเครื่องที่จะใช้เป็นพร็อ�ซี socks"
+
+#: ../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 ""
+"พอร์ตของเครื่องที่�ำหนดโดย \"/apps/evolution/shell/network_config/http_host\" "
+"ที่คุณใช้เป็นพร็อ�ซี"
+
+#: ../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 ""
+"พอร์ตของเครื่องที่�ำหนดโดย \"/apps/evolution/shell/network_config/secure_host\" "
+"ที่คุณใช้เป็นพร็อ�ซี"
+
+#: ../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 ""
+"พอร์ตของเครื่องที่�ำหนดโดย \"/apps/evolution/shell/network_config/socks_host\" "
+"ที่คุณใช้เป็นพร็อ�ซี"
+
+#: ../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 "
@@ -18545,52 +19837,67 @@ msgstr ""
 "รูป�บบของปุ่มหน้าต่าง สามารถเป็น \"text\", \"icons\", \"both\" หรือ \"toolbar\" "
 "ถ้า�ำหนดเป็น \"toolbar\" รูป�บบของปุ่มจะ�ำหนดโดยค่าตั้ง�ถบเครื่องมือของ GNOME"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 ""
+"คีย์นี้เ�็บรายชื่อโฮสต์ที่จะเชื่อมต่อโดยตรงโดยไม่ผ่านพร็อ�ซี ค่าที่�ำหนดอาจอยู่ในรูปชื่อโฮสต์, โดเมน "
+"(โดยใช้ wildcard ในส่วนหน้า เช่น *.foo.com), หมายเลขไอพี (ได้ทั้ง IPv4 �ละ IPv6) "
+"หรือที่อยู่เครือข่ายพร้อมเน็ต�มส�์ (ตัวอย่างเช่น 192.168.0.0/24)"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "�สดง�ถบเครื่องมือ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "URL that provides proxy configuration values."
+msgstr "URL ที่เตรียมค่าตั้งพร็อ�ซีไว้ให้"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr "ใช้พร็อ�ซี HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "ชื่อผู้ใช้ที่จะใช้ยืนยันตัวบุคคลเมื่อจะใช้พร็อ�ซี HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "�ำหนดว่า Evolution จะเริ่มทำงานในโหมดออฟไลน์�ทนโหมดออนไลน์หรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr "�ำหนดว่าจะตรวจจับ�ารพังหรือไม่"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "�ำหนดว่าจะ�สดงหน้าต่างขยายเต็มจอหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "�ำหนดว่าจะ�สดง�ถบข้างหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "�ำหนดว่าจะ�สดง�ถบสถานะหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "�ำหนดว่าจะ�สดง�ถบเครื่องมือหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "�ำหนดว่าจะข้าม�ล่องโต้ตอบเตือนเมื่อใช้ Evolution รุ่น�ำลังพัฒนาหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "�ำหนดว่าจะข้าม�ล่องโต้ตอบเตือนขณะ Evolution ฟื้นตัวหรือไม่"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "�ำหนดว่าจะ�สดงปุ่มต่างๆ ในหน้าต่างหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "รูป�บบของปุ่มหน้าต่าง"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "�สดงปุ่มหน้าต่าง"
 
@@ -18606,27 +19913,21 @@ msgstr "�ารเชื่อมต่อที่ทำงานอยู่
 msgid "Click OK to close these connections and go offline"
 msgstr "คลิ� \"ต�ลง\" เพื่อปิด�ารเชื่อมต่อเหล่านี้ �ล้วเปลี่ยนเป็นโหมดออฟไลน์"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "เลือ�ชนิดของ�ารนำเข้าที่จะทำ:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"เลือ��ฟ้มที่คุณต้อง�ารนำเข้ามายัง Evolution �ล้วเลือ�ชนิดของ�ฟ้มดัง�ล่าวจา�ราย�าร\n"
-"\n"
-"คุณสามารถเลือ� \"อัตโนมัติ\" ได้ ถ้าคุณไม่ทราบ �ล้ว Evolution จะพยายามตรวจสอบเอง"
+"of file it is from the list."
+msgstr "เลือ��ฟ้มที่คุณต้อง�ารนำเข้ามายัง Evolution �ล้วเลือ�ชนิดของ�ฟ้มดัง�ล่าวจา�รายชื่อ"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "เลือ�ปลายทางของ�ารนำเข้านี้"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -18637,23 +19938,23 @@ msgstr ""
 "Pine, Netscape, Elm, iCalendar �ต่ไม่พบค่าตั้งที่สามารถนำเข้าได้เลย\n"
 "ถ้าคุณต้อง�ารลองใหม่อี�ครั้ง �รุณาคลิ�ปุ่ม \"ย้อน�ลับ\"\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "ชื่อ�_ฟ้ม:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "เลือ��ฟ้ม"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_ชนิด�ฟ้ม:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "นำเข้าข้อมูล�ละค่าตั้งจา�โปร��รมเ_�่า"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "นำเข้า�ฟ้ม�ฟ้มเ_ดียว"
 
@@ -18661,54 +19962,34 @@ msgstr "นำเข้า�ฟ้ม�ฟ้มเ_ดียว"
 msgid "Evolution Preferences"
 msgstr "ปรับ�ต่ง Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "ไม่ได้ระบุชื่อโฟลเดอร์"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "ชื่อโฟลเดอร์มีอั�ขระ Return ไม่ได้"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "ชื่อโฟลเดอร์มีอั�ขระ \"/\" ไม่ได้"
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "ชื่อโฟลเดอร์มีอั�ขระ \"#\" ไม่ได้"
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' �ละ '..' เป็นชื่อโฟลเดอร์ที่สงวนไว้"
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 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 "ไม่พบเครื่องมือ GNOME Pilot ติดตั้งในระบบ"
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ใช้ %s"
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "ไม่ได้ติดตั้งเครื่องมือรายงานบั๊� (bug buddy)"
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "เรีย�เครื่องมือรายงานบั๊� (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:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "สุปราณี ธีระวัฒนสุข <supranee@opentle.org>\n"
@@ -18717,65 +19998,73 @@ msgstr ""
 "ถ้ามีเวลาโปรดมาช่วย�ัน�ปล :-)\n"
 "http://gnome-th.sf.net"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "เว็บไซต์ Evolution"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "เ�ิดข้อผิดพลาดขณะเปิดเว็บหน้าคำถามที่ถามบ่อย"
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "ทำงานออ_นไลน์"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ทำงานออ_ฟไลน์"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution �ำลังออนไลน์อยู่ คุณ�ดปุ่มนี้ได้เพื่อให้ออฟไลน์"
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution �ำลังออนไลน์อยู่\n"
+"�ดปุ่มนี้ถ้าต้อง�ารให้ออฟไลน์"
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution �ำลังเปลี่ยน�ารทำงานเป็นออฟไลน์"
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution �ำลังออฟไลน์อยู่ คุณ�ดปุ่มนี้ได้เพื่อให้ออนไลน์"
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution �ำลังออฟไลน์อยู่\n"
+"�ดปุ่มนี้ถ้าต้อง�ารให้ออนไลน์"
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "เปลี่ยนไปที่%s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "ข้อผิดพลาดไม่ทราบสาเหตุของระบบ"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "อาร์�ิวเมนต์ผิดพลาด"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "ไม่สามารถลงทะเบียน�ับ OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "ไม่พบ�านข้อมูลค่าตั้ง"
 
@@ -18785,15 +20074,16 @@ msgstr "ไม่พบ�านข้อมูลค่าตั้ง"
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "�ารทดสอบใหม่"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
 msgstr "_ทดสอบ"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "สร้างราย�ารทดสอบใหม่"
 
@@ -18836,7 +20126,7 @@ msgstr ""
 "เข้าสู่ Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18870,7 +20160,7 @@ msgstr ""
 "เราหวังว่าคุณจะพึงพอใจ�ับผลของ�ารทำงานอย่างหนั�ของเรา\n"
 "�ละเรา�ำลังรอคอย�ารร่วมสมทบของคุณอย่างใจจดใจจ่อ!\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18878,66 +20168,43 @@ msgstr ""
 "ขอขอบคุณ\n"
 "ทีมงาน Evolution\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "ไม่ต้องบอ�ฉันอี�"
 
-#: ../shell/main.c:307
-msgid "Evolution Crash Detection"
-msgstr "�ารตรวจจับ�ารพังของ Evolution"
-
-#: ../shell/main.c:309
-msgid "Ig_nore"
-msgstr "ไ_ม่สนใจ"
-
-#: ../shell/main.c:324
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"ดูเหมือน Evolution จะจบ�ารทำงาน�บบผิดป�ติใน�ารทำงานครั้ง�่อน\n"
-"�ละเพื่อเป็นมาตร�ารป้อง�ัน ช่อง�สดงตัวอย่างข้อความต่างๆ จะถู�ซ่อนทั้งหมด\n"
-"คุณสามารถเรีย�ช่อง�สดงตัวอย่างดัง�ล่าวคืนมาได้ โดยใช้เมนูมุมมอง\n"
-
-#: ../shell/main.c:335
-msgid "_Do not show this message again"
-msgstr "ไ_ม่ต้อง�สดงข้อความนี้อี�"
-
-#: ../shell/main.c:567
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "เรีย� Evolution โดยเปิดใช้องค์ประ�อบที่�ำหนด"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "เริ่มทำงานในโหมดออนไลน์"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "บังคับปิดองค์ประ�อบทั้งหมดของ Evolution"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "บังคับปรับรุ่นข้อมูลใหม่จา� Evolution 1.4"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "ส่งข้อความดีบั๊�ของทุ�องค์ประ�อบลง�ฟ้ม"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "ปิด�ารโหลดปลั๊�อินใดๆ"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "ไม่ใช้ช่อง�สดงตัวอย่างสำหรับเมล, ที่อยู่ติดต่อ �ละงาน"
+msgstr "ไม่ใช้ช่อง�สดงตัวอย่างสำหรับเมล, ที่อยู่ติดต่อ �ละภาร�ิจ"
 
-#: ../shell/main.c:615
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution: โปร��รมจัด�ารข้อมูลส่วนบุคคล�ละไคลเอนต์อีเมล"
 
-#: ../shell/main.c:628
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19075,27 +20342,34 @@ msgstr ""
 "\n"
 "ถ้าคุณเลือ�ที่จะดำเนิน�ารต่อ คุณอาจไม่สามารถใช้ข้อมูลเ�่าบางส่วนของคุณได้อี�\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
+"ใบรับรอง '%s' เป็นใบรับรอง CA\n"
+"\n"
+"��้ไขค่าตั้งความเชื่อถือ:"
 
-#: ../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 "
 "unless otherwise indicated here"
 msgstr ""
+"เนื่องจา�คุณไม่เชื่อถือองค์�รรับรองซึ่งออ�ใบรับรองนี้ "
+"ดังนั้นจึงเท่า�ับคุณไม่เชื่อถือความ�ท้ของใบรับรองนี้ด้วย นอ�จา�จะมี�ารระบุเป็นอย่างอื่นที่นี่"
 
 #: ../smime/gui/certificate-manager.c:137
 #: ../smime/gui/certificate-manager.c:380
@@ -19145,22 +20419,27 @@ msgstr "ที่อยู่อีเมล"
 msgid "All CA certificate files"
 msgstr "�ฟ้มใบรับรอง CA ทั้งหมด"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "เครื่องมือดูใบรับรอง: %s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "ป้อนรหัสผ่านสำหรับ `%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 "ป้อนรหัสผ่านใหม่สำหรับ�านข้อมูลใบรับรอง"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "ป้อนรหัสผ่านใหม่"
 
 #. 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"
@@ -19169,7 +20448,7 @@ msgstr ""
 "ออ�ให้�ับ:\n"
 "   เรื่อง: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19178,25 +20457,25 @@ msgstr ""
 "ออ�ให้โดย:\n"
 "    เรื่อง: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "เลือ�ใบรับรอง"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "<ไม่ใช่ส่วนหนึ่งของใบรับรอง>"
 
 #: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
-msgstr ""
+msgstr "<b>เขตข้อมูลใบรับรอง</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>ลำดับชั้นใบรับรอง</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
-msgstr ""
+msgstr "<b>ค่าของเขตข้อมูล</b>"
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
@@ -19220,53 +20499,55 @@ msgstr "<b>อายุใช้งาน</b>"
 
 #: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
-msgstr ""
+msgstr "องค์�ร"
 
 #: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
-msgstr ""
+msgstr "สำรอง"
 
 #: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
-msgstr ""
+msgstr "สำรองทั้งหมด"
 
 #: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
+"�่อนที่จะเชื่อถือ CA นี้เพื่อจุดประสงค์ใดๆ คุณควรตรวจสอบใบรับรองนี้ "
+"พร้อมทั้งนโยบาย�ละ�ระบวน�ารด้วย (ถ้ามี)"
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
-msgstr ""
+msgstr "ใบรับรอง"
 
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
-msgstr ""
+msgstr "ความเชื่อถือองค์�รออ�ใบรับรอง"
 
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
-msgstr ""
+msgstr "รายละเอียดใบรับรอง"
 
 #: ../smime/gui/smime-ui.glade.h:17
 msgid "Certificates Table"
-msgstr ""
+msgstr "ตารางใบรับรอง"
 
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
-msgstr ""
+msgstr "ชื่อสามั� (CN)"
 
 #: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
-msgstr ""
+msgstr "ใบรับรองของผู้ติดต่อ"
 
 #: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "ไม่เชื่อถือความ�ท้ของใบรับรองนี้"
 
 #: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
-msgstr ""
+msgstr "หน้าต่างหุ่นเท่านั้น"
 
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
@@ -19274,15 +20555,15 @@ msgstr "��้ไข"
 
 #: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
-msgstr ""
+msgstr "ค่าตั้งความเชื่อถือใบรับรองอีเมล"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
-msgstr ""
+msgstr "ใบรับรองผู้รับอีเมล"
 
 #: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
-msgstr ""
+msgstr "ใบรับรองผู้เซ็น�ำ�ับอีเมล"
 
 #: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
@@ -19302,11 +20583,11 @@ msgstr "ลายนิ้วมือ MD5"
 
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
-msgstr ""
+msgstr "องค์�ร (O)"
 
 #: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
-msgstr ""
+msgstr "หน่วยงานองค์�ร (OU)"
 
 #: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
@@ -19314,57 +20595,57 @@ msgstr "ลายนิ้วมือ SHA1"
 
 #: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
-msgstr ""
+msgstr "ใบรับรองลู�ข่าย SSL"
 
 #: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
-msgstr ""
+msgstr "ใบรับรอง�ม่ข่าย SSL"
 
 #: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "เชื่อถือความ�ท้ของใบรับรองนี้"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr ""
+msgstr "เชื่อถือ CA นี้ใน�ารระบุผู้ใช้อีเมล"
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr ""
+msgstr "เชื่อถือ CA นี้ใน�ารระบุนั�พัฒนาซอฟต์�วร์"
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr ""
+msgstr "เชื่อถือ CA นี้ใน�ารระบุเว็บไซต์"
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
-msgstr ""
+msgstr "ดู"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
+msgstr "คุณมีใบรับรองจา�องค์�รต่อไปนี้ซึ่งระบุตัวคุณ:"
 
 #: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr ""
+msgstr "คุณมีใบรับรองใน�ฟ้มซึ่งระบุองค์�รรับรองต่อไปนี้:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
+msgstr "คุณมีใบรับรองใน�ฟ้มซึ่งระบุบุคคลต่อไปนี้:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
-msgstr ""
+msgstr "ใบรับรองของคุณ"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr ""
+msgstr "�_�้ไขความเชื่อถือ CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
-msgstr ""
+msgstr "มีใบรับรองอยู่�ล้ว"
 
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
@@ -19397,44 +20678,44 @@ msgstr "รุ่นที่ 3"
 
 #: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "MD2 พร้อม�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
 #: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "MD5 พร้อม�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
 #: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "SHA-1 พร้อม�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
 #: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
 #: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
-msgstr ""
+msgstr "�ารใช้�ุ��จใบรับรอง"
 
 #: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
-msgstr ""
+msgstr "ชนิดใบรับรองของเน็ตสเคป"
 
 #: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
-msgstr ""
+msgstr "ตัวระบุ�ุ��จองค์�รออ�ใบรับรอง"
 
 #: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "ตัวระบุอ็อบเจ�ต์ (%s)"
 
 #: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "ตัวระบุอัล�อริทึม"
 
 #: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "พารามิเตอร์ของอัล�อริทึม"
 
 #: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
@@ -19450,59 +20731,59 @@ msgstr ""
 
 #: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
-msgstr ""
+msgstr "ข้อผิดพลาด: ไม่สามารถประมวลผลส่วนขยาย"
 
 #: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
-msgstr ""
+msgstr "ผู้เซ็น�ำ�ับอ็อบเจ�ต์"
 
 #: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
-msgstr ""
+msgstr "องค์�รออ�ใบรับรอง SSL"
 
 #: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
-msgstr ""
+msgstr "องค์�รออ�ใบรับรองอีเมล"
 
 #: ../smime/lib/e-cert.c:867
 msgid "Signing"
-msgstr ""
+msgstr "�ารเซ็น�ำ�ับ"
 
 #: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
-msgstr ""
+msgstr "�ารรับรองความ�ท้"
 
 #: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
-msgstr ""
+msgstr "�ารเข้ารหัสลับ�ุ��จ"
 
 #: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
-msgstr ""
+msgstr "�ารเข้ารหัสลับข้อมูล"
 
 #: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
-msgstr ""
+msgstr "�ารยอมรับ�ุ��จ"
 
 #: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
-msgstr ""
+msgstr "ใช้เซ็น�ำ�ับใบรับรอง"
 
 #: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
-msgstr ""
+msgstr "ใช้เซ็น�ำ�ับ CRL"
 
 #: ../smime/lib/e-cert.c:939
 msgid "Critical"
-msgstr ""
+msgstr "สำคั�มา�"
 
 #: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
-msgstr ""
+msgstr "ไม่สำคั�มา�"
 
 #: ../smime/lib/e-cert.c:965
 msgid "Extensions"
-msgstr ""
+msgstr "ส่วนขยาย"
 
 #: ../smime/lib/e-cert.c:1036
 #, c-format
@@ -19511,7 +20792,7 @@ msgstr "%s = %s"
 
 #: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
-msgstr ""
+msgstr "อัล�อริทึมสำหรับลายเซ็นใบรับรอง"
 
 #: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
@@ -19570,8 +20851,7 @@ msgstr "คัด_ลอà¸�ที่อยู่ติดต่อทั้งà¸
 msgid "Contact _Preview"
 msgstr "ดู_ตัวอย่างที่อยู่ติดต่อ"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "คัดลอ�"
@@ -19593,11 +20873,10 @@ msgid "Copy to Folder..."
 msgstr "คัดลอ�ไปยังโฟลเดอร์..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "สร้างโฟลเดอร์สมุดที่อยู่ใหม่"
 
-#: ../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 "ตัด"
@@ -19638,8 +20917,7 @@ msgstr "ย้ายที่อยู่ติดต่อในโฟลเด
 msgid "Move to Folder..."
 msgstr "ย้ายไปยังโฟลเดอร์..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "�ปะ"
@@ -19676,13 +20954,11 @@ msgstr "บันทึ�ที่อยู่ติดต่อที่เล
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "บันทึ�ที่อยู่ติดต่อของโฟลเดอร์ที่เลือ�ในรูป VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "เลือ�ทั้งหมด"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "เลือ�ทั้ง_หมด"
 
@@ -19751,7 +21027,7 @@ msgstr "_ย้ายที่อยู่ติดต่อไปยัง..."
 msgid "_Move Folder Contacts To"
 msgstr "_ย้ายที่อยู่ติดต่อในโฟลเดอร์ไปยัง"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "สร้างใ_หม่"
 
@@ -19812,7 +21088,7 @@ msgid "Month"
 msgstr "เดือน"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -19821,7 +21097,7 @@ msgid "Previews the calendar to be printed"
 msgstr "�สดงตัวอย่างป�ิทิน�่อนพิมพ์"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "�่อนหน้า"
 
@@ -19889,232 +21165,6 @@ msgstr "สัปดาห์ทำงาน"
 msgid "_Open Appointment"
 msgstr "เ_ปิดนัดหมาย"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "คัดลอ�ข้อความที่เลือ�เข้าคลิปบอร์ด"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "คัดลอ�ส่วนที่เลือ�เข้าคลิปบอร์ด"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "ตัดข้อความที่เลือ�เข้าคลิปบอร์ด"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "ตัดส่วนที่เลือ�เข้าคลิปบอร์ด"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "�ปะจา�คลิปบอร์ด"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "�ปะข้อความจา�คลิปบอร์ด"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "เลือ�เนื้อความทั้งหมด"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "�นบ"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "คลิ�ที่นี่เพื่อ�นบ�ฟ้ม"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "คลิ�ที่นี่เพื่อปิดหน้าต่างปัจจุบัน"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "คลิ�ที่นี่เพื่อบันทึ�หน้าต่างปัจจุบัน"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "คลิ�ที่นี่เพื่อดูวิธีใช้"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "ปิด"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "�_ทร�"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "�าร�_นบ�ฟ้ม..."
-
-#: ../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 "ปิ_ด"
-
-#: ../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:42
-msgid "_File"
-msgstr "�_ฟ้ม"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_วิธีใช้"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_ตัวเลือ�"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "เหตุ�ารณ์ตลอดวัน"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "เหตุ�ารณ์_ตลอดวัน"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "�ำหนดเป็นประเภทความลับ"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "�ำหนดเป็นประเภทส่วนตัว"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "�ำหนดเป็นประเภทเปิดเผย"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "คลิ�ที่นี่เพื่อ�ำหนดหรือย�เลิ��าร�จ้งเตือนของเหตุ�ารณ์นี้"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "�ทร�ตัวเลือ�ขั้นสูงของ�ารส่ง"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "ทำให้เป็นเหตุ�ารณ์เวียนซ้ำ"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "เ_ปิดเผย"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "สอบถามข้อมูล�ารว่าง/ไม่ว่างของผู้เข้าประชุม"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "ช่องข้อมูล_บทบาท"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_ตัวเลือ�ของ�ารส่ง"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "�สดงเวลาว่าไ_ม่ว่าง"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "เ_ขตเวลา"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "ซ่อน/�สดงช่องข้อมูลชนิดผู้เข้าประชุม"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "ซ่อน/�สดงช่องข้อมูล RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "ซ่อน/�สดงช่องข้อมูลบทบาท"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "ซ่อน/�สดงช่องข้อมูลสถานะ"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "ซ่อน/�สดงช่องข้อมูลเขตเวลา"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "ซ่อน/�สดงช่องข้อมูลหมวดหมู่"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "เลือ�ให้มี/ไม่มีเหตุ�ารณ์ตลอดวัน"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "เลือ��สดงเวลาเป็นว่าง/ไม่ว่าง"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "�ารเ_ตือน"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_หมวด"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "ประเ_ภท"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "เป็นความ_ลับ"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_ว่าง/ไม่ว่าง"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "ส่วน_ตัว"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "�ารเ_วียนซ้ำ"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "ช่องข้อมูล_สถานะ"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "ช่องข้อมูล_ชนิด"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ย�เลิ�ป�ิบัติ�ารเมลปัจจุบัน"
@@ -20144,7 +21194,6 @@ msgid "Empty _Trash"
 msgstr "เท_ถังขยะ"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "โ_ฟลเดอร์"
 
@@ -20362,7 +21411,7 @@ msgstr "เรียงข้อความเป็น�ระทู้"
 msgid "_Group By Threads"
 msgstr "จัด�ลุ่มตาม_�ระทู้"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "_ข้อความ"
@@ -20697,129 +21746,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "�สดงเคอร์เซอร์�ะพริบในเนื้อความของข้อความที่�สดง"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "�สดงข้อความในรูป�บบป�ติ"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "�สดงข้อความพร้อมด้วยส่วนหัวของอีเมลทั้งหมด"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "�สดงข้อมูลดิบของอีเมลของข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "เรีย�คืนข้อความลบ�ล้วที่เลือ�"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "ไ_ม่สำคั�"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "ขยาย_ออ�"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "�_นบ"
 
-#: ../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
 msgid "_Clear Flag"
 msgstr "_ล้างธง"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_ลบข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_หาในข้อความ..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_ปั�ธงว่าเสร็จ�ล้ว"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "ไป_ยัง"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_สำคั�"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "ใ_นข้อความ"
 
-#: ../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 "โ_หลดภาพ"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "ข้อมูล_ดิบของข้อความ"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "ข้อความ_ถัดไป"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "ขนาด_ป�ติ"
 
-#: ../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 "เปิดใน_หน้าต่างใหม่"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "ข้อความ_�่อนหน้า"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "อ้าง_คำพูด"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_อ่าน�ล้ว"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_บันทึ�ข้อความ..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "เรีย�_คืนข้อความที่ลบ"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_ยังไม่ได้อ่าน"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_ขยาย"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_ขยายเข้า"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "ปิดหน้าต่างนี้"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "ปิด"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -20857,305 +21902,21 @@ msgstr "ดูบันทึ�ช่วยจำที่เลือ�"
 msgid "_Open Memo"
 msgstr "เ_ปิดบันทึ�ช่วยจำ"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "�นบ�ฟ้ม"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "ปิด�ฟ้มปัจจุบัน"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "ลบทั้งหมดย�เว้นลายเซ็น"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "เข้ารหัสข้อความนี้ด้วย PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "เข้ารหัสข้อความนี้ด้วย�ารตรวจสอบ�ารเข้ารหัส S/MIME ของคุณ"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_รูป�บบ"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "รับ�าร�จ้งเมื่อข้อความของคุณถู�เปิดอ่าน"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "�ทร�ตัวเลือ�ของ�ารส่ง"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "เปิด�ฟ้ม"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "เข้ารหัส PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "เซ็น PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "เ_ข้ารหัส PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "เ_ซ็น PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "ร้อง_ขอ�าร�จ้งรับข้อความ"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "เข้า_รหัส S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "เข้ารหัส S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "เซ็_น S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "เซ็น S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "_ส่ง"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "บันทึ�เป็น"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "บันทึ�ฉบับร่าง"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "บันทึ�เ_ป็น..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "บันทึ�ฉบับ_ร่าง"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "บันทึ�เป็นฉบับร่าง"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "บันทึ�ในโฟลเดอร์..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "บันทึ��ฟ้มปัจจุบัน"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "บันทึ��ฟ้มปัจจุบันในชื่ออื่น"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "บันทึ�ข้อความในโฟลเดอร์ที่�ำหนด"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "ส่ง"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "ส่งเมลในรูป�บบ HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "ส่งข้อความนี้"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "�ำหนดลำดับความสำคั�ของข้อความเป็นสำคั�สูง"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "เซ็น�ำ�ับข้อความนี้ด้วยคีย์ PGP ของคุณ"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "เซ็น�ำ�ับข้อความนี้ด้วยใบรับรองลายเซ็น S/MIME ของคุณ"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "ซ่อน/�สดงช่อง สำเนาลับถึง (BCC)"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "ซ่อน/�สดงช่อง สำเนาถึง (CC)"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "ซ่อน/�สดงตัวเลือ�ผู้ส่ง"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "ซ่อน/�สดงช่อง ประ�าศที่ (Post-To)"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "ซ่อน/�สดงช่อง ที่อยู่ตอบ�ลับ (Reply-To)"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "ซ่อน/�สดงช่อง ถึง (To)"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "ช่องสำเนา_ลับถึง"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "ช่อง_สำเนาถึง"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_ลบทั้งหมด"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "ช่อง_จา�"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "เปิ_ด..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "ช่อง_ประ�าศที่"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "จัด_ลำดับความสำคั�ของข้อความ"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "ช่อง_ที่อยู่ตอบ�ลับ"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_ระบบรั�ษาความปลอดภัย"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "ตัวเ_ลือ�ของ�ารส่ง"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "ช่อง_ถึง"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_ปิด"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "บันทึ��ละปิด"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "บันทึ��ละ_ปิด"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "บันทึ��ฟ้มปัจจุบัน�ละปิดหน้าต่าง"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "เพิ่มโฟลเดอร์ในรายชื่อโฟลเดอร์ที่บอ�รับข้อมูลของคุณ"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "อ่านรายชื่อใหม่"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "อ่านรายชื่อโฟลเดอร์ใหม่"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "ลบโฟลเดอร์ออ�จา�รายชื่อโฟลเดอร์ที่บอ�รับข้อมูลของคุณ"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "บอ�รับ"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "เลิ�บอ�รับ"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_�ลับส่วนเลือ�-ไม่เลือ�"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "คลิ�เพื่อดูหรือเปลี่ยนรายละเอียดสถานะของงาน"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "รายละเอียดสถานะ"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "เขตเวลา"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "รายละเอียด_สถานะ"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "คัดลอ�งานที่เลือ�"
+msgstr "คัดลอ�ภาร�ิจที่เลือ�"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
-msgstr "ตัดงานที่เลือ�"
+msgstr "ตัดภาร�ิจที่เลือ�"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr "ลบงานที่เสร็จ�ล้ว"
+msgstr "ลบภาร�ิจที่เสร็จ�ล้ว"
 
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr "ลบงานที่เลือ�"
+msgstr "ลบภาร�ิจที่เลือ�"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
@@ -21163,35 +21924,35 @@ msgstr "ทำเ_ครื่องหมายว่าเสร็จà¹�ลà¹
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr "ทำเครื่องหมายงานที่เลือ�ว่าเป็นงานที่เสร็จ�ล้ว"
+msgstr "ทำเครื่องหมายภาร�ิจที่เลือ�ว่าเป็นภาร�ิจที่เสร็จ�ล้ว"
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
-msgstr "�ปะงานจา�คลิปบอร์ด"
+msgstr "�ปะภาร�ิจจา�คลิปบอร์ด"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "�สดงตัวอย่างราย�ารงาน�่อนพิมพ์"
+msgstr "�สดงตัวอย่างราย�ารภาร�ิจ�่อนพิมพ์"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "พิมพ์ราย�ารงาน"
+msgstr "พิมพ์ราย�ารภาร�ิจ"
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "�สดงช่องหน้าต่าง�สดงตัวอย่างงาน"
+msgstr "�สดงช่องหน้าต่าง�สดงตัวอย่างภาร�ิจ"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "_ตัวอย่างงาน"
+msgstr "_ตัวอย่างภาร�ิจ"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
-msgstr "ดูงานที่เลือ�"
+msgstr "ดูภาร�ิจที่เลือ�"
 
 #: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
-msgstr "เ_ปิดงาน"
+msgstr "เ_ปิดภาร�ิจ"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -21334,50 +22095,54 @@ msgid "View/Hide the Status Bar"
 msgstr "ซ่อน/�สดง�ถบสถานะ"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "ทำงานออ_ฟไลน์"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "เ_�ี่ยว�ับ"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_ปิดหน้าต่าง"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_ทิ้งรหัสผ่าน"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "คำ_ถามที่ถามบ่อย"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "ซ่อ_นปุ่ม"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "ไ_อคอนเท่านั้น"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "เอ�สาร_อ้างอิงด่วน"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_ออ�"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "รูป�บบของ_ปุ่มเลือ�"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_ตัวเลือ��าร sync..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_ข้อความเท่านั้น"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_หน้าต่าง"
 
@@ -21453,12 +22218,12 @@ msgstr "�สดง_�ำหนดเสร็จ"
 msgid "With _Status"
 msgstr "�สดง_สถานะ"
 
-#. 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"
 
@@ -21475,8 +22240,8 @@ msgid "Select a Time Zone"
 msgstr "เลือ�เขตเวลา"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "�ล่องคอมโบเขตเวลา"
+msgid "Timezone drop-down combination box"
+msgstr "�ล่องดึงลง�บบผสมเพื่อเลือ�เขตเวลา"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21487,19 +22252,19 @@ msgstr ""
 "ใช้ปุ่มเมาส์ซ้ายเพื่อขยายดูพื้นที่บริเวณ�ผนที่�ละเลือ�เขตเวลา\n"
 "ใช้ปุ่มเมาส์ขวาเพื่อถอยดูภาพรวม"
 
-#: ../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 "�ำหนดมุมมองสำหรับ %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 "�ำหนดมุมมอง"
 
@@ -21509,17 +22274,17 @@ msgid "Define Views for \"%s\""
 msgstr "�ำหนดมุมมองสำหรับ \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr ""
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "บันทึ�มุมมองปัจจุบัน"
 
@@ -21533,7 +22298,7 @@ msgstr "ใช้�_ทนมุมมองที่มีอยู่"
 
 #. 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 "มุมมอง�ำหนดเอง"
 
@@ -21542,40 +22307,40 @@ msgid "Save Custom View"
 msgstr "บันทึ�มุมมอง�ำหนดเอง"
 
 #: ../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 "�ำหนดมุมมอง..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "มุมมอง_ปัจจุบัน"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "เลือ�มุมมอง: %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 "บันทึ�มุมมอง�ำหนดเอง..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "บันทึ�มุมมอง�ำหนดเองปัจจุบัน"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "สร้างหรือ��้ไขมุมมอง"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "โรงงาน"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "�ำหนดมุมมองใหม่"
 
@@ -21591,17 +22356,17 @@ msgstr "ชนิดของมุมมอง"
 msgid "Type of view:"
 msgstr "ชนิดของมุมมอง:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "�ถบเอ�สาร�นบ"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ไม่สามารถ�นบ�ฟ้ม %s: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ไม่สามารถ�นบ�ฟ้ม %s: ไม่ใช่�ฟ้มป�ติ"
@@ -21623,33 +22388,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "ให้�สดงเอ�สาร�นบนี้โดยอัตโนมัติ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1724
+#: ../widgets/misc/e-calendar-item.c:1272
 msgid "%B %Y"
 msgstr "%B %Ey"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "ป�ิทินเดือน"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 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:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "ลายที่ระบาย"
 
@@ -21673,30 +22437,30 @@ msgstr "Y1"
 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:3062
+#: ../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
 msgid "Minimum width"
 msgstr "ความ�ว้างต่ำสุด"
 
-#: ../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:3063
+#: ../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
 msgid "Minimum Width"
 msgstr "ความ�ว้างต่ำสุด"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "�ารเว้นช่องว่าง"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "ขณะนี้"
 
-#: ../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 "เวลาต้องอยู่ในรูป�บบ: %s"
@@ -21705,257 +22469,263 @@ msgstr "เวลาต้องอยู่ในรูป�บบ: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ค่าร้อยละจะต้องอยู่ในช่วงตั้ง�ต่ 0 ถึง 100"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
-msgstr "ภาษาอารบิ�"
+msgstr "อารบิ�"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
-msgstr "ภาษาบอลติ�"
+msgstr "บอลติ�"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "ยุโรปตอน�ลาง"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
-msgstr "ภาษาจีน"
+msgstr "จีน"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
-msgstr "ภาษาซีริลลิ�"
+msgstr "ซีริลลิ�"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
-msgstr "ภาษา�รี�"
+msgstr "�รี�"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
-msgstr "ภาษาฮิบรู"
+msgstr "ฮีบรู"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
-msgstr "ภาษา�ี่ปุ่น"
+msgstr "�ี่ปุ่น"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
-msgstr "ภาษาเ�าหลี"
+msgstr "เ�าหลี"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
-msgstr "ภาษาไทย"
+msgstr "ไทย"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
-msgstr "ภาษาตุร�ี"
+msgstr "ตุร�ี"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "ยูนิโค้ด"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "ยุโรปตะวันต�"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "ยุโรปตะวันต�, ใหม่"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "ดั้งเดิม"
 
-#: ../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 "ประยุ�ต์"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
-msgstr "ภาษายูเครน"
+msgstr "ยูเครน"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
-msgstr ""
+msgstr "ซ้ายไปขวา"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "ชุดอั�ขระที่ไม่รู้จั�: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "รหัสอั�ขระ"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "ใส่ชุดอั�ขระที่จะใช้"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "อื่นๆ ..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "_รหัสอั�ขระ"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "วัน�ละเวลา"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "ราย�ารข้อความเพื่อป้อนข้อมูลวันที่"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "คลิ�ที่ปุ่มนี้เพื่อ�สดงป�ิทิน"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "�ล่องคอมโบเพื่อเลือ�เวลา"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "�ล่องดึงลง�บบผสมเพื่อเลือ�เวลา"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_ขณะนี้"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_วันนี้"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "วันที่ไม่ถู�ต้อง"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "เวลาไม่ถู�ต้อง"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "ขยายอยู่"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "ระบุว่าวิดเจ็ตยุบ-ขยายขยายอยู่หรือไม่"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "ข้อความที่ป้ายของวิดเจ็ตยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "ใช้ตัวขีดเส้นใต้"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "ถ้าเลือ� อั�ขระขีดเส้นใต้ในข้อความจะระบุว่าอั�ขระถัดไปจะใช้เป็นรหัสปุ่มลัด"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "ช่องว่างระหว่างป้าย�ละวิดเจ็ต"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "วิดเจ็ตป้าย"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "วิดเจ็ตที่จะใช้�สดงผล�ทนป้ายป�ติของวิดเจ็ตยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "ขนาดที่ขยายขึ้น"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "ขนาดของลู�ศรยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "ช่องไฟรอบลู�ศรยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "ช่องไฟรอบลู�ศรยุบ-ขยาย"
 
 #. 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:748
+#: ../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 "�ารค้นหาขั้นสูง"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "บันทึ��ารค้นหา"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "�าร_ค้นหา"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "�ารค้นหา"
 
-#: ../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 "_บันทึ��ารค้นหา..."
 
-#: ../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 "�_�้ไข�ารค้นหาที่บันทึ�ไว้..."
 
-#: ../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 "_ค้นหาขั้นสูง..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "ทุ�บั�ชี"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "บั�ชีปัจจุบัน"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "โฟลเดอร์ปัจจุบัน"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "ข้อความปัจจุบัน"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "เลือ�รูปภาพ"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "�ผนที่โล�"
 
-#: ../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-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "ออนไลน์"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "สถานะของปุ่มคือออนไลน์"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sync �ับ:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
-msgstr ""
+msgstr "Sync ระเบียนข้อมูลส่วนตัว:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Sync หมวด:"
 
@@ -21965,80 +22735,80 @@ msgstr "ข้อความว่างเปล่า"
 
 #: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
-msgstr ""
+msgstr "โมเดลข้อมูล�ารจัดเรียง�ระ�สข้อความ"
 
 #: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "ความ�ว้างคอลัมน์"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "ค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "คลิ�ที่นี่เพื่อเปลี่ยนชนิดของ�ารค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_ค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_หาเดี๋ยวนี้"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_ล้าง"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "หมายเลขราย�าร"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " ใ_น "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "�ถวเคอร์เซอร์"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "คอลัมน์เคอร์เซอร์"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "�ารเรียงลำดับ"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "โหมด�ารเลือ�"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "โหมดของเคอร์เซอร์"
 
@@ -22066,10 +22836,6 @@ msgstr "<b>�ารติดตามสถานะ</b>"
 msgid "A_uto-delete sent item"
 msgstr "_ลบราย�ารส่งโดยอัตโนมัติ"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "ประเภท"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "สร้า_งราย�ารเมลส่ง�ล้วเพื่อติดตามข้อมูล"
@@ -22150,50 +22916,51 @@ msgstr "_หลังจา�:"
 msgid "_All information"
 msgstr "_ข้อมูลทั้งหมด"
 
-#: ../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 "_หน่วง�ารส่งข้อความ"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_ถึง�ล้ว"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_�ำหนดวันหมดอายุ"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_จน�ระทั่ง:"
 
-#: ../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 "เมื่อ_เปิด�ล้ว:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (เสร็จ�ล้ว %d%%)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "คลิ�ที่นี่เพื่อไปยัง URL"
 
 #: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
-msgstr "��้ไขราย�ารหมวด�ม่�บบ..."
+msgstr "��้ไขรายชื่อหมวด�ม่�บบ..."
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
@@ -22207,9 +22974,9 @@ msgstr "_หมวดที่มี:"
 msgid "categories"
 msgstr "หมวด"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
-msgstr ""
+msgstr "รายชื่อผุดขึ้น"
 
 #: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
@@ -22227,23 +22994,23 @@ msgstr "คอลัมน์ที่โฟ�ัส"
 msgid "Unselected Column"
 msgstr "คอลัมน์ที่ไม่ได้เลือ�"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "คอลัมน์ขีดฆ่า"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "คอลัมน์ขีดเส้นใต้"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "คอลัมน์ตัวหนา"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "คอลัมน์สี"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "คอลัมน์สีพื้น"
 
@@ -22281,7 +23048,7 @@ msgid "A_vailable Fields:"
 msgstr "เขตข้อมูลที่_มี:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "หน้าไปหลัง"
 
@@ -22294,7 +23061,7 @@ msgid "Clear _All"
 msgstr "ล้างทั้งห_มด"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "หลังมาหน้า"
 
@@ -22357,14 +23124,14 @@ 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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "ข้อมูลส่วนหัวเต็ม"
 
@@ -22384,307 +23151,568 @@ msgstr ""
 "�ารเพิ่มคอลัมน์ในตาราง ทำได้โดยลา�ไปวาง\n"
 "ที่ตำ�หน่งที่คุณต้อง�ารให้�สดง"
 
-#: ../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 ราย�าร)"
 msgstr[1] "%s : %s (%d ราย�าร)"
 
-#: ../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 ราย�าร)"
 msgstr[1] "%s (%d ราย�าร)"
 
-#: ../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:3020 ../widgets/table/e-table-item.c:3021
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "สลับสีของ�ถว"
 
-#: ../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:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "ตีเส้นตาราง�นวนอน"
 
-#: ../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:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "ตีเส้นตาราง�นวตั้ง"
 
-#: ../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:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "วาดโฟ�ัส"
 
-#: ../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:3048 ../widgets/table/e-table-item.c:3049
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "โหมดของเคอร์เซอร์"
 
-#: ../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:3013 ../widgets/table/e-table-item.c:3014
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "วิธี�ารเลือ�"
 
-#: ../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:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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: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
 msgid "Length Threshold"
 msgstr "ขีดเริ่มของความยาว"
 
-#: ../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:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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: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
 msgid "Uniform row height"
 msgstr "ความสูงเท่า�ันทุ��ถว"
 
-#: ../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 "�ช่�ข็ง"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "ปรับ�ต่งมุมมองปัจจุบัน"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "เรียงจา�ห_น้าไปหลัง"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "เรียงจา�ห_ลังมาหน้า"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "ไ_ม่เรียง"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "จัด�ลุ่มตามเ_ขตข้อมูลนี้"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "จัด�ลุ่มตาม_�ล่อง"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "ลบ_คอลัมน์นี้"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "เพิ่มค_อลัมน์..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "�าร_จัดชิดขอบ"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "ปรับความ�ว้าง_พอดี"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "จัดรูป�บบคอ_ลัมน์..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "ปรับ�_ต่งมุมมองปัจจุบัน..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "เ_รียงตาม"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_�ำหนดเอง"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "คำบรรยาย�บบอั�ษร"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "ข้อมูลของ�ารเรียงลำดับ"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "ต้นไม้"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "หัวตาราง"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "�บบจำลองข้อมูลตาราง"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "�ถวของเคอร์เซอร์"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "ค้นหาเสมอ"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "คลิ�เพื่อเพิ่ม"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
-msgstr ""
+msgstr "ตัวปรับ�ารเชื่อมต่อตาราง ETree"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "หน้าตา�บบเ�่า"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "วาดเส้น�ละเครื่องหมาย +/- สำหรับยุบ-ขยาย"
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "วิธีป้อนข้อความ"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ตัวจัด�ารเหตุ�ารณ์"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "หนา"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "ขีดฆ่า"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "สมอยึด"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "�ารจัดชิดขอบ"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "ความ�ว้างของคลิป"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "ความสูงของคลิป"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "คลิป"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "ระบายสีพื้นคลิป"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "ออฟเซ็ต X"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "ออฟเซ็ต Y"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "ความ�ว้างข้อความ"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "ความสูงข้อความ"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "ใช้จุดไข่ปลา"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "จุดไข่ปลา"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "ตัดบรรทัด"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "ตัดที่อั�ขระ"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "จำนวนบรรทัดสูงสุด"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "วาดขอบ"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "�ทร�อั�ขระขึ้นบรรทัดใหม่ได้"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "วาดพื้นหลัง"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "วาดปุ่ม"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "ตำ�หน่งเคอร์เซอร์"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM Context"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "จัด�ารหน้าต่างผุดขึ้น"
 
+#~ msgid "Upcoming Appointments"
+#~ msgstr "นัดหมายที่จะถึง"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "�ำหนดว่าจะเรีย�ทำงานส่วนตรวจจับ�ารพังหรือไม่"
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "ข้าม�ล่องโต้ตอบเตือน�ารฟื้นตัว"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "�ำหนดว่าจะตรวจจับ�ารพังหรือไม่"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "�ำหนดว่าจะข้าม�ล่องโต้ตอบเตือนขณะ Evolution ฟื้นตัวหรือไม่"
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "�ารตรวจจับ�ารพังของ Evolution"
+
+#~ msgid "Ig_nore"
+#~ msgstr "ไ_ม่สนใจ"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "ดูเหมือน Evolution จะจบ�ารทำงาน�บบผิดป�ติใน�ารทำงานครั้ง�่อน\n"
+#~ "�ละเพื่อเป็นมาตร�ารป้อง�ัน ช่อง�สดงตัวอย่างข้อความต่างๆ จะถู�ซ่อนทั้งหมด\n"
+#~ "คุณสามารถเรีย�ช่อง�สดงตัวอย่างดัง�ล่าวคืนมาได้ โดยใช้เมนูมุมมอง\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "ไ_ม่ต้อง�สดงข้อความนี้อี�"
+
+#~ msgid "Permission Denied."
+#~ msgstr "ไม่ได้รับอนุ�าต"
+
+#~ msgid "_Properties..."
+#~ msgstr "คุณ_สมบัติ..."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>�สดง</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>ข้อมูลเซิร์ฟเวอร์</b>"
+
+#~ msgid "D_escription:"
+#~ msgstr "_คำอธิบาย:"
+
+#~ msgid "De_scription:"
+#~ msgstr "คำ_อธิบาย:"
+
+#~ msgid "Updating query"
+#~ msgstr "�ำลังปรับข้อมูล�ารสืบค้น"
+
+#~ msgid "Unknown reason"
+#~ msgstr "ไม่ทราบสาเหตุ"
+
+#~ msgid "Open File"
+#~ msgstr "เปิด�ฟ้ม"
+
+#~ msgid "_Save Message"
+#~ msgstr "_บันทึ�ข้อความ"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "ไม่สามารถเปิด�ฟ้ม &quot;{0}&quot;"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "Attach original message"
+#~ msgstr "�นบข้อความเดิม"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "ไม่อ้างคำพูดเดิม"
+
+#~ msgid "Quote original message"
+#~ msgstr "อ้างคำพูดเดิม"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "�รุณาป้อนชื่อสำหรับลายเซ็นนี้"
+
+#~ msgid "Name:"
+#~ msgstr "ชื่อ:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "คุณ�น่ใจหรือไม่ ว่าจะ�วาดข้อความที่สั่งลบไว้ในโฟลเดอร์ &quot;{0}&quot; ทิ้งอย่างถาวร?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "ลบ &quot;{0}&quot; หรือไม่?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "ลบข้อความในโฟลเดอร์ค้นหา &quot;{0}&quot; หรือไม่?"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "คุณต้อง�ารทำป�ิบัติ�ารนี้�ับโฟลเดอร์ย่อยต่างๆ ด้วยหรือไม่?"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "ทำเครื่องหมายทุ�ข้อความในโฟลเดอร์นี้�ละโฟลเดอร์ย่อยว่าอ่าน�ล้วหรือไม่?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "ในโฟลเดอร์_ปัจจุบันเท่านั้น"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "เปิดใช้ปลั๊�อินเตือน�าร�นบเอ�สาร"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "เปิดใช้ปลั๊�อินเตือน�าร�นบเอ�สาร"
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "เตือนเมื่อ_ขาดเอ�สาร�นบ"
+
+#~ msgid "_Refresh:"
+#~ msgstr "โ_หลดใหม่:"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "ไม่มีตัวเลือ�ค่าตั้งสำหรับปลั๊�อินนี้"
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "เพิ่มตัวเลือ�สั่งพิมพ์จา�หน้าต่างเขียนข้อความ"
+
+#~ msgid "Print Message"
+#~ msgstr "พิมพ์ข้อความ"
+
+#~ msgid "Prints the message"
+#~ msgstr "พิมพ์ข้อความ"
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "ปลั๊�อินจัด�ารเครื่องมืออัตโนมัติขณะเริ่มโปร��รม"
+
+#~ msgid "Startup wizard"
+#~ msgstr "เครื่องมืออัตโนมัติขณะเริ่มโปร��รม"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "ข้อความบรรยายค่าตั้งเครื่องพิมพ์ปัจจุบัน"
+
+#~ msgid "No folder name specified."
+#~ msgstr "ไม่ได้ระบุชื่อโฟลเดอร์"
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "ชื่อโฟลเดอร์มีอั�ขระ Return ไม่ได้"
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "ชื่อโฟลเดอร์มีอั�ขระ \"/\" ไม่ได้"
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "ชื่อโฟลเดอร์มีอั�ขระ \"#\" ไม่ได้"
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' �ละ '..' เป็นชื่อโฟลเดอร์ที่สงวนไว้"
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "คัดลอ�ส่วนที่เลือ�เข้าคลิปบอร์ด"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "ตัดส่วนที่เลือ�เข้าคลิปบอร์ด"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "�ปะจา�คลิปบอร์ด"
+
+#~ msgid "I_nsert"
+#~ msgstr "�_ทร�"
+
+#~ msgid "All Day Event"
+#~ msgstr "เหตุ�ารณ์ตลอดวัน"
+
+#~ msgid "Send _Options"
+#~ msgstr "_ตัวเลือ�ของ�ารส่ง"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "�สดงข้อความในรูป�บบป�ติ"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "ลบทั้งหมดย�เว้นลายเซ็น"
+
+#~ msgid "For_mat"
+#~ msgstr "_รูป�บบ"
+
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+
+#~ msgid "Open a file"
+#~ msgstr "เปิด�ฟ้ม"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "เข้ารหัส PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "เซ็น PGP"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "เข้ารหัส S/MIME"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "เซ็น S/MIME"
+
+#~ msgid "Save As"
+#~ msgstr "บันทึ�เป็น"
+
+#~ msgid "Save in folder..."
+#~ msgstr "บันทึ�ในโฟลเดอร์..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "บันทึ�ข้อความในโฟลเดอร์ที่�ำหนด"
+
+#~ msgid "Send"
+#~ msgstr "ส่ง"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "ส่งเมลในรูป�บบ HTML"
+
+#~ msgid "_Delete all"
+#~ msgstr "_ลบทั้งหมด"
+
+#~ msgid "_Open..."
+#~ msgstr "เปิ_ด..."
+
+#~ msgid "C_lose"
+#~ msgstr "_ปิด"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "บันทึ��ละ_ปิด"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "บันทึ��ฟ้มปัจจุบัน�ละปิดหน้าต่าง"
+
+#~ msgid "Refresh List"
+#~ msgstr "อ่านรายชื่อใหม่"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "อ่านรายชื่อโฟลเดอร์ใหม่"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "ลบโฟลเดอร์ออ�จา�รายชื่อโฟลเดอร์ที่บอ�รับข้อมูลของคุณ"
+
+#~ msgid "Subscribe"
+#~ msgstr "บอ�รับ"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "เลิ�บอ�รับ"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_�ลับส่วนเลือ�-ไม่เลือ�"
+
+#~ msgid "Status Details"
+#~ msgstr "รายละเอียดสถานะ"
+
+#~ msgid "Time Zone"
+#~ msgstr "เขตเวลา"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "�ล่องคอมโบเขตเวลา"
+
 #~ msgid "_Categories..."
 #~ msgstr "_หมวด..."
 
@@ -22710,7 +23738,7 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgstr "ผู้_ประสานงาน:"
 
 #~ msgid "Task sort"
-#~ msgstr "ลำดับงาน"
+#~ msgstr "ลำดับภาร�ิจ"
 
 #~ msgid "Memo sort"
 #~ msgstr "�ารเรียงบันทึ�ช่วยจำ"
@@ -22730,9 +23758,6 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgid "Di_sable"
 #~ msgstr "ปิ_ดใช้งาน"
 
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "ตรวจรู้หน้า�สดงอารมณ์์โดยอัตโนมัติ"
-
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "�ฟ้มเสียง�จ้งเมลใหม่"
 
@@ -22787,9 +23812,6 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgid "System error: %s"
 #~ msgstr "ข้อผิดพลาดในระบบ: %s"
 
-#~ msgid "Camel error: %s"
-#~ msgstr "ข้อผิดพลาดใน Camel: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "บั�ชีไม่สามารถส่งอีิเมลได้"
 
@@ -22813,9 +23835,6 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgid "Download messages for offline"
 #~ msgstr "ดาวน์โหลดข้อความสำหรับอ่าน�บบออฟไลน์"
 
-#~ msgid "_Phone List"
-#~ msgstr "ราย�ารเบอร์โ_ทร"
-
 #~ msgid "MTWTFSS"
 #~ msgstr "จอพพศสอ"
 
@@ -22965,13 +23984,13 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgstr "เพิ่มป�ิทิน"
 
 #~ msgid "Add Task List"
-#~ msgstr "เพิ่มราย�ารงาน"
+#~ msgstr "เพิ่มราย�ารภาร�ิจ"
 
 #~ msgid "_Add Calendar"
 #~ msgstr "เ_พิ่มป�ิทิน"
 
 #~ msgid "_Add Task List"
-#~ msgstr "เพิ่มราย�าร_งาน"
+#~ msgstr "เพิ่มราย�าร_ภาร�ิจ"
 
 #~ msgid "<b>Calendar options</b>"
 #~ msgstr "<b>ตัวเลือ�ป�ิทิน</b>"
@@ -22989,16 +24008,16 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgstr "ชื่อป�ิทิน"
 
 #~ msgid "<b>Task List Options</b>"
-#~ msgstr "<b>ตัวเลือ�ราย�ารงาน</b>"
+#~ msgstr "<b>ตัวเลือ�ราย�ารภาร�ิจ</b>"
 
 #~ msgid "Add New Task List"
-#~ msgstr "เพิ่มราย�ารงานใหม่"
+#~ msgstr "เพิ่มราย�ารภาร�ิจใหม่"
 
 #~ msgid "Task List Group"
-#~ msgstr "�ลุ่มราย�ารงาน"
+#~ msgstr "�ลุ่มราย�ารภาร�ิจ"
 
 #~ msgid "Task List Name"
-#~ msgstr "ชื่อราย�ารงาน"
+#~ msgstr "ชื่อราย�ารภาร�ิจ"
 
 #~ msgid "<b>Free/Busy C_alendars</b>"
 #~ msgstr "<b>_ป�ิทิน ว่าง/ไม่ว่าง</b>"
@@ -23333,421 +24352,3 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 
 #~ msgid "Find No_w"
 #~ msgstr "หาเ_ดี๋ยวนี้"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "�ารประชุมทางวีดิทัศน์"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_สถานที่:"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "ผู้_รับฉันทะ"
-
-#~ msgid "Properties..."
-#~ msgstr "คุณสมบัติ..."
-
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "ไม่สามารถสร้าง�ฟ้มผลลัพธ์: %s\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "The message was sent via the &quot;sendmail&quot; external application. "
-#~ "Sendmail reports the following error: status 67: mail not sent.\n"
-#~ "The message is stored in the Outbox folder. Check the message for errors "
-#~ "and resend."
-#~ msgstr ""
-#~ "ได้ส่งข้อความผ่าน &quot;sendmail&quot; ซึ่งเป็นโปร��รมภายนอ��ล้ว ปรา��ว่า sendmail "
-#~ "รายงานข้อผิดพลาดดังนี้: สถานะ 67: ไม่ได้ส่งเมล\n"
-#~ "ข้อความดัง�ล่าวถู�เ�็บไว้ที่�ล่องจดหมายออ� �รุณาตรวจสอบข้อผิดพลาดได้ในข้อความดัง�ล่าว "
-#~ "�ล้วลองส่งใหม่"
-
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "ข้อความหัวข้อ &quot;{0}&quot; ของคุณยังไม่ได้ส่ง"
-
-#~ msgid "_Insert"
-#~ msgstr "�_ทร�"
-
-#~ msgid "ordinal|first"
-#~ msgstr "วัน�ร�"
-
-#~ msgid "ordinal|second"
-#~ msgstr "วันที่สอง"
-
-#~ msgid "ordinal|third"
-#~ msgstr "วันที่สาม"
-
-#~ msgid "ordinal|fourth"
-#~ msgstr "วันที่สี่"
-
-#~ msgid "ordinal|last"
-#~ msgstr "วันที่สุดท้าย"
-
-#~ 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 ""
-#~ "�ารเลือ�ตัวเลือ�นี้หมายความว่า Evolution จะพยายามใช้ SSL/TLS "
-#~ "�็ต่อเมื่อคุณอยู่ในสภาพ�วดล้อมที่ไม่ปลอดภัยเท่านั้น ตัวอย่างเช่น ถ้าเซิร์ฟเวอร์ LDAP "
-#~ "ของคุณอยู่หลังไฟร์วอลล์ที่ทำงานอยู่ Evolution �็จะไม่ต้องใช้ SSL/TLS "
-#~ "เพราะว่า�ารเชื่อมต่อของคุณอยู่ในสภาพ�วดล้อมที่ปลอดภัย�ล้ว"
-
-#~ msgid "%u hour"
-#~ msgid_plural "%u hours"
-#~ msgstr[0] "%u ชั่วโมง"
-#~ msgstr[1] "%u ชั่วโมง"
-
-#~ msgid "%u minute"
-#~ msgid_plural "%u minutes"
-#~ msgstr[0] " %u นาที"
-#~ msgstr[1] " %u นาที"
-
-#~ msgid "%u second"
-#~ msgid_plural "%u seconds"
-#~ msgstr[0] " %u วินาที"
-#~ msgstr[1] " %u วินาที"
-
-#~ msgid "(%ld seconds)"
-#~ msgstr "(%ld วินาที)"
-
-#~ msgid "(%d %s %d %s)"
-#~ msgstr "(%d %s %d %s)"
-
-#~ msgid "(%d %s)"
-#~ msgstr "(%d %s)"
-
-#~ msgid " %u %s"
-#~ msgstr " %u %s"
-
-#~ msgid "%u %s"
-#~ msgstr "%u %s"
-
-#~ msgid "hour"
-#~ msgid_plural "hours"
-#~ msgstr[0] "ชั่วโมง"
-#~ msgstr[1] "ชั่วโมง"
-
-#~ msgid "(%d seconds)"
-#~ msgstr "(%d วินาที)"
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "ชุด�รุ๊ป�วร์ Evolution"
-
-#~ msgid "<b>%s (%s)</b> : %s"
-#~ msgstr "<b>%s (%s)</b> : %s"
-
-#~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
-
-#~ msgid "<b>%s</b> : %s"
-#~ msgstr "<b>%s</b> : %s"
-
-#~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
-
-#~ msgid "time|second"
-#~ msgstr "วินาที"
-
-#~ msgid " %u minutes"
-#~ msgstr " %u นาที"
-
-#~ msgid "%u hours"
-#~ msgstr "%u ชั่วโมง"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">ติดต่ออัตโนมัติ</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">ที่อยู่ติดต่อสำหรับ�ารส่งข้อความทันใจ</span>"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">�ารค้นหา�ารประชุมที่ชน�ัน</span>"
-
-#~ msgid "Delete this Occurrence"
-#~ msgstr "ลบนัดหมายรอบนี้"
-
-#~ msgid "_Show animated images"
-#~ msgstr "�_สดงภาพเคลื่อนไหว"
-
-#~ msgid "Task Table"
-#~ msgstr "โต๊ะงาน"
-
-#~ msgid "Memo Table"
-#~ msgstr "ตารางบันทึ�ข้อความ"
-
-#~ msgid "Timezone Button"
-#~ msgstr "ปุ่มเขตเวลา"
-
-#~ msgid "Attachment Button"
-#~ msgstr "ปุ่มเอ�สาร�นบ"
-
-#~ msgid "Filters"
-#~ msgstr "ตัว�รองข้อความ"
-
-#~ msgid "Message List"
-#~ msgstr "ราย�ารข้อความ"
-
-#~ msgid "Alar_ms"
-#~ msgstr "�าร�จ้งเ_ตือน"
-
-#~ msgid "_All day Event"
-#~ msgstr "เหตุ�ารณ์ตลอด_วัน"
-
-#~ msgid "Previous Button"
-#~ msgstr "ปุ่ม�่อนหน้า"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "ราย�ารวันที่ข้อความ"
-
-#~ msgid "Date Button"
-#~ msgstr "ปุ่มวันที่"
-
-#~ msgid "Time Combo Box"
-#~ msgstr "�ล่องคอมโบเวลา"
-
-#~ msgid "Search Text Entry"
-#~ msgstr "ค้นหาราย�ารข้อความ"
-
-#~ msgid "Addressbook"
-#~ msgstr "สมุดที่อยู่"
-
-#~ msgid "Advanced..."
-#~ msgstr "ขั้นสูง..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "เลือ�สมุดที่อยู่เป้าหมาย"
-
-#~ msgid "Primary Email"
-#~ msgstr "อีเมลหลั�"
-
-#~ msgid "Select an Action"
-#~ msgstr "เลือ�ป�ิบัติ�าร"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "สร้างที่อยู่ติดต่อใหม่ \"%s\""
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "เพิ่มที่อยู่ตรงที่อยู่ติดต่อที่มีอยู่ \"%s\""
-
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "ผสานที่อยู่อีเมล"
-
-#~ msgid ""
-#~ "<big><b>%s</b></big>\n"
-#~ "%s until %s"
-#~ msgstr ""
-#~ "<big><b>%s</b></big>\n"
-#~ "%s �ระทั่ง %s"
-
-#~ msgid "Preferences"
-#~ msgstr "ปรับ�ต่ง"
-
-#~ msgid "Remove"
-#~ msgstr "ลบ"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 นาที"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 นาที"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 นาที"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 นาที"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 นาที"
-
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>เซิร์ฟเวอร์�สดงสถานะ�ารว่าง/ไม่ว่างปริยาย</b>"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>ทั่วไป</b>"
-
-#~ msgid "<b>Publishing</b>"
-#~ msgstr "<b>�ารประ�าศ</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>ราย�ารงาน</b>"
-
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>เวลา</b>"
-
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>สัปดาห์ทำงาน</b>"
-
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "�ารตั้งค่างาน�ละป�ิทิน"
-
-#~ msgid "Color for overdue tasks"
-#~ msgstr "สีสำหรับงานที่เลย�ำหนดเวลา"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "สีสำหรับงานที่มี�ำหนดเสร็จวันนี้"
-
-#~ msgid "Days"
-#~ msgstr "วัน"
-
-#~ msgid "Hours"
-#~ msgstr "ชั่วโมง"
-
-#~ msgid "Minutes"
-#~ msgstr "นาที"
-
-#~ msgid "_Add URL"
-#~ msgstr "_เพิ่ม URL"
-
-#~ msgid "option menu to choose reminder units"
-#~ msgstr "เมนูตัวเลือ�ที่จะเลือ�หน่วยเตือนความจำ"
-
-#~ msgid "option menu to choose time units"
-#~ msgstr "เมนูตัวเลือ�ที่จะเลือ�หน่วยเวลา"
-
-#~ msgid "Or_ganizer"
-#~ msgstr "ผู้_ประสานงาน"
-
-#~ msgid "_Set alarm\t"
-#~ msgstr "_ตั้ง�าร�จ้งเตือน\t"
-
-#~ msgid "Classi_fication:"
-#~ msgstr "ประเ_ภท:"
-
-#~ msgid "_Group"
-#~ msgstr "_�ลุ่ม"
-
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "_ประ�าศข้อมูล�ารว่าง/ไม่ว่าง"
-
-#~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %d/%m/%Ey %I:%M %p"
-
-#~ msgid "%a %m/%d/%Y %H:%M"
-#~ msgstr "%a %d/%m/%Ey %H:%M"
-
-#~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a %d/%m/%Ey %I %p"
-
-#~ msgid "%a %m/%d/%Y %H"
-#~ msgstr "%a %d/%m/%Ey %H"
-
-#~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%d/%m/%Ey %I:%M:%S %p"
-
-#~ msgid "%m/%d/%Y %H:%M:%S"
-#~ msgstr "%d/%m/%Ey %H:%M:%S"
-
-#~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%d/%m/%Ey %I:%M %p"
-
-#~ msgid "%m/%d/%Y %H:%M"
-#~ msgstr "%d/%m/%Ey %H:%M"
-
-#~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%d/%m/%Ey %I %p"
-
-#~ msgid "%m/%d/%Y %H"
-#~ msgstr "%d/%m/%Ey %H"
-
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "If"
-#~ msgstr "ถ้า"
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "�บบอั�ษรเ_ทอร์มินัล:"
-
-#~ msgid "Server: %s, Type: %s"
-#~ msgstr "เซิร์ฟเวอร์: %s, ชนิด: %s"
-
-#~ msgid "Automatic contacts"
-#~ msgstr "ที่อยู่ติดต่ออัตโนมัติ"
-
-#~ msgid "Plugin manager"
-#~ msgstr "ผู้จัด�ารปลั๊�อิน"
-
-#~ msgid "Id"
-#~ msgstr "Id"
-
-#~ msgid "Path"
-#~ msgstr "พาธ"
-
-#~ msgid "Url"
-#~ msgstr "Url"
-
-#~ msgid "_Select All"
-#~ msgstr "เลือ�ทั้ง_หมด"
-
-#~ msgid "Publish Free/Busy information for this calendar"
-#~ msgstr "ประ�าศข้อมูล�ารว่าง/ไม่ว่างสำหรับป�ิทินนี้"
-
-#~ msgid "_Attachments"
-#~ msgstr "เอ�สาร�_นบ"
-
-#~ msgid "Show Time _Zone"
-#~ msgstr "�สดงเ_ขตเวลา"
-
-#~ msgid "Move"
-#~ msgstr "ย้าย"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "เ_�ี่ยว�ับ Evolution..."
-
-#~ msgid "_Send / Receive"
-#~ msgstr "_รับ / ส่ง"
-
-#~ msgid "Discard Changes"
-#~ msgstr "ละเลย�ารเปลี่ยน�ปลง"
-
-#~ msgid "description of appointment"
-#~ msgstr "คำอธิบาย�ารนัดหมาย"
-
-#~ msgid "Dismiss"
-#~ msgstr "ไม่สนใจ"
-
-#~ msgid "Dismiss All"
-#~ msgstr "ไม่สนใจทั้งหมด"
-
-#~ msgid ""
-#~ "Alarm on %s\n"
-#~ "%s\n"
-#~ "Starting at %s\n"
-#~ "Ending at %s"
-#~ msgstr ""
-#~ "เตือนเมื่อ %s\n"
-#~ "%s\n"
-#~ "เริ่มต้นที่ %s\n"
-#~ "สิ้นสุดที่ %s"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "�_ถบเอ�สาร�นบ (วางเอ�สาร�นบที่นี่)"
-
-#~ msgid "Scheduling"
-#~ msgstr "�ำหนด�าร"
-
-#~ msgid "Invitations"
-#~ msgstr "�ารเชิ�"
-
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "�ารนัดหมายนี้มี�าร�จ้งเตือนที่�ำหนดขึ้นเอง"
-
-#~ msgid "Assignment"
-#~ msgstr "งานมอบหมาย"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "ประชุม�ละงาน"
-
-#~ msgid "_Preview Pane"
-#~ msgstr "ช่อง�สดง_ตัวอย่าง"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ced3a8df5..8eb52008f5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,11 +5,12 @@
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-23 20:44+0000\n"
+"POT-Creation-Date: 2008-09-06 16:13+0000\n"
 "PO-Revision-Date: 2008-03-04 16:29+0800\n"
 "Last-Translator: YangZhang <zyangmath@gmail.com>\n"
 "Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
@@ -20,28 +21,27 @@ 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"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "evolution 地�簿"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "新建�系人"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "新建�系人列表"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "当�地�簿文件夹 %s 有 %d 张�片"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "打开"
 
@@ -57,63 +57,63 @@ msgstr "�系人："
 msgid "evolution minicard"
 msgstr "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 "有�现。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "为会议。"
 
-#: ../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 "日历事件：摘�为 %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 "日历事件：无摘�。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "日历视图事件"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "获得焦点"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "新建约会"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "新建全天事件"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "新会议"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "转到今天"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "转到日期"
 
-#: ../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 "�查看并选择当�时间范围的表"
 
 #. 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."
@@ -121,14 +121,14 @@ msgstr[0] "有 %d 个事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "无事件。"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "周工作视图：%s。%s"
@@ -136,21 +136,21 @@ msgstr "周工作视图：%s。%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日视图：%s。%s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "工作周的日历视图"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -160,32 +160,30 @@ msgstr "%Y年%-m月%-d日%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2158
-#: ../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: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:335
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
-#: ../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:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c: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:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -194,61 +192,59 @@ msgstr "%Y年%-m月%-d日"
 #. 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:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2174
-#: ../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: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:349
 msgid "%d %b"
 msgstr "%B%-dæ—¥"
 
-#: ../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:766
 msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "�索�"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "Evolution 日历和�索�"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "跳转按钮"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "�击此处�查找更多事件。"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月视图：%s。%s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "周视图：%s。%s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "月日历视图"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "一周或多周的日历视图"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "弹出"
 
 #. 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 "弹出�对象"
 
@@ -260,12 +256,12 @@ msgstr "编辑"
 msgid "begin editing this cell"
 msgstr "开始编辑此�元格"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "切�"
 
 #. 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 "切��元格"
 
@@ -285,47 +281,47 @@ msgstr "折�"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "在包�此�元格的 ETree 中折�行"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "表格�元格"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c: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 "�击�添加"
 
-#: ../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 "�击"
 
-#: ../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 "排�"
 
-#: ../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 "%Y年%-m月%-d日"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "日历：从 %s 到 %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "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 "激活默认"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "弹出��"
 
@@ -340,10 +336,10 @@ msgstr "激活"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr "“{0}�是�读的地�簿�。切�到�系人视图，然�选中一个�"
-"接��系人的地�簿。"
+"'{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}�是�读的地�簿，无法修改。请从�系人视图的侧边�中选择�外一个地�簿。"
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -381,14 +377,14 @@ msgid "Could not get schema information for LDAP server."
 msgstr "无法从 LDAP �务器获�大纲信�。"
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "无法删除地�簿。"
 
 #: ../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 ""
 "目�您�能从 Evolution 中访问 GroupWise 系统地�簿。请使用其它 GroupWise 邮件"
 "客户程�获得 GroupWise 中您最常�系的�系人以� GroupWise 个人�系人文件夹。"
@@ -398,8 +394,8 @@ msgid "Delete address book '{0}'?"
 msgstr "删除地�簿“{0}��？"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
-msgstr "装入默认地�簿错误。"
+msgid "Error loading address book."
+msgstr "装入地�簿错误。"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
@@ -411,7 +407,7 @@ msgstr "认�到 IMAP �务器失败。"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "删除�系人失败"
 
@@ -424,27 +420,23 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP �务器无法�应有效的大纲信�。"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "��被�止。"
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "�务器版本"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "�些特性�能无法在您目�的�务器下工作"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution 地�簿异常退出。"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../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:24
+#: ../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 "
@@ -453,53 +445,53 @@ msgstr ""
 "此 LDAP �务器�能使用较早版本的 LDAP，所以无法支�此功能，或者是�置错误。请"
 "询问您的管�员有关支�的�索基础一事。"
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "此地�簿�将被永久删除。"
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "无法打开此地�簿。"
 
-#: ../addressbook/addressbook.error.xml.h:27
-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 "此地�簿�务器�支�任何建议的�索基础。"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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 "此地�簿�务器��达，或者�务器�称拼错，�或者您的网络连接已断。"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "此地�簿�将被永久删除。"
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此�务器�支� LDAPv3 大纲信�。"
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "无法打开地�簿"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "无法执行�索。"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "无法�存 {0}。"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "您希望�存更改�？"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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 ""
 "您�将把�系人从一个地�簿移至�外一个地�簿，但是无法从�地�簿删除该�系"
 "人。您想��作�制�系人�？"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -508,6 +500,10 @@ msgstr ""
 "您正在连接到�支�的 GroupWise �务器，此时使用 Evolution �能�到问题。为了"
 "得到最佳效果，�务器应该�级到 Evolution 支�的版本"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "您没有足够的��从地�簿中删除�系人。"
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -519,7 +515,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "除�您�新�动 Evolution，�则 {0} 的�系人无法使用。"
 
-#: ../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
@@ -542,9 +538,9 @@ msgstr "缩放(_R)"
 msgid "_Use as it is"
 msgstr "原样使用(_U)"
 
-#. 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:44
-#: ../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}"
 
@@ -553,17 +549,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "默认�步地�："
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "无法装入地�簿"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地�应用程��"
 
@@ -585,10 +581,10 @@ msgstr "在此�置自动补全"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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:582
 msgid "Contacts"
 msgstr "�系人"
 
@@ -597,7 +593,7 @@ msgid "Evolution Address Book"
 msgstr "Evolution 地�簿"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "Evolution 地�簿地�弹出框"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -613,8 +609,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution 地�簿组件"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime �书管�控件"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME �书管�控件"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -628,12 +624,13 @@ msgstr "在此管�您的 S/MIME �书"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../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
 msgid "On This Computer"
 msgstr "在此计算机中"
 
@@ -646,120 +643,124 @@ msgstr "在此计算机中"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "个人"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "在 LDAP �务器上"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "�系人(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "创建一个新�系人"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "�系人列表(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "创建一个新的�系人列表"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "新地�簿"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "地�簿(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "创建新地�簿"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�级地�簿设置或文件夹失败。"
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "基础"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "类型(_T)："
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "将地�簿内容�制到本地以进行脱机�作(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "常规"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "地�簿"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "�务器信�"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "身份验�"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../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 "细节"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "�索"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "下载"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "地�簿属性"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "正在��..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "��“%s�："
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -811,70 +812,76 @@ msgstr ""
 "\n"
 "请�候，Evolution 正在��您的 Pilot �步数�..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "将“%s�文件夹�命�为："
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "�命�文件夹"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "文件夹��能�有字符“/�"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "新建地�簿(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "�存为 vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1385
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
+#: ../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
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../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 "删除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "属性(_P)..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "属性(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "�系人�选择器"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿�访问 LDAP �务器"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../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 "认�失败。\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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 "输入 %s 的密�(用户 %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "输入密�"
 
@@ -948,38 +955,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>身份验�</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>显示</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>下载</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>�索</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>�务器信�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>类型：</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "添加地�簿"
 
-#: ../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:761
 msgid "Always"
 msgstr "总是"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "匿�"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "�览此地�簿直到达到��(_R)"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "基本"
@@ -1006,14 +1010,14 @@ msgid "Lo_gin:"
 msgstr "登录(_G)："
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "从�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "�加密"
 
@@ -1025,7 +1029,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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -1091,7 +1095,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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
@@ -1180,8 +1184,8 @@ msgid "_Login method:"
 msgstr "登录方�(_L)："
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1196,7 +1200,7 @@ msgid "_Search scope:"
 msgstr "�索范围(_S)："
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "�务器(_S)："
@@ -1217,9 +1221,10 @@ msgstr "�片"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "分钟"
 
@@ -1260,7 +1265,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:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1272,16 +1277,16 @@ msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "�系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 msgid "Contact Editor"
 msgstr "�系人编辑器"
 
@@ -1294,7 +1299,7 @@ msgid "Image"
 msgstr "图�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1307,7 +1312,7 @@ msgid "Nic_kname:"
 msgstr "昵称(_K)："
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1321,11 +1326,11 @@ msgstr "电�"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "工作"
 
@@ -1347,8 +1352,8 @@ msgid "_Birthday:"
 msgstr "生日(_B)："
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "日历(_C)："
@@ -1437,1119 +1442,1121 @@ msgstr "何处(_W)："
 msgid "_Zip/Postal Code:"
 msgstr "邮政编�(_Z)："
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "地�"
 
-#: ../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:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../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:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../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
 msgid "Editable"
 msgstr "�编辑"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "美国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "阿尔巴尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "阿尔�利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "美洲�摩亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "安�尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "安哥拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "安圭拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "��洲"
 
-#: ../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 "安�瓜和巴布达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "亚美尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "阿�巴岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "巴哈马群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "å·´æž—å²›"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "孟加拉国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "巴巴多斯岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "白俄罗斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "伯利兹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "百慕大群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "�丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "玻利维亚"
 
-#: ../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 "波斯尼亚和黑赛哥维纳"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "�茨瓦纳"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "布维岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../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 "英属�度洋地区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "文莱德��兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "�加利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "布基纳法索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "布隆迪"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "柬埔寨"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "喀麦隆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "佛得角"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "开曼群岛"
 
-#: ../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 "中�共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "�得"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "智利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "中国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "圣诞岛"
 
-#: ../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 "科科斯群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "哥伦比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "科摩罗群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "刚果"
 
-#: ../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 "刚果人民民主共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "库克群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../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 "科特迪瓦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "克罗地亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "�巴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "塞浦路斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "�克共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "丹麦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "�布�群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "多米尼加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "多米尼加共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "厄瓜多尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "埃�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "�尔瓦多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "赤�几内亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "厄立特里亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "爱沙尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "埃塞俄比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "�克兰群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "法罗群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "�济"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "法国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "法属圭亚那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "法属波利尼西亚"
 
-#: ../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 "法属�部地区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "加蓬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "冈比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "格��亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "德国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "加纳"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "直布罗陀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "希腊"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "格陵兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "格林纳达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "瓜德罗普岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "关岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "�地马拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "格�西岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "几内亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "几内亚比�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "圭亚那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "海地"
 
-#: ../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 "赫德和麦克�纳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "圣座"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "洪都拉斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "中国香港特别行政区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "冰岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "�度"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "�度尼西亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "伊朗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "爱尔兰"
 
-#: ../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 "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "以色列"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "�大利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "牙买加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "日本"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "�尔西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "约旦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "哈�克斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "肯尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "基里巴斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "韩国人民民主共和国"
 
-#: ../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 "韩国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "科�特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "�尔�斯斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "拉脱维亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "莱索托"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "利比里亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "利比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "�森堡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "中国澳门特别行政区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "马其顿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "马拉维"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "马�西亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "马尔代夫"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "马里"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "马耳他"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "马�尔群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "马�尼�岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "毛里塔尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "毛里求斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "马约特岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "密克罗尼西亚"
 
-#: ../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 "摩尔多瓦共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "摩纳哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "蒙�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "蒙特塞拉特群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "莫桑比克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "缅甸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "纳米比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "瑙�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "尼泊尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "�兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "�属安的列斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "新喀里多尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "新西兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "尼日尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "尼日利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "纽埃岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "诺�克岛"
 
-#: ../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 "北马里亚那群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "挪�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "阿曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "巴基斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "帕劳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "巴勒斯�地区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "巴拿马"
 
-#: ../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 "巴布亚新几内亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "秘�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "�利宾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "皮特克�岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "波兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "葡�牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "波多黎�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "�塔尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "留尼汪"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "罗马尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "俄罗斯�邦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "�旺达"
 
-#: ../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 "圣基德和�维斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "圣�西亚岛"
 
-#: ../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 "圣文森特和格林纳达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "�摩亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "圣马力诺"
 
-#: ../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 "圣多美和普林西比"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "沙特阿拉伯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "塞内加尔"
 
-#: ../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 "塞尔维亚和黑山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "塞舌尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "新加�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "斯洛�克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "斯洛文尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "索马里"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "��"
 
-#: ../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 "�乔治亚和�三文治群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "西�牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "斯里兰�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "圣赫勒拿岛"
 
-#: ../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 "圣皮埃尔和麦克伦群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "�丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "�里�"
 
-#: ../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 "斯瓦巴和尖棉群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "斯�士兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "ç‘žå…¸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "�利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "中国�湾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "塔�克斯�"
 
-#: ../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 "�桑尼亚�邦共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "泰国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "东�汶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "多哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "托克劳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "汤加"
 
-#: ../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 "特里尼达和多巴哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "�尼斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "土库曼斯�"
 
-#: ../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 "特克斯和凯科斯群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "图瓦�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "乌干达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "乌克兰"
 
-#: ../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 "阿拉伯��酋长国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../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 "美国�型外岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "乌拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "乌兹别克斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "努瓦阿图"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "委内瑞拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "越�"
 
-#: ../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 "英属处女群岛"
 
-#: ../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 "美属处女群岛"
 
-#: ../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 "瓦利斯和富图纳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "也门"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "赞比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "姓�"
 
-#: ../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 "AOL �时通讯程�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../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
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu �时通讯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../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 "�务"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "�置"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "用户�"
 
-#: ../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:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "家庭"
 
-#: ../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:194
 #: ../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:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../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:249
 msgid "Source Book"
 msgstr "��地�簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "目标地�簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "为新�系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "�写域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "必需域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "请选择此�系人的图�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "无图�(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2557,67 +2564,67 @@ msgstr ""
 "�系人数�无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s�的格�无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s�的格�无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s�为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "无效的�系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "快速添加�系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "编辑全�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "全�(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "电�邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "选择地�簿(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 msgstr "您确定�删除�系人列表(%s)�？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr "您确定�删除这些�系人列表�？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
 msgstr "您确定�删除�系人(%s)�？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2723,7 +2730,7 @@ msgstr "�时通讯�务(_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-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "�置(_L)："
@@ -2733,7 +2740,7 @@ msgid "<b>Members</b>"
 msgstr "<b>�员</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 "�系人列表编辑器"
 
@@ -2753,27 +2760,28 @@ msgstr "列表�称(_L)："
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "输入电�邮件地�或者把�系人拖放到下�的列表(_T)："
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "�系人列表�员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "�员(_M)"
+
+#: ../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:390
-#: ../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/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "地�簿"
 
-#: ../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 "为新列表"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "�员(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "更改了的�系人："
@@ -2809,40 +2817,40 @@ msgstr ""
 "此�系人的姓�或地�已�在本文件夹中存在了。\n"
 "您一定�添加�？"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "�并�系人"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "�并(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "�并�系人"
+
+#: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "电�邮件"
 
 #: ../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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "姓�以此开头"
+msgid "Name contains"
+msgstr "姓��有"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2855,10 +2863,10 @@ msgid_plural "%d contacts"
 msgstr[0] "%d 个�系人"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../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-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "查询"
 
@@ -2866,123 +2874,119 @@ msgstr "查询"
 msgid "Error getting book view"
 msgstr "获��簿视图出错"
 
-#: ../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:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../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:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "模型"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "修改�片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "姓�以此开头"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "类型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "�存为 VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "新建�系人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "新建�系人列表(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "�存为 vCard(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "转��系人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "转��系人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "给�系人�信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "给列表�信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "给�系人�信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "打�(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "�制到地�簿(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "移至地�簿(_V)..."
 
-#: ../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:952
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../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
 #: ../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 "�制(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "粘贴(_A)"
 
 #. 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:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "任何类别"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "其它错误"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3014,7 +3018,7 @@ msgstr "车载电�"
 
 #: ../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
@@ -3115,9 +3119,9 @@ msgid "Radio"
 msgstr "收音机"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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 "角色"
 
@@ -3153,38 +3157,38 @@ msgid "Web Site"
 msgstr "网站"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../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-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-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:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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
 msgid "Width"
 msgstr "宽度"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../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-click-to-add.c:530
 #: ../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:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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
 msgid "Height"
 msgstr "高度"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "有焦点"
 
@@ -3204,11 +3208,21 @@ msgstr "文字模型"
 msgid "Max field name length"
 msgstr "最大域�长度"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "列宽"
 
-#: ../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"
+"正在�索�系人..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3222,7 +3236,7 @@ msgstr ""
 "\n"
 "或在此�击以创建新�系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3236,7 +3250,7 @@ msgstr ""
 "\n"
 "请在此�击以创建新�系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3246,7 +3260,7 @@ msgstr ""
 "\n"
 "�索�系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3256,40 +3270,41 @@ msgstr ""
 "\n"
 "本视图中没有�显示的项。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "适�器"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "工作电�邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "家庭电�邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "其它电�邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "已选择"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "有光标"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "在�览器中打开链接(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "�制链接�置(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "把新信��到(_S)..."
 
@@ -3311,7 +3326,7 @@ msgid "map"
 msgstr "地图"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "列出�员"
 
@@ -3332,25 +3347,23 @@ msgid "Video Chat"
 msgstr "视频�天"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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
+#: ../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-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 "日历"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "å¿™/é—²"
 
@@ -3372,150 +3385,162 @@ msgid "Web Log"
 msgstr "Web 日志"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "纪念日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "�称"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "�功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "��忙"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "仓库脱机"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "地�簿�存在"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "找�到�系人"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "�系人 ID 已�存在"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "�支�的�议"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "已�消"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "无法�消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "认�失败"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "必须认�"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS ��用"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "没有��"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "脱机模�下��用"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "其它错误"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "无效的�务器版本"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "�支�的认�方�"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, 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 ""
 "我们无法打开此地�簿。请检查路径 %s 是�存在以�您是�有足够的��访问它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 ""
-"我们无法打开此地�簿。这�能是由于您输入了错误的 URI，也�能是因为LDAP �务器"
+"我们无法打开此地�簿。这�能是由于您输入了错误的 URI，也�能是因为 LDAP �务器"
 "已�关闭。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 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 "
@@ -3524,75 +3549,79 @@ msgstr ""
 "本版本的 Evolution 并没有把 LDAP 支�编译进去。如果您希望在 Evolution 中使用 "
 "LDAP，就必须安装�用了 LDAP 的 Evolution 包。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 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 ""
 "我们无法打开此地�簿。这�能是由于您输入了错误的 URI，也�能是因为�务器已�"
 "关闭。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "错误细节："
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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 ""
-"匹�此查询的�片数既超过了�务器�置的返回数目，也超过了\n"
+"匹�此查询的�片数超过了�务器�置的返回数目，或者超过了\n"
 "Evolution �置�显示的数目。请在�索的时候指定更加严格的\n"
 "�索�件，或者在此地�簿的目录�务器�数中将结果�制调高。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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 ""
-"执行此查询的时间既超过了�务器�制，也超过了您为此地�簿�置的�制。\n"
+"执行此查询的时间超过了�务器�制，或者超过了您为此地�簿�置的�制。\n"
 "请在�索的时候指定更加严格的�索�件，或者在此地�簿的目录�务器�数\n"
 "中将时间�制调高。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
 msgstr "此地�簿的�端无法解�此查询。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
 msgstr "此地�簿的�端拒�执行此查询。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "此查询未�功完�。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
 msgid "Error adding contact"
 msgstr "添加�系人出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error modifying contact"
 msgstr "修改�系人出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
 msgid "Error removing contact"
 msgstr "删除�系人出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3604,16 +3633,16 @@ msgstr[0] ""
 "打开 %d 个�系人将�时打开 %d 个新窗�。\n"
 "您真的想�显示所有�系人�？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 msgid "_Don't Display"
 msgstr "�显示(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Display _All Contacts"
 msgstr "显示全部�系人(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3622,69 +3651,69 @@ msgstr ""
 "%s 已�存在\n"
 "您打算覆盖它�？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "�系人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
 msgid "Select Address Book"
 msgstr "选择地�簿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "list"
 msgstr "列表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contact to"
 msgstr "将�系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contact to"
 msgstr "将�系人�制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contacts to"
 msgstr "将�系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contacts to"
 msgstr "将�系人�制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
 msgid "Multiple vCards"
 msgstr "多个 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 #, c-format
 msgid "vCard for %s"
 msgstr "%s çš„ vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "Contact information"
 msgstr "�系人信�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的�系人信�"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "正在查询地�簿..."
 
@@ -3704,50 +3733,50 @@ msgid "Show Compact vCard"
 msgstr "显示紧凑 vCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "�存在地�簿中"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "�片视图"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 数�交�格�(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
 
@@ -3800,12 +3829,12 @@ msgid "Format"
 msgstr "格�"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "页眉"
 
@@ -3907,8 +3936,8 @@ msgstr "阴影"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "大�："
@@ -3926,7 +3955,7 @@ msgid "Top:"
 msgstr "顶部："
 
 #: ../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 "类型："
 
@@ -3938,35 +3967,35 @@ msgstr "宽度："
 msgid "_Font..."
 msgstr "字体(_F)..."
 
-#: ../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 "�系人打�样�编辑器测试"
 
-#: ../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 "版� (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 "这应该测试�系人打�样�编辑器部件"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "�系人打�测试"
 
-#: ../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:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "无法打开文件"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "无法获得地�簿列表"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -3982,7 +4011,7 @@ msgid "OUTPUTFILE"
 msgstr "输出文件"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "列出本地地�簿文件夹"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4031,290 +4060,301 @@ msgstr "未处�的错误"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr "“{0}�是�读日历�。切�到日历视图，然�选择�接�约会的日历。"
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
 
-#: ../calendar/calendar.error.xml.h:3
+#. 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}�是�读日历，无法修改。请�选一个�接�约会的日历。"
+
+#: ../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:4
+#: ../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:5
+#: ../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:6
+#: ../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:7
+#: ../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:8
+#: ../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:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "您确定�删除“{0}�任务�？"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "您确信您�删除标题为“{0}�的约会�？"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "您确定�删除“{0}�备忘�？"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "您确定�删除这 {0} 个约会�？"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "您确定�删除这 {0} 个备忘�？"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "您确定�删除这 {0} 个任务�？"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "您确信您�删除该约会�？"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您�删除该会议�？"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "您确信您�删除该备忘�？"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定�删除此任务�？"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "您确定想��存没有摘�的备忘�？"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "您确定想���没有摘�的约会�？"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "您确定想���没有摘�的任务�？"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "无法创建新事件"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "无法�存事件"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "删除日历“{0}��？"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "删除备忘列表“{0}��？"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "删除任务列表“{0}��？"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "���(_N)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下载进行中。您想��存约会�？"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下载进行中。您想��存任务�？"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "无法装入编辑器。"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../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:35
+#: ../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:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "装入日历时出错"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "装入备忘列表出错"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "装入任务列表出错"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "��更新的信�将�许其他出席者使他们的日历��最新。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "��更新的信��许其他出席者使他们的任务列表��最新。"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "附件正在下载中。�存约会将使得约会�存时无法包��续的附件。"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "附件正在下载中。�存任务将使得任务�存时无法包��续的附件。"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "�些特性�能无法在您目�的�务器下工作。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 备忘异常退出。"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "备忘列表未标为脱机使用"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "备忘列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "此备忘列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想��存对约会的更改�？"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "您想��存对此备忘的更改�？"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "您想��存对此任务的更改�？"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "您是�想�为此备忘���消通知？"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "您是�想�给全部出席者���消通知？"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是�想�给出席者��会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "您是�想�将此任务��给出席者？"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是�想�给出席者��更新的会议信�？"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是�想�给出席者��更新的任务信�？"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4323,107 +4363,107 @@ msgstr ""
 "您正在连接到�支�的 GroupWise �务器，此时使用 Evolution �能�到问题。为了"
 "得到最佳效果，�务器应该�级到支�的版本。"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已�更改了此约会，但尚未�存。"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "您已�对此任务�出了更改，但尚未�存。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "您已�对此备忘�出了更改，但尚未�存。"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除�您�新�动 Evolution，�则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "除�您�新�动 Evolution，�则您的备忘将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "除�您�新�动 Evolution，�则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "�存(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "�存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "��(_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "��通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}。"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件："
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "无法�动 evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程��"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "无法读入 Pilot 的备忘应用程��"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "无法写入 Pilot 备忘应用程��"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "默认优先级："
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程��"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "无法写入 Pilot ToDo 应用程��"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "日历"
 
@@ -4464,25 +4504,25 @@ msgid "Memo_s"
 msgstr "备忘(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../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/memos-control.c:370
 msgid "Memos"
 msgstr "备忘"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../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:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../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/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: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 "任务"
@@ -4500,23 +4540,24 @@ msgstr "任务(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 日历�醒通知�务"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../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:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "�时"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "开始时间"
 
@@ -4527,9 +4568,9 @@ msgstr "约会"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "�置："
@@ -4539,17 +4580,15 @@ msgid "Snooze _time:"
 msgstr "��时间(_T)："
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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:41 ../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 "编辑(_E)"
 
@@ -4561,32 +4600,32 @@ msgstr "��(_S)"
 msgid "location of appointment"
 msgstr "约会�置"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "没有�用的摘�。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "没有�述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "没有�用的�置信�。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个�醒"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4598,7 +4637,7 @@ msgstr ""
 "��电�邮件。Evolution 将以\n"
 "显示普通�示会�框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4614,35 +4653,35 @@ msgstr ""
 "\n"
 "您确信您��行该程��？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "���次询问此问题。"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "无法�始化 Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr "无法创建�醒�务车间，�能已��行了..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "无效时间"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d �时"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4651,8 +4690,8 @@ msgstr[0] "%d 分钟"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4880,12 +4919,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:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "显示“预览���"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "显示“预览���。"
 
@@ -4935,7 +4974,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:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "时区"
 
@@ -5062,66 +5101,66 @@ msgstr "工作日开始分钟"
 msgid "daylight savings time"
 msgstr "�时制时间"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "概��有"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "�述�有"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "类别为"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "注释�有"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "�置�有"
 
-#: ../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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "无匹�"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "下一周的任务"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "活动任务"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "延期任务"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "已完�任务"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "有附件的任务"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "活动约会"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5129,16 +5168,17 @@ msgid ""
 msgstr ""
 "该�作将永久删除所有比选中时间�早的事件。如果您继续，您将无法��这些事件。"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "销�较早的事件"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../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:397
-#: ../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 "天"
 
@@ -5147,131 +5187,331 @@ msgstr "天"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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:406
+#: ../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 "天气"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "�制(_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�级日历失败。"
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "无法打开日历“%s��创建事件和会议"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "没有�创建事件和会议的日历"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "日历�选择器"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "新建会议"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "创建一�新会议请求"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "日视图"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "周工作视图"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "周视图"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "月视图"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+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
+msgid "Attachments"
+msgstr "附件"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "出席者"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "商务"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "类别"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "分类"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "完�"
+
+#: ../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/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "机密"
+
+#: ../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 "�述"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "�述�有"
 
-#: ../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:22
+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
+msgid "Exist"
+msgstr "存在"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "最爱"
+
+#: ../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
+msgid "Holiday"
+msgstr "�日"
+
+#: ../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
+msgid "Hot Contacts"
+msgstr "热络"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "想法"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "国际"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "关键客户"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "�项"
+
+#: ../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
+msgid "Organizer"
+msgstr "组织者"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "电�"
+
+#: ../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/memotypes.xml.h:29
+msgid "Private"
+msgstr "�密"
+
+#: ../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
+msgid "Public"
+msgstr "公开"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "�现"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "状�"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "战略"
+
+#: ../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:361
+msgid "Summary"
+msgstr "概�"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "概��有"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "供应商"
+
+#: ../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 "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+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
+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
+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
+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
+msgid "is not"
+msgstr "�是"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "打开日历时出错"
@@ -5284,11 +5524,11 @@ msgstr "打开日历的方法�支�"
 msgid "Permission denied to open the calendar"
 msgstr "没有��打开日历"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "编辑�醒"
 
@@ -5321,17 +5561,17 @@ msgid "Mes_sage:"
 msgstr "消�(_S)："
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "播放声音"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 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:454
 msgid "Run a program"
 msgstr "�行程�"
 
@@ -5344,7 +5584,7 @@ msgid "Send To:"
 msgstr "��给："
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "��电�邮件"
 
@@ -5399,7 +5639,7 @@ msgstr "分钟"
 msgid "start of appointment"
 msgstr "约会开始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "动作/触�器"
 
@@ -5410,16 +5650,15 @@ msgstr "添加(_D)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "�醒"
 
-#: ../calendar/gui/dialogs/cal-attachment-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
 msgid "_Suggest automatic display of attachment"
 msgstr "建议自动显示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "添加附件"
 
@@ -5487,8 +5726,8 @@ msgid "Display"
 msgstr "显示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "星期五"
 
@@ -5503,8 +5742,8 @@ msgstr ""
 "天"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "星期一"
 
@@ -5527,7 +5766,7 @@ msgstr ""
 "星期日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "选�一�颜色"
 
@@ -5537,8 +5776,8 @@ msgid "S_un"
 msgstr "周日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "星期六"
 
@@ -5555,8 +5794,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期�览器中显示周数(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "星期日"
 
@@ -5574,13 +5813,13 @@ msgid "Template:"
 msgstr "模�："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "星期四"
 
 #: ../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 "时区(_Z)："
 
@@ -5589,14 +5828,14 @@ msgid "Time format:"
 msgstr "时间格�："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../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:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -5674,300 +5913,451 @@ msgstr "周三(_W)"
 msgid "before every appointment"
 msgstr "在�次约会�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "将日历内容�制到本地以进行脱机�作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "将任务列表内容�制到本地以进行脱机�作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "将备忘列表内容�制到本地以进行脱机�作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "颜色(_O)："
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
+msgstr "颜色(_R)："
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "备忘列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "新建任务列表"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "备忘列表属性"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "此事件已�被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "此任务已�被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "此备注已�被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已��了修改。放弃这些修改并关闭编辑器�？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您还没有进行修改，关闭编辑器�？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "此事件已�被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "此任务已�被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "此备注已�被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已��出了修改。放弃这些修改并更新编辑器�？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器�？"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (完� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "已完� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加的信件 - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d �附加的信件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "�消拖曳(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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:91
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "编辑约会"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "会议 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "约会 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "分�的任务 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "任务 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "备忘 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "没有概�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "�击此处�关闭当�窗�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "将选中文字�制到剪贴�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "将选中文字剪切到剪贴�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "�击此处�查看�用的帮助"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "从剪贴�中粘贴文字"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "�击此处��存当�窗�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "选中所有文字"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "分类(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "文件(_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "�入(_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "选项(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../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 "查看(_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "附件(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "�击此处�便附加文件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "类别(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "切�是�显示类别"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "时区(_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "切�是�显示时区"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "公开(_B)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "分类为公开"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "�人(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "分类为�人"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "机密(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "分类为机密"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "角色域(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "切�是�显示角色域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "请回�(_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "切�是�显示请回�域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "状�域(_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "切�是�显示状�域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "类型域(_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "切�是�显示出席者类型域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "最近文档(_D)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> 个附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "��附件�(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "显示附件�(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../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
 #: ../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 "删除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "添加附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "显示附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "按空格键�切�附件�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "编辑约会"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "会议 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "约会 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "分�的任务 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "任务 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "备忘 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "没有概�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的�，对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "无法使用当�版本�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "无法打开�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "无法打开目的"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "目的�读"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "从全部其它收件人的邮箱中删除此项�？(_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "无法删除事件，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "无法删除任务，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "无法删除备忘，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "无法删除项目，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "无法删除事件，原因是��被�止"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "无法删除任务，原因是��被�止"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "无法删除备忘，原因是��被�止"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "无法删除项目，原因是��被�止"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "由于错误，无法删除事件"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "由于错误，无法删除任务"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "由于错误，无法删除备忘"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "由于错误，无法删除项目"
 
@@ -5976,7 +6366,7 @@ msgid "Contacts..."
 msgstr "�系人..."
 
 #: ../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 "授�给："
 
@@ -5984,132 +6374,178 @@ msgstr "授�给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "�醒(_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "�击此处以设定或�消此事件的�醒"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "�现(_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "将此事件标为���生"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../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
+msgid "Insert advanced send options"
+msgstr "�入高级��选项"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "全天事件(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "切�是�有全天事件"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "将时间显示为忙(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "切�是�将时间显示为忙"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "å¿™/é—²(_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "查询出席者的忙闲信�"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "约会(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "�现"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "此事件有�醒"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "组织者(_G)："
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "代�人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "没有结�日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "结�日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "结�时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有�户了。"
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "需�一�组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "需�至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "添加(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s�。"
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正在以 %s 的身份行动"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天�"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d �时�"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟�"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "自定义"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2011
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../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-signature-combo-box.c:70
 msgid "None"
 msgstr "æ— "
 
@@ -6134,23 +6570,25 @@ msgid "Custom Alarm:"
 msgstr "自定义�醒："
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "�述(_E)："
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件�述"
 
-#: ../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 "概�(_M)："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "�醒(_A)"
 
+#: ../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 "�述(_D)："
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "时间(_T)："
@@ -6181,28 +6619,24 @@ msgstr "更改组织者(_H)"
 msgid "Co_ntacts..."
 msgstr "�系人(_N)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "组织者"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "组织者："
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s�中的备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "收件人"
 
@@ -6215,63 +6649,59 @@ msgstr "开始日期(_R)："
 msgid "T_o:"
 msgstr "到(_O)："
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "�述(_D)："
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "组(_G)："
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "您�将修改�现事件。您想�修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "您�将代��现事件。您想�代�何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "您�将修改�现任务。您想�修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "您�将修改�现备忘。您想�修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "�是本次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "本次和以��次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "本次和以��次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "所有�次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会�有 Evolution 无法编辑的�现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "在"
 
@@ -6279,7 +6709,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "第一个"
 
@@ -6288,7 +6718,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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "第二"
 
@@ -6296,7 +6726,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "第三个"
 
@@ -6304,7 +6734,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "第四个"
 
@@ -6312,13 +6742,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "最�一个"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -6326,7 +6756,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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "上旬"
 
@@ -6334,7 +6764,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] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "中旬"
 
@@ -6342,45 +6772,45 @@ 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] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "下旬"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "添加例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "无法获得�修改的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "修改例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "无法获得�删除的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "日期/时间"
 
@@ -6431,12 +6861,12 @@ msgstr "周"
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "完�日期有错"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "网页"
 
@@ -6451,51 +6881,55 @@ msgstr "<span weight=\"bold\">状�</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:435 ../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:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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
 msgid "Completed"
 msgstr "已完�"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../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
 msgid "High"
 msgstr "高"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "进行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../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
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../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
 msgid "Normal"
 msgstr "中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -6508,7 +6942,7 @@ msgid "Stat_us:"
 msgstr "状�(_U)："
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "未定义"
 
@@ -6517,7 +6951,7 @@ msgid "_Date completed:"
 msgstr "完�日期(_D)："
 
 #: ../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 "优先级(_P)："
 
@@ -6525,25 +6959,37 @@ msgstr "优先级(_P)："
 msgid "_Web Page:"
 msgstr "网页(_W)："
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "状�细节(_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
+msgid "_Send Options"
+msgstr "��选项(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "任务细节"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "组织者(_Z)："
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s�中的任务。"
@@ -6557,160 +7003,140 @@ msgid "Categor_ies..."
 msgstr "类别(_I)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "�述(_S)："
+msgid "D_ue date:"
+msgstr "到期日期(_U)："
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "时区："
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "到期日期(_D)："
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 周"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "执行未知的动作"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "在 %2$s 时 %1$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:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触�类型"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "�击以打开 %s"
 
-#: ../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:857
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../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
+#: ../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 "开始日期："
 
-#: ../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-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 "�述："
 
-#: ../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
 msgid "Web Page:"
 msgstr "网页："
 
-#: ../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 "概�："
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "到期日期："
 
 #. 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
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "状�："
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "优先级："
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "公开"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "�密"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "机密"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "结�日期"
@@ -6720,21 +7146,14 @@ msgstr "结�日期"
 msgid "Start Date"
 msgstr "开始日期"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "概�"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "空闲"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "�忙"
 
@@ -6748,199 +7167,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../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:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../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 "�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../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 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2036
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../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-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
+#: ../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:968
+#: ../calendar/gui/e-cal-model.c:976
 msgid "Recurring"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
 msgid "Assigned"
 msgstr "已分�"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "�存为..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 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:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "无标题图�.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../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
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "�存为(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "�存选中(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "组织者：%s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "开始："
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "到期："
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "更新对象"
 
-#: ../calendar/gui/e-calendar-table.c:1137
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-msg-composer.c:1472
+#: ../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:277
 msgid "Save as..."
 msgstr "�存为..."
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "打�(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1376 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "分�任务(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转�(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "标记为完�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "标记为未完�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "把任务标记为未完�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1386
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "删除选中任务(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1623
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "�击以添加任务"
@@ -6963,7 +7408,8 @@ msgid "Due date"
 msgstr "到期日期"
 
 #: ../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:372
 msgid "Priority"
 msgstr "优先级"
 
@@ -6971,127 +7417,108 @@ msgstr "优先级"
 msgid "Start date"
 msgstr "开始日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "状�"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "移动项目"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "�制项目"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "新建会议(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "当�视图(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "选择今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "选择日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "打�(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "�制到日历(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "代�会议(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转�(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "回�(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "回�所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "将此次�生�为�移动(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "组织者：%s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "组织者：%s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "�置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2269
 #, 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%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 "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../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"
@@ -7104,7 +7531,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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
@@ -7115,436 +7542,406 @@ 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:1359
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../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
 msgid "%A %d %B"
 msgstr "%B%dæ—¥%A"
 
 #. 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:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "上�"
 
 #. 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:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "下�"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(���现)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "� %d 天"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "� %d 周"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "� %d 周的"
 
 #. 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 " 和 "
 
-#. 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 天属于"
 
-#. 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 属于"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "� %d 月"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "� %d 年"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " 总计 %d 次"
 
 #. 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 "，结�于 "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "开始"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "结�"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "到期"
 
-#: ../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 "iCalendar 信�"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "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
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "未知的人"
 
 #. 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> 请查看下列信�，并从下�的��中选择一个动作。"
 
-#: ../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:728
-#: ../plugins/itip-formatter/itip-formatter.c:2024
+#: ../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:2034
 msgid "Accepted"
 msgstr "接�"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2027
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "暂时接�"
 
-#: ../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:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2030
+#: ../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:2040
 msgid "Declined"
 msgstr "拒�"
 
-#: ../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> �布了会议信�。"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "会议信�"
 
-#: ../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> 请求 %s �加一个会议。"
 
-#: ../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> 请求您�加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> 希望加入到已有的会议。"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "会议更新"
 
-#: ../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> 希望收到最新的会议信�。"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
-#: ../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> 已回�一个会议请求。"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "会议答�"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> �消了一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "会议�消"
 
-#: ../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> ��了一个无法�解的信件。"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "错误的会议信件"
 
-#: ../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> �布了任务信�。"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "任务信�"
 
-#: ../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> 请求 %s 完�一个任务。"
 
-#: ../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> 请求您完�一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "任务建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> 希望加入到已有的任务。"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "任务更新"
 
-#: ../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> 希望获�最新的任务信�。"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
-#: ../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> 已�回�了任务分�。"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "任务回�"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> �消了任务。"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "任务�消"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "错误的任务信件"
 
-#: ../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> �布了忙闲信�。"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "忙闲信�"
 
-#: ../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> 请求您的忙闲信�。"
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "忙/闲请求"
 
-#: ../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> 应答了忙闲请求。"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信件"
 
-#: ../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 "信件的格��能�正确"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "信件��有�支�的请求。"
 
-#: ../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 "附件中没有有效的日历信件"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有�查看的日历项目"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "更新完�\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 "对象无效，无法更新\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 "此�应并��自当�出席者。将�应者加为出席者�？"
 
-#: ../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 "因为无效状�而无法更新出席者状��\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "更新出席者状�\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于�目��存在而无法更新出席者状�"
 
-#: ../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 "项目已���\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 "无法��项目�\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: ../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 "接�"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "暂时接�"
 
-#: ../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 "拒�"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "��忙闲信�"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "更新应答者状�"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "��最新的信�"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "�消"
@@ -7573,112 +7970,112 @@ msgstr "正在装入日历..."
 msgid "Server Message:"
 msgstr "�务器消�："
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "�选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "资�"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../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/print.c:965
+#: ../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
 msgid "Individual"
 msgstr "个人"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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
 msgid "Group"
 msgstr "组"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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
 msgid "Resource"
 msgstr "资�"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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
 msgid "Room"
 msgstr "房间"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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
 msgid "Chair"
 msgstr "主席"
 
-#: ../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/print.c:983
+#: ../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
 msgid "Required Participant"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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
 msgid "Optional Participant"
 msgstr "�选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Non-Participant"
 msgstr "��加"
 
-#: ../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 "需�动作"
 
-#: ../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:412
+#: ../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
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../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:737
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../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
 msgid "Delegated"
 msgstr "被委任的"
 
 #. 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:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "请回�"
 
-#: ../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 "处�中"
 
 #. 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:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -7686,85 +8083,81 @@ msgstr "%Y年%m月%d日%A"
 #. 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:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%Y年%m月%d日%A"
 
 #. 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 "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "没有信�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "出席者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "�显示工作�时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "自动获�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "全部人和资�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "全部人和一个资�(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资�(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "结�时间(_E)："
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "出席者"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "�击此处添加出席者"
@@ -7789,16 +8182,16 @@ msgstr "语言"
 msgid "Member"
 msgstr "�员"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "删除选中备忘(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�击以添加备忘"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7807,85 +8200,80 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "装入备忘"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "在 %s 打开备忘"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
-#: ../calendar/gui/e-tasks.c:975
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: ../calendar/gui/e-tasks.c:1065
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: ../calendar/gui/e-tasks.c:1310
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "正在完�任务..."
 
-#: ../calendar/gui/e-tasks.c:1360
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "销�"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "更新查询"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "自定义视图(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "�存自定义视图(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "定义视图(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "装入�于 %s 的约会"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "装入�于 %s 的任务"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "装入�于 %s 的备忘"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "销�"
 
@@ -7945,57 +8333,57 @@ msgstr "�月"
 msgid "_Select Today"
 msgstr "选择今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "必须设定组织者。"
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "至少需�一个�加者"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "事件信�"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "任务信�"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "备忘信�"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "忙闲信�"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "日历信�"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "æ›´æ–°"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信� (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar 信�"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
@@ -8032,47 +8420,54 @@ msgstr "没有�创建备忘的日历"
 msgid "Memo Source Selector"
 msgstr "备忘��选择器"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "新建备忘"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "新建共享备忘"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "共享备忘(_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "创建新的共享备忘"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "备忘列表(_S)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "打�备忘"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "下一周"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8083,7 +8478,7 @@ msgstr ""
 "\n"
 "请�候，Evolution 正在��您的文件夹..."
 
-#: ../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"
@@ -8095,27 +8490,27 @@ msgstr ""
 "请�候，Evolution 正在��您的文件夹..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "无法从 evolution/config.xmldb 中��旧设置"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "无法��日历“%s�"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "无法��任务“%s�"
 
 #: ../calendar/gui/migration.c:1227
-#: ../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
+#: ../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 "笔记"
 
@@ -8272,57 +8667,52 @@ msgstr "五"
 msgid "Sa"
 msgstr "å…­"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "概�：%s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "出席者："
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "状�：%s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完�率：%i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "�系人："
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "�将到�的约会"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "新建任务列表(_N)"
@@ -8350,39 +8740,47 @@ msgstr "没有�创建任务的日历"
 msgid "Task Source Selector"
 msgstr "任务��选择器"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "新建任务"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+#, fuzzy
+msgctxt "New"
+msgid "_Task"
+msgstr "任务(_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "新建分�的任务"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "分�的任务(_D)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "创建新分�的任务"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "新建任务列表"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "任务列表(_K)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8393,1700 +8791,1913 @@ msgstr ""
 "\n"
 "确实删除这些任务�？"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "���次询问。"
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "打�任务"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% 完�"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "已�消"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "进行中"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "大于"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "�于"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "�醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 文件(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "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 "�洲/阿比让"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "�洲/阿克拉"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "�洲/亚的斯亚�巴"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "�洲/阿尔�尔"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "�洲/阿斯马拉"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "�洲/巴马科"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�洲/��"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "�洲/��尔"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "�洲/比�"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "�洲/布兰太尔"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "�洲/布拉柴维尔"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "�洲/布�布拉"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "�洲/开罗"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "�洲/��布兰�"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "�洲/休塔"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "�洲/科纳克里"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "�洲/达喀尔"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "�洲/达累斯�拉姆"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "�洲/�布�"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "�洲/�阿拉"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "�洲/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "�洲/弗里敦"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "�洲/哈�罗内"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "�洲/哈拉雷"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "�洲/约翰内斯堡"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "�洲/�帕拉"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "�洲/喀土穆"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "�洲/基加利"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "�洲/金沙�"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "�洲/拉�斯"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "�洲/利伯维尔"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "�洲/洛美"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "�洲/罗安达"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "�洲/�本巴希"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "�洲/���"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "�洲/马拉�"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "�洲/马普托"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "�洲/马塞�"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "�洲/姆巴巴纳"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "�洲/摩加迪沙"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "�洲/蒙罗维亚"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "�洲/内罗毕"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "�洲/�贾梅纳"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "�洲/尼亚美"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "�洲/努瓦克肖特"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "�洲/瓦加��"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "�洲/波多诺�"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "�洲/圣多美"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "�洲/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "�洲/的黎波里"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "�洲/�尼斯"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "�洲/温得和克"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "美洲/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "美洲/安克雷奇"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "美洲/安圭拉"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "美洲/安�瓜"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "美洲/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "美洲/阿�巴"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "美洲/亚�森"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "美洲/巴巴多斯"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "美洲/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "美洲/伯利兹"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "美洲/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "美洲/波哥大"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "美洲/�伊西"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "美洲/布宜诺斯艾利斯"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "美洲/剑桥湾"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "美洲/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "美洲/加拉加斯"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "美洲/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "美洲/�宴"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "美洲/开曼"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "美洲/�加哥"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "美洲/奇瓦瓦"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "美洲/科尔多瓦"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "美洲/哥斯达黎加"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "美洲/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "美洲/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "美洲/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "美洲/�森"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "美洲/�森克里克"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "美洲/丹佛"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "美洲/底特律"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "美洲/多米尼加"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "美洲/埃德蒙顿(爱民顿)"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "美洲/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "美洲/�尔瓦多"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "美国/�塔雷�"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "美洲/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "美洲/戈德�普"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "美洲/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "美洲/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "美洲/格林纳达"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "美洲/瓜德罗普岛"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "美洲/�地马拉"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "美洲/瓜亚基尔"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "美洲/圭亚那"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "美洲/哈利法克斯"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "美洲/哈瓦那"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "美洲/厄木波利斯"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "美洲/�地安那/�地安纳波利斯"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "美洲/�地安那/诺克斯"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "美洲/�地安那/马伦戈"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "美洲/�地安那/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "美洲/�地安纳波利斯"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "美洲/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "美洲/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "美洲/牙买加"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "美洲/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "美洲/朱诺"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "美洲/肯塔基/路易斯维尔"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "美洲/肯塔基/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "美洲/拉巴斯"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "美洲/利马"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "美洲/洛�矶"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "美洲/路易斯维尔"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "美洲/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "美洲/马那瓜"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "美洲/马瑙斯"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "美洲/马�尼克岛"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "美洲/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "美洲/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "美洲/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "美洲/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "美洲/墨西哥城"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "美洲/密克隆岛"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "美洲/蒙特雷"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "美洲/蒙得维的亚"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "美洲/蒙特利尔"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "美洲/蒙特塞拉特"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "美洲/拿骚"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "美洲/纽约"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "美洲/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "美洲/诺姆"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "美洲/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "美洲/北达科它/中心"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "美洲/巴拿马"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "美洲/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "美洲/帕拉马里�"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "美洲/凤凰城"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "美洲/太�港"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "美洲/西�牙港"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "美洲/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "美洲/波多黎�"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "美洲/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "美洲/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "美洲/累西腓"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "美洲/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "美洲/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "美洲/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "美洲/圣地亚哥"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "美洲/圣多明哥"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "美洲/圣�罗"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "美洲/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "美洲/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "美洲/圣约翰斯"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "美洲/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "美洲/圣露西娅"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "美洲/圣托马斯"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "美洲/圣文森特"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "美洲/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "美洲/特�西加尔巴"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "美洲/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "美洲/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "美洲/��纳"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "美洲/托托拉岛"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "美洲/温哥�"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "美洲/怀特�斯"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "美洲/温尼伯"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "美洲/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "美洲/耶洛奈夫"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "��洲/凯西"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "��洲/戴维斯"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "��洲/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "��洲/莫森"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "��洲/麦克默多"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "��洲/帕默"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "��洲/��点"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "��洲/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "��洲/东方站"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "北�地区/郎伊尔城"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "亚洲/亚�"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "亚洲/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "亚洲/安曼"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "亚洲/阿纳德尔"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "亚洲/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "亚洲/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "亚洲/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "亚洲/巴格达"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "亚洲/巴林岛"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "亚洲/巴库"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "亚洲/曼谷"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "亚洲/��特"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "亚洲/比什凯克"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "亚洲/文莱"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "亚洲/加尔�答"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "亚洲/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "亚洲/�庆"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "亚洲/科伦�"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "亚洲/大马士�"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "亚洲/达�"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "亚洲/�力"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "亚洲/迪拜"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "亚洲/�尚别"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "亚洲/加沙"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "亚洲/哈尔滨"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "亚洲/香港"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "亚洲/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "亚洲/伊尔库次克"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "亚洲/伊斯�布尔"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "亚洲/雅加达"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "亚洲/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "亚洲/耶路撒冷"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "亚洲/喀布尔"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "亚洲/堪察加�岛"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "亚洲/�拉奇"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "亚洲/喀什葛尔"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "亚洲/加德满都"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "亚洲/克拉斯诺�斯克"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "亚洲/�隆�"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "亚洲/�晋"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "亚洲/科�特"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "亚洲/澳门"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "亚洲/澳门"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "亚洲/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "亚洲/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "亚洲/马尼拉"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "亚洲/马斯喀特"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "亚洲/尼科西亚"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "亚洲/新西伯利亚"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "亚洲/鄂木斯克"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "亚洲/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "亚洲/金边"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "亚洲/�甸"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "亚洲/平壤"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "亚洲/�塔尔"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "亚洲/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "亚洲/仰光"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "亚洲/利雅得"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "亚洲/西贡"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "亚洲/库页岛"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "亚洲/撒马尔罕"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "亚洲/汉城"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "亚洲/上海"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "亚洲/新加�"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "亚洲/�北"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "亚洲/塔什干"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "亚洲/第比利斯"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "亚洲/德黑兰"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "亚洲/廷布"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "亚洲/东京"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "亚洲/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "亚洲/乌兰巴托"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "亚洲/乌�木�"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "亚洲/万象"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "亚洲/符拉迪沃斯托克"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "亚洲/雅库茨克"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "亚洲/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "亚洲/耶列万"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "大西洋/亚述尔群岛"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "大西洋/百慕大"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "大西洋/�内里"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/佛得角"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "大西洋/法罗"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "大西洋/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "大西洋/马德拉群岛"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "大西洋/雷克雅未克"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "大西洋/�乔治亚"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "大西洋/圣海伦娜"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "大西洋/斯�利"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "澳大利亚/阿德莱德"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "澳大利亚/布里斯�"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "澳大利亚/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "澳大利亚/达尔文"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "澳大利亚/�巴特"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "澳大利亚/林德曼"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "澳大利亚/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "澳洲/墨尔本"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "澳大利亚/�斯"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "澳洲/悉尼"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "欧洲/阿姆斯特丹"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "欧洲/安�尔"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "欧洲/雅典"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "欧洲/�尔法斯特"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "欧洲/�尔格莱德"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "欧洲/�林"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "欧洲/布拉迪斯拉�"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "欧洲/布�塞尔"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "欧洲/布加勒斯特"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "欧洲/布达佩斯"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "欧洲/尼科西亚"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "欧洲/哥本哈根"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "欧洲/都�林"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "欧洲/直布罗陀"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "欧洲/赫尔辛基"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "欧洲/伊斯�布尔"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "欧洲/加里�格勒"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "欧洲/基辅"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "欧洲/里斯本"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "欧洲/�布尔雅纳"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "欧洲/伦敦"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "欧洲/�森堡"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "欧洲/马德里"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "欧洲/马耳他"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "欧洲/明斯克"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "欧洲/摩纳哥"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "欧洲/莫斯科"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "欧洲/尼科西亚"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "欧洲/奥斯路"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "欧洲/巴黎"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "欧洲/布拉格"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "欧洲/里加"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "欧洲/罗马"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "欧洲/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "欧洲/圣马力诺"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "欧洲/�拉热�"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "欧洲/辛�罗波尔"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "欧洲/斯科普里"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "欧洲/索�亚"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "欧洲/斯德哥尔摩"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "欧洲/塔林"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "欧洲/地拉那"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "欧洲/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "欧洲/瓦�兹"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "欧洲/梵蒂冈"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "欧洲/维也纳"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "欧洲/维尔纽斯"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "欧洲/�沙"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "欧洲/�格勒布"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "欧洲/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "欧洲/�黎世"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "�度洋/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "�度洋/查戈斯群岛"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "�度洋/圣诞岛"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "�度洋/科科斯"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "�度洋/科摩罗"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "�度洋/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "�度洋/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "�度洋/马尔代夫"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "�度洋/毛里求斯"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "�度洋/马约特岛"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "�度洋/留尼汪"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "太平洋/阿皮亚"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "太平洋/奥克兰"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "太平洋/查塔姆群岛"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "太平洋/�活节岛"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "太平洋/埃法特岛"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "太平洋/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "太平洋/�济"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "太平洋/富纳富�"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "太平洋/加拉帕哥斯群岛"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "太平洋/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/瓜达�纳尔岛"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "太平洋/关岛"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "太平洋/�奴��"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "太平洋/约翰斯顿"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "太平洋/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/夸贾林环�"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "太平洋/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "太平洋/马克�斯群岛"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "太平洋/中途岛"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "太平洋/瑙�"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "太平洋/纽埃岛"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "太平洋/诺�克"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "太平洋/努美阿"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/帕果_帕果"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "太平洋/帕劳"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/皮特克�岛"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "太平洋/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/莫尔斯比港"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/拉罗汤加岛"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "太平洋/塞�岛"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "太平洋/塔希�"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "太平洋/塔拉瓦岛"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "太平洋/特�克"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "太平洋/�克岛"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "太平洋/沃利斯"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "�击此处以使用地�簿"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "无法打开自动�存文件"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "投递目的"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "无法从编辑器获�信件"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "选择�将信件投递到哪个文件夹。"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "�入附件"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "�击此处以选择�投递到的文件夹"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "附件(_T)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "签�(_G)："
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "无标题信件"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "添加附件"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "关闭当�文件"
+
+#: ../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 "打�(_P)..."
+
+#: ../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 "打�预览(_V)"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "�存当�文件"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "�存为(_A)..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "用��的文件��存当�文件"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "�存�稿(_D)"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "�存为�稿"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "��(_E)"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "��这�信"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "�入��选项"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "新建信件(_M)"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "打开新建信件窗�"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "字符编�(_E)"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "安全(_S)"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "PGP 加密(_E)"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "用 PGP 加密该信件"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "PGP 签�(_S)"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "用您的 PGP 密钥签�该信件"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "标为优先(_P)"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "将信件设定为高优先级"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "请求阅读收�(_Q)"
+
+#: ../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 "S/MIME 加密(_C)"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "用您的 S/MIME 加密�书加密该信件"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "S/MIME 签�(_N)"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "用您的 S/MIME 签�认�签�该信件"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "暗�域(_B)"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "是�显示暗中转�域"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "抄�域(_C)"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "是�显示转�域"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "�件人域(_F)"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "是�显示�件人选择器"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "投递到域(_P)"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "是�显示投递到域"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "回�域(_R)"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "是�显示回�域"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "主题域(_C)"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "切�是�显示主题域"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "收件人域(_T)"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "是�显示寄给域"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "输入信件的收件人"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "输入将接收该信件副本的收件人地�"
+
+#: ../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 "输入将接收该信件副本，但�出现在收件人列表中的收件人地�"
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "�件人(_O)："
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "回�到(_R)："
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "收信人(_T)："
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "输入信件的收件人"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "抄�(_C)："
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "输入将接收该信件副本的收件人地�"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "暗�(_B)："
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr "输入将接收该信件副本，但�出现在收件人列表中的收件人地�"
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "投递到(_P)："
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "主题(_U)："
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "附件(_T)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "签�(_G)："
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "�入附件"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "�击此处以使用地�簿"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "投递目的"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "选择�将信件投递到哪个文件夹。"
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "�击此处以选择�投递到的文件夹"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "显示附件�(_A)"
+
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信件签�：未对此账户设置签��书"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密�书"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "附件"
+
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "��附件�(_A)"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "显示附件�(_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "未知原因"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "无法打开文件"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "无法从编辑器获�信件"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "无标题信件"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "打开文件"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "撰写新信件"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10112,8 +10723,7 @@ msgstr "您确定想�丢弃您正在编写的标题为“{0}�的信件�？
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "由于“{0}�，您�能�选择��的邮件选项。"
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "原因是“{1}�。"
 
@@ -10220,23 +10830,27 @@ msgstr "您无法将文件“{0}�作为这�信的附件。"
 msgid "You need to configure an account before you can compose mail."
 msgstr "在您�以撰写邮件之�您需��置一个�户。"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "继续编辑(_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "���(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "��(_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "�存信件(_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "�存�稿(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "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:738
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
@@ -10252,47 +10866,70 @@ msgstr "地��"
 msgid "calendar information"
 msgstr "日历信�"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution 错误"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution 信�"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution 查询"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "内部错误，请求了未知的错误“%s�"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "组件"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "记录日志的组件�称"
+
+#: ../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
+msgid "Enabled"
+msgstr "已�用"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "�件是�已�用"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "打�时�生了错误"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "打�系统报告了下列错误细节："
 
-#: ../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 "打�系统未报告关于错误的任何�外细节。"
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "原因是“{1}�。"
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "无法打开文件“{0}�。"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "无法�存文件“{0}�。"
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10300,7 +10937,7 @@ msgid "Do you wish to overwrite it?"
 msgstr "您打算覆盖它�？"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "文件已存在“{0}�。"
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10311,49 +10948,64 @@ msgstr "覆盖文件�？"
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "无法显示 Evolution 的帮助。"
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "��(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "工作(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "个人(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "待办(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "�候(_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "标签�称(_N)："
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "编辑标签"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "添加标签"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "标签�称�能为空。"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-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
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 错误：%s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "�续所有的错误都�显示在终端。"
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10457,65 +11109,65 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "测试"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "规则�(_U)："
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "查找符�下列�件的项目"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "添加过滤规则(_D)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "如果满足所有�件"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "如果满足任一�件"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "查找项目(_F)："
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "回�"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "回��原始邮件"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "无回�或原始邮件"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "包�线索(_N)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -10539,7 +11191,7 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少文件�。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "缺少�称。"
 
@@ -10609,7 +11261,7 @@ msgstr "未�"
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "秒"
 
@@ -10621,9 +11273,10 @@ msgstr "当�时间"
 msgid "the time you specify"
 msgstr "您指定的时间"
 
-#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "周"
 
@@ -10639,7 +11292,7 @@ msgstr "添加规则"
 msgid "Edit Rule"
 msgstr "编辑规则"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "规则�"
 
@@ -10661,57 +11314,69 @@ msgid "Configure your email accounts here"
 msgstr "在这里�置您的电�邮件账户"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "在这里�置您的网络连接设置"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "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 "Evolution 邮件账户�置控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution 邮件组件"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "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 "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 "Evolution 邮件首选项控件"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "邮件"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "邮件账户"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "网络首选项"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 许��议"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10723,115 +11388,109 @@ msgstr ""
 "请仔细阅读下方显示的 %s 许��议\n"
 "并选中�选框表明您接�该�议\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../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
 msgid "Autogenerated"
 msgstr "自动生�的"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "��信都询问"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "标识"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "接收电�邮件"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "自动检查新邮件的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "分钟(_T)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "��电�邮件"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "默认"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "安全"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "接收选项"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "检查新邮件"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[默认]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "已�用"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "账户�"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "�议"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "未命�"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "语言"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "添加签�脚本"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "签�"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转�的信件 --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "未知�件人"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10839,11 +11498,11 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender}写�："
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- 原始信件 --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "过滤规则(_F)"
 
@@ -10860,10 +11519,6 @@ msgstr "分�颜色"
 msgid "Assign Score"
 msgstr "分�计分"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "附件"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -10880,10 +11535,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "完�于"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "�有"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "�制到文件夹"
@@ -10897,7 +11548,7 @@ msgid "Date sent"
 msgstr "��日期"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -10908,10 +11559,6 @@ msgstr "删除"
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "��有"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "�结尾于"
@@ -10932,10 +11579,6 @@ msgstr "�音��"
 msgid "does not start with"
 msgstr "�开始于"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "�存在"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "�稿"
@@ -10944,10 +11587,6 @@ msgstr "�稿"
 msgid "ends with"
 msgstr "结�于"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "存在"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "存在"
@@ -10960,14 +11599,10 @@ msgstr "表达�"
 msgid "Follow Up"
 msgstr "跟�"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "��"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "是"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "之�"
@@ -10980,18 +11615,6 @@ msgstr "之�"
 msgid "is Flagged"
 msgstr "已标志"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "大于"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "�于"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "�是"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "未标志"
@@ -11004,7 +11627,7 @@ msgstr "未设置"
 msgid "is set"
 msgstr "已设置"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾"
@@ -11013,7 +11636,7 @@ msgstr "垃圾"
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "标签"
 
@@ -11055,7 +11678,7 @@ 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:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "已读"
 
@@ -11127,10 +11750,9 @@ msgstr "开始于"
 msgid "Stop Processing"
 msgstr "�止处�"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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
 msgid "Subject"
@@ -11141,94 +11763,114 @@ msgid "Unset Status"
 msgstr "�消状�"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "然�"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建�索文件夹(_R)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "全部信件"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "未读信件"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "无标签"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "已读信件"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "最近信件"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "�五天的信件"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "有附件的信件"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "��信件"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "�是垃圾邮件"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "账户�索"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "全部账户�索"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未读信件数："
 
 #. 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
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "总信件数："
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "��使用(%s)："
+
+#: ../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:160
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "收件箱"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<�击此处以选择文件夹>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "文件夹�称(_N)："
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "�索文件夹"
 
@@ -11237,27 +11879,19 @@ msgstr "�索文件夹"
 msgid "UNMATCHED"
 msgstr "�匹�"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "�稿"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "收件箱"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "�件箱"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "已�箱"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "正在装入..."
 
@@ -11276,383 +11910,373 @@ msgstr "正在装入..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s�"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "�制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件�制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信件放到顶级文件夹存储"
 
-#: ../mail/em-folder-tree.c:1011 ../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 "�制到文件夹(_C)"
 
-#: ../mail/em-folder-tree.c:1012 ../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 "移至文件夹(_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "在“%s�中扫�文件夹"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "查看(_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "在新窗�中打开(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "移动(_M)..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "�命�(_R)..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "刷新(_F)"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "清空�件箱(_U)"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "把“%s��制到 %s"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../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:83
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "�制(_O)"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s�"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "邮件删除失败"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您没有足够的��删除此邮件。"
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回��件人(_R)"
 
-#: ../mail/em-folder-view.c:1337 ../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 "转�(_F)"
 
 #. 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:1341 ../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 "作为新信件进行编辑(_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "打�(_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "�消删除(_N)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "�制到文件夹(_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "标记为��(_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "标记为���(_I)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "标记为�垃圾(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟�(_W)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "标签(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "æ— (_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "已完�标志(_G)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "根�信件创建规则(_T)"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "基于主题的�索文件夹(_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "基于�件人的�索文件夹(_N)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "基于收件人的�索文件夹(_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "基于邮件列表的�索文件夹(_L)"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "基于主题过滤(_J)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "基于�件人过滤(_D)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "默认"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "无法获�信件"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "正在收�信件..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "呼�到(_A)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "创建�索文件夹(_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "自此地�(_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "到此地�(_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "�击以给 %s ��邮件"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "�击以呼� %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../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:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "匹�：%d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "查找(_D)："
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "上一项(_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "下一项(_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "匹�大�写(_A)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "未签�"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签�。无法��这�信是�信的。"
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "有效签�"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
 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:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "无效签�"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这�信的签�，�能在传�的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "签�有效，但是无法校验��者"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
 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:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "签�已存在，但需�公钥"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "这�信的签�有效，但是没有相应的公钥。"
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这�信未加密。在 Internet 上传�时所有人都�以看到其内容。"
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -11661,21 +12285,21 @@ msgstr ""
 "这�信已加密，但使用的是弱加密算法。如果外人想�查看这�信的内容，�能�花一"
 "定时间进行暴力破解，这很困难但并�是��能。"
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
 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:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11684,93 +12308,88 @@ msgstr ""
 "这�信已加密，且使用的是强加密算法。如果外人想�查看这�信的内容，�能�花大"
 "�时间进行暴力破解，这�分困难。"
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "查看�书(_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "此�书��查看"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%m月%d日%A，%p%l:%M完�"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%p%l:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "��(_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "适�宽度(_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "显示原始大�(_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "附件"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "附件�存为"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "选择�存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "�存所选(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 个附件(_T)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "�存(_A)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "全部�存(_A)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "无附件"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "无格�查看(_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "无格���(_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "打开方�(_P)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2473
 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 ""
 "Evolution 无法渲染此电�邮件，原因是该邮件太大。您�以以无格�方�查看该邮"
@@ -11781,275 +12400,285 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "收�“%s�"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "未知的 external-body 部分。"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "格��正确的 external-body 部分。"
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指� FTP 站点 (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s�指�本地文件 (%1$s) �法"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指�本地文件 (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指�远程数� (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指�未知的外部数� (“%s�类型)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "格�化信件"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "正在格�化信件..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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 "抄�"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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 "密件抄�"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "邮件程�"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../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:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "日期"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "此消�由 <b>%s</b> 以 <b>%s</b> 的身份��"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "�件人"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 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
+msgid "Date"
+msgstr "日期"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "新闻组"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "无法解� S/MIME 信件：未知错误"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解� MIME 信件。显示�文本。"
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "�支� multipart/encrypted 的加密类型"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "无法解� PGP/MIME 信件"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "无法解� PGP/MIME 信件：未知错误"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "�支�的签�格�"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "校验签�错误"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "校验签��生了未知错误"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "无法分� PGP 信件"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "无法解� PGP 信件：未知错误"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "�次"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "�天一次"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "�周一次"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "�月一次"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "添加自定义垃圾信头"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "信头�称："
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "信头值�有："
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "包�值"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "颜色"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "标签"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s �件�用，二进制文件已�安装。"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s �件��用。请检查软件包是�已安装。"
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "没有�用的垃圾邮件�件"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "待办"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "�候"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Evolution 任务文件夹的�置和层次与 Evolution 1.x ��。\n"
-"\n"
-"请�候，Evolution 正在��您的文件夹..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "无法创建新文件夹“%s�：%s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "无法将文件夹“%s��制为“%s�：%s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "无法扫��于“%s�的已有邮箱：%s"
 
-#: ../mail/em-migrate.c:2065
+#: ../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 ""
+"Evolution 任务文件夹的�置和层次与 Evolution 1.x ��。\n"
+"\n"
+"请�候，Evolution 正在��您的文件夹..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "无法打开旧的 POP �留在�务器上的数�“%s�：%s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "无法创建 POP3 �留在�务器上的数�目录“%s�：%s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "无法�制 POP3 在�务器上�留的数�“%s�：%s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "创建本地邮件存储“%s�失败：%s"
 
-#: ../mail/em-migrate.c:2827
+#: ../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 ""
+"Evolution 任务文件夹的�置和层次与 Evolution 1.x ��。\n"
+"\n"
+"请�候，Evolution 正在��您的文件夹..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "无法在“%s�创建本地邮件文件夹：%s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12057,264 +12686,305 @@ msgstr ""
 "无法从先�的 Evolution 安装中读�设置，“evolution/config.xmldb��存在或者已�"
 "�。"
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "回��件人(_R)"
 
-#: ../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 "回�邮件列表(_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "添加到地�簿(_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此存储�支�订阅，或订阅未�用。"
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "已订阅"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "请选择�务器。"
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "没有选中�务器"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "��显示此信�(_D)。"
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "信件"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "�存信件..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "添加地�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "�自 %s 的信件"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "�索文件夹(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "�索文件夹��"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "“��和接收邮件�窗�高度"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "“��和接收邮件�窗�最大化状�"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+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 显示被�制大�的文本部分"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "总是请求阅读收�"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../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:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "自动识别表情图标"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "自动识别链接"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "检查收到的邮件是�是垃圾邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "引用�出颜色"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "引用�出颜色。"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "编写窗�的默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "编写窗�的默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "撰写器加载/附件目录"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "压缩 TO/CC/BCC 中地�的显示"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "将 TO/CC/BCC 的显示地�数压缩到 address_count 所指定的数�。"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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 ""
+"控制与远程邮件�务器�步本地更改的频率。间隔必须至少为 30 秒。"
+
+#: ../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
 msgid "Default charset in which to compose messages"
 msgstr "编写信件的默认字符集"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "编写信件的默认字符集。"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "显示信件的默认字符集"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "显示信件的默认字符集。"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "默认转�方�"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "撰写窗�的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "信件窗�的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "订阅对�框的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "默认回�样�"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "�题的默认展开状�"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "撰写窗�的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "信件窗�的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "订阅对�框的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "决定是�在地�簿中查找�件人 email"
+#: ../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:28
+#: ../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 loopup the sender email in addressbook. If found, it "
+"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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"决定是�在地�簿中查找�件人 email。如果找到，则�应是垃圾邮件。这"
-"将在标记为自动补全的地�簿中查找，如果远程地�簿(如 ldap)被标记为"
-"自动补全的�，�能会比较慢。"
+"决定是�在地�簿中查找�件人电�邮件。如果找到，则�应是垃圾邮件。这将在标记为"
+"自动补全的地�簿中查找，如果远程地�簿(如 LDAP)被标记为自动补全的�，�能会比"
+"较慢。"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../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:30
+#: ../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:31
+#: ../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 ""
-"决定是�在垂直视图中对“信件�列的“�自�和“主题�行使用相�的字体。"
+msgstr "决定是�在垂直视图中对“信件�列的“�自�和“主题�行使用相�的字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "邮件写作器用�加载/附加文件的目录"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "�存邮件组件文件的目录。"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../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:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "退出时清空垃圾邮件文件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空回收站"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "退出 Evolution 时清空垃圾邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出 Evolution 时清空回收站。"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../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:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "�用或�用魔术空格键"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "�用或�用自动�进功能"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "�用�索文件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "�动时�用�索文件夹。"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12325,46 +12995,45 @@ msgstr ""
 "您�以更加轻�地在侧边�中找到文件夹，�需输入文件夹�称，然�选中范围就会自"
 "动跳转到该文件夹。"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../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 ""
-"�用以在消�预览�消�列表和文件夹中使用空格键。"
+msgstr "�用以在消�预览�消�列表和文件夹中使用空格键。"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "�许渲染被�制大�的信件文本部分。"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "�用/�用光标模�"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "信件列表��的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "信件列表��的高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "���文件夹预览并移除选择"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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:52
+#: ../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:53
+#: ../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 "
@@ -12374,17 +13043,38 @@ msgstr ""
 "MIME 类型在 GNOME 的 MIME 类型数�库中映射的 bonobo 组件查看器将被用�显示其"
 "内容。"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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:55
+#: ../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:56
+#: ../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 "
@@ -12392,31 +13082,31 @@ msgid ""
 msgstr ""
 "�用/�用永久删除(而�简�地从结果中移除)�索文件夹中的信件时�断弹出的�示。"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "上次清空垃圾邮件的时间"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "上次清空回收站的时间"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的消�会被记录。"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "标签�其对应颜色的列表"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "列出接�的许�"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "账户列表"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
@@ -12424,11 +13114,15 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的账户。此列表包�了相对于 /apps/evolution/mail/"
 "accounts 的�目录命�字符串。"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "自定义头�该头是��用。"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../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."
@@ -12436,263 +13130,264 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格�形如“�称:颜色�，其中"
 "颜色使用了 HTML �六进制编�方�。"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "列出�使用 bonobo 组件查看器查看的 MIME 类型"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "列出接��议的�议�称。"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "在 HTML 信件中装入 HTTP 图�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
+#, 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."
+"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 - 决�从网上装入图�，1 - "
 "如果��者在地�簿中则装入图�，2 - 总是从网上装入图�。"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "记录过滤动作的日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过�标为已看"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过�标为已看。"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "在信件“预览�中标出引用"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在信件“预览�中标出引用。"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "信件窗�默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "信件窗�默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "信件显示风格(普通�全部邮件头��代�)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "退出时清空垃圾信件的最少天数"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空回收站的最少天数"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "�在 TO/CC/BCC 中显示的地�数"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "空主题时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "删除�索文件夹中的信件时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "用户销�时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "用户�填入 Bcc 时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "当用户试图一次打开超过��信时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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 "当用户试图给�想接收 HTML 的�系人�� HTML 邮件时�示。"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "当用户试图��没有 To 或 Cc 收件人的邮件时�示。"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "当用户是����外的 HTML 时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "标记多�信件时�示"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "识别文本中的表情，并将其替�为图�。"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "识别文本中的链接并进行替�。"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "对收到的邮件�行垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "�存目录"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-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:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "默认以 HTML ��邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "默认以 HTML ��邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "在信件列表中显示 email 地�列"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "�务器�步间隔"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "将动画图�显示为动画。"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "在信件列表中显示删除了的信件"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "显示�件人照片"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../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:114
+#: ../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:115
-msgid "Specifies the header to check for junk."
-msgstr "指定用以检查垃圾邮件的信头。"
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"指定用以检查垃圾邮件的信头。其 gconf 格�为 信头�=值。"
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "内嵌拼写检查"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "拼写检查颜色"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "拼写检查语言"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "订阅对�框默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "订阅对�框默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "文本信件部分�制"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信件钩��件"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../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:124
+#: ../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:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的�宽字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../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 ""
-"此选项有三��能值：0�错误，1�警告，2�调试信�。"
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr "此选项有三��能值：0�错误，1�警告，2�调试信�。"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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."
@@ -12700,7 +13395,7 @@ msgstr ""
 "此选项决定了 Evolution 中�格�化的最大文本部分大�。默认为 4MB/4096 KB，��"
 "为 KB。"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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 "
@@ -12709,15 +13404,16 @@ msgstr ""
 "这是默认的垃圾邮件�件，�使�用了多个�件。如果默认列出的�件被�用，它�会"
 "缺�到其它�用的�件。"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 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 ""
 "此键�被读�一次并在读��被�设为 false。它�消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../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;"
@@ -12727,174 +13423,189 @@ msgstr ""
 "此键应包�指定自定义邮件头的 XML 结构列表，以�是�显示这些邮件头。XML 结构的"
 "格�为：&lt;�用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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:133
+#: ../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:134
+#: ../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 "此设置指定了默认情况下线索是被展开还是被折�。需��� Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "此设置指定了默认情况下是�将线索按线索中的最新消�而�是"
-"消�日期排�。需��� Evolution。"
+msgstr ""
+"此设置指定了默认情况下是�将线索按线索中的最新消�而�是消�日期排�。需��"
+"� Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "按线索编排信件列表。"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "将信件标为已看的超时时长"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "将信件标为已看的超时时长。"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "默认账户的 UID 字符串。"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使用 SpamAssassin 守护程�和客户端(spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "�使用本地垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "之使用本地垃圾邮件测试(无 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "使用并排还是宽�布局"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "�宽字体"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "选中了查看/Bcc ��项"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "选中了查看/Bcc ��项。"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "选中了查看/Cc ��项"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "选中了查看/Cc ��项。"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "选中了查看/From ��项"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "选中了查看/From ��项。"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "选中了查看/PostTo ��项"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "选中了查看/PostTo ��项。"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "选中了查看/ReplyTo ��项"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "选中了查看/ReplyTo ��项。"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../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:161
+#: ../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 "是�在信件�包� In-Reply-To 或 References 头时强制按主题编排线索。"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../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:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "信件列表��的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "信件列表��的高度。"
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "导入 Elm 数�"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导入器"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "从 Elm 导入邮件。"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "目的文件夹："
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "选择�导入到哪个文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入器 Berkeley 邮箱格�文件夹"
 
@@ -12902,7 +13613,7 @@ msgstr "导入器 Berkeley 邮箱格�文件夹"
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "导入“%s�"
@@ -12912,167 +13623,182 @@ msgstr "导入“%s�"
 msgid "Scanning %s"
 msgstr "扫� %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "导入 Pine 数�"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "从 Pine 导入邮件。"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "邮寄给 %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 "�自 %s 的邮件"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "模�"
+
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个，"
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已删除"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �垃圾"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ��稿"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d �已�"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d �未�"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "，%d �未读，"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d �"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "新建信件"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "信件(_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "撰写一�新信"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "新建邮件文件夹"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "�级邮件设置或文件夹失败。"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "错误"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "错误"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "警告和错误"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "调试"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "错误，警告和调试信�"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "调试日志"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "在状��显示错误(_E)"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+msgid "second(s)."
 msgstr "秒。"
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "日志消�："
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "日志级别"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "时间"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "信件"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "关闭此窗�"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "检查支�的类型(_E)"
@@ -13086,7 +13812,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>(在此版本的 Evolution 中�支� SSL)</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>��者照片</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13167,73 +13893,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">打�字体</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">代��务器状�</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">请求的信�</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">已��和�稿信件</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">�务器�置</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">认�类型(_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "账户管�"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "添加新签�(_W)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "添加脚本(_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "当使用该账户时总是��签�信件(_W)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "当��加密邮件时也对自身加密(_F)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "总是抄�到(_S)："
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "总是暗�到(_B)："
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "当��加密邮件时总是对自身加密(_M)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "请求阅读收�(_D)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "附加原始信件"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "自动�入表情图�(_E)"
@@ -13251,13 +13977,13 @@ msgid "C_haracter set:"
 msgstr "字符集(_H)："
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "检查自定义信头以判别垃圾邮件(_H)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "检查支�的类型(_E)"
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "检查自定义信头以判别垃圾邮件(_S)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "检查收到的邮件是�是垃圾邮件(_M)"
@@ -13318,16 +14044,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "对寄出的信件进行数字签�(默认)(_U)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "如果信件��者在地�簿中则标记为垃圾邮件(_N)"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "如果文本超出大��制，则�格�化邮件中的文本内容(_Z)"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "如果文本超出大��制，则�格�化邮件中的文本内容(_Z)"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "如果信件��者在地�簿中则�标记为垃圾邮件(_K)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "无法引用原始信件"
+msgid "Do not quote"
+msgstr "�引用"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13390,70 +14116,86 @@ msgid "HTML Messages"
 msgstr "HTML 信件"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP 代��务器(_T)："
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "信头"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "�出显示引用(_Q)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "嵌入"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "嵌入原消�(Outlook 风格)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "嵌入(Outlook 风格)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "标签"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "语言表"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "邮件�置"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "邮件头表"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "邮件箱�置"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "信件撰写器"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "�使用代�的情况(_P)："
+
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"注�：标签�中的下划线被用作��中的助记符。"
+msgstr "注�：标签�中的下划线被用作��中的助记符。"
 
-#: ../mail/mail-config.glade.h:106
+#: ../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:107
+#: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "如果找到匹�的自定义垃圾信头，此选项将被覆盖。"
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "密�(_W)："
+
+#: ../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."
@@ -13461,7 +14203,7 @@ msgstr ""
 "请在下�的空白处输入此账户的�述性�称。\n"
 "此�称将�在显示时使用。"
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13469,7 +14211,7 @@ msgstr ""
 "请在下�输入您的�件�务器信�。如果您�太确定的�，请询问您的系统管�员或者"
 "互�网�务�供商ISP。"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13478,113 +14220,121 @@ msgstr ""
 "请在下�输入您的姓�和电�邮件地�。下�的“�选�域�必填入，除�您想�在您�"
 "出的邮件中包�此信�。"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "请从以下选项中选择"
 
-#: ../mail/mail-config.glade.h:115
+#: ../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 "���有暗�收件人的信件时�示(_O)"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "引用原始信件"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "记�密�(_M)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "回�到(_P)："
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "记�密�(_P)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS 主机(_O)："
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "仅在本地地�簿中�索�件人照片(_E)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "选择(_E)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "��信件收�(_E)："
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "标准字体(_T)："
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "选择用于打�的 HTML 固定宽度字体"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "选择 HTML �宽度字体"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "选择用于打�的 HTML �宽度字体"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "��邮件"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "已��信件文件夹(_M)："
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "�务器需�认�(_V)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "�务器类型(_T)："
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "签��书(_N)："
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "签�(_U)："
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "签�"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "签�表"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "回�时在底部开始打字(_T)"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "类型(_Y)："
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "在此列出的语言�映了您所安装的字典。"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13593,13 +14343,7 @@ msgstr ""
 "此脚本的输出将用于您的签�。您指定的�称将�会\n"
 "用于显示。"
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"如果找到匹�的自定义垃圾信头，此选项将被覆盖。"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13607,16 +14351,26 @@ msgstr ""
 "输入您想�给此�户起的�字。\n"
 "如：“工作�或“�人�"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "用户�(_E)："
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "使用身份验�(_N)"
+
+#: ../mail/mail-config.glade.h:156 ../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 "用户�(_N)："
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "�宽(_A)："
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13626,100 +14380,124 @@ msgstr ""
 "\n"
 "�击“�进�开始。"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "添加签�(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "总是从 Internet 上装入图�(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "自动代��务器�置 URL(_A)："
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "默认的垃圾邮件�件(_D)："
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "直接连接到 Internet(_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "��签�会议请求(� Outlook 兼容)(_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "转�方�(_F)："
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "回�时�留原始信件的签�(_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "装入�自�系人的邮件中的图�(_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "仅在本地地�簿中查阅(_L)"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "使它�为我的默认账户(_M)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "手动代��务器�置(_M)："
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "把信件标记为已读�等(_M)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "��从 Internet 装入图�(_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "路径(_P)："
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "��给�想接收 HTML 的�系人时�示(_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "��空主题行的信件时�示(_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "回�风格(_R)："
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "脚本(_S)："
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "安全 HTTP 代�(_S)："
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "选择(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "显示图�动画(_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在电�邮件预览中显示��者的照片(_S)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "�显示 To/Cc/Bcc 头中的�(_S)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "使用安全连接(_U)："
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "使用默认值(_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程�相�的字体(_U)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "个地�"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "颜色"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "�述"
 
@@ -13759,43 +14537,43 @@ msgstr "区分大�写(_S)"
 msgid "Co_mpleted"
 msgstr "已完�(_M)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "查找(_I)："
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "在信件中查找"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "跟�的标志"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../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 "没有选中"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "�务器(_E)："
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "安全信�"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "指定文件夹"
 
-#: ../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."
@@ -13803,23 +14581,23 @@ msgstr ""
 "您选中进行跟�的信件已�在下�列出。\n"
 "请从“标志���中选择跟��作。"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "接��议(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "延期人(_D)："
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "标志(_F)："
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "选中此处以表明您接�许��议(_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:845
 #, c-format
 msgid "Pinging %s"
 msgstr "查验 %s"
@@ -13866,97 +14644,102 @@ msgstr "��第%d�信，共%d�"
 msgid "Failed to send %d of %d messages"
 msgstr "在第%d�信失败，共%d�"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "已�消。"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "完�。"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "把信件�存到文件夹中"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把信件移至 %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把信件�制到 %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "转�的信件"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "打开文件夹 %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "正在获�文件加 %s 的��信�"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "打开存储 %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "删除文件夹 %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s�"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销�并存储账户“%s�"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储账户“%s�"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "刷新文件夹"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "销�文件夹"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s�中的回收站"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "收�信件 %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "收� %d �信"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "�存 %d �信"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13965,11 +14748,11 @@ msgstr ""
 "在将信件�存到 %s 时�生错误：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "�存附件"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13978,89 +14761,89 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数�：%s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "�新连接到 %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "正在准备脱机使用账户“%s�"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "检查�务"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "正在�消..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "��和接收邮件"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "全部�消(_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "检查新邮件"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "输入 %s 的密�"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "输入密�"
 
-#: ../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 "为 %s 输入密�"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "输入密�"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "用户己�消�作。"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "编辑签�"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "�存并关闭(_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "输入该签�的�字。"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "编辑签�"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "�称："
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "签�(_S)："
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14101,27 +14884,25 @@ msgstr "更新“%s:%s�的�索文件夹"
 msgid "Updating Search Folders for '%s'"
 msgstr "更新“%s�的�索文件夹"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "编辑�索文件夹"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "新建�索文件夹"
 
 #: ../mail/mail.error.xml.h:1
-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 "已�存在�为“{0}�的文件夹。请使用��的�称。"
 
 #: ../mail/mail.error.xml.h:2
-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 "已�存在�为“{1}�的文件夹。请使用��的�称。"
 
 #: ../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."
@@ -14132,14 +14913,14 @@ 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 "“{1}�请求了阅读收�。将阅读收���给{0}�？"
 
 #: ../mail/mail.error.xml.h:7
 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 "已�存在�为“{0}�的签�。请使用��的�称。"
 
 #: ../mail/mail.error.xml.h:8
@@ -14174,8 +14955,8 @@ msgstr "您确定想�永久删除全部文件夹中已删除的全部信件�
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "您确定想�永久删除文件夹“%s�中已删除的全部信件�？"
+"folder \"{0}\"?"
+msgstr "您确定想�永久删除文件夹“{0}�中已删除的全部信件�？"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14190,11 +14971,11 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "您确定想���没有主题的信件�？"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "原因是“{0}�。"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "原因是“{2}�。"
 
 #: ../mail/mail.error.xml.h:21
@@ -14202,15 +14983,15 @@ msgid "Blank Signature"
 msgstr "空签�"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "无法添加�索文件夹“{0}�。"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}��制到“{1}�。"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "无法创建文件夹“{0}�。"
 
 #: ../mail/mail.error.xml.h:25
@@ -14218,52 +14999,51 @@ msgid "Cannot create temporary save directory."
 msgstr "无法创建临时�存目录。"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "无法创建�存目录，原因是“{1}�"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "无法删除文件夹“{0}�。"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "无法删除系统文件夹“{0}�。"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "无法编辑�索文件夹“{0}�，原因是该文件夹�存在。"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}�移至“{1}�。"
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "无法打开�“{0}�"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "无法打开�“{2}�。"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "无法打开目标“{2}�。"
 
 #: ../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 ""
 "无法读�许�文件“{0}�，原因是安装有问题。您将无法使用此�供者，除�您接�其许"
 "��议。"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "无法将“{0}��命�为“{1}�。"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "无法�命�或移动系统文件夹“{0}�。"
 
 #: ../mail/mail.error.xml.h:37
@@ -14271,18 +15051,22 @@ msgid "Cannot save changes to account."
 msgstr "无法将更改�存到账户。"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "无法�存到目录“{0}�。"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "无法�存到文件“{0}�。"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "无法设定签�脚本“{0}�。"
 
 #: ../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."
@@ -14290,46 +15074,42 @@ msgstr ""
 "选中此处以确�您的密�拼写正确。请记�，很多密�都是区分大�写的；您的 Caps "
 "Lock ��能为开。"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "无法�存签�文件。"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "删除“{0}�？�"
-
 #: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "删除“{0}��？"
+
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "删除账户�？"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "删除�索文件夹“{0}�中的信件�？"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "删除�索文件夹中的信件�？"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "丢弃更改�？"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "�删除(_E)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "�删除"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "��用"
 
-#: ../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 "
@@ -14426,34 +15206,26 @@ msgid "Mark all messages as read"
 msgstr "把所有信件标记为已读"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "将此文件夹�其�文件夹中的信件全部标记为已读�？"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "缺少文件夹。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "没有选中�。"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "�对当�文件夹(_C)"
-
-#: ../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."
@@ -14461,7 +15233,7 @@ msgstr ""
 "请在 To: 中输入有效的电�邮件地�。您�以�击输入框�边的 To: 按钮��索电�"
 "邮件地�。"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14470,34 +15242,42 @@ msgstr ""
 "请确定下列收件人愿�并且能够接收 HTML 邮件：\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "请�供此签�的唯一标识�称。"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "请�候。"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "��旧的邮件文件夹“{0}�出现问题。"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "查询�务器"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "查询�务器所支�的身份验�算法列表。"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "阅读收�已请求。"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "真的�删除文件夹“{0}��其全部�文件夹�？"
 
+#: ../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 "�索文件夹已自动更新。"
@@ -14544,13 +15324,13 @@ 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 ""
 "下列�索文件夹：\n"
 "{0}\n"
 "使用现已删除的文件夹：\n"
-"“{1}�\n"
+"   “{1}�\n"
 "已�更新。"
 
 #: ../mail/mail.error.xml.h:106
@@ -14558,13 +15338,13 @@ 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 ""
 "下列过滤规则：\n"
 "{0}\n"
 "使用现已删除的文件夹：\n"
-"“{1}�\n"
+"   “{1}�\n"
 "已�更新。"
 
 #: ../mail/mail.error.xml.h:111
@@ -14633,8 +15413,8 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"警告：从�索文件夹中删除信件将会删除实际�于您的本地"
-"或远程文件夹中的相应信件。\n"
+"警告：从�索文件夹中删除信件将会删除实际�于您的本地或远程文件夹中的相应信"
+"件。\n"
 "您真的想�这么��？"
 
 #: ../mail/mail.error.xml.h:127
@@ -14667,8 +15447,8 @@ msgstr ""
 "或者�一选择文件夹，或者选中全部本地文件夹和/或全部远程文件夹。"
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "您以“{1}�的身份登录到�务器“{0}�失败。"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "您以“{0}�的身份登录到�务器“{0}�失败。"
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14690,22 +15470,22 @@ msgstr "销�(_E)"
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "在当�文件夹�其�文件夹中(_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "已答�"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "已转�"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "多�未看信件"
@@ -14730,37 +15510,48 @@ msgstr "较高"
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1614 ../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:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../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 "今天%p%l:%M"
 
-#: ../mail/message-list.c:1630 ../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 "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1642 ../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%p%l:%M"
 
-#: ../mail/message-list.c:1650 ../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 "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "生�信件列表"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "此文件夹中没有信件。"
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "延期"
@@ -14790,39 +15581,39 @@ msgstr "已�信件"
 msgid "Size"
 msgstr "大�"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "呼�"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "��转�"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "跟�"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "给您的信�"
 
-#: ../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 "转�"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "�必回�"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回�"
 
-#: ../mail/message-tag-followup.c:84 ../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 "全部回�"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "回顾"
 
@@ -14847,6 +15638,10 @@ msgid "Subject contains"
 msgstr "主题�有"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "主题或接收者�有"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "主题或��者�有"
 
@@ -14859,33 +15654,22 @@ msgid "Provides core functionality for local address books."
 msgstr "�供本地地�簿的核心功能。"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "�用附件�醒�件"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "�用附件�醒�件。"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 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:4
+#: ../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/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "关键字"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "�醒缺少的附件(_M)"
-
 #: ../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"
@@ -14907,9 +15691,9 @@ msgstr "Evolution 找到一些关键字表明此信件应当包å�«é™„件，但å�
 msgid "Message has no attachments"
 msgstr "信件无附件"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "继续编辑(_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "编辑信件(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -14922,27 +15706,27 @@ msgstr ""
 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 "选择 Evolution 备份文件�称"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "备份��新�动 Evolution(_R)"
 
-#: ../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 "选择���的 Evolution 备份文件�称"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "����新�动 Evolution(_R)"
 
-#: ../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"
@@ -14952,95 +15736,119 @@ msgstr ""
 "人。\n"
 "它还能��您的所有的个人设置和邮件过滤器等。"
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "从备份文件中�� Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "选择���的 Evolution 存档："
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "选择���的文件"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "备份 Evolution 目录"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "�� Evolution 目录"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "检查 Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "�新�动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "带图形用户界�"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "关闭 Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "备份 Evolution 的账户�设置"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "备份 Evolution 数�(邮件��系人�日历�任务�备忘)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "备份完�"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "�新�动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "备份当� Evolution 数�"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "从备份中��文件"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "装入 Evolution 的设置"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "删除临时备份文件"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../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 "正在备份到文件夹 %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "正在从文件夹 %s 中��"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution ��"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "正在备份 Evolution 数�"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "请�候，Evolution 正在备份您的数�。"
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "正在�� Evolution 数�"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "请�候，Evolution 正在��您的数�。"
+
+#: ../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 "备份��� Evolution 数�和设置的�件。"
@@ -15071,14 +15879,22 @@ 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 "无效的 Evolution 备份文件"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "请选择���的有效备份文件。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../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 "
@@ -15102,44 +15918,41 @@ msgstr "��设置(_E)..."
 msgid "_Backup Settings..."
 msgstr "备份设置(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动�系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "回�邮件时自动在地�簿中创建�系人项(_A)"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动�系人的地�簿"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "�时通讯�系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好�列表中�步�系人信�和图�"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好�列表的地�簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "立��步好�列表(_B)"
 
 #: ../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 ""
@@ -15150,7 +15963,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:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "打�时�生了错误"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "将信件文本转�为 _Unicode"
 
@@ -15170,20 +16004,25 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter 选项"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter 垃圾选项"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
-msgstr "使用 Bogofilter 过滤垃圾信件"
+msgstr "使用 Bogofilter 过滤垃圾信件。"
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../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:351
+#: ../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 "使用 _SSL"
 
@@ -15203,17 +16042,18 @@ msgstr "装入日历"
 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:375
-msgid "_Refresh:"
-msgstr "刷新(_R)："
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "刷新(_F)："
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "安全连接(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "用户�(_M)："
 
@@ -15310,14 +16150,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是�想�将 Evolution 设置为您的默认电�邮件客户端？"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "标为默认文件夹(_D)"
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr "标为默认地�簿(_D)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr "标为默认日历(_D)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr "标为默认任务列表(_D)"
+
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr "标为默认备忘列表(_D)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15325,10 +16176,54 @@ msgstr "默认�"
 
 #: ../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:558
+msgid "_Custom Header"
+msgstr "自定义信头(_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "é”®"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+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 "打开其他用户的文件夹"
@@ -15346,32 +16241,32 @@ msgid "_User:"
 msgstr "用户(_U)："
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "安全密�"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "此选项将使用安全密�(NTLM)身份验�连接到 Exchange �务器。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "纯文本密�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "此选项将使用标准的纯文本密�身份验�连接到 Exchange �务器。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "办公室以外"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -15379,83 +16274,87 @@ msgstr ""
 "在您�于办公室外时，如果有人给您��邮件，则会自动将下�指定的信件\n"
 "�回。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "我正在办公室外"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "我正在办公室内"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "更改 Exchange 账户的密�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "更改密�"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管� Exchange 账户的代�设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "代�助手"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "�项"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "查看所有 Exchange 文件夹的大�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "文件夹大�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange 设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL："
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "身份验�(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "邮件(_M)："
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "身份验�类型(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "检查支�的类型(_E)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
 #: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15467,13 +16366,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 "两个密��匹�。请�新输入密�。"
 
@@ -15493,38 +16392,38 @@ msgstr "新建密�："
 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 "您的密��将于 %d �过期"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "自定义"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "编辑(读��创建�编辑)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "作者(读��创建)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "�查者(�读)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "代���"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s 的��"
@@ -15532,7 +16431,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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15542,66 +16441,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 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:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "但是你�能查看我的�人项目。"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "您现在已�被授�为 %s 的代�人"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "授�给"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "删除代�人 %s �？"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "无法访问 Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "无法在 Active Directory 中找到自己"
 
-#: ../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 "无法在 Active Directory 中找到代�人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "无法删除代�人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "无法更新代�人。"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "无法添加代�人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "读�代�人列表出错。"
 
@@ -15647,20 +16546,25 @@ msgstr "总结��(_S)"
 msgid "_Tasks:"
 msgstr "任务(_T)："
 
-#: ../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
 msgid "Permissions..."
 msgstr "��..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "文件夹�称"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "文件夹大�"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. 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 "订阅其他用户的文件夹"
@@ -15669,20 +16573,20 @@ msgstr "订阅其他用户的文件夹"
 msgid "Exchange Folder Tree"
 msgstr "Exchange 文件夹树"
 
-#: ../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
 msgid "Unsubscribe Folder..."
 msgstr "退订文件夹..."
 
-#: ../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
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "真的�退订文件夹“%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
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "退订“%s�"
@@ -15746,15 +16650,18 @@ msgstr "您的密��将于 7 天�过期..."
 msgid "_Change Password"
 msgstr "更改密�(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(��被�止。)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "添加用户："
 
-#: ../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:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "添加用户"
 
@@ -15872,15 +16779,11 @@ msgstr "�感度(_S)："
 msgid "_User"
 msgstr "用户(_U)"
 
-#: ../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:138
 msgid "Select User"
 msgstr "选择用户"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "地�簿..."
 
@@ -15894,9 +16797,9 @@ msgstr "订阅其他用户的日历"
 
 #: ../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 "包�若干 Exchange �户特定�作和特性的�件。"
+msgstr "管�一组 Exchange �户特定�作和特性的�件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15982,10 +16885,14 @@ msgid "Could not update out-of-office state"
 msgstr "无法更新�在办公室状�"
 
 #: ../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 "Exchange 账户脱机。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16009,102 +16916,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "更新代�人失败："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "文件夹已�存在"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "文件夹�存在"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "文件夹脱机"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "常规错误"
 
-#: ../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 "如果 OWA �行于��的路径上，您必须在账户�置对�框中指定该路径。"
 
-#: ../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 "{0} 的邮箱�在此�务器上。"
 
-#: ../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 "请确定 URL 正确，然��试一次。"
 
-#: ../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 "用户 {0} 在 {1} 上没有邮箱。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "没有用户 {0}"
 
-#: ../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 "请输入一个代�人 ID 或�消选中“以代�人身份���选项。"
 
-#: ../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
 msgid "Please restart Evolution for changes to take effect"
 msgstr "请�新�动 Evolution 以便使得更改生效"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "请选择用户。"
 
-#: ../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 "当您退出 Evolution 时，Exchange 账户将被�用"
 
-#: ../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 "当您退出 Evolution 时 Exchange 账户将被删除"
 
-#: ../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 "Exchange �务器与 Exchange Connector �兼容。"
 
-#: ../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."
@@ -16112,7 +17019,7 @@ msgstr ""
 "�务器正在�行 Exchange 5.5。Exchange Connector �支� Microsoft Exchange "
 "2000 和 2003。"
 
-#: ../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"
@@ -16125,87 +17032,88 @@ msgstr ""
 "\n"
 "或者，您�能拼错了密�。"
 
-#: ../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
 msgid "Unable to add user to access control list:"
 msgstr "无法将用户添加到访问控制列表中："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "无法编辑代�人。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "查阅 {0} 时�生未知错误"
 
-#: ../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
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "未知类型"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "�支�的�作"
 
-#: ../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 "您�能�置�个 Exchange 账户。"
 
-#: ../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 "您目�使用了 {0} KB。试�通过删除邮件�清�一些空间。"
 
-#: ../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 "您目�使用了 {0} KB。您现在既�能��也�能接收邮件。"
 
-#: ../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 "您目�使用了 {0} KB。您将无法��邮件，除�您通过删除邮件�清�空间。"
 
-#: ../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 "{0} 无法添加到访问控制列表中"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} 已被授�"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} 已�在列表中"
 
@@ -16217,35 +17125,74 @@ msgstr "订阅其他用户的任务"
 msgid "Check folder permissions"
 msgstr "更改文件夹��"
 
+#: ../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 ""
-"一个使用外部编辑器作为撰写器的�件。您�能��纯文本信件。"
+msgstr "一个使用外部编辑器作为撰写器的�件。您�能��纯文本信件。"
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "外部编辑器"
 
+#: ../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 "Evolution 无法创建临时文件��存您的邮件。请�候�试。"
+
+#: ../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 "在外部编辑器中写作"
+msgid "Compose in _External Editor"
+msgstr "在外部编辑器中写作(_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "使用外部编辑器写作信件"
 
-#: ../plugins/face/face.c:57
+#: ../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 ""
+"Emacs 应使用“xemacs�\n"
+"VI 应使用“gvim�"
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "选择一个�于 700B 的 48*48 的 PNG 图�"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG 文件"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "头�(_F)"
 
@@ -16280,20 +17227,52 @@ msgstr "退订文件夹"
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-#: ../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
 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 "输入用户 %s 的密�以便访问已订阅日历的列表。"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr "无法从 Google �务器上读�数�。\n%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "日历(_E)："
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "获�列表(_L)"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+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."
-msgstr "设置 Google 日历�的�件。"
+msgid "A plugin to setup google calendar and contacts."
+msgstr "设置 Google 日历和�系人的�件。"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google �"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "待办清�"
 
@@ -16338,16 +17317,16 @@ msgstr "安装共享文件夹"
 msgid "Shared Folder Installation"
 msgstr "共享文件夹安装"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "垃圾邮件设置"
 
-#: ../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 "垃圾邮件设置"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "垃圾邮件设置..."
 
@@ -16373,10 +17352,21 @@ msgid "_Junk List"
 msgstr "垃圾测试(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+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 "邮件�功收回"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "收回邮件"
 
@@ -16384,12 +17374,6 @@ msgstr "收回邮件"
 msgid "Add Send Options to groupwise messages"
 msgstr "将��选项添加到 GroupWise 信件"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "��选项"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Groupwise 账户特性的�件。"
@@ -16398,7 +17382,80 @@ msgstr "Groupwise 账户特性的�件。"
 msgid "Groupwise Features"
 msgstr "Groupwise 特性"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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
+#, fuzzy
+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 "无效用户"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "无法�存到文件“{0}�。"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../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
+#, fuzzy
+msgid "You have already given proxy permissions to this user."
+msgstr "你在我的文件夹上拥有下列��："
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 "已�存在�为“{0}�的文件夹。请使用��的�称。"
+
+#: ../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
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "将此事件标为���生"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "您希望�存更改�？"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "您希望�存更改�？"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "无法�存到自动�存文件“{0}�。"
+
+#: ../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 ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "暂时接�"
 
@@ -16415,7 +17472,7 @@ msgid "Con_tacts..."
 msgstr "�系人(_T)..."
 
 #: ../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 "消�"
 
@@ -16496,9 +17553,9 @@ msgstr "<b>账户�</b>"
 msgid "Proxy Login"
 msgstr "代��务器登录"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16507,40 +17564,44 @@ msgstr "%s输入 %s 的密�(用户 %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "代��务器登录(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代��务器标签仅当账户�机时��用。"
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代��务器标签仅当账户�用时��用。"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "用户"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "输入用户�设定��"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "新建共享文件夹(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "共享"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "自定义通知"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "添加"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "修改"
 
@@ -16605,11 +17666,11 @@ msgstr "设置 Hula 日历�的�件。"
 msgid "Hula Account Setup"
 msgstr "Hula 账户设置"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "自定义信头"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP 信头"
 
@@ -16662,28 +17723,28 @@ msgstr "实现 IMAP 账户特性的�件。"
 msgid "IMAP Features"
 msgstr "IMAP 特性"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "导入到日历(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "导入到任务(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "导入 ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "选择任务列表"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "选择日历"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "导入(_I)"
 
@@ -16719,13 +17780,14 @@ msgid ""
 msgstr ""
 "Evolution 找�到��步的 iPod。您�能没有将其连接到系统，或者没有开机。"
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 格�(.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr "将选中的任务/备忘/日历/地�簿与 Apple iPod �步"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -16736,602 +17798,602 @@ msgstr "�步到 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod �步"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "装入日历“%s�失败"
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s�中的一个约会与此会议冲�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s�中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "无法在任何备忘列表中找到此备忘"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "�索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "无法分�项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目��到日历“%s�。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s���为已接�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s���为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s���为已拒�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s���为已�消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已�删除了代�人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代�人��了�消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代�人���消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状�无法更新，原因是状�无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "出席者状�已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "会议信�已��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "任务信�已��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "备忘信�已��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法��会议信�，会议�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法��任务信�，任务�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "无法��备忘信�，备忘�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包�日历，但日历�是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 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:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包�多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "�处�这些全部项目，应该�存文件并导入日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "此会议�现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2141
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "此任务�现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2144
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "此备忘�现"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "�作�删除消�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2369
-#: ../plugins/itip-formatter/itip-formatter.c:2401
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "冲��索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择��索冲�会议的日历"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%-m月%-d日%A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%-m月%-d日%A %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:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m月%-d日%A %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:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m月%-d日%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%-m月%-d日%A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%-m月%-d日%A %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:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "请以 <b>%s</b> 的身份回应"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "以 <b>%s</b> 的身份接收"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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> 通过 %s �布了会议信�："
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> �布了会议信�："
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 为您代�了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 通过 %s 请求您�加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 请求您�加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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> 通过 %s 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b> 通过 %s 希望接收到下列会议的最新信�："
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望接收到下列会议的最新信�："
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../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> 通过 %s �回了下列会议请求的�应："
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> �回了下列会议请求的�应："
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 通过 %s �消了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> �消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../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> 通过 %s �议了下列会议�更。"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> �议了下列会议�更。"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 通过 %s 拒�了下列会议�更："
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 拒�了下列会议�更。"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 通过 %s �布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> �布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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> 请求给 %s 分�下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 通过 %s 为您分�了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 为您分�了一个任务："
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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> 通过 %s 希望加入到已有的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s<b> 希望加入到已存在的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../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 "<b>%s</b> 通过 %s 想�收到所分�的下列任务的最新信�："
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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 "<b>%s</b> 想�收到所分�的下列任务的最新信�："
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> 通过 %s �回了下列分�任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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> �回了下列分�任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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> 通过 %s �消了下列任务分�："
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> �消分�的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 通过 %s �议了下列任务分��更："
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> �议了下列任务分��更："
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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> 通过 %s 拒�了下列任务分�："
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 拒�了分�的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 通过 %s �布了下列备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> �布了下列备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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> 通过 %s 希望加入到已有的备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入到已有的备忘中："
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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> 通过 %s �消了下列共享备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> �消了下列共享备忘："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "打开日历(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "拒�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "接�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "全部拒�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "全部接�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "��信�(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "更新与会者状�(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
@@ -17432,9 +18494,9 @@ msgstr "新邮件到达时生� D-Bus 信�。"
 
 #: ../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 ""
-"新信件到达时，此值如果为 true，则�铃，�则播放声音文件。"
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "新信件到达时，此值如果为 true，则�铃，�则播放声音文件。"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17480,8 +18542,16 @@ msgstr "是��通知收件箱文件夹中的新信件。"
 msgid "Generate a _D-Bus message"
 msgstr "生� _D-Bus 消�"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolution 邮件通知"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+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:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17491,54 +18561,54 @@ msgid_plural ""
 "in %s."
 msgstr[0] "您在 %2$s 中收到了 %1$d �新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您收到了 %d �新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "新电�邮件"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "在通知区显示图标(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "闪�通知区图标(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "�时弹出图标和消�(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "新邮件到达时播放声音(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "�铃(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "播放声音文件(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "指定文件�(_F)："
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "播放(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "�通知收件箱中的新信件(_I)"
 
@@ -17566,17 +18636,16 @@ msgstr "转�为会议(_V)"
 msgid "Mail to meeting"
 msgstr "邮寄到会议"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "无法打开日历。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../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 ""
-"选中的�是�读的，因此�能在此创建任务。请选择其它的�。"
+msgstr "选中的�是�读的，因此�能在此创建任务。请选择其它的�。"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -17677,7 +18746,7 @@ msgstr "把信件��到邮件列表�？"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17757,6 +18826,24 @@ msgstr "订阅列表(_S)"
 msgid "_Unsubscribe from List"
 msgstr "退订列表(_U)"
 
+#: ../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 "当�文件夹�其�文件夹中(_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "�有当�文件夹(_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "全部标为已读"
@@ -17799,7 +18886,7 @@ msgstr "管��件是�用还是�用的�件。"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "�件管�器"
 
@@ -17811,33 +18898,24 @@ msgstr "�用和�用�件"
 msgid "_Plugins"
 msgstr "�件(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "�述"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "�置"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注�：�些更改直到�新�动��生效"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "概览"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "�置"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "此�件无�置选项。"
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "�件"
 
@@ -17861,41 +18939,22 @@ msgstr "纯文字模�"
 msgid "Prefer plain-text"
 msgstr "首选纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "首选 HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "首选纯文本"
 
-#: ../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
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
-#: ../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 "打�信件"
-
-#: ../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 "打�预览(_V)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "打�该信件"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution �置器"
@@ -17920,13 +18979,7 @@ msgstr "�置"
 msgid "_Publish Calendar Information"
 msgstr "�布日历信�(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "输入“%s�的密�"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "您确定您想�删除此 URL �？"
 
@@ -18014,15 +19067,80 @@ msgstr ""
 "iCal\n"
 "å¿™/é—²"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+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
+#, fuzzy
+msgid "Python Loader"
+msgstr "Mono 装入器"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "垃圾克星(内置)"
 
-#: ../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:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "垃圾克星�件"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "创建本地邮件存储“%s�失败：%s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"%s 错误：\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "��选项��用。"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "这将让过滤器更��，但�慢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "包�远程测试(_N)"
 
@@ -18046,7 +19164,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:314
 msgid "Save attachments"
 msgstr "�存附件"
 
@@ -18058,16 +19176,15 @@ msgstr "�存附件..."
 msgid "Save all attachments"
 msgstr "�存全部附件"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "选择�存基础�称"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "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:347
 msgid "Save"
 msgstr "�存"
 
@@ -18075,79 +19192,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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "�述列表"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "类别列表"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "注释列表"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "创建时间"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "�系人列表"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "开始"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "结�"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "完�百分比"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "出席者列表"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "修改日期"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV 格�的高级选项"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "�置头"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "值分隔符："
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "记录分隔符："
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "将值以下列形��装："
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "逗�分隔的值格�(.csv)"
 
@@ -18168,15 +19285,15 @@ msgstr "�存到�盘(_S)"
 #. * 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:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF 格�(.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "选择目的文件"
 
@@ -18201,22 +19318,22 @@ msgid "Show _only this Task List"
 msgstr "�显示此任务列表(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "处��动�导的�件。"
+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 "�动�导"
+msgid "Setup Assistant"
+msgstr "设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18228,29 +19345,29 @@ msgstr ""
 "\n"
 "请�击“�进�按钮继续。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "导入文件"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信�："
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "正在导入数�。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "请�候"
 
@@ -18267,10 +19384,33 @@ msgid "Thread messages by subject"
 msgstr "基于主题按线索编排信件列表"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "默认按照主题对线索中的信件排�(_A)"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "消�主体中的用于附件�醒�件的线索列表。"
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "无标题"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "�存为模�(_T)"
+
+#: ../plugins/templates/templates.c:745
+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
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "一个使用 ytnef �解� tnef 附件的简��件。"
@@ -18279,6 +19419,28 @@ msgstr "一个使用 ytnef �解� tnef 附件的简��件。"
 msgid "TNEF Attachment decoder"
 msgstr "TNEF 附件解�器"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "设置 WebDAV �系人的�件。"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV �系人"
+
+#: ../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 "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+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 "Evolution 外壳"
@@ -18296,16 +19458,16 @@ msgid "Evolution Test component"
 msgstr "Evolution 测试组件"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "当�打�机设置的字符串�述。"
+msgid "Authenticate proxy server connections"
+msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "�置版本"
+msgid "Automatic proxy configuration URL"
+msgstr "自动代��务器�置 URL"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "决定是��行崩溃检测。"
+msgid "Configuration version"
+msgstr "�置版本"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18324,63 +19486,156 @@ msgid "Default window width"
 msgstr "默认窗�宽度"
 
 #: ../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 "输入密�"
+
+#: ../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 或别�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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 "上次�级的�置版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../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:11
+#: ../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 "�置"
+
+#: ../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 "侧边���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "跳过开�警告对�框"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "跳过��警告对�框"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "以脱机模��动"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "状����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../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 "Evolution 的�置版本，带主/次/�置级别(如“2.6.0�)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "主窗�的默认高度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "主窗�的默认宽度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "侧边�的默认宽度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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 "上次�级的 Evolution �置版本，带主/次/�置级别(如“2.6.0�)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../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 "
@@ -18389,52 +19644,65 @@ msgstr ""
 "窗�按钮的样�。�以是文字�图标�二者�工具�。如果设置为工具�，则工具�的"
 "样�由 GNOME 设置决定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 "工具���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+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 "是�以脱机模�而��机模��动 Evolution。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr "回收站删除是�执行"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "窗�是�应为最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "侧边�是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "状��是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "工具�是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是�跳过 Evoltuion 开�版本的警告。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "是�跳过 Evoltuion ��警告对�框。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "窗�按钮是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "窗�按钮样�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "窗�按钮��"
 
@@ -18450,27 +19718,22 @@ msgstr "当�连接"
 msgid "Click OK to close these connections and go offline"
 msgstr "�击确定关闭这些连接，并转入脱机�作"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "选择��行的导入器类型："
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\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 ""
-"选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。\n"
-"\n"
-"如果您�清楚，�以选择“自动�，Evolution 将�试为您确定类型。"
+"选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "选择此导入的目的�置"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -18481,23 +19744,23 @@ msgstr ""
 "iCalendar。并未�现�导入的设置。如果您想��试一次，请�击\n"
 "“上一步�按钮。\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "文件�(_I)："
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "选择一个文件"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "文件类型(_T)："
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "从旧版程�中导入数�和设置(_O)"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "导入�个文件(_S)"
 
@@ -18505,118 +19768,104 @@ msgstr "导入�个文件(_S)"
 msgid "Evolution Preferences"
 msgstr "Evolution 首选项"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "没有指定文件夹�称。"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "文件夹��能�有回车符。"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "文件夹��能�有字符“/�。"
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "文件夹��能�有字符“#�。"
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "“.�和“..�是�留文件夹�。"
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 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 "GNOME Pilot 工具好�并未安装到系统中。"
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "执行 %s 错误。"
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "未安装 Bug buddy。"
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "无法�行 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:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "开�软件国际化之简体中文组\n"
 "http://i18n.linux.net.cn"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "打开 FAQ 网页时出错。"
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "�机工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "脱机工作"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr "Evolution 目��机。�击该按钮�脱机工作。"
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在脱机过程中。"
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr "Evolution 目�脱机。�击该按钮��机工作。"
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "切�到 %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "未知的系统错误。"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "确定"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "无效�数"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "找�到�置数�库"
 
@@ -18626,15 +19875,17 @@ msgstr "找�到�置数�库"
 msgid "New"
 msgstr "新建"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "新建测试"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#, fuzzy
+msgctxt "New"
 msgid "_Test"
 msgstr "测试(_T)"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "创建新测试项"
 
@@ -18676,7 +19927,7 @@ msgstr ""
 "本助手将全程指导您将外部文件导入 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18708,7 +19959,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享�我们努力工作的�果，我们也热切盼望�您的���\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18716,65 +19967,43 @@ msgstr ""
 "æ„Ÿè°¢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "���通知我"
 
-#: ../shell/main.c:309
-msgid "Evolution Crash Detection"
-msgstr "Evolution 崩溃检测"
-
-#: ../shell/main.c:311
-msgid "Ig_nore"
-msgstr "忽略(_N)"
-
-#: ../shell/main.c:326
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution 似乎在上次�行时异常退出。作为预防措施，所有的预览��\n"
-"将被��。您�以从查看��中��预览��。\n"
-
-#: ../shell/main.c:337
-msgid "_Do not show this message again"
-msgstr "��显示此信�(_D)"
-
-#: ../shell/main.c:569
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "�动 Evolution 并激活指定组件"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "以�机模��动"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 �新��"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有�员的调试输出��到一个文件中。"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "�止装入任何�件。"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "�用邮件��系人和任务的预览��。"
 
-#: ../shell/main.c:617
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信�管�和邮件客户"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18909,7 +20138,7 @@ msgstr ""
 "\n"
 "如果您选择继续，您�能无法访问您的�些旧数�。\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -18920,14 +20149,14 @@ msgstr ""
 "\n"
 "编辑信任设置："
 
-#: ../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 "
@@ -18982,22 +20211,27 @@ msgstr "电�邮件地�"
 msgid "All CA certificate files"
 msgstr "全部��机构文件"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "�书查看器：%s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "输入“%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 "输入�书数�库的新密�"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "输入新密�"
 
 #. 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"
@@ -19006,7 +20240,7 @@ msgstr ""
 "�行给：\n"
 "  主题：%s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19015,7 +20249,7 @@ msgstr ""
 "�行者：\n"
 "  主题：%s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "选择�书"
 
@@ -19199,7 +20433,7 @@ msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "�书已�存在"
 
@@ -19366,15 +20600,15 @@ msgstr "主题唯一 ID"
 msgid "Certificate Signature Value"
 msgstr "�书签�值"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密�"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "输入 PKCS12 文件的密�："
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "导入的�书"
 
@@ -19407,8 +20641,7 @@ msgstr "将全部�系人�制到(_P)..."
 msgid "Contact _Preview"
 msgstr "�系人预览(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "�制"
@@ -19430,11 +20663,10 @@ msgid "Copy to Folder..."
 msgstr "�制到文件夹..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "创建新的地�簿文件夹"
 
-#: ../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 "剪切"
@@ -19475,8 +20707,7 @@ msgstr "把选中文件夹中的�系人移至其它文件夹"
 msgid "Move to Folder..."
 msgstr "移至文件夹..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "粘贴"
@@ -19513,13 +20744,11 @@ msgstr "把选中的�系人�存为 VCard。"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "把选中文件夹中的的�系人�存为 VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "全选"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "全选(_A)"
 
@@ -19588,7 +20817,7 @@ msgstr "将�系人移至(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "将文件夹�系人移至(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "新建(_N)"
 
@@ -19649,7 +20878,7 @@ msgid "Month"
 msgstr "月"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "下一项"
 
@@ -19658,7 +20887,7 @@ msgid "Previews the calendar to be printed"
 msgstr "预览将�打�的日历"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "上一项"
 
@@ -19726,232 +20955,6 @@ msgstr "一周工作日"
 msgid "_Open Appointment"
 msgstr "打开约会(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "将选中文字�制到剪贴�"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "将选中文字�制到剪贴�"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "将选中文字剪切到剪贴�"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "将选中文字剪切到剪贴�"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "从剪贴�粘贴"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "从剪贴�中粘贴文字"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "选中所有文字"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "附件"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "�击此处�便附加文件"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "�击此处�关闭当�窗�"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "�击此处��存当�窗�"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "�击此处�查看�用的帮助"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "关闭"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "�入(_N)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "附件(_A)..."
-
-#: ../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 "关闭(_C)"
-
-#: ../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:42
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "选项(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "全天事件"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "全天事件(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "分类为机密"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "分类为�人"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "分类为公开"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "�击此处以设定或�消此事件的�醒"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "�入高级��选项"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "将此事件标为���生"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "公开(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "查询出席者的忙闲信�"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "角色域(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "��选项(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "将时间显示为忙(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "时区(_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "切�是�显示出席者类型域"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "切�是�显示请回�域"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "切�是�显示角色域"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "切�是�显示状�域"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "切�是�显示时区"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "切�是�显示类别"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "切�是�有全天事件"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "切�是�将时间显示为忙"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "�醒(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "类别(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "分类(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "机密(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "å¿™/é—²(_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "�人(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "请回�(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "�现(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "状�域(_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "类型域(_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "�消当�邮件�作"
@@ -19981,7 +20984,6 @@ msgid "Empty _Trash"
 msgstr "清空回收站(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "文件夹(_O)"
 
@@ -20199,7 +21201,7 @@ msgstr "按线索编排的信件列表"
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../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 "信件(_M)"
@@ -20534,129 +21536,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信件的信体中显示闪�光标"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "以普通样�显示信件"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "显示邮件时显示所有信头"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "显示信件的原始邮件�代�"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "�消选中信件的删除"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "���(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "缩�(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "光标模�(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "删除信件(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "在信件中查找(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "标志为已完�(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "��(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "装入图�(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "信件�代�(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "下一�信(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "普通大�(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "�垃圾(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "在新窗�中打开(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "上一�信(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "读�(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "�存信件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "�消删除信件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "关闭此窗�"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "关闭"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -20694,290 +21692,6 @@ msgstr "查看选中的备忘"
 msgid "_Open Memo"
 msgstr "打开备忘(_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "添加附件"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "关闭当�文件"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "删除签�以外的所有内容"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "用 PGP 加密该信件"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "用您的 S/MIME 加密�书加密该信件"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "格�(_M)"
-
-#: ../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
-msgid "Insert Send options"
-msgstr "�入��选项"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "打开文件"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP 加密"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP 签�"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP 加密(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP 签�(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "请求阅读收�(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME 加密(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME 加密"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME 签�(_N)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME 签�"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "��(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "�存为"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "�存�稿"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "�存为(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "�存�稿(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "�存为�稿"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "�存到文件夹..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "�存当�文件"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "用��的文件��存当�文件"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "在指定的文件夹中�存信件"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "��"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "以 HTML 格���邮件"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "��这�信"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "将信件设定为高优先级"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "用您的 PGP 密钥签�该信件"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "用您的 S/MIME 签�认�签�该信件"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "是�显示暗中转�域"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "是�显示转�域"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "是�显示�件人选择器"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "是�显示投递到域"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "是�显示回�域"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "是�显示寄给域"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "暗�域(_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "抄�域(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "全部删除(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "�件人域(_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "打开(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "投递到域(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "标为优先(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "回�域(_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "安全(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "��选项(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "收件人域(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "关闭(_L)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "�存并关闭"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "�存并关闭(_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "�存当�文件并关闭窗�"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "把文件夹添加到您的订阅文件夹列表中去"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "刷新列表"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "刷新文件夹列表"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "从您的订阅文件夹列表中删除文件夹"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "订阅"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "退订"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "�转选择(_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "�击�更改/查看任务的状�细节"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "状�细节"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "时区"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "状�细节(_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "�制选中的任务"
@@ -21171,50 +21885,55 @@ msgid "View/Hide the Status Bar"
 msgstr "查看/��状��"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "脱机工作"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "关闭窗�(_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "丢弃密�(_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "常�问答(FAQ)(_F)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "��按钮(_H)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "�有图标(_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "切�器外观(_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "�步选项(_S)..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "�有文字(_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "窗�(_W)"
 
@@ -21291,11 +22010,11 @@ msgid "With _Status"
 msgstr "状�(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21312,8 +22031,8 @@ msgid "Select a Time Zone"
 msgstr "选择一个时区"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "时区组�框"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21324,19 +22043,19 @@ msgstr ""
 "用鼠标左键放大地图的�个区域并选择时区。\n"
 "用鼠标�键缩�。"
 
-#: ../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 "定义 %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 "定义视图"
 
@@ -21346,17 +22065,17 @@ msgid "Define Views for \"%s\""
 msgstr "定义“%s�的视图"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../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:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "实例"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "�存当�视图"
 
@@ -21370,7 +22089,7 @@ msgstr "替�现有视图(_R)"
 
 #. 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 "当�视图"
 
@@ -21379,40 +22098,40 @@ msgid "Save Custom View"
 msgstr "�存自定义视图"
 
 #: ../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 "定义视图..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "当�视图(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "选择视图：%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 "�存当�视图..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "�存当�自定义视图"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "创建或编辑视图"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "工厂"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "定义新视图"
 
@@ -21428,17 +22147,17 @@ msgstr "视图类型"
 msgid "Type of view:"
 msgstr "视图类型："
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "附件�"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "无法附加文件 %s：%s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "无法附加文件 %s：�是普通文件"
@@ -21460,33 +22179,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%Yå¹´%B"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "月历"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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
 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:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "点绘填充"
 
@@ -21510,30 +22228,30 @@ msgstr "Y1"
 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:3071
+#: ../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
 msgid "Minimum width"
 msgstr "最�宽度"
 
-#: ../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:3072
+#: ../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
 msgid "Minimum Width"
 msgstr "最�宽度"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "é—´è·�"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "现在"
 
-#: ../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 "时间必须采用格�：%s"
@@ -21542,257 +22260,264 @@ msgstr "时间必须采用格�：%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "百分比值必需在 0 到 100 之间，� 0 和 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 "波罗的语"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "中欧"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "中文"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "西里尔语"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "希伯�语"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "日文"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "韩语"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "泰语"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: ../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 "西欧"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "西欧，新"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "�体"
 
-#: ../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 "简体"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "�视"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "未知的字符集：%s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "字符编�"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "输入�使用的字符集"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "其它..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "字符编�(_A)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "输入日期的文本框"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "�击此按钮�显示日历"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
 msgstr "选择时间的组�框"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "现在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "今天(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "已展开"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "是�展开扩展器"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "扩展器标签的文本"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "使用下划线"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "如果设置了此选项，将会在表明加速键的字符下�加下划线"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "标签�其�空间中间的间�"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "标签部件"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "在通常扩展器标签的�置显示的部件"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "扩展器大�"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "扩展器箭头的大�"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "标识器间�"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "扩展器箭头�边的间�"
 
 #. 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:748
+#: ../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 "高级�索"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "�存�索"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "�索(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "�索"
 
-#: ../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 "�存�索(_S)..."
 
-#: ../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 "编辑�存的�索(_E)..."
 
-#: ../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 "高级�索(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "全部账户"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "当�账户"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "当�文件夹"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "当�信件"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "选择图�"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "世界地图"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:629
+#, fuzzy
 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-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "在线"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "按钮状�为在线"
+
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "�步对象："
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "�步�有记录："
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "�步类别："
 
@@ -21808,74 +22533,74 @@ msgstr "回�模型"
 msgid "Column width"
 msgstr "列宽"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "�索"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "�击此处更改�索类型"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "�索(_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "立�查找(_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "项目 ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "显示(_W)："
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "�索(_C)："
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " 于(_N) "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "光标行"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "光标列"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "排�"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "选择模�"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "光标模�"
 
@@ -21903,10 +22628,6 @@ msgstr "<b>状�跟踪</b>"
 msgid "A_uto-delete sent item"
 msgstr "自动删除已�项目(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "分类"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "创建一个已��项以跟踪信�(_E)"
@@ -21987,44 +22708,45 @@ msgstr "之�(_A)："
 msgid "_All information"
 msgstr "全部信�(_A)"
 
-#: ../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 "推迟信件投递(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "已投递(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "设置过期时间(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "直到(_U)："
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "方便时(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "打开时(_W)："
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完�)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "�击此处转到 URL"
 
@@ -22044,7 +22766,7 @@ msgstr "�用类别(_A)："
 msgid "categories"
 msgstr "类别"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "弹出列表"
 
@@ -22064,23 +22786,23 @@ msgstr "�焦列"
 msgid "Unselected Column"
 msgstr "未选列"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "给列加删除线"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "给列加下划线"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "给列加粗"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "给列�色"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "给列�背景色"
 
@@ -22118,7 +22840,7 @@ msgid "A_vailable Fields:"
 msgstr "�用域(_V)："
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "��"
 
@@ -22131,7 +22853,7 @@ msgid "Clear _All"
 msgstr "全部清除(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "��"
 
@@ -22194,14 +22916,14 @@ msgstr "排�(_S)..."
 #: ../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:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "拖放代�"
 
 #: ../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:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "完整标题"
 
@@ -22219,447 +22941,301 @@ msgid ""
 "the location in which you want it to appear."
 msgstr "�在您的表格中添加列，请将其拖曳到您想�其出现的�置。"
 
-#: ../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 项)"
 
-#: ../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 项)"
 
-#: ../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:3029 ../widgets/table/e-table-item.c:3030
+#: ../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:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "交替行色"
 
-#: ../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:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "水平绘制网格"
 
-#: ../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:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "垂直绘制网格"
 
-#: ../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:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "绘制焦点"
 
-#: ../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:3057 ../widgets/table/e-table-item.c:3058
+#: ../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:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "光标模�"
 
-#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../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:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "选择模型"
 
-#: ../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:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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: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
 msgid "Length Threshold"
 msgstr "长度阀值"
 
-#: ../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:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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: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
 msgid "Uniform row height"
 msgstr "统一行高"
 
-#: ../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 "冻结"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "自定义当�视图"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "��排�(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "��排�(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "未排�(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "对�(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "最佳匹�(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "格�化列(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "自定义当�视图(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "排�方�(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "字体�述"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "排�信�"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "æ ‘"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "表头"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "光标行"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "总是�索"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "�击�添加"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree 表格适�器"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "�箭外观"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "绘制行和 +/- 扩展柄。"
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "输入法"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "事件处�器"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "粗体"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "删除线"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "锚点"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "两端对�"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "�剪宽度"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "�剪高度"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "�剪"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "填充�剪矩形"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "水平�移"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "垂直�移"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "文字宽度"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "使用椭圆"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "椭圆"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "�行"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "�行字符"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "最多行数"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "绘制边框"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "�许新行"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "绘制按钮"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "光标�置"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "输入法环境"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "处�弹出"
-
-#~ msgid "_Categories..."
-#~ msgstr "类别(_C)..."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Add an email to the List"
-#~ msgstr "将电�邮件添加到列表"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "从地�簿中�入电�邮件地�"
-
-#~ msgid "Members"
-#~ msgstr "�员"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "从列表中删除电�邮件地�"
-
-#~ msgid "_Select"
-#~ msgstr "选择(_S)"
-
-#~ msgid "Or_ganiser:"
-#~ msgstr "组织者(_G)："
-
-#~ msgid "Task sort"
-#~ msgstr "任务排�"
-
-#~ msgid "Memo sort"
-#~ msgstr "备忘排�"
-
-#~ msgid "SMTWTFS"
-#~ msgstr "日一二三四五六"
-
-#~ msgid "Post To:"
-#~ msgstr "投递到："
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "Evolution 个人信�管�和邮件客户"
-
-#~ msgid "_Search name:"
-#~ msgstr "�索�称(_B)："
-
-#~ msgid "Di_sable"
-#~ msgstr "�用(_S)"
-
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "自动识别表情"
-
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "新建邮件通知声音文件"
-
-#~ msgid "New Mail Notify type"
-#~ msgstr "新建邮件通知类型"
-
-#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
-#~ msgstr "指定用户想�使用的新邮件通知类型。"
-
-#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
-#~ msgstr "<span weight=\"bold\">标签和颜色</span>"
-
-#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
-#~ msgstr "<span weight=\"bold\">新邮件�醒</span>"
-
-#~ msgid "HTML Mail"
-#~ msgstr "HTML 邮件"
-
-#~ msgid "Se_lect..."
-#~ msgstr "选择(_L)..."
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "选择�稿文件夹"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "选择已�文件夹"
-
-#~ msgid "_Beep when new mail arrives"
-#~ msgstr "新邮件到达时�铃(_B)"
-
-#~ msgid "_Do not notify me when new mail arrives"
-#~ msgstr "新邮件到达时���醒我(_D)"
-
-#~ msgid "Attachment Reminder Preferences"
-#~ msgstr "附件�醒首选项"
-
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "选择一个�于 720B 的 48*48 的 PNG 图�"
-
-#~ msgid "_Contacts..."
-#~ msgstr "�系人(_C)..."
-
-#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
-#~ msgstr "�当新邮件到达时，弹出一个 libnotify 通知。"
-
-#~ msgid "Make the status icon blink"
-#~ msgstr "闪�状�图标"
-
-#~ msgid "When the new-mail status icon is visible, make it blink."
-#~ msgstr "当新邮件状�图标��时，使之闪�。"
-
-#~ msgid "System error: %s"
-#~ msgstr "系统错误：%s"
-
-#~ msgid "Camel error: %s"
-#~ msgstr "Camel 错误：%s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "账户无法��电�邮件"
-
-#~ msgid "No store available"
-#~ msgstr "没有�用的存储"
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr "实现远程访问邮件数�的 CORBA 接�的�件。"
-
-#~ msgid "Mail Remote"
-#~ msgstr "远程邮件"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "新邮件通知"
-
-#~ msgid "Configure"
-#~ msgstr "�置"
-
-#~ msgid "Download messages for offline"
-#~ msgstr "下载信件进行脱机处�"
-
-#~ msgid "_Phone List"
-#~ msgstr "电�列表(_P)"
-
-#~ msgid "MTWTFSS"
-#~ msgstr "一二三四五六日"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- 删除(_R)"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "按顺�显示这些域(_O)："
-
-#~ msgid "_Add ->"
-#~ msgstr "添加(_A) ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "模拟标签缩放"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 57fb25ab09..548332ded2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,13 +6,12 @@
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Abel Cheung <abelcheung@gmail.com>, 2006.
 #
-#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.23.90\n"
+"Project-Id-Version: evolution 2.23.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 12:38+0800\n"
-"PO-Revision-Date: 2008-08-09 12:40+0800\n"
+"POT-Creation-Date: 2008-08-21 03:21+0000\n"
+"PO-Revision-Date: 2008-08-22 19:35+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +26,12 @@ msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "新�絡人"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "新增�絡人清單"
 
@@ -115,7 +114,8 @@ msgstr "用來檢視與�擇時刻範�的表格"
 
 #. 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:151
+#: ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -124,7 +124,8 @@ msgstr[1] "它有 %d 個事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "它沒有事件。"
 
@@ -153,7 +154,7 @@ msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -164,8 +165,9 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. 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:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../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
 msgid "%a %d %b"
 msgstr "%-m 月 %-d 日 (%a)"
@@ -173,9 +175,9 @@ msgstr "%-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -183,10 +185,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -196,8 +198,9 @@ msgstr "%Y 年 %-m 月 %-d 日"
 #. 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:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../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
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
@@ -338,15 +341,11 @@ msgstr "使作用"
 
 #. 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."
+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}�是一個唯讀的通訊錄。請從通訊錄檢視的�邊欄中�擇��的通訊錄。"
 
 #: ../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?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr "此�絡人的電�郵件地�已經存在。你無論如何都�加入�樣��的新�片嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -366,10 +365,7 @@ msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
 #: ../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."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
 msgstr "請檢查來確定你的密碼拼法正確，而且你使用的是支�的登入方法。請記得許多密碼有�分大�寫；你�能啟動了大寫鎖定�。"
 
 #: ../addressbook/addressbook.error.xml.h:9
@@ -381,10 +377,7 @@ msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
 #: ../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."
+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 "目�你�能存� Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 GroupWise 郵件客戶端，以�得你的 GroupWise 常用�絡人� Groupwise 個人�絡人資料夾。"
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -405,7 +398,7 @@ msgstr "無法驗證 LDAP 伺�器。"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "刪除�絡人失敗"
 
@@ -430,15 +423,11 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經�外��。"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所�擇的圖片太大。你是��改變大�後�儲存它？"
 
 #: ../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."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
 msgstr "此 LDAP 伺�器�能使用舊的 LDAP 版本，它�支�此功能，或�能設定錯誤。請洽詢管�員，瞭解支�的�尋基礎。"
 
 #: ../addressbook/addressbook.error.xml.h:24
@@ -454,9 +443,7 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺�器沒有任何建議的�尋基礎。"
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr "此通訊錄伺�器無法連線，或伺�器�稱�能拼錯，或你的網絡連線已經�止。"
 
 #: ../addressbook/addressbook.error.xml.h:28
@@ -480,16 +467,11 @@ msgid "Would you like to save your changes?"
 msgstr "�儲存所�的更改？"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
 msgstr "你正在嘗試從�一個通訊錄，將�絡人移至�一個通訊錄，但是它無法從來�移除。你想�儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h: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"
+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 "你正連線到�支�的 GroupWise 伺�器而且�能�到使用 Evolution 的�題。最好的解決方案是將該伺�器�級至支�的版太"
 
 #: ../addressbook/addressbook.error.xml.h:35
@@ -497,17 +479,15 @@ msgid "You do not have permission to delete contacts in this address book."
 msgstr "你沒有足夠的權�刪除這個通訊錄中的�絡人。"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "你已經修改此�絡人。�儲存這些更改？"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "�新啟動 Evolution 之�，無法使用 {0} 的�絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -531,7 +511,8 @@ msgid "_Use as it is"
 msgstr "將它視為(_U)"
 
 #. 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:44 ../mail/mail.error.xml.h:143
+#: ../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}"
@@ -573,8 +554,9 @@ msgstr "在此設定自動完�"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
@@ -601,8 +583,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution 通訊錄元件"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 證書管�控制"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME 證書管�控制"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -616,13 +598,18 @@ msgstr "在此管�你的 S/MIME 證書"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:196 ../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:1456
+#: ../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
 msgid "On This Computer"
 msgstr "我的電腦"
 
@@ -635,11 +622,16 @@ msgstr "我的電腦"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../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:205
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../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 "個人"
 
@@ -650,23 +642,38 @@ msgid "On LDAP Servers"
 msgstr "在 LDAP 伺�器"
 
 #: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
+msgid "_Contact"
+msgstr "�絡人(_C)"
+
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "建立新的�絡人"
 
 #: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
+msgid "Contact _List"
+msgstr "�絡人清單(_L)"
+
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "建立新的�絡人清單"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "新通訊錄"
 
 #: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
+msgid "Address _Book"
+msgstr "通訊錄(_B)"
+
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�級通訊錄設定值或資料夾失敗。"
 
@@ -689,14 +696,15 @@ msgstr "複製通訊錄內容至本地用於離線作業(_B)"
 #: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../mail/em-folder-properties.c:280
+#: ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "通訊錄"
@@ -716,7 +724,7 @@ msgid "Details"
 msgstr "詳細資料"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:965
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "�尋中"
 
@@ -730,15 +738,17 @@ msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "正在移轉 `%s'："
+msgid "Migrating '%s':"
+msgstr "正在移轉「%s�："
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -750,8 +760,7 @@ msgstr "自動完�設定"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -789,74 +798,82 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的 Pilot Sync 資料時，請�心等候..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�新命�「%s�資料夾為："
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "�新命�資料夾"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾�稱�能包�斜線。"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
+#: ../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:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../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
+#: ../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
+#: ../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 "刪除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "�絡人來��擇器"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿�方�存� LDAP 伺�器"
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "驗證證書失敗。\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -875,9 +892,7 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "完� uris 清單的 EFolderList xml"
 
 #: ../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."
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
 msgstr "垂直窗格的�置，在�片�清單檢視與�覽窗格之間，以�素計。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
@@ -885,9 +900,7 @@ msgid "Show preview pane"
 msgstr "顯示�覽窗格"
 
 #: ../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."
+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
@@ -959,7 +972,7 @@ msgstr "匿�"
 #. 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 ""
+msgstr "�覽這個通訊錄直到�制(_R)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
@@ -974,8 +987,7 @@ msgid "Email address"
 msgstr "電�郵件地�"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 會使用此電�郵件地�，在伺�器驗證你的身份。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1027,29 +1039,19 @@ msgid "Search filter"
 msgstr "�尋�濾器"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
+msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
 msgstr "�尋�濾器是在進行�尋時使用的物件類型。如果此項沒有被修改，�設的�尋目標是「person�物件類型。"
 
 #: ../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."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
 msgstr "��此�項表示，Evolution �會連線到你的 LDAP 伺�器 (如果你的 LDAP 伺�器支� 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."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
 msgstr "��此�項表示，Evolution �會連線到你的 LDAP 伺�器 (如果你的 LDAP 伺�器支� 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."
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "��此�項表示，你的伺�器�支� SSL 或 TLS。這表示你的連線將�安全，而且你的安全有�洞。 "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
@@ -1069,50 +1071,31 @@ msgid "TLS encryption"
 msgstr "TLS 加密"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr "�尋基礎是指項目的�辨識�稱 (DN)，�尋會由此處開始。如果此處空白，�尋會在目錄樹的底層開始。"
 
 #: ../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."
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr "�尋範�會定義你想從網絡目錄樹往下延伸�尋的深度。\"sub\" 的�尋範�會包括�尋基礎底下所有的項目。「一個�的�尋範��會包括基礎底下的一個層級。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "這是你的 ldap 伺�器的完整�稱。例如：「ldap.mycompany.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."
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 msgstr "這是�下載項目的數目上�。將此數字設定�太大會減慢通訊錄的速度。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr "這是 Evolution 將�用來驗證你的方法。注��設定此項至「電�郵件���需�你的 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. "
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
 msgstr "這是此伺�器的�稱，會顯示在你的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
 #: ../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."
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr "這是 LDAP 伺�器上的埠，Evolution 會嘗試連線到這個地方。已�供標準埠清單。請洽詢你的系統管�員，瞭解你應該指定的埠。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
@@ -1180,10 +1163,12 @@ msgstr "�片"
 #: ../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
+#: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "分�"
 
@@ -1224,7 +1209,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:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1236,16 +1221,16 @@ msgid "Ca_tegories..."
 msgstr "分類(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../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
 msgid "Contact"
 msgstr "�絡人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "�絡人編輯器"
 
@@ -1258,7 +1243,7 @@ msgid "Image"
 msgstr "圖片"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1271,7 +1256,7 @@ msgid "Nic_kname:"
 msgstr "網�(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
@@ -1286,7 +1271,7 @@ msgstr "電話"
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1311,8 +1296,8 @@ msgid "_Birthday:"
 msgstr "生日(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
@@ -1402,16 +1387,16 @@ msgstr "通訊錄(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "郵��號(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 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:293
+#: ../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
@@ -1420,980 +1405,981 @@ msgstr "地�"
 #: ../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
+#: ../widgets/table/e-cell-text.c:1836
+#: ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "�編輯的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "美國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "阿爾巴尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "阿爾�利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "美屬薩摩亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "安�爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "安哥拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "安圭拉島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "�極洲"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "安�瓜和巴布�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "亞美尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "阿盧巴島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "澳大利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "亞塞拜彊"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "巴哈馬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "å·´æž—"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "巴巴多斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "白俄羅斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "伯利兹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "�寧"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "百慕�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "�丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "玻利維亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "波斯尼亞-赫�格維�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "�茨瓦�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "波維特島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "英屬�度洋地�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "汶�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "�加利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "布基�法索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "布隆迪"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "柬埔寨王國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "喀麥隆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "佛得角島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "開曼羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "中�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "�得"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "智利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "中國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "�誕島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "��斯羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "哥倫比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "科摩羅"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "剛果共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "剛果共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "科克羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "哥斯�黎加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "象牙海岸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "克羅地亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "�巴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "賽浦路斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "�克共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "丹麥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "�布�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "多明尼克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "多明尼加共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "厄瓜多爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "埃�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "赤�畿內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "厄立特里亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "埃塞俄比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "�克蘭羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "法羅羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "�濟羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "法國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "法屬圭亞那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "法屬玻利尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "法屬�部屬地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "加蓬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "岡比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "格魯�亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "德國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "加�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "直布羅陀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "希臘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "格陵蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "格林��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "瓜德魯普島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "關島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "�地馬拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "根�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "畿內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "畿內亞比紹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "圭亞那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "海地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "赫德�麥當勞羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "梵蒂岡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "洪都拉斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "香港"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "冰島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "�度"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "�尼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "伊朗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "�島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "以色列"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "�大利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "日本"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "澤西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ç´„æ—¦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "肯雅"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "基里巴斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "北韓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "韓國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "科�特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "�爾�斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "寮國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "�索托"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "利比里亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "利比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "盧森堡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "澳門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "馬�加斯加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "馬拉維"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "馬爾代夫"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "馬里"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "馬爾他"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "馬紹爾羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "法屬馬�尼克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "毛里塔尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "毛里裘斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "美亞特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "密克羅尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "摩爾多瓦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "摩�哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "蒙�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "蒙瑟拉特島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "莫桑比克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "緬甸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "�米比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "瑙魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "尼泊爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "�蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "�屬安的列斯羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "新喀里多尼亞島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "新西蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "尼日爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "尼日利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "��島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "諾�克羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "北馬里亞�羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "挪�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "阿曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "巴基斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "帕勞羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "巴勒斯�地�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "巴布亞新畿內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "秘魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "�律賓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "皮特康"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "葡�牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "波多黎�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "�塔爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "留尼旺"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "ä¿„ç¾…æ–¯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "盧旺�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "�基茨島�尼維斯聯邦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "�盧西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "�文森特和格林內�斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "薩摩亞羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "�馬力諾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "�多美和普林西比"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "沙地阿拉伯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "塞內加爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "塞爾維亞和黑山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "塞舌爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "新加�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "斯洛�克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "斯洛文尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "所羅門羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "索馬里"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "�格魯�亞��桑�奇羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "西�牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "斯里蘭�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "�赫勒拿島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "�匹�密啟倫羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "蘇丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "蘇里�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴�尖棉島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "斯�士蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "ç‘žå…¸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "敘利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "臺�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "塔�克斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "�桑尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "��汶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "多哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "托克勞羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "湯加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "�里�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "�尼斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "土庫曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "土克斯�開科斯羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "圖瓦盧"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "�干�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "�克蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "阿拉伯��酋長國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "美屬邊疆羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "�拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "�茲別克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "瓦努阿圖"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "越�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "英屬維爾京羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "美屬維爾京羣島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "沃里斯與�塔那島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "也門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "贊比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "津巴布韋"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../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
@@ -2405,118 +2391,119 @@ msgstr "津巴布韋"
 msgid "Name"
 msgstr "�稱"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 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:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 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:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
 msgid "Service"
 msgstr "�務"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
 #: ../calendar/gui/caltypes.xml.h:25
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../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
 msgid "Location"
 msgstr "�置"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "使用者�稱"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "�家"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "來�通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "是新�絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "�寫的欄�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "必�欄�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "請��代表此�絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2524,23 +2511,23 @@ msgstr ""
 "�絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s�是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "無效的�絡人。"
 
@@ -2740,7 +2727,7 @@ msgstr "�員(_M)"
 #: ../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:213
+#: ../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
 msgid "Book"
@@ -2764,9 +2751,7 @@ msgid "Duplicate Contact Detected"
 msgstr "�測到�複的�絡人"
 
 #: ../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?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr "此�絡人的�稱或電�郵件地�已經存在於此資料夾。無論如何都�新增它嗎？"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2800,19 +2785,22 @@ 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:415
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "電�郵件"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76
+#: ../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:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "電�郵件開始於"
 
@@ -2833,7 +2821,7 @@ msgstr[1] "%d 個�絡人"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../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
 msgid "Query"
@@ -2847,7 +2835,8 @@ msgstr "�得書本檢視時發生錯誤"
 #: ../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
+#: ../widgets/table/e-tree-selection-model.c:821
+#: ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "模型"
@@ -2856,15 +2845,15 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯�片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "�稱開始於"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "來�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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,92 +2861,99 @@ msgstr "來�"
 msgid "Type"
 msgstr "é¡žåž‹"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../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:1680 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1671
+#: ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "é–‹å•Ÿ(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "新增�絡人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "新增�絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "儲存� _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "轉寄�絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "轉寄�絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "傳�郵件給�絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "傳�郵件給清單(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "傳�郵件給�絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "打�(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../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:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2046
-#: ../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
+#: ../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
+#: ../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 "複製(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "任何分類"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "其他錯誤"
@@ -3133,8 +3129,10 @@ msgstr "網�"
 
 #: ../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
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../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
@@ -3142,23 +3140,29 @@ msgstr "網�"
 #: ../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/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../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
 msgid "Width"
 msgstr "闊度"
 
 #: ../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
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../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: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/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../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
 msgid "Height"
 msgstr "高度"
 
@@ -3270,7 +3274,8 @@ msgstr "已�擇"
 msgid "Has Cursor"
 msgstr "有游標"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "在�覽器內開啟連�(_O)"
 
@@ -3279,7 +3284,8 @@ msgstr "在�覽器內開啟連�(_O)"
 msgid "_Copy Link Location"
 msgstr "複製連���(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "傳�新郵件至(_S)…"
 
@@ -3323,9 +3329,8 @@ msgstr "視�交談"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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
@@ -3339,7 +3344,7 @@ msgstr "行事曆"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
@@ -3361,14 +3366,18 @@ msgid "Web Log"
 msgstr "網誌"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/e-calendar-view.c:2343
+#: ../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:2353
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -3440,7 +3449,8 @@ msgstr "通訊�定�支�"
 #: ../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-calendar-table.c:643
+#: ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "已�消"
 
@@ -3481,40 +3491,37 @@ msgstr "無法在離線模�下使用"
 msgid "Invalid server version"
 msgstr "無效的伺�器版本"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
-msgid ""
-"We were unable to open this addressbook. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "�支�的驗證方法"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
 msgstr "我們無法開啟這個通訊錄。這�能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模��次讀�通訊錄以下載它的內容"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
-msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
+msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是�存在而且你有權�存�它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示你輸入錯誤的 URI，或無法連線 LDAP 伺�器。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-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."
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
 msgstr "此 Evolution 版本未編譯 LDAP 支�。如果你若想在 Evolution 使用 LDAP，必須安�啟用 LDAP 的 Evolution 套件。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示你輸入錯誤的URI，或伺�器無法連線。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "詳細的錯誤："
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3526,7 +3533,7 @@ msgstr ""
 "請使用更加明確的查詢或是�高此目錄�務的目錄\n"
 "伺�器�好設定中的�果上�。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3538,45 +3545,45 @@ msgstr ""
 "或是�高此目錄�務的目錄伺�器�好設定中的\n"
 "�果上�。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄�務的後端程�無法解�這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄�務的後端程�拒絕執行這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全�功。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "新增�絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "修改�絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "移除�絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3585,18 +3592,22 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
+"開啟 %d 個�絡人會�時開啟 %d 個新視窗。\n"
+"確定�顯示這個�絡人？"
 msgstr[1] ""
+"開啟 %d 個�絡人會�時開啟 %d 個新視窗。\n"
+"確定�顯示這些�絡人？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "��顯示(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "顯示所有的�絡人(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3605,65 +3616,65 @@ msgstr ""
 "%s 已經存在\n"
 "你是��覆寫它？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "個�絡人"
 msgstr[1] "個�絡人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "�擇通訊錄"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "清單"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "將�絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "複製�絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "將�絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "複製�絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "多� vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "%s çš„ vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "�絡人資訊"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的�絡人資訊"
@@ -3700,7 +3711,8 @@ msgstr "�片檢視模�"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:671
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "匯入..."
 
@@ -3785,7 +3797,8 @@ 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:503
+#: ../mail/em-mailer-prefs.c:432
+#: ../widgets/table/e-table-click-to-add.c:503
 #: ../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
@@ -3989,9 +4002,7 @@ msgid "Export in asynchronous mode"
 msgstr "在��步模�匯出"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "��步模�下，一個輸出檔案中的�片數目，�設大�是 100。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
@@ -3999,8 +4010,7 @@ msgid "NUMBER"
 msgstr "數目"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help �項來查看用法。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:116
@@ -4021,28 +4031,20 @@ msgstr "未處�的錯誤"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
+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}�是一個唯讀的行事曆並且�能被修改。請從行事曆檢視的�邊欄中�擇��的行事曆。"
 
 #. 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."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
 msgstr "「{0}�是一個唯讀的行事曆來�。請��一個能加入約會的行事曆。"
 
 #: ../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."
+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:6
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+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:7
@@ -4054,9 +4056,7 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "會刪除此備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "會刪除這些約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4064,13 +4064,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "會刪除這些工作的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "會刪除此約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4110,19 +4108,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "確定�刪除此約會？"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確定�刪除此工作？"
@@ -4176,14 +4174,11 @@ msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
 #: ../calendar/calendar.error.xml.h:37
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "電�郵件邀請會傳�給所有�與者並讓他們接�此工作。"
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "電�郵件邀請函會傳�給所有�與者並讓他們回覆。"
 
 #: ../calendar/calendar.error.xml.h:39
@@ -4199,45 +4194,31 @@ msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
 #: ../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."
+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:43
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+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:44
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+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:45
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "傳�更新的資訊�許其他�與者�有最新的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "傳�更新的資訊讓其他�與者�有最新的工作清單。"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "這�有一些需�下載的附件。儲存此約會將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "這�有一些需�下載的附件。儲存此工作將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:49
@@ -4317,10 +4298,7 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "�傳�更新的工作資訊給�與者？"
 
 #: ../calendar/calendar.error.xml.h:68
-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."
+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 "你正連線到�支�的 GroupWise 伺�器而且�能�到使用 Evolution 的�題。最好的解決方案是將該伺�器�級至支�的版本。"
 
 #: ../calendar/calendar.error.xml.h:69
@@ -4352,7 +4330,8 @@ msgstr "�新啟動 Evolution 之�，無法使用你的工作。"
 msgid "_Discard Changes"
 msgstr "放棄更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76
+#: ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -4361,7 +4340,8 @@ msgid "_Save Changes"
 msgstr "儲存更改(_S)"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../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 "傳�(_S)"
@@ -4417,12 +4397,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀� pilot 待辦事項程��塊"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "行事曆"
 
@@ -4463,18 +4444,24 @@ msgid "Memo_s"
 msgstr "備忘錄(_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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../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:353
 #: ../calendar/gui/memos-control.c:369
 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:1574 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4499,25 +4486,27 @@ msgstr "工作(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知�務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分�"
 msgstr[1] "分�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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
+#: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "�時"
 msgstr[1] "�時"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "開始時刻"
 
@@ -4528,8 +4517,8 @@ msgstr "約會"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4540,14 +4529,18 @@ msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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:167
 #: ../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
+#: ../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 "編輯(_E)"
@@ -4560,32 +4553,32 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 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
 msgid "No description available."
 msgstr "沒有�用的�述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "沒有�用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "你有 %d 個鬧鈴"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
-#: ../mail/mail-component.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4597,11 +4590,10 @@ msgstr ""
 "�出電�郵件。  Evolution 會顯示\n"
 "普通的�醒�話盒來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -4614,7 +4606,7 @@ msgstr ""
 "\n"
 "你確定�執行這個程�？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "���詢�我關於這個程�。"
 
@@ -4623,9 +4615,7 @@ msgid "Could not initialize Bonobo"
 msgstr "無法�始化 Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "無法建立�音�醒�務元件工廠，也許它已經在執行中..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
@@ -4633,7 +4623,8 @@ msgid "invalid time"
 msgstr "失效時間"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4642,7 +4633,8 @@ msgstr[0] "%d �時"
 msgstr[1] "%d �時"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:72
+#: ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4653,7 +4645,8 @@ msgstr[1] "%d 分"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:76
+#: ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4682,8 +4675,7 @@ msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用�設值)。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -4815,39 +4807,27 @@ msgid "Overdue tasks color"
 msgstr "�期的工作色彩"
 
 #: ../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."
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 msgstr "水平窗格的�置，當�在月檢視中時，在日期導覽行事曆與工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "水平窗格的�置，在月檢視中的視窗與日期導覽行事曆�工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "垂直窗格的�置，在行事曆清單與日期導覽行事曆之間。"
 
 #: ../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."
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "垂直窗格的�置，在工作清單與工作�覽窗格之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "垂直窗格的�置，在月檢視中的視窗與日期導覽行事曆�工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h: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."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 msgstr "垂直窗格的�置，當�在月檢視中時，在日期導覽行事曆與工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
@@ -4914,15 +4894,11 @@ msgstr "工作垂直窗格�置"
 
 #: ../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."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
 msgstr "作為空閒/忙碌資料回饋之用的網�範本，%u �以電�郵件��的使用者�稱部分來�代，而 %d �替�為網域�稱。"
 
 #: ../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\"."
+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 "用於行事曆中日期與時刻的�設時�，未翻譯的 Olsen 時�資料庫�置就� \"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
@@ -4934,14 +4910,12 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "時�"
 
 #: ../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)."
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
 msgstr "行事曆檢視中的事件�明化效果，數值介於 0 (完全�明)到 10 (��明)之間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
@@ -4953,8 +4927,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "�設�醒單�，「分���「�時�或「日�。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱�工作的單�，「分���「�時�或「日�。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
@@ -4978,9 +4951,7 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是��求確�。"
 
 #: ../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."
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "是�壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空�中。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
@@ -4988,8 +4959,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "是�在週�月的檢視內顯示約會的��時間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是�在行事曆中繪出 Marcus Bains 線（代表目�時刻的直線）。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5017,8 +4987,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是�在事件/工作/會議編輯器中顯示 狀態 欄�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是�使用 24 �時制時間而�是使用上�/下�。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5061,71 +5030,72 @@ msgstr "工作日開始分�"
 msgid "daylight savings time"
 msgstr "日光節約時間"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "主旨包�"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "�述包�"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "分類為"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "備註包�"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "�置包�"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629
+#: ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "�期的工作"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "已完�的工作 "
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "有附加檔案的工作"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
 # zh_HK: msgstr "打�"
-#: ../calendar/gui/calendar-commands.c:92 ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../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
-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."
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr "此作業會永久性刪除比��時間還舊的所有事件。如果你繼續，將無法復原這些事件。"
 
 #: ../calendar/gui/calendar-commands.c:323
@@ -5133,10 +5103,12 @@ msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
 #: ../calendar/gui/calendar-commands.c:328
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../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:717
+#: ../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 "天"
@@ -5145,47 +5117,51 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:232
+#: ../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 "在網站上"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310
+#: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天氣"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�級行事曆失敗。"
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆�用來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "行事曆來��擇器"
 
@@ -5193,6 +5169,11 @@ msgstr "行事曆來��擇器"
 msgid "New appointment"
 msgstr "新增約會"
 
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
+msgid "_Appointment"
+msgstr "約會(_A)"
+
 #: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
@@ -5201,6 +5182,11 @@ msgstr "建立一個新的約會"
 msgid "New meeting"
 msgstr "新增會議"
 
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
+msgid "M_eeting"
+msgstr "會議(_E)"
+
 #: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "建立新會議�求"
@@ -5209,6 +5195,11 @@ msgstr "建立新會議�求"
 msgid "New all day appointment"
 msgstr "新的全日約會"
 
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "全日約會(_P)"
+
 #: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
@@ -5217,6 +5208,11 @@ msgstr "建立新的全日約會"
 msgid "New calendar"
 msgstr "新行事曆"
 
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "行事曆(_N)"
+
 #: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
@@ -5237,13 +5233,16 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 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/caltypes.xml.h:4
+#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "附加檔案"
 
@@ -5253,133 +5252,163 @@ msgstr "附加檔案"
 msgid "Attendee"
 msgstr "到會者"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/memotypes.xml.h:6
 #: ../calendar/gui/tasktypes.xml.h:9
 msgid "Business"
 msgstr "商務"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Category"
 msgstr "分類"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "分類"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
 #: ../calendar/gui/tasktypes.xml.h:12
 msgid "Competition"
 msgstr "競爭者"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../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/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "機密"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../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
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "�述:"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:12
 #: ../calendar/gui/tasktypes.xml.h:15
 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/caltypes.xml.h:14
+#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/em-filter-i18n.h:22
 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/caltypes.xml.h:15
+#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "存在"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Favourites"
 msgstr "喜好"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../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/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:20
 msgid "Goals/Objectives"
-msgstr ""
+msgstr "終點/目標"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:22
 msgid "Holiday"
 msgstr "�日"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../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/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:20
 #: ../calendar/gui/tasktypes.xml.h:24
 msgid "Hot Contacts"
 msgstr "熱門�絡人"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:21
 #: ../calendar/gui/tasktypes.xml.h:25
 msgid "Ideas"
 msgstr "點�"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/caltypes.xml.h:23
+#: ../calendar/gui/memotypes.xml.h:22
 #: ../calendar/gui/tasktypes.xml.h:27
 msgid "International"
 msgstr "國際的"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/caltypes.xml.h:24
+#: ../calendar/gui/memotypes.xml.h:23
 #: ../calendar/gui/tasktypes.xml.h:28
 msgid "Key Customer"
 msgstr "關�客戶"
 
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/caltypes.xml.h:26
+#: ../calendar/gui/memotypes.xml.h:24
 #: ../calendar/gui/tasktypes.xml.h:30
 msgid "Miscellaneous"
 msgstr "其它"
 
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#: ../calendar/gui/caltypes.xml.h:27
+#: ../calendar/gui/tasktypes.xml.h:31
 msgid "Next 7 days"
 msgstr "接下來 7 天"
 
 #: ../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
+#: ../calendar/gui/memotypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:34
 msgid "Organizer"
 msgstr "會議�集人"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:30
+#: ../calendar/gui/memotypes.xml.h:28
 #: ../calendar/gui/tasktypes.xml.h:36
 msgid "Phone Calls"
 msgstr "電話"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../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/memotypes.xml.h:29
 msgid "Private"
 msgstr "�人"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../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: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
 msgid "Public"
 msgstr "公開"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:297
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -5387,12 +5416,15 @@ msgstr "週期性"
 #: ../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:70 ../mail/message-list.etspec.h:17
+#: ../calendar/gui/memotypes.xml.h:31
+#: ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "狀�"
 
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/caltypes.xml.h:35
+#: ../calendar/gui/memotypes.xml.h:32
 #: ../calendar/gui/tasktypes.xml.h:39
 msgid "Strategies"
 msgstr "ç­–ç•¥"
@@ -5400,54 +5432,68 @@ msgstr "ç­–ç•¥"
 #: ../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/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
 msgid "Summary"
 msgstr "摘�"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/caltypes.xml.h:37
+#: ../calendar/gui/memotypes.xml.h:34
 #: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "摘�包�"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/caltypes.xml.h:38
+#: ../calendar/gui/memotypes.xml.h:35
 #: ../calendar/gui/tasktypes.xml.h:42
 msgid "Suppliers"
 msgstr "供應商"
 
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:39
+#: ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
 msgstr "時間 &amp; 花費"
 
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../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/caltypes.xml.h:41
+#: ../calendar/gui/memotypes.xml.h:38
 #: ../calendar/gui/tasktypes.xml.h:46
 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/caltypes.xml.h:42
+#: ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47
+#: ../mail/em-filter-i18n.h:10
 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/caltypes.xml.h:43
+#: ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48
+#: ../mail/em-filter-i18n.h:16
 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/caltypes.xml.h:44
+#: ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49
+#: ../mail/em-filter-i18n.h:30
 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/caltypes.xml.h:45
+#: ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "�是"
 
@@ -5463,11 +5509,12 @@ msgstr "開啟行事曆時�支�方法"
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許�權來開啟行事曆"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429
+#: ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "�明的錯誤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
@@ -5570,10 +5617,7 @@ msgstr "�醒間隔�"
 msgid "hour(s)"
 msgstr "�時"
 
-#. Translators: This is the second half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "分�"
 
@@ -5581,7 +5625,7 @@ msgstr "分�"
 msgid "start of appointment"
 msgstr "約會開始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -5595,12 +5639,12 @@ msgstr "加入(_A)"
 msgid "Alarms"
 msgstr "鬧鈴"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
@@ -5624,8 +5668,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u 與 %d 會被替�為電�郵件��中的使用者與網域�稱。</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5761,7 +5804,7 @@ msgid "Thursday"
 msgstr "星期四"
 
 #: ../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 "時�(_Z):"
 
@@ -5903,46 +5946,46 @@ msgstr "備忘錄清單屬性"
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "這項工作已刪除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "這個備忘錄已刪除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  你已經�了些更改。放棄這些更改並且關閉這個編輯器？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  你沒有�任何更改，關閉這個編輯器？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "這個事件已更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "這項工作已更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "這個備忘錄已更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  你已經�了些更改。放棄這些更改並且更新這個編輯器？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  你沒有�任何更改，更新這個編輯器？"
@@ -5952,292 +5995,310 @@ msgstr "%s  你沒有�任何更改，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確�上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:182
+#: ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:186
+#: ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (已完�) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:188
+#: ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "已完� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr "(期�)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "期� "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊� - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊�"
 msgstr[1] "附加 %d 個訊�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2047
+#: ../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
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483
+#: ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008
+#: ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "�消拖拉(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../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
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "沒有摘�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "按這�以關閉目�視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "複製��的文字至剪貼簿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "剪下��的文字至剪貼簿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "按這�以檢視�用的說明"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "按這�以儲存目�視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "��所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "�入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "�項(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../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 "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 #: ../composer/e-composer-actions.c:472
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "按這�以附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "切�是�顯示「分類�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "時�(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "切�是�顯示「時��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "歸類為�人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "角色欄�(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "切�是�顯示「角色�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切�是�顯示「RSVP�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "狀態欄�(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "切�是�顯示「狀態�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "類型欄�(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切�是�顯示「到會者類型�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent Docu_ments"
 msgstr "最近使用文件(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../calendar/gui/dialogs/comp-editor.c:1785
 #: ../composer/e-composer-actions.c:700
 msgid "Attach"
 msgstr "附加"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "隱�附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "顯示附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "移除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2194
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "顯示附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "按下空白�切�附加檔案列"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄�此項目所�的更改"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "無法使用目�的版本�"
 
@@ -6253,55 +6314,55 @@ msgstr "無法開啟目的地"
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "是�刪除其他所有收件者信箱中的這個項目(_D)？"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除事件。"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除該備忘錄。"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除項目。"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "因為許�全被拒絕，所以無法刪除事件。"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "因為許�全被拒絕，所以無法刪除工作。"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "因為許�權被拒絕，所以無法刪除該備忘錄。"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "因為許�權被拒絕，所以無法刪除項目。"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除事件。"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除該備忘錄。"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除項目。"
 
@@ -6318,179 +6379,183 @@ msgstr "委託給："
 msgid "Enter Delegate"
 msgstr "輸入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:194
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "Click here to set or unset alarms for this event"
 msgstr "按這�以設定或�消這個事件的鬧鈴"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Recurrence"
 msgstr "週期性(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Make this a recurring event"
 msgstr "將此項設為循環事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "傳��項"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "Insert advanced send options"
 msgstr "�入進階傳��項"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "Toggles whether to have All Day Event"
 msgstr "切�是��有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "切�是�將時間顯示為忙碌"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "這個事件具有鬧鈴"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "會議�集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "代�者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "無��日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "��日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "��時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "��的�集人已經沒有帳號。"
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "需�一個�集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "最少需�一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "新增(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "你正擔任 %s 的代�人"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "自�"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158
+#: ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685
+#: ../mail/em-account-editor.c:1409
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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-signature-combo-box.c:69
 msgid "None"
@@ -6517,23 +6582,25 @@ msgid "Custom Alarm:"
 msgstr "自�鬧鈴:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "�述(_E):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件�述"
 
-#: ../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 "摘�(_M):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "鬧鈴(_A)"
 
+#: ../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 "�述(_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "時間(_T):"
@@ -6571,7 +6638,8 @@ msgstr "�絡人(_N)..."
 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:2476
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -6580,10 +6648,14 @@ msgstr "備忘錄"
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s�開啟備忘錄。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
-#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002
+#: ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620
+#: ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77
+#: ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "收件者"
 
@@ -6596,10 +6668,6 @@ msgstr "開始日(_R):"
 msgid "T_o:"
 msgstr "收件者(_O):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "�述(_D):"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -6836,17 +6904,21 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #: ../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-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:642
+#: ../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
 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:1064
+#: ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "高"
 
@@ -6856,21 +6928,25 @@ msgstr "高"
 #: ../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-calendar-table.c:641
+#: ../calendar/gui/print.c:2549
 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:1062
+#: ../calendar/gui/e-calendar-table.c:569
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 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:966 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "正常"
 
@@ -6879,7 +6955,8 @@ msgstr "正常"
 #: ../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-calendar-table.c:640
+#: ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "未開始"
@@ -6893,7 +6970,8 @@ msgid "Stat_us:"
 msgstr "狀態(_U):"
 
 #: ../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:570
+#: ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "未指定"
 
@@ -6910,24 +6988,24 @@ msgstr "優先順�(_P):"
 msgid "_Web Page:"
 msgstr "網�(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:111
 msgid "_Status Details"
 msgstr "狀態詳細資料(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "Click to change or view the status details of the task"
 msgstr "按這�改變/檢視該工作的狀態詳細資料"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:121
 #: ../composer/e-composer-actions.c:528
 msgid "_Send Options"
 msgstr "傳��項(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "工作詳細資料"
 
@@ -6954,17 +7032,13 @@ msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "�述(_S):"
+msgid "D_ue date:"
+msgstr "到期日(_U):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "時�:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "到期日(_D):"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7042,13 +7116,15 @@ msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-preview.c:73
+#: ../mail/em-folder-view.c:3315
 #, c-format
 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:857
 msgid "Untitled"
 msgstr "未命�"
 
@@ -7061,7 +7137,8 @@ msgstr "開始日期："
 #: ../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
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "�述:"
@@ -7124,15 +7201,18 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:976
 #: ../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: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 "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:976
 #: ../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
@@ -7140,51 +7220,65 @@ msgid "No"
 msgstr "�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../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-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:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../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
 #: ../plugins/plugin-manager/plugin-manager.c:73
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "�明"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "循環模�"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183
+#: ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "�存新檔..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
+#: ../calendar/gui/e-cal-popup.c:199
+#: ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "�擇用來儲存�定的附加檔案的資料夾..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231
+#: ../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:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../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
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:561
+#: ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "�存新檔(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286
+#: ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
@@ -7192,7 +7286,8 @@ msgstr "設為背景(_B)"
 msgid "_Save Selected"
 msgstr "儲存��的(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428
+#: ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -7203,7 +7298,7 @@ msgstr "* 沒有摘� *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "�集人: %s <%s>"
@@ -7211,7 +7306,7 @@ 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:2228
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議�集人: %s"
@@ -7269,55 +7364,68 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:665
+#: ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "刪除�定的物件"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:795
+#: ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "更新物件"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-view.c:1221
+#: ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "�存新檔..."
 
 #: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "開啟網�(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "打�(_R)..."
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1677
+#: ../calendar/gui/e-memo-table.c:931
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
 #: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-memo-table.c:933
+#: ../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 "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCale_ndar 轉寄"
@@ -7374,93 +7482,97 @@ msgstr "優先順�"
 msgid "Start date"
 msgstr "開始日期"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "移動項目"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "目�檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "�擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "�擇日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "打�(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689
+#: ../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 "回覆所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示��移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "�置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -7499,19 +7611,23 @@ 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:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../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
 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:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/e-day-view.c:791
+#: ../calendar/gui/e-week-view.c:528
 #: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "上�"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/e-day-view.c:794
+#: ../calendar/gui/e-week-view.c:531
 #: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "下�"
@@ -7597,7 +7713,8 @@ msgstr "��"
 msgid "Due"
 msgstr "截止"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
@@ -7606,54 +7723,55 @@ msgstr "iCalendar 資訊"
 msgid "iCalendar Error"
 msgstr "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
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "�明人士"
 
 #. 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."
+msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下�的�單中�擇一個動作。"
 
 #: ../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/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "接�"
 
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "暫時接�"
 
 #: ../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:2041
+#: ../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
 msgid "Declined"
 msgstr "婉拒"
 
 #: ../calendar/gui/e-itip-control.c:1283
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "會議已經�消，但是在你的行事曆中找�到"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經�消，但是在你的工作清單中找�到"
 
 #: ../calendar/gui/e-itip-control.c:1363
@@ -7716,7 +7834,8 @@ msgstr "<b>%s</b> 已經消�會議。"
 msgid "Meeting Cancelation"
 msgstr "會議�消"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../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."
@@ -7858,15 +7977,17 @@ msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態�能更新，因為項目已經�存在"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2111
+#: ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "項目傳��\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2117
+#: ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "無法傳�這個項目�\n"
 
@@ -7904,7 +8025,8 @@ msgstr "更新回應狀態"
 msgid "Send Latest Information"
 msgstr "�出最新資訊"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
+#: ../calendar/gui/e-itip-control.c:2470
+#: ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "�消"
@@ -7954,69 +8076,83 @@ msgid "Attendees"
 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:86
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740
+#: ../calendar/gui/print.c:981
 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/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
 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/e-meeting-store.c:90
+#: ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:983
 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/e-meeting-store.c:92
+#: ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:984
 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/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:998
 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:123
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/print.c:999
 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/e-meeting-store.c:125
+#: ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:1000
 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/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../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:171
+#: ../calendar/gui/e-meeting-store.c:194
 #: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 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-store.c:177
+#: ../calendar/gui/e-meeting-store.c:200
 #: ../calendar/gui/e-meeting-time-sel.c:397
 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/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "已委派"
 
@@ -8031,7 +8167,8 @@ msgstr "到會者"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "進行中"
 
@@ -8149,12 +8286,14 @@ msgstr "�員"
 msgid "_Delete Selected Memos"
 msgstr "刪除�定的備忘錄(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這�增加新的備忘錄"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../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"
@@ -8172,7 +8311,8 @@ msgstr "正在載入備忘錄"
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1062
+#: ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "正在刪除�定的物件..."
 
@@ -8193,54 +8333,51 @@ msgstr "正在完�工作..."
 msgid "Expunging"
 msgstr "除去中"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 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:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:348
+#: ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "正在更新查詢"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "自�檢視(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "儲存自�檢視(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "é–‹å•Ÿ %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "清除"
 
@@ -8300,7 +8437,8 @@ msgstr "�月"
 msgid "_Select Today"
 msgstr "�擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../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 "必須指定一個�集人。"
@@ -8309,19 +8447,23 @@ msgstr "必須指定一個�集人。"
 msgid "At least one attendee is necessary"
 msgstr "至少需�一個到會者"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626
+#: ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628
+#: ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
@@ -8354,38 +8496,39 @@ msgstr "iCalendar 資訊"
 msgid "You must be an attendee of the event."
 msgstr "你必須是此事件的到會者。"
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 msgstr[1] "%d 項備忘錄"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546
+#: ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已�擇 %d 個"
 msgstr[1] "，已�擇 %d 個"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "�級備忘錄失敗。"
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s�來建立事件和會議"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "沒有�用的行事曆來建立備忘錄"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "備忘錄來��擇器"
 
@@ -8393,6 +8536,11 @@ msgstr "備忘錄來��擇器"
 msgid "New memo"
 msgstr "新增備忘錄"
 
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
+msgid "Mem_o"
+msgstr "備忘錄(_O)"
+
 #: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
@@ -8401,6 +8549,11 @@ msgstr "建立新的備忘錄"
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "共用備忘錄(_S)"
+
 #: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
@@ -8409,12 +8562,18 @@ msgstr "建立新的共用備忘錄"
 msgid "New memo list"
 msgstr "新備忘錄清單"
 
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
+msgid "Memo li_st"
+msgstr "備忘錄清單(_S)"
+
 #: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
 # zh_HK: msgstr "打�備忘錄"
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "打�備忘錄"
 
@@ -8424,8 +8583,7 @@ msgstr "接下來 7 天"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"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 ""
@@ -8435,8 +8593,7 @@ msgstr ""
 
 #: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -8445,7 +8602,8 @@ msgstr ""
 "當 Evolution 移轉你的資料夾時，請�心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:775
+#: ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
@@ -8673,31 +8831,31 @@ msgstr "�絡人: "
 msgid "Upcoming Appointments"
 msgstr "�將開始的約會"
 
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 msgstr[1] "%d 項工作"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "�級工作失敗。"
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有�用的行事曆來建立工作"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "工作來��擇器"
 
@@ -8705,6 +8863,11 @@ msgstr "工作來��擇器"
 msgid "New task"
 msgstr "新增工作"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "工作(_T)"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "建立一個新的工作"
@@ -8713,6 +8876,11 @@ msgstr "建立一個新的工作"
 msgid "New assigned task"
 msgstr "新指定的工作"
 
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "指派的工作(_D)"
+
 #: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
@@ -8721,14 +8889,18 @@ msgstr "建立新指定的工作"
 msgid "New task list"
 msgstr "新工作清單"
 
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
+msgid "Tas_k list"
+msgstr "工作清單(_K)"
+
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
 #: ../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"
+"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 ""
@@ -8736,11 +8908,13 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:455
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "���顯示這個訊�。"
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "打�工作"
 
@@ -8757,11 +8931,13 @@ 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:34
 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:35
 msgid "is less than"
 msgstr "�於"
 
@@ -8771,7 +8947,7 @@ msgstr "約會和會議"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
@@ -10357,7 +10533,8 @@ msgstr "未命�的郵件"
 msgid "Attach a file"
 msgstr "附加檔案"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:479
+#: ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "關閉(_C)"
@@ -10366,16 +10543,22 @@ msgstr "關閉(_C)"
 msgid "Close the current file"
 msgstr "關閉目�檔案"
 
-#: ../composer/e-composer-actions.c:486 ../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
+#: ../composer/e-composer-actions.c:486
+#: ../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 "打�(_P)..."
 
-#: ../composer/e-composer-actions.c:493 ../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
+#: ../composer/e-composer-actions.c:493
+#: ../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 "�覽打�(_V)"
 
@@ -10540,9 +10723,7 @@ msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
 #: ../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"
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
 msgstr "輸入郵件密件副本的收件者，他們會收到這�郵件但�會出�在郵件的收件者清單"
 
 #: ../composer/e-composer-header-table.c:645
@@ -10597,47 +10778,44 @@ msgstr "按一下這�，���張貼的資料夾"
 msgid "Recent _Documents"
 msgstr "最近使用文件(_D)"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180
+#: ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:873
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:872
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署�出的郵件：此帳號沒有設定簽署證書"
 
-#: ../composer/e-msg-composer.c:880
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+#: ../composer/e-msg-composer.c:879
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "無法加密�出的郵件：沒有設定加密證書(此帳號)"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
-#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 msgstr[1] "附件"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "隱�附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573
+#: ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4056
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:4055
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>（郵件編輯器包��能編輯的�文字的郵件內文。）<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 "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
 msgstr "這�有一些附件�下載。傳�此郵件將無法一併寄出接下來的附件"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -10645,9 +10823,7 @@ msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "確定�放棄正在撰寫，標題為 ‘{0}’ 的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -10659,10 +10835,7 @@ msgid "Because &quot;{1}&quot;."
 msgstr "因為「{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."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
 msgstr "除�你�擇儲存郵件至「�稿�資料夾，�則關閉此撰寫視窗會永久放棄郵件。儲存�稿�以讓你以後�繼續撰寫郵件。"
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -10702,15 +10875,11 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{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."
+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 �外��。復原郵件�以讓你從原來中斷的地方繼續。"
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
-"accounts."
+msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
 msgstr "傳�僅用於 Novell Groupwise 與 Microsoft Exchange 帳號的�項。"
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -10722,17 +10891,14 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "檔案 `{0}' �是一般檔案而且無法在郵件中傳�。"
 
 #: ../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."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
 msgstr "�附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔�加以附加它。"
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "無法啟動 HTML 編輯器控制。\n"
 "\n"
@@ -10766,7 +10932,7 @@ msgstr "繼續編輯(_C)"
 msgid "_Do not Recover"
 msgstr "��復原(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "復原(_R)"
 
@@ -10778,7 +10944,8 @@ msgstr "儲存�稿(_S)"
 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:738
 msgid "Groupware Suite"
 msgstr "Groupware 套�軟件"
 
@@ -10794,11 +10961,15 @@ 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:77
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:120
 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:79
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
@@ -10824,8 +10995,10 @@ msgstr "元件"
 msgid "Name of the component being logged"
 msgstr "已登入元件的�稱"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../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
 msgid "Enabled"
@@ -10844,11 +11017,11 @@ msgid "The printing system reported the following details about the error:"
 msgstr "打�系統回報下列關於此錯誤的詳細資訊："
 
 #: ../e-util/e-print.c:171
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "打�系統沒有回報任何關於此錯誤的�外資訊。"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "因為「{1}�。"
 
@@ -10872,10 +11045,15 @@ msgstr "檔案已存在「{0}�。"
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "無法顯示 Evolution 的求助文件。"
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "��(_M)"
@@ -10917,9 +11095,7 @@ 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."
+msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "伺�器上已存在�樣的標籤。請更改你的標籤�稱。"
 
 #: ../e-util/gconf-bridge.c:1218
@@ -11033,7 +11209,8 @@ msgstr[1] "%d 年後"
 msgid "<click here to select a date>"
 msgstr "<按這��擇日期>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:301
 #: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "�在"
@@ -11100,12 +11277,14 @@ msgstr "沒有回復或原始郵件"
 msgid "I_nclude threads"
 msgstr "包括郵件羣組(_N)"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044
+#: ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "內�"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044
+#: ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11129,7 +11308,8 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少檔案�稱。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "缺少�稱。"
 
@@ -11205,7 +11385,8 @@ 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:195
 msgid "seconds"
 msgstr "秒後"
 
@@ -11217,9 +11398,11 @@ msgstr "目�時間"
 msgid "the time you specify"
 msgstr "你所指定的時間"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
+#: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "週"
 
@@ -11244,8 +11427,7 @@ msgid "Composer Preferences"
 msgstr "郵件編輯器�好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "在此設定郵件的�好設定，包�安全性與郵件的顯示"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11288,10 +11470,13 @@ msgstr "Evolution 郵件優先設定控制"
 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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
@@ -11332,13 +11517,16 @@ msgstr ""
 " %s 授權�約\n"
 "並��核�方塊來接�它\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466
+#: ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 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:97
+#: ../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:97
 msgid "Autogenerated"
 msgstr "自動產生的"
 
@@ -11346,11 +11534,13 @@ msgstr "自動產生的"
 msgid "Ask for each message"
 msgstr "��郵件皆詢�"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810
+#: ../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:1859
+#: ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "接收電�郵件"
 
@@ -11362,34 +11552,41 @@ msgstr "自動檢查新郵件�(_N)"
 msgid "minu_tes"
 msgstr "分�(_T)"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2327
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "傳�電�郵件"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386
+#: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "�設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2452
+#: ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 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:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "接收�項"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "檢查新郵件"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932
+#: ../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:2932
+#: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助�"
 
@@ -11406,8 +11603,10 @@ msgstr "帳號�稱"
 msgid "Protocol"
 msgstr "通訊�定"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../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 "未命�的"
 
@@ -11423,7 +11622,8 @@ msgstr "新增簽署程�檔"
 msgid "Signature(s)"
 msgstr "簽�檔"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1148
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉�的郵件 --------"
 
@@ -11435,9 +11635,7 @@ msgstr "�明的寄件者"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:2007
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} �到："
 
 #: ../mail/em-composer-utils.c:2150
@@ -11491,8 +11689,10 @@ msgstr "�件日期"
 
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:767
-#: ../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-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 "刪除"
@@ -11541,7 +11741,8 @@ msgstr "詞�"
 msgid "Follow Up"
 msgstr "跟隨"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "��"
 
@@ -11569,7 +11770,8 @@ msgstr "未設定"
 msgid "is set"
 msgstr "設定"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40
+#: ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
@@ -11578,7 +11780,8 @@ msgstr "垃圾郵件"
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42
+#: ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "標籤"
 
@@ -11620,11 +11823,13 @@ 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:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:53
+#: ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "已閱讀"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件者"
 
@@ -11652,11 +11857,13 @@ msgstr "傳回�於"
 msgid "Run Program"
 msgstr "執行程�"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:61
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "目標"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "寄件者"
 
@@ -11692,9 +11899,12 @@ msgstr "以此開始"
 msgid "Stop Processing"
 msgstr "�止處�"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11713,51 +11923,51 @@ msgstr "接�根據"
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "從�尋建立�尋資料夾(_R)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "最近的郵件"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "有附加檔案的郵件"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "��郵件"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "�垃圾郵件"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "帳號�尋"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "所有的帳號�尋"
 
@@ -11776,14 +11986,17 @@ msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 msgstr[1] "所有郵件:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:193
+#: ../mail/em-folder-properties.c:195
 msgid "Quota usage"
 msgstr "�制用�"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
+#: ../mail/em-folder-properties.c:355
+#: ../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
 msgid "Inbox"
@@ -11807,32 +12020,60 @@ msgid "Folder _name:"
 msgstr "資料夾�稱(_N):"
 
 #. load store to mail component at the end, when everything is loaded
-#: ../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/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970
+#: ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "�尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:212
 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:161
 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:162
 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:163
 msgid "Sent"
 msgstr "已傳�"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:534
+#: ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "載入中..."
 
+#. 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:380
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (%u)"
+
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
@@ -11847,12 +12088,14 @@ msgstr "正在移動資料夾 %s"
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909
+#: ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911
+#: ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -11861,15 +12104,18 @@ msgstr "正在複製郵件至資料夾 %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存�"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:1003
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:1004
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718
+#: ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃�「%s�內的資料夾"
@@ -11887,7 +12133,8 @@ msgstr "新增資料夾(_N)..."
 msgid "_Move..."
 msgstr "移動(_M)..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114
+#: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "�新命�(_R)..."
 
@@ -11899,62 +12146,71 @@ msgstr "�新整�(_F)"
 msgid "Fl_ush Outbox"
 msgstr "清�寄件匣(_U)"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "清空回收筒(_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s�複製到「%s�"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "�擇資料夾"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "指定�建立資料夾的�置："
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "你沒有足夠的權�刪除此�郵件。"
 
-#: ../mail/em-folder-view.c:1329 ../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 "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../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 "轉寄(_F)"
 
 #. 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
+#: ../mail/em-folder-view.c:1335
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -12004,7 +12260,8 @@ msgstr "標籤(_L)"
 
 #. 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:484
 msgid "_None"
 msgstr "ç„¡(_N)"
 
@@ -12061,10 +12318,11 @@ msgstr "從通信論壇建立�濾器(_M)"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "�設值"
 
@@ -12129,99 +12387,89 @@ msgstr "下一個(_N)"
 msgid "M_atch case"
 msgstr "�分大�寫(_A)"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "未簽署"
 
 #: ../mail/em-format-html-display.c:947
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+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:650
+#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "有效的簽署"
 
 #: ../mail/em-format-html-display.c:948
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+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:651
+#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "無效的簽署"
 
 #: ../mail/em-format-html-display.c:949
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+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:652
+#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽署有效，但是無法檢驗寄件者"
 
 #: ../mail/em-format-html-display.c:950
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+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:653
+#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "簽署存在，但需�公開密碼匙"
 
 #: ../mail/em-format-html-display.c:951
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+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:659
+#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "未加密"
 
 #: ../mail/em-format-html-display.c:958
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+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:660
+#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "已加密，�嚴密"
 
 #: ../mail/em-format-html-display.c:959
-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."
+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:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "已加密"
 
 #: ../mail/em-format-html-display.c:960
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+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:662
+#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
 #: ../mail/em-format-html-display.c:961
-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."
+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:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視證書(_V)"
 
@@ -12229,83 +12477,83 @@ msgstr "檢視證書(_V)"
 msgid "This certificate is not viewable"
 msgstr "此證書無法檢視"
 
-#: ../mail/em-format-html-display.c:1370
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完�於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1378
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "到期日:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "隱�(_H)"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "符�闊度(_F)"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "顯示原始大�(_O)"
 
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "�存附加檔案為"
 
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "�擇用來儲存所有附加檔案的資料夾"
 
-#: ../mail/em-format-html-display.c:2037
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "儲存��的(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2104
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 個附件(_T)"
 msgstr[1] "%d 個附件(_T)"
 
-#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
+#: ../mail/em-format-html-display.c:2112
+#: ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "儲存(_A)"
 
-#: ../mail/em-format-html-display.c:2122
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-#: ../mail/em-format-html-display.c:2196
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "無附件"
 
-#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
+#: ../mail/em-format-html-display.c:2338
+#: ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "檢閱未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2339
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "隱�未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2394
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "以...開啟(_O)"
 
-#: ../mail/em-format-html-display.c:2465
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
+#: ../mail/em-format-html-display.c:2468
+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 無法顯示此�電�郵件，因為它已超出能處�的大�。你�以用�排版的方�或使用外部文字編輯器來閱讀它。"
 
 #: ../mail/em-format-html-print.c:156
@@ -12313,106 +12561,120 @@ msgstr "Evolution 無法顯示此å°�é›»å­�郵件，因為它已超出能處ç�†çš
 msgid "Page %d of %d"
 msgstr "第 %d / %d �"
 
-#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷� `%s'"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "未知的外加本文部分。"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "格��良的外加本文部分。"
 
-#: ../mail/em-format-html.c:962
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s�有效的指示"
 
-#: ../mail/em-format-html.c:975
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:996
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�端資料指示 (%s)"
 
-#: ../mail/em-format-html.c:1007
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�明的外部檔案指示 (「%s�類型)"
 
-#: ../mail/em-format-html.c:1235
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "格�化郵件"
 
-#: ../mail/em-format-html.c:1409
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "格�化郵件..."
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1563
+#: ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "副本"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "密件副本"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744
+#: ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1770
+#: ../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:1775
+#: ../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:1906
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "這�郵件是由 <b>%s</b> 代表 <b>%s</b> 寄出"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:314
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "寄件者"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 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
+#: ../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
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "新�羣組"
 
@@ -12425,7 +12687,8 @@ msgstr "%s 附加檔案"
 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:1336
+#: ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解� MIME 格�的郵件。�好顯示原始檔。"
 
@@ -12445,11 +12708,14 @@ msgstr "無法剖� PGP/MIME 郵件：未知的錯誤"
 msgid "Unsupported signature format"
 msgstr "�支�的簽署格�"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "檢驗簽署發生錯誤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1581
+#: ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽署發生�明錯誤"
 
@@ -12502,16 +12768,17 @@ 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:1078
+#: ../mail/em-mailer-prefs.c:1132
 #, 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:1086
+#: ../mail/em-mailer-prefs.c:1141
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 外掛程�尚無法使用。請檢查是�有安�該套件。"
 
 #: ../mail/em-mailer-prefs.c:1107
@@ -12528,11 +12795,6 @@ msgstr "待辦"
 msgid "Later"
 msgstr "�後"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "正在移轉「%s�："
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12550,8 +12812,7 @@ msgstr "無法掃� `%s' �有的信箱：%s"
 
 #: ../mail/em-migrate.c:1868
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -12574,15 +12835,15 @@ msgstr "無法建立 POP 儲存在伺�器上的資料目錄 `%s':%s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺�器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#: ../mail/em-migrate.c:2583
+#: ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存� `%s':%s"
 
 #: ../mail/em-migrate.c:2898
 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 ""
@@ -12596,22 +12857,23 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%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."
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "無法從以�的 Evolution 讀�設定值，`evolution/config.xmldb' �存在或�毀。"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564
+#: ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565
+#: ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629
+#: ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "加入到通訊錄(_A)"
 
@@ -12733,15 +12995,11 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中��的顯示方�"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "將 TO/CC/BCC 中��的顯示方�壓縮為 address_count 中指定的長度。"
 
 #: ../mail/evolution-mail.schemas.in.h:17
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
 msgstr "控制本地端更改與�端郵件伺�器�步的頻率。間隔必須至少有 30 秒。"
 
 #: ../mail/evolution-mail.schemas.in.h:18
@@ -12749,9 +13007,7 @@ 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\"."
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
 msgstr "檢查垃圾郵件用的自�標頭。此清單中的元素格�為「headername=value�字串。"
 
 #: ../mail/evolution-mail.schemas.in.h:20
@@ -12807,9 +13063,7 @@ msgid "Default width of the subscribe dialog."
 msgstr "訂閱�話盒的�設闊度。"
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+msgid "Determines whether to look up addresses for junk filtering in local addressbook only"
 msgstr "決定是��在本地端通訊錄中尋找檢查垃圾郵件用的電�郵件��"
 
 #: ../mail/evolution-mail.schemas.in.h:34
@@ -12817,11 +13071,7 @@ msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "決定是�在通訊錄中尋找寄件者電�郵件帳號"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote addressbooks (like ldap) are marked for "
-"autocompletion."
+msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
 msgstr "決定是�在通訊錄中尋找寄件者電�郵件帳號。如果找得到，就�判斷為垃圾郵件。它會�尋標記為自動補齊的通訊錄。但若標記為自動補齊的是�端通訊錄（� ldap），則速度�能會很慢。"
 
 #: ../mail/evolution-mail.schemas.in.h:36
@@ -12829,16 +13079,11 @@ 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."
+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."
+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
@@ -12851,7 +13096,7 @@ msgstr "用來儲存郵件元件檔的目錄。"
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr ""
+msgstr "�用或啟用資料夾樹的資料夾�稱�略功能"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -12894,17 +13139,11 @@ 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 "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+msgid "Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder."
 msgstr "啟用�邊欄�尋功能使你能輸入文字開始互動��尋。它的作用是讓你�須在�邊欄中輸入資料夾�稱就�以輕鬆的找到該資料夾，藉由��的動作更�以自動跳至該資料夾的�置。"
 
 #: ../mail/evolution-mail.schemas.in.h:53
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+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
@@ -12928,43 +13167,27 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱��資料夾�覽並移除���"
 
 #: ../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."
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢�使用者是�確定�這麼�。"
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
+msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 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."
+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 "如果沒有內置檢視器�用於 Evolution ��特殊的 mime-type，任何顯示在此清單的 mime-types 且�應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於顯示內容。"
 
 #: ../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."
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
 msgstr "「傳�與接收郵件�視窗的�始高度。這個數值會在視窗垂直改變大�時更新。"
 
 #: ../mail/evolution-mail.schemas.in.h: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."
+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 "「傳�與接收郵件�視窗的�始最大化狀態。這個數值會在使用者最大化或�消最大化視窗時更新。注�，這個特定的數值�能在 Evolution 中使用，因為「傳�與接收郵件�視窗�能最大化。這個�值�為了實作需�而存在。"
 
 #: ../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."
+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
@@ -12972,16 +13195,11 @@ msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "這會�用/啟用標記多個郵件時的�示。"
 
 #: ../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."
+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."
+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
@@ -13009,9 +13227,7 @@ msgid "List of accounts"
 msgstr "帳號清單"
 
 #: ../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."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Evolution 的郵件元件已知的帳號清單。清單包�與 /apps/evolution/mail/accounts 相關的字串命��目錄。"
 
 #: ../mail/evolution-mail.schemas.in.h:75
@@ -13023,9 +13239,7 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "用於拼字檢查的字典語言碼清單。"
 
 #: ../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."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr "Evolution 的郵件元件已知的標籤清單。清單包�字串，其中包� name:color，color 使用 HTML �六進�編碼。"
 
 #: ../mail/evolution-mail.schemas.in.h:78
@@ -13041,10 +13255,7 @@ msgid "Load images for HTML messages over http"
 msgstr "�� http 載入 HTML 郵件的圖片"
 
 #: ../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."
+msgid "Load images for HTML messages over http(s). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
 msgstr "�� http(s) 載入 HTML 郵件的圖片。�能的值為：「0�– �從網絡載入圖片。「1�– 如果是在�絡人�的寄件者時，載入圖片。「2�- 一定從網絡載入圖片。"
 
 #: ../mail/evolution-mail.schemas.in.h:82
@@ -13120,8 +13331,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，�示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳�沒有主旨的郵件時，�示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.h:101
@@ -13145,9 +13355,7 @@ msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時�示使用者。"
 
 #: ../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."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "當使用者嘗試傳� HTML 郵件到�想接� HTML 郵件的收件者時，顯示�示。"
 
 #: ../mail/evolution-mail.schemas.in.h:107
@@ -13219,9 +13427,7 @@ msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
 #: ../mail/evolution-mail.schemas.in.h:126
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "在郵件清單的中以分離的欄�顯示寄件者的電�郵件。"
 
 #: ../mail/evolution-mail.schemas.in.h:127
@@ -13277,66 +13483,43 @@ msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動闊度字型。"
 
 #: ../mail/evolution-mail.schemas.in.h:140
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "這��使用三種數值。「0�為錯誤，「1�為警告，「2�為除錯訊�。"
 
 #: ../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."
+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."
 msgstr "這�決定了郵件內文在 evolution 中�排版的最大容�。�設的大�是 4MB / 4096 KB，以 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."
+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: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."
+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 "這個�值�能讀�一次，並會在讀�後設為「false�。這樣會�消在清單中�該郵件的��並移除�該資料夾的�覽。"
 
 #: ../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."
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "此密碼匙應該包� XML 清單，它會指定自�檔頭，以�是�顯示它們。XML �構的格�是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定� enabled。"
 
 #: ../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 addressbook only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local addressbook only to exclude mail sent by known contacts from junk filtering."
+msgstr "這個�項相關於�值「lookup_addressbook�，是用來決定是��在本地端通訊錄中查詢電�郵件��以用於垃圾郵件�濾時「排除已知�絡人寄出的郵件�功能。"
 
 #: ../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:147
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+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:148
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
 msgstr "這個設定值指定相關郵件�設為展開或收摺的狀態。Evolution 將需��新啟動。"
 
 #: ../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."
+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 "這個設定值指定相關郵件�根據�個郵件羣組最新的郵件排�，而�根據郵件的日期。Evolution 將需��新啟動。"
 
 #: ../mail/evolution-mail.schemas.in.h:150
@@ -13445,12 +13628,10 @@ msgstr "是��設在��郵件加入讀信回�的�求"
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
+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."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "當郵件�包� In-Reply-To 或 References 檔頭時，是�按照主旨放回郵件羣組。"
 
 #: ../mail/evolution-mail.schemas.in.h:178
@@ -13497,7 +13678,8 @@ msgstr "匯入 Berkeley 郵件信箱格�資料夾"
 msgid "Importing mailbox"
 msgstr "正在匯入信箱"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:232
+#: ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "正在匯入 ‘%s’"
@@ -13524,7 +13706,8 @@ msgstr "從 Pine 匯入郵件。"
 msgid "Mail to %s"
 msgstr "郵件�到 %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:243
+#: ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
@@ -13543,140 +13726,155 @@ msgstr "%s 郵件列表"
 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:164
+#: ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:726
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "範本"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已�擇 %d 個，"
 msgstr[1] "已�擇 %d 個，"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已刪除"
 msgstr[1] "%d �已刪除"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �垃圾"
 msgstr[1] "%d �垃圾"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個�稿"
 msgstr[1] "%d 個�稿"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d �已傳�"
 msgstr[1] "%d �已傳�"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d �未傳�"
 msgstr[1] "%d �未傳�"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d �未讀，"
 msgstr[1] "%d �未讀，"
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å…± %d å°�"
 msgstr[1] "å…± %d å°�"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "新增郵件"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:924
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "郵件訊�(_M)"
+
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊�"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:932
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "郵件資料夾(_F)"
+
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "�級郵件或資料夾失敗。"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "錯誤"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "錯誤"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "警告與錯誤"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "�錯"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "錯誤�警告與除錯訊�"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "除錯紀錄檔"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1736
 msgid "Show _errors in the status bar for"
 msgstr "在狀態列顯示此錯誤(_E)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1745
+#: ../mail/mail-component.c:1752
 msgid "second(s)."
 msgstr "秒。"
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "紀錄檔訊�:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "紀錄等級"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1808
+#: ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "時間"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1818
+#: ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "郵件"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1827
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "關閉這個視窗"
@@ -14023,7 +14221,8 @@ msgstr "行內（Outlook 風格）"
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "標籤"
 
@@ -14052,14 +14251,11 @@ msgid "No _Proxy for:"
 msgstr "沒有代�伺�器給(_P):"
 
 #: ../mail/mail-config.glade.h:107
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+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"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "注�：在首次連線之�將�會�示你輸入密碼"
 
 #: ../mail/mail-config.glade.h:109
@@ -14087,16 +14283,11 @@ 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."
+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."
+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
@@ -14208,9 +14399,7 @@ msgid "T_ype: "
 msgstr "é¡žåž‹(_Y):"
 
 #: ../mail/mail-config.glade.h:148
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "這�的語言清單��映出已經安�字典的語言。"
 
 #: ../mail/mail-config.glade.h:149
@@ -14239,8 +14428,10 @@ msgstr "使用者�稱(_E):"
 msgid "Use Authe_ntication"
 msgstr "使用驗證(_N)"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../mail/mail-config.glade.h:156
+#: ../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 "使用者�稱(_N):"
@@ -14424,7 +14615,8 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在郵件內尋找"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "�跟隨的標幟"
 
@@ -14495,7 +14687,8 @@ msgstr "接收郵件"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄�濾器：%s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:572
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14523,11 +14716,13 @@ msgstr "正在傳�郵件 %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳�第 %d 個郵件 (共 %d 個)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "已�消。"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "完�。"
 
@@ -14588,7 +14783,8 @@ msgstr "儲存帳號 '%s'"
 msgid "Refreshing folder"
 msgstr "�新載入資料夾"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1657
+#: ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
@@ -14633,7 +14829,8 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2146
+#: ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14666,27 +14863,28 @@ msgstr "準備帳號「%s�離線工作"
 msgid "Checking Service"
 msgstr "檢查�務"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "正在�消..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "傳�與接收郵件"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "全部�消(_A)"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
@@ -14785,29 +14983,22 @@ msgstr "已經有�稱為「{1}�的資料夾存在。請使用��的�稱
 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."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "�於「{1}�的�空白資料夾已經存在。\n"
 "\n"
 "你�以�擇忽略此資料夾�覆寫或附加它的內容或者��。"
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
 msgstr "「{1}�已�求傳�讀信回�。是�傳�讀信回�給 {0}？"
 
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "已經有�稱為「{0}�的簽�檔存在。請使用��的�稱。"
 
 #: ../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."
+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
@@ -14819,8 +15010,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "確定�刪除這個帳號？"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定�刪除這個帳號以�它所有的代�伺�器？"
 
 #: ../mail/mail.error.xml.h:12
@@ -14828,15 +15018,11 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "你確定�一次�開啟 {0} �郵件？"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+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}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
 msgstr "確定�永久移除資料夾「{0}�中所有刪除的郵件？"
 
 #: ../mail/mail.error.xml.h:15
@@ -14912,9 +15098,7 @@ msgid "Cannot open target \"{2}\"."
 msgstr "�能開啟目標「{2}�。"
 
 #: ../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."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
 msgstr "�能讀�授權�款檔案「{0}�，應該是安��題造�的。在你��這項授權之�將無法使用它。"
 
 #: ../mail/mail.error.xml.h:35
@@ -14947,9 +15131,7 @@ msgstr "檢查垃圾郵件失敗"
 
 # (Abel) �盤的�最好�譯了
 #: ../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."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
 msgstr "請檢查密碼拼字是�正確。請注�，很多密碼�分大�寫；你�能按了 Caps Lock。"
 
 #: ../mail/mail.error.xml.h:43
@@ -14989,9 +15171,7 @@ msgid "Do not disable"
 msgstr "���用"
 
 #: ../mail/mail.error.xml.h:52
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "是��在本地端�步那些標記為離線使用的資料夾？"
 
 #: ../mail/mail.error.xml.h:53
@@ -15031,9 +15211,7 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果你�擇繼續，將無法復原這些郵件。"
 
 #: ../mail/mail.error.xml.h:62
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+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
@@ -15053,9 +15231,7 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
 #: ../mail/mail.error.xml.h:67
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "如果你�擇��，�次啟動 Evolution 之�，�會傳�這些郵件。"
 
 #: ../mail/mail.error.xml.h:68
@@ -15071,11 +15247,7 @@ msgid "Mail filters automatically updated."
 msgstr "郵件�濾器自動更新。"
 
 #: ../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."
+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 "很多電�郵件系統會新增 Apparently-To 檔頭至�有密件副本收件者的郵件。如果加入了此檔頭，會永�列示郵件中所有的收件者。���此情�，應該至少新增一個「收件者：�或「副本：�收件者。"
 
 #: ../mail/mail.error.xml.h:73
@@ -15103,15 +15275,12 @@ msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳�。"
 
 #: ../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."
+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"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
 "請確定以下收件者希望並且�以接收 HTML 電�郵件：\n"
@@ -15174,19 +15343,14 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "是��步資料夾以供離線使用？"
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr "Evolution 需�系統資料夾�能正常作業，而且該資料夾��以�新命��移動或刪除。"
 
 #: ../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. "
+"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 ""
 "傳�的�絡人清單是設定�隱�清單收件者。\n"
 "\n"
@@ -15233,20 +15397,15 @@ msgstr ""
 "需�時，請移至�尋資料夾編輯器，以手動方�新增它。"
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+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"
+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."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "此伺�器�支�此驗證類型而且根本�支�驗證。"
 
 #: ../mail/mail.error.xml.h:117
@@ -15254,9 +15413,7 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "此簽署已經更改，但尚未儲存。"
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "這會將標示�定的資料夾�其�資料夾中所有郵件為已閱讀。"
 
 #: ../mail/mail.error.xml.h:119
@@ -15264,9 +15421,7 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺�器。"
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "無法開啟此帳號的�稿資料夾。是�使用系統�稿資料夾代替？"
 
 #: ../mail/mail.error.xml.h:121
@@ -15283,8 +15438,7 @@ msgstr "使用�設的�稿資料夾？"
 
 #: ../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"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 "警告：從�尋資料夾中刪除郵件將會自你的本地或�端資料夾刪除實際的郵件。\n"
@@ -15313,8 +15467,7 @@ msgstr "你必須指定一個資料夾。"
 #: ../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."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "你必須至少指定一個資料夾當�來�。\n"
 "個別��資料夾，然後/或��所有本地資料夾�所有�端資料夾或二者皆�。"
@@ -15343,85 +15496,90 @@ msgstr "清除(_E)"
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1595 ../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:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 "今天%p %-l:%M"
 
-#: ../mail/message-list.c:1611 ../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 "昨天%p %-l:%M"
 
-#: ../mail/message-list.c:1623 ../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%p %-l:%M"
 
-#: ../mail/message-list.c:1631 ../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 "%-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
+#: ../mail/message-list.c:3916
+#: ../mail/message-list.c:4373
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
-#: ../mail/message-list.c:4179
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+#: ../mail/message-list.c:4223
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "沒有郵件符�你的�尋�作。�以使用「�尋->清除��單項目來清除�尋或改變它。"
 
-#: ../mail/message-list.c:4181
+#: ../mail/message-list.c:4225
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -15454,39 +15612,42 @@ msgstr "傳�郵件"
 msgid "Size"
 msgstr "大�"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "原始�置"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "跟隨"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "給你的資訊"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "�需�回應"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "檢閱"
 
@@ -15511,6 +15672,10 @@ msgid "Subject contains"
 msgstr "主旨包�"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "主旨或收件者包�"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "主旨或寄件者包�"
 
@@ -15523,15 +15688,11 @@ 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"
+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."
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
 msgstr "讓附加檔案�醒外掛程�用來�尋郵件內文的關�字清單。"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
@@ -15545,15 +15706,11 @@ msgid "Attachment Reminder"
 msgstr "附加檔案�醒程�"
 
 #: ../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"
+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."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
 msgstr "Evolution 已找到�些代表該郵件應�有附加檔案的關�字，�找�到這個附加檔案。"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
@@ -15565,9 +15722,7 @@ msgid "_Edit Message"
 msgstr "編輯郵件(_E)"
 
 #: ../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."
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
 msgstr "用來顯示郵件中音效附件的格�外掛程�，它�以讓你在 evolution 中直接播放它們。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
@@ -15596,8 +15751,7 @@ msgstr "從備份還原"
 
 #: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
+"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 ""
 "你�以從備份中還原 Evolution。它�以還原所有的郵件�行事曆�工作�備忘錄��絡人。\n"
@@ -15730,16 +15884,11 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "確定�關閉 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?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "確定�從�定的備份檔案還原 Evolution？"
 
 #: ../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."
+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 "Evolution 備份�能在 Evolution 沒有執行時啟動。在進行之�請確定你已儲存並關閉所有未儲存的視窗。如果希望 Evolution 在備份後自動�新啟動，請啟用切�按鈕。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -15759,12 +15908,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."
+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 "這將會刪除所有 Evolution 目�的資料與設定值並從備份中還原它們。Evolution 還原�能在 Evolution 沒有執行時啟動。如果希望 Evolution 在還原後自動�新啟動，請啟用切�按鈕。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
@@ -15779,7 +15923,8 @@ msgstr "還原設定值(_E)..."
 msgid "_Backup Settings..."
 msgstr "備份設定值(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:543
+#: ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的�絡人"
@@ -15812,10 +15957,7 @@ msgid "Synchronize with _buddy list now"
 msgstr "立�與好�清單�步(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
+msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
 msgstr "回覆郵件時自動在通訊錄中填入姓�與電�郵件��。�時也會在好�清單中填入 IM �絡人資訊。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
@@ -15852,9 +15994,7 @@ msgid "Convert mail messages to Unicode"
 msgstr "將郵件轉�為 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."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
 msgstr "將郵件文字轉�為 Unicode UTF-8 以統一來自��字集的 spam/ham 特徵。"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -15869,7 +16009,8 @@ msgstr "Bogofilter 垃圾郵件外掛程�"
 msgid "Filters junk messages using Bogofilter."
 msgstr "使用 Bogofilter �濾垃圾郵件。"
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
@@ -15879,7 +16020,8 @@ msgid "_URL:"
 msgstr "網�(_U):"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
@@ -15901,7 +16043,8 @@ msgstr "�供本地行事曆的核心功能。"
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "�新整�(_F):"
 
@@ -15975,9 +16118,7 @@ msgid "Weather Calendars"
 msgstr "氣象行事曆"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
+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
@@ -15989,8 +16130,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "檢查 Evolution 是�為�設的郵件程�"
 
 #: ../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."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "�次啟動 Evolution 時，檢查它是�為�設的郵件程�。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -16006,7 +16146,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "你是��將 Evolution 設為你的�設電�郵件客戶端程�？"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16031,20 +16171,18 @@ msgid "Default Sources"
 msgstr "�設來�"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+msgid "Provides functionality for marking a calendar or an addressbook as the default one."
 msgstr "�供標記�設行事曆或通訊錄的功能。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "自�標頭(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
 msgstr "設定�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr "數值"
@@ -16076,10 +16214,7 @@ 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 \";\""
+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
@@ -16105,9 +16240,7 @@ msgstr "�全密碼"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:64
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
 msgstr "此�項將會連線到使用�全密碼 (NTLM) 驗證的 Exchange 伺�器。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:72
@@ -16115,9 +16248,7 @@ msgid "Plaintext Password"
 msgstr "純文字密碼"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr "此�項將會連線到使用標準純文字密碼驗證的 Exchange 伺�器。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:255
@@ -16225,9 +16356,7 @@ msgstr ""
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:113
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
+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:120
@@ -16290,9 +16419,7 @@ msgstr "%s 的許�權"
 #. summarizing the permissions assigned to him.
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:341
-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."
+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 "這�郵件是由 Evolution 自動寄出以通知你已經被指派為代�人。你�在�以代表我寄發郵件。"
 
 #. To translators: Another chunk of the same message.
@@ -16469,8 +16596,7 @@ msgstr "<b>狀態：</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"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>當你�在辦公室時，以下指定的郵件將會自動傳�給\n"
@@ -16517,7 +16643,7 @@ msgid "Add User:"
 msgstr "新增使用者："
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/exchange-operations/exchange-send-options.c:408
 #: ../plugins/groupwise-features/proxy.c:934
 #: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
@@ -16639,7 +16765,7 @@ msgstr "使用者(_U)"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:17
 msgid "button-user"
-msgstr ""
+msgstr "button-user"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
@@ -16658,9 +16784,7 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "訂閱其他使用者的行事曆"
 
 #: ../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."
+msgid "A plugin that manages a collection of Exchange account specific operations and features."
 msgstr "處� Exchange 帳號指定�作與功能集�的外掛程�。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16680,9 +16804,7 @@ msgid "Cannot perform the operation."
 msgstr "無法執行此項�作。"
 
 #: ../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."
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
 msgstr "� Exchange 帳號「{0}��項的更改將在�新啟動 Evolution 之後生效。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
@@ -16800,7 +16922,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -16809,9 +16931,7 @@ msgid "Global Catalog Server is not reachable"
 msgstr "無法連接全域型錄伺�器"
 
 #: ../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."
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
 msgstr "如果 OWA 在別的路徑執行，你必須在帳號組態�話盒中指定。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
@@ -16917,7 +17037,7 @@ msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生�明的錯誤"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "�明的錯誤。"
 
@@ -16934,9 +17054,7 @@ msgid "You are nearing your quota available for storing mail on this server."
 msgstr "你已經接近在此伺�器儲存郵件的 quota ��。"
 
 #: ../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."
+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
@@ -16952,21 +17070,15 @@ msgid "You may only configure a single Exchange account."
 msgstr "你�以�設定一個單一的 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."
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
 msgstr "目�的使用�為：{0} KB。請嘗試刪除一些郵件來空出部分空間。"
 
 #: ../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."
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
 msgstr "目�的使用�為：{0} KB。你�在將無法傳�或接收郵件。"
 
 #: ../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."
+msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
 msgstr "目�的使用�為：{0} KB。除�你刪除一些郵件來空出部分空間，�則將無法傳�郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
@@ -17002,9 +17114,7 @@ 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."
+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
@@ -17021,15 +17131,11 @@ 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."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr "Evoluton 無法建立用來儲存你郵件的暫存檔案。請�後�試。"
 
 #: ../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."
+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
@@ -17065,10 +17171,7 @@ msgid "_Face"
 msgstr "�貌(_F)"
 
 #: ../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."
+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 "在外寄的郵件中附加大頭貼標頭。第一次使用時需�先設定一張 48*48 的 png 相片。它會以 base 64 編碼並儲存於 ~/.evolution/faces 這會用在未來所寄出的郵件中。"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
@@ -17100,48 +17203,37 @@ msgstr "�消訂閱(_U)"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
-msgstr "請�擇其他�稱。"
+msgstr "請先輸入使用者�稱。"
 
-#: ../plugins/google-account-setup/google-source.c:497
-#, fuzzy, c-format
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "新增資料夾到已訂閱的資料夾清單"
+msgstr "輸入使用者 %s 的密碼以存�已訂閱的行事曆清單。"
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
+"�能從 Google 伺�器讀�資料。\n"
+"%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
-msgstr "行事曆(_C):"
+msgstr "行事曆(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:782
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
-msgstr "正在擷� `%s'"
+msgstr "�回清單(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/google-account-setup/google-contacts-source.c:268
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>伺�器</b>"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-msgid "Username:"
-msgstr "使用者�稱:"
-
-#. Translators: This is the first half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
-#: ../plugins/google-account-setup/google-contacts-source.c:233
-msgid "Update every"
-msgstr "更新間隔�"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar and contacts."
 msgstr "用來設定 Google 行事曆與�絡人的外掛程�。"
@@ -17230,14 +17322,11 @@ msgid "_Junk List"
 msgstr "垃圾郵件清單(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
-#, fuzzy
 msgid "Message Retract"
-msgstr "郵件狀態"
+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 ?"
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
 msgstr "�回郵件�能會將該郵件自數件者的 mailbox 移除。你確定�這麼�？"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
@@ -17261,14 +17350,12 @@ msgid "Groupwise Features"
 msgstr "Groupware 功能"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "郵件已�功收回"
+msgstr "郵件�消失敗"
 
 #: ../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 "將�定的郵件轉�為新的工作"
+msgstr "此伺�器��許將��的郵件�消。"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17302,9 +17389,7 @@ 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."
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
 msgstr "以 &quot;{0}&quot; 登入代�伺�器失敗。請檢查你的電�郵件��並�試一次。"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
@@ -17564,8 +17649,7 @@ msgstr "�得完整檔頭(_L)"
 
 #: ../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"
+"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 ""
 "�供在上列標準檔頭以外你想�接收的�外檔頭。\n"
@@ -17595,23 +17679,23 @@ msgstr "�供 IMAP 帳號功能的外掛程�。"
 msgid "IMAP Features"
 msgstr "IMAP 功能"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "匯入至行事曆(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "匯入 ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "�擇工作清單"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "�擇行事曆"
 
@@ -17634,9 +17718,7 @@ msgid "Hardware Abstraction Layer not loaded"
 msgstr "無法載入硬件抽象層"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:35
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
 msgstr "「hald��務是必�的但目�並未執行。請啟用該�務後�回到本程�，或者�絡你的系統管�者。"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
@@ -17644,9 +17726,7 @@ msgid "Search for an iPod failed"
 msgstr "�尋 iPod 失敗"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-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."
+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 無法找到��步化的 iPod。�能是 iPod 尚未連接到系統或者沒有打開電�。"
 
 #: ../plugins/ipod-sync/ical-format.c:118
@@ -17666,602 +17746,588 @@ msgstr "�步化 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod �步化"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "載入行事曆「%s�失敗"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s�中的約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "找�到任何行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "無法分�項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳�項目至行事曆「%s�。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳�至行事曆 '%s' 並設為已接�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳�至行事曆 '%s' 並設為�確定的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳�至行事曆 '%s' 並設為已婉拒"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳�至行事曆「%s�並設為已�消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議�集人已移除代�人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳��消通知給代�人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳��消通知給代�人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於��法的狀態使得到會者狀態無法更新�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊，該會議並�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊，該項工作�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "無法寄出備忘錄資訊，該備忘錄並�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "此郵件宣告其�有行事曆內容，但其行事曆並�有效的 iCalendar。"
 
-#: ../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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+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:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容�有多個項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1448
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "�處�這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "這個會議的循環�則為"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "這項工作的循環�則為"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "這個備忘錄的循環�則為"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "完�後刪除郵件(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "��的�尋"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "�擇��尋會議��的行事曆"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189
+#: ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A%p %-l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p %-l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%-m 月 %d 日 (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%-m 月 %d 日 (%A) %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:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m 月 %d 日 (%A) %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:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %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:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "請代表 <b>%s</b> 回覆"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "代表 <b>%s</b> 接收"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> 由於 %s 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 已經委派下列會議給你："
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 由於 %s 邀請你出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 邀請你出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> 由於 %s 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../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:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> �� %s 希望收到下列會議的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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> �� %s 傳�了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 傳�了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 由於 %s 已經消�下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 已經消�下列會議。"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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> �� %s 已經答覆了下列會議更改。"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 已經答覆了下列會議更改。"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 由於 %s 已經婉拒了下列會議更改："
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 已經婉拒了下列會議更改。"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 已經發佈了下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> 指派 %s 加入下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 由於 %s 已經指派你一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 已經指派你一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> 由於 %s 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../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:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> �� %s 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> �� %s 傳�了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> 傳�了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> 由於 %s 已經�消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 已經�消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> �� %s 已經回覆下列指派工作的更改："
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 已經回覆下列指派工作的更改："
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> 由於 %s 已婉拒了下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 已經婉拒下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> 已經發佈了備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> 由於 %s 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> 由於 %s 已經消�下列共用備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經�消下列共用備忘錄："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "開啟行事曆(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "接�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "全部接�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "傳�資訊(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
@@ -18314,9 +18380,7 @@ msgid "Itip Formatter"
 msgstr "Itip 格�器"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
 msgstr "「{0}�已代�此會議。是�還�加入代�人「{1}�？"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -18324,8 +18388,7 @@ msgid "This meeting has been delegated"
 msgstr "這個會議已委派"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "這個回覆並�來自目�的到會者。將寄件人加入為到會者？"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -18361,9 +18424,7 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "當新郵件到�時產生 D-BUS 訊�。"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
 msgstr "如果為「true�，則當新郵件抵�時發出嗶��則就播放�音檔。"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -18406,20 +18467,20 @@ msgstr "圖示是��閃�。"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "是��通知收件匣的新郵件。"
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "產生 _D-Bus 訊�"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "Evolution 的新郵件通知"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:398
 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
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18434,62 +18495,60 @@ msgstr[1] ""
 "你已經接收 %d �郵件 。 \n"
 "�於 %s。"
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "新郵件"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "在通知�中顯示圖示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "讓通知�圖示閃�(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "在圖示上彈出訊�(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:728
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "當新郵件到�時播放�音檔案(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "嗶�(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "播放�音檔案(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "指定檔案�稱(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "�擇�音檔案"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "播放(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:805
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "�通知收件匣的新郵件(_I)"
 
 #: ../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."
+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 "當新郵件抵�時產生 D-Bus 訊�或在通知�以圖示和通知訊�知會使用者。"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
@@ -18497,9 +18556,7 @@ msgid "Mail Notification"
 msgstr "郵件通知"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+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
@@ -18516,15 +18573,11 @@ msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:275
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+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."
+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
@@ -18562,8 +18615,7 @@ msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr "�供一般通信論壇指令的動作 （訂閱��消訂閱…）。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -18584,11 +18636,9 @@ msgstr "無法使用動作"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"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."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
 "�將寄出一�電�郵件至 URL \"{0}\"。你�以自動�出郵件，或是先查看並�些改變。\n"
 "\n"
@@ -18607,9 +18657,7 @@ msgid "Posting not allowed"
 msgstr "��許張貼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+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
@@ -18618,8 +18666,7 @@ msgstr "傳�郵件到通信論壇？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"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 ""
@@ -18638,9 +18685,7 @@ msgstr ""
 "檔頭： {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+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
@@ -18700,16 +18745,12 @@ msgid "_Unsubscribe from List"
 msgstr "�消訂閱論壇(_U)"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-#, fuzzy
 msgid "Also mark messages in subfolders?"
-msgstr "正在將郵件移至資料夾 %s"
+msgstr "是�也標記�資料夾中的郵件？"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-#, 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 "這會將標示�定的資料夾�其�資料夾中所有郵件為已閱讀。"
+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:162
 msgid "Current Folder and _Subfolders"
@@ -18796,8 +18837,7 @@ msgstr "外掛程�"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
+"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 ""
@@ -18982,11 +19022,9 @@ msgid "Failed to create pipe: %s"
 msgstr "建立導管失敗：%s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"發生於 %s 的錯誤：\n"
-" %s"
+msgstr "fork 之後發生錯誤：%s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
@@ -19017,9 +19055,7 @@ msgid "I_nclude remote tests"
 msgstr "包��端測試(_N)"
 
 #: ../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."
+msgid "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed."
 msgstr "使用 SpamAssassin �濾垃圾郵件。這個外掛程�需�安� SpamAssassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
@@ -19197,18 +19233,17 @@ msgstr "指引你完��始帳號設定。"
 msgid "Setup Assistant"
 msgstr "設定助�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -19217,28 +19252,28 @@ msgstr ""
 "\n"
 "請按一下「下一步�按鈕繼續。 "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "匯入檔案"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:135
 #: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "請�擇你想�匯入的資訊："
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../plugins/startup-wizard/startup-wizard.c:150
 #: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../plugins/startup-wizard/startup-wizard.c:230
 #: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "匯入資料。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "請�候"
@@ -19261,9 +19296,7 @@ msgid "F_all back to threading messages by subject"
 msgstr "退回到根據主旨的相關郵件(_A)"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr "使用郵件內文的範本外掛程��用的關�字/數值組清單。"
 
 #: ../plugins/templates/templates.c:614
@@ -19341,251 +19374,208 @@ msgid "Configuration version"
 msgstr "組態版本"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "決定是�應執行當機�測功能。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "�設資訊方塊列闊度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "�設視窗高度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "�設視窗狀態"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "�設視窗闊度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "當存�互�網上的 HTTP/ 安全� HTTP 時啟用代�伺�器設定值。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP 代�伺�器主機�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP 代�伺�器密碼 "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP 代�伺�器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP 代�伺�器使用者�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 或別�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-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."
+#: ../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 "如果為 true，�代�伺�器的連線就需�驗證。其中使用者�稱會從 GConf 的「apps/evolution/shell/network_config/authentication_user��值�得，而密碼會從 gnome-keyring 或「~/.gnome2_private/Evolution�的密碼檔案�得。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "上次�級的組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../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:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "�代�伺�器主機"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "使用 HTTP 代�伺�器時�使用的密碼。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "代�伺�器組態模�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS 代�伺�器使用者�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS 代�伺�器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "安全� HTTP 代�伺�器主機�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "安全� HTTP 代�伺�器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
-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."
+#: ../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 "�擇代�伺�器組態模�。支�的數值有 0� 1� 2� 和 3，分別代表「使用系統設定值��「�使用代�伺�器��「使用手動代�伺�器組態�和「使用在 autoconfig url 中�供的代�伺�器組態�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "顯示�邊欄"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告�話盒"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "忽略復原警告�話盒"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "以離線模�啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "狀態列設為顯示"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+#: ../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 "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0�) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的�設高度，以�素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的�設闊度，以�素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的�設闊度，以�素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+#: ../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 "上次�級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如「2.6.0�) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP 代�伺�器主機�稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "安全� HTTP 代�伺�器主機�稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "socks 代�伺�器主機�稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
+#: ../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 "定義於「/apps/evolution/shell/network_config/http_host�的代�伺�器主機通訊埠。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
+#: ../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 "定義於「/apps/evolution/shell/network_config/secure_host�的代�伺�器主機通訊埠。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
+#: ../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 "定義於「/apps/evolution/shell/network_config/socks_host�的代�伺�器主機通訊埠。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-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."
+#: ../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 "視窗按鈕的風格。�以是「文字��「圖示��「兩者��「工具列�。如果設為「工具列�，按鈕的風格會根據 GNOME 工具列設定值決定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-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)."
+#: ../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 "這個�值包�了�直接連線，���代�伺�器（如果有使用）的主機。數值�以為主機�稱�網域（開頭使用�用字符如 *.foo.com）�IP ��（IPv4 和 IPv6 皆�）或帶有�網絡�罩的��（�是 192.168.0.0/24）。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "工具列�以看到"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "�供代�伺�器組態的網�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "使用 HTTP 代�伺�器"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "使用 HTTP 代�伺�器時�使用的使用者�稱。"
 
 # zh_HK: msgstr "Evolution 是�以離線模�啟動�代線上模�。"
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是�以離線模�啟動�代線上模�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "是�使用當機�測。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "視窗是��以最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "是��以看到�邊欄。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "是�顯示狀態列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "是��以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是��略 Evulution 開發版本的警告�話盒。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "是��略 Evulution 復原的警告�話盒。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "是��以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是�視的"
 
@@ -19607,11 +19597,9 @@ msgstr "�擇匯入�務�執行的類型："
 
 #: ../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.\n"
+"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."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
 "���匯入 Evolution 的檔案，並且在清單內�定檔案類型。\n"
 "\n"
@@ -19659,7 +19647,8 @@ 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19708,7 +19697,8 @@ msgstr "開啟 FAQ 網�時發生錯誤"
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:968
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19717,64 +19707,71 @@ msgid "Work Offline"
 msgstr "離線工作"
 
 # zh_HK: msgstr "Evolution 目�為線上模�。按一下此按鈕以進行離線工作。"
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr "Evolution 目�為線上模�。按一下此按鈕以進行離線工作。"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程�中。"
 
 # zh_HK: msgstr "Evolution 目�為離線模�。按一下此按鈕以進行線上工作。"
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr "Evolution 目�為離線模�。按一下此按鈕以進行線上工作。"
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "切�至 %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "�明的系統錯誤。"
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298
+#: ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "確�"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "無效的�數"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "�能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "找�到組態資料庫"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "新增"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "新測試"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
+msgid "_Test"
+msgstr "測試(_T)"
+
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
@@ -19817,7 +19814,7 @@ msgstr ""
 "匯入到 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19852,7 +19849,7 @@ msgstr ""
 "我們希望你享�工作�果，而且我們\n"
 "熱切希望你�供�見�\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19860,67 +19857,44 @@ msgstr ""
 "��\n"
 "Evolution �組敬上\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "���顯示這個訊�"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Evolution 當機�測"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "忽略(_N)"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution 上次執行時似乎發生�正常的關閉。\n"
-"為了�防它�度發生，所有的�覽窗格都會隱�起來。\n"
-"你�以從「檢視��單還原這些�覽窗格。\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "���顯示這個訊�(_D)"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
 # zh_HK: msgstr "以線上模�啟動"
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "以線上模�啟動"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 �新移轉"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳�至一個檔案。"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "�用�任何外掛程�的載入。"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "�用郵件��絡人和工作的�覽窗格。"
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19946,9 +19920,7 @@ msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
+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
@@ -19961,15 +19933,11 @@ msgstr "確定�刪除舊資料？"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"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"
+"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"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
 "「evolution�目錄的所有內容�將永久移除。\n"
 "\n"
@@ -19981,10 +19949,7 @@ msgstr ""
 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"
+"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 ""
 "舊的 Evolution 版本將其資料儲存在��的�置。\n"
 "\n"
@@ -19996,11 +19961,9 @@ msgstr "從以�的版本�級失敗：{0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"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."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
 "�級你的資料和設定值最多會需� {0} �碟空間，但是你�有 {1} �用。\n"
 "\n"
@@ -20046,8 +20009,7 @@ msgstr "�後�醒我(_R)"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
@@ -20065,17 +20027,11 @@ 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"
+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"
+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
@@ -20105,7 +20061,8 @@ msgstr "證書�稱"
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289
+#: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "�號"
@@ -20217,12 +20174,11 @@ msgid "Backup All"
 msgstr "全部備份"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 msgstr "信任此核證機關之�，如果�以的話，你應該先檢查它的證書以�它的政策和程�。"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "證書"
 
@@ -20298,11 +20254,13 @@ 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:819
 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:823
 msgid "SSL Server Certificate"
 msgstr "SSL 伺�器證書"
 
@@ -20331,8 +20289,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "你已經有來自這些組織的證書，�以識別你的身份:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "你已經�有檔案的相關證書，�以識別這些核證機關:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -20352,7 +20309,8 @@ msgstr "編輯核證機關 (_CA) 信任度"
 msgid "Certificate already exists"
 msgstr "證書已經存在"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:239
+#: ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
@@ -20434,11 +20392,13 @@ msgstr "主旨公開密碼匙演算法"
 msgid "Subject's Public Key"
 msgstr "主旨的公開密碼匙"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:810
+#: ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "錯誤：無法處�延伸"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "物件簽署者"
 
@@ -20482,7 +20442,8 @@ msgstr "CRL 簽署者"
 msgid "Critical"
 msgstr "��"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:941
+#: ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "���"
 
@@ -20495,7 +20456,8 @@ msgstr "延伸"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1092
+#: ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "證書簽署演算法"
 
@@ -20556,7 +20518,8 @@ msgstr "複製所有的�絡人到(_P)..."
 msgid "Contact _Preview"
 msgstr "�絡人�覽(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6 ../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 "複製"
@@ -20569,7 +20532,8 @@ msgstr "複製�擇的�絡人到�一個資料夾..."
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "複製已�定資料夾中的�絡人到�一個資料夾"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "複製�定範�"
 
@@ -20581,12 +20545,14 @@ msgstr "複製至資料夾..."
 msgid "Create a new addressbook folder"
 msgstr "建立新通訊錄資料夾"
 
-#: ../ui/evolution-addressbook.xml.h:12 ../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 "剪下"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪下�定範�"
 
@@ -20622,12 +20588,14 @@ msgstr "將�定資料夾中的�絡人移至�一個資料夾"
 msgid "Move to Folder..."
 msgstr "移至資料夾..."
 
-#: ../ui/evolution-addressbook.xml.h:23 ../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 "貼上"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
@@ -20661,7 +20629,8 @@ msgstr "將�定的�絡人儲存為 VCard。"
 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:2723
 msgid "Select All"
 msgstr "全�"
 
@@ -20705,7 +20674,8 @@ msgstr "�止載入"
 msgid "View the current contact"
 msgstr "檢視目�的�絡人"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "執行(_A)"
@@ -20734,7 +20704,8 @@ msgstr "將�絡人移到(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "將資料夾�絡人移到(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "新增(_N)"
 
@@ -20794,7 +20765,8 @@ msgstr "清單"
 msgid "Month"
 msgstr "月"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "下一個"
@@ -20804,7 +20776,8 @@ msgstr "下一個"
 msgid "Previews the calendar to be printed"
 msgstr "�覽將�打�的行事曆內容"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "上一個"
@@ -20814,7 +20787,8 @@ msgstr "上一個"
 msgid "Print this calendar"
 msgstr "打�這個行事曆"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "清除(_E)"
 
@@ -20902,7 +20876,8 @@ msgstr "下載標記為離線使用的帳號/資料夾之郵件"
 msgid "Empty _Trash"
 msgstr "清空回收筒(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "資料夾(_O)"
 
@@ -21036,8 +21011,7 @@ msgid "Hide _Read Messages"
 msgstr "隱�已閱讀的郵件(_R)"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "隱�已刪除的郵件而�將它們以刪除線的形�顯示"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -21120,7 +21094,8 @@ msgstr "相關郵件清單"
 msgid "_Group By Threads"
 msgstr "根據相關郵件為羣組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -21448,7 +21423,8 @@ msgstr "��所有文字(_A)"
 msgid "Select all the text in a message"
 msgstr "�擇郵件中的所有文字"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "設定你目�打�機的版�設定"
 
@@ -21577,7 +21553,8 @@ msgstr "放大(_Z)"
 msgid "Close"
 msgstr "關閉"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -21869,7 +21846,8 @@ msgstr "根據公�(_C)"
 msgid "_Address Cards"
 msgstr "地��(_A)"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "清單檢視(_L)"
 
@@ -21960,8 +21938,7 @@ 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 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 ""
 "使用滑鼠左�拉近地圖的�域，然後��時�。\n"
@@ -22075,13 +22052,16 @@ msgstr "檢視的類型:"
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../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:298 ../widgets/misc/e-attachment.c:599
+#: ../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：�是一個�法的檔案"
@@ -22112,7 +22092,8 @@ 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/misc/e-canvas-background.c:454
+#: ../widgets/text/e-text.c:3643
 #: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "填入色彩"
@@ -22120,14 +22101,17 @@ 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/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
 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/misc/e-canvas-background.c:475
+#: ../widgets/text/e-text.c:3665
 #: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "填入網點"
@@ -22152,21 +22136,24 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:92
+#: ../widgets/misc/e-reflow.c:1426
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:644
 #: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "最�闊度"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:93
+#: ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:645
 #: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "最�闊度"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "é–“è·�"
@@ -22240,13 +22227,16 @@ msgstr "西�語系"
 msgid "Western European, New"
 msgstr "西�語系，新"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:88
+#: ../widgets/misc/e-charset-picker.c:89
 #: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "�體"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:91
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "ç°¡é«”"
 
@@ -22328,9 +22318,7 @@ msgid "Use underline"
 msgstr "使用底線"
 
 #: ../widgets/misc/e-expander.c:197
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+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
@@ -22345,11 +22333,13 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，�以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221
+#: ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "展開器大�"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大�"
 
@@ -22362,8 +22352,10 @@ msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周�的間�"
 
 #. 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:130
+#: ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311
+#: ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "進階�尋"
 
@@ -22380,15 +22372,18 @@ msgstr "�尋(_S)"
 msgid "Searches"
 msgstr "�尋"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "儲存�尋�果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的�尋�果(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "進階�尋(_A)..."
 
@@ -22417,16 +22412,14 @@ msgid "World Map"
 msgstr "世界地圖"
 
 #: ../widgets/misc/e-map.c:627
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
+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:112
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
 msgstr "上線"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
 msgstr "按鈕狀態為上線"
 
@@ -22442,64 +22435,70 @@ msgstr "�步�人記錄:"
 msgid "Sync Categories:"
 msgstr "�步分類:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1448
+#: ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1455
+#: ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "回�模�"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1462
+#: ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "欄寬"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "�尋"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "按這�以改變�尋類型"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "立��尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "é …ç›® ID"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875
+#: ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "顯示(_W):"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "�尋(_C):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " i_n "
 
@@ -22655,19 +22654,19 @@ msgid "_When opened:"
 msgstr "當開啟時(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完�)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "按這�以移至 URL"
 
@@ -22731,11 +22730,13 @@ msgstr "背景色彩欄"
 msgid "State"
 msgstr "狀態"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(�增)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(�減)"
 
@@ -22882,7 +22883,8 @@ msgstr[1] "%s (%d 個項目)"
 #: ../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:3032
+#: ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
@@ -22890,8 +22892,10 @@ msgstr "列與列間交替使用的色彩"
 #: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
@@ -22899,8 +22903,10 @@ msgstr "水平繪圖格"
 #: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
@@ -22908,8 +22914,10 @@ msgstr "垂直繪圖格"
 #: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../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
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
@@ -22917,7 +22925,8 @@ msgstr "繪圖焦點"
 #: ../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:3060
+#: ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "游標模�"
 
@@ -22925,7 +22934,8 @@ msgstr "游標模�"
 #: ../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:3025
+#: ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "�擇�模型"
 
@@ -22933,9 +22943,11 @@ msgstr "�擇�模型"
 #: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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
 msgid "Length Threshold"
 msgstr "界�長度"
 
@@ -22943,9 +22955,11 @@ msgstr "界�長度"
 #: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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
 msgid "Uniform row height"
 msgstr "標準列高"
 
@@ -23028,20 +23042,24 @@ msgstr "排�資訊"
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3094
+#: ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "總是�尋"
 
@@ -23049,15 +23067,16 @@ msgstr "總是�尋"
 msgid "Use click to add"
 msgstr "請按這�加入"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線�與 +/- 展開符號。"
 
@@ -23065,375 +23084,221 @@ msgstr "繪出線�與 +/- 展開符號。"
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "事件處�器"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "ç²—é«”"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "左��齊"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "剪輯闊度"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X �移"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y �移"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "文字闊度"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "使用�略號"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "�行"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "中斷字符"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "�許新行"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "繪製背景"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "游標�置"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM 快顯視窗"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "處�彈出�項目"
 
+#~ msgid "Disable or enable ellipsizing. of folder names in folder tree"
+#~ msgstr "�用或啟用資料夾樹的資料夾�稱�略"
+#~ msgid "Migrating `%s':"
+#~ msgstr "正在移轉 `%s'："
+#~ msgid "D_escription:"
+#~ msgstr "�述(_E):"
+#~ msgid "De_scription:"
+#~ msgstr "�述(_S):"
+#~ msgid "Updating query"
+#~ msgstr "正在更新查詢"
+#~ msgid "Username:"
+#~ msgstr "使用者�稱:"
+#~ msgid "Update every"
+#~ msgstr "更新間隔�"
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "決定是�應執行當機�測功能。"
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "忽略復原警告�話盒"
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "是�使用當機�測。"
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "是��略 Evulution 復原的警告�話盒。"
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolution 當機�測"
+#~ msgid "Ig_nore"
+#~ msgstr "忽略(_N)"
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution 上次執行時似乎發生�正常的關閉。\n"
+#~ "為了�防它�度發生，所有的�覽窗格都會隱�起來。\n"
+#~ "您�以從「檢視��單還原這些�覽窗格。\n"
+#~ msgid "_Do not show this message again"
+#~ msgstr "���顯示這個訊�(_D)"
 #~ msgid "Mark All Messages as Read"
 #~ msgstr "將全部的郵件標示�已閱讀"
-
 #~ msgid "_Properties..."
 #~ msgstr "屬性(_P)..."
-
-#~ msgid "_Appointment"
-#~ msgstr "約會(_A)"
-
-#~ msgid "M_eeting"
-#~ msgstr "會議(_M)"
-
-#~ msgid "All Day A_ppointment"
-#~ msgstr "全日約會(_P)"
-
-#~ msgid "Cale_ndar"
-#~ msgstr "行事曆(_N)"
-
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr "是�將此資料夾�其�資料夾中全部的郵件標示�已閱讀？"
-
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "是�想在�資料夾中一併進行這項�作程�？"
-
 #~ msgid "Show messages in the normal style"
 #~ msgstr "使用正常模�顯示郵件"
-
 #~ msgid "Permission Denied."
 #~ msgstr "權��足。"
-
-#~ msgid "_Contact"
-#~ msgstr "連絡人(_C)"
-
-#~ msgid "Contact _List"
-#~ msgstr "連絡人清單(_L)"
-
-#~ msgid "Address _Book"
-#~ msgstr "通訊錄(_B)"
-
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>顯示</b>"
-
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>伺�器資訊</b>"
-
-#~ msgid "Mem_o"
-#~ msgstr "備忘錄(_O)"
-
-#~ msgid "_Shared memo"
-#~ msgstr "共用備忘錄(_S)"
-
-#~ msgid "Memo li_st"
-#~ msgstr "備忘錄清單(_S)"
-
-#~ msgid "Assigne_d Task"
-#~ msgstr "指派的工作(_D)"
-
-#~ msgid "Tas_k list"
-#~ msgstr "工作清單(_K)"
-
 #~ msgid "Unknown reason"
 #~ msgstr "�明的原因"
-
 #~ msgid "Open File"
 #~ msgstr "開啟檔案"
-
 #~ msgid "_Save Message"
 #~ msgstr "儲存郵件(_S)"
-
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "無法開啟檔案「{0}�。"
-
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
-
-#~ msgid "_Mail Message"
-#~ msgstr "郵件訊�(_M)"
-
-#~ msgid "Mail _Folder"
-#~ msgstr "郵件資料夾(_F)"
-
 #~ msgid "Attach original message"
 #~ msgstr "附加原始郵件"
-
 #~ msgid "Do not quote original message"
 #~ msgstr "��引用原始郵件"
-
 #~ msgid "Quote original message"
 #~ msgstr "引用原始郵件"
-
 #~ msgid "Enter a name for this signature."
 #~ msgstr "輸入這個簽�檔的�稱。"
-
 #~ msgid "Name:"
 #~ msgstr "�稱:"
-
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr "�永久移除資料夾「{0}�中所有刪除的郵件？"
-
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "刪除「{0}�？"
-
 #~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
 #~ msgstr "是�刪除�尋資料夾 &quot;{0}&quot;？"
-
 #~ msgid "Only on _Current Folder"
 #~ msgstr "�在目�的資料夾(_C)"
-
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "啟用附加檔案�醒外掛程�"
-
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "啟用附加檔案�醒外掛程�。"
-
 #~ msgid "Remind _missing attachments"
 #~ msgstr "�醒�失的附加檔案(_M)"
-
 #~ msgid "_Refresh:"
 #~ msgstr "�新整�(_R):"
-
 #~ msgid "There is no configuration option for this plugin."
 #~ msgstr "這個外掛程�沒有設定的�項。"
 
-# msgstr "�供自郵件編輯器打�郵件的�項"
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "�供自郵件編輯器列�郵件的�項。"
-
-# zh_HK: msgstr "打�郵件"
-#~ msgid "Print Message"
-#~ msgstr "列�郵件"
-
-# zh_HK: msgstr "打�此郵件"
-#~ msgid "Prints the message"
-#~ msgstr "列�此郵件"
-
-#~ msgid "A plugin that handles the Startup wizard."
-#~ msgstr "處�啟動精�的外掛程�。"
-
-#~ msgid "Startup wizard"
-#~ msgstr "啟動精�"
-
-#~ msgid "A string description of the current printer settings."
-#~ msgstr "目��表機設定值的�述字串。"
-
-#~ msgid "No folder name specified."
-#~ msgstr "沒有指定資料夾�稱。"
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "資料夾�稱�能包��行字元。"
-
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "資料夾�稱��以包括 “/� 字元。"
-
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "資料夾�稱��以包括 “#� 字元。"
-
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "‘.’ 和 ‘..’ 是資料夾�留�稱。"
-
-#~ msgid "_Test"
-#~ msgstr "測試(_T)"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "複製���至剪貼簿"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "剪下���至剪貼簿"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "從剪貼簿貼上"
-
-#~ msgid "All Day Event"
-#~ msgstr "全天事件"
-
-#~ msgid "Send _Options"
-#~ msgstr "傳��項(_O)"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "刪除簽�檔以外的全部事件"
-
-#~ msgid "For_mat"
-#~ msgstr "格�(_M)"
-
-#~ msgid "HT_ML"
-#~ msgstr "HT_ML"
-
-#~ msgid "Open a file"
-#~ msgstr "開啟舊檔"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP 加密"
-
-#~ msgid "PGP Sign"
-#~ msgstr "PGP 加簽"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "S/MIME 加密"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "S/MIME 加簽"
-
-#~ msgid "Save As"
-#~ msgstr "�存新檔"
-
-#~ msgid "Save in folder..."
-#~ msgstr "儲存至資料夾..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "將郵件儲存至指定的資料夾"
-
-#~ msgid "Send"
-#~ msgstr "傳�"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "使用 HTML 格�傳�郵件"
-
-#~ msgid "_Delete all"
-#~ msgstr "全部刪除(_D)"
-
-#~ msgid "_Open..."
-#~ msgstr "é–‹å•Ÿ(_O)..."
-
-#~ msgid "C_lose"
-#~ msgstr "關閉(_L)"
-
-#~ msgid "H_TML"
-#~ msgstr "H_TML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "儲存後關閉(_C)"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "儲存這個檔案並關閉視窗"
-
-#~ msgid "Refresh List"
-#~ msgstr "�整清單"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "�整資料夾的清單"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "從已訂閱的資料夾清單內將資料夾移除"
-
-#~ msgid "Subscribe"
-#~ msgstr "訂閱"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "�消訂閱"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "���擇(_I)"
-
-#~ msgid "Status Details"
-#~ msgstr "狀態詳細資料"
-
-#~ msgid "Time Zone"
-#~ msgstr "時�"
-
-#~ msgid "TimeZone Combobox"
-#~ msgstr "時�組��方塊 "
-
-#~ msgid ""
-#~ "You have received %d new message\n"
-#~ "in %s.You have received %d new messages\n"
-#~ "in %s."
-#~ msgstr ""
-#~ "您已經接收 %d �新郵件\n"
-#~ "æ–¼ %s\n"
-#~ "您已經接收 %d �新郵件\n"
-#~ "æ–¼ %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b38bcda159..f538ced19c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,13 +6,12 @@
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Abel Cheung <abelcheung@gmail.com>, 2006.
 #
-#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.23.90\n"
+"Project-Id-Version: evolution 2.23.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 12:38+0800\n"
-"PO-Revision-Date: 2008-08-05 15:52+0800\n"
+"POT-Creation-Date: 2008-08-21 03:21+0000\n"
+"PO-Revision-Date: 2008-08-21 20:31+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +26,12 @@ msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "新連絡人"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
@@ -115,7 +114,8 @@ msgstr "用來檢視與�擇時刻範�的表格"
 
 #. 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:151
+#: ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -124,7 +124,8 @@ msgstr[1] "它有 %d 個事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "它沒有事件。"
 
@@ -153,7 +154,7 @@ msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -164,8 +165,9 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. 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:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../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
 msgid "%a %d %b"
 msgstr "%-m 月 %-d 日 (%a)"
@@ -173,9 +175,9 @@ msgstr "%-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -183,10 +185,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -196,8 +198,9 @@ msgstr "%Y 年 %-m 月 %-d 日"
 #. 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:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../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
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
@@ -338,15 +341,11 @@ msgstr "使作用"
 
 #. 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."
+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}�是一個唯讀的通訊錄。請從通訊錄檢視的�邊欄中�擇��的通訊錄。"
 
 #: ../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?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr "此連絡人的電�郵件地�已經存在。您無論如何都�加入�樣��的新�片嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -366,13 +365,8 @@ msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
 #: ../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 ""
-"請檢查來確定您的密碼拼法正確，而且您使用的是支�的登入方法。請記得許多密碼有"
-"�分大�寫；您�能啟動了大寫鎖定�。"
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "請檢查來確定您的密碼拼法正確，而且您使用的是支�的登入方法。請記得許多密碼有�分大�寫；您�能啟動了大寫鎖定�。"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -383,14 +377,8 @@ msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
 #: ../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 ""
-"目�您�能存� Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 "
-"GroupWise 郵件客戶端，以�得您的 GroupWise 常用連絡人� Groupwise 個人連絡人"
-"資料夾。"
+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 "目�您�能存� Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 GroupWise 郵件客戶端，以�得您的 GroupWise 常用連絡人� Groupwise 個人連絡人資料夾。"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -410,7 +398,7 @@ msgstr "無法驗證 LDAP 伺�器。"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
@@ -435,18 +423,12 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經�外��。"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所�擇的圖片太大。您是��改變大�後�儲存它？"
 
 #: ../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 ""
-"此 LDAP 伺�器�能使用舊的 LDAP 版本，它�支�此功能，或�能設定錯誤。請洽詢"
-"管�員，瞭解支�的�尋基礎。"
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "此 LDAP 伺�器�能使用舊的 LDAP 版本，它�支�此功能，或�能設定錯誤。請洽詢管�員，瞭解支�的�尋基礎。"
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
@@ -461,9 +443,7 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺�器沒有任何建議的�尋基礎。"
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr "此通訊錄伺�器無法連線，或伺�器�稱�能拼錯，或您的網路連線已經�止。"
 
 #: ../addressbook/addressbook.error.xml.h:28
@@ -487,38 +467,27 @@ msgid "Would you like to save your changes?"
 msgstr "�儲存所�的變更？"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"您正在嘗試從�一個通訊錄，將連絡人移至�一個通訊錄，但是它無法從來�移除。您"
-"想�儲存一個副本來代替嗎？"
+msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "您正在嘗試從�一個通訊錄，將連絡人移至�一個通訊錄，但是它無法從來�移除。您想�儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h: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 ""
-"您正連線到�支�的 GroupWise 伺�器而且�能�到使用 Evolution 的�題。最好的"
-"解決方案是將該伺�器�級至支�的版太"
+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 "您正連線到�支�的 GroupWise 伺�器而且�能�到使用 Evolution 的�題。最好的解決方案是將該伺�器�級至支�的版太"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "您沒有足夠的權�刪除這個通訊錄中的連絡人。"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "您已經修改此連絡人。�儲存這些變更？"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "�新啟動 Evolution 之�，無法使用 {0} 的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -542,7 +511,8 @@ msgid "_Use as it is"
 msgstr "將它視為(_U)"
 
 #. 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:44 ../mail/mail.error.xml.h:143
+#: ../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}"
@@ -584,8 +554,9 @@ msgstr "在此設定自動完�"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../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
 msgid "Contacts"
@@ -612,8 +583,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution 通訊錄元件"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 憑證管�控制"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME 憑證管�控制"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -627,13 +598,18 @@ msgstr "在此管�您的 S/MIME 憑證"
 #. 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
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:196 ../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:1456
+#: ../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
 msgid "On This Computer"
 msgstr "我的電腦"
 
@@ -646,11 +622,16 @@ msgstr "我的電腦"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../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:205
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../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 "個人"
 
@@ -661,23 +642,38 @@ msgid "On LDAP Servers"
 msgstr "在 LDAP 伺�器"
 
 #: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
+msgid "_Contact"
+msgstr "連絡人(_C)"
+
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
 #: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
+msgid "Contact _List"
+msgstr "連絡人清單(_L)"
+
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:245
 #: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "新通訊錄"
 
 #: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
+msgid "Address _Book"
+msgstr "通訊錄(_B)"
+
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�級通訊錄設定值或資料夾失敗。"
 
@@ -700,14 +696,15 @@ msgstr "複製通訊錄內容至本地用於離線作業(_B)"
 #: ../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:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../mail/em-folder-properties.c:280
+#: ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "通訊錄"
@@ -727,7 +724,7 @@ msgid "Details"
 msgstr "詳細資料"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:965
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "�尋中"
 
@@ -741,15 +738,17 @@ msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "正在移轉 `%s'："
+msgid "Migrating '%s':"
+msgstr "正在移轉「%s�："
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -761,8 +760,7 @@ msgstr "自動完�設定"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -800,74 +798,82 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的 Pilot Sync 資料時，請�心等候..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�新命�「%s�資料夾為："
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "�新命�資料夾"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾�稱�能包�斜線。"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
+#: ../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:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../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
+#: ../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
+#: ../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 "刪除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "連絡人來��擇器"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿�方�存� LDAP 伺�器"
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:498
+#: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -886,9 +892,7 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "完� uris 清單的 EFolderList xml"
 
 #: ../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."
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
 msgstr "垂直窗格的�置，在�片�清單檢視與�覽窗格之間，以�素計。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
@@ -896,9 +900,7 @@ msgid "Show preview pane"
 msgstr "顯示�覽窗格"
 
 #: ../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."
+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
@@ -970,7 +972,7 @@ msgstr "匿�"
 #. 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 ""
+msgstr "�覽這個通訊錄直到�制(_R)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
@@ -985,8 +987,7 @@ msgid "Email address"
 msgstr "電�郵件地�"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 會使用此電�郵件地�，在伺�器驗證您的身份。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1038,38 +1039,20 @@ msgid "Search filter"
 msgstr "�尋�濾器"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"�尋�濾器是在進行�尋時使用的物件類型。如果此項沒有被修改，�設的�尋目標是"
-"「person�物件類型。"
+msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
+msgstr "�尋�濾器是在進行�尋時使用的物件類型。如果此項沒有被修改，�設的�尋目標是「person�物件類型。"
 
 #: ../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 ""
-"��此�項表示，Evolution �會連線到您的 LDAP 伺�器 (如果您的 LDAP 伺�器支"
-"� SSL)。"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "��此�項表示，Evolution �會連線到您的 LDAP 伺�器 (如果您的 LDAP 伺�器支� 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 ""
-"��此�項表示，Evolution �會連線到您的 LDAP 伺�器 (如果您的 LDAP 伺�器支"
-"� TLS)。"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "��此�項表示，Evolution �會連線到您的 LDAP 伺�器 (如果您的 LDAP 伺�器支� 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 ""
-"��此�項表示，您的伺�器�支� SSL 或 TLS。這表示您的連線將�安全，而且您的"
-"安全有�洞。 "
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "��此�項表示，您的伺�器�支� SSL 或 TLS。這表示您的連線將�安全，而且您的安全有�洞。 "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1088,60 +1071,32 @@ msgid "TLS encryption"
 msgstr "TLS 加密"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"�尋基礎是指項目的�辨識�稱 (DN)，�尋會由此處開始。如果此處空白，�尋會在目"
-"錄樹的底層開始。"
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "�尋基礎是指項目的�辨識�稱 (DN)，�尋會由此處開始。如果此處空白，�尋會在目錄樹的底層開始。"
 
 #: ../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 ""
-"�尋範�會定義您想從網路目錄樹往下延伸�尋的深度。\"sub\" 的�尋範�會包括�"
-"尋基礎底下所有的項目。「一個�的�尋範��會包括基礎底下的一個層級。"
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "�尋範�會定義您想從網路目錄樹往下延伸�尋的深度。\"sub\" 的�尋範�會包括�尋基礎底下所有的項目。「一個�的�尋範��會包括基礎底下的一個層級。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "這是您的 ldap 伺�器的完整�稱。例如：「ldap.mycompany.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."
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 msgstr "這是�下載項目的數目上�。將此數字設定�太大會減慢通訊錄的速度。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"這是 Evolution 將�用來驗證您的方法。注��設定此項至「電�郵件���需�您"
-"的 LDAP 伺�器的匿�存�。"
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+msgstr "這是 Evolution 將�用來驗證您的方法。注��設定此項至「電�郵件���需�您的 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 ""
-"這是此伺�器的�稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "這是此伺�器的�稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
 #: ../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 ""
-"這是 LDAP 伺�器上的埠，Evolution 會嘗試連線到這個地方。已�供標準埠清單。請"
-"洽詢您的系統管�員，瞭解您應該指定的埠。"
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "這是 LDAP 伺�器上的埠，Evolution 會嘗試連線到這個地方。已�供標準埠清單。請洽詢您的系統管�員，瞭解您應該指定的埠。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1208,10 +1163,12 @@ msgstr "�片"
 #: ../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
+#: ../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:715
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "分�"
 
@@ -1252,7 +1209,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:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1264,16 +1221,16 @@ msgid "Ca_tegories..."
 msgstr "分類(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../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
 msgid "Contact"
 msgstr "連絡人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1286,7 +1243,7 @@ msgid "Image"
 msgstr "圖片"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1299,7 +1256,7 @@ msgid "Nic_kname:"
 msgstr "暱稱(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
@@ -1314,7 +1271,7 @@ msgstr "電話"
 #. 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:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1339,8 +1296,8 @@ msgid "_Birthday:"
 msgstr "生日(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
@@ -1430,16 +1387,16 @@ msgstr "通訊錄(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "郵��號(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 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:293
+#: ../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
@@ -1448,980 +1405,981 @@ msgstr "地�"
 #: ../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
+#: ../widgets/table/e-cell-text.c:1836
+#: ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "�編輯的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "美國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "阿爾巴尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "阿爾�利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "美屬薩摩亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "安�爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "安哥拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "安圭拉島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "�極洲"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "安地��巴布�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "亞美尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "阿盧巴島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "澳大利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "亞賽拜然"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "巴哈馬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "å·´æž—"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "巴�多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "白俄羅斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "�里斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "百慕�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "�丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "玻利維亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "波士尼亞-赫�格維�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "波札那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "波維特島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "英屬�度洋地�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "汶�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "�加利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "布��法索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "浦隆地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "柬埔寨王國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "喀麥隆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "維德角島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "開曼群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "中�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "查德"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "智利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "中國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "�誕島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "��斯群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "哥倫比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "葛摩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "剛果共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "剛果共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "科克群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "象牙海岸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "克羅埃西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "�巴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "賽普勒斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "�克共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "丹麥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "�布地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "多明尼克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "多明尼加共和國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "厄瓜多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "埃�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "赤�幾內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "厄利垂亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "�索比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "�克蘭群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "法羅群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "�濟群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "法國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "法屬圭亞那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "法屬玻里尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "法屬�部屬地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "加彭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "甘比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "喬治亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "德國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "迦�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "直布羅陀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "希臘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "格陵蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "格瑞那�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "瓜德魯普島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "關島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "瓜地馬拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "根�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "幾內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "幾內亞比索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "蓋亞�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "海地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "赫德�麥當勞群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "教廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "�都拉斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "香港"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "冰島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "�度"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "�尼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "伊朗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "曼島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "以色列"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "義大利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "日本"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "澤西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ç´„æ—¦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "肯亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "�里巴斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "北韓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "韓國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "科�特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "�爾�斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "寮國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "賴索托"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "賴比瑞亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "利比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "列支敦斯登"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "盧森堡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "澳門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "馬�加斯加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "馬拉�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "馬爾地夫"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "馬利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "馬爾他"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "馬紹爾群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "法屬馬�尼克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "茅利塔尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "模里西斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "美亞特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "密克羅尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "摩爾多瓦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "摩�哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "蒙�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "蒙瑟拉特島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "莫三比克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "緬甸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "�米比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "諾魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "尼泊爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "�蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "�屬安地列斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "新喀里多尼亞島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "�西蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "尼日"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "奈�利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "��島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "諾�克群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "北馬里亞�群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "挪�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "阿曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "巴基斯�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "帛�群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "巴勒斯�地�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "巴布亞�幾內亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "秘魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "�律賓"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "皮特康"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "葡�牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "波多黎�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "留尼旺"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "ä¿„ç¾…æ–¯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "盧安�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "�克里斯多�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "�露西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "�文森"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "薩摩亞群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "�馬利諾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "�多美�普林西比"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "沙�地阿拉伯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "塞內加爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "塞爾維亞和黑山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "塞席爾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "��山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "新加�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "斯洛�克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "斯洛凡尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "索羅門群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "索馬利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "�喬治亞��桑�奇群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "西�牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "斯里蘭�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "�赫勒拿島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "�匹�密啟倫群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "蘇丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "蘇利�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴�尖棉島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "�瓦濟蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "ç‘žå…¸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "敘利亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "臺�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "塔�克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "�尚尼亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "��汶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "多哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "托克勞群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "�加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "�里�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "�尼西亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "土庫曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "土克斯�開科斯群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "�瓦魯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "�干�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "�克蘭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "阿拉伯��大公國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "美屬邊疆群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "�拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "�茲別克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "�那�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "越�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "英屬維爾京群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "美屬維爾京群島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "沃里斯與�塔那島"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "葉門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "尚比亞"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "辛巴�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../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
@@ -2433,118 +2391,119 @@ msgstr "辛巴�"
 msgid "Name"
 msgstr "�稱"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 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:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 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:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
 msgid "Service"
 msgstr "�務"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
 #: ../calendar/gui/caltypes.xml.h:25
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../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
 msgid "Location"
 msgstr "�置"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "使用者�稱"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "�家"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../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:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "來�通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "是新連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "�寫的欄�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "必�欄�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "已變更"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "請��代表此連絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2552,23 +2511,23 @@ msgstr ""
 "連絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s�是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -2768,7 +2727,7 @@ msgstr "�員(_M)"
 #: ../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:213
+#: ../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
 msgid "Book"
@@ -2792,9 +2751,7 @@ msgid "Duplicate Contact Detected"
 msgstr "�測到�複的連絡人"
 
 #: ../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?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr "此連絡人的�稱或電�郵件地�已經存在於此資料夾。無論如何都�新增它嗎？"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2828,19 +2785,22 @@ 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:415
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "電�郵件"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76
+#: ../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:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "電�郵件開始於"
 
@@ -2861,7 +2821,7 @@ msgstr[1] "%d 個連絡人"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../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
 msgid "Query"
@@ -2875,7 +2835,8 @@ msgstr "�得書本檢視時發生錯誤"
 #: ../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
+#: ../widgets/table/e-tree-selection-model.c:821
+#: ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "模型"
@@ -2884,15 +2845,15 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯�片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "�稱開始於"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "來�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2900,92 +2861,99 @@ msgstr "來�"
 msgid "Type"
 msgstr "é¡žåž‹"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../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:1680 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1671
+#: ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "é–‹å•Ÿ(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "儲存� _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "傳�郵件給連絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "傳�郵件給清單(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "傳�郵件給連絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "列�(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../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:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2046
-#: ../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
+#: ../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
+#: ../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 "複製(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "任何分類"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "其他錯誤"
@@ -3161,8 +3129,10 @@ msgstr "網�"
 
 #: ../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
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../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
@@ -3170,23 +3140,29 @@ msgstr "網�"
 #: ../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/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../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
 msgid "Width"
 msgstr "寬度"
 
 #: ../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
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../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: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/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../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
 msgid "Height"
 msgstr "高度"
 
@@ -3298,7 +3274,8 @@ msgstr "已�擇"
 msgid "Has Cursor"
 msgstr "有游標"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "在�覽器內開啟連�(_O)"
 
@@ -3307,7 +3284,8 @@ msgstr "在�覽器內開啟連�(_O)"
 msgid "_Copy Link Location"
 msgstr "複製連���(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "傳�新郵件至(_S)…"
 
@@ -3351,9 +3329,8 @@ msgstr "視訊交談"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../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
@@ -3367,7 +3344,7 @@ msgstr "行事曆"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
@@ -3389,14 +3366,18 @@ msgid "Web Log"
 msgstr "網誌"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/e-calendar-view.c:2343
+#: ../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:2353
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -3468,7 +3449,8 @@ msgstr "通訊�定�支�"
 #: ../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-calendar-table.c:643
+#: ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "已�消"
 
@@ -3509,44 +3491,37 @@ msgstr "無法在離線模�下使用"
 msgid "Invalid server version"
 msgstr "無效的伺�器版本"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
-msgid ""
-"We were unable to open this addressbook. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
-msgstr ""
-"我們無法開啟這個通訊錄。這�能表示此通訊錄未標記為離線用途或者尚未下載以供離"
-"線使用。請於上線模��次讀�通訊錄以下載它的內容"
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "�支�的驗證方法"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+msgstr "我們無法開啟這個通訊錄。這�能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模��次讀�通訊錄以下載它的內容"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
-msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
+msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是�存在而且您有權�存�它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的 URI，或無法連線 LDAP 伺�器。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"此 Evolution 版本未編譯 LDAP 支�。如果您若想在 Evolution 使用 LDAP，必須安�"
-"啟用 LDAP 的 Evolution 套件。"
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
+msgstr "此 Evolution 版本未編譯 LDAP 支�。如果您若想在 Evolution 使用 LDAP，必須安�啟用 LDAP 的 Evolution 套件。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的URI，或伺�器無法連線。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "詳細的錯誤："
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3558,7 +3533,7 @@ msgstr ""
 "請使用更加明確的查詢或是�高此目錄�務的目錄\n"
 "伺�器�好設定中的�果上�。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3570,45 +3545,45 @@ msgstr ""
 "或是�高此目錄�務的目錄伺�器�好設定中的\n"
 "�果上�。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄�務的後端程�無法解�這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄�務的後端程�拒絕執行這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全�功。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "修改連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3617,18 +3592,22 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
+"開啟 %d 個連絡人會�時開啟 %d 個新視窗。\n"
+"確定�顯示這個連絡人？"
 msgstr[1] ""
+"開啟 %d 個連絡人會�時開啟 %d 個新視窗。\n"
+"確定�顯示這些連絡人？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "��顯示(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "顯示所有的連絡人(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3637,65 +3616,65 @@ msgstr ""
 "%s 已經存在\n"
 "您是��覆寫它？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "個連絡人"
 msgstr[1] "個連絡人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "�擇通訊錄"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "清單"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "將連絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "將連絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "多� vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "%s çš„ vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "連絡人資訊"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
@@ -3732,7 +3711,8 @@ msgstr "�片檢視模�"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:671
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "匯入..."
 
@@ -3817,7 +3797,8 @@ 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:503
+#: ../mail/em-mailer-prefs.c:432
+#: ../widgets/table/e-table-click-to-add.c:503
 #: ../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
@@ -4021,9 +4002,7 @@ msgid "Export in asynchronous mode"
 msgstr "在��步模�匯出"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "��步模�下，一個輸出檔案中的�片數目，�設大�是 100。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
@@ -4031,8 +4010,7 @@ msgid "NUMBER"
 msgstr "數目"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help �項來查看用法。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:116
@@ -4053,30 +4031,20 @@ msgstr "未處�的錯誤"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"「{0}�是一個唯讀的行事曆並且�能被修改。請從行事曆檢視的�邊欄中�擇��的行"
-"事曆。"
+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}�是一個唯讀的行事曆並且�能被修改。請從行事曆檢視的�邊欄中�擇��的行事曆。"
 
 #. 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."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
 msgstr "「{0}�是一個唯讀的行事曆來�。請��一個能加入約會的行事曆。"
 
 #: ../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."
+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:6
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+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:7
@@ -4088,9 +4056,7 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "會刪除此備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "會刪除這些約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4098,13 +4064,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "會刪除這些工作的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "會刪除此約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4144,19 +4108,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "確定�刪除此約會？"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確定�刪除此工作？"
@@ -4210,14 +4174,11 @@ msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
 #: ../calendar/calendar.error.xml.h:37
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "電�郵件邀請會傳�給所有�與者並讓他們接�此工作。"
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "電�郵件邀請函會傳�給所有�與者並讓他們回覆。"
 
 #: ../calendar/calendar.error.xml.h:39
@@ -4233,45 +4194,31 @@ msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
 #: ../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."
+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:43
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+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:44
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+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:45
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "傳�更新的資訊�許其他�與者�有最新的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "傳�更新的資訊讓其他�與者�有最新的工作清單。"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "這裡有一些需�下載的附件。儲存此約會將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "這裡有一些需�下載的附件。儲存此工作將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:49
@@ -4351,13 +4298,8 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "�傳�更新的工作資訊給�與者？"
 
 #: ../calendar/calendar.error.xml.h:68
-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 ""
-"您正連線到�支�的 GroupWise 伺�器而且�能�到使用 Evolution 的�題。最好的"
-"解決方案是將該伺�器�級至支�的版本。"
+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 "您正連線到�支�的 GroupWise 伺�器而且�能�到使用 Evolution 的�題。最好的解決方案是將該伺�器�級至支�的版本。"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
@@ -4388,7 +4330,8 @@ msgstr "�新啟動 Evolution 之�，無法使用您的工作。"
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76
+#: ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -4397,7 +4340,8 @@ msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../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 "傳�(_S)"
@@ -4453,12 +4397,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀� pilot 待辦事項程��塊"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "行事曆"
 
@@ -4499,18 +4444,24 @@ msgid "Memo_s"
 msgstr "備忘錄(_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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../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:353
 #: ../calendar/gui/memos-control.c:369
 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:1574 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4535,25 +4486,27 @@ msgstr "工作(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知�務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分�"
 msgstr[1] "分�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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
+#: ../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:716
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "�時"
 msgstr[1] "�時"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "開始時刻"
 
@@ -4564,8 +4517,8 @@ msgstr "約會"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4576,14 +4529,18 @@ msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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:167
 #: ../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
+#: ../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 "編輯(_E)"
@@ -4596,32 +4553,32 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 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
 msgid "No description available."
 msgstr "沒有�用的�述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "沒有�用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
-#: ../mail/mail-component.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1594
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4633,11 +4590,10 @@ msgstr ""
 "�出電�郵件。  Evolution 會顯示\n"
 "普通的�醒�話盒來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -4650,7 +4606,7 @@ msgstr ""
 "\n"
 "您確定�執行這個程�？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "���詢�我關於這個程�。"
 
@@ -4659,9 +4615,7 @@ msgid "Could not initialize Bonobo"
 msgstr "無法�始化 Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "無法建立�音�醒�務元件工廠，也許它已經在執行中..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
@@ -4669,7 +4623,8 @@ msgid "invalid time"
 msgstr "失效時間"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4678,7 +4633,8 @@ msgstr[0] "%d �時"
 msgstr[1] "%d �時"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:72
+#: ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4689,7 +4645,8 @@ msgstr[1] "%d 分"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:76
+#: ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4718,8 +4675,7 @@ msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用�設值)。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -4851,44 +4807,28 @@ msgid "Overdue tasks color"
 msgstr "�期的工作色彩"
 
 #: ../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 ""
-"水平窗格的�置，當�在月檢視中時，在日期導覽行事曆與工作清單之間，以�素計。"
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "水平窗格的�置，當�在月檢視中時，在日期導覽行事曆與工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h: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 ""
-"水平窗格的�置，在月檢視中的視窗與日期導覽行事曆�工作清單之間，以�素計。"
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "水平窗格的�置，在月檢視中的視窗與日期導覽行事曆�工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "垂直窗格的�置，在行事曆清單與日期導覽行事曆之間。"
 
 #: ../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."
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "垂直窗格的�置，在工作清單與工作�覽窗格之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.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 ""
-"垂直窗格的�置，在月檢視中的視窗與日期導覽行事曆�工作清單之間，以�素計。"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "垂直窗格的�置，在月檢視中的視窗與日期導覽行事曆�工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h: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 ""
-"垂直窗格的�置，當�在月檢視中時，在日期導覽行事曆與工作清單之間，以�素計。"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "垂直窗格的�置，當�在月檢視中時，在日期導覽行事曆與工作清單之間，以�素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
@@ -4954,20 +4894,12 @@ msgstr "工作垂直窗格�置"
 
 #: ../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 ""
-"作為空閒/忙碌資料回饋之用的網�範本，%u �以電�郵件��的使用者�稱部分來�"
-"代，而 %d �替�為網域�稱。"
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "作為空閒/忙碌資料回饋之用的網�範本，%u �以電�郵件��的使用者�稱部分來�代，而 %d �替�為網域�稱。"
 
 #: ../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 ""
-"用於行事曆中日期與時刻的�設時�，未翻譯的 Olsen 時�資料庫�置就� "
-"\"America/New York\"。"
+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 "用於行事曆中日期與時刻的�設時�，未翻譯的 Olsen 時�資料庫�置就� \"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
@@ -4978,16 +4910,13 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "時�"
 
 #: ../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 ""
-"行事曆檢視中的事件�明化效果，數值介於 0 (完全�明)到 10 (��明)之間。"
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "行事曆檢視中的事件�明化效果，數值介於 0 (完全�明)到 10 (��明)之間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
@@ -4998,8 +4927,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "�設�醒單�，「分���「�時�或「日�。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱�工作的單�，「分���「�時�或「日�。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
@@ -5023,9 +4951,7 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是��求確�。"
 
 #: ../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."
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "是�壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空�中。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
@@ -5033,8 +4959,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "是�在週�月的檢視內顯示約會的��時間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是�在行事曆中繪出 Marcus Bains 線（代表目�時刻的直線）。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5062,8 +4987,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是�在事件/工作/會議編輯器中顯示 狀態 欄�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是�使用 24 �時制時間而�是使用上�/下�。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5106,83 +5030,85 @@ msgstr "工作日開始分�"
 msgid "daylight savings time"
 msgstr "日光節約時間"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "主旨包�"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "�述包�"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "分類為"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "備註包�"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "�置包�"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629
+#: ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "�期的工作"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "已完�的工作 "
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "有附加檔案的工作"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
 # zh_HK: msgstr "打�"
-#: ../calendar/gui/calendar-commands.c:92 ../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
+#: ../calendar/gui/calendar-commands.c:92
+#: ../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
-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 ""
-"此作業會永久性刪除比��時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "此作業會永久性刪除比��時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
 #: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
 #: ../calendar/gui/calendar-commands.c:328
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../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:717
+#: ../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 "天"
@@ -5191,47 +5117,51 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:232
+#: ../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 "在網站上"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310
+#: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天氣"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "�級行事曆失敗。"
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆�用來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "行事曆來��擇器"
 
@@ -5239,6 +5169,11 @@ msgstr "行事曆來��擇器"
 msgid "New appointment"
 msgstr "新增約會"
 
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
+msgid "_Appointment"
+msgstr "約會(_A)"
+
 #: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
@@ -5247,6 +5182,11 @@ msgstr "建立一個新的約會"
 msgid "New meeting"
 msgstr "新增會議"
 
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
+msgid "M_eeting"
+msgstr "會議(_E)"
+
 #: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "建立新會議�求"
@@ -5255,6 +5195,11 @@ msgstr "建立新會議�求"
 msgid "New all day appointment"
 msgstr "新的全日約會"
 
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "全日約會(_P)"
+
 #: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
@@ -5263,6 +5208,11 @@ msgstr "建立新的全日約會"
 msgid "New calendar"
 msgstr "新行事曆"
 
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "行事曆(_N)"
+
 #: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
@@ -5283,13 +5233,16 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 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/caltypes.xml.h:4
+#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "附加檔案"
 
@@ -5299,133 +5252,163 @@ msgstr "附加檔案"
 msgid "Attendee"
 msgstr "到會者"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/memotypes.xml.h:6
 #: ../calendar/gui/tasktypes.xml.h:9
 msgid "Business"
 msgstr "商務"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Category"
 msgstr "分類"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "分類"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
 #: ../calendar/gui/tasktypes.xml.h:12
 msgid "Competition"
 msgstr "競爭者"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../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/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "機密"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../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
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "�述:"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:12
 #: ../calendar/gui/tasktypes.xml.h:15
 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/caltypes.xml.h:14
+#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/em-filter-i18n.h:22
 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/caltypes.xml.h:15
+#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "存在"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Favourites"
 msgstr "喜好"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../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/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:20
 msgid "Goals/Objectives"
-msgstr ""
+msgstr "終點/目標"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:22
 msgid "Holiday"
 msgstr "�日"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../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/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:20
 #: ../calendar/gui/tasktypes.xml.h:24
 msgid "Hot Contacts"
 msgstr "熱門連絡人"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:21
 #: ../calendar/gui/tasktypes.xml.h:25
 msgid "Ideas"
 msgstr "點�"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/caltypes.xml.h:23
+#: ../calendar/gui/memotypes.xml.h:22
 #: ../calendar/gui/tasktypes.xml.h:27
 msgid "International"
 msgstr "國際的"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/caltypes.xml.h:24
+#: ../calendar/gui/memotypes.xml.h:23
 #: ../calendar/gui/tasktypes.xml.h:28
 msgid "Key Customer"
 msgstr "關�客戶"
 
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/caltypes.xml.h:26
+#: ../calendar/gui/memotypes.xml.h:24
 #: ../calendar/gui/tasktypes.xml.h:30
 msgid "Miscellaneous"
 msgstr "其它"
 
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#: ../calendar/gui/caltypes.xml.h:27
+#: ../calendar/gui/tasktypes.xml.h:31
 msgid "Next 7 days"
 msgstr "接下來 7 天"
 
 #: ../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
+#: ../calendar/gui/memotypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:34
 msgid "Organizer"
 msgstr "會議�集人"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:30
+#: ../calendar/gui/memotypes.xml.h:28
 #: ../calendar/gui/tasktypes.xml.h:36
 msgid "Phone Calls"
 msgstr "電話"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../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/memotypes.xml.h:29
 msgid "Private"
 msgstr "�人"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../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: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
 msgid "Public"
 msgstr "公開"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:297
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -5433,12 +5416,15 @@ msgstr "週期性"
 #: ../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:70 ../mail/message-list.etspec.h:17
+#: ../calendar/gui/memotypes.xml.h:31
+#: ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "狀�"
 
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/caltypes.xml.h:35
+#: ../calendar/gui/memotypes.xml.h:32
 #: ../calendar/gui/tasktypes.xml.h:39
 msgid "Strategies"
 msgstr "ç­–ç•¥"
@@ -5446,54 +5432,68 @@ msgstr "ç­–ç•¥"
 #: ../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/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
 msgid "Summary"
 msgstr "摘�"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/caltypes.xml.h:37
+#: ../calendar/gui/memotypes.xml.h:34
 #: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "摘�包�"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/caltypes.xml.h:38
+#: ../calendar/gui/memotypes.xml.h:35
 #: ../calendar/gui/tasktypes.xml.h:42
 msgid "Suppliers"
 msgstr "供應商"
 
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:39
+#: ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
 msgstr "時間 &amp; 花費"
 
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../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/caltypes.xml.h:41
+#: ../calendar/gui/memotypes.xml.h:38
 #: ../calendar/gui/tasktypes.xml.h:46
 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/caltypes.xml.h:42
+#: ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47
+#: ../mail/em-filter-i18n.h:10
 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/caltypes.xml.h:43
+#: ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48
+#: ../mail/em-filter-i18n.h:16
 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/caltypes.xml.h:44
+#: ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49
+#: ../mail/em-filter-i18n.h:30
 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/caltypes.xml.h:45
+#: ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "�是"
 
@@ -5509,11 +5509,12 @@ msgstr "開啟行事曆時�支�方法"
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許�權來開啟行事曆"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:429
+#: ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "�明的錯誤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
@@ -5616,10 +5617,7 @@ msgstr "�醒間隔�"
 msgid "hour(s)"
 msgstr "�時"
 
-#. Translators: This is the second half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "分�"
 
@@ -5627,7 +5625,7 @@ msgstr "分�"
 msgid "start of appointment"
 msgstr "約會開始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -5641,12 +5639,12 @@ msgstr "加入(_A)"
 msgid "Alarms"
 msgstr "鬧鈴"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
@@ -5670,8 +5668,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u 與 %d 會被替�為電�郵件��中的使用者與網域�稱。</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5807,7 +5804,7 @@ msgid "Thursday"
 msgstr "星期四"
 
 #: ../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 "時�(_Z):"
 
@@ -5949,46 +5946,46 @@ msgstr "備忘錄清單屬性"
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "這項工作已刪除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "這個備忘錄已刪除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已經�了些變更。放棄這些變更並且關閉這個編輯器？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您沒有�任何變更，關閉這個編輯器？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "這個事件已變更。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "這項工作已變更。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "這個備忘錄已變更。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已經�了些變更。放棄這些變更並且更新這個編輯器？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有�任何變更，更新這個編輯器？"
@@ -5998,292 +5995,310 @@ msgstr "%s  您沒有�任何變更，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確�上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:182
+#: ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:186
+#: ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (已完�) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:188
+#: ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "已完� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr "(期�)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "期� "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊� - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊�"
 msgstr[1] "附加 %d 個訊�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2047
+#: ../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
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483
+#: ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008
+#: ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "�消拖拉(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../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
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "沒有摘�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "按這裡以關閉目�視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "複製��的文字至剪貼簿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "剪下��的文字至剪貼簿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "按這裡以檢視�用的說明"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "按這裡以儲存目�視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "��所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "�入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "�項(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../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 "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 #: ../composer/e-composer-actions.c:472
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "按這裡以附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "切�是�顯示「分類�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "時�(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "切�是�顯示「時��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "歸類為�人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "角色欄�(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "切�是�顯示「角色�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切�是�顯示「RSVP�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "狀態欄�(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "切�是�顯示「狀態�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "類型欄�(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切�是�顯示「到會者類型�欄�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:1766
 #: ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent Docu_ments"
 msgstr "最近使用文件(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../calendar/gui/dialogs/comp-editor.c:1785
 #: ../composer/e-composer-actions.c:700
 msgid "Attach"
 msgstr "附加"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, 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:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "隱�附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "顯示附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "移除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2194
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "顯示附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "按下空白�切�附加檔案列"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄�此項目所�的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "無法使用目�的版本�"
 
@@ -6299,55 +6314,55 @@ msgstr "無法開啟目的地"
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "是�刪除其他所有收件者信箱中的這個項目(_D)？"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除事件。"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除該備忘錄。"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除項目。"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "因為許�全被拒絕，所以無法刪除事件。"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "因為許�全被拒絕，所以無法刪除工作。"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "因為許�權被拒絕，所以無法刪除該備忘錄。"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "因為許�權被拒絕，所以無法刪除項目。"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除事件。"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除該備忘錄。"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除項目。"
 
@@ -6364,179 +6379,183 @@ msgstr "委託給："
 msgid "Enter Delegate"
 msgstr "輸入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:194
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "Click here to set or unset alarms for this event"
 msgstr "按這裡以設定或�消這個事件的鬧鈴"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Recurrence"
 msgstr "週期性(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Make this a recurring event"
 msgstr "將此項設為循環事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "傳��項"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "Insert advanced send options"
 msgstr "�入進階傳��項"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "Toggles whether to have All Day Event"
 msgstr "切�是��有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "切�是�將時間顯示為忙碌"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "這個事件具有鬧鈴"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "會議�集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "代�者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "無��日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "��日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "��時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "��的�集人已經沒有帳號。"
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "需�一個�集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "最少需�一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "新增(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正擔任 %s 的代�人"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "自訂"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158
+#: ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685
+#: ../mail/em-account-editor.c:1409
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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-signature-combo-box.c:69
 msgid "None"
@@ -6563,23 +6582,25 @@ msgid "Custom Alarm:"
 msgstr "自訂鬧鈴:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "�述(_E):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件�述"
 
-#: ../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 "摘�(_M):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "鬧鈴(_A)"
 
+#: ../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 "�述(_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "時間(_T):"
@@ -6617,7 +6638,8 @@ msgstr "連絡人(_N)..."
 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:2476
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -6626,10 +6648,14 @@ msgstr "備忘錄"
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s�開啟備忘錄。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
-#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002
+#: ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620
+#: ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77
+#: ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "收件者"
 
@@ -6642,10 +6668,6 @@ msgstr "開始日(_R):"
 msgid "T_o:"
 msgstr "收件者(_O):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "�述(_D):"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -6882,17 +6904,21 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #: ../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-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:642
+#: ../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
 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:1064
+#: ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "高"
 
@@ -6902,21 +6928,25 @@ msgstr "高"
 #: ../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-calendar-table.c:641
+#: ../calendar/gui/print.c:2549
 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:1062
+#: ../calendar/gui/e-calendar-table.c:569
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 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:966 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "正常"
 
@@ -6925,7 +6955,8 @@ msgstr "正常"
 #: ../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-calendar-table.c:640
+#: ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "未開始"
@@ -6939,7 +6970,8 @@ msgid "Stat_us:"
 msgstr "狀態(_U):"
 
 #: ../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:570
+#: ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "未指定"
 
@@ -6956,24 +6988,24 @@ msgstr "優先順�(_P):"
 msgid "_Web Page:"
 msgstr "網�(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:111
 msgid "_Status Details"
 msgstr "狀態詳細資料(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "Click to change or view the status details of the task"
 msgstr "按這裡改變/檢視該工作的狀態詳細資料"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:121
 #: ../composer/e-composer-actions.c:528
 msgid "_Send Options"
 msgstr "傳��項(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "工作詳細資料"
 
@@ -7000,17 +7032,13 @@ msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "�述(_S):"
+msgid "D_ue date:"
+msgstr "到期日(_U):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "時�:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "到期日(_D):"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7088,13 +7116,15 @@ msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-preview.c:73
+#: ../mail/em-folder-view.c:3315
 #, c-format
 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:857
 msgid "Untitled"
 msgstr "未命�"
 
@@ -7107,7 +7137,8 @@ msgstr "開始日期："
 #: ../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
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "�述:"
@@ -7170,15 +7201,18 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:976
 #: ../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: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 "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:976
 #: ../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
@@ -7186,51 +7220,65 @@ msgid "No"
 msgstr "�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../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-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:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../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
 #: ../plugins/plugin-manager/plugin-manager.c:73
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "�明"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "循環模�"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183
+#: ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "�存新檔..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
+#: ../calendar/gui/e-cal-popup.c:199
+#: ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "�擇用來儲存�定的附加檔案的資料夾..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231
+#: ../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:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../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
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:561
+#: ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "�存新檔(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286
+#: ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
@@ -7238,7 +7286,8 @@ msgstr "設為背景(_B)"
 msgid "_Save Selected"
 msgstr "儲存��的(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:428
+#: ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -7249,7 +7298,7 @@ msgstr "* 沒有摘� *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "�集人: %s <%s>"
@@ -7257,7 +7306,7 @@ 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:2228
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議�集人: %s"
@@ -7315,55 +7364,68 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:665
+#: ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "刪除�定的物件"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:795
+#: ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "更新物件"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-view.c:1221
+#: ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "�存新檔..."
 
 #: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "開啟網�(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "列�(_R)..."
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1677
+#: ../calendar/gui/e-memo-table.c:931
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
 #: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-memo-table.c:933
+#: ../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 "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCale_ndar 轉寄"
@@ -7420,93 +7482,97 @@ msgstr "優先順�"
 msgid "Start date"
 msgstr "開始日期"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "移動項目"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "目�檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "�擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "�擇日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "列�(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689
+#: ../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 "回覆所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示��移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "�置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -7545,19 +7611,23 @@ 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:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../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
 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:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/e-day-view.c:791
+#: ../calendar/gui/e-week-view.c:528
 #: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "上�"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/e-day-view.c:794
+#: ../calendar/gui/e-week-view.c:531
 #: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "下�"
@@ -7643,7 +7713,8 @@ msgstr "��"
 msgid "Due"
 msgstr "截止"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
@@ -7652,54 +7723,55 @@ msgstr "iCalendar 資訊"
 msgid "iCalendar Error"
 msgstr "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
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "�明人士"
 
 #. 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."
+msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下�的�單中�擇一個動作。"
 
 #: ../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/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "接�"
 
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "暫時接�"
 
 #: ../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:2041
+#: ../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
 msgid "Declined"
 msgstr "婉拒"
 
 #: ../calendar/gui/e-itip-control.c:1283
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "會議已經�消，但是在您的行事曆中找�到"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經�消，但是在您的工作清單中找�到"
 
 #: ../calendar/gui/e-itip-control.c:1363
@@ -7762,7 +7834,8 @@ msgstr "<b>%s</b> 已經消�會議。"
 msgid "Meeting Cancelation"
 msgstr "會議�消"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../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."
@@ -7904,15 +7977,17 @@ msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態�能更新，因為項目已經�存在"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2111
+#: ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "項目傳��\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2117
+#: ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "無法傳�這個項目�\n"
 
@@ -7950,7 +8025,8 @@ msgstr "更新回應狀態"
 msgid "Send Latest Information"
 msgstr "�出最新資訊"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
+#: ../calendar/gui/e-itip-control.c:2470
+#: ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "�消"
@@ -8000,69 +8076,83 @@ msgid "Attendees"
 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:86
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740
+#: ../calendar/gui/print.c:981
 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/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
 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/e-meeting-store.c:90
+#: ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:983
 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/e-meeting-store.c:92
+#: ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:984
 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/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:998
 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:123
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/print.c:999
 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/e-meeting-store.c:125
+#: ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:1000
 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/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../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:171
+#: ../calendar/gui/e-meeting-store.c:194
 #: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 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-store.c:177
+#: ../calendar/gui/e-meeting-store.c:200
 #: ../calendar/gui/e-meeting-time-sel.c:397
 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/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "已委派"
 
@@ -8077,7 +8167,8 @@ msgstr "到會者"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "進行中"
 
@@ -8195,12 +8286,14 @@ msgstr "�員"
 msgid "_Delete Selected Memos"
 msgstr "刪除�定的備忘錄(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../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"
@@ -8218,7 +8311,8 @@ msgstr "正在載入備忘錄"
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1062
+#: ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "正在刪除�定的物件..."
 
@@ -8239,54 +8333,51 @@ msgstr "正在完�工作..."
 msgid "Expunging"
 msgstr "除去中"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 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:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:348
+#: ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "正在更新查詢"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "自訂檢視(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "儲存自訂檢視(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "é–‹å•Ÿ %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "清除"
 
@@ -8346,7 +8437,8 @@ msgstr "�月"
 msgid "_Select Today"
 msgstr "�擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../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 "必須指定一個�集人。"
@@ -8355,19 +8447,23 @@ msgstr "必須指定一個�集人。"
 msgid "At least one attendee is necessary"
 msgstr "至少需�一個到會者"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626
+#: ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628
+#: ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
@@ -8400,38 +8496,39 @@ msgstr "iCalendar 資訊"
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 msgstr[1] "%d 項備忘錄"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546
+#: ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已�擇 %d 個"
 msgstr[1] "，已�擇 %d 個"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "�級備忘錄失敗。"
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s�來建立事件和會議"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "沒有�用的行事曆來建立備忘錄"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "備忘錄來��擇器"
 
@@ -8439,6 +8536,11 @@ msgstr "備忘錄來��擇器"
 msgid "New memo"
 msgstr "新增備忘錄"
 
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
+msgid "Mem_o"
+msgstr "備忘錄(_O)"
+
 #: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
@@ -8447,6 +8549,11 @@ msgstr "建立新的備忘錄"
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "共用備忘錄(_S)"
+
 #: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
@@ -8455,12 +8562,18 @@ msgstr "建立新的共用備忘錄"
 msgid "New memo list"
 msgstr "新備忘錄清單"
 
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
+msgid "Memo li_st"
+msgstr "備忘錄清單(_S)"
+
 #: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
 # zh_HK: msgstr "打�備忘錄"
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "打�備忘錄"
 
@@ -8470,8 +8583,7 @@ msgstr "接下來 7 天"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"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 ""
@@ -8481,8 +8593,7 @@ msgstr ""
 
 #: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -8491,7 +8602,8 @@ msgstr ""
 "當 Evolution 移轉您的資料夾時，請�心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:775
+#: ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
@@ -8719,31 +8831,31 @@ msgstr "連絡人: "
 msgid "Upcoming Appointments"
 msgstr "�將開始的約會"
 
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 msgstr[1] "%d 項工作"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "�級工作失敗。"
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有�用的行事曆來建立工作"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "工作來��擇器"
 
@@ -8751,6 +8863,11 @@ msgstr "工作來��擇器"
 msgid "New task"
 msgstr "新增工作"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "工作(_T)"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "建立一個新的工作"
@@ -8759,6 +8876,11 @@ msgstr "建立一個新的工作"
 msgid "New assigned task"
 msgstr "新指定的工作"
 
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "指派的工作(_D)"
+
 #: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
@@ -8767,27 +8889,32 @@ msgstr "建立新指定的工作"
 msgid "New task list"
 msgstr "新工作清單"
 
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
+msgid "Tas_k list"
+msgstr "工作清單(_K)"
+
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
 #: ../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"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"這個動作會永久地清除所有標示為已完�的工作。如果您�繼續，您將�能復原這些工"
-"作。\n"
+"這個動作會永久地清除所有標示為已完�的工作。如果您�繼續，您將�能復原這些工作。\n"
 "\n"
 "確定清除這些工作？"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:455
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "���顯示這個訊�。"
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "列�工作"
 
@@ -8804,11 +8931,13 @@ 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:34
 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:35
 msgid "is less than"
 msgstr "�於"
 
@@ -8818,7 +8947,7 @@ msgstr "約會和會議"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
@@ -10404,7 +10533,8 @@ msgstr "未命�的郵件"
 msgid "Attach a file"
 msgstr "附加檔案"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:479
+#: ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "關閉(_C)"
@@ -10413,16 +10543,22 @@ msgstr "關閉(_C)"
 msgid "Close the current file"
 msgstr "關閉目�檔案"
 
-#: ../composer/e-composer-actions.c:486 ../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
+#: ../composer/e-composer-actions.c:486
+#: ../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 "列�(_P)..."
 
-#: ../composer/e-composer-actions.c:493 ../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
+#: ../composer/e-composer-actions.c:493
+#: ../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 "�覽列�(_V)"
 
@@ -10587,11 +10723,8 @@ msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
 #: ../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 ""
-"輸入郵件密件副本的收件者，他們會收到這�郵件但�會出�在郵件的收件者清單"
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "輸入郵件密件副本的收件者，他們會收到這�郵件但�會出�在郵件的收件者清單"
 
 #: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
@@ -10645,47 +10778,44 @@ msgstr "按一下這裡，���張貼的資料夾"
 msgid "Recent _Documents"
 msgstr "最近使用文件(_D)"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180
+#: ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:873
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:872
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署�出的郵件：此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:880
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+#: ../composer/e-msg-composer.c:879
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "無法加密�出的郵件：沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
-#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
+#: ../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
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 msgstr[1] "附件"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "隱�附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573
+#: ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4056
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:4055
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>（郵件編輯器包��能編輯的�文字的郵件內文。）<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 "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
 msgstr "這裡有一些附件�下載。傳�此郵件將無法一併寄出接下來的附件"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -10693,9 +10823,7 @@ msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "確定�放棄正在撰寫，標題為 ‘{0}’ 的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -10707,13 +10835,8 @@ msgid "Because &quot;{1}&quot;."
 msgstr "因為「{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 ""
-"除�您�擇儲存郵件至「�稿�資料夾，�則關閉此撰寫視窗會永久放棄郵件。儲存�"
-"稿�以讓您以後�繼續撰寫郵件。"
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "除�您�擇儲存郵件至「�稿�資料夾，�則關閉此撰寫視窗會永久放棄郵件。儲存�稿�以讓您以後�繼續撰寫郵件。"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10752,16 +10875,11 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{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 �外��。復原郵件�以讓您從原來中斷的地方繼續。"
+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 �外��。復原郵件�以讓您從原來中斷的地方繼續。"
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
-"accounts."
+msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
 msgstr "傳�僅用於 Novell Groupwise 與 Microsoft Exchange 帳號的�項。"
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -10773,19 +10891,14 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "檔案 `{0}' �是一般檔案而且無法在郵件中傳�。"
 
 #: ../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 ""
-"�附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔�加以附加"
-"它。"
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "�附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔�加以附加它。"
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "無法啟動 HTML 編輯器控制。\n"
 "\n"
@@ -10819,7 +10932,7 @@ msgstr "繼續編輯(_C)"
 msgid "_Do not Recover"
 msgstr "��復原(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "復原(_R)"
 
@@ -10831,7 +10944,8 @@ msgstr "儲存�稿(_S)"
 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:738
 msgid "Groupware Suite"
 msgstr "Groupware 套�軟體"
 
@@ -10847,11 +10961,15 @@ 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:77
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:120
 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:79
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
@@ -10877,8 +10995,10 @@ msgstr "元件"
 msgid "Name of the component being logged"
 msgstr "已登入元件的�稱"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../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
 msgid "Enabled"
@@ -10897,11 +11017,11 @@ msgid "The printing system reported the following details about the error:"
 msgstr "列�系統回報下列關於此錯誤的詳細資訊："
 
 #: ../e-util/e-print.c:171
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "列�系統沒有回報任何關於此錯誤的�外資訊。"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "因為「{1}�。"
 
@@ -10925,10 +11045,15 @@ msgstr "檔案已存在「{0}�。"
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "無法顯示 Evolution 的求助文件。"
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "��(_M)"
@@ -10970,9 +11095,7 @@ 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."
+msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "伺�器上已存在�樣的標籤。請更改您的標籤�稱。"
 
 #: ../e-util/gconf-bridge.c:1218
@@ -11086,7 +11209,8 @@ msgstr[1] "%d 年後"
 msgid "<click here to select a date>"
 msgstr "<按這��擇日期>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:301
 #: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "�在"
@@ -11153,12 +11277,14 @@ msgstr "沒有回復或原始郵件"
 msgid "I_nclude threads"
 msgstr "包括郵件群組(_N)"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044
+#: ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "內�"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044
+#: ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11182,7 +11308,8 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少檔案�稱。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "缺少�稱。"
 
@@ -11258,7 +11385,8 @@ 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:195
 msgid "seconds"
 msgstr "秒後"
 
@@ -11270,9 +11398,11 @@ msgstr "目�時間"
 msgid "the time you specify"
 msgstr "您所指定的時間"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
+#: ../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:718
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "週"
 
@@ -11297,8 +11427,7 @@ msgid "Composer Preferences"
 msgstr "郵件編輯器�好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "在此設定郵件的�好設定，包�安全性與郵件的顯示"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11341,10 +11470,13 @@ msgstr "Evolution 郵件優先設定控制"
 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:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
@@ -11385,13 +11517,16 @@ msgstr ""
 " %s 授權�約\n"
 "並��核�方塊來接�它\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466
+#: ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 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:97
+#: ../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:97
 msgid "Autogenerated"
 msgstr "自動產生的"
 
@@ -11399,11 +11534,13 @@ msgstr "自動產生的"
 msgid "Ask for each message"
 msgstr "��郵件皆詢�"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810
+#: ../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:1859
+#: ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "接收電�郵件"
 
@@ -11415,34 +11552,41 @@ msgstr "自動檢查新郵件�(_N)"
 msgid "minu_tes"
 msgstr "分�(_T)"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2327
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "傳�電�郵件"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386
+#: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "�設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2452
+#: ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 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:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "接收�項"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "檢查新郵件"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932
+#: ../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:2932
+#: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助�"
 
@@ -11459,8 +11603,10 @@ msgstr "帳號�稱"
 msgid "Protocol"
 msgstr "通訊�定"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../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 "未命�的"
 
@@ -11476,7 +11622,8 @@ msgstr "新增簽�程�檔"
 msgid "Signature(s)"
 msgstr "簽�檔"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1148
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉�的郵件 --------"
 
@@ -11488,12 +11635,8 @@ msgstr "�明的寄件者"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:2007
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
-"${TimeZone}，${Sender} �到："
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} �到："
 
 #: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
@@ -11546,8 +11689,10 @@ msgstr "�件日期"
 
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:767
-#: ../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-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 "刪除"
@@ -11596,7 +11741,8 @@ msgstr "詞�"
 msgid "Follow Up"
 msgstr "跟隨"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "��"
 
@@ -11624,7 +11770,8 @@ msgstr "未設定"
 msgid "is set"
 msgstr "設定"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40
+#: ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
@@ -11633,7 +11780,8 @@ msgstr "垃圾郵件"
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42
+#: ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "標籤"
 
@@ -11675,11 +11823,13 @@ 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:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:53
+#: ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "已閱讀"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件者"
 
@@ -11707,11 +11857,13 @@ msgstr "傳回�於"
 msgid "Run Program"
 msgstr "執行程�"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:61
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "目標"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "寄件者"
 
@@ -11747,9 +11899,12 @@ msgstr "以此開始"
 msgid "Stop Processing"
 msgstr "�止處�"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11768,51 +11923,51 @@ msgstr "接著�"
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "從�尋建立�尋資料夾(_R)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "最近的郵件"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "有附加檔案的郵件"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "��郵件"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "�垃圾郵件"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "帳號�尋"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "所有的帳號�尋"
 
@@ -11831,14 +11986,17 @@ msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 msgstr[1] "所有郵件:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:193
+#: ../mail/em-folder-properties.c:195
 msgid "Quota usage"
 msgstr "�制用�"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
+#: ../mail/em-folder-properties.c:355
+#: ../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
 msgid "Inbox"
@@ -11862,32 +12020,60 @@ msgid "Folder _name:"
 msgstr "資料夾�稱(_N):"
 
 #. load store to mail component at the end, when everything is loaded
-#: ../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/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970
+#: ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "�尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:212
 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:161
 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:162
 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:163
 msgid "Sent"
 msgstr "已傳�"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:534
+#: ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "載入中..."
 
+#. 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:380
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (%u)"
+
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
@@ -11902,12 +12088,14 @@ msgstr "正在移動資料夾 %s"
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909
+#: ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911
+#: ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -11916,15 +12104,18 @@ msgstr "正在複製郵件至資料夾 %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存�"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:1003
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:1004
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718
+#: ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃�「%s�內的資料夾"
@@ -11942,7 +12133,8 @@ msgstr "新增資料夾(_N)..."
 msgid "_Move..."
 msgstr "移動(_M)..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114
+#: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "�新命�(_R)..."
 
@@ -11954,62 +12146,71 @@ msgstr "�新整�(_F)"
 msgid "Fl_ush Outbox"
 msgstr "清�寄件匣(_U)"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "清空回收筒(_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s�複製到「%s�"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "�擇資料夾"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "指定�建立資料夾的�置："
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權�刪除此�郵件。"
 
-#: ../mail/em-folder-view.c:1329 ../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 "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../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 "轉寄(_F)"
 
 #. 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
+#: ../mail/em-folder-view.c:1335
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -12059,7 +12260,8 @@ msgstr "標籤(_L)"
 
 #. 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:484
 msgid "_None"
 msgstr "ç„¡(_N)"
 
@@ -12116,10 +12318,11 @@ msgstr "從通信論壇建立�濾器(_M)"
 #. 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:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../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 "�設值"
 
@@ -12184,103 +12387,89 @@ msgstr "下一個(_N)"
 msgid "M_atch case"
 msgstr "�分大�寫(_A)"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "未簽�"
 
 #: ../mail/em-format-html-display.c:947
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+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:650
+#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "有效的簽�"
 
 #: ../mail/em-format-html-display.c:948
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+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:651
+#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "無效的簽�"
 
 #: ../mail/em-format-html-display.c:949
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+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:652
+#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽�有效，但是無法檢驗寄件者"
 
 #: ../mail/em-format-html-display.c:950
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+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:653
+#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "簽章存在，但需�公開金鑰"
 
 #: ../mail/em-format-html-display.c:951
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+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:659
+#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "未加密"
 
 #: ../mail/em-format-html-display.c:958
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+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:660
+#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "已加密，�嚴密"
 
 #: ../mail/em-format-html-display.c:959
-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 ""
-"此郵件已加密，但是使用�嚴密的加密演算法。外�的人很難檢閱內容，但��一些時"
-"日，並�是無法檢視此郵件的內容。"
+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:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "已加密"
 
 #: ../mail/em-format-html-display.c:960
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+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:662
+#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
 #: ../mail/em-format-html-display.c:961
-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 ""
-"此郵件已加密，使用嚴密的加密演算法。縱使經�一段時間，外�的人很難檢閱此郵件"
-"的內容。"
+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:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
@@ -12288,192 +12477,204 @@ msgstr "檢視憑證(_V)"
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../mail/em-format-html-display.c:1370
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完�於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1378
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "到期日:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "隱�(_H)"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "符�寬度(_F)"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "顯示原始大�(_O)"
 
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "�存附加檔案為"
 
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "�擇用來儲存所有附加檔案的資料夾"
 
-#: ../mail/em-format-html-display.c:2037
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "儲存��的(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2104
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 個附件(_T)"
 msgstr[1] "%d 個附件(_T)"
 
-#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
+#: ../mail/em-format-html-display.c:2112
+#: ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "儲存(_A)"
 
-#: ../mail/em-format-html-display.c:2122
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-#: ../mail/em-format-html-display.c:2196
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "無附件"
 
-#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
+#: ../mail/em-format-html-display.c:2338
+#: ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "檢閱未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2339
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "隱�未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2394
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "以...開啟(_O)"
 
-#: ../mail/em-format-html-display.c:2465
-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 無法顯示此�電�郵件，因為它已超出能處�的大�。您�以用�排版的方"
-"�或使用外部文字編輯器來閱讀它。"
+#: ../mail/em-format-html-display.c:2468
+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 無法顯示此�電�郵件，因為它已超出能處�的大�。您�以用�排版的方�或使用外部文字編輯器來閱讀它。"
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d �"
 
-#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷� `%s'"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "未知的外加本文部分。"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "格��良的外加本文部分。"
 
-#: ../mail/em-format-html.c:962
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s�有效的指示"
 
-#: ../mail/em-format-html.c:975
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:996
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�端資料指示 (%s)"
 
-#: ../mail/em-format-html.c:1007
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�明的外部檔案指示 (「%s�類型)"
 
-#: ../mail/em-format-html.c:1235
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "格�化郵件"
 
-#: ../mail/em-format-html.c:1409
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "格�化郵件..."
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1563
+#: ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "副本"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "密件副本"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1744
+#: ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1770
+#: ../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:1775
+#: ../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:1906
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "這�郵件是由 <b>%s</b> 代表 <b>%s</b> 寄出"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:314
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "寄件者"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 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
+#: ../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
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "新�群組"
 
@@ -12486,7 +12687,8 @@ msgstr "%s 附加檔案"
 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:1336
+#: ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解� MIME 格�的郵件。�好顯示原始檔。"
 
@@ -12506,11 +12708,14 @@ msgstr "無法剖� PGP/MIME 郵件：未知的錯誤"
 msgid "Unsupported signature format"
 msgstr "�支�的簽�格�"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "檢驗簽�發生錯誤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1519
+#: ../mail/em-format.c:1581
+#: ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽�發生�明錯誤"
 
@@ -12563,16 +12768,17 @@ 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:1078
+#: ../mail/em-mailer-prefs.c:1132
 #, 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:1086
+#: ../mail/em-mailer-prefs.c:1141
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 外掛程�尚無法使用。請檢查是�有安�該套件。"
 
 #: ../mail/em-mailer-prefs.c:1107
@@ -12589,11 +12795,6 @@ msgstr "待辦"
 msgid "Later"
 msgstr "�後"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "正在移轉「%s�："
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12611,8 +12812,7 @@ msgstr "無法掃� `%s' �有的信箱：%s"
 
 #: ../mail/em-migrate.c:1868
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
@@ -12635,15 +12835,15 @@ msgstr "無法建立 POP 儲存在伺�器上的資料目錄 `%s':%s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺�器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#: ../mail/em-migrate.c:2583
+#: ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存� `%s':%s"
 
 #: ../mail/em-migrate.c:2898
 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 ""
@@ -12657,23 +12857,23 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%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 ""
-"無法從以�的 Evolution 讀�設定值，`evolution/config.xmldb' �存在或�毀。"
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "無法從以�的 Evolution 讀�設定值，`evolution/config.xmldb' �存在或�毀。"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564
+#: ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565
+#: ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629
+#: ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "加入到通訊錄(_A)"
 
@@ -12795,15 +12995,11 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中��的顯示方�"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "將 TO/CC/BCC 中��的顯示方�壓縮為 address_count 中指定的長度。"
 
 #: ../mail/evolution-mail.schemas.in.h:17
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
 msgstr "控制本地端變更與�端郵件伺�器�步的頻率。間隔必須至少有 30 秒。"
 
 #: ../mail/evolution-mail.schemas.in.h:18
@@ -12811,11 +13007,8 @@ 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 ""
-"檢查垃圾郵件用的自訂標頭。此清單中的元素格�為「headername=value�字串。"
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "檢查垃圾郵件用的自訂標頭。此清單中的元素格�為「headername=value�字串。"
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -12870,9 +13063,7 @@ msgid "Default width of the subscribe dialog."
 msgstr "訂閱�話盒的�設寬度。"
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+msgid "Determines whether to look up addresses for junk filtering in local addressbook only"
 msgstr "決定是��在本地端通訊錄中尋找檢查垃圾郵件用的電�郵件��"
 
 #: ../mail/evolution-mail.schemas.in.h:34
@@ -12880,33 +13071,19 @@ msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "決定是�在通訊錄中尋找寄件者電�郵件帳號"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote addressbooks (like ldap) are marked for "
-"autocompletion."
-msgstr ""
-"決定是�在通訊錄中尋找寄件者電�郵件帳號。如果找得到，就�判斷為垃圾郵件。它"
-"會�尋標記為自動補齊的通訊錄。但若標記為自動補齊的是�端通訊錄（� ldap），則"
-"速度�能會很慢。"
+msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
+msgstr "決定是�在通訊錄中尋找寄件者電�郵件帳號。如果找得到，就�判斷為垃圾郵件。它會�尋標記為自動補齊的通訊錄。但若標記為自動補齊的是�端通訊錄（� ldap），則速度�能會很慢。"
 
 #: ../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 ""
-"決定是�使用自訂標頭來檢查垃圾郵件。如果啟用這個�項並且�供標頭，將會��垃"
-"圾郵件檢查的速度。"
+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."
+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
@@ -12919,7 +13096,7 @@ msgstr "用來儲存郵件元件檔的目錄。"
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr ""
+msgstr "�用或啟用資料夾樹的資料夾�稱�略功能"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -12962,20 +13139,11 @@ 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 "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"啟用�邊欄�尋功能使您能輸入文字開始互動��尋。它的作用是讓您�須在�邊欄中"
-"輸入資料夾�稱就�以輕鬆的找到該資料夾，藉由��的動作更�以自動跳至該資料夾"
-"的�置。"
+msgid "Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder."
+msgstr "啟用�邊欄�尋功能使您能輸入文字開始互動��尋。它的作用是讓您�須在�邊欄中輸入資料夾�稱就�以輕鬆的找到該資料夾，藉由��的動作更�以自動跳至該資料夾的�置。"
 
 #: ../mail/evolution-mail.schemas.in.h:53
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+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
@@ -12999,49 +13167,27 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱��資料夾�覽並移除���"
 
 #: ../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."
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢�使用者是�確定�這麼�。"
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
+msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 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."
-msgstr ""
-"如果沒有內建檢視器�用於 Evolution ��特殊的 mime-type，任何顯示在此清單的 "
-"mime-types 且�應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於"
-"顯示內容。"
+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 "如果沒有內建檢視器�用於 Evolution ��特殊的 mime-type，任何顯示在此清單的 mime-types 且�應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於顯示內容。"
 
 #: ../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."
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
 msgstr "「傳�與接收郵件�視窗的�始高度。這個數值會在視窗垂直改變大�時更新。"
 
 #: ../mail/evolution-mail.schemas.in.h: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 ""
-"「傳�與接收郵件�視窗的�始最大化狀態。這個數值會在使用者最大化或�消最大化"
-"視窗時更新。注�，這個特定的數值�能在 Evolution 中使用，因為「傳�與接收郵"
-"件�視窗�能最大化。這個�值�為了實作需�而存在。"
+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 "「傳�與接收郵件�視窗的�始最大化狀態。這個數值會在使用者最大化或�消最大化視窗時更新。注�，這個特定的數值�能在 Evolution 中使用，因為「傳�與接收郵件�視窗�能最大化。這個�值�為了實作需�而存在。"
 
 #: ../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."
+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
@@ -13049,19 +13195,12 @@ msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "這會�用/啟用標記多個郵件時的�示。"
 
 #: ../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."
+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 ""
-"它啟用/�用在從�尋資料夾中刪除郵件時是��複�示以警告那將會永久刪除郵件，而"
-"�僅是將郵件自�尋�果中移除。"
+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"
@@ -13088,12 +13227,8 @@ msgid "List of accounts"
 msgstr "帳號清單"
 
 #: ../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."
-msgstr ""
-"Evolution 的郵件元件已知的帳號清單。清單包�與 /apps/evolution/mail/accounts "
-"相關的字串命��目錄。"
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "Evolution 的郵件元件已知的帳號清單。清單包�與 /apps/evolution/mail/accounts 相關的字串命��目錄。"
 
 #: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
@@ -13104,12 +13239,8 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "用於拼字檢查的字典語言碼清單。"
 
 #: ../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."
-msgstr ""
-"Evolution 的郵件元件已知的標籤清單。清單包�字串，其中包� name:color，color "
-"使用 HTML �六進�編碼。"
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "Evolution 的郵件元件已知的標籤清單。清單包�字串，其中包� name:color，color 使用 HTML �六進�編碼。"
 
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
@@ -13124,13 +13255,8 @@ msgid "Load images for HTML messages over http"
 msgstr "�� http 載入 HTML 郵件的圖片"
 
 #: ../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 ""
-"�� http(s) 載入 HTML 郵件的圖片。�能的值為：「0�– �從網路載入圖片。"
-"「1�– 如果是在連絡人裡的寄件者時，載入圖片。「2�- 一定從網路載入圖片。"
+msgid "Load images for HTML messages over http(s). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "�� http(s) 載入 HTML 郵件的圖片。�能的值為：「0�– �從網路載入圖片。「1�– 如果是在連絡人裡的寄件者時，載入圖片。「2�- 一定從網路載入圖片。"
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
@@ -13205,8 +13331,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，�示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳�沒有主旨的郵件時，�示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.h:101
@@ -13230,9 +13355,7 @@ msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時�示使用者。"
 
 #: ../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."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "當使用者嘗試傳� HTML 郵件到�想接� HTML 郵件的收件者時，顯示�示。"
 
 #: ../mail/evolution-mail.schemas.in.h:107
@@ -13304,9 +13427,7 @@ msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
 #: ../mail/evolution-mail.schemas.in.h:126
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "在郵件清單的中以分離的欄�顯示寄件者的電�郵件。"
 
 #: ../mail/evolution-mail.schemas.in.h:127
@@ -13362,78 +13483,44 @@ msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
 #: ../mail/evolution-mail.schemas.in.h:140
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "這裡�使用三種數值。「0�為錯誤，「1�為警告，「2�為除錯訊�。"
 
 #: ../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."
-msgstr ""
-"這裡決定了郵件內文在 evolution 中�排版的最大容�。�設的大�是 4MB / 4096 "
-"KB，以 KB 來指定。"
+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."
+msgstr "這裡決定了郵件內文在 evolution 中�排版的最大容�。�設的大�是 4MB / 4096 KB，以 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 ""
-"這是�設的垃圾郵件外掛程�，�使已啟用了其他的外掛程�。如果�用這裡列出的�"
-"設外掛程�，並�會影響其他�用的外掛程�。"
+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: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 ""
-"這個�值�能讀�一次，並會在讀�後設為「false�。這樣會�消在清單中�該郵件的"
-"��並移除�該資料夾的�覽。"
+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 "這個�值�能讀�一次，並會在讀�後設為「false�。這樣會�消在清單中�該郵件的��並移除�該資料夾的�覽。"
 
 #: ../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 ""
-"此金鑰應該包� XML 清單，它會指定自訂檔頭，以�是�顯示它們。XML �構的格�"
-"是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定� enabled。"
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "此金鑰應該包� XML 清單，它會指定自訂檔頭，以�是�顯示它們。XML �構的格�是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定� enabled。"
 
 #: ../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 addressbook only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local addressbook only to exclude mail sent by known contacts from junk filtering."
+msgstr "這個�項相關於�值「lookup_addressbook�，是用來決定是��在本地端通訊錄中查詢電�郵件��以用於垃圾郵件�濾時「排除已知連絡人寄出的郵件�功能。"
 
 #: ../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:147
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+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:148
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"這個設定值指定相關郵件�設為展開或收摺的狀態。Evolution 將需��新啟動。"
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr "這個設定值指定相關郵件�設為展開或收摺的狀態。Evolution 將需��新啟動。"
 
 #: ../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 ""
-"這個設定值指定相關郵件���個郵件群組最新的郵件排�，而��照郵件的日期。"
-"Evolution 將需��新啟動。"
+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 "這個設定值指定相關郵件���個郵件群組最新的郵件排�，而��照郵件的日期。Evolution 將需��新啟動。"
 
 #: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
@@ -13541,14 +13628,11 @@ msgstr "是��設在��郵件加入讀信回�的�求"
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
+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 ""
-"當郵件�包� In-Reply-To 或 References 檔頭時，是�按照主旨放回郵件群組。"
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "當郵件�包� In-Reply-To 或 References 檔頭時，是�按照主旨放回郵件群組。"
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
@@ -13594,7 +13678,8 @@ msgstr "匯入 Berkeley 郵件信箱格�資料夾"
 msgid "Importing mailbox"
 msgstr "正在匯入信箱"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:232
+#: ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "正在匯入 ‘%s’"
@@ -13621,7 +13706,8 @@ msgstr "從 Pine 匯入郵件。"
 msgid "Mail to %s"
 msgstr "郵件�到 %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:243
+#: ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
@@ -13640,140 +13726,155 @@ msgstr "%s 郵件列表"
 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:164
+#: ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:726
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "範本"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已�擇 %d 個，"
 msgstr[1] "已�擇 %d 個，"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已刪除"
 msgstr[1] "%d �已刪除"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �垃圾"
 msgstr[1] "%d �垃圾"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個�稿"
 msgstr[1] "%d 個�稿"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d �已傳�"
 msgstr[1] "%d �已傳�"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d �未傳�"
 msgstr[1] "%d �未傳�"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d �未讀，"
 msgstr[1] "%d �未讀，"
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å…± %d å°�"
 msgstr[1] "å…± %d å°�"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "新增郵件"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:924
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "郵件訊�(_M)"
+
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊�"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:932
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "郵件資料夾(_F)"
+
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "�級郵件或資料夾失敗。"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Error"
 msgstr "錯誤"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1593
 msgid "Errors"
 msgstr "錯誤"
 
-#: ../mail/mail-component.c:1587
+#: ../mail/mail-component.c:1594
 msgid "Warnings and Errors"
 msgstr "警告與錯誤"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Debug"
 msgstr "�錯"
 
-#: ../mail/mail-component.c:1588
+#: ../mail/mail-component.c:1595
 msgid "Error, Warnings and Debug messages"
 msgstr "錯誤�警告與除錯訊�"
 
-#: ../mail/mail-component.c:1715
+#: ../mail/mail-component.c:1722
 msgid "Debug Logs"
 msgstr "除錯紀錄檔"
 
-#: ../mail/mail-component.c:1729
+#: ../mail/mail-component.c:1736
 msgid "Show _errors in the status bar for"
 msgstr "在狀態列顯示此錯誤(_E)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1745
+#: ../mail/mail-component.c:1752
 msgid "second(s)."
 msgstr "秒。"
 
-#: ../mail/mail-component.c:1751
+#: ../mail/mail-component.c:1758
 msgid "Log Messages:"
 msgstr "紀錄檔訊�:"
 
-#: ../mail/mail-component.c:1792
+#: ../mail/mail-component.c:1799
 msgid "Log Level"
 msgstr "紀錄等級"
 
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1808
+#: ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "時間"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1818
+#: ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "郵件"
 
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1827
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "關閉這個視窗"
@@ -14120,7 +14221,8 @@ msgstr "行內（Outlook 風格）"
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "標籤"
 
@@ -14149,14 +14251,11 @@ msgid "No _Proxy for:"
 msgstr "沒有代�伺�器給(_P):"
 
 #: ../mail/mail-config.glade.h:107
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+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"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "注�：在首次連線之�將�會�示您輸入密碼"
 
 #: ../mail/mail-config.glade.h:109
@@ -14184,21 +14283,12 @@ 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 ""
-"請輸入以下關於寄�郵件方�的資訊。如果您�清楚，請�絡系統管�員或網路�務供"
-"應商。"
+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 ""
-"請在下�輸入您的�稱�電郵地�。「�擇性�的欄��一定�填，除�您希望在�出"
-"的郵件內包�這些資訊。"
+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"
@@ -14309,9 +14399,7 @@ msgid "T_ype: "
 msgstr "é¡žåž‹(_Y):"
 
 #: ../mail/mail-config.glade.h:148
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "這裡的語言清單��映出已經安�字典的語言。"
 
 #: ../mail/mail-config.glade.h:149
@@ -14340,8 +14428,10 @@ msgstr "使用者�稱(_E):"
 msgid "Use Authe_ntication"
 msgstr "使用驗證(_N)"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
+#: ../mail/mail-config.glade.h:156
+#: ../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 "使用者�稱(_N):"
@@ -14525,7 +14615,8 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在郵件內尋找"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "�跟隨的標幟"
 
@@ -14596,7 +14687,8 @@ msgstr "接收郵件"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄�濾器：%s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:572
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14624,11 +14716,13 @@ msgstr "正在傳�郵件 %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳�第 %d 個郵件 (共 %d 個)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "已�消。"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "完�。"
 
@@ -14689,7 +14783,8 @@ msgstr "儲存帳號 '%s'"
 msgid "Refreshing folder"
 msgstr "�新載入資料夾"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1657
+#: ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
@@ -14734,7 +14829,8 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2146
+#: ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14767,27 +14863,28 @@ msgstr "準備帳號「%s�離線工作"
 msgid "Checking Service"
 msgstr "檢查�務"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "正在�消..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "傳�與接收郵件"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "全部�消(_A)"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
@@ -14886,29 +14983,22 @@ msgstr "已經有�稱為「{1}�的資料夾存在。請使用��的�稱
 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."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "�於「{1}�的�空白資料夾已經存在。\n"
 "\n"
 "您�以�擇忽略此資料夾�覆寫或附加它的內容或者��。"
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
 msgstr "「{1}�已�求傳�讀信回�。是�傳�讀信回�給 {0}？"
 
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "已經有�稱為「{0}�的簽�檔存在。請使用��的�稱。"
 
 #: ../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."
+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
@@ -14920,8 +15010,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "確定�刪除這個帳號？"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定�刪除這個帳號以�它所有的代�伺�器？"
 
 #: ../mail/mail.error.xml.h:12
@@ -14929,15 +15018,11 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "您確定�一次�開啟 {0} �郵件？"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+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}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
 msgstr "確定�永久移除資料夾「{0}�中所有刪除的郵件？"
 
 #: ../mail/mail.error.xml.h:15
@@ -15013,12 +15098,8 @@ msgid "Cannot open target \"{2}\"."
 msgstr "�能開啟目標「{2}�。"
 
 #: ../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 ""
-"�能讀�授權�款檔案「{0}�，應該是安��題造�的。在您��這項授權之�將無法"
-"使用它。"
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "�能讀�授權�款檔案「{0}�，應該是安��題造�的。在您��這項授權之�將無法使用它。"
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -15050,11 +15131,8 @@ msgstr "檢查垃圾郵件失敗"
 
 # (Abel) �盤的�最好�譯了
 #: ../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 ""
-"請檢查密碼拼字是�正確。請注�，很多密碼�分大�寫；您�能按了 Caps Lock。"
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "請檢查密碼拼字是�正確。請注�，很多密碼�分大�寫；您�能按了 Caps Lock。"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15093,9 +15171,7 @@ msgid "Do not disable"
 msgstr "���用"
 
 #: ../mail/mail.error.xml.h:52
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "是��在本地端�步那些標記為離線使用的資料夾？"
 
 #: ../mail/mail.error.xml.h:53
@@ -15135,9 +15211,7 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您�擇繼續，將無法復原這些郵件。"
 
 #: ../mail/mail.error.xml.h:62
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+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
@@ -15157,9 +15231,7 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
 #: ../mail/mail.error.xml.h:67
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "如果您�擇��，�次啟動 Evolution 之�，�會傳�這些郵件。"
 
 #: ../mail/mail.error.xml.h:68
@@ -15175,15 +15247,8 @@ msgid "Mail filters automatically updated."
 msgstr "郵件�濾器自動更新。"
 
 #: ../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 ""
-"很多電�郵件系統會新增 Apparently-To 檔頭至�有密件副本收件者的郵件。如果加入"
-"了此檔頭，會永�列示郵件中所有的收件者。���此情�，應該至少新增一個「收件"
-"者：�或「副本：�收件者。"
+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 "很多電�郵件系統會新增 Apparently-To 檔頭至�有密件副本收件者的郵件。如果加入了此檔頭，會永�列示郵件中所有的收件者。���此情�，應該至少新增一個「收件者：�或「副本：�收件者。"
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15210,17 +15275,12 @@ msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳�。"
 
 #: ../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 ""
-"請在「收件者：�欄�輸入一個有效的電�郵件地�。您�以按一下輸入方塊�邊的"
-"「收件者：�按鈕，�尋電�郵件地�。"
+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"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
 "請確定以下收件者希望並且�以接收 HTML 電�郵件：\n"
@@ -15283,27 +15343,18 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "是��步資料夾以供離線使用？"
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Evolution 需�系統資料夾�能正常作業，而且該資料夾��以�新命��移動或刪"
-"除。"
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Evolution 需�系統資料夾�能正常作業，而且該資料夾��以�新命��移動或刪除。"
 
 #: ../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. "
+"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 ""
 "傳�的連絡人清單是設定�隱�清單收件者。\n"
 "\n"
-"很多電�郵件系統會新增 Apparently-To 檔頭至�有密件副本收件者的郵件。如果新增"
-"此檔頭，會列示郵件中所有的收件者。���此情�，您應該至少新增一個「收件"
-"者：�或「副本：�收件者。 "
+"很多電�郵件系統會新增 Apparently-To 檔頭至�有密件副本收件者的郵件。如果新增此檔頭，會列示郵件中所有的收件者。���此情�，您應該至少新增一個「收件者：�或「副本：�收件者。 "
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -15346,20 +15397,15 @@ msgstr ""
 "需�時，請移至�尋資料夾編輯器，以手動方�新增它。"
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+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"
+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."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "此伺�器�支�此驗證類型而且根本�支�驗證。"
 
 #: ../mail/mail.error.xml.h:117
@@ -15367,9 +15413,7 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已經變更，但尚未儲存。"
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "這會將標示�定的資料夾�其�資料夾中所有郵件為已閱讀。"
 
 #: ../mail/mail.error.xml.h:119
@@ -15377,9 +15421,7 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺�器。"
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "無法開啟此帳號的�稿資料夾。是�使用系統�稿資料夾代替？"
 
 #: ../mail/mail.error.xml.h:121
@@ -15396,8 +15438,7 @@ msgstr "使用�設的�稿資料夾？"
 
 #: ../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"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 "警告：從�尋資料夾中刪除郵件將會自您的本地或�端資料夾刪除實際的郵件。\n"
@@ -15426,8 +15467,7 @@ msgstr "您必須指定一個資料夾。"
 #: ../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."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "您必須至少指定一個資料夾當�來�。\n"
 "個別��資料夾，然後/或��所有本地資料夾�所有�端資料夾或二者皆�。"
@@ -15456,86 +15496,90 @@ msgstr "清除(_E)"
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1595 ../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:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../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 "今天%p %-l:%M"
 
-#: ../mail/message-list.c:1611 ../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 "昨天%p %-l:%M"
 
-#: ../mail/message-list.c:1623 ../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%p %-l:%M"
 
-#: ../mail/message-list.c:1631 ../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 "%-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
+#: ../mail/message-list.c:3916
+#: ../mail/message-list.c:4373
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
-#: ../mail/message-list.c:4179
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"沒有郵件符�您的�尋�作。�以使用「�尋->清除��單項目來清除�尋或改變它。"
+#: ../mail/message-list.c:4223
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "沒有郵件符�您的�尋�作。�以使用「�尋->清除��單項目來清除�尋或改變它。"
 
-#: ../mail/message-list.c:4181
+#: ../mail/message-list.c:4225
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -15568,39 +15612,42 @@ msgstr "傳�郵件"
 msgid "Size"
 msgstr "大�"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "原始�置"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "跟隨"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "給您的資訊"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "�需�回應"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "檢閱"
 
@@ -15625,6 +15672,10 @@ msgid "Subject contains"
 msgstr "主旨包�"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "主旨或收件者包�"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "主旨或寄件者包�"
 
@@ -15637,15 +15688,11 @@ 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"
+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."
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
 msgstr "讓附加檔案�醒外掛程�用來�尋郵件內文的關�字清單。"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
@@ -15659,17 +15706,12 @@ msgid "Attachment Reminder"
 msgstr "附加檔案�醒程�"
 
 #: ../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"
+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 ""
-"Evolution 已找到�些代表該郵件應�有附加檔案的關�字，�找�到這個附加檔案。"
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr "Evolution 已找到�些代表該郵件應�有附加檔案的關�字，�找�到這個附加檔案。"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
@@ -15680,11 +15722,8 @@ msgid "_Edit Message"
 msgstr "編輯郵件(_E)"
 
 #: ../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 ""
-"用來顯示郵件中音效附件的格�外掛程�，它�以讓您在 evolution 中直接播放它們。"
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
+msgstr "用來顯示郵件中音效附件的格�外掛程�，它�以讓您在 evolution 中直接播放它們。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -15712,12 +15751,10 @@ msgstr "從備份還原"
 
 #: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
+"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 ""
-"您�以從備份中還原 Evolution。它�以還原所有的郵件�行事曆�工作�備忘錄�連"
-"絡人。\n"
+"您�以從備份中還原 Evolution。它�以還原所有的郵件�行事曆�工作�備忘錄�連絡人。\n"
 "它也�以還原您所有的個人設定�郵件�濾器等。"
 
 #: ../plugins/backup-restore/backup-restore.c:264
@@ -15847,19 +15884,12 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "確定�關閉 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?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "確定�從�定的備份檔案還原 Evolution？"
 
 #: ../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 ""
-"Evolution 備份�能在 Evolution 沒有執行時啟動。在進行之�請確定您已儲存並關閉"
-"所有未儲存的視窗。如果希望 Evolution 在備份後自動�新啟動，請啟用切�按鈕。"
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Evolution 備份�能在 Evolution 沒有執行時啟動。在進行之�請確定您已儲存並關閉所有未儲存的視窗。如果希望 Evolution 在備份後自動�新啟動，請啟用切�按鈕。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -15878,16 +15908,8 @@ 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 ""
-"這將會刪除所有 Evolution 目�的資料與設定值並從備份中還原它們。Evolution 還原"
-"�能在 Evolution 沒有執行時啟動。如果希望 Evolution 在還原後自動�新啟動，請"
-"啟用切�按鈕。"
+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 "這將會刪除所有 Evolution 目�的資料與設定值並從備份中還原它們。Evolution 還原�能在 Evolution 沒有執行時啟動。如果希望 Evolution 在還原後自動�新啟動，請啟用切�按鈕。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -15901,7 +15923,8 @@ msgstr "還原設定值(_E)..."
 msgid "_Backup Settings..."
 msgstr "備份設定值(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:543
+#: ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
@@ -15934,13 +15957,8 @@ msgid "Synchronize with _buddy list now"
 msgstr "立�與好�清單�步(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"回覆郵件時自動在通訊錄中填入姓�與電�郵件��。�時也會在好�清單中填入 IM "
-"連絡人資訊。"
+msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
+msgstr "回覆郵件時自動在通訊錄中填入姓�與電�郵件��。�時也會在好�清單中填入 IM 連絡人資訊。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -15976,9 +15994,7 @@ msgid "Convert mail messages to Unicode"
 msgstr "將郵件轉�為 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."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
 msgstr "將郵件文字轉�為 Unicode UTF-8 以統一來自��字集的 spam/ham 特徵。"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -15993,7 +16009,8 @@ msgstr "Bogofilter 垃圾郵件外掛程�"
 msgid "Filters junk messages using Bogofilter."
 msgstr "使用 Bogofilter �濾垃圾郵件。"
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
@@ -16003,7 +16020,8 @@ msgid "_URL:"
 msgstr "網�(_U):"
 
 #: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
@@ -16025,7 +16043,8 @@ msgstr "�供本地行事曆的核心功能。"
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "�新整�(_F):"
 
@@ -16099,12 +16118,8 @@ msgid "Weather Calendars"
 msgstr "氣象行事曆"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"用來展示彈出��單外掛程�功能的測試用外掛程�，它�以讓您複製�西到剪貼簿"
-"裡。"
+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"
@@ -16115,8 +16130,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "檢查 Evolution 是�為�設的郵件程�"
 
 #: ../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."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "�次啟動 Evolution 時，檢查它是�為�設的郵件程�。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -16132,7 +16146,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是��將 Evolution 設為您的�設電�郵件客戶端程�？"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16157,20 +16171,18 @@ msgid "Default Sources"
 msgstr "�設來�"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+msgid "Provides functionality for marking a calendar or an addressbook as the default one."
 msgstr "�供標記�設行事曆或通訊錄的功能。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:558
 msgid "_Custom Header"
 msgstr "自訂標頭(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
+#: ../plugins/email-custom-header/email-custom-header.c:879
 msgid "Key"
 msgstr "設定�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:890
 #: ../plugins/templates/templates.c:400
 msgid "Values"
 msgstr "數值"
@@ -16202,13 +16214,8 @@ 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 ""
-"這個�值指定的是您�以加到外寄郵件的自訂標頭清單。指定標頭與標頭數值的格�"
-"為：自訂標頭�稱加上「=�，後�的數值則以「;�隔開"
+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"
@@ -16233,9 +16240,7 @@ msgstr "�全密碼"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:64
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
 msgstr "此�項將會連線到使用�全密碼 (NTLM) 驗證的 Exchange 伺�器。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:72
@@ -16243,9 +16248,7 @@ msgid "Plaintext Password"
 msgstr "純文字密碼"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr "此�項將會連線到使用標準純文字密碼驗證的 Exchange 伺�器。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:255
@@ -16353,9 +16356,7 @@ msgstr ""
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:113
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
+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:120
@@ -16418,12 +16419,8 @@ msgstr "%s 的許�權"
 #. summarizing the permissions assigned to him.
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:341
-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 ""
-"這�郵件是由 Evolution 自動寄出以通知您已經被指派為代�人。您�在�以代表我寄"
-"發郵件。"
+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 "這�郵件是由 Evolution 自動寄出以通知您已經被指派為代�人。您�在�以代表我寄發郵件。"
 
 #. To translators: Another chunk of the same message.
 #.
@@ -16599,8 +16596,7 @@ msgstr "<b>狀態：</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"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>當您�在辦公室時，以下指定的郵件將會自動傳�給\n"
@@ -16647,7 +16643,7 @@ msgid "Add User:"
 msgstr "新增使用者："
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/exchange-operations/exchange-send-options.c:408
 #: ../plugins/groupwise-features/proxy.c:934
 #: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
@@ -16769,7 +16765,7 @@ msgstr "使用者(_U)"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:17
 msgid "button-user"
-msgstr ""
+msgstr "button-user"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
@@ -16788,9 +16784,7 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "訂閱其他使用者的行事曆"
 
 #: ../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."
+msgid "A plugin that manages a collection of Exchange account specific operations and features."
 msgstr "處� Exchange 帳號指定�作與功能集�的外掛程�。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16810,9 +16804,7 @@ msgid "Cannot perform the operation."
 msgstr "無法執行此項�作。"
 
 #: ../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."
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
 msgstr "� Exchange 帳號「{0}��項的變更將在�新啟動 Evolution 之後生效。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
@@ -16930,7 +16922,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -16939,9 +16931,7 @@ msgid "Global Catalog Server is not reachable"
 msgstr "無法連接全域型錄伺�器"
 
 #: ../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."
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
 msgstr "如果 OWA 在別的路徑執行，您必須在帳號組態�話盒中指定。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
@@ -17047,7 +17037,7 @@ msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生�明的錯誤"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "�明的錯誤。"
 
@@ -17064,9 +17054,7 @@ msgid "You are nearing your quota available for storing mail on this server."
 msgstr "您已經接近在此伺�器儲存郵件的 quota ��。"
 
 #: ../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."
+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
@@ -17082,24 +17070,16 @@ msgid "You may only configure a single Exchange account."
 msgstr "您�以�設定一個單一的 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."
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
 msgstr "目�的使用�為：{0} KB。請試著刪除一些郵件來空出部分空間。"
 
 #: ../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."
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
 msgstr "目�的使用�為：{0} KB。您�在將無法傳�或接收郵件。"
 
 #: ../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 ""
-"目�的使用�為：{0} KB。除�您刪除一些郵件來空出部分空間，�則將無法傳�郵"
-"件。"
+msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
+msgstr "目�的使用�為：{0} KB。除�您刪除一些郵件來空出部分空間，�則將無法傳�郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
@@ -17134,9 +17114,7 @@ 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."
+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
@@ -17153,17 +17131,12 @@ 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."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr "Evoluton 無法建立用來儲存您郵件的暫存檔案。請�後�試。"
 
 #: ../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 ""
-"�能啟動在您外掛程��好設定中設定的外部編輯器。請試著設定��的編輯器。"
+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"
@@ -17198,13 +17171,8 @@ msgid "_Face"
 msgstr "�貌(_F)"
 
 #: ../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 ""
-"在外寄的郵件中附加大頭貼標頭。第一次使用時需�先設定一張 48*48 的 png 相片。"
-"它會以 base 64 編碼並儲存於 ~/.evolution/faces 這會用在未來所寄出的郵件中。"
+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 "在外寄的郵件中附加大頭貼標頭。第一次使用時需�先設定一張 48*48 的 png 相片。它會以 base 64 編碼並儲存於 ~/.evolution/faces 這會用在未來所寄出的郵件中。"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -17235,48 +17203,37 @@ msgstr "�消訂閱(_U)"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
-msgstr "請�擇其他�稱。"
+msgstr "請先輸入使用者�稱。"
 
-#: ../plugins/google-account-setup/google-source.c:497
-#, fuzzy, c-format
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "新增資料夾到已訂閱的資料夾清單"
+msgstr "輸入使用者 %s 的密碼以存�已訂閱的行事曆清單。"
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
+"�能從 Google 伺�器讀�資料。\n"
+"%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
-msgstr "行事曆(_C):"
+msgstr "行事曆(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:782
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
-msgstr "正在擷� `%s'"
+msgstr "�回清單(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/google-account-setup/google-contacts-source.c:268
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>伺�器</b>"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-msgid "Username:"
-msgstr "使用者�稱:"
-
-#. Translators: This is the first half of the sentence "Update
-#. * every NNN minute(s)", where NNN is a spin button widget.
-#: ../plugins/google-account-setup/google-contacts-source.c:233
-msgid "Update every"
-msgstr "更新間隔�"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar and contacts."
 msgstr "用來設定 Google 行事曆與連絡人的外掛程�。"
@@ -17365,14 +17322,11 @@ msgid "_Junk List"
 msgstr "垃圾郵件清單(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
-#, fuzzy
 msgid "Message Retract"
-msgstr "郵件狀態"
+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 ?"
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
 msgstr "�回郵件�能會將該郵件自數件者的 mailbox 移除。您確定�這麼�？"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
@@ -17396,14 +17350,12 @@ msgid "Groupwise Features"
 msgstr "Groupware 功能"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "郵件已�功收回"
+msgstr "郵件�消失敗"
 
 #: ../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 "將�定的郵件轉�為新的工作"
+msgstr "此伺�器��許將��的郵件�消。"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17437,11 +17389,8 @@ 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 ""
-"以 &quot;{0}&quot; 登入代�伺�器失敗。請檢查您的電�郵件��並�試一次。"
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "以 &quot;{0}&quot; 登入代�伺�器失敗。請檢查您的電�郵件��並�試一次。"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
@@ -17700,8 +17649,7 @@ msgstr "�得完整檔頭(_L)"
 
 #: ../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"
+"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 ""
 "�供在上列標準檔頭以外您想�接收的�外檔頭。\n"
@@ -17731,23 +17679,23 @@ msgstr "�供 IMAP 帳號功能的外掛程�。"
 msgid "IMAP Features"
 msgstr "IMAP 功能"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "匯入至行事曆(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "匯入 ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "�擇工作清單"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "�擇行事曆"
 
@@ -17770,24 +17718,16 @@ msgid "Hardware Abstraction Layer not loaded"
 msgstr "無法載入硬體抽象層"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:35
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"「hald��務是必�的但目�並未執行。請啟用該�務後�回到本程�，或者連絡您的"
-"系統管�者。"
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr "「hald��務是必�的但目�並未執行。請啟用該�務後�回到本程�，或者連絡您的系統管�者。"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
 msgstr "�尋 iPod 失敗"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-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 無法找到��步化的 iPod。�能是 iPod 尚未連接到系統或者沒有打開電"
-"�。"
+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 無法找到��步化的 iPod。�能是 iPod 尚未連接到系統或者沒有打開電�。"
 
 #: ../plugins/ipod-sync/ical-format.c:118
 #: ../plugins/save-calendar/ical-format.c:163
@@ -17806,603 +17746,588 @@ msgstr "�步化 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod �步化"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "載入行事曆「%s�失敗"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s�中的約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "找�到任何行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "無法分�項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳�項目至行事曆「%s�。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳�至行事曆 '%s' 並設為已接�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳�至行事曆 '%s' 並設為�確定的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳�至行事曆 '%s' 並設為已婉拒"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳�至行事曆「%s�並設為已�消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議�集人已移除代�人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳��消通知給代�人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳��消通知給代�人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於��法的狀態使得到會者狀態無法更新�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊，該會議並�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊，該項工作�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "無法寄出備忘錄資訊，該備忘錄並�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "此郵件宣告其�有行事曆內容，但其行事曆並�有效的 iCalendar。"
 
-#: ../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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
-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:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+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:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容�有多個項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1448
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "�處�這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "這個會議的循環�則為"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "這項工作的循環�則為"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "這個備忘錄的循環�則為"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "完�後刪除郵件(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "��的�尋"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "�擇��尋會議��的行事曆"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189
+#: ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A%p %-l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p %-l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%-m 月 %d 日 (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%-m 月 %d 日 (%A) %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:292
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m 月 %d 日 (%A) %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:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %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:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "請代表 <b>%s</b> 回覆"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "代表 <b>%s</b> 接收"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> 由於 %s 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 已經委派下列會議給您："
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 由於 %s 邀請您出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 邀請您出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> 由於 %s 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../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:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> �� %s 希望收到下列會議的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../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> �� %s 傳�了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 傳�了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 由於 %s 已經消�下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 已經消�下列會議。"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../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> �� %s 已經答覆了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 已經答覆了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 由於 %s 已經婉拒了下列會議變更："
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 已經婉拒了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 已經發佈了下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> 指派 %s 加入下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 由於 %s 已經指派您一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 已經指派您一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> 由於 %s 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../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:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> �� %s 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> �� %s 傳�了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> 傳�了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> 由於 %s 已經�消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 已經�消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> �� %s 已經回覆下列指派工作的變更："
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 已經回覆下列指派工作的變更："
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> 由於 %s 已婉拒了下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 已經婉拒下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> 已經發佈了備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> 由於 %s 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> 由於 %s 已經消�下列共用備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經�消下列共用備忘錄："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "開啟行事曆(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "接�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "全部接�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "傳�資訊(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
@@ -18455,9 +18380,7 @@ msgid "Itip Formatter"
 msgstr "Itip 格�器"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
 msgstr "「{0}�已代�此會議。是�還�加入代�人「{1}�？"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -18465,8 +18388,7 @@ msgid "This meeting has been delegated"
 msgstr "這個會議已委派"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "這個回覆並�來自目�的到會者。將寄件人加入為到會者？"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -18502,9 +18424,7 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "當新郵件到�時產生 D-BUS 訊�。"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
 msgstr "如果為「true�，則當新郵件抵�時發出嗶��則就播放�音檔。"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -18547,20 +18467,20 @@ msgstr "圖示是��閃�。"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "是��通知收件匣的新郵件。"
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "產生 _D-Bus 訊�"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "Evolution 的新郵件通知"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:398
 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
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18575,62 +18495,60 @@ msgstr[1] ""
 "您已經接收 %d �郵件 。 \n"
 "�於 %s。"
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "新郵件"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "在通知�中顯示圖示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "讓通知�圖示閃�(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "在圖示上彈出訊�(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:728
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "當新郵件到�時播放�音檔案(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "嗶�(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "播放�音檔案(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "指定檔案�稱(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "�擇�音檔案"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "播放(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:805
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "�通知收件匣的新郵件(_I)"
 
 #: ../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."
+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 "當新郵件抵�時產生 D-Bus 訊�或在通知�以圖示和通知訊�知會使用者。"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
@@ -18638,9 +18556,7 @@ msgid "Mail Notification"
 msgstr "郵件通知"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+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
@@ -18657,15 +18573,11 @@ msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:275
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+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."
+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
@@ -18703,8 +18615,7 @@ msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr "�供一般通信論壇指令的動作 （訂閱��消訂閱…）。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -18725,14 +18636,11 @@ msgstr "無法使用動作"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"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."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"�將寄出一�電�郵件至 URL \"{0}\"。您�以自動�出郵件，或是先查看並�些改"
-"變。\n"
+"�將寄出一�電�郵件至 URL \"{0}\"。您�以自動�出郵件，或是先查看並�些改變。\n"
 "\n"
 "在這�郵件�出後�久您應該會收到來自通信論壇的回應。"
 
@@ -18749,12 +18657,8 @@ msgid "Posting not allowed"
 msgstr "��許張貼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"�此通信論壇的張貼是�被�許的。這�能是一個唯讀的通信論壇。請連絡論壇的管�"
-"者以�得進一步資訊。"
+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?"
@@ -18762,8 +18666,7 @@ msgstr "傳�郵件到通信論壇？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"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 ""
@@ -18782,9 +18685,7 @@ msgstr ""
 "檔頭： {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+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
@@ -18844,16 +18745,12 @@ msgid "_Unsubscribe from List"
 msgstr "�消訂閱論壇(_U)"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-#, fuzzy
 msgid "Also mark messages in subfolders?"
-msgstr "正在將郵件移至資料夾 %s"
+msgstr "是�也標記�資料夾中的郵件？"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-#, 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 "這會將標示�定的資料夾�其�資料夾中所有郵件為已閱讀。"
+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:162
 msgid "Current Folder and _Subfolders"
@@ -18940,8 +18837,7 @@ msgstr "外掛程�"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
+"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 ""
@@ -19126,11 +19022,9 @@ msgid "Failed to create pipe: %s"
 msgstr "建立導管失敗：%s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"發生於 %s 的錯誤：\n"
-" %s"
+msgstr "fork 之後發生錯誤：%s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
@@ -19161,9 +19055,7 @@ msgid "I_nclude remote tests"
 msgstr "包��端測試(_N)"
 
 #: ../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."
+msgid "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed."
 msgstr "使用 SpamAssassin �濾垃圾郵件。這個外掛程�需�安� SpamAssassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
@@ -19341,18 +19233,17 @@ msgstr "指引您完��始帳號設定。"
 msgid "Setup Assistant"
 msgstr "設定助�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -19361,28 +19252,28 @@ msgstr ""
 "\n"
 "請按一下「下一步�按鈕繼續。 "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "匯入檔案"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:135
 #: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "請�擇您想�匯入的資訊："
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../plugins/startup-wizard/startup-wizard.c:150
 #: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../plugins/startup-wizard/startup-wizard.c:230
 #: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "匯入資料。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "請�候"
@@ -19405,9 +19296,7 @@ msgid "F_all back to threading messages by subject"
 msgstr "退回到�主旨的相關郵件(_A)"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr "使用郵件內文的範本外掛程��用的關�字/數值組清單。"
 
 #: ../plugins/templates/templates.c:614
@@ -19485,271 +19374,208 @@ msgid "Configuration version"
 msgstr "組態版本"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "決定是�應執行當機�測功能。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "�設資訊方塊列寬度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "�設視窗高度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "�設視窗狀態"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "�設視窗寬度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "當存�網際網路上的 HTTP/ 安全� HTTP 時啟用代�伺�器設定值。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP 代�伺�器主機�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP 代�伺�器密碼 "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP 代�伺�器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP 代�伺�器使用者�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../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 或別�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-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 ""
-"如果為 true，�代�伺�器的連線就需�驗證。其中使用者�稱會從 GConf 的「apps/"
-"evolution/shell/network_config/authentication_user��值�得，而密碼會從 "
-"gnome-keyring 或「~/.gnome2_private/Evolution�的密碼檔案�得。"
+#: ../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 "如果為 true，�代�伺�器的連線就需�驗證。其中使用者�稱會從 GConf 的「apps/evolution/shell/network_config/authentication_user��值�得，而密碼會從 gnome-keyring 或「~/.gnome2_private/Evolution�的密碼檔案�得。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "上次�級的組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../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:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "�代�伺�器主機"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "使用 HTTP 代�伺�器時�使用的密碼。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "代�伺�器組態模�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS 代�伺�器使用者�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS 代�伺�器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "安全� HTTP 代�伺�器主機�稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "安全� HTTP 代�伺�器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
-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 ""
-"�擇代�伺�器組態模�。支�的數值有 0� 1� 2� 和 3，分別代表「使用系統設定"
-"值��「�使用代�伺�器��「使用手動代�伺�器組態�和「使用在 autoconfig "
-"url 中�供的代�伺�器組態�。"
+#: ../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 "�擇代�伺�器組態模�。支�的數值有 0� 1� 2� 和 3，分別代表「使用系統設定值��「�使用代�伺�器��「使用手動代�伺�器組態�和「使用在 autoconfig url 中�供的代�伺�器組態�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "顯示�邊欄"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告�話盒"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "忽略復原警告�話盒"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "以離線模�啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "狀態列設為顯示"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0�) 。"
+#: ../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 "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0�) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的�設高度，以�素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的�設寬度，以�素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的�設寬度，以�素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"上次�級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如"
-"「2.6.0�) 。"
+#: ../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 "上次�級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如「2.6.0�) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP 代�伺�器主機�稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "安全� HTTP 代�伺�器主機�稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "socks 代�伺�器主機�稱。"
 
+#: ../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 "定義於「/apps/evolution/shell/network_config/http_host�的代�伺�器主機通訊埠。"
+
+#: ../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 "定義於「/apps/evolution/shell/network_config/secure_host�的代�伺�器主機通訊埠。"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"定義於「/apps/evolution/shell/network_config/http_host�的代�伺�器主機通訊"
-"埠。"
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr "定義於「/apps/evolution/shell/network_config/socks_host�的代�伺�器主機通訊埠。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"定義於「/apps/evolution/shell/network_config/secure_host�的代�伺�器主機通"
-"訊埠。"
+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 "視窗按鈕的風格。�以是「文字��「圖示��「兩者��「工具列�。如果設為「工具列�，按鈕的風格會� GNOME 工具列設定值決定。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"定義於「/apps/evolution/shell/network_config/socks_host�的代�伺�器主機通訊"
-"埠。"
+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 "這個�值包�了�直接連線，���代�伺�器（如果有使用）的主機。數值�以為主機�稱�網域（開頭使用�用字元如 *.foo.com）�IP ��（IPv4 和 IPv6 皆�）或帶有�網路�罩的��（�是 192.168.0.0/24）。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
-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 ""
-"視窗按鈕的風格。�以是「文字��「圖示��「兩者��「工具列�。如果設為「工"
-"具列�，按鈕的風格會� GNOME 工具列設定值決定。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-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 ""
-"這個�值包�了�直接連線，���代�伺�器（如果有使用）的主機。數值�以為主"
-"機�稱�網域（開頭使用�用字元如 *.foo.com）�IP ��（IPv4 和 IPv6 皆�）或"
-"帶有�網路�罩的��（�是 192.168.0.0/24）。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "工具列�以看到"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "�供代�伺�器組態的網�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "使用 HTTP 代�伺�器"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "使用 HTTP 代�伺�器時�使用的使用者�稱。"
 
 # zh_HK: msgstr "Evolution 是�以離線模�啟動�代線上模�。"
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是�以離線模�啟動�代線上模�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "是�使用當機�測。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "視窗是��以最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "是��以看到�邊欄。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "是�顯示狀態列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "是��以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是��略 Evulution 開發版本的警告�話盒。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "是��略 Evulution 復原的警告�話盒。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "是��以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是�視的"
 
@@ -19771,11 +19597,9 @@ msgstr "�擇匯入�務�執行的類型："
 
 #: ../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.\n"
+"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."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
 "���匯入 Evolution 的檔案，並且在清單內�定檔案類型。\n"
 "\n"
@@ -19823,7 +19647,8 @@ 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19872,7 +19697,8 @@ msgstr "開啟 FAQ 網�時發生錯誤"
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:968
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19881,64 +19707,71 @@ msgid "Work Offline"
 msgstr "離線工作"
 
 # zh_HK: msgstr "Evolution 目�為線上模�。按一下此按鈕以進行離線工作。"
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr "Evolution 目�為線上模�。按一下此按鈕以進行離線工作。"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程�中。"
 
 # zh_HK: msgstr "Evolution 目�為離線模�。按一下此按鈕以進行線上工作。"
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr "Evolution 目�為離線模�。按一下此按鈕以進行線上工作。"
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "切�至 %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "�明的系統錯誤。"
 
-#: ../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:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298
+#: ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "確�"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "無效的�數"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "�能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "找�到組態資料庫"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "新增"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "新測試"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
+msgid "_Test"
+msgstr "測試(_T)"
+
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
@@ -19981,7 +19814,7 @@ msgstr ""
 "匯入到 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20016,7 +19849,7 @@ msgstr ""
 "我們希望您享�工作�果，而且我們\n"
 "熱切希望您�供�見�\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20024,67 +19857,44 @@ msgstr ""
 "��\n"
 "Evolution �組敬上\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "���顯示這個訊�"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Evolution 當機�測"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "忽略(_N)"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution 上次執行時似乎發生�正常的關閉。\n"
-"為了�防它�度發生，所有的�覽窗格都會隱�起來。\n"
-"您�以從「檢視��單還原這些�覽窗格。\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "���顯示這個訊�(_D)"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
 # zh_HK: msgstr "以線上模�啟動"
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "以線上模�啟動"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 �新移轉"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳�至一個檔案。"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "�用�任何外掛程�的載入。"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "�用郵件�連絡人和工作的�覽窗格。"
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20110,11 +19920,8 @@ msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"�忘您的密碼會刪除所有已記憶的密碼。在下次需�使用密碼時將會�示您輸入。"
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "�忘您的密碼會刪除所有已記憶的密碼。在下次需�使用密碼時將會�示您輸入。"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -20126,20 +19933,15 @@ msgstr "確定�刪除舊資料？"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"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"
+"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"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
 "「evolution�目錄的所有內容�將永久移除。\n"
 "\n"
-"建議您手動檢查所有的電�郵件�連絡人和行事曆資料是�顯示，而且此 Evolution 版"
-"本在刪除舊資料�能正確作業。\n"
+"建議您手動檢查所有的電�郵件�連絡人和行事曆資料是�顯示，而且此 Evolution 版本在刪除舊資料�能正確作業。\n"
 "\n"
 "刪除之後，未經手動�作，便無法�級至舊的 Evolution 版本。\n"
 
@@ -20147,15 +19949,11 @@ msgstr ""
 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"
+"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 ""
 "舊的 Evolution 版本將其資料儲存在��的�置。\n"
 "\n"
-"如果�擇移除此資料，將會永久移除「evolution�目錄的所有內容。如果�擇�留此資"
-"料，就�以在方便的時候，手動移除「evolution�的內容。\n"
+"如果�擇移除此資料，將會永久移除「evolution�目錄的所有內容。如果�擇�留此資料，就�以在方便的時候，手動移除「evolution�的內容。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -20163,11 +19961,9 @@ msgstr "從以�的版本�級失敗：{0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"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."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
 "�級您的資料和設定值最多會需� {0} �碟空間，但是您�有 {1} �用。\n"
 "\n"
@@ -20213,8 +20009,7 @@ msgstr "�後�醒我(_R)"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
@@ -20232,22 +20027,12 @@ 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 ""
-"因為您信任發出此憑證的憑證單�，所以除�在此指示，�則您將信任此憑證的有效"
-"性。"
+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 ""
-"因為您�信任發出此憑證的憑證單�，所以除�在此指示，�則您將�信任此憑證的有"
-"效性。"
+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
@@ -20276,7 +20061,8 @@ msgstr "憑證�稱"
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289
+#: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "�號"
@@ -20388,14 +20174,11 @@ msgid "Backup All"
 msgstr "全部備份"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"信任此憑證管�中心之�，如果�以的話，您應該先檢查它的憑證以�它的政策和程"
-"�。"
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "信任此憑證管�中心之�，如果�以的話，您應該先檢查它的憑證以�它的政策和程�。"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "憑證"
 
@@ -20471,11 +20254,13 @@ 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:819
 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:823
 msgid "SSL Server Certificate"
 msgstr "SSL 伺�器憑證"
 
@@ -20504,8 +20289,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "您已經有來自這些組織的憑證，�以識別您的身份:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "您已經�有檔案的相關憑證，�以識別這些憑證管�中心:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -20525,7 +20309,8 @@ msgstr "編輯憑證管�中心 (_CA) 信任度"
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:239
+#: ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
@@ -20607,11 +20392,13 @@ msgstr "主旨公鑰演算法"
 msgid "Subject's Public Key"
 msgstr "主旨的公鑰"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:810
+#: ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "錯誤：無法處�延伸"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "物件簽署者"
 
@@ -20655,7 +20442,8 @@ msgstr "CRL 簽署者"
 msgid "Critical"
 msgstr "��"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:941
+#: ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "���"
 
@@ -20668,7 +20456,8 @@ msgstr "延伸"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1092
+#: ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "憑證簽章演算法"
 
@@ -20729,7 +20518,8 @@ msgstr "複製所有的連絡人到(_P)..."
 msgid "Contact _Preview"
 msgstr "連絡人�覽(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6 ../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 "複製"
@@ -20742,7 +20532,8 @@ msgstr "複製�擇的連絡人到�一個資料夾..."
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "複製已�定資料夾中的連絡人到�一個資料夾"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "複製�定範�"
 
@@ -20754,12 +20545,14 @@ msgstr "複製至資料夾..."
 msgid "Create a new addressbook folder"
 msgstr "建立新通訊錄資料夾"
 
-#: ../ui/evolution-addressbook.xml.h:12 ../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 "剪下"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪下�定範�"
 
@@ -20795,12 +20588,14 @@ msgstr "將�定資料夾中的連絡人移至�一個資料夾"
 msgid "Move to Folder..."
 msgstr "移至資料夾..."
 
-#: ../ui/evolution-addressbook.xml.h:23 ../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 "貼上"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
@@ -20834,7 +20629,8 @@ msgstr "將�定的連絡人儲存為 VCard。"
 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:2723
 msgid "Select All"
 msgstr "全�"
 
@@ -20878,7 +20674,8 @@ msgstr "�止載入"
 msgid "View the current contact"
 msgstr "檢視目�的連絡人"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "執行(_A)"
@@ -20907,7 +20704,8 @@ msgstr "將連絡人移到(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "將資料夾連絡人移到(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "新增(_N)"
 
@@ -20967,7 +20765,8 @@ msgstr "清單"
 msgid "Month"
 msgstr "月"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "下一個"
@@ -20977,7 +20776,8 @@ msgstr "下一個"
 msgid "Previews the calendar to be printed"
 msgstr "�覽將�打�的行事曆內容"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "上一個"
@@ -20987,7 +20787,8 @@ msgstr "上一個"
 msgid "Print this calendar"
 msgstr "打�這個行事曆"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "清除(_E)"
 
@@ -21075,7 +20876,8 @@ msgstr "下載標記為離線使用的帳號/資料夾之郵件"
 msgid "Empty _Trash"
 msgstr "清空回收筒(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "資料夾(_O)"
 
@@ -21209,8 +21011,7 @@ msgid "Hide _Read Messages"
 msgstr "隱�已閱讀的郵件(_R)"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "隱�已刪除的郵件而�將它們以刪除線的形�顯示"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -21293,7 +21094,8 @@ msgstr "相關郵件清單"
 msgid "_Group By Threads"
 msgstr "�相關郵件為群組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -21621,7 +21423,8 @@ msgstr "��所有文字(_A)"
 msgid "Select all the text in a message"
 msgstr "�擇郵件中的所有文字"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目��表機的版�設定"
 
@@ -21750,7 +21553,8 @@ msgstr "放大(_Z)"
 msgid "Close"
 msgstr "關閉"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -22042,7 +21846,8 @@ msgstr "�公�(_C)"
 msgid "_Address Cards"
 msgstr "地��(_A)"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "清單檢視(_L)"
 
@@ -22133,8 +21938,7 @@ 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 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 ""
 "使用滑鼠左�拉近地圖的�域，然後��時�。\n"
@@ -22248,13 +22052,16 @@ msgstr "檢視的類型:"
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../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:298 ../widgets/misc/e-attachment.c:599
+#: ../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：�是一個�法的檔案"
@@ -22285,7 +22092,8 @@ 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/misc/e-canvas-background.c:454
+#: ../widgets/text/e-text.c:3643
 #: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "填入色彩"
@@ -22293,14 +22101,17 @@ 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/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
 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/misc/e-canvas-background.c:475
+#: ../widgets/text/e-text.c:3665
 #: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "填入網點"
@@ -22325,21 +22136,24 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:92
+#: ../widgets/misc/e-reflow.c:1426
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:644
 #: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "最�寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:93
+#: ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:645
 #: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "最�寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "é–“è·�"
@@ -22413,13 +22227,16 @@ msgstr "西�語系"
 msgid "Western European, New"
 msgstr "西�語系，新"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:88
+#: ../widgets/misc/e-charset-picker.c:89
 #: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "正體"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:91
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "ç°¡é«”"
 
@@ -22501,9 +22318,7 @@ msgid "Use underline"
 msgstr "使用底線"
 
 #: ../widgets/misc/e-expander.c:197
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+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
@@ -22518,11 +22333,13 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，�以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221
+#: ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "展開器大�"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大�"
 
@@ -22535,8 +22352,10 @@ msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周�的間�"
 
 #. 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:130
+#: ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311
+#: ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "進階�尋"
 
@@ -22553,15 +22372,18 @@ msgstr "�尋(_S)"
 msgid "Searches"
 msgstr "�尋"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "儲存�尋�果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的�尋�果(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "進階�尋(_A)..."
 
@@ -22590,18 +22412,14 @@ msgid "World Map"
 msgstr "世界地圖"
 
 #: ../widgets/misc/e-map.c:627
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"用來�擇時�的滑鼠互動�地圖元件。使用�盤的使用者應該使用下方的下拉�組�方"
-"塊來�擇時�。"
+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:112
+#: ../widgets/misc/e-online-button.c:109
 msgid "Online"
 msgstr "上線"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:110
 msgid "The button state is online"
 msgstr "按鈕狀態為上線"
 
@@ -22617,64 +22435,70 @@ msgstr "�步�人記錄:"
 msgid "Sync Categories:"
 msgstr "�步分類:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1448
+#: ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1455
+#: ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "回�模�"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1462
+#: ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "欄寬"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "�尋"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340
+#: ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "按這裡以改變�尋類型"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "立��尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "é …ç›® ID"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875
+#: ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "顯示(_W):"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "�尋(_C):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " i_n "
 
@@ -22830,19 +22654,19 @@ msgid "_When opened:"
 msgstr "當開啟時(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完�)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "按這裡以移至 URL"
 
@@ -22906,11 +22730,13 @@ msgstr "背景色彩欄"
 msgid "State"
 msgstr "狀態"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(�增)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(�減)"
 
@@ -23057,7 +22883,8 @@ msgstr[1] "%s (%d 個項目)"
 #: ../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:3032
+#: ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
@@ -23065,8 +22892,10 @@ msgstr "列與列間交替使用的色彩"
 #: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
@@ -23074,8 +22903,10 @@ msgstr "水平繪圖格"
 #: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
@@ -23083,8 +22914,10 @@ msgstr "垂直繪圖格"
 #: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../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
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
@@ -23092,7 +22925,8 @@ msgstr "繪圖焦點"
 #: ../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:3060
+#: ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "游標模�"
 
@@ -23100,7 +22934,8 @@ msgstr "游標模�"
 #: ../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:3025
+#: ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "�擇�模型"
 
@@ -23108,9 +22943,11 @@ msgstr "�擇�模型"
 #: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../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
 msgid "Length Threshold"
 msgstr "界�長度"
 
@@ -23118,9 +22955,11 @@ msgstr "界�長度"
 #: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../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
 msgid "Uniform row height"
 msgstr "標準列高"
 
@@ -23203,20 +23042,24 @@ msgstr "排�資訊"
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3094
+#: ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "總是�尋"
 
@@ -23224,15 +23067,16 @@ msgstr "總是�尋"
 msgid "Use click to add"
 msgstr "請按這裡加入"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線�與 +/- 展開符號。"
 
@@ -23240,375 +23084,221 @@ msgstr "繪出線�與 +/- 展開符號。"
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "事件處�器"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "ç²—é«”"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "左��齊"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X �移"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y �移"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "文字寬度"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "使用�略號"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "�行"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "中斷字元"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "�許新行"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "繪製背景"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "游標�置"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM 快顯視窗"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "處�彈出�項目"
 
+#~ msgid "Disable or enable ellipsizing. of folder names in folder tree"
+#~ msgstr "�用或啟用資料夾樹的資料夾�稱�略"
+#~ msgid "Migrating `%s':"
+#~ msgstr "正在移轉 `%s'："
+#~ msgid "D_escription:"
+#~ msgstr "�述(_E):"
+#~ msgid "De_scription:"
+#~ msgstr "�述(_S):"
+#~ msgid "Updating query"
+#~ msgstr "正在更新查詢"
+#~ msgid "Username:"
+#~ msgstr "使用者�稱:"
+#~ msgid "Update every"
+#~ msgstr "更新間隔�"
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "決定是�應執行當機�測功能。"
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "忽略復原警告�話盒"
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "是�使用當機�測。"
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "是��略 Evulution 復原的警告�話盒。"
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolution 當機�測"
+#~ msgid "Ig_nore"
+#~ msgstr "忽略(_N)"
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution 上次執行時似乎發生�正常的關閉。\n"
+#~ "為了�防它�度發生，所有的�覽窗格都會隱�起來。\n"
+#~ "您�以從「檢視��單還原這些�覽窗格。\n"
+#~ msgid "_Do not show this message again"
+#~ msgstr "���顯示這個訊�(_D)"
 #~ msgid "Mark All Messages as Read"
 #~ msgstr "將全部的郵件標示�已閱讀"
-
 #~ msgid "_Properties..."
 #~ msgstr "屬性(_P)..."
-
-#~ msgid "_Appointment"
-#~ msgstr "約會(_A)"
-
-#~ msgid "M_eeting"
-#~ msgstr "會議(_M)"
-
-#~ msgid "All Day A_ppointment"
-#~ msgstr "全日約會(_P)"
-
-#~ msgid "Cale_ndar"
-#~ msgstr "行事曆(_N)"
-
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr "是�將此資料夾�其�資料夾中全部的郵件標示�已閱讀？"
-
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "是�想在�資料夾中一併進行這項�作程�？"
-
 #~ msgid "Show messages in the normal style"
 #~ msgstr "使用正常模�顯示郵件"
-
 #~ msgid "Permission Denied."
 #~ msgstr "權��足。"
-
-#~ msgid "_Contact"
-#~ msgstr "連絡人(_C)"
-
-#~ msgid "Contact _List"
-#~ msgstr "連絡人清單(_L)"
-
-#~ msgid "Address _Book"
-#~ msgstr "通訊錄(_B)"
-
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>顯示</b>"
-
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>伺�器資訊</b>"
-
-#~ msgid "Mem_o"
-#~ msgstr "備忘錄(_O)"
-
-#~ msgid "_Shared memo"
-#~ msgstr "共用備忘錄(_S)"
-
-#~ msgid "Memo li_st"
-#~ msgstr "備忘錄清單(_S)"
-
-#~ msgid "Assigne_d Task"
-#~ msgstr "指派的工作(_D)"
-
-#~ msgid "Tas_k list"
-#~ msgstr "工作清單(_K)"
-
 #~ msgid "Unknown reason"
 #~ msgstr "�明的原因"
-
 #~ msgid "Open File"
 #~ msgstr "開啟檔案"
-
 #~ msgid "_Save Message"
 #~ msgstr "儲存郵件(_S)"
-
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "無法開啟檔案「{0}�。"
-
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
-
-#~ msgid "_Mail Message"
-#~ msgstr "郵件訊�(_M)"
-
-#~ msgid "Mail _Folder"
-#~ msgstr "郵件資料夾(_F)"
-
 #~ msgid "Attach original message"
 #~ msgstr "附加原始郵件"
-
 #~ msgid "Do not quote original message"
 #~ msgstr "��引用原始郵件"
-
 #~ msgid "Quote original message"
 #~ msgstr "引用原始郵件"
-
 #~ msgid "Enter a name for this signature."
 #~ msgstr "輸入這個簽�檔的�稱。"
-
 #~ msgid "Name:"
 #~ msgstr "�稱:"
-
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr "�永久移除資料夾「{0}�中所有刪除的郵件？"
-
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "刪除「{0}�？"
-
 #~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
 #~ msgstr "是�刪除�尋資料夾 &quot;{0}&quot;？"
-
 #~ msgid "Only on _Current Folder"
 #~ msgstr "�在目�的資料夾(_C)"
-
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "啟用附加檔案�醒外掛程�"
-
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "啟用附加檔案�醒外掛程�。"
-
 #~ msgid "Remind _missing attachments"
 #~ msgstr "�醒�失的附加檔案(_M)"
-
 #~ msgid "_Refresh:"
 #~ msgstr "�新整�(_R):"
-
 #~ msgid "There is no configuration option for this plugin."
 #~ msgstr "這個外掛程�沒有設定的�項。"
 
-# msgstr "�供自郵件編輯器打�郵件的�項"
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "�供自郵件編輯器列�郵件的�項。"
-
-# zh_HK: msgstr "打�郵件"
-#~ msgid "Print Message"
-#~ msgstr "列�郵件"
-
-# zh_HK: msgstr "打�此郵件"
-#~ msgid "Prints the message"
-#~ msgstr "列�此郵件"
-
-#~ msgid "A plugin that handles the Startup wizard."
-#~ msgstr "處�啟動精�的外掛程�。"
-
-#~ msgid "Startup wizard"
-#~ msgstr "啟動精�"
-
-#~ msgid "A string description of the current printer settings."
-#~ msgstr "目��表機設定值的�述字串。"
-
-#~ msgid "No folder name specified."
-#~ msgstr "沒有指定資料夾�稱。"
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "資料夾�稱�能包��行字元。"
-
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "資料夾�稱��以包括 “/� 字元。"
-
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "資料夾�稱��以包括 “#� 字元。"
-
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "‘.’ 和 ‘..’ 是資料夾�留�稱。"
-
-#~ msgid "_Test"
-#~ msgstr "測試(_T)"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "複製���至剪貼簿"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "剪下���至剪貼簿"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "從剪貼簿貼上"
-
-#~ msgid "All Day Event"
-#~ msgstr "全天事件"
-
-#~ msgid "Send _Options"
-#~ msgstr "傳��項(_O)"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "刪除簽�檔以外的全部事件"
-
-#~ msgid "For_mat"
-#~ msgstr "格�(_M)"
-
-#~ msgid "HT_ML"
-#~ msgstr "HT_ML"
-
-#~ msgid "Open a file"
-#~ msgstr "開啟舊檔"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP 加密"
-
-#~ msgid "PGP Sign"
-#~ msgstr "PGP 加簽"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "S/MIME 加密"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "S/MIME 加簽"
-
-#~ msgid "Save As"
-#~ msgstr "�存新檔"
-
-#~ msgid "Save in folder..."
-#~ msgstr "儲存至資料夾..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "將郵件儲存至指定的資料夾"
-
-#~ msgid "Send"
-#~ msgstr "傳�"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "使用 HTML 格�傳�郵件"
-
-#~ msgid "_Delete all"
-#~ msgstr "全部刪除(_D)"
-
-#~ msgid "_Open..."
-#~ msgstr "é–‹å•Ÿ(_O)..."
-
-#~ msgid "C_lose"
-#~ msgstr "關閉(_L)"
-
-#~ msgid "H_TML"
-#~ msgstr "H_TML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "儲存後關閉(_C)"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "儲存這個檔案並關閉視窗"
-
-#~ msgid "Refresh List"
-#~ msgstr "�整清單"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "�整資料夾的清單"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "從已訂閱的資料夾清單內將資料夾移除"
-
-#~ msgid "Subscribe"
-#~ msgstr "訂閱"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "�消訂閱"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "���擇(_I)"
-
-#~ msgid "Status Details"
-#~ msgstr "狀態詳細資料"
-
-#~ msgid "Time Zone"
-#~ msgstr "時�"
-
-#~ msgid "TimeZone Combobox"
-#~ msgstr "時�組��方塊 "
-
-#~ msgid ""
-#~ "You have received %d new message\n"
-#~ "in %s.You have received %d new messages\n"
-#~ "in %s."
-#~ msgstr ""
-#~ "您已經接收 %d �新郵件\n"
-#~ "æ–¼ %s\n"
-#~ "您已經接收 %d �新郵件\n"
-#~ "æ–¼ %s\n"
diff --git a/server.mk b/server.mk
index 827165755c..7796708fda 100644
--- a/server.mk
+++ b/server.mk
@@ -1,4 +1,4 @@
-%.server.in: %.server.in.in
+%.server.in: %.server.in.in $(top_builddir)/config.h
 	sed -e 's|\@BINDIR_IN_SERVER_FILE\@|$(bindir_in_server_file)|'	\
 	-e 's|\@PRIVLIBEXECDIR_IN_SERVER_FILE\@|$(privlibexecdir_in_server_file)|'	\
 	-e 's|\@COMPONENTDIR_IN_SERVER_FILE\@|$(componentdir_in_server_file)|'	\
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0aa3bb8359..599e2f32ec 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,65 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-component-registry.c:
+	* e-shell-settings-dialog.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-component-registry.h:
+	* e-component-view.c:
+	* e-corba-config-page.c:
+	* e-corba-config-page.h:
+	* e-shell-constants.h:
+	* e-shell-importer.h:
+	* e-shell.h:
+	* e-user-creatable-items-handler.h:
+	* es-event.c:
+	* es-menu.c:
+	* evolution-component.c:
+	* evolution-config-control.c:
+	* evolution-config-control.h:
+	* evolution-shell-component-utils.c:
+	* evolution-shell-component-utils.h:
+	* importer/evolution-importer-client.c:
+	* importer/evolution-importer-client.h:
+	* importer/evolution-importer-listener.c:
+	* importer/evolution-importer-listener.h:
+	* importer/evolution-importer.c:
+	* importer/evolution-importer.h:
+	* importer/evolution-intelligent-importer.c:
+	* importer/evolution-intelligent-importer.h:
+	* importer/intelligent.c:
+	* importer/intelligent.h:
+	* test/evolution-test-component.h:
+
+2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #549554 (patch from Paul Bolle)
+
+	* e-shell-importer.c: (struct info):
+	Drop sentence about an "Automatic" option.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-component-view.h:
+	* e-config-upgrade.h:
+	* e-shell-settings-dialog.h:
+	* e-shell-view.h:
+	* e-shell-window-commands.h:
+	* e-shell-window.h:
+	* e-sidebar.h:
+	* es-event.h:
+	* es-menu.h:
+	* evolution-component.h:
+	* evolution-listener.c:
+	* evolution-listener.h:
+
 2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	* test/evolution-test-component.c (impl_upgradeFromVersion):
diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h
index e6f53b0e4a..27d9393058 100644
--- a/shell/e-config-upgrade.h
+++ b/shell/e-config-upgrade.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-config-upgrade.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Michael Zucchi <notzed@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Michael Zucchi <notzed@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.
  */
 
 #ifndef _E_CONFIG_UPGRADE_H
diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h
index 1adeffaf4f..25aec79d6f 100644
--- a/shell/e-shell-constants.h
+++ b/shell/e-shell-constants.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-utils.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_SHELL_CONSTANTS_H
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index adf662aacf..c01d19dea5 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -132,9 +132,7 @@ static struct {
 	},
 	{ "file_html",
 	  N_("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.")
+	     "and select what type of file it is from the list.")
 	},
 	{ "dest_html",
 	  N_("Choose the destination for this import")
diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h
index 88cfaef2f8..d78c04ab5d 100644
--- a/shell/e-shell-importer.h
+++ b/shell/e-shell-importer.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* importer.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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_SHELL_IMPORTER_H
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 83bc8ac627..e03e009d13 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -47,7 +47,7 @@ reinit_dbus (EShell *shell)
 
 static DBusHandlerResult
 e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
-			 DBusMessage *message, void *user_data)
+                         DBusMessage *message, void *user_data)
 {
 	DBusError error;
 	const gchar *object;
@@ -131,3 +131,18 @@ exception:
 
 	return FALSE;
 }
+
+gboolean
+e_shell_dbus_initialise (EShellWindow *window)
+{
+	g_type_init ();
+
+	return init_dbus (window);
+}
+
+void
+e_shell_dbus_dispose (EShellWindow *window)
+{
+	//FIXME
+	return;
+}
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 4b9bf8683d..34f2625e22 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-view.h
+/*
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This is only a CORBA wrapper around e_shell_window.
  *
  * 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.
+ * 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)
  *
- * 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 E_SHELL_VIEW_H
diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index 1780675bb9..4044a49337 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -1,21 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-window.h
- *
- * 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.
+ * 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.
+ * 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:
+ *		Ettore Perazzoli <ettore@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.
  */
 
 #ifndef E_SHELL_WINDOW_H
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 2a8f3251bd..709e4db170 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -1,21 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.h
- *
- * 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.
+ * 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.
+ * 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:
+ *		Ettore Perazzoli <ettore@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.
  */
 
 #ifndef E_SHELL_H
diff --git a/shell/es-event.c b/shell/es-event.c
index ee1cdb400a..80d3896023 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/shell/es-event.h b/shell/es-event.h
index 8b8d356e2f..df6d7e6398 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
  *
- *  Authors: Michel Zucchi <notzed@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:
+ *		Michel Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 73ae4a1d68..5f32241b17 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-client.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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
  * Based on evolution-shell-component-client.c by Ettore Perazzoli
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index f4e157e6bb..043a639c5d 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-client.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef EVOLUTION_IMPORTER_CLIENT_H
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index 2ee9697e69..e8256971f1 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-client.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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index f7a815a28b..7e09ff2da8 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-listener.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef EVOLUTION_IMPORTER_LISTENER_H
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 35afc924ce..9fb7e66f5e 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer.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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index 1e69d064d0..a684aecfb2 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef EVOLUTION_IMPORTER_H
diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c
index e0a7230411..bce7d75fa8 100644
--- a/shell/importer/evolution-intelligent-importer.c
+++ b/shell/importer/evolution-intelligent-importer.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-intelligent-importer.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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h
index 77e7245fac..35ad7d0010 100644
--- a/shell/importer/evolution-intelligent-importer.h
+++ b/shell/importer/evolution-intelligent-importer.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-intelligent-importer.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Iain Holmes  <iain@ximian.com>
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef EVOLUTION_INTELLIGENT_IMPORTER_H
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index a60c65e6a6..a9a8fed024 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* intelligent.c
- *
- * Authors:
- *    Iain Holmes  <iain@ximian.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 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:
+ *		Iain Holmes  <iain@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/shell/importer/intelligent.h b/shell/importer/intelligent.h
index 3bb349a653..bbdf00cc18 100644
--- a/shell/importer/intelligent.h
+++ b/shell/importer/intelligent.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* importer.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.
+ * 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.
+ * 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.
  *
- * Author: Kjartan Maraas  <kmaraas@gnome.org>
+ * Authors:
+ *		Kjartan Maraas  <kmaraas@gnome.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __INTELLIGENT_H__
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 585396bcfe..87bb1d3091 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,32 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/cert-trust-dialog.c:
+	* gui/cert-trust-dialog.h:
+	* gui/certificate-manager.h:
+	* gui/certificate-viewer.c:
+	* gui/certificate-viewer.h:
+	* gui/component.c:
+	* gui/component.h:
+	* lib/e-cert-db.h:
+	* lib/e-pkcs12.c:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/ca-trust-dialog.c:
+	* gui/ca-trust-dialog.h:
+	* gui/certificate-manager.c:
+	* gui/e-cert-selector.c:
+	* gui/e-cert-selector.h:
+	* lib/e-asn1-object.h:
+	* lib/e-cert-trust.h:
+	* lib/e-cert.h:
+	* lib/e-pkcs12.h:
+	* tests/import-cert.c:
+
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #534360
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index a82f72199f..f0d6cea90f 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		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/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h
index 31bf6704d4..1ebd05e780 100644
--- a/smime/gui/ca-trust-dialog.h
+++ b/smime/gui/ca-trust-dialog.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 5e155def67..0b82182972 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *           Michael Zucchi <notzed@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>
+ *      Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/gui/cert-trust-dialog.h b/smime/gui/cert-trust-dialog.h
index acc69089e1..a9c3e9ca8b 100644
--- a/smime/gui/cert-trust-dialog.h
+++ b/smime/gui/cert-trust-dialog.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *           Michael Zucchi <notzed@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>
+ *      Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 9a3c2d2339..63604eb67f 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		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/gui/certificate-manager.h b/smime/gui/certificate-manager.h
index 92e4fa3085..27813fab26 100644
--- a/smime/gui/certificate-manager.h
+++ b/smime/gui/certificate-manager.h
@@ -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/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 8595e5cc19..5c587139a5 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -1,26 +1,25 @@
-/* -*- 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)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h
index 902a61c2b0..2f088dd6c3 100644
--- a/smime/gui/certificate-viewer.h
+++ b/smime/gui/certificate-viewer.h
@@ -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/smime/gui/component.c b/smime/gui/component.c
index 22a65a5ea8..339adabbbf 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -1,26 +1,25 @@
-/* -*- 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)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/smime/gui/component.h b/smime/gui/component.h
index a7215e3208..5a7492a342 100644
--- a/smime/gui/component.h
+++ b/smime/gui/component.h
@@ -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/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index d7101d6ec8..dacf33198f 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -1,24 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Copyright 2003, Novell Inc.
- *
- * Author(s): Michael Zucchi <notzed@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Michael Zucchi <notzed@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/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h
index 47f865b616..130d90920c 100644
--- a/smime/gui/e-cert-selector.h
+++ b/smime/gui/e-cert-selector.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-cert-selector.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Michael Zucchi
+/*
  *
  * 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.
+ * 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:
+ *		Michael Zucchi <notzed@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h
index 0c99ffea18..b761730ec3 100644
--- a/smime/lib/e-asn1-object.h
+++ b/smime/lib/e-asn1-object.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h
index ecef5022de..b3a69632d1 100644
--- a/smime/lib/e-cert-db.h
+++ b/smime/lib/e-cert-db.h
@@ -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/smime/lib/e-cert-trust.h b/smime/lib/e-cert-trust.h
index 19f830c6db..65a925d7bb 100644
--- a/smime/lib/e-cert-trust.h
+++ b/smime/lib/e-cert-trust.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/lib/e-cert.h b/smime/lib/e-cert.h
index 20eb1b2ccf..e152031a5d 100644
--- a/smime/lib/e-cert.h
+++ b/smime/lib/e-cert.h
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 5c0bf3fcd7..cd79b21a4b 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -1,25 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-pkcs12.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. */
 
diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h
index d2d6ab01a3..950a2d3899 100644
--- a/smime/lib/e-pkcs12.h
+++ b/smime/lib/e-pkcs12.h
@@ -1,23 +1,21 @@
-/* -*- 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)
  */
 
 #ifndef _E_PKCS12_H_
diff --git a/smime/tests/import-cert.c b/smime/tests/import-cert.c
index e30b085317..006cb2c313 100644
--- a/smime/tests/import-cert.c
+++ b/smime/tests/import-cert.c
@@ -1,3 +1,22 @@
+/*
+ *
+ * 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)
+ *
+ */
 
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-ui-init.h>
diff --git a/tools/killev.c b/tools/killev.c
index 36dff357bf..374aa1be7c 100644
--- a/tools/killev.c
+++ b/tools/killev.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* killev.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 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.
+ * 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:
+ *
+ * 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/ui/ChangeLog b/ui/ChangeLog
index b6402cb979..b1ee2caa0a 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* evolution-addressbook.xml: Change "addressbook" to "address book"
+	in translatable strings.
+
 2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fix for bug #546788
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index c50d4be33f..6631a5702a 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,40 @@
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-timezone-dialog/e-timezone-dialog.c:
+	* e-timezone-dialog/e-timezone-dialog.h:
+	* menus/gal-define-views-dialog.h:
+	* menus/gal-define-views-model.c:
+	* menus/gal-view-collection.c:
+	* menus/gal-view-collection.h:
+	* menus/gal-view-etable.c:
+	* menus/gal-view-factory.c:
+	* menus/gal-view-menus.c:
+	* menus/gal-view-new-dialog.h:
+	* text/e-text-model-repos.h:
+	* text/e-text-model.c:
+	* text/e-text-model.h:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* menus/gal-define-views-dialog.c:
+	* menus/gal-define-views-model.h:
+	* menus/gal-view-etable.h:
+	* menus/gal-view-factory-etable.c:
+	* menus/gal-view-factory-etable.h:
+	* menus/gal-view-factory.h:
+	* menus/gal-view-instance.c:
+	* menus/gal-view-instance.h:
+	* menus/gal-view-menus.h:
+	* menus/gal-view-new-dialog.c:
+	* menus/gal-view.c:
+	* menus/gal-view.h:
+	* text/e-text-model-repos.c:
+	* text/e-text-model-test.c:
+
 2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* text/e-text-model-test.c: (main):
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 8a9413ec6c..f0879a41ae 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Damon Chaplin <damon@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/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h
index e951efe6d1..0da1112276 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.h
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.h
@@ -1,22 +1,25 @@
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
+/*
+ * Evolution calendar - Timezone selector 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.
+ * 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:
+ *		Damon Chaplin <damon@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.
  */
 
 #ifndef __E_TIMEZONE_DIALOG_H__
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 0c8d2e2576..4e252e1622 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-define-views-dialog.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index ade8d7b39e..08be5de0f9 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-define-views-dialog.h
- * 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)
+ *
  */
 
 #ifndef __GAL_DEFINE_VIEWS_DIALOG_H__
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index cba86f9434..737c800bca 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-define-views-model.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>
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
index bd6610bc52..f1adb8038c 100644
--- a/widgets/menus/gal-define-views-model.h
+++ b/widgets/menus/gal-define-views-model.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-define-views-model.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _GAL_DEFINE_VIEWS_MODEL_H_
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 84f20f8690..57c06eba16 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-collection.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>
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
index 3a554e6b8e..cf6871edd1 100644
--- a/widgets/menus/gal-view-collection.h
+++ b/widgets/menus/gal-view-collection.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-collection.h
- * 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)
+ *
  */
 
 #ifndef _GAL_VIEW_SET_H_
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index dc858bdd53..780e430e88 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-etable.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>
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index c80a744793..af03abb8e0 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-etable.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _GAL_VIEW_ETABLE_H_
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
index 26d469120f..05cf09707e 100644
--- a/widgets/menus/gal-view-factory-etable.c
+++ b/widgets/menus/gal-view-factory-etable.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-factory-etable.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
index 4839d8a748..cd89717bde 100644
--- a/widgets/menus/gal-view-factory-etable.h
+++ b/widgets/menus/gal-view-factory-etable.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-factory-etable.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _GAL_VIEW_FACTORY_ETABLE_H_
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
index dc5bf03460..7f740bc350 100644
--- a/widgets/menus/gal-view-factory.c
+++ b/widgets/menus/gal-view-factory.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-factory.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>
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index b7fa25753f..a2f78098f7 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-factory.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _GAL_VIEW_FACTORY_H_
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index a99593ff4d..e31c7d1079 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-instance.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index f1ea21ff07..37c8ad6869 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-instance.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _GAL_VIEW_INSTANCE_H_
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 0c195f07b0..061c04b71a 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-new-dialog.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
index d2ecddba87..75016bc589 100644
--- a/widgets/menus/gal-view-new-dialog.h
+++ b/widgets/menus/gal-view-new-dialog.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view-new-dialog.h
- * 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)
+ *
  */
 
 #ifndef __GAL_VIEW_NEW_DIALOG_H__
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index 12cd12244f..6509a7996d 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index 13df44c14b..0baba16761 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * gal-view.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _GAL_VIEW_H_
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 2d100b24ce..74ad227f47 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,10 +1,122 @@
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+2008-09-06  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #549968
 
 	* e-attachment-bar.c (e_attachment_bar_bonobo_ui_populate_with):
 	Use the same mnemonic for "Recent Documents" as composer.
 
+2008-09-06  Michael Meeks  <michael.meeks@novell.com>
+
+	* e-spinner.c: correct licensing cockup; apologies.
+	* e-icon-entry.h: ditto.
+
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-calendar-item.c:
+	* e-charset-picker.c:
+	* e-config-page.c:
+	* e-dropdown-button.c:
+	* e-multi-config-dialog.c:
+	* e-multi-config-dialog.h:
+	* test-multi-config-dialog.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-activity-handler.c:
+	* e-activity-handler.h:
+	* e-attachment-bar.h:
+	* e-attachment.h:
+	* e-calendar.h:
+	* e-canvas-background.h:
+	* e-canvas-utils.h:
+	* e-canvas-vbox.c:
+	* e-canvas-vbox.h:
+	* e-canvas.h:
+	* e-cell-date-edit.c:
+	* e-cell-renderer-combo.c:
+	* e-colors.h:
+	* e-combo-button.h:
+	* e-combo-cell-editable.c:
+	* e-config-page.h:
+	* e-cursors.c:
+	* e-dropdown-button.h:
+	* e-expander.h:
+	* e-filter-bar.c:
+	* e-filter-bar.h:
+	* e-gui-utils.c:
+	* e-gui-utils.h:
+	* e-image-chooser.c:
+	* e-info-label.c:
+	* e-map.c:
+	* e-pilot-settings.c:
+	* e-popup-menu.c:
+	* e-popup-menu.h:
+	* e-printable.c:
+	* e-reflow.h:
+	* e-selection-model.c:
+	* e-send-options.c:
+	* e-task-bar.c:
+	* e-task-bar.h:
+	* e-task-widget.h:
+	* e-unicode.c:
+	* test-calendar.c:
+	* test-dateedit.c:
+	* test-dropdown-button.c:
+
+2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #550334
+
+	* e-activity-handler.c:
+	Use standard icon names for warning and information.
+
+2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-info-label.c (e_info_label_set_info):
+	Fix vertical alignment of labels.
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-account-combo-box.c:
+	* e-account-combo-box.h:
+	* e-attachment.c:
+	* e-calendar-item.h:
+	* e-canvas-utils.c:
+	* e-cell-date-edit.h:
+	* e-cell-percent.h:
+	* e-cell-renderer-combo.h:
+	* e-charset-picker.h:
+	* e-combo-cell-editable.h:
+	* e-cursors.h:
+	* e-icon-entry.h:
+	* e-image-chooser.h:
+	* e-info-label.h:
+	* e-map.h:
+	* e-pilot-settings.h:
+	* e-printable.h:
+	* e-reflow-model.c:
+	* e-reflow-model.h:
+	* e-selection-model-array.c:
+	* e-selection-model-array.h:
+	* e-selection-model-simple.c:
+	* e-selection-model-simple.h:
+	* e-selection-model.h:
+	* e-send-options.h:
+	* e-signature-combo-box.c:
+	* e-signature-combo-box.h:
+	* e-spinner.c:
+	* e-spinner.h:
+	* test-charset-picker.c:
+	* test-color.c:
+	* test-error.c:
+	* test-info-label.c:
+
 2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #547411
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index b6f92146e0..ebde2b5c0e 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include "e-account-combo-box.h"
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index 2bf84c163a..87f7eb9704 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_ACCOUNT_COMBO_BOX_H
diff --git a/widgets/misc/e-attachment-bar.h b/widgets/misc/e-attachment-bar.h
index 4d6f136cbe..7f8b4795d1 100644
--- a/widgets/misc/e-attachment-bar.h
+++ b/widgets/misc/e-attachment-bar.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-attachment-bar.h
- *
- * 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
- * published by the Free Software Foundation; either version 2 of the
- * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
- * 	   Srinivasa Ragavan
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ * 	   	Srinivasa Ragavan <sragavan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __E_ATTACHMENT_BAR_H__
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 44774a0ffa..073110571a 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /*
- *  Authors: Ettore Perazzoli <ettore@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *	     Srinivasa Ragavan <sragavan@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 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 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
+ * Lesser General Public License for more details.
  *
- *  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 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:
+ *			Ettore Perazzoli <ettore@ximian.com>
+ *          Jeffrey Stedfast <fejj@ximian.com>
+ *	     	Srinivasa Ragavan <sragavan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index 958604fe7a..7b45f24ae5 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-attachment.h
- *
- * 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
- * published by the Free Software Foundation; either version 2 of the
- * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
- * 	   Srinivasa Ragavan
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ * 	   	Srinivasa Ragavan <sragavan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef __E_ATTACHMENT_H__
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 2d7a78a5eb..3bf1fe65a7 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -1,32 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *  Bolian Yin <bolian.yin@sun.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * ECalendarItem - canvas item displaying a 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
- */
-
-/*
- * ECalendarItem - canvas item displaying a 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>
+ *		Bolian Yin <bolian.yin@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 42efd5358f..b93ec9518d 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -1,25 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
 #ifndef _E_CALENDAR_ITEM_H_
 #define _E_CALENDAR_ITEM_H_
 
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 99902a8d0d..aebc615cfc 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
+
 #ifndef _E_CALENDAR_H_
 #define _E_CALENDAR_H_
 
diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h
index afa2fb771a..5d75735c12 100644
--- a/widgets/misc/e-canvas-background.h
+++ b/widgets/misc/e-canvas-background.h
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-canvas-background.h - background color for canvas.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_CANVAS_BACKGROUND_H
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index 2e242b1c6d..c46f64c199 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-canvas-utils.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 "e-canvas-utils.h"
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
index fae54472ff..fa09a86c25 100644
--- a/widgets/misc/e-canvas-utils.h
+++ b/widgets/misc/e-canvas-utils.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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)
+ *
  */
 
 #ifndef __E_CANVAS_UTILS__
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 9c93c15f23..dfdfaf64dc 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-canvas-vbox.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>
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
index 4422983844..51602e77de 100644
--- a/widgets/misc/e-canvas-vbox.h
+++ b/widgets/misc/e-canvas-vbox.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-canvas-vbox.h
- * 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)
+ *
  */
 
 #ifndef __E_CANVAS_VBOX_H__
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index 9be02115f3..e06bed7824 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-canvas.h
- * 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)
+ *
  */
 
 #ifndef __E_CANVAS_H__
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 0748cec19e..824c8a1b20 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
index 0bcb2395f7..938d356e8d 100644
--- a/widgets/misc/e-cell-date-edit.h
+++ b/widgets/misc/e-cell-date-edit.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h
index a07c3b9409..46a7ddc3e3 100644
--- a/widgets/misc/e-cell-percent.h
+++ b/widgets/misc/e-cell-percent.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c
index 09f80de663..96f474d0d9 100644
--- a/widgets/misc/e-cell-renderer-combo.c
+++ b/widgets/misc/e-cell-renderer-combo.c
@@ -1,23 +1,23 @@
 /*
- * e-cell-renderer-combo.c
- *
- * Author:  Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h
index 056c62eb80..547eca7e7a 100644
--- a/widgets/misc/e-cell-renderer-combo.h
+++ b/widgets/misc/e-cell-renderer-combo.h
@@ -1,23 +1,24 @@
 /*
- * e-cell-renderer-combo.h
- *
- * Author: Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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.
  */
 
 #ifndef __E_CELL_RENDERER_COMBO_H__
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index f83ca36aa5..03014609ae 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /*
- * 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.
+ * 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.
+ * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h
index 5947304392..7250b10dfb 100644
--- a/widgets/misc/e-charset-picker.h
+++ b/widgets/misc/e-charset-picker.h
@@ -1,20 +1,20 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /*
- * 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.
+ * 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.
+ * 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.
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
index 5afe019a76..30ddfd496a 100644
--- a/widgets/misc/e-colors.h
+++ b/widgets/misc/e-colors.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-colors.h
- * 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@kernel.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@kernel.org)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef GNOME_APP_LIBS_COLOR_H
diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c
index b4921db52e..5502a83a0d 100644
--- a/widgets/misc/e-combo-cell-editable.c
+++ b/widgets/misc/e-combo-cell-editable.c
@@ -1,23 +1,23 @@
 /*
- * e-combo-cell-editable.c
- *
- * Author: Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h
index 447b8a8aa3..d3f64a36d3 100644
--- a/widgets/misc/e-combo-cell-editable.h
+++ b/widgets/misc/e-combo-cell-editable.h
@@ -1,23 +1,24 @@
 /*
- * e-combo-cell-editable.h
- *
- * Author: Mike Kestner  <mkestner@ximian.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 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.
+ * 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:
+ *		Mike Kestner  <mkestner@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.
  */
 
 #ifndef __E_COMBO_CELL_EDITABLE_H__
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index 95c511ed92..ac03e18e70 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-cursors.c - cursor handling for gnumeric
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index e0d20362bd..c22e295c7b 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cursors.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 GNOME_APP_LIB_CURSORS_H
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
index ce9f02127f..32785a5e8f 100644
--- a/widgets/misc/e-dropdown-button.c
+++ b/widgets/misc/e-dropdown-button.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.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.
+ * 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.
+ * 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:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Damon Chaplin <damon@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
index e52c59457f..b10fd9a670 100644
--- a/widgets/misc/e-dropdown-button.h
+++ b/widgets/misc/e-dropdown-button.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_DROPDOWN_BUTTON_H_
diff --git a/widgets/misc/e-expander.h b/widgets/misc/e-expander.h
index b7aa330d28..6ddb68087e 100644
--- a/widgets/misc/e-expander.h
+++ b/widgets/misc/e-expander.h
@@ -1,24 +1,24 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Sun Microsystems, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+/*
+ * 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) any later version.
+ * version 2 of the License, or (at your option) version 3.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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/>  
  *
- * 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:
- *	Mark McLoughlin <mark@skynet.ie>
+ *		Mark McLoughlin <mark@skynet.ie>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2003 Sun Microsystems, Inc.
+ *
  */
 
 #ifndef _E_EXPANDER_H_
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index dc9863a8f5..c662460aba 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -1,29 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * e-search-bar.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Michael Zucchi <notzed@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 library; 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/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index ca53f3aeb0..edc20e2fec 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -1,22 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-filter-bar.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Michael Zucchi <notzed@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
+
 #ifndef E_FILTER_BAR_H
 #define E_FILTER_BAR_H
 
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index d4a7888fb8..4e0b099944 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-gui-utils.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@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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
index 1682041c4c..d0a54f7c42 100644
--- a/widgets/misc/e-gui-utils.h
+++ b/widgets/misc/e-gui-utils.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-gui-utils.h
- * 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@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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef GAL_GUI_UTILS_H
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index d0c626c10f..8057d23aaa 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-image-chooser.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; 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/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index bbf160f1c1..0e78026683 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -1,21 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-image-chooser.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
+/*
  *
- * This library 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 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
- * 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:
+ *		Chris Toshok <toshok@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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  */
 
 #ifndef _E_IMAGE_CHOOSER_H_
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index eb518c2434..347b97ca7c 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Map widget.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Hans Petter Jansson <hpj@ximian.com>
+/*
+ * Map 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.
+ * 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:
+ *		Hans Petter Jansson <hpj@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/widgets/misc/e-map.h b/widgets/misc/e-map.h
index 34e4d775d5..4d65c7b47b 100644
--- a/widgets/misc/e-map.h
+++ b/widgets/misc/e-map.h
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Map widget.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Hans Petter Jansson <hpj@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Hans Petter Jansson <hpj@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.
  */
 
 #ifndef E_MAP_H
diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c
index c190aaf696..80ad52d083 100644
--- a/widgets/misc/e-pilot-settings.c
+++ b/widgets/misc/e-pilot-settings.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-pilot-settings.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 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/widgets/misc/e-pilot-settings.h b/widgets/misc/e-pilot-settings.h
index f98a320da2..fbba3b2f71 100644
--- a/widgets/misc/e-pilot-settings.h
+++ b/widgets/misc/e-pilot-settings.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-pilot-settings.h
- *
- * 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.
+ * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_PILOT_SETTINGS_H_
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 1d370f2093..1581d3e409 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-popup-menu.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@ximian.com>
- *   Jody Goldberg (jgoldberg@home.com)
- *   Jeffrey Stedfast <fejj@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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Jody Goldberg (jgoldberg@home.com)
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index 195c788505..c297bde53f 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-popup-menu.h
- * 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@ximian.com>
- *   Jody Goldberg (jgoldberg@home.com)
- *   Jeffrey Stedfast <fejj@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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Jody Goldberg (jgoldberg@home.com)
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_POPUP_MENU_H
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 62de9a1847..f5392cc201 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-printable.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>
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
index 5875de4baa..d0d3223dbf 100644
--- a/widgets/misc/e-printable.h
+++ b/widgets/misc/e-printable.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-printable.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_PRINTABLE_H_
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 31747e6bcc..8f206e20c6 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -1,26 +1,25 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-reflow-model.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 "e-util/e-util-marshal.h"
diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h
index 1322057693..7482e5079f 100644
--- a/widgets/misc/e-reflow-model.h
+++ b/widgets/misc/e-reflow-model.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-reflow-model.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_REFLOW_MODEL_H_
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index 93c7b1ddf8..6d67369209 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-reflow.h
- * 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)
+ *
  */
 
 #ifndef __E_REFLOW_H__
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 8f3398d982..f45923c1dd 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-selection-model-array.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index 7d0d9f5a47..abbf828374 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-selection-model-array.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_SELECTION_MODEL_ARRAY_H_
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index 9ec0251ddd..88fa6f857f 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-selection-model-simple.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
index e65724649d..2cd2ecabd3 100644
--- a/widgets/misc/e-selection-model-simple.h
+++ b/widgets/misc/e-selection-model-simple.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-selection-model-simple.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_SELECTION_MODEL_SIMPLE_H_
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index e8e4e52629..4e473f80bb 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-selection-model.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>
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index a1b5c38aaf..18bbc2a115 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-selection-model.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_SELECTION_MODEL_H_
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 33c80d6917..6c10a60c1c 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Main page of the Groupwise send options Dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Chenthill Palanisamy <pchenthill@novell.com>
+/*
+ * Evolution calendar - Main page of the Groupwise send options 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:
+ *		Chenthill Palanisamy <pchenthill@novell.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.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h
index 0b4a1d8b51..9a32357358 100644
--- a/widgets/misc/e-send-options.h
+++ b/widgets/misc/e-send-options.h
@@ -1,24 +1,26 @@
- /* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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:
+ *		Damon Chaplin <damon@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.
  */
-
+ 
 #ifndef __E_SENDOPTIONS_DIALOG_H__
 #define __E_SENDOPTIONS_DIALOG_H__
 
diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c
index 522a400801..199a3ad51a 100644
--- a/widgets/misc/e-signature-combo-box.c
+++ b/widgets/misc/e-signature-combo-box.c
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include "e-signature-combo-box.h"
diff --git a/widgets/misc/e-signature-combo-box.h b/widgets/misc/e-signature-combo-box.h
index 14435d12b1..ec05c2b5d7 100644
--- a/widgets/misc/e-signature-combo-box.h
+++ b/widgets/misc/e-signature-combo-box.h
@@ -1,20 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU Lesser General Public
- * License 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 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.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_SIGNATURE_COMBO_BOX_H
diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h
index 0cc4ca5e20..a955da4bb1 100644
--- a/widgets/misc/e-task-widget.h
+++ b/widgets/misc/e-task-widget.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-task-widget.h
- *
- * 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.
+ * 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.
+ * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_TASK_WIDGET_H_
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 85ee8f7596..a98154dd20 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-unicode.c - utf-8 support functions for gal
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Lauris Kaplinski <lauris@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 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:
+ *		Lauris Kaplinski <lauris@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 /*
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index 307190c85d..1906c70ede 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/widgets/misc/test-charset-picker.c b/widgets/misc/test-charset-picker.c
index 889bba2600..5b49e2d0f7 100644
--- a/widgets/misc/test-charset-picker.c
+++ b/widgets/misc/test-charset-picker.c
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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)
+ *
+ */
+
 #include <gnome.h>
 #include "e-charset-picker.h"
 
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 66e0081177..f86166a228 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -1,23 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-color.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
  *
- * 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/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index d2d430ac16..da6a5953b1 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.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 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:
+ *		Damon Chaplin <damon@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
  */
 
 /*
diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
index c572af2102..38523c47b1 100644
--- a/widgets/misc/test-dropdown-button.c
+++ b/widgets/misc/test-dropdown-button.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.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.
+ * 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.
+ * 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:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Damon Chaplin <damon@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c
index 5ebdb6a93e..84abd76ce3 100644
--- a/widgets/misc/test-error.c
+++ b/widgets/misc/test-error.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- *
- * test-error.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Michael Zucchi <notzed@ximian.com>
+/*
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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.
+ * 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.
+ * 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:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index cf632fc517..5ba6ebeda1 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,135 @@
+2008-09-04  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-cell-pixbuf.c:
+	* e-cell-size.c:
+	* e-table-group-container.c:
+	* e-table-header-utils.c:
+	* e-table-sorted.c:
+
+2008-09-02  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-cell-combo.c:
+	* e-cell-date.c:
+	* e-cell-hbox.c:
+	* e-cell-number.c:
+	* e-cell-pixbuf.h:
+	* e-cell-popup.c:
+	* e-cell-size.h:
+	* e-cell-text.h:
+	* e-cell-toggle.c:
+	* e-cell-vbox.c:
+	* e-cell.h:
+	* e-table-click-to-add.c:
+	* e-table-click-to-add.h:
+	* e-table-column-specification.c:
+	* e-table-column-specification.h:
+	* e-table-column.c:
+	* e-table-config-field.c:
+	* e-table-config-field.h:
+	* e-table-config.c:
+	* e-table-config.h:
+	* e-table-example-1.c:
+	* e-table-example-2.c:
+	* e-table-extras.c:
+	* e-table-field-chooser-dialog.h:
+	* e-table-group.c:
+	* e-table-header-item.h:
+	* e-table-header.c:
+	* e-table-memory-callbacks.h:
+	* e-table-memory-store.c:
+	* e-table-memory.c:
+	* e-table-memory.h:
+	* e-table-one.h:
+	* e-table-search.c:
+	* e-table-selection-model.c:
+	* e-table-size-test.c:
+	* e-table-sort-info.c:
+	* e-table-sort-info.h:
+	* e-table-sorted-variable.c:
+	* e-table-sorter.c:
+	* e-table-sorter.h:
+	* e-table-sorting-utils.h:
+	* e-table-specification.c:
+	* e-table-state.c:
+	* e-table-state.h:
+	* e-table-subset-variable.c:
+	* e-table-subset-variable.h:
+	* e-table-tooltip.h:
+	* e-table.h:
+	* e-tree-memory-callbacks.h:
+	* e-tree-memory.c:
+	* e-tree-selection-model.h:
+	* e-tree-sorted-variable.c:
+	* e-tree-sorted.c:
+	* e-tree-table-adapter.c:
+	* e-tree-table-adapter.h:
+	* e-tree.h:
+
+2008-08-27  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-cell-checkbox.c:
+	* e-cell-checkbox.h:
+	* e-cell-combo.h:
+	* e-cell-date.h:
+	* e-cell-hbox.h:
+	* e-cell-number.h:
+	* e-cell-popup.h:
+	* e-cell-toggle.h:
+	* e-cell-vbox.h:
+	* e-cell.c:
+	* e-table-col-dnd.h:
+	* e-table-col.h:
+	* e-table-defines.h:
+	* e-table-extras.h:
+	* e-table-field-chooser-dialog.c:
+	* e-table-field-chooser-item.h:
+	* e-table-field-chooser.h:
+	* e-table-group-container.h:
+	* e-table-group-leaf.c:
+	* e-table-group-leaf.h:
+	* e-table-group.h:
+	* e-table-header-utils.h:
+	* e-table-header.h:
+	* e-table-item.h:
+	* e-table-memory-callbacks.c:
+	* e-table-memory-store.h:
+	* e-table-model.c:
+	* e-table-model.h:
+	* e-table-one.c:
+	* e-table-scrolled.h:
+	* e-table-search.h:
+	* e-table-selection-model.h:
+	* e-table-simple.c:
+	* e-table-simple.h:
+	* e-table-sorted-variable.h:
+	* e-table-sorted.h:
+	* e-table-specification.h:
+	* e-table-subset.c:
+	* e-table-subset.h:
+	* e-table-tree.h:
+	* e-table-utils.c:
+	* e-table-utils.h:
+	* e-table-without.c:
+	* e-table-without.h:
+	* e-tree-memory-callbacks.c:
+	* e-tree-memory.h:
+	* e-tree-model.h:
+	* e-tree-scrolled.c:
+	* e-tree-scrolled.h:
+	* e-tree-simple.c:
+	* e-tree-simple.h:
+	* e-tree-sorted-variable.h:
+	* e-tree-sorted.h:
+	* table-test.h:
+	* test-check.c:
+	* test-cols.c:
+
 2008-08-11  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #352695
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index eb1e80b539..114c2b52a2 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-checkbox.c: Checkbox cell renderer
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 <gdk/gdkkeysyms.h>
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h
index 64719a8614..79f55c371f 100644
--- a/widgets/table/e-cell-checkbox.h
+++ b/widgets/table/e-cell-checkbox.h
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-checkbox.h: Checkbox cell renderer
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_CHECKBOX_H_
 #define _E_CELL_CHECKBOX_H_
 
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 8415e31c77..34de0fb29e 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-cell-combo.c: Combo cell renderer
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Damon Chaplin <damon@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 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:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 /*
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
index 7a76fd22c9..b7cc928e25 100644
--- a/widgets/table/e-cell-combo.h
+++ b/widgets/table/e-cell-combo.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-combo.h: Combo cell renderer
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author :
- *  Damon Chaplin <damon@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 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:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 /*
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index 05bc5caa60..1ec554515e 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -1,23 +1,23 @@
 /*
- * e-cell-date.c - Date item for e-table.
- * 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.
  *
- * Author:
- *  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>
diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h
index 2c94b294c5..f7d24cf8a9 100644
--- a/widgets/table/e-cell-date.h
+++ b/widgets/table/e-cell-date.h
@@ -1,23 +1,24 @@
 /*
- * e-cell-date.h - Date item for e-table.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_DATE_H_
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index ece5d914c5..b9a8544f57 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -1,29 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-hbox.c - Hbox cell object.
- * 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.
+ *
+ * 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:
- *   Srinivasa Ragavan <sragavan@novell.com>
+ *		Srinivasa Ragavan <sragavan@novell.com>
  *
  * A majority of code taken from:
  *
  * the ECellText renderer.
- * 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.
  *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index 9a68a9e5d1..d3cb84db6a 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -1,29 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-hbox.h - Hbox cell object.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Authors:
- *   Srinivasa Ragavan <sragavan@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.
  *
- * A majority of code taken from:
+ * 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.
  *
- * the ECellText renderer.
- * 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 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.
+ * Authors:
+ *		Srinivasa Ragavan <sragavan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_HBOX_H_
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 11e9731155..6d4e3925de 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -1,23 +1,23 @@
 /*
- * e-cell-number.c - Number item for e-table.
- * 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>
diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h
index e2640bbb13..006801d71d 100644
--- a/widgets/table/e-cell-number.h
+++ b/widgets/table/e-cell-number.h
@@ -1,23 +1,24 @@
 /*
- * e-cell-number.h - Number item for e-table.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *  Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_NUMBER_H_
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 2e02535e10..4a2dde7f9b 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-pixbuf.c - An ECell that displays a GdkPixbuf
- * 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.
+ *
+ * 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:
- *  Vladimir Vukicevic <vladimir@ximian.com>
+ *		Vladimir Vukicevic <vladimir@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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h
index 46e0162ece..09918a4027 100644
--- a/widgets/table/e-cell-pixbuf.h
+++ b/widgets/table/e-cell-pixbuf.h
@@ -1,23 +1,25 @@
 /*
  * e-cell-pixbuf.h - An ECell that displays a GdkPixbuf
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *  Vladimir Vukicevic <vladimir@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 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:
+ *		Vladimir Vukicevic <vladimir@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_PIXBUF_H_
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 17d682e954..92e03d79a1 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-cell-popup.c: Popup cell renderer
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Damon Chaplin <damon@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 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/>  
+ *
  *
- * 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:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 /*
  * ECellPopup - an abstract ECell class used to support popup selections like
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index b47b6b02cb..5c462b9490 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-popup.h: Popup cell renderer
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Damon Chaplin <damon@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 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:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 /*
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index 4d84c5ee20..08a1c8aff9 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-size.c: Size item for e-table.
- * 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>
diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h
index 1f8c912526..68ee4ebb7d 100644
--- a/widgets/table/e-cell-size.h
+++ b/widgets/table/e-cell-size.h
@@ -1,25 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-cell-size.h: Size item for e-table.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_SIZE_H_
 #define _E_CELL_SIZE_H_
 
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index dd397ccee8..c831b2edc2 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -1,11 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-text.h: Text cell renderer.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Text cell renderer.
+ *
+ * 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:
- *   Miguel de Icaza <miguel@ximian.com>
- *   Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * A lot of code taken from:
  *
@@ -19,19 +33,6 @@
  *
  * 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.
- *
- * 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_TEXT_H_
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 66d43c4514..4fc6aca107 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-cell-toggle.c - Multi-state image toggle cell object.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
index 0dc457da4f..49e2afb018 100644
--- a/widgets/table/e-cell-toggle.h
+++ b/widgets/table/e-cell-toggle.h
@@ -1,24 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-toggle.h - Multi-state image toggle cell object.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Authors:
- *   Miguel de Icaza <miguel@ximian.com>
+ * Multi-state image toggle cell object.
  *
- * 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TOGGLE_H_
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 77370bfac2..af398ae872 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -1,30 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-vbox.c - Vbox cell object.
- * 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 Toshok <toshok@ximian.com>
- *   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.
  *
- * A majority of code taken from:
+ * 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/>  
  *
- * the ECellText renderer.
- * 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.
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *		Chris Lahey  <clahey@ximian.com>
  *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h
index dfc0bf2cb8..6292862ab8 100644
--- a/widgets/table/e-cell-vbox.h
+++ b/widgets/table/e-cell-vbox.h
@@ -1,30 +1,29 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell-vbox.h - Vbox cell object.
- * 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.
+ *
+ * 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:
- *   Chris Toshok <toshok@ximian.com>
- *   Chris Lahey  <clahey@ximina.com
+ *		Chris Toshok <toshok@ximian.com>
+ *		Chris Lahey  <clahey@ximina.com
  *
  * A majority of code taken from:
- *
  * the ECellText renderer.
  * 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.
- *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_VBOX_H_
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index b13be6a94b..e76e073dd1 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -1,25 +1,25 @@
- /*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell.c - base class for cell renderers in e-table
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Miguel de Icaza <miguel@ximian.com>
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ * 		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index e5636ce789..cb60cc8a2a 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-cell.h
- * 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@ximian.com>
- *   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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_CELL_H_
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 0f5a785284..c4d72e314b 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-click-to-add.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>
diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
index 2efc312596..1ddbe4e75b 100644
--- a/widgets/table/e-table-click-to-add.h
+++ b/widgets/table/e-table-click-to-add.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-click-to-add.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_CLICK_TO_ADD_H_
diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h
index 5df96b2a2c..335b456e46 100644
--- a/widgets/table/e-table-col-dnd.h
+++ b/widgets/table/e-table-col-dnd.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-col-dnd.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_COL_DND_H_
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
index c7a9ecc339..562e4fd7a7 100644
--- a/widgets/table/e-table-col.h
+++ b/widgets/table/e-table-col.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-col.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 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:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_COL_H_
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index 6056b6ae4c..3da9e28fdb 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-table-column-specification.c - Savable specification of a column.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h
index a57f4e3d1f..775cbc3570 100644
--- a/widgets/table/e-table-column-specification.h
+++ b/widgets/table/e-table-column-specification.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-column-specification.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_COLUMN_SPECIFICATION_H_
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
index af1584322f..bf9ed10afe 100644
--- a/widgets/table/e-table-column.c
+++ b/widgets/table/e-table-column.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-column.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>
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index 8a0506c3c9..f5111d7ca2 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-config-field.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>
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
index 1eca32164b..3e21147ef5 100644
--- a/widgets/table/e-table-config-field.h
+++ b/widgets/table/e-table-config-field.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-config-field.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_CONFIG_FIELD_H_
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index ead6dfd923..5becaa30f2 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-config.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@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>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
+
 /*
  * FIXME:
  *    Sort Dialog: when text is selected, the toggle button switches state.
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 7d56e161a8..b265e32ba3 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-config.h
- * 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@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>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_TABLE_CONFIG_H_
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
index ccabd49a23..f401d5e418 100644
--- a/widgets/table/e-table-defines.h
+++ b/widgets/table/e-table-defines.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-defines.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_DEFINES__
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
index cfbf29bb58..e68dda908e 100644
--- a/widgets/table/e-table-example-1.c
+++ b/widgets/table/e-table-example-1.c
@@ -1,27 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-example-1.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)
+ *
  */
 
-/* This code is GPL. */
 #include <stdio.h>
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index e57db1348d..4f3324d084 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-example-2.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 <stdio.h>
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index ac7d870fac..2fa6e5cecf 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-table-extras.c - Set of hash table sort of thingies.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h
index df0418c57d..986d9b9208 100644
--- a/widgets/table/e-table-extras.h
+++ b/widgets/table/e-table-extras.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-extras.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_EXTRAS_H_
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 676cea0ed3..f277795d23 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-field-chooser-dialog.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 28dddfb6ae..8467316317 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-field-chooser-dialog.h
- * 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)
+ *
  */
 
 #ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
index c2bd85b3f9..96b5b28e02 100644
--- a/widgets/table/e-table-field-chooser-item.h
+++ b/widgets/table/e-table-field-chooser-item.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-field-chooser-item.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_FIELD_CHOOSER_ITEM_H_
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index 30ee193fb5..01a54da822 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-field-chooser.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_FIELD_CHOOSER_H__
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 2c61eee775..0066b8b482 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-group-container.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>
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index 6f5669a955..c4e0293edb 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-group-container.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_GROUP_CONTAINER_H_
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 906208b62d..95dc312b0a 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-group-leaf.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 69d8d83edb..394c2dd778 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-group-leaf.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_GROUP_LEAF_H_
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 0c83c5f608..cbbd02c839 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-group.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>
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index c6bfd85096..10591e4113 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-group.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_GROUP_H_
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 1d45749627..d9b3efce63 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-header-item.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_HEADER_ITEM_H_
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 17ca805d18..6f613433ea 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-header-utils.h
- * 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@ximian.com>
- *          Federico Mena-Quintero <federico@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>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 5985b37bae..33376f31c4 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-header-utils.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		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 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_TABLE_HEADER_UTILS_H
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 588c6ff0d0..66e7d68680 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-header.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@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>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index e992977eb5..2c091ce20f 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-header.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_COLUMN_H_
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index ef3f4a542a..48d6093b51 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-item.h
- * 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 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)
  *
- * 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_TABLE_ITEM_H_
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index 7c8b909210..071494ca25 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-memory-callbacks.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h
index 3e9dea119d..c9202ecfef 100644
--- a/widgets/table/e-table-memory-callbacks.h
+++ b/widgets/table/e-table-memory-callbacks.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-memory-callbacks.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_MEMORY_CALLBACKS_H_
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index cfb5781309..5756402b54 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-memory-store.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>
diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h
index 6562e4e75e..b16a18f8e5 100644
--- a/widgets/table/e-table-memory-store.h
+++ b/widgets/table/e-table-memory-store.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-memory-store.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_MEMORY_STORE_H_
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index bff5374c3a..371261387e 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-memory.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>
diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
index 304c50ab1f..37fc3449ff 100644
--- a/widgets/table/e-table-memory.h
+++ b/widgets/table/e-table-memory.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-memory.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_MEMORY_H_
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 64bc322885..a7b6f9e714 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-model.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
index 6640494abe..337da0758e 100644
--- a/widgets/table/e-table-model.h
+++ b/widgets/table/e-table-model.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-model.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_MODEL_H_
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index 171f83fca5..939733fea6 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-one.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h
index 3634b5db96..d5e0b6a431 100644
--- a/widgets/table/e-table-one.h
+++ b/widgets/table/e-table-one.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-one.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_ONE_H_
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
index 0b1d9bfe26..2ff7332cc6 100644
--- a/widgets/table/e-table-scrolled.h
+++ b/widgets/table/e-table-scrolled.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-scrolled.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SCROLLED_H_
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 13f89c88a1..99fa7acb17 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-search.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>
diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h
index e51196241a..94232bd757 100644
--- a/widgets/table/e-table-search.h
+++ b/widgets/table/e-table-search.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-search.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SEARCH_H_
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 4224336063..75ae0f92c8 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-selection-model.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>
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 4208746405..c1549513db 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-selection-model.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SELECTION_MODEL_H_
diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c
index 4e20652fbe..d4ba8d8795 100644
--- a/widgets/table/e-table-simple.c
+++ b/widgets/table/e-table-simple.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-simple.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel.ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
index 40e3d48be9..b8661fe3df 100644
--- a/widgets/table/e-table-simple.h
+++ b/widgets/table/e-table-simple.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-simple.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SIMPLE_H_
diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c
index 45ebc29df6..817785076e 100644
--- a/widgets/table/e-table-size-test.c
+++ b/widgets/table/e-table-size-test.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-size-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:
- *   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 <stdio.h>
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index c3729ce268..e5e3da391c 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sort-info.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>
diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h
index d398184456..5a1874e9f3 100644
--- a/widgets/table/e-table-sort-info.h
+++ b/widgets/table/e-table-sort-info.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sort-info.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_SORT_INFO_H_
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 49ac068191..b181b4390f 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorted-variable.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>
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
index 415cbffffc..06d398077b 100644
--- a/widgets/table/e-table-sorted-variable.h
+++ b/widgets/table/e-table-sorted-variable.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorted-variable.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SORTED_VARIABLE_H_
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 1cf85f4fb9..4cb1a6cca7 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorted.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>
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
index 939ff70406..1d93b2ae93 100644
--- a/widgets/table/e-table-sorted.h
+++ b/widgets/table/e-table-sorted.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorted.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SORTED_H_
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index ffbf66948a..dc63f74492 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorter.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>
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
index a3b4de351c..81a7eb71f5 100644
--- a/widgets/table/e-table-sorter.h
+++ b/widgets/table/e-table-sorter.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorter.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_SORTER_H_
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
index 545b573a82..4ab8714caf 100644
--- a/widgets/table/e-table-sorting-utils.h
+++ b/widgets/table/e-table-sorting-utils.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-sorting-utils.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_SORTING_UTILS_H_
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 0913c92c00..6860d2f275 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-specification.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>
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
index bbd03411a7..463bba6ef2 100644
--- a/widgets/table/e-table-specification.h
+++ b/widgets/table/e-table-specification.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-specification.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SPECIFICATION_H_
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 23c0eb9275..9f173eb573 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-state.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>
diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h
index 69c9e00fdb..f09baf7c4c 100644
--- a/widgets/table/e-table-state.h
+++ b/widgets/table/e-table-state.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-state.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_STATE_H_
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index a61fa67d9e..50913ddaa9 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-subset-variable.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>
diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h
index 23fa7a688a..680d426e77 100644
--- a/widgets/table/e-table-subset-variable.h
+++ b/widgets/table/e-table-subset-variable.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-subset-variable.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_SUBSET_VARIABLE_H_
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 2b0f4c5cd5..d1e9ee66b7 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-subset.c - Implements a table that contains a subset of another table.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h
index ca3caa639e..e2bf5b46c6 100644
--- a/widgets/table/e-table-subset.h
+++ b/widgets/table/e-table-subset.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-subset.h - Implements a table that contains a subset of another table.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_SUBSET_H_
diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h
index 9a307ccd45..4c85c08a50 100644
--- a/widgets/table/e-table-tooltip.h
+++ b/widgets/table/e-table-tooltip.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-tooltip.h
- * 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)
+ *
  */
 
 #ifndef _E_TABLE_TOOLTIP_H_
diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h
index 86f8affe33..13d6bf730d 100644
--- a/widgets/table/e-table-tree.h
+++ b/widgets/table/e-table-tree.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-tree.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_TREE_H_
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index f96f11cc60..d01d94ae28 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-utils.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h
index 91bc6e78ea..037a5f97d8 100644
--- a/widgets/table/e-table-utils.h
+++ b/widgets/table/e-table-utils.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-utils.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_UTILS_H_
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index b7ce815880..2ee1734d69 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-without.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index 6f089fcc39..db40ded70f 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-without.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TABLE_WITHOUT_H_
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 1dd873e04e..1a681e9eca 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table.h - A graphical view of a Table.
- * 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@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>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_TABLE_H_
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index c34b0ed49d..3a6f7a8493 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-memory-callbacks.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
index caa2e1b917..89d3a0d756 100644
--- a/widgets/table/e-tree-memory-callbacks.h
+++ b/widgets/table/e-tree-memory-callbacks.h
@@ -1,27 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-memory-callbacks.h
- * 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)
+ *
  */
 
-
 #ifndef _E_TREE_MEMORY_CALLBACKS_H_
 #define _E_TREE_MEMORY_CALLBACKS_H_
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index a7eff63d85..a7d266e0e6 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-memory.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>
- *   Chris Toshok <toshok@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>
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h
index f369a7db61..075f740de3 100644
--- a/widgets/table/e-tree-memory.h
+++ b/widgets/table/e-tree-memory.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-memory.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TREE_MEMORY_H_
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index 9b523a62b2..a318bd7df0 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-model.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@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 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TREE_MODEL_H_
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
index 7c6a498939..7e40ef81d3 100644
--- a/widgets/table/e-tree-scrolled.c
+++ b/widgets/table/e-tree-scrolled.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-scrolled.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h
index a264c98394..cbe725a162 100644
--- a/widgets/table/e-tree-scrolled.h
+++ b/widgets/table/e-tree-scrolled.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-scrolled.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TREE_SCROLLED_H_
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index 42cd7f5a36..e1541a661f 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-selection-model.h
- * 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)
+ *
  */
 
 #ifndef _E_TREE_SELECTION_MODEL_H_
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
index 39e439d5fc..be67a95cf8 100644
--- a/widgets/table/e-tree-simple.c
+++ b/widgets/table/e-tree-simple.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-simple.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
index 6c0583c69e..95e0bfb486 100644
--- a/widgets/table/e-tree-simple.h
+++ b/widgets/table/e-tree-simple.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-simple.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TREE_SIMPLE_H_
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index c1b83a8faa..d30812da1f 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-sorted-variable.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>
diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h
index d9f100fd7e..6abed5e397 100644
--- a/widgets/table/e-tree-sorted-variable.h
+++ b/widgets/table/e-tree-sorted-variable.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-sorted-variable.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TREE_SORTED_VARIABLE_H_
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index ee9ee8b5ca..dd326ec094 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -1,27 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-sorted.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.
+ *
+ * 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:
- *   Chris Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *		Chris Toshok <toshok@ximian.com>
  *
  * Adapted from the gtree code and ETableModel.
  *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 /* FIXME: Overall e-tree-sorted.c needs to be made more efficient. */
diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h
index c9d824701d..1dc7f056fb 100644
--- a/widgets/table/e-tree-sorted.h
+++ b/widgets/table/e-tree-sorted.h
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-sorted.h
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TREE_SORTED_H_
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 7953440b57..7e63a64783 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-table-adapter.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>
- *   Chris Toshok <toshok@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>
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h
index 4d792f7451..d1296c2b1d 100644
--- a/widgets/table/e-tree-table-adapter.h
+++ b/widgets/table/e-tree-table-adapter.h
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree-table-adapter.h
- * 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>
- *   Chris Toshok <toshok@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>
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_TREE_TABLE_ADAPTER_H_
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 3093855e4b..361ab5adc7 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-tree.h
- * 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)
+ *
  */
 
 #ifndef _E_TREE_H_
diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h
index d4d319a23b..3dc7d98162 100644
--- a/widgets/table/table-test.h
+++ b/widgets/table/table-test.h
@@ -1,24 +1,24 @@
-/* -*- 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)
- *
- * Authors:
- *   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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 void table_browser_test (void);
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
index 07eae58699..86561d3362 100644
--- a/widgets/table/test-check.c
+++ b/widgets/table/test-check.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-check.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
index dd59500125..7c3ac25705 100644
--- a/widgets/table/test-cols.c
+++ b/widgets/table/test-cols.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-cols.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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>
diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c
index b462fe5f93..0b55930792 100644
--- a/widgets/text/e-text-model-repos.c
+++ b/widgets/text/e-text-model-repos.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-model-repos.c - Standard ETextModelReposFn definitions
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Jon Trowbridge <trow@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 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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 "e-text-model-repos.h"
diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h
index a14c138e38..461a70f59d 100644
--- a/widgets/text/e-text-model-repos.h
+++ b/widgets/text/e-text-model-repos.h
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-text-model-repos.h - Standard ETextModelReposFn definitions
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Jon Trowbridge <trow@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 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:
+ *		Jon Trowbridge <trow@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_TEXT_MODEL_REPOS_H
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
index 60a13226cf..0f1f216cfb 100644
--- a/widgets/text/e-text-model-test.c
+++ b/widgets/text/e-text-model-test.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-model-test.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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-model.c b/widgets/text/e-text-model.c
index 53c03d0f93..c1704e532c 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-model.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)
+ *
  */
 
 #undef  PARANOID_DEBUGGING
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 867d48530b..2a484f14b4 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-text-model.h
- * 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)
+ *
  */
 
 #ifndef E_TEXT_MODEL_H